From ecda68f9ffbd4e0f01d3939550906f670b1e0482 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 21 六月 2024 15:56:28 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 14 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index 30012c2..7ec6671 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -1,9 +1,20 @@
package com.smartor.service.impl;
+import com.alibaba.fastjson2.JSON;
+import com.google.gson.Gson;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DtoConversionUtils;
+import com.smartor.domain.PatTaskRelevance;
+import com.smartor.domain.SvyTask;
import com.smartor.domain.SvyTaskSingle;
+import com.smartor.domain.SvyTaskVO;
import com.smartor.mapper.SvyTaskSingleMapper;
+import com.smartor.service.ISvyTaskService;
import com.smartor.service.ISvyTaskSingleService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,11 +26,14 @@
* @author ruoyi
* @date 2024-06-12
*/
+@Slf4j
@Service
-public class SvyTaskSingleServiceImpl implements ISvyTaskSingleService
-{
+public class SvyTaskSingleServiceImpl implements ISvyTaskSingleService {
@Autowired
private SvyTaskSingleMapper svyTaskSingleMapper;
+
+ @Autowired
+ private ISvyTaskService svyTaskService;
/**
* 鏌ヨ鍗曚竴浠诲姟锛堥棶鍗凤級
@@ -28,8 +42,7 @@
* @return 鍗曚竴浠诲姟锛堥棶鍗凤級
*/
@Override
- public SvyTaskSingle selectSvyTaskSingleById(Long id)
- {
+ public SvyTaskSingle selectSvyTaskSingleById(Long id) {
return svyTaskSingleMapper.selectSvyTaskSingleById(id);
}
@@ -40,8 +53,7 @@
* @return 鍗曚竴浠诲姟锛堥棶鍗凤級
*/
@Override
- public List<SvyTaskSingle> selectSvyTaskSingleList(SvyTaskSingle svyTaskSingle)
- {
+ public List<SvyTaskSingle> selectSvyTaskSingleList(SvyTaskSingle svyTaskSingle) {
return svyTaskSingleMapper.selectSvyTaskSingleList(svyTaskSingle);
}
@@ -52,8 +64,7 @@
* @return 缁撴灉
*/
@Override
- public int insertSvyTaskSingle(SvyTaskSingle svyTaskSingle)
- {
+ public int insertSvyTaskSingle(SvyTaskSingle svyTaskSingle) {
svyTaskSingle.setCreateTime(DateUtils.getNowDate());
return svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
}
@@ -65,8 +76,7 @@
* @return 缁撴灉
*/
@Override
- public int updateSvyTaskSingle(SvyTaskSingle svyTaskSingle)
- {
+ public int updateSvyTaskSingle(SvyTaskSingle svyTaskSingle) {
svyTaskSingle.setUpdateTime(DateUtils.getNowDate());
return svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
}
@@ -78,8 +88,7 @@
* @return 缁撴灉
*/
@Override
- public int deleteSvyTaskSingleByIds(Long[] ids)
- {
+ public int deleteSvyTaskSingleByIds(Long[] ids) {
return svyTaskSingleMapper.deleteSvyTaskSingleByIds(ids);
}
@@ -90,8 +99,84 @@
* @return 缁撴灉
*/
@Override
- public int deleteSvyTaskSingleById(Long id)
- {
+ public int deleteSvyTaskSingleById(Long id) {
return svyTaskSingleMapper.deleteSvyTaskSingleById(id);
}
+
+ @Override
+ public int insertOrUpdateSvyTask(SvyTaskVO svyTaskVO) {
+ if (ObjectUtils.isEmpty(svyTaskVO)) {
+ log.info("闂嵎浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+ throw new BaseException("闂嵎浠诲姟鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�");
+ }
+ Integer integer = 1;
+ SvyTask svyTask = DtoConversionUtils.sourceToTarget(svyTaskVO, SvyTask.class);
+ svyTask.setTextParam(JSON.toJSONString(svyTaskVO.getTextParamMap()));
+ if (svyTaskVO.getIsoperation() != null && svyTaskVO.getIsoperation() == 1) {
+ //寰�浠诲姟琛ㄤ腑锛屾柊澧炰换鍔�
+ if (ObjectUtils.isNotEmpty(svyTaskVO.getSendTimeSlot()))
+ svyTask.setSendTimeSlot(JSON.toJSONString(svyTaskVO.getSendTimeSlot()));
+ if (svyTask.getSendState() == null) svyTask.setSendState("1");
+ svyTask.setTemplateid(svyTaskVO.getLibtemplateid());
+ svyTaskService.insertSvyTask(svyTask);
+
+ //灏嗕换鍔′俊鎭斁鍒版湇鍔¤〃涓�
+ SvyTaskSingle svyTaskSingle = DtoConversionUtils.sourceToTarget(svyTaskVO, SvyTaskSingle.class);
+ svyTaskSingle.setTaskid(svyTask.getTaskid());
+ //鏂板
+ if (CollectionUtils.isNotEmpty(svyTaskVO.getPatTaskRelevances())) {
+ for (PatTaskRelevance patTaskRelevance : svyTaskVO.getPatTaskRelevances()) {
+ //灏嗕换鍔′俊鎭柊澧炲埌闅忚鏈嶅姟琛ㄤ腑
+ svyTaskSingle.setSendname(patTaskRelevance.getName());
+ svyTaskSingle.setAge(patTaskRelevance.getAge());
+ svyTaskSingle.setSfzh(patTaskRelevance.getSfzh());
+ svyTaskSingle.setPhone(patTaskRelevance.getPhone());
+ svyTaskSingle.setAddr(patTaskRelevance.getAddr());
+ svyTaskSingle.setPatid(patTaskRelevance.getPatid());
+ svyTaskSingle.setCreateTime(DateUtils.getNowDate());
+ svyTaskSingle.setCreateTime(DateUtils.getNowDate());
+ svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
+ integer = svyTaskSingle.getId().intValue();
+ }
+ }
+
+ } else if (svyTaskVO.getIsoperation() != null && svyTaskVO.getIsoperation() == 2) {
+ //浠诲姟淇敼
+ if (ObjectUtils.isNotEmpty(svyTaskVO.getSendTimeSlot()))
+ svyTask.setSendTimeSlot(JSON.toJSONString(svyTaskVO.getSendTimeSlot()));
+ //淇敼鎿嶄綔锛岄渶瑕佸皢stopState鐘舵��+1
+ SvyTask svyTask1 = svyTaskService.selectSvyTaskByTaskid(svyTaskVO.getTaskid());
+ svyTask.setStopState(svyTask1.getStopState() + 1);
+ svyTask.setTemplateid(svyTaskVO.getLibtemplateid());
+ svyTaskService.updateSvyTask(svyTask);
+
+ if (CollectionUtils.isNotEmpty(svyTaskVO.getPatTaskRelevances())) {
+ for (PatTaskRelevance patTaskRelevance : svyTaskVO.getPatTaskRelevances()) {
+
+ SvyTaskSingle svyTaskSingle = DtoConversionUtils.sourceToTarget(svyTaskVO, SvyTaskSingle.class);
+ svyTaskSingle.setSendname(patTaskRelevance.getName());
+ svyTaskSingle.setAge(patTaskRelevance.getAge());
+ svyTaskSingle.setSfzh(patTaskRelevance.getSfzh());
+ svyTaskSingle.setPhone(patTaskRelevance.getPhone());
+ svyTaskSingle.setAddr(patTaskRelevance.getAddr());
+ svyTaskSingle.setPatid(patTaskRelevance.getPatid());
+ svyTaskSingle.setCreateTime(DateUtils.getNowDate());
+ svyTaskSingle.setTextParam(new Gson().toJson(svyTaskVO.getTextParamMap()));
+ if (patTaskRelevance.getIsoperation() != null) {
+ if (patTaskRelevance.getIsoperation() == 2)
+ svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
+ if (patTaskRelevance.getIsoperation() == 1)
+ svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
+ if (patTaskRelevance.getIsoperation() == 3)
+ // 閫氳繃taskid鍜宲atid鍘诲垹闄よ鏉℃暟鎹�
+ svyTaskSingleMapper.deleteSvyTaskcallByCondition(svyTaskVO.getTaskid(), patTaskRelevance.getPatid());
+ }
+ integer = svyTaskSingle.getTaskid().intValue();
+ }
+ }
+ }
+
+
+ return integer;
+ }
}
--
Gitblit v1.9.3