From c466328ae0389f01ba2413fd75182ba799dba8f6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 20 三月 2024 15:11:46 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java | 101 ++++++++++++++++++++++++++------------------------
1 files changed, 52 insertions(+), 49 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java
index e0e8366..bf9143d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeTaskServiceImpl.java
@@ -1,6 +1,6 @@
package com.smartor.service.impl;
-import com.ruoyi.common.enums.SendTypeEnum;
+import com.google.gson.Gson;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
@@ -8,7 +8,7 @@
import com.smartor.domain.*;
import com.smartor.mapper.HeTaskMapper;
import com.smartor.mapper.PatArchiveMapper;
-import com.smartor.mapper.PatHetaskRelevanceMapper;
+import com.smartor.mapper.PatTaskRelevanceMapper;
import com.smartor.service.IHeTaskService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -19,8 +19,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
/**
* 瀹ｆ暀浠诲姟Service涓氬姟灞傚鐞�
@@ -44,7 +42,7 @@
private HeLibraryServiceImpl heLibraryService;
@Autowired
- private PatHetaskRelevanceMapper patHetaskRelevanceMapper;
+ private PatTaskRelevanceMapper PatTaskRelevanceMapper;
@Autowired
private SendService sendService;
@@ -85,19 +83,19 @@
/**
* 鏌ヨ瀹ｆ暀浠诲姟鍒楄〃
*
- * @param patHetaskRelevanceVO 瀹ｆ暀浠诲姟
+ * @param patTaskRelevanceVO 瀹ｆ暀浠诲姟
* @return 瀹ｆ暀浠诲姟
*/
@Override
- public List<PatHetaskRelevanceVO> selectHeTaskList(PatHetaskRelevanceVO patHetaskRelevanceVO) {
- PatHetaskRelevance patHetaskRelevance = new PatHetaskRelevance();
- List<PatHetaskRelevance> patHetaskRelevances = patHetaskRelevanceMapper.selectPatHetaskRelevanceList(patHetaskRelevance);
- List<PatHetaskRelevanceVO> patHetaskRelevanceVOS = DtoConversionUtils.sourceToTarget(patHetaskRelevances, PatHetaskRelevanceVO.class);
- for (PatHetaskRelevanceVO patHetaskRelevanceVO1 : patHetaskRelevanceVOS) {
- HeTask heTask1 = heTaskMapper.selectHeTaskById(patHetaskRelevanceVO1.getHeTaskId());
- patHetaskRelevanceVO1.setHeTask(heTask1);
+ public List<PatTaskRelevanceVO> selectHeTaskList(PatTaskRelevanceVO patTaskRelevanceVO) {
+ PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
+ List<PatTaskRelevance> patTaskRelevances = PatTaskRelevanceMapper.selectPatTaskRelevanceList(patTaskRelevance);
+ List<PatTaskRelevanceVO> PatTaskRelevanceVOS = DtoConversionUtils.sourceToTarget(patTaskRelevances, PatTaskRelevanceVO.class);
+ for (PatTaskRelevanceVO patTaskRelevanceVO1 : PatTaskRelevanceVOS) {
+ HeTask heTask1 = heTaskMapper.selectHeTaskById(patTaskRelevanceVO1.getTaskId());
+ patTaskRelevanceVO1.setHeTask(heTask1);
}
- return patHetaskRelevanceVOS;
+ return PatTaskRelevanceVOS;
}
/**
@@ -115,11 +113,11 @@
// if (heTaskVO.getIsSend() == 2) {
// //鍙戦�佹柟寮�
// String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue());
-// for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
+// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
// //寮�濮嬪彂閫�
// SendMagParam sendMagParam = new SendMagParam();
// sendMagParam.setType(sendtype);
-// sendMagParam.setPhone(patHetaskRelevance.getPhone());
+// sendMagParam.setPhone(PatTaskRelevance.getPhone());
// //杩欓噷鐨勬ā鏉縄D涓嶇‘瀹氾紝鍏堣繖鏍峰啓
// sendMagParam.setTmpCode("SMS_461860582");
// sendMagParam.setContent("Test鍙戦�佹暟鎹�");
@@ -129,7 +127,7 @@
// }
//
// //蹇呴』鍏ㄩ儴鎴愬姛锛屾墠鑳戒慨鏀瑰彂閫佺姸鎬�
-// if (heTaskVO.getPatHetaskRelevances().size() == integer) {
+// if (heTaskVO.getPatTaskRelevances().size() == integer) {
// //濡傛灉鍙戦�佹垚鍔�
// heTaskVO.setSendState(1L);
// }
@@ -141,10 +139,10 @@
//
// //灏嗕换鍔′笌鎮ｈ�呭叧鑱�
// Integer i = null;
-// if (ObjectUtils.isNotEmpty(heTaskVO.getPatHetaskRelevances())) {
-// for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
-// patHetaskRelevance.setHeTaskId(heTask.getId());
-// i = patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
+// if (ObjectUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) {
+// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
+// PatTaskRelevance.setHeTaskId(heTask.getId());
+// i = PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
// }
//
// }
@@ -156,11 +154,11 @@
// @Override
// public void run() {
// Integer integer = 0;
-// for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
+// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
// String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue());
// SendMagParam sendMagParam = new SendMagParam();
// sendMagParam.setType(sendtype);
-// sendMagParam.setPhone(patHetaskRelevance.getPhone());
+// sendMagParam.setPhone(PatTaskRelevance.getPhone());
// //杩欓噷鐨勬ā鏉縄D涓嶇‘瀹氾紝鍏堣繖鏍峰啓
// sendMagParam.setTmpCode("SMS_461860582");
// sendMagParam.setContent("Test鍙戦�佹暟鎹�");
@@ -170,7 +168,7 @@
// }
// }
// //蹇呴』鍏ㄩ儴鎴愬姛锛屾墠鑳戒慨鏀瑰彂閫佺姸鎬�
-// if (heTaskVO.getPatHetaskRelevances().size() == integer) {
+// if (heTaskVO.getPatTaskRelevances().size() == integer) {
// //濡傛灉鍙戦�佹垚鍔�
// heTaskVO.setSendState(1L);
// }
@@ -178,10 +176,10 @@
// heTask.setCreateTime(DateUtils.getNowDate());
// heTaskMapper.insertHeTask(heTask);
//
-// if (ObjectUtils.isNotEmpty(heTaskVO.getPatHetaskRelevances())) {
-// for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
-// patHetaskRelevance.setHeTaskId(heTask.getId());
-// patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
+// if (ObjectUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) {
+// for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
+// PatTaskRelevance.setHeTaskId(heTask.getId());
+// PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
// }
//
// }
@@ -210,13 +208,18 @@
//灏嗕换鍔′俊鎭柊澧炲埌瀹ｆ暀浠诲姟琛ㄤ腑
HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class);
+
heTask.setCreateTime(DateUtils.getNowDate());
+ heTask.setPreachform(new Gson().toJson(heTaskVO.getPreachform()));
+ heTask.setTextParam(new Gson().toJson(heTaskVO.getTextParam()));
heTaskMapper.insertHeTask(heTask);
integer = heTask.getId().intValue();
//鏂板
- for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
- patHetaskRelevance.setHeTaskId(heTask.getId());
- patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
+ if (CollectionUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) {
+ for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
+ PatTaskRelevance.setTaskId(heTask.getId());
+ PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
+ }
}
} else if (heTaskVO.getIsoperation() != null && heTaskVO.getIsoperation() == 2) {
@@ -224,14 +227,14 @@
heTask.setUpdateTime(DateUtils.getNowDate());
heTaskMapper.updateHeTask(heTask);
//鏂板銆佸垹闄ゃ�佷慨鏀规偅鑰呬俊鎭�
- for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
- if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 1) {
- patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
- } else if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 2) {
- patHetaskRelevance.setHeTaskId(heTask.getId());
- patHetaskRelevanceMapper.updatePatHetaskRelevance(patHetaskRelevance);
- } else if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 3) {
- patHetaskRelevanceMapper.deletePatHetaskRelevanceById(patHetaskRelevance.getId());
+ for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
+ if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 1) {
+ PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
+ } else if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 2) {
+ PatTaskRelevance.setTaskId(heTask.getId());
+ PatTaskRelevanceMapper.updatePatTaskRelevance(PatTaskRelevance);
+ } else if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 3) {
+ PatTaskRelevanceMapper.deletePatTaskRelevanceById(PatTaskRelevance.getId());
}
}
integer = heTask.getId().intValue();
@@ -239,9 +242,9 @@
heTaskMapper.deleteHeTaskById(heTaskVO.getId());
//鍒犻櫎鎮ｈ�呬俊鎭�
- for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
- if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 3) {
- patHetaskRelevanceMapper.deletePatHetaskRelevanceById(patHetaskRelevance.getId());
+ for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
+ if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 3) {
+ PatTaskRelevanceMapper.deletePatTaskRelevanceById(PatTaskRelevance.getId());
}
}
integer = heTaskVO.getId().intValue();
@@ -295,8 +298,8 @@
* @return
*/
@Override
- public List<PatHetaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
- List<PatHetaskRelevance> patHetaskRelevances = new ArrayList<>();
+ public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
+ List<PatTaskRelevance> PatTaskRelevances = new ArrayList<>();
List<PatArchive> patArchiveList = new ArrayList<>();
if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
@@ -319,13 +322,13 @@
}
}
for (PatArchive patArchive : patArchiveList) {
- PatHetaskRelevance patHetaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatHetaskRelevance.class);
- patHetaskRelevance.setCreateTime(patArchive.getCreateTime());
- patHetaskRelevance.setCreateBy(patArchive.getCreateBy());
- patHetaskRelevances.add(patHetaskRelevance);
+ PatTaskRelevance PatTaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatTaskRelevance.class);
+ PatTaskRelevance.setCreateTime(patArchive.getCreateTime());
+ PatTaskRelevance.setCreateBy(patArchive.getCreateBy());
+ PatTaskRelevances.add(PatTaskRelevance);
}
- return patHetaskRelevances;
+ return PatTaskRelevances;
}
}
--
Gitblit v1.9.3