Merge branch 'master' into master-test

ANDRU-PC\Andru

2023-03-06 a4c539d27c6e7f5268bb0a71df935e3cdfcf3a29

 phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java

@@ -1,14 +1,15 @@
package com.hz.his.feign.service.dcp;

import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import com.hz.his.dto.dcp.TagRuleInfoDto;
import com.hz.his.dto.dcp.TagRuleInfoItemDto;
import com.hz.his.dto.dcp.UserTagInfoDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -17,8 +18,12 @@
public interface SUserTagInfoService {

    /**查询用户标签列表*/
    @RequestMapping("/user/tag/info/list")
    Result userTagInfoListData(@RequestBody(required = false) UserTagInfoDto userTagInfoDto);
    @PostMapping("/user/tag/info/list")
    Result userTagInfoListData(@RequestBody UserTagInfoDto userTagInfoDto);

    /**查询用户标签用户列表 返回(FilterUserDto)*/
    @RequestMapping("/user/tag/info/user/list")
    Result userListData(@RequestBody UserTagInfoDto userTagInfoDto);

    /**
     * 编辑用户标签 添加 编辑 删除  三合一接口
@@ -40,15 +45,23 @@
     *    (删除的数据id)"deleteUserTagInfoIdList": ["62d91ec5776bca1873344066"]
     * }
     */
    @RequestMapping(value = "/user/tag/info/edit", method = RequestMethod.POST)
    Result edit(HttpServletRequest request, @RequestBody(required = false) String data);
    @PostMapping(value = "/user/tag/info/edit")
    Result edit(@RequestBody JSONObject data);


    /**标签分类树形数据  数据案例：{"ascription":["customer","project","product","card","employee","promotion"]}*/
    @RequestMapping("/tag/rule/info/tree/data")
    Result tagTypeTreeData(@RequestBody(required = false) String data);
    @PostMapping("/tag/rule/info/tree/data")
    Result tagTypeTreeData(@RequestBody JSONObject data);

    /**标签列表*/
    @RequestMapping("/tag/rule/item/list")
    Result tagInfoListData(@RequestBody(required = false) TagRuleInfoItemDto tagRuleInfoItemDto);
    @PostMapping("/tag/rule/item/list")
    Result tagInfoListData(@RequestBody TagRuleInfoItemDto tagRuleInfoItemDto);

    /**标签分类数据列表*/
    @PostMapping("/tag/rule/info/list")
    Result listData(@RequestBody TagRuleInfoDto tagRuleInfoDto);

    /**同步用户标签数据*/
    @PostMapping("/test/handlerSyncUserLabelInfo")
    Result handlerSyncUserLabelInfo(@RequestParam("userId") String userId);
}