Merge branch 'master-prod-new' into master-test

fhx

2023-10-11 ed43bd0e7f5520f227c329ef436adb1e278016a7

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

@@ -1,11 +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.RequestParam;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
@@ -13,9 +17,17 @@
@FeignClient(name="dcp-rules-service",path = "/dcp-rules",contextId = "userTagInfo")
public interface SUserTagInfoService {

    /** 标签分类树型列表 */
    @PostMapping("/tag/rule/info/list/tree")
    Result listTreeData();

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

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

    /**
     * 编辑用户标签 添加 编辑 删除  三合一接口
@@ -27,10 +39,10 @@
     *          (是否自定义标签 否)"isCustom": 0,
     *          (标签类型编号)"typeNo": "constellation",
     *          (标签编号)"tagNo": "LA20220506bRnJDj"
     *                },
     *        {
     *          },
     *          {
     *          (是否自定义标签 是)"isCustom": 1,
     *          (标签类型编号 没有类型可以为空或不传)"typeNo": "constellation",
     *           (标签类型编号)"typeNo": "constellation",
     *          (标签编号)"tagName": "牛马座"
     *        }
     *    ],
@@ -38,14 +50,22 @@
     * }
     */
    @PostMapping(value = "/user/tag/info/edit")
    Result edit(@RequestBody String data);
    Result edit(@RequestBody JSONObject data);


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

    /**标签列表*/
    @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);
}