酒测推送异常数据

liujun001
1 parent f41edf2d
Showing 3 changed files with 29 additions and 28 deletions
Bsth-admin/src/main/java/com/ruoyi/service/SignatureUtils.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/resources/application-druid-lingangPrd.yml
 package com.ruoyi.service;
  
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.DigestUtils;
-
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.TreeMap;
  
 public class SignatureUtils {
-    private final static Logger logger = LoggerFactory.getLogger(SignatureUtils.class);
-
     // 生成签名
-    public static String generateSignature(Map<String, Object> params, String secretKey) {
-        TreeMap<String, Object> sortedParams = new TreeMap<>(params);
+    public static String generateSignature(Map<String, String> params, String secretKey) {
+        TreeMap<String, String> sortedParams = new TreeMap<>(params);
         StringBuilder sb = new StringBuilder();
  
-        for (Map.Entry<String, Object> entry : sortedParams.entrySet()) {
+        for (Map.Entry<String, String> entry : sortedParams.entrySet()) {
             sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
         }
         sb.append("secretKey=").append(secretKey);
@@ -25,19 +19,21 @@ public class SignatureUtils {
         return md5(sb.toString());
     }
  
+    // MD5加密
     private static String md5(String input) {
         try {
-            logger.info("MD5加密之前内容: {}", input);
-            if (input == null || "".equals(input.trim())) {
-                return null;
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] messageDigest = md.digest(input.getBytes());
+            StringBuilder hexString = new StringBuilder();
+
+            for (byte b : messageDigest) {
+                hexString.append(String.format("%02x", b));
             }
-            String md5 = DigestUtils.md5DigestAsHex(input.getBytes());
-            logger.info("MD5加密之后内容: {}", md5);
-            return md5;
-        } catch (Exception e) {
-            logger.error("MD5加密异常:", e);
+
+            return hexString.toString();
+        } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
+            return null;
         }
-        return null;
     }
 }
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.TempCache;
@@ -45,7 +46,6 @@ import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.DateUtil;
-import com.ruoyi.utils.HttpClientUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
@@ -370,7 +370,7 @@ public class ThreadJobService {
  
             if (CollectionUtils.isNotEmpty(newDrivers)) {
                 for (NewDriver newDriver : newDrivers) {
-                    Map<String, Object> map = new HashMap<>();
+                    Map<String, String> map = new HashMap<>();
                     map.put("noticeIssuer", "运控中心");
                     map.put("noticeRecipient", "05-" + newDriver.getJobCode());
                     map.put("noticeTitle", "异常通知");
@@ -386,14 +386,14 @@ public class ThreadJobService {
  
                     map.put("noticeContent", builder.toString());
                     map.put("phone", newDriver.getTelphone());
-                    map.put("smscontent", builder.toString());
+                    map.put("smsContent", builder.toString());
                     map.put("noticeType", "岗前检查");
  
                     String key = SignatureUtils.generateSignature(map, "your_secret_key_here");
                     map.put("signature", key);
                     String result = null;
                     try {
-                        result = HttpUtil.get(processSignExceptionURL, map, 10000);
+                        result = HttpUtil.get(processSignExceptionURL, (Map<String, Object>) JSON.toJSON((map)), 10000);
                         log.info("processSignExceptionURL:[{}],paramMap:[{}],result:[{}]", processSignExceptionURL, JSONUtil.toJsonStr(map), result);
                     } catch (Exception e) {
                         log.error("processSignExceptionURL:[{}],paramMap:[{}],result:[{}]", processSignExceptionURL, JSONUtil.toJsonStr(map), result, e);
@@ -406,19 +406,24 @@ public class ThreadJobService {
     }
  
     public static void main(String[] args) {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
         map.put("noticeIssuer", "运控中心");
         map.put("noticeRecipient", "05-006154");
         map.put("noticeTitle", "异常通知");
-
-
         map.put("noticeContent", "工号：1700003,姓名：测试,工种：驾驶员,排班：有排班,打卡时间：2025-01-07 03:29:20,酒精测试超标，当前测试值达到50mg/100ml。属于饮酒后驾驶机动车");
         map.put("phone", "13681905733");
-        map.put("smscontent", "工号：1700003,姓名：测试,工种：驾驶员,排班：有排班,打卡时间：2025-01-07 03:29:20,酒精测试超标，当前测试值达到50mg/100ml。属于饮酒后驾驶机动车");
+        map.put("smsContent", "工号：1700003,姓名：测试,工种：驾驶员,排班：有排班,打卡时间：2025-01-07 03:29:20,酒精测试超标，当前测试值达到50mg/100ml。属于饮酒后驾驶机动车");
         map.put("noticeType", "岗前检查");
  
         String key = SignatureUtils.generateSignature(map, "your_secret_key_here");
-        System.out.println(key);
+        map.put("signature", key);
+        String result = null;
+        try {
+            result = HttpUtil.get("http://10.10.200.142:9103/commonOpenDataApi/sendAppAndSmsNotice", (Map<String, Object>) JSON.toJSON((map)), 10000);
+            System.out.println(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
  
     private static String[] comStrs(String str) {
@@ -239,6 +239,6 @@ bsth:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     process:
         sign:
-            url: http://10.10.200.171:9103/commonOpenDataApi/sendAppAndSmsNotice
+            url: http://10.10.200.142:9103/commonOpenDataApi/sendAppAndSmsNotice
     audit-jobs: