Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/config/AppConfig.java

@@ -39,6 +39,12 @@ public class AppConfig {
     @Value("${change.goods.principal.email:grp.gyhtest1001@corp.netease.com}")
     private String defaultEmail;
 
+    @Value("${searchName:aa}")
+    private String searchName;
+
+    @Value("${searchUid:wb.mulongfei@mesg.corp.netease.com}")
+    private String searchUid;
+
     /**
      * 变更管理QM
      */

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/change/AdminChangeConfigService.java

 package com.netease.mail.yanxuan.change.biz.service.change;
 
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
+import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigDeleteReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
 
@@ -43,7 +44,7 @@ public interface AdminChangeConfigService {
      * @param id
      * @return
      */
-    AjaxResult deleteChange(Long id);
+    AjaxResult deleteChange(ChangeConfigDeleteReq id);
 
 
     AjaxResult queryConfigType();

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/AdminChangeConfigServiceImpl.java

@@ -18,6 +18,7 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
+import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigDeleteReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeConfigArrayVO;
@@ -150,17 +151,20 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
 
     @Override
     @Transactional
-    public AjaxResult deleteChange(Long id) {
-        ChangeConfig changeConfig = changeConfigService.queryChangeConfig(id);
+    public AjaxResult deleteChange(ChangeConfigDeleteReq id) {
+        if (id == null && id.getId() == null){
+            return AjaxResult.of(ResponseCodeEnum.PARAM_ERROR);
+        }
+        ChangeConfig changeConfig = changeConfigService.queryChangeConfig(id.getId());
         if (changeConfig == null){
             return AjaxResult.of(ResponseCodeEnum.NO_FOUND);
         }
-        changeConfigService.deleteChangeConfig(id);
+        changeConfigService.deleteChangeConfig(id.getId());
         List<ChangeType> changeTypes = typeService.queryChangeType(changeConfig.getParentChangeClassId(), changeConfig.getSonChangeClassId(), true);
         typeService.deleteChangeTypes(changeTypes);
-        execConfigService.deleteChangeConfig(id);
+        execConfigService.deleteChangeConfig(id.getId());
         // 缓存内删除
-        redisTemplate.delete(CHANGE_CONFIG+id);
+        redisTemplate.delete(CHANGE_CONFIG+id.getId());
         return AjaxResult.success();
     }
 

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeExecConfigServiceImpl.java

@@ -49,8 +49,6 @@ public class ChangeExecConfigServiceImpl implements ChangeExecConfigService {
     public List<ChangeExecConfig> updateChangeExecConfig(Long id,List<ChangeExecConfig> changeExecConfigs) {
         //删除原来的行动
         deleteChangeConfig(id);
-        //重新载入新的行动项
-        addChangeExecConfig(id,changeExecConfigs);
         return addChangeExecConfig(id,changeExecConfigs);
     }
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeConfigDeleteReq.java

+package com.netease.mail.yanxuan.change.dal.meta.model.req;
+
+import lombok.Data;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/12/7/007$
+ */
+@Data
+public class ChangeConfigDeleteReq {
+
+    private Long id;
+
+}

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java

@@ -3,6 +3,7 @@ package com.netease.mail.yanxuan.change.web.controller;
 
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.biz.service.change.AdminChangeConfigService;
+import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigDeleteReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
 import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
@@ -96,7 +97,7 @@ public class ChangeConfigController {
      */
     @PostMapping("/delete")
     public AjaxResult deleteChange(
-            @RequestBody Long id){
+            @RequestBody ChangeConfigDeleteReq id){
         return service.deleteChange(id);
     }
 

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/SupplierController.java

+package com.netease.mail.yanxuan.change.web.controller;
+
+import com.netease.mail.yanxuan.change.biz.config.AppConfig;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierService;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierInfoRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/12/7/007$
+ */
+@RestController
+@RequestMapping("/supplier")
+public class SupplierController {
+
+    @Autowired
+    private FlowRpcSupplierService rpcSupplierService;
+
+    @Autowired
+    private AppConfig appConfig;
+
+    @GetMapping("/query/supplier/infos")
+    public AjaxResponse<List<SupplierInfoRsp>> querySupplierInfos(
+            @RequestParam(name = "name",required = false )String name,
+            @RequestParam(name = "uid",required = false)String uid,
+            @RequestParam(name = "fuzzySearchText") String fuzzySearchText){
+        if (name == null){
+            name = appConfig.getSearchName();
+        }
+        if (uid == null){
+            uid = appConfig.getSearchUid();
+        }
+        return rpcSupplierService.getSupplierInfo(name,uid,fuzzySearchText);
+    }
+
+
+}

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/TestController.java

@@ -71,31 +71,6 @@ public class TestController {
         return AjaxResult.success();
     }
 
-    @Autowired
-    private FlowRpcSupplierService rpcSupplierService;
-
-    @GetMapping("/test1")
-    public AjaxResponse<List<SupplierInfoRsp>>  test1(@RequestParam(name = "fuzzySearchText") String fuzzySearchText){
-        return rpcSupplierService.getSupplierInfo("aa","wb.mulongfei@mesg.corp.netease.com",fuzzySearchText);
-    }
-
-    @Autowired
-    private FlowRpcSupplierSendService supplierSendService;
-
-    @PostMapping("/test2")
-    public AjaxResponse<List<SupplierUserRsp>> test2(@RequestBody SupplierRelatedUserReq req) {
-        return supplierSendService.querySupplierRelatedUser(req);
-    }
-
-    @PostMapping("/test3")
-    public AjaxResponse<List<SupplierSimpleRsp>> test3(@RequestBody SupplierSearchRemoteReq req) {
-        return supplierSendService.queryByConditionForQc(req);
-    }
-
-    @PostMapping("/test4")
-    public AjaxResponse<List<SupplierGoodsInfoRsp>> test4(@RequestBody SupplierGoodsInfoReq req) {
-        return supplierSendService.SupplierGoodsInfoBySupplier(req);
-    }
 
     @PostMapping("/submit")
     public AjaxResult<Void> submit(Long id) {