Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into dev/neo2mysql20210120

cdssman-service/src/main/java/com/diagbot/facade/KlRuleFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.KlRuleServiceImpl;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.KlRuleByIdVO;
 import com.diagbot.vo.KlRuleInfoClearVO;
 import com.diagbot.vo.KlRuleInfoSaveVO;
@@ -56,6 +57,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     }
 
     public Boolean saveRuleInfos(KlRuleInfoSaveVO klRuleInfoSaveVO) {
+        klRuleInfoSaveVO.setModifier(UserUtils.getCurrentPrincipleID());
         RespDTO<Boolean> booleanRespDTO = cdssCoreClient.saveRuleInfoAll(klRuleInfoSaveVO);
         RespDTOUtil.respNGDeal(booleanRespDTO, "保存规则详情数据失败");
         return booleanRespDTO.data;
@@ -68,12 +70,14 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     }
 
     public Boolean startOrDisableRule(KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        klRuleSatartOrdisaVO.setModifier(UserUtils.getCurrentPrincipleID());
         RespDTO<Boolean> booleanRespDTO = cdssCoreClient.disableRuleInfos(klRuleSatartOrdisaVO);
         RespDTOUtil.respNGDeal(booleanRespDTO, "停用规则失败");
         return booleanRespDTO.data;
     }
 
     public Boolean startRuleInfos(KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        klRuleSatartOrdisaVO.setModifier(UserUtils.getCurrentPrincipleID());
         RespDTO<Boolean> booleanRespDTO = cdssCoreClient.startRuleInfos(klRuleSatartOrdisaVO);
         RespDTOUtil.respNGDeal(booleanRespDTO, "启用规则失败");
         return booleanRespDTO.data;

cdssman-service/src/main/java/com/diagbot/vo/KlRuleSatartOrdisaVO.java

@@ -15,4 +15,5 @@ import javax.validation.constraints.NotNull;
 public class KlRuleSatartOrdisaVO {
     @NotNull(message = "请输id")
     private Long id;
+    private String modifier;
 }