From 2d84b9771e11b64f4224c57ebc36a157fe9a15b4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:52:59 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTelInfoController.java | 4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 3
smartor/src/main/java/com/smartor/mapper/ServiceOutPathMapper.java | 7 ++
smartor/src/main/java/com/smartor/service/IServiceOutPathService.java | 7 ++
smartor/src/main/java/com/smartor/service/impl/ServiceOutPathServiceImpl.java | 10 +++
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java | 24 ++++++++
smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml | 5 +
smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java | 7 +
smartor/src/main/java/com/smartor/service/IServiceTelInfoService.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java | 4 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java | 69 +++++++++++------------
ruoyi-common/src/main/java/com/ruoyi/common/utils/sms/smsUtils.java | 27 +++++++++
12 files changed, 126 insertions(+), 43 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
index 4c0e937..2a1b772 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SmsController.java
@@ -1,13 +1,16 @@
package com.ruoyi.web.controller.common;
+import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.RSAPublicKeyExample;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.sms.smsUtils;
+import com.ruoyi.framework.config.ServerConfig;
+import com.smartor.domain.HtmlContentVO;
import com.smartor.domain.ServiceOutPath;
-import com.smartor.domain.ServiceTask;
import com.smartor.domain.smsVO;
-import com.smartor.mapper.ServiceTaskMapper;
import com.smartor.service.IServiceOutPathService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -24,6 +27,7 @@
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Date;
+import java.util.List;
@RestController
@Api(description = "鐭ヤ俊鎺ュ彛")
@@ -52,8 +56,7 @@
private IServiceOutPathService iServiceOutPathService;
@Autowired
- private ServiceTaskMapper serviceTaskMapper;
-
+ private UtilsMapper utilsMapper;
/**
* @param
@@ -76,36 +79,29 @@
String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key);
String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key);
+ Integer radix=iServiceOutPathService.selectAutoId();
+ String format = String.format("%03X", radix);
ServiceOutPath serviceOutPath = new ServiceOutPath();
serviceOutPath.setParam1(taskId);
serviceOutPath.setParam2(patid);
serviceOutPath.setParam3(vo.getTaskName());
serviceOutPath.setParam6(subId);
+ serviceOutPath.setRadix(format);
serviceOutPath.setCreateTime(new Date());
- String format ="";
- if(ObjectUtils.isNotEmpty(vo.getSubId())) {
- format = String.format("%03X", Integer.parseInt(vo.getSubId()));
- serviceOutPath.setRadix(format);
- }
iServiceOutPathService.insertServiceOutPath(serviceOutPath);
String url = ip + ":" + req_path + "/wt?p=" + format;
- ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(Long.valueOf(taskId));
- //濡傛灉type鏄闊抽殢璁跨殑璇濓紙璇存槑琛ュ伩鍙戦�佹柟寮忎腑鏈夌數璇濋殢璁跨殑鏂瑰紡锛岃繖閲岀殑澶栭摼灏卞湴鍧�鍙兘鐢�/sf锛�
- if (serviceTask.getType().equals("1")) {
- url = ip + ":" + req_path + "/sf?p=" + format;
- }
- String content="鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
- if(ObjectUtils.isNotEmpty(vo.getContent()))
- content=vo.getContent();
- else
- sendChat(vo);
- String sendMsg="";
- try{
- sendMsg=smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,vo.getPhone(),content);
+ String content = "鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+ if (ObjectUtils.isNotEmpty(vo.getContent()))
+ content = vo.getContent();
+// else
+// sendChat(vo);
+ String sendMsg = "";
+ try {
+ sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, vo.getPhone(), content);
log.info(sendMsg);
- }catch (Exception ex){
+ } catch (Exception ex) {
log.error(ex.getMessage());
}
return AjaxResult.success(sendMsg);
@@ -121,21 +117,22 @@
RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
String taskId = rsaPublicKeyExample.encryptedData(vo.getTaskId().toString(), pub_key);
String patid = rsaPublicKeyExample.encryptedData(vo.getPatId().toString(), pub_key);
- String url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "¶m2=" + patid
- + "¶m3=" + URLEncoder.encode(vo.getTaskName(), StandardCharsets.UTF_8.toString()) + "¶m5=false";
+ String subId = rsaPublicKeyExample.encryptedData(vo.getSubId().toString(), pub_key);
+ Integer radix=iServiceOutPathService.selectAutoId();
+ String format = String.format("%03X", radix);
+ ServiceOutPath serviceOutPath = new ServiceOutPath();
+ serviceOutPath.setParam1(taskId);
+ serviceOutPath.setParam2(patid);
+ serviceOutPath.setParam3(vo.getTaskName());
+ serviceOutPath.setParam6(subId);
+ serviceOutPath.setRadix(format);
+ serviceOutPath.setCreateTime(new Date());
+ iServiceOutPathService.insertServiceOutPath(serviceOutPath);
- String content="鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑�" + url + "濉啓銆傛劅璋㈡偍閰嶅悎锛�";
+ String url = ip + ":" + req_path + "/wt?p=" + format;
- String urlTemp="http://192.200.54.14:5003/sfjk/SendMessage?sfzh="+vo.getIdCard()
- +"&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content="+content+"&phone="+vo.getPhone()
- +"&url="+url+"&key=ff76f8904f5f32b5ee1739e8ea46e60g";
- String sendMsg= "";
- try{
- sendMsg= HttpUtils.sendGet(urlTemp);
- log.info(sendMsg);
- }catch (Exception ex){
- log.error(ex.getMessage());
- }
+
+ String sendMsg = smsUtils.sendChat(url,vo.getPhone(),vo.getIdCard());
return AjaxResult.success(sendMsg);
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTelInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTelInfoController.java
index bba4a2b..dd17bab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTelInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTelInfoController.java
@@ -24,8 +24,8 @@
*/
@ApiOperation("闅忚鐢佃瘽璇︽儏鍒楄〃")
@GetMapping("/getList")
- public AjaxResult getList() {
- return AjaxResult.success(telService.getList());
+ public AjaxResult getList(String orgid) {
+ return AjaxResult.success(telService.getList(orgid));
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index d8b249b..90d8d52 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -13,6 +13,12 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ruoyi.common.constant.Constants;
@@ -112,6 +118,7 @@
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
conn.setRequestProperty("Accept-Charset", "utf-8");
+ conn.setRequestProperty("Charsert", "UTF-8");
conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
conn.setDoOutput(true);
conn.setDoInput(true);
@@ -308,4 +315,21 @@
return true;
}
}
+
+ public static String sendPost(String url){
+ HttpPost post = new HttpPost(url);
+ CloseableHttpClient client = HttpClients.createDefault();
+ //鍚姩鎵ц璇锋眰锛屽苟鑾峰緱杩斿洖鍊�
+ CloseableHttpResponse execute = null;
+ try {
+ execute = client.execute(post);
+ HttpEntity entity = execute.getEntity();
+ //鎶婂疄浣撳璞¤浆鎹负string
+ return EntityUtils.toString(entity, "UTF-8");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return "璋冪敤澶辫触";
+ }
+
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sms/smsUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sms/smsUtils.java
index 2ec23d9..bf7e08b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sms/smsUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/sms/smsUtils.java
@@ -5,13 +5,16 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.utils.HttpUtil;
+import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.sign.Md5Utils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+@Slf4j
public class smsUtils {
@@ -40,4 +43,28 @@
return sendMsg;
}
+
+ /**
+ * 鏉窞甯備竴鍖婚櫌鍚村北闄㈠尯鎴戠煭淇℃帴鍙�
+ *
+ * @param url 寰俊URL
+ * @param phone 鎵嬫満鍙� 13500000001
+ * @param idCard 韬唤璇�
+ * @return 涓や釜鍙傛暟鐨勫拰
+ */
+ public static String sendChat(String url,String phone,String idCard){
+ String urlTemp = "http://192.200.54.14:5003/sfjk/SendMessage?sfzh="
+ + idCard
+ + "&title=鎮ㄥソ锛岄個璇锋偍濉啓鍑洪櫌璋冩煡琛紝璇风偣鍑诲～鍐欍��&content=寰呴殢璁�&phone=" + phone
+ + "&url=" + url + "&key=ff76f8904f5f32b5ee1739e8ea46e60g";
+ String sendMsg = "";
+ try {
+ sendMsg = HttpUtils.sendPost(urlTemp);
+ log.info(sendMsg);
+ } catch (Exception ex) {
+ sendMsg=ex.getMessage();
+ log.error(ex.getMessage());
+ }
+ return sendMsg;
+ }
}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index b5107b1..6a1d80c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -85,6 +85,10 @@
if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("sys_job") || originalSql.contains("update sys_menu") || originalSql.contains("information_schema.tables") || originalSql.contains("information_schema.columns") || originalSql.contains("gen_table") || originalSql.toUpperCase().contains("ORGID IS NULL") || originalSql.toUpperCase().contains("FROM CRYXX") || originalSql.toUpperCase().contains("FROM MZXX") || originalSql.toUpperCase().contains("FROM JBXX") || originalSql.toUpperCase().contains("FROM BMXX") || originalSql.toUpperCase().contains("FROM HZJBXX") || originalSql.toUpperCase().contains("RENAME TABLE") || originalSql.toUpperCase().contains("FROM YHYKSXX") || originalSql.toUpperCase().contains("FROM YHYJSXX") || originalSql.toUpperCase().contains("ALTER TABLE") || originalSql.toUpperCase().contains("CREATE TABLE")) {
return originalSql;
}
+ if(originalSql.contains("and onorgid")){
+ originalSql=originalSql.replace("and onorginid","");
+ return originalSql;
+ }
// 鎻愬彇 orgid 鐨� WHERE 瀛愬彞
String whereClause = " orgid = '" + orgid + "'";
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 710bae5..c611180 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
@@ -5,9 +5,9 @@
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.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
+import com.ruoyi.common.enums.VisitSendStateEnum;
import com.ruoyi.common.enums.WxGZHEnum;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.OkHttpExample;
@@ -94,6 +94,7 @@
@Autowired
private ISysConfigService configService;
+
@Value("${localIP}")
private String localIP;
diff --git a/smartor/src/main/java/com/smartor/mapper/ServiceOutPathMapper.java b/smartor/src/main/java/com/smartor/mapper/ServiceOutPathMapper.java
index 55b810b..a248dc2 100644
--- a/smartor/src/main/java/com/smartor/mapper/ServiceOutPathMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/ServiceOutPathMapper.java
@@ -60,4 +60,11 @@
* @return 缁撴灉
*/
public int deleteServiceOutPathByIds(Long[] ids);
+
+ /**
+ * 鏌ヨ鑷ID
+ *
+ * @return ID
+ */
+ public Integer selectAutoId();
}
diff --git a/smartor/src/main/java/com/smartor/service/IServiceOutPathService.java b/smartor/src/main/java/com/smartor/service/IServiceOutPathService.java
index 6106b89..f7efea9 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceOutPathService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceOutPathService.java
@@ -58,4 +58,11 @@
* @return 缁撴灉
*/
public int deleteServiceOutPathById(Long id);
+
+ /**
+ * 鏌ヨ鑷ID
+ *
+ * @return ID
+ */
+ public Integer selectAutoId();
}
diff --git a/smartor/src/main/java/com/smartor/service/IServiceTelInfoService.java b/smartor/src/main/java/com/smartor/service/IServiceTelInfoService.java
index 5a1e92a..90d6372 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceTelInfoService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceTelInfoService.java
@@ -10,7 +10,7 @@
*
* @return 缁撴灉
*/
- public List<Map<String,Object>> getList();
+ public List<Map<String,Object>> getList(String orgid);
/**
* 璁剧疆鐢佃瘽鐘舵��
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceOutPathServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceOutPathServiceImpl.java
index a63e655..feda3ae 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceOutPathServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceOutPathServiceImpl.java
@@ -84,4 +84,14 @@
public int deleteServiceOutPathById(Long id) {
return serviceOutPathMapper.deleteServiceOutPathById(id);
}
+
+ /**
+ * 鏌ヨ鑷ID
+ *
+ * @return ID
+ */
+ @Override
+ public Integer selectAutoId() {
+ return serviceOutPathMapper.selectAutoId();
+ }
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
index a0f88b0..615ae41 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
@@ -22,8 +22,11 @@
* @return 缁撴灉
*/
@Override
- public List<Map<String,Object>> getList() {
- List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo where state=0 ");
+ public List<Map<String,Object>> getList(String orgid) {
+ String where=" where (state=0 OR DATE_ADD(editTime, INTERVAL 10 MINUTE)< NOW()) ";
+ if(ObjectUtils.isNotEmpty(orgid))
+ where=where+" and orgid='"+orgid+"'";
+ List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo " +where);
return lists;
}
/**
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
index 4ae0783..54cb39c 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceOutPathMapper.xml
@@ -151,6 +151,9 @@
#{id}
</foreach>
</update>
-
+ <select id="selectAutoId" resultType="Integer" >
+ SELECT AUTO_INCREMENT FROM INFORMATION_SCHEMA.TABLES
+ WHERE TABLE_NAME = 'service_out_path' AND table_schema = DATABASE() and onorgid
+ </select>
</mapper>
--
Gitblit v1.9.3