From bd6c66c1a161e9f0fe94b94bed7935b2bde541f2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 14 五月 2025 18:14:32 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java | 8 +-
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java | 1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 31 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 9 +
ruoyi-common/src/main/java/com/ruoyi/common/enums/PreachFormEnum.java | 54 +++++++++++++
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java | 2
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java | 132 +++++++++++++++++++++++++++++++++
smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java | 1
9 files changed, 231 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 88d4670..40cbf8e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -93,6 +93,9 @@
@Value("${visitHosp}")
private Integer visitHosp;
+ @Value("${server.port}")
+ private String port;
+
// 鍒涘缓鍥哄畾澶у皬鐨勭嚎绋嬫睜
private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -107,7 +110,7 @@
log.error("鏈満鐨勭綉缁淚P涓�:{}", ip);
String content = message.toString();
//鍒ゆ柇鏄笉鏄换鍔′俊鎭紝濡傛灉涓嶆槸锛岀洿鎺ヨ繑鍥烇紝涓嶉渶瑕佹墽琛�
- if (!content.contains("taskid")) {
+ if (!content.contains("taskid") || !port.equals("8095")) {
log.error("涓嶆槸浠诲姟淇℃伅");
return;
}
@@ -407,7 +410,7 @@
}
if (s.equals("true")) {
//鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
- log.error("serviceSubtask淇濆瓨鎴愬姛浜嗗悧锛燂細{}",s);
+ log.error("serviceSubtask淇濆瓨鎴愬姛浜嗗悧锛燂細{}", s);
String uuid = UUID.randomUUID().toString();
serviceSubtask.setResult("success");
serviceSubtask.setRemark("鐭俊鍙戦�佹垚鍔�");
@@ -427,7 +430,7 @@
serviceSubtaskRecord.setResult("success");
serviceSubtaskRecord.setRemark("鐭俊鍙戦�佹垚鍔�");
serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
- log.error("serviceSubtaskRecord淇濆瓨鎴愬姛浜嗗悧锛燂細{}",serviceSubtaskRecord);
+ log.error("serviceSubtaskRecord淇濆瓨鎴愬姛浜嗗悧锛燂細{}", serviceSubtaskRecord);
}
} catch (Exception e) {
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 583fc84..e2fc650 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.PreachFormEnum;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -83,6 +84,36 @@
// return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
}
+
+ /**
+ * 瀵煎嚭鍗曚竴浠诲姟锛堥殢璁垮鏁欙級鍒楄〃
+ */
+ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
+ @Log(title = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級", businessType = BusinessType.EXPORT)
+ @PostMapping("/patItemExport")
+ public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskVO serviceSubtaskVO) {
+ List<ServiceSubtask> serviceSubtaskList = null;
+ if (serviceSubtaskVO != null) {
+ if (serviceSubtaskVO.getPageNum() != null && serviceSubtaskVO.getPageSize() != null)
+ PageUtils.startPageByPost(serviceSubtaskVO.getPageNum(), serviceSubtaskVO.getPageSize());
+ serviceSubtaskList = serviceSubtaskService.patItem(serviceSubtaskVO);
+ }
+ List<ServiceSubtaskExprot> serviceSubtaskExprots = null;
+ if (!CollectionUtils.isEmpty(serviceSubtaskList)) {
+ serviceSubtaskExprots = DtoConversionUtils.sourceToTarget(serviceSubtaskList, ServiceSubtaskExprot.class);
+ for (ServiceSubtaskExprot serviceSubtaskExprot : serviceSubtaskExprots) {
+ String pf = PreachFormEnum.getDescByCode(serviceSubtaskExprot.getPreachform());
+ serviceSubtaskExprot.setPreachform(pf);
+ }
+
+ }
+
+
+ ExcelUtil<ServiceSubtaskExprot> util = new ExcelUtil<ServiceSubtaskExprot>(ServiceSubtaskExprot.class);
+ util.exportExcel(response, serviceSubtaskExprots, "鎮ｈ�呴殢璁夸俊鎭〃鍗�");
+ }
+
+
/**
* 鏌ヨ鎮ｈ�呴殢璁夸俊鎭�
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/PreachFormEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/PreachFormEnum.java
new file mode 100644
index 0000000..22b4cd5
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/PreachFormEnum.java
@@ -0,0 +1,54 @@
+package com.ruoyi.common.enums;
+
+/**
+ * 鍙戦�佺被鍨嬫灇涓�
+ */
+public enum PreachFormEnum {
+ rg("1", "浜哄伐"),
+ zz("2", "绾歌川"),
+ dh("3", "鐢佃瘽"),
+ dx("4", "鐭俊"),
+ wxgzh("5", "寰俊鍏紬鍙�"),
+ wxxch("6", "寰俊灏忕▼搴�"),
+ zfbxch("7", "鏀粯瀹濆皬绋嬪簭"),
+ znjqr("8", "鏅鸿兘鏈哄櫒浜�"),
+ dd("8", "閽夐拤"),
+ dr("8", "瀵煎叆");
+
+
+ private String code;
+ private String desc;
+
+ PreachFormEnum(String code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public static String getDescByCode(String code) {
+ PreachFormEnum[] organEnums = values();
+ for (int i = 0; i < organEnums.length; i++) {
+ PreachFormEnum organEnum = organEnums[i];
+ if (organEnum.getCode().equals(code)) {
+ return organEnum.getDesc();
+ }
+ }
+ return null;
+ }
+
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+}
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 e253663..7f6a671 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
@@ -610,6 +610,7 @@
if ((Boolean) map.get("succ") == true) {
serviceSubtask.setResult("success");
} else {
+ log.error("serviceSubtask1231313鐨勫�间负锛歿}",serviceSubtask);
serviceSubtask.setResult("error");
serviceSubtask.setSendstate(5L);
serviceSubtask.setRemark(map.get("msg").toString());
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index 4b23584..4a1f987 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -234,28 +234,28 @@
/**
* 鍙戦�佺姸鎬�
*/
- @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
+// @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
@ApiModelProperty(value = "鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇) 2 寰呭彂閫� 3 宸插彂閫� 4 涓嶆墽琛� 5 鍙戦�佸け璐� 6 宸插畬鎴�")
private Long sendstate;
/**
* 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1
*/
- @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
+// @Excel(name = " 鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1 ")
@ApiModelProperty(value = "鏆傚仠鐘� 锛� 鐘舵�佸鏋滃彂鐢熶慨鏀癸紝鍊煎氨鍔�1")
private Long stopState;
/**
* 鍙戦�乁UID
*/
- @Excel(name = " 鍙戦�乁UID ")
+// @Excel(name = " 鍙戦�乁UID ")
@ApiModelProperty(value = "鍙戦�乁UID")
private String senduuid;
/**
* 缁撴灉
*/
- @Excel(name = " 缁撴灉 ")
+// @Excel(name = " 缁撴灉 ")
@ApiModelProperty(value = "缁撴灉")
private String result;
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java
new file mode 100644
index 0000000..5cd4e75
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtaskExprot.java
@@ -0,0 +1,132 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鍗曚竴浠诲姟锛堥殢璁匡級瀵硅薄 ivr_taskcall
+ *
+ * @author ruoyi
+ * @date 2024-02-02
+ */
+@ApiModel(value = "ServiceSubtaskExprot", description = "鍗曚竴闅忚浠诲姟鍏ュ弬")
+@Data
+public class ServiceSubtaskExprot extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浠诲姟鍚嶇О
+ */
+ @Excel(name = "浠诲姟鍚嶇О")
+ @ApiModelProperty(value = "浠诲姟鍚嶇О")
+ private String taskName;
+
+ /**
+ * 鍙戦�佷汉
+ */
+ @Excel(name = " 鍙戦�佷汉 ")
+ @ApiModelProperty(value = "鍙戦�佷汉")
+ private String sendname;
+
+ /**
+ * 鍒涘缓鑰�
+ */
+ @Excel(name = "闅忚浜�")
+ private String updateBy;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "瀹屾垚鏃堕棿")
+ private Date finishtime;
+
+ /**
+ * 鍑洪櫌鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
+ private Date endtime;
+
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
+ @Excel(name = "涓绘不鍖荤敓")
+ @ApiModelProperty(value = "鍖荤敓濮撳悕")
+ private String drname;
+
+
+ /**
+ * 韬唤璇佸彿
+ */
+ @Excel(name = " 韬唤璇佸彿 ")
+ @ApiModelProperty(value = "韬唤璇佸彿")
+ private String sfzh;
+
+
+ /**
+ * 鎵嬫満鍙�
+ */
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鎵嬫満鍙�")
+ private String phone;
+
+ /**
+ * 璐ｄ换鎶ゅ＋濮撳悕
+ */
+ @Excel(name = "璐ｄ换鎶ゅ＋")
+ @ApiModelProperty("璐ｄ换鎶ゅ＋濮撳悕")
+ private String nurseName;
+
+
+ /**
+ * 绉戝鍚嶇О
+ */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
+
+
+ /**
+ * 鍑洪櫌鐥呭尯鍚嶇О
+ */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
+ @Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
+ private String leavehospitaldistrictname;
+
+
+ /**
+ * 妯℃澘鍚�
+ */
+ @Excel(name = "鍑洪櫌闅忚妯℃澘鍚嶇О")
+ @ApiModelProperty(value = "妯℃澘鍚�")
+ private String templatename;
+
+
+ /**
+ * 瀹ｆ暀褰㈠紡 :鏂囨湰銆佸浘鐗囥�佽闊炽�佽棰戙�佹贩鍚�
+ */
+ @Excel(name = "浠诲姟鎵ц鏂瑰紡")
+ @ApiModelProperty(value = "浠诲姟褰㈠紡(1,浜哄伐 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹濆皬绋嬪簭 8.鏅鸿兘鏈哄櫒浜� 9.閽夐拤 10.瀵煎叆)")
+ private String preachform;
+
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+
+}
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 6e325ed..f943254 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -687,6 +687,7 @@
serviceSubtask.setLongSendTime(newDate);
//鎮ｈ�呭彂閫佹椂闂�
if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+ log.error("serviceSubtask99999999鐨勫�间负锛歿}",serviceSubtask);
String remark = patArchive.getNotrequiredreason();
serviceSubtask.setRemark(remark);
serviceSubtask.setResult("error");
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
index 7c8c18f..bc61593 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
@@ -227,6 +227,7 @@
serviceSubtask.setRemark(remark);
serviceSubtask.setResult("error");
serviceSubtask.setFinishtime(new Date());
+ log.error("serviceSubtask888888鐨勫�间负锛歿}",serviceSubtask);
//涓嶆墽琛�
serviceSubtask.setSendstate(4L);
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index 43f79a7..bf54388 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -382,7 +382,7 @@
private Map<String, Object> getMap(Map<String, Object> scriptInfoByCondition, Long subid, Long patid) {
Map<String, Object> map = new HashMap<>();
if (ObjectUtils.isNotEmpty(scriptInfoByCondition) && ObjectUtils.isNotEmpty(scriptInfoByCondition.get("script"))) {
- log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}", scriptInfoByCondition);
+// log.error("-----------scriptInfoByCondition鐨勫�间负锛歿}", scriptInfoByCondition);
if (scriptInfoByCondition.get("type").equals("1")) {
List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
--
Gitblit v1.9.3