Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-base/src/main/java/com/simuwang/base/mapper/EmailTemplateInfoMapper.java

@@ -21,4 +21,6 @@ public interface EmailTemplateInfoMapper {
     void updateTemplateInfo(EmailTemplateInfoDO emailDeletionInfoDO);
 
     EmailTemplateInfoDO searchTemplateById(@Param("id") Integer id);
+
+    EmailTemplateInfoDO searchTemplateByName(String name);
 }

service-base/src/main/resources/mapper/EmailTemplateInfoMapper.xml

@@ -64,6 +64,10 @@
         select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
         from PPW_EMAIL.email_template_info where isvalid=1 and id=#{id}
     </select>
+    <select id="searchTemplateByName" resultType="com.simuwang.base.pojo.dos.EmailTemplateInfoDO">
+        select id,name,type,direction,start_index,end_index,description,status,isvalid,creatorid,createtime,updaterid,updatetime
+        from PPW_EMAIL.email_template_info where isvalid=1 and name=#{name} limit 1
+    </select>
 
 
 </mapper>

service-manage/src/main/java/com/simuwang/manage/api/template/TemplateController.java

@@ -75,9 +75,16 @@ public class TemplateController {
      */
     @SystemLog(value = "保存模版信息")
     @RequestMapping("save-template-list")
-    public boolean saveTemplateList(@RequestBody SaveTemplateInfoVO saveTemplateInfoVO){
+    public ResultVo saveTemplateList(@RequestBody SaveTemplateInfoVO saveTemplateInfoVO){
+        ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
+        if(!emailTemplateInfoService.checkConfigKeyUnique(saveTemplateInfoVO)){
+            vo.setMsg("已存在相同的模版配置名称，不能重复添加");
+            vo.setData(false);
+            return vo;
+        }
         emailTemplateInfoService.saveTemplateList(saveTemplateInfoVO);
-        return true;
+        vo.setData(true);
+        return vo;
     }
 
     /**

service-manage/src/main/java/com/simuwang/manage/service/EmailTemplateInfoService.java

@@ -25,4 +25,6 @@ public interface EmailTemplateInfoService {
     void controlTemplateConfig(StatusVO statusVO);
 
     SaveTemplateInfoVO searchTemplateInfo(Integer id);
+
+    boolean checkConfigKeyUnique(SaveTemplateInfoVO saveTemplateInfoVO);
 }

service-manage/src/main/java/com/simuwang/manage/service/impl/EmailTemplateInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.simuwang.manage.service.impl;
 
+import com.simuwang.base.common.conts.UserConstants;
 import com.simuwang.base.common.support.MybatisPage;
 import com.simuwang.base.common.util.DateUtils;
 import com.simuwang.base.common.util.StringUtil;
@@ -9,6 +10,7 @@ import com.simuwang.base.mapper.EmailTemplateInfoMapper;
 import com.simuwang.base.pojo.dos.EmailTemplateApplicationRuleDO;
 import com.simuwang.base.pojo.dos.EmailTemplateDataRuleDO;
 import com.simuwang.base.pojo.dos.EmailTemplateInfoDO;
+import com.simuwang.base.pojo.dos.SysConfigDO;
 import com.simuwang.base.pojo.dto.query.EmailTemplateInfoPageQuery;
 import com.simuwang.base.pojo.vo.*;
 import com.simuwang.manage.service.EmailTemplateInfoService;
@@ -105,28 +107,24 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
                     emailTemplateDataRuleMapper.batchInsert(addList);
                 }
                 if(editList.size() > 0){
-                    emailTemplateDataRuleMapper.batchUpdate(editList.subList(0,1));
+                    emailTemplateDataRuleMapper.batchUpdate(editList);
                 }
             }
             List<EmailTemplateApplicationRuleVO> emailTemplateApplicationRuleVOList = saveTemplateInfoVO.getEmailTemplateApplicationRuleVOList();
             if(emailTemplateApplicationRuleVOList.size() > 0){
                 emailTemplateApplicationRuleVOList.forEach(e -> e.setTemplateId(templateId));
+                List<Integer> templateIdList = new ArrayList<>();
+                templateIdList.add(templateId);
+                Integer userId = UserUtils.getLoginUser().getUserId();
+                emailTemplateApplicationRuleMapper.deleteByTemplateId(templateIdList,userId);
                 List<EmailTemplateApplicationRuleDO> addList = new ArrayList<>();
-                List<EmailTemplateApplicationRuleDO> editList = new ArrayList<>();
                 for(EmailTemplateApplicationRuleVO applicationRuleVO : emailTemplateApplicationRuleVOList){
                     EmailTemplateApplicationRuleDO applicationRuleDO = toEmailTemplateApplicationRuleDO(applicationRuleVO);
-                    if(StringUtil.isNull(applicationRuleDO.getId())){
-                        addList.add(applicationRuleDO);
-                    }else{
-                        editList.add(applicationRuleDO);
-                    }
+                    addList.add(applicationRuleDO);
                 }
                 if(addList.size() > 0){
                     emailTemplateApplicationRuleMapper.batchInsert(addList);
                 }
-                if(editList.size() > 0){
-                    emailTemplateApplicationRuleMapper.batchUpdate(editList);
-                }
             }
 
         }
@@ -164,6 +162,18 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
         return vo;
     }
 
+    @Override
+    public boolean checkConfigKeyUnique(SaveTemplateInfoVO saveTemplateInfoVO) {
+        EmailTemplateInfoVO infoVO = saveTemplateInfoVO.getEmailTemplateInfoVO();
+        Integer id = StringUtil.isNull(infoVO.getId()) ? -1 : infoVO.getId();
+        EmailTemplateInfoDO info = emailTemplateInfoMapper.searchTemplateByName(infoVO.getName());
+        if (StringUtil.isNotNull(info) && info.getId().intValue() != id.intValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
     private EmailTemplateApplicationRuleDO toEmailTemplateApplicationRuleDO(EmailTemplateApplicationRuleVO applicationRuleVO) {
         Integer userId = UserUtils.getLoginUser().getUserId();
         EmailTemplateApplicationRuleDO applicationRuleDO = new EmailTemplateApplicationRuleDO();
@@ -177,10 +187,8 @@ public class EmailTemplateInfoServiceImpl implements EmailTemplateInfoService {
         applicationRuleDO.setType(applicationRuleVO.getType());
         applicationRuleDO.setUpdaterId(userId);
         applicationRuleDO.setUpdateTime(DateUtils.getNowDate());
-        if(StringUtil.isNull(applicationRuleDO.getId())){
-            applicationRuleDO.setCreateTime(DateUtils.getNowDate());
-            applicationRuleDO.setCreatorId(userId);
-        }
+        applicationRuleDO.setCreateTime(DateUtils.getNowDate());
+        applicationRuleDO.setCreatorId(userId);
         return applicationRuleDO;
     }
 

service-manage/src/main/java/com/simuwang/manage/service/impl/system/SysConfigServiceImpl.java

@@ -68,7 +68,7 @@ public class SysConfigServiceImpl implements SysConfigService {
         Integer userId = UserUtils.getLoginUser().getUserId();
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS);
         vo.setData(true);
-        if(sysConfigVO.getConfigId() == null && !checkConfigKeyUnique(sysConfigVO)){
+        if(!checkConfigKeyUnique(sysConfigVO)){
             vo.setMsg("已存在相同的参数配置信息，无须重复添加");
             vo.setData(false);
             return vo;