From 5c1f5dcc9dbea7478b1a9bd7c047a99a042e9d24 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 十月 2025 20:02:28 +0800
Subject: [PATCH] 省立同德短信模板
---
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 78 ++++++++++++++++++++++++++++++--------
1 files changed, 61 insertions(+), 17 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
index cdb456b..370d592 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1,11 +1,12 @@
package com.smartor.service.impl;
import com.alibaba.fastjson2.JSON;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.dx.MessageSend;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.smartor.common.FtpService;
@@ -24,13 +25,9 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZoneId;
+import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -177,15 +174,14 @@
ServiceTaskVO serviceTaskVO = DtoConversionUtils.sourceToTarget(serviceTask, ServiceTaskVO.class);
ObjectMapper objectMapper = new ObjectMapper();
try {
- List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachform(), List.class);
+ List<Map<String, Object>> mapList = objectMapper.readValue(serviceTask.getPreachformDesc(), List.class);
serviceTaskVO.setPreachformList(mapList);
-
- String result = mapList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
- serviceTaskVO.setPreachform(result);
+//
+// String result = mapList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
+// serviceTaskVO.setPreachform(result);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
-
return serviceTaskVO;
}
@@ -284,8 +280,8 @@
}).collect(Collectors.toList());
serviceTaskVO.setPreachformList(resultList);
- String result = resultList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
- serviceTaskVO.setPreachform(result);
+// String result = resultList.stream().map(mapList1 -> mapList1.get("preachform")).map(String::valueOf).collect(Collectors.joining(","));
+// serviceTaskVO.setPreachform(result);
}
serviceTaskVO.setPatTaskRelevances(patTaskRelevances);
@@ -453,7 +449,7 @@
ObjectMapper mapper = new ObjectMapper();
try {
String preachformList = mapper.writeValueAsString(serviceTaskVO.getPreachformList());
- serviceTask.setPreachform(preachformList);
+ serviceTask.setPreachformDesc(preachformList);
} catch (JsonProcessingException e) {
e.printStackTrace();
}
@@ -849,7 +845,7 @@
ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
serviceSubtaskPreachform.setSort(ObjectUtils.isEmpty(map.get("sort")) ? 0 : Long.valueOf(map.get("sort").toString()));
serviceSubtaskPreachform.setPreachform(ObjectUtils.isEmpty(map.get("preachform")) ? "" : map.get("preachform").toString());
- serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("preachcompensateTimeform").toString());
+ serviceSubtaskPreachform.setCompensateTime(ObjectUtils.isEmpty(map.get("compensateTime")) ? "" : map.get("compensateTime").toString());
serviceSubtaskPreachform.setTaskid(serviceTask.getTaskid());
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
//杩欎釜sendstate闇�瑕佸湪鏁版嵁搴撹缃竴涓粯璁ゅ�间负鈥�1鈥�
@@ -2083,6 +2079,37 @@
return result;
}
+ @Override
+ public List<PatArchiveSrmVO> sendMsgTemplate(List<PatArchiveSrmVO> patArchiveSrmVOS) {
+ //鐢ㄦ潵璁板綍鍙戦�佸け璐ョ殑
+ List<PatArchiveSrmVO> sendError = new ArrayList<>();
+
+ for (PatArchiveSrmVO patArchiveSrmVO : patArchiveSrmVOS) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY骞碝M鏈坉d鏃H:mm");
+ String timestamp = simpleDateFormat.format(patArchiveSrmVO.getVisitTime());
+
+ StringBuilder stringBuilder = new StringBuilder();
+ if (patArchiveSrmVO.getSrmTemplate().equals("鍏ラ櫌鍑嗗涓績-鏃犳鏌�")) {
+ stringBuilder.append(patArchiveSrmVO.getName() + ",鎮ㄥソ锛佷富绠″尰鐢熷凡涓烘偍瀹夋帓浣忛櫌锛岃浜庡綋澶�");
+ } else if (patArchiveSrmVO.getSrmTemplate().equals("鍏ラ櫌鍑嗗涓績-绌鸿吂妫�鏌�")) {
+ stringBuilder.append(patArchiveSrmVO.getName() + ",鎮ㄥソ锛佷富绠″尰鐢熷凡涓烘偍瀹夋帓浣忛櫌锛岃褰撳ぉ绌鸿吂骞朵簬");
+ } else if (patArchiveSrmVO.getSrmTemplate().equals("鏃ラ棿鐥呮埧鈥旀嫨鏈熺梾浜烘鏌�")) {
+ stringBuilder.append(patArchiveSrmVO.getName() + ",鎮ㄥソ锛佷富绠″尰鐢熷凡涓烘偍瀹夋帓浣忛櫌鍓嶆鏌ワ紝璇峰綋澶╃┖鑵瑰苟浜�");
+ }
+
+ stringBuilder.append(timestamp + ",涔嬪墠鎼哄甫鍖讳繚鍗℃垨鐢靛瓙鍖讳繚鍗¤韩浠借瘉鍑鏉＄煭淇″埌1鍙锋ゼ3妤煎崡鍏ラ櫌鍑嗗涓績鍏ラ櫌鐧昏绐楀彛锛屽姙鐞嗘寮忎綇闄㈡墜缁紝瀹屾垚鍚勯」妫�鏌ュ悗鍐嶅埌鐩稿簲鐥呭尯鎶ゅ＋绔欐姤鍒般��");
+ stringBuilder.append("鍏ラ櫌鍑嗗涓績鐢佃瘽锛�89975977銆傚叆闄㈠姙鐞嗛』鐭�:https://mp.weixin.qq.com/s/OCkotuRyQ8Ld2owFF0YErw");
+
+ JSONObject data = MessageSend.sendMsg(stringBuilder.toString(), "2", patArchiveSrmVO.getPhone(), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
+ String code = data.get("code").toString();
+ if (StringUtils.isNotEmpty(code) && !code.equals("00000")) {
+ sendError.add(patArchiveSrmVO);
+ }
+ }
+
+ return sendError;
+ }
+
/**
* 鑾峰彇闅忚缁熻姣斾緥
*
@@ -2303,8 +2330,25 @@
serviceSubtaskStatistic.setAbnormalAgain(serviceSubtaskStatistic.getAbnormalAgain() + 1L);
}
}
-
-
+ //闅忚鎯呭喌
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 1) {
+ serviceSubtaskStatistic.setTaskSituation1(serviceSubtaskStatistic.getTaskSituation1() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 2) {
+ serviceSubtaskStatistic.setTaskSituation2(serviceSubtaskStatistic.getTaskSituation2() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 3) {
+ serviceSubtaskStatistic.setTaskSituation3(serviceSubtaskStatistic.getTaskSituation3() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 4) {
+ serviceSubtaskStatistic.setTaskSituation4(serviceSubtaskStatistic.getTaskSituation4() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 5) {
+ serviceSubtaskStatistic.setTaskSituation5(serviceSubtaskStatistic.getTaskSituation5() + 1);
+ }
+ if (serviceSubtask.getTaskSituation() != null && serviceSubtask.getTaskSituation() == 6) {
+ serviceSubtaskStatistic.setTaskSituation6(serviceSubtaskStatistic.getTaskSituation6() + 1);
+ }
}
--
Gitblit v1.9.3