From 1d4a5e64b2ce21342d35c9c2c85f353508f06a39 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 28 四月 2025 18:48:38 +0800
Subject: [PATCH] 代码提交
---
/dev/null | 48 ----------------
ruoyi-admin/src/main/java/com/ruoyi/web/test/WeChatService.java | 27 ---------
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 6 --
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java | 5 -
ruoyi-admin/src/main/java/com/ruoyi/web/task/PhoneTask.java | 5 -
ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java | 8 +-
ruoyi-admin/src/main/resources/application-druid.yml | 16 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 7 --
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 17 -----
ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java | 16 +++++
10 files changed, 29 insertions(+), 126 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 88ce994..1717887 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
@@ -1,6 +1,5 @@
package com.ruoyi.web.component;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -11,8 +10,6 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.smartor.common.SendService;
-import com.smartor.config.RobotPhoneUtils;
import com.smartor.domain.*;
import com.smartor.mapper.PatArchiveMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
@@ -20,7 +17,6 @@
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceSubtaskRecordService;
-import com.smartor.service.ISvyTaskTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,10 +26,7 @@
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.stereotype.Component;
-import java.net.URLEncoder;
import java.security.MessageDigest;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index 1c075bd..dd7e71e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -12,7 +12,6 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.common.SendService;
import com.smartor.domain.*;
import com.smartor.service.IServiceSubtaskService;
import com.smartor.service.IServiceTaskService;
@@ -22,12 +21,9 @@
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
import java.util.List;
import java.util.stream.Collectors;
@@ -56,19 +52,6 @@
@Autowired
private RSAPublicKeyExample rsaPublicKeyExample;
-
- @Autowired
- private SendService sendService;
-
- @PostMapping("/test")
- public TableDataInfo test(@RequestBody SendMagParam sendMagParam) {
- try {
- Boolean aBoolean = sendService.sendMsg(sendMagParam);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
/**
* 鏌ヨ璇煶浠诲姟鍒楄〃
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/WeChatController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/WeChatController.java
deleted file mode 100644
index 60fb6be..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/WeChatController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.ruoyi.web.controller.smartor.tools;
-
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.smartor.domain.WeChatSendVo;
-import com.smartor.service.WeChatService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 寰俊鎺ュ彛
- *
- * @author liusheng
- * @date 2023-05-15
- */
-@Api(description = "寰俊鎺ュ彛")
-@RestController
-@RequestMapping("/smartor/wechat")
-@PropertySource(value = {"classpath:application-druid.yml"})
-public class WeChatController extends BaseController {
-
- @Value("${appid}")
- private String appid;
-
- @Value("${appSecret}")
- private String appSecret;
-
- @Autowired
- private WeChatService weChatService;
-
-
- /**
- * 鑾峰彇妯℃澘淇℃伅
- *
- * @return
- */
- @ApiOperation("鑾峰彇妯℃澘淇℃伅")
- @GetMapping("/getTemplateList")
- public JSONArray getTemplateList() {
- String url = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=" + getAccessToken();
- OkHttpClient httpClient = new OkHttpClient();
- Request request = new Request.Builder().url(url).build();
- try {
- Response response = httpClient.newCall(request).execute();
- JSONObject jsonObject = JSONObject.parseObject(response.body().string());
- return jsonObject.getJSONArray("template_list");
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
-
- /**
- * 寰俊鍏紬鍙蜂俊鎭彂閫�
- *
- * @param weChatSendVo
- * @return
- */
-// @ApiOperation("寰俊鍏紬鍙蜂俊鎭彂閫�")
-// @PostMapping("/sendMessageToFollowers")
-// public AjaxResult sendMessageToFollowers(@RequestBody WeChatSendVo weChatSendVo) {
-// return toAjax(weChatService.sendMessageToFollowers(weChatSendVo));
-// }
-
-
- /**
- * 鑾峰彇 access_token
- */
- public String getAccessToken() {
- String accessTokenUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + appSecret;
- OkHttpClient httpClient = new OkHttpClient();
- Request request = new Request.Builder().url(accessTokenUrl).build();
- try {
- Response response = httpClient.newCall(request).execute();
- JSONObject jsonObject = JSONObject.parseObject(response.body().string());
- return jsonObject.getString("access_token");
- } catch (IOException e) {
- e.printStackTrace();
- return null;
- }
- }
-
-
-}
-
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/task/PhoneTask.java b/ruoyi-admin/src/main/java/com/ruoyi/web/task/PhoneTask.java
index 25be19e..c51f16e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/task/PhoneTask.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/task/PhoneTask.java
@@ -5,7 +5,6 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
-import com.smartor.common.SendService;
import com.smartor.config.PhoneUtils;
import com.smartor.config.RobotPhoneUtils;
import com.smartor.domain.*;
@@ -22,17 +21,15 @@
private List<IvrTaskTemplateScriptVO> ivrTaskTemplateScriptVO;
private RedisCache redisCache;
private IvrTaskTemplateVO ivrTaskTemplateVO;
- private SendService sendService;
private String phonePath;
private RobotPhoneUtils robotPhoneUtils;
- public PhoneTask(ServiceSubtask ivrTaskSingle, IvrTaskTemplateVO ivrTaskTemplateVO, RedisCache redisCache, SendService sendService, String phonePath, RobotPhoneUtils robotPhoneUtils) {
+ public PhoneTask(ServiceSubtask ivrTaskSingle, IvrTaskTemplateVO ivrTaskTemplateVO, RedisCache redisCache, String phonePath, RobotPhoneUtils robotPhoneUtils) {
this.ivrTaskSingle = DtoConversionUtils.sourceToTarget(ivrTaskSingle, ServiceSubtask.class);
this.ivrTaskTemplateScriptVO = DtoConversionUtils.sourceToTarget(ivrTaskTemplateVO.getIvrTaskTemplateScriptVOList(), IvrTaskTemplateScriptVO.class);
this.ivrTaskTemplateVO = DtoConversionUtils.sourceToTarget(ivrTaskTemplateVO, IvrTaskTemplateVO.class);
this.redisCache = redisCache;
- this.sendService = sendService;
this.phonePath = phonePath;
this.robotPhoneUtils = robotPhoneUtils;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
index 49171a6..619c540 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java
@@ -14,6 +14,7 @@
import java.io.*;
import java.math.BigInteger;
import java.nio.file.Files;
+import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -21,6 +22,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import static cn.hutool.core.convert.Convert.toHex;
import static org.eclipse.jetty.http.HttpGenerator.CHUNK_SIZE;
//@SpringBootTest
@@ -62,6 +64,20 @@
}
+ public static String encode(String arg) {
+ if (arg == null) {
+ arg = "";
+ }
+ MessageDigest md5 = null;
+ try {
+ md5 = MessageDigest.getInstance("MD5");
+ md5.update(arg.getBytes("UTF-8"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return toHex(md5.digest());
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/WeChatService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/WeChatService.java
index f0e7b20..2492d50 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/WeChatService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/WeChatService.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.web.controller.smartor.tools.WeChatController;
import com.smartor.domain.WeChatSendVo;
import me.chanjar.weixin.common.exception.WxErrorException;
import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
@@ -59,30 +58,4 @@
}
}
- public static void main(String[] args) {
-// String appId = "wx1c5243d2337753f4";
-// String appSecret = "84a2186a0d175e88345267c716516cd3";
-// WeChatService weChatService = new WeChatService(appId, appSecret);
-// weChatService.sendMessageToFollowers("浣犲湪璇村暐鍛紵锛燂紵锛�");
-// // new com.smartor.controller.BaseSmsaccountController().sendMessageToFollowers("AIJSl-IF6M05NzaXofPYbT5wgSP3bWH7I9OBmvJqsaU","www.baidu.com");
- WeChatController weChatController = new WeChatController();
- JSONArray templateList = weChatController.getTemplateList();
- for (int i = 0; i < templateList.size(); i++) {
- JSONObject template = templateList.getJSONObject(i);
- System.out.println("Template ID: " + template.getString("template_id"));
- System.out.println("Title: " + template.getString("title"));
- System.out.println("Content: " + template.getString("content"));
- System.out.println("===============================");
- WeChatSendVo weChatSendVo = new WeChatSendVo();
- weChatSendVo.setTemplateId(template.getString("template_id"));
- Map<String, Object> map = new HashMap<>();
- map.put("first", "姝﹀櫒鐨勫崱");
- map.put("keyword1", "鐪嬫垜浠樻鐪嬫垜浠樻鏈紑鏀剧湅鎴戜粯娆�");
- map.put("keyword2", "12657698798797");
- map.put("remark", "鍟婂晩鎾掑晩鍟婂晩");
- weChatSendVo.setContent(map);
-// weChatController.sendMessageToFollowers(weChatSendVo);
- }
-
- }
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 980a88d..d772950 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -13,10 +13,10 @@
# 鍏徃
# url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 涓芥按
- # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: smartor
- # password: Smartor.2023
- # driverClassName: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: smartor
+ password: Smartor.2023
+ driverClassName: com.mysql.cj.jdbc.Driver
# # 鏂板崕
# url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: smartor
@@ -24,10 +24,10 @@
# driverClassName: com.mysql.cj.jdbc.Driver
# 鍏徃浜�
- url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: hxsoft
- password: Hxerp2000
- driverClassName: com.mysql.cj.jdbc.Driver
+# url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# username: hxsoft
+# password: Hxerp2000
+# driverClassName: com.mysql.cj.jdbc.Driver
# 浠庡簱鏁版嵁婧�
slave:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
index 24dca07..827aaab 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/WxGZHEnum.java
@@ -9,7 +9,8 @@
* 涓芥按鍏紬鍙�
*/
public enum WxGZHEnum {
- ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://192.168.10.170:18001/frontend/medical/api"), JN("47255004333112711A1001", null, null, null);
+ ZYY("47231022633110211A2101", "3311000002", "MzMxMTAwMDAwMg==", "http://192.168.10.170:18001/frontend/medical/api"),
+ JN("47255004333112711A1001", null, null, null);
private String orgid;
@@ -25,19 +26,18 @@
}
public static List<String> getDescByCode(String orgid) {
+ List<String> list = new ArrayList<>();
WxGZHEnum[] organEnums = values();
for (int i = 0; i < organEnums.length; i++) {
WxGZHEnum organEnum = organEnums[i];
if (organEnum.getOrgid().equals(orgid)) {
- List<String> list = new ArrayList<>();
if (StringUtils.isEmpty(organEnum.getOrgid())) list.add(organEnum.getOrgid());
if (StringUtils.isEmpty(organEnum.getAppid())) list.add(organEnum.getAppid());
if (StringUtils.isEmpty(organEnum.getAppSecret())) list.add(organEnum.getAppSecret());
if (StringUtils.isEmpty(organEnum.getAddress())) list.add(organEnum.getAddress());
- return list;
}
}
- return null;
+ return list;
}
public String getOrgid() {
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 9be2bab..4191ba6 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
@@ -1,8 +1,6 @@
package com.ruoyi.quartz.task;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
-import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.reflect.TypeToken;
@@ -12,18 +10,15 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.ServiceFromEnum;
import com.ruoyi.common.enums.WxGZHEnum;
-import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.smartor.common.SendService;
import com.smartor.domain.*;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.mapper.ServiceTaskMapper;
import com.smartor.mapper.SysUserImportMapper;
import com.smartor.service.*;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -36,7 +31,6 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.lang.reflect.Type;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
diff --git a/smartor/src/main/java/com/smartor/common/SendService.java b/smartor/src/main/java/com/smartor/common/SendService.java
deleted file mode 100644
index 4eef100..0000000
--- a/smartor/src/main/java/com/smartor/common/SendService.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.smartor.common;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.smartor.domain.*;
-import com.smartor.mapper.PatWildcardMapper;
-import com.smartor.service.DingTalkService;
-import com.smartor.service.ISmsParamService;
-import com.smartor.service.WeChatService;
-import com.smartor.service.impl.BaseSmsaccountServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍙戦�佹湇鍔″伐鍏风被
- */
-@Slf4j
-@Component
-public class SendService {
- @Autowired
- private BaseSmsaccountServiceImpl baseSmsaccountService;
-
- @Autowired
- private DingTalkService dingTalkService;
-
- @Autowired
- private PatWildcardMapper patWildcardMapper;
-
- @Autowired
- private WeChatService weChatService;
-
- @Autowired
- ISmsParamService iSmsParamService;
-
- @Value("${xhsmsPath}")
- private String xhsmsPath;
- // 甯愬彿
- @Value("${xhsmsAccount}")
- private String xhsmsAccount;
- // 鎺ュ彛瀵嗙爜
- @Value("${xhsmsPwd}")
- private String xhsmsPwd;
- // 铏氭嫙鎺ュ叆鐮�
- @Value("${xhsmsjrm}")
- private String xhsmsjrm;
-
- public Boolean sendMsg(SendMagParam sendMagParam) throws UnsupportedEncodingException, JsonProcessingException {
- // 1,澶氬獟浣� 2,绾歌川 3,鐢佃瘽 4,鐭俊 5.寰俊鍏紬鍙� 6.寰俊灏忕▼搴� 7.鏀粯瀹� 8.鏅鸿兘灏忕▼搴� 9.閽夐拤
- switch (sendMagParam.getType()) {
- case ("1"):
-
- case ("2"):
-
- case ("3"):
-
- case ("4"):
- //鐭俊
- Map<String, String> map2 = new HashMap<>();
- map2.put("action", "send");
- map2.put("account", xhsmsAccount);
- map2.put("password", xhsmsPwd);
- map2.put("mobile", sendMagParam.getPhone());
- map2.put("content", sendMagParam.getContent());
- map2.put("extno", xhsmsjrm);
- map2.put("rt", "json");
- StringBuilder encodedParams = new StringBuilder();
-
- for (Map.Entry<String, String> entry : map2.entrySet()) {
- if (encodedParams.length() > 0) {
- encodedParams.append("&");
- }
- // 瀵归敭鍜屽�艰繘琛孶RL缂栫爜
- String encodedKey = URLEncoder.encode(entry.getKey(), "UTF-8");
- String encodedValue = URLEncoder.encode(entry.getValue(), "UTF-8");
- encodedParams.append(encodedKey).append("=").append(encodedValue);
- }
-
- String result = HttpUtils.sendPost(xhsmsPath, encodedParams.toString());
- ObjectMapper objectMapper2 = new ObjectMapper();
- Map<String, Object> map3 = objectMapper2.readValue(result, new TypeReference<Map<String, Object>>() {
- });
- if (ObjectUtils.isNotEmpty(map3)) {
- String status = map3.get("status").toString();
- if (status.equals("0")) {
- return true;
- }
- }
- log.error("鐭俊鍙戦�佸け璐ap:{}, 杩斿洖鐨勪俊鎭负:{}", map2, result);
- return false;
- case ("5"):
- //鍏紬鍙�
-// String params = "service=smarthos.yygh.ApiService.push&idcard=" + sendMagParam.getIdcard() + "&url=" + sendMagParam.getUrl() + "&keyword1=null&keyword2=null&keyword3=null&keyword4=null";
-// String result = HttpUtils.sendPost("/api", params);
-// JSONObject jsonObject = JSONObject.parseObject(result);
-// String code = (String) jsonObject.get("code");
-// if (!code.equals(0)) {
-// log.error("寰俊鍏紬鍙锋秷鎭彂閫佸け璐ヤ簡锛歿}", sendMagParam);
-// return false;
-// }
-// return true;
-
- WeChatSendVo weChatSendVo = new WeChatSendVo();
- weChatSendVo.setUrl(sendMagParam.getUrl());
- weChatSendVo.setTemplateId(sendMagParam.getTmpCode());
- ObjectMapper objectMapper = new ObjectMapper();
- Map map = null;
- try {
- map = objectMapper.readValue(sendMagParam.getContent(), Map.class);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- weChatSendVo.setContent(map);
- weChatSendVo.setOpenid(sendMagParam.getOpenid());
- Boolean aBoolean1 = weChatService.sendMessageToFollowers(weChatSendVo);
- return aBoolean1;
- case ("6"):
-
- case ("7"):
-
- case ("8"):
-
- case ("9"):
- DingTalkReqVo dingTalkReqVo = new DingTalkReqVo();
- Boolean aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
- if (aBoolean) {
- return true;
- }
- default:
- return false;
- }
-
- }
-
- /**
- * 瀵归棶棰樹腑鐨勯�氶厤绗﹁繘琛屽尮閰�
- *
- * @param script
- * @param patArchive
- * @return
- */
- public String patWildcard(String script, PatArchive patArchive) {
- List<PatWildcard> patWildcards = patWildcardMapper.selectPatWildcardList(new PatWildcard());
- for (PatWildcard patWildcard : patWildcards) {
- try {
- //鑾峰彇鎮ｈ�呭搴旂殑瀛楁鐨勫��
- Field field = patArchive.getClass().getField(patWildcard.getPatField());
- field.setAccessible(true);
- String value = field.get(patArchive).toString();
- //灏嗛棶棰樹腑鐨勯�氶厤绗﹁繘琛屾浛鎹�
- script.replaceAll(patWildcard.getWildcard(), value);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- return script;
- }
-}
diff --git a/smartor/src/main/java/com/smartor/service/WeChatService.java b/smartor/src/main/java/com/smartor/service/WeChatService.java
deleted file mode 100644
index 612dec7..0000000
--- a/smartor/src/main/java/com/smartor/service/WeChatService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.smartor.service;
-
-import com.smartor.domain.WeChatSendVo;
-import org.springframework.web.bind.annotation.RequestBody;
-
-public interface WeChatService {
- public Boolean sendMessageToFollowers(@RequestBody WeChatSendVo weChatSendVo);
-}
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 47d2c90..29b9d5d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.*;
import com.smartor.common.FtpService;
-import com.smartor.common.SendService;
import com.smartor.config.PhoneUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -24,7 +23,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.Duration;
@@ -109,9 +107,6 @@
@Autowired
private RedisTemplate redisTemplate;
-
- @Autowired
- private SendService sendService;
@Value("${hangup}")
private String hangup;
diff --git a/smartor/src/main/java/com/smartor/service/impl/WeChatServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/WeChatServiceImpl.java
deleted file mode 100644
index d2445b8..0000000
--- a/smartor/src/main/java/com/smartor/service/impl/WeChatServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.smartor.service.impl;
-
-import com.smartor.domain.WeChatSendVo;
-import com.smartor.service.WeChatService;
-import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class WeChatServiceImpl implements WeChatService {
- @Value("${appid}")
- private String appid;
-
- @Value("${appSecret}")
- private String appSecret;
-
- @Override
- public Boolean sendMessageToFollowers(WeChatSendVo weChatSendVo) {
- WxMpService wxMpService;
- wxMpService = new WxMpServiceImpl();
- wxMpService.setWxMpConfigStorage(new WxMpInMemoryConfigStorage());
- WxMpInMemoryConfigStorage wxMpConfigStorage = (WxMpInMemoryConfigStorage) wxMpService.getWxMpConfigStorage();
- wxMpConfigStorage.setAppId(appid);
- wxMpConfigStorage.setSecret(appSecret);
- try {
- List<String> openIdList = wxMpService.getUserService().userList(null).getOpenids();
-// for (String openId : openIdList) {
- WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder().toUser(weChatSendVo.getOpenid()).templateId(weChatSendVo.getTemplateId()).url(weChatSendVo.getUrl()).build();
- for (String key : weChatSendVo.getContent().keySet()) {
- templateMessage.addData(new WxMpTemplateData(key, weChatSendVo.getContent().get(key).toString()));
- }
- wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
-// }
- } catch (WxErrorException e) {
- e.printStackTrace();
- }
- return true;
-
- }
-}
--
Gitblit v1.9.3