修改变更模板接口编写完成

删除变更模板删除接口完成~

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

 package com.netease.mail.yanxuan.change.biz.service.change;
 
-import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 
 import java.util.List;
@@ -16,10 +15,7 @@ public interface ChangeExecConfigService {
 
     Boolean addChangeExecConfig(Long id,List<ChangeExecConfig> changeExecConfigs);
 
-    Boolean updateChangeExecConfig(ChangeExecConfig changeExecConfig);
-
-    Boolean deleteChangeExecConfig(Long id);
-
+    Boolean updateChangeExecConfig(Long id,List<ChangeExecConfig> changeExecConfigs);
 
     Boolean deleteChangeConfig(Long changeTemplateId);
 

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

@@ -35,7 +35,7 @@ public interface ChangeTypeService {
      */
     List<ChangeType> updateChangeType(List<ChangeType> changeTypes);
 
-    Boolean deleteChangeType(List<ChangeType> changeTypes);
+    Boolean deleteChangeTypes(List<ChangeType> changeTypes);
 
     /**
      * 一级ID 二级ID 是否存在

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

@@ -78,7 +78,7 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         vo.setChangeConfig(changeConfig);
         vo.setChangeTypes(changeTypes);
         vo.setChangeExecConfigs(changeExecConfigs);
-        //放入缓存并返回
+        //如果没有查询后返回redis
         return AjaxResult.success(vo);
     }
 
@@ -90,13 +90,24 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         ChangeConfig changeConfig = parameterSplicing(changeTypes,changeConfigReq);
         changeConfig = changeConfigService.addChangeConfig(changeConfig);
         execConfigService.addChangeExecConfig(changeConfig.getId(),changeConfigReq.getChangeExecConfigs());
+        //新增后添加到redis
         return AjaxResult.success();
     }
 
     @Override
+    @Transactional
     public AjaxResult modifyChange(ChangeConfigReq changeConfigReq) {
+        if (changeConfigReq.getId() == null){
+            return AjaxResult.of(9001,"修改变更模板主键id不能为空");
+        }
         //新增类似   //内嵌行动方案
-        return null;
+        List<ChangeType> changeTypes = typeService.updateChangeType(changeConfigReq.getChangeTypes());
+        ChangeConfig changeConfig = parameterSplicing(changeTypes,changeConfigReq);
+        changeConfigService.updateChangeConfig(changeConfig);
+        //修改
+        execConfigService.updateChangeExecConfig(changeConfigReq.getId(),changeConfigReq.getChangeExecConfigs());
+        //修改后更新redis
+        return AjaxResult.success();
     }
 
     @Override
@@ -108,7 +119,7 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         }
         changeConfigService.deleteChangeConfig(id);
         List<ChangeType> changeTypes = typeService.queryChangeType(changeConfig.getParentChangeClassId(), changeConfig.getSonChangeClassId(), true);
-        typeService.deleteChangeType(changeTypes);
+        typeService.deleteChangeTypes(changeTypes);
         execConfigService.deleteChangeConfig(id);
         // 缓存内删除
         return AjaxResult.success();
@@ -134,6 +145,9 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         ChangeConfig changeConfig = new ChangeConfig();
         changeConfig.setParentChangeClassId(changeTypes.get(0).getId());
         changeConfig.setSonChangeClassId(changeTypes.get(1).getId());
+        if (changeConfigReq.getId() != null){
+            changeConfig.setId(changeConfigReq.getId());
+        }
         if (changeConfigReq.getChangeSubject() == null){
             throw ExceptionFactory.createBiz(ResponseCode.PARAMETER_DEFICIENCY);
         }

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

@@ -34,6 +34,7 @@ public class ChangeConfigServiceImpl implements ChangeConfigService {
 
     @Override
     public Boolean updateChangeConfig(ChangeConfig changeConfig) {
+        changeConfig.setUpdateTime(System.currentTimeMillis());
         mapper.updateByPrimaryKeySelective(changeConfig);
         return true;
     }

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

@@ -37,15 +37,11 @@ public class ChangeExecConfigServiceImpl implements ChangeExecConfigService {
     }
 
     @Override
-    public Boolean updateChangeExecConfig(ChangeExecConfig changeExecConfig) {
-        //行动项,变更风险描述,  变更验证措施, 需要判断字段长度   参数验证 暂不验证
-        mapper.updateByPrimaryKeySelective(changeExecConfig);
-        return true;
-    }
-
-    @Override
-    public Boolean deleteChangeExecConfig(Long id) {
-        mapper.deleteById(id);
+    public Boolean updateChangeExecConfig(Long id,List<ChangeExecConfig> changeExecConfigs) {
+        //删除原来的行动
+        deleteChangeConfig(id);
+        //重新载入新的行动项
+        addChangeExecConfig(id,changeExecConfigs);
         return true;
     }
 

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

@@ -61,13 +61,62 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
 
     @Override
     public List<ChangeType> updateChangeType(List<ChangeType> changeTypes) {
-        deleteChangeType(changeTypes);
-        return addChangeType(changeTypes);
+        //根据传进来的一级ID 和二级ID 进行查询
+        List<ChangeType> changeTypeList = mapper.queryTypes(changeTypes.get(0).getId(), changeTypes.get(1).getId(), 0);
+        if (changeTypeList.get(0).getTypeName().equals(changeTypes.get(0).getTypeName())) {
+            if (changeTypeList.get(1).getTypeName().equals(changeTypes.get(1).getTypeName())){
+                //未改变情况直接返回
+                return changeTypes;
+            }else{
+                //一级未改变  二级发生改变
+                List<ChangeType> sonChanges = mapper.queryParent(changeTypes.get(0).getId());
+                for (ChangeType sonChange : sonChanges){
+                    if (sonChange.getTypeName().equals(changeTypes.get(1).getTypeName())){
+                        deleteChangeType(changeTypes.get(1));
+                        changeTypes.set(1,sonChange);
+                        return changeTypes;
+                    }
+                }
+                //发现没有直接新增并返回
+                changeTypes.get(1).setId(null);
+                changeTypes.get(1).setParentId(changeTypes.get(0).getId());
+                changeTypes.get(1).setCreateTime(System.currentTimeMillis());
+                changeTypes.get(1).setUpdateTime(System.currentTimeMillis());
+                mapper.insertSelective(changeTypes.get(1));
+                return changeTypes;
+            }
+        }else{
+            //查询 所有一级ID 是否有重复的
+            ChangeType changeParentType = mapper.queryTypeName(changeTypes.get(0).getTypeName());
+            if (changeParentType == null){
+                //ID置空
+                changeTypes.get(0).setId(null);
+                changeTypes.get(1).setId(null);
+                //新增一级二级并返回
+                return addChangeType(changeTypes);
+            }
+            //查询二级
+            List<ChangeType> sonChanges = mapper.queryParent(changeParentType.getId());
+            for (ChangeType sonChange : sonChanges){
+                if (sonChange.getTypeName().equals(changeTypes.get(1).getTypeName())){
+                    deleteChangeType(changeTypes.get(1));
+                    changeTypes.set(1,sonChange);
+                    return changeTypes;
+                }
+            }
+            //发现没有直接新增并返回
+            changeTypes.get(1).setId(null);
+            changeTypes.get(1).setParentId(changeParentType.getId());
+            changeTypes.get(1).setCreateTime(System.currentTimeMillis());
+            changeTypes.get(1).setUpdateTime(System.currentTimeMillis());
+            mapper.insertSelective(changeTypes.get(1));
+            return changeTypes;
+        }
     }
 
     @Override
     @Transactional
-    public Boolean deleteChangeType(List<ChangeType> changeTypes) {
+    public Boolean deleteChangeTypes(List<ChangeType> changeTypes) {
         if (changeTypes.get(0) == null || changeTypes.get(1) == null){
             throw ExceptionFactory.createParamFail();
         }
@@ -82,6 +131,19 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
         return true;
     }
 
+    public void deleteChangeType(ChangeType changeType) {
+        if (changeType == null ){
+            throw ExceptionFactory.createParamFail();
+        }
+        Example example = new Example(ChangeType.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.orEqualTo("id",changeType.getId());
+        changeType.setDeleteType(1);
+        changeType.setUpdateTime(System.currentTimeMillis());
+        mapper.updateByExampleSelective(changeType,example);
+    }
+
+
     @Override
     public List<ChangeTypePo> queryConfigType() {
         //获取数据,创建目录集合,遍历分组

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeExecConfigMapper.java

@@ -23,9 +23,6 @@ import java.util.List;
 @Mapper
 public interface ChangeExecConfigMapper extends tk.mybatis.mapper.common.Mapper<ChangeExecConfig> {
 
-    @Delete("delete from TB_YX_QC_CHANGE_EXEC_CONFIG where id = #{id}")
-    int deleteById(@Param("id") Long id);
-
     @Select("select * from TB_YX_QC_CHANGE_EXEC_CONFIG where change_template_id = #{changeTemplateId}")
     List<ChangeExecConfig> queryChangeExecConfig(@Param("changeTemplateId")Long changeTemplateId);
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeTypeMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Mapper
 public interface ChangeTypeMapper extends tk.mybatis.mapper.common.Mapper<ChangeType> {
 
-    @Select("select * from TB_YX_QC_CHANGE_TYPE where type_name = #{typeName} and delete_type  = 0")
+    @Select("select * from TB_YX_QC_CHANGE_TYPE where type_name = #{typeName} and parent_id = 0 and delete_type  = 0")
     ChangeType queryTypeName(@Param("typeName") String typeName);
 
 
@@ -35,4 +35,5 @@ public interface ChangeTypeMapper extends tk.mybatis.mapper.common.Mapper<Change
 
     @Select("select * from TB_YX_QC_CHANGE_TYPE where parent_id = #{id} and delete_type  = 0")
     List<ChangeType> queryParent(@Param("id") Long id);
+
 }
\ No newline at end of file

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

@@ -3,7 +3,6 @@ package com.netease.mail.yanxuan.change.dal.meta.model.req;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import lombok.Data;
-
 import java.util.List;
 
 /**
@@ -14,6 +13,11 @@ import java.util.List;
 public class ChangeConfigReq {
 
     /**
+     * 主键ID 用户修改
+     */
+    private Long id;
+
+    /**
      * 变更主体
      */
     private Integer changeSubject;