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 | 373 +++++++++++++++++++++++++++++++----------------------
1 files changed, 219 insertions(+), 154 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 bdb28d7..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,203 +1,268 @@
package com.ycl.platform.service.impl;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+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.entity.YwUnit;
-import com.ycl.platform.domain.vo.RuleItemVO;
+import com.ycl.platform.domain.query.CheckTemplateQuery;
import com.ycl.platform.mapper.CheckTemplateMapper;
import com.ycl.platform.mapper.CheckTemplateRuleMapper;
-import com.ycl.platform.service.CheckTemplateService;
-import com.ycl.platform.service.YwUnitService;
+import com.ycl.platform.service.ICheckTemplateRuleService;
+import com.ycl.platform.service.ICheckTemplateService;
+import com.ycl.system.AjaxResult;
import com.ycl.system.Result;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.form.CheckTemplateForm;
-import com.ycl.platform.domain.vo.CheckTemplateVO;
-import com.ycl.platform.domain.query.CheckTemplateQuery;
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ycl.system.page.PageUtil;
-import com.ycl.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.security.core.context.SecurityContextHolder;
+import com.ycl.system.domain.SysJob;
+import com.ycl.system.entity.SysDept;
+import com.ycl.system.service.ISysDeptService;
+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.Assert;
-import java.util.ArrayList;
-import java.util.Objects;
+import org.springframework.util.CollectionUtils;
+import utils.DateUtils;
+import utils.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
-import lombok.RequiredArgsConstructor;
-import org.springframework.util.StringUtils;
/**
- * 鑰冩牳妯℃澘 鏈嶅姟瀹炵幇绫�
+ * 鑰冩牳妯℃澘Service涓氬姟灞傚鐞�
*
- * @author xp
- * @since 2024-03-06
+ * @author ruoyi
+ * @date 2024-04-01
*/
@Service
-@RequiredArgsConstructor
-public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements CheckTemplateService {
-
- private final CheckTemplateMapper checkTemplateMapper;
- private final CheckTemplateRuleMapper checkTemplateRuleMapper;
+public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateMapper, CheckTemplate> implements ICheckTemplateService {
@Autowired
- private YwUnitService unitService;
+ private CheckTemplateMapper checkTemplateMapper;
+ @Autowired
+ private ICheckTemplateRuleService templateRuleServicee;
+ @Autowired
+ private CheckTemplateRuleMapper checkTemplateRuleMapper;
+ @Autowired
+ private ISysJobService jobService;
+
/**
- * 娣诲姞
- * @param form
- * @return
+ * 鏌ヨ鑰冩牳妯℃澘
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 鑰冩牳妯℃澘
+ */
+ @Override
+ public CheckTemplateQuery selectCheckTemplateById(Integer id) {
+ CheckTemplate checkTemplate = checkTemplateMapper.selectCheckTemplateById(id);
+ CheckTemplateQuery checkTemplateQuery = new CheckTemplateQuery();
+ 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;
+ }
+
+ /**
+ * 鏌ヨ鑰冩牳妯℃澘鍒楄〃
+ *
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
+ * @return 鑰冩牳妯℃澘
+ */
+ @Override
+ public List<CheckTemplateQuery> selectCheckTemplateList(CheckTemplateQuery checkTemplateDTO) {
+ List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(checkTemplateDTO);
+ List<CheckTemplateQuery> checkTemplateList = new ArrayList<>();
+ //杞崲閮ㄩ棬id涓洪泦鍚�,杞崲alarmScore涓簊tring
+ for (CheckTemplate template : checkTemplates) {
+ 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 checkTemplateList;
+ }
+
+ /**
+ * 鏂板鑰冩牳妯℃澘
+ *
+ * @param checkTemplateDTO 鑰冩牳妯℃澘
+ * @return 缁撴灉
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result add(CheckTemplateForm form) {
- CheckTemplate entity = CheckTemplateForm.getEntityByForm(form, null);
- baseMapper.insert(entity);
- form.getRuleFormList().stream().forEach(rule -> {
- CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
- checkTemplateRule.setCheckTemplateId(entity.getId());
- checkTemplateRule.setCheckRuleId(rule.getRuleId());
- checkTemplateRule.setWeight(rule.getWeight());
- checkTemplateRuleMapper.insert(checkTemplateRule);
- });
- return Result.ok("娣诲姞鎴愬姛");
+ public int insertCheckTemplate(CheckTemplateQuery checkTemplateDTO) throws SchedulerException, TaskException {
+ String username = SecurityUtils.getUsername();
+ /** 鎻掑叆t_template */
+ CheckTemplate checkTemplate = new 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 form
- * @return
+ * 澶嶅埗鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result update(CheckTemplateForm form) {
-
- CheckTemplate entity = baseMapper.selectById(form.getId());
- // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- BeanUtils.copyProperties(form, entity);
- baseMapper.updateById(entity);
-
- // 鍏堝垹闄ゅ師鍏堢殑瀵瑰簲鍏崇郴
- new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
- .eq(CheckTemplateRule::getCheckTemplateId, form.getId())
- .remove();
- // 鍐嶉噸鏂版坊鍔�
- form.getRuleFormList().stream().forEach(rule -> {
- CheckTemplateRule checkTemplateRule = new CheckTemplateRule();
- checkTemplateRule.setCheckTemplateId(entity.getId());
- checkTemplateRule.setCheckRuleId(rule.getRuleId());
- checkTemplateRule.setWeight(rule.getWeight());
- checkTemplateRuleMapper.insert(checkTemplateRule);
- });
- return Result.ok("淇敼鎴愬姛");
+ 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;
}
/**
- * 鎵归噺鍒犻櫎
- * @param ids
- * @return
+ * 淇敼鑰冩牳妯℃澘
+ *
+ * @param checkTemplate 鑰冩牳妯℃澘
+ * @return 缁撴灉
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result remove(List<String> ids) {
- baseMapper.deleteBatchIds(ids);
- new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
- .in(CheckTemplateRule::getCheckTemplateId, ids)
- .remove();
- return Result.ok("鍒犻櫎鎴愬姛");
+ 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);
+
+ /** 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();
}
/**
- * id鍒犻櫎
- * @param id
- * @return
+ * 鍒犻櫎鑰冩牳妯℃澘淇℃伅
+ *
+ * @param id 鑰冩牳妯℃澘涓婚敭
+ * @return 缁撴灉
*/
@Override
- @Transactional(rollbackFor = Exception.class)
- public Result removeById(String id) {
- baseMapper.deleteById(id);
- new LambdaUpdateChainWrapper<>(checkTemplateRuleMapper)
- .eq(CheckTemplateRule::getCheckTemplateId, id)
- .remove();
- return Result.ok("鍒犻櫎鎴愬姛");
+ 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);
}
- /**
- * 鍒嗛〉鏌ヨ
- * @param query
- * @return
- */
@Override
- public Result page(CheckTemplateQuery query) {
- IPage<CheckTemplate> page = new LambdaQueryChainWrapper<>(baseMapper)
- .like(StringUtils.hasText(query.getTemplateName()), CheckTemplate::getTemplateName, query.getTemplateName())
- .eq(StringUtils.hasText(query.getStatus()), CheckTemplate::getStatus, query.getStatus())
- .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
- CheckTemplate::getCreateTime,
- DateUtils.getDayStart(query.getStart()),
- DateUtils.getDayEnd(query.getEnd()))
- .orderByDesc(CheckTemplate::getCreateTime)
- .page(PageUtil.getPage(query, CheckTemplate.class));
+ public Result pullList() {
+ List<CheckTemplate> checkTemplates = checkTemplateMapper.selectCheckTemplateList(new CheckTemplateQuery());
- List<CheckTemplateVO> vos = page.getRecords().stream()
- .map(
- entity -> CheckTemplateVO.getVoByEntity(entity, null)
- .setUnitName(unitService.getById(entity.getUnitId()).getUnitName())
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos).total(page.getTotal());
+ return Result.ok().data(checkTemplates);
}
- /**
- * 鏍规嵁id鏌ユ壘
- * @param id
- * @return
- */
- @Override
- public Result detail(String id) {
- CheckTemplate entity = baseMapper.selectById(id);
- Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
- CheckTemplateVO vo = CheckTemplateVO.getVoByEntity(entity, null);
-
- // 鏌ヨ�冩牳瑙勫垯
- List<CheckTemplateRule> ruleList = new LambdaQueryChainWrapper<>(checkTemplateRuleMapper)
- .eq(CheckTemplateRule::getCheckTemplateId, entity.getId())
- .list();
- List<RuleItemVO> ruleVOS = ruleList.stream().map(rule -> {
- RuleItemVO ruleItemVO = new RuleItemVO();
- ruleItemVO.setRuleId(rule.getCheckRuleId());
- ruleItemVO.setWeight(rule.getWeight());
- return ruleItemVO;
- }).collect(Collectors.toList());
- vo.setRuleFormList(ruleVOS);
-
- return Result.ok().data(vo);
+ 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);
+ }
}
- /**
- * 鍒楄〃
- * @return
- */
- @Override
- public Result all() {
- List<CheckTemplate> entities = baseMapper.selectList(null);
- List<BaseSelect> vos = entities.stream()
- .map(
- entity -> {
- BaseSelect baseSelect = new BaseSelect();
- baseSelect.setId(entity.getId());
- baseSelect.setValue(entity.getTemplateName());
- return baseSelect;
- }
- )
- .collect(Collectors.toList());
- return Result.ok().data(vos);
+ 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