From fea22e82e7e49691f6e0c20a29b228d0ab3173e9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 29 十月 2025 17:08:38 +0800
Subject: [PATCH] 修改问题
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java | 227 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 176 insertions(+), 51 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
index e05625e..1deba5d 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckTemplateServiceImpl.java
@@ -1,25 +1,37 @@
package com.ycl.platform.service.impl;
+import com.alibaba.fastjson2.JSONArray;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.exception.job.TaskException;
import com.ycl.platform.base.BaseSelect;
import com.ycl.platform.domain.entity.CheckTemplate;
+import com.ycl.platform.domain.entity.CheckTemplateRule;
import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.platform.mapper.CheckTemplateMapper;
+import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.service.ICheckTemplateRuleService;
import com.ycl.platform.service.ICheckTemplateService;
+import com.ycl.system.AjaxResult;
import com.ycl.system.Result;
+import com.ycl.system.domain.SysJob;
import com.ycl.system.entity.SysDept;
import com.ycl.system.service.ISysDeptService;
-import io.jsonwebtoken.lang.Collections;
+import com.ycl.system.service.ISysJobService;
+import com.ycl.utils.SecurityUtils;
+import constant.CheckConstants;
+import org.quartz.SchedulerException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import utils.DateUtils;
import utils.StringUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -29,11 +41,15 @@
* @date 2024-04-01
*/
@Service
-public class CheckTemplateServiceImpl implements ICheckTemplateService {
+public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements ICheckTemplateService {
@Autowired
private CheckTemplateMapper checkTemplateMapper;
@Autowired
- private ISysDeptService deptService;
+ private ICheckTemplateRuleService templateRuleServicee;
+ @Autowired
+ private CheckTemplateRuleMapper checkTemplateRuleMapper;
+ @Autowired
+ private ISysJobService jobService;
/**
* 鏌ヨ鑰冩牳妯℃澘
@@ -42,16 +58,25 @@
* @return 鑰冩牳妯℃澘
*/
@Override
- public CheckTemplateQuery selectCheckTemplateById(Long id) {
+ public CheckTemplateQuery selectCheckTemplateById(Integer id) {
CheckTemplate checkTemplate = checkTemplateMapper.selectCheckTemplateById(id);
CheckTemplateQuery checkTemplateQuery = new CheckTemplateQuery();
- BeanUtils.copyProperties(checkTemplate,checkTemplateQuery);
- String deptId = checkTemplate.getDeptId();
- String deptIdStr = deptId.substring(1, deptId.length() - 1);
- List<Integer> deptIds = Arrays.stream(deptIdStr.split(","))
- .mapToInt(Integer::parseInt)
- .boxed().collect(Collectors.toList());
- checkTemplateQuery.setDeptId(deptIds);
+ BeanUtils.copyProperties(checkTemplate, checkTemplateQuery);
+ List<Integer> deptIds = JSONArray.parseArray(checkTemplate.getDeptId(), Integer.class);
+ checkTemplateQuery.setDeptId(deptIds)
+ .setAdjustCoefficient(checkTemplate.getAdjustCoefficient() + "")
+ .setAlarmScore(checkTemplate.getAlarmScore() + "");
+ //鏌ヨ瑙勫垯鏉冮噸
+ List<CheckTemplateRule> templateRuleList = checkTemplateRuleMapper.selectListByTemplateId(checkTemplate.getId());
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (CheckTemplateRule checkTemplateRule : templateRuleList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("ruleId", checkTemplateRule.getCheckRuleId());
+ map.put("weight", checkTemplateRule.getWeight());
+ list.add(map);
+ }
+ checkTemplateQuery.setRuleFormList(list);
+
return checkTemplateQuery;
}
@@ -62,27 +87,20 @@
* @return 鑰冩牳妯℃澘
*/
@Override
- public List<CheckTemplate> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO) {
+ public List<CheckTemplateQuery> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO) {
List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(checkTemplateDTO);
- //閮ㄩ棬鍖哄煙涓嬫媺鍒楄〃
- Result all = deptService.pullList();
- List<BaseSelect> data = (List<BaseSelect>) all.get("data");
- //缈昏瘧閮ㄩ棬id
+ List<CheckTemplateQuery> checkTemplateList = new ArrayList<>();
+ //杞崲閮ㄩ棬id涓洪泦鍚�,杞崲alarmScore涓簊tring
for (CheckTemplate template : checkTemplates) {
- if(template.getDeptId() == null)continue;
- String[] deptIds = template.getDeptId().replace("[", "").replace("]", "").split(",");
- List<String> deptName = new ArrayList<>();
- for (String deptId : deptIds) {
- List<String> deptStr = data.stream()
- .filter(baseSelect -> baseSelect.getId().equals(Integer.parseInt(deptId)))
- .map(BaseSelect::getValue)
- .collect(Collectors.toList());
- deptName.addAll(deptStr);
- }
- template.setDeptId(StringUtils.join(deptName,","));
+ List<Integer> deptIds = JSONArray.parseArray(template.getDeptId(), Integer.class);
+ CheckTemplateQuery checkTemplateQuery = new CheckTemplateQuery();
+ BeanUtils.copyProperties(template, checkTemplateQuery);
+ checkTemplateQuery.setDeptId(deptIds)
+ .setAdjustCoefficient(template.getAdjustCoefficient() + "");
+ checkTemplateList.add(checkTemplateQuery);
}
- return checkTemplates;
+ return checkTemplateList;
}
/**
@@ -92,12 +110,61 @@
* @return 缁撴灉
*/
@Override
- public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO) {
- checkTemplateDTO.setCreateTime(DateUtils.getNowDate());
+ @Transactional(rollbackFor = Exception.class)
+ public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ String username = SecurityUtils.getUsername();
+ /** 鎻掑叆t_template */
CheckTemplate checkTemplate = new CheckTemplate();
- BeanUtils.copyProperties(checkTemplateDTO,checkTemplate);
- checkTemplate.setDeptId(checkTemplateDTO.getDeptId().toString().replaceAll(" ",""));
- return checkTemplateMapper.insertCheckTemplate(checkTemplate);
+ BeanUtils.copyProperties(checkTemplateDTO, checkTemplate);
+ //浠庡皬鍒板ぇ鎺掑簭
+ List<Integer> deptId = checkTemplateDTO.getDeptId();
+ Collections.sort(deptId);
+ Date nowDate = DateUtils.getNowDate();
+ checkTemplate.setDeptId(JSONArray.toJSONString(deptId))
+ .setUpdateUserName(username)
+ .setCreateUserName(username)
+ .setAdjustCoefficient(new BigDecimal(checkTemplateDTO.getAdjustCoefficient() + ""))
+ //涓嶅～鎶ヨ鍒嗘暟---->闆跺垎---->涓嶆姤璀�
+ .setAlarmScore(new BigDecimal(checkTemplateDTO.getAlarmScore() == null ? "" : checkTemplateDTO.getAlarmScore()));
+ int i = checkTemplateMapper.insertCheckTemplate(checkTemplate);
+
+ //鏂板瀹氭椂浠诲姟锛岀姸鎬佸悓妯℃澘,鐒跺悗璧嬪�糺obId缁檛emplate
+ SysJob sysJob = addJob(checkTemplateDTO.setId(checkTemplate.getId()));
+ checkTemplate.setJobId(Integer.parseInt(sysJob.getJobId() + ""));
+ checkTemplateMapper.updateCheckTemplate(checkTemplate);
+
+ /** t_template_rule鏂板鏉冮噸 */
+ insertTemlpateRule(checkTemplateDTO, checkTemplate);
+
+ return i;
+ }
+
+ /**
+ * 澶嶅埗鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int copyCheckTemplate(CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ //鎻掑叆妯℃澘琛�
+ CheckTemplate checkTemplate = checkTemplateMapper.selectCheckTemplateById(checkTemplateDTO.getId());
+ String username = SecurityUtils.getUsername();
+ checkTemplate.setUpdateUserName(username)
+ .setCreateUserName(username)
+ .setStatus(CheckConstants.Status_Stop)
+ .setId(null);
+ int i = checkTemplateMapper.insertCheckTemplate(checkTemplate);
+ //鎻掑叆template_rule琛�
+ List<CheckTemplateRule> templateRuleList = checkTemplateRuleMapper.selectListByTemplateId(checkTemplateDTO.getId());
+ templateRuleList.forEach(checkTemplateRule -> checkTemplateRule.setCheckTemplateId(checkTemplate.getId()).setId(null));
+ templateRuleServicee.saveBatch(templateRuleList);
+ //鏂板瀹氭椂浠诲姟锛岀姸鎬佸悓妯℃澘,鐒跺悗璧嬪�糺obId缁檛emplate
+ SysJob sysJob = addJob(checkTemplateDTO.setId(checkTemplate.getId()));
+ checkTemplate.setJobId(Integer.parseInt(sysJob.getJobId() + ""));
+ checkTemplateMapper.updateCheckTemplate(checkTemplate);
+ return i;
}
/**
@@ -107,20 +174,29 @@
* @return 缁撴灉
*/
@Override
- public int updateCheckTemplate(CheckTemplate checkTemplate) {
- checkTemplate.setUpdateTime(DateUtils.getNowDate());
- return checkTemplateMapper.updateCheckTemplate(checkTemplate);
- }
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult updateCheckTemplate(CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ CheckTemplate checkTemplate = new CheckTemplate();
+ BeanUtils.copyProperties(checkTemplateDTO, checkTemplate);
+ checkTemplate.setUpdateUserName(SecurityUtils.getUsername());
+ List<Integer> deptId = checkTemplateDTO.getDeptId();
+ Collections.sort(deptId);
+ checkTemplate.setDeptId(JSONArray.toJSONString(deptId))
+ .setAdjustCoefficient(new BigDecimal(checkTemplateDTO.getAdjustCoefficient() + ""));
+ checkTemplateMapper.updateCheckTemplate(checkTemplate);
- /**
- * 鎵归噺鍒犻櫎鑰冩牳妯℃澘
- *
- * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deleteCheckTemplateByIds(Long[] ids) {
- return checkTemplateMapper.deleteCheckTemplateByIds(ids);
+ /** t_template_rule淇敼鏉冮噸 */
+ if (!CollectionUtils.isEmpty(checkTemplateDTO.getRuleFormList())) {
+ //鍏堝垹闄ゅ師鏁版嵁
+ checkTemplateRuleMapper.deleteByTemplateId(checkTemplate.getId());
+ //鎻掑叆鏂拌鍒欐暟鎹�
+ insertTemlpateRule(checkTemplateDTO, checkTemplate);
+ }
+ //璋冩暣job琛ㄩ噷鐨勭姸鎬�
+ SysJob job = jobService.selectJobById(Long.valueOf(checkTemplateDTO.getJobId()));
+ job.setStatus(checkTemplateDTO.getStatus());
+ jobService.updateJob(job);
+ return AjaxResult.success();
}
/**
@@ -130,7 +206,15 @@
* @return 缁撴灉
*/
@Override
- public int deleteCheckTemplateById(Long id) {
+ public int deleteCheckTemplateById(Integer id) throws SchedulerException {
+ CheckTemplate checkTemplate = checkTemplateMapper.selectCheckTemplateById(id);
+ //鍒犻櫎瀹氭椂浠诲姟
+ SysJob job = new SysJob();
+ if (checkTemplate.getJobId() != null) {
+ job.setJobId(Long.valueOf(checkTemplate.getJobId()));
+ job.setJobGroup("CHECK");
+ jobService.deleteJob(job);
+ }
return checkTemplateMapper.deleteCheckTemplateById(id);
}
@@ -140,4 +224,45 @@
return Result.ok().data(checkTemplates);
}
+
+
+ private void insertTemlpateRule(CheckTemplateQuery checkTemplateDTO, CheckTemplate checkTemplate) {
+ List<Map<String, Object>> ruleFormList = checkTemplateDTO.getRuleFormList();
+ if (!CollectionUtils.isEmpty(ruleFormList)) {
+ List<CheckTemplateRule> templateRuleList = new ArrayList<>();
+ for (Map<String, Object> map : ruleFormList) {
+ templateRuleList.add(new CheckTemplateRule()
+ .setCheckRuleId((Integer) map.get("ruleId"))
+ .setCheckTemplateId(checkTemplate.getId())
+ .setWeight(new BigDecimal(map.get("weight").toString())));
+ }
+ //鎵归噺鎻掑叆鏁版嵁搴�
+ templateRuleServicee.saveBatch(templateRuleList);
+ }
+ }
+
+ private SysJob addJob(CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ SysJob job = new SysJob();
+ job.setCreateBy(SecurityUtils.getLoginUser().getUsername());
+ //璋冪敤鏂规硶鍚�
+ job.setInvokeTarget("checkScoreTask.executeTemplate(" + checkTemplateDTO.getId() + ")");
+ job.setConcurrent("1");
+ job.setStatus(checkTemplateDTO.getStatus());
+ job.setJobGroup("CHECK");
+ job.setCronExpression("0 0 8 * * ?");
+ job.setJobName(checkTemplateDTO.getTemplateName());
+ int i = jobService.insertJob(job);
+ return job;
+ }
+
+ // /**
+// * 鎵归噺鍒犻櫎鑰冩牳妯℃澘
+// *
+// * @param ids 闇�瑕佸垹闄ょ殑鑰冩牳妯℃澘涓婚敭
+// * @return 缁撴灉
+// */
+// @Override
+// public int deleteCheckTemplateByIds(Integer[] ids) {
+// return checkTemplateMapper.deleteCheckTemplateByIds(ids);
+// }
}
--
Gitblit v1.8.0