From 78c9129e9045fafe4c2f7333b3dcafde6b20b96d Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 05 十二月 2024 15:20:51 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java | 21 ++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 105 +++-------------------------------
smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java | 7 ++
ruoyi-admin/src/main/resources/application-druid.yml | 4
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java | 12 ++++
6 files changed, 53 insertions(+), 98 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
index f595faf..bcde8c6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -9,9 +9,11 @@
import com.smartor.service.IServiceSubtaskDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,6 +67,20 @@
}
/**
+ * 鏂板浠诲姟缁撴灉鏄庣粏
+ */
+ //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:add')")
+ @ApiOperation("鎵归噺鏂板浠诲姟缁撴灉鏄庣粏")
+ @Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.INSERT)
+ @PostMapping("/batchAdd")
+ public AjaxResult batchAdd(@RequestBody List<ServiceSubtaskDetail> serviceSubtaskDetails) {
+ if (CollectionUtils.isEmpty(serviceSubtaskDetails)) {
+ return error("闇�瑕佹柊澧炶闊宠鎯呬负绌�");
+ }
+ return toAjax(ServiceSubtaskDetailService.batchInsertServiceSubtaskDetail(serviceSubtaskDetails));
+ }
+
+ /**
* 淇敼璇煶浠诲姟鍛煎彨鏄庣粏
*/
//@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:edit')")
@@ -83,7 +99,10 @@
@Log(title = "璇煶浠诲姟鍛煎彨鏄庣粏", businessType = BusinessType.UPDATE)
@ApiOperation("淇敼浠诲姟缁撴灉鏄庣粏")
@PostMapping("/batchEdit")
- public AjaxResult edit(@RequestBody List<ServiceSubtaskDetail> serviceSubtaskDetails) {
+ public AjaxResult batchEdit(@RequestBody List<ServiceSubtaskDetail> serviceSubtaskDetails) {
+ if (CollectionUtils.isEmpty(serviceSubtaskDetails)) {
+ return error("闇�瑕佷慨鏀硅闊宠鎯呬负绌�");
+ }
for (ServiceSubtaskDetail serviceSubtaskDetail : serviceSubtaskDetails) {
ServiceSubtaskDetailService.updateServiceSubtaskDetail(serviceSubtaskDetail);
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 2459146..e3166a7 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -170,9 +170,9 @@
app_key_yq: ZurNHpaQLq6P55YS
#鏈� 鍦� 鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
-xhsmsPath: http://192.168.2.13:8092/sendSms
+#xhsmsPath: http://192.168.2.13:8092/sendSms
#鏂板崕鐭俊璇锋眰鍦板潃(杩欎釜鏈嶅姟鏄垜浠嚜宸卞啓鐨�)
-#xhsmsPath: http://192.16.4.220:8092/sendSms
+xhsmsPath: http://192.16.4.220:8092/sendSms
#甯愬彿
xhsmsAccount: 911124
#鎺ュ彛瀵嗙爜
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 3d8dfb0..f126715 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -237,98 +237,15 @@
iPatMedInhospService.dealOutHospInfo();
}
-// /**
-// * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
-// */
-// public void dealOutHospInfoXHC() {
-// PatMedInhosp patMedInhosp = new PatMedInhosp();
-// //鑾峰彇鏈鐞嗙殑鏁版嵁
-// List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
-//
-// for (ServicePatientTemp servicePatientTemp : servicePatientTemps) {
-// Long tid = null;
-// if (servicePatientTemp.getType() != null && servicePatientTemp.getType() == 1) {
-// IvrTaskTemplate ivrTaskTemplate = iIvrTaskTemplateService.selectIvrTaskTemplateByID(servicePatientTemp.getTempId());
-// tid = ivrTaskTemplate.getTaskid();
-// } else if (servicePatientTemp.getType() != null && servicePatientTemp.getType() == 2) {
-// SvyTaskTemplate svyTaskTemplate = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(servicePatientTemp.getTempId());
-// tid = svyTaskTemplate.getTaskid();
-// }
-//
-// ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(tid);
-// ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
-// serviceSubtask.setTaskid(serviceTask.getTaskid());
-// serviceSubtask.setTemplateid(servicePatientTemp.getTempId());
-// serviceSubtask.setTemplatename(stt.getTemplateName());
-// serviceSubtask.setPatid(patArchive.getId());
-// serviceSubtask.setSendname(patArchive.getName());
-// serviceSubtask.setSfzh(patArchive.getIdcardno());
-// serviceSubtask.setPhone(patArchive.getTelcode());
-// serviceSubtask.setSex(patArchive.getSex());
-// serviceSubtask.setAge(patArchive.getAge());
-// serviceSubtask.setSendstate(2L);
-// serviceSubtask.setStarttime(patMedInhosp1.getStarttime());
-// serviceSubtask.setEndtime(patMedInhosp1.getEndtime());
-// serviceSubtask.setServiceType("2");
-// serviceSubtask.setPreachform(serviceTask.getPreachform());
-// serviceSubtask.setHospType("2");
-// serviceSubtask.setCreateTime(new Date());
-// serviceSubtask.setUpdateTime(new Date());
-// serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
-// serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
-// serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
-// //璁剧疆鍙戦�佹椂闂�
-// Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay());
-// serviceSubtask.setLongSendTime(newDate);
-// //鎮ｈ�呭彂閫佹椂闂�
-// if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
-// remark = patArchive.getNotrequiredreason();
-// serviceSubtask.setRemark(remark);
-// serviceSubtask.setResult("error");
-// serviceSubtask.setFinishtime(new Date());
-// //涓嶆墽琛�
-// serviceSubtask.setSendstate(4L);
-// }
-//
-// //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
-// ServiceSubtaskVO subtask = new ServiceSubtaskVO();
-// subtask.setPatid(patArchive.getId());
-// subtask.setSendstate(2L);
-// List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
-// log.error("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
-// if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
-// for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
-// if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
-// //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
-// continue;
-// }
-// if (serviceSubtask1.getEndtime().before(serviceSubtask.getEndtime())) {
-// //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
-// serviceSubtask1.setSendstate(4L);
-// serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
-// serviceSubtask1.setResult("error");
-// serviceSubtask1.setFinishtime(new Date());
-// serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
-// } else {
-// //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
-// serviceSubtask.setResult("error");
-// serviceSubtask.setFinishtime(new Date());
-// serviceSubtask.setSendstate(4L);
-// serviceSubtask.setRemark("鎮ｈ�呭啀鍏ラ櫌");
-// }
-// }
-// }
-//
-// serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
-// //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
-// PatMedInhosp patMedInhosp2 = new PatMedInhosp();
-// patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
-// patMedInhosp2.setCheckFlag("1");
-// patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
-// }
-//
-// return 1;
-// }
+ /**
+ * 澶勭悊鎮ｈ�呬俊鎭紝杩涘叆瀛愪换鍔¤〃(寰俊灏忕▼搴�)
+ */
+ public void dealOutHospInfoXHC() {
+ PatMedInhosp patMedInhosp = new PatMedInhosp();
+ //鑾峰彇鏈鐞嗙殑鏁版嵁
+ List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
+
+ }
/**
@@ -781,10 +698,10 @@
log.error("鏄惁闇�瑕佹洿鏂帮細{}", patMedInhosps.size());
if (CollectionUtils.isNotEmpty(patMedInhosps)) {
patMedInhosp.setInhospid(patMedInhosps.get(0).getInhospid());
- log.error("------鎮ｈ�呭嚭鍏ラ櫌淇敼淇℃伅锛歿}",patMedInhosp);
+ log.error("------鎮ｈ�呭嚭鍏ラ櫌淇敼淇℃伅锛歿}", patMedInhosp);
patMedInhospService.updatePatMedInhosp(patMedInhosp);
} else {
- log.error("----鎮ｈ�呭嚭鍏ラ櫌鏂板淇℃伅锛歿}",patMedInhosp);
+ log.error("----鎮ｈ�呭嚭鍏ラ櫌鏂板淇℃伅锛歿}", patMedInhosp);
patMedInhospService.insertPatMedInhosp(patMedInhosp);
}
diff --git a/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java b/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
index f27826e..d1e7ead 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
@@ -37,6 +37,13 @@
public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail);
/**
+ * 鎵归噺鏂板璇煶浠诲姟鍛煎彨鏄庣粏
+ *
+ * @return 缁撴灉
+ */
+ public int batchInsertServiceSubtaskDetail(List<ServiceSubtaskDetail> serviceSubtaskDetails);
+
+ /**
* 淇敼璇煶浠诲姟鍛煎彨鏄庣粏
*
* @param serviceSubtaskDetail 璇煶浠诲姟鍛煎彨鏄庣粏
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index b7d4855..6601346 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -409,11 +409,11 @@
serviceSubtask1.setResult("error");
serviceSubtask1.setFinishtime(new Date());
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+ patMedInhosp1.setCheckFlag("1");
}
}
}
//灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
- patMedInhosp1.setCheckFlag("1");
patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
}
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
index 64e2c60..1cc499d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
@@ -141,6 +141,18 @@
return ServiceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
}
+ @Override
+ public int batchInsertServiceSubtaskDetail(List<ServiceSubtaskDetail> serviceSubtaskDetails) {
+ int i = 0;
+ if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
+ for (ServiceSubtaskDetail serviceSubtaskDetail : serviceSubtaskDetails) {
+ serviceSubtaskDetail.setCreateTime(DateUtils.getNowDate());
+ i = ServiceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
+ }
+ }
+ return i;
+ }
+
/**
* 淇敼璇煶浠诲姟鍛煎彨鏄庣粏
*
--
Gitblit v1.9.3