完善

platform-common/src/main/java/com/platform/common/constant/RedisKeyConstants.java

@@ -21,6 +21,11 @@ public class RedisKeyConstants {
      * 微信 ticket_token
      */
     public static final String WECHAT_TICKET_TOKEN = "ticket_token";
+
+    /**
+     * 华为短信：一个手机号的数量不能超过5条
+     */
+    public static final String HW_SMS = "HW_SMS";
     /**
      * 过期监控业务分隔符
      */

platform-common/src/main/java/com/platform/common/util/SendSms.java

@@ -0,0 +1,343 @@
+package com.platform.common.util;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
+//如果JDK版本是1.8,可使用原生Base64类
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+//如果JDK版本低于1.8,请使用三方库提供Base64类
+//import org.apache.commons.codec.binary.Base64;
+
+public class SendSms {
+
+    //无需修改,用于格式化鉴权头域,给"X-WSSE"参数赋值
+    private static final String WSSE_HEADER_FORMAT = "UsernameToken Username=\"%s\",PasswordDigest=\"%s\",Nonce=\"%s\",Created=\"%s\"";
+    //无需修改,用于格式化鉴权头域,给"Authorization"参数赋值
+    private static final String AUTH_HEADER_VALUE = "WSSE realm=\"SDP\",profile=\"UsernameToken\",type=\"Appkey\"";
+
+    //必填,请参考"开发准备"获取如下数据,替换为实际值
+    private static final String url = "https://rtcsms.cn-north-1.myhuaweicloud.com:10743/sms/batchSendSms/v1"; //APP接入地址+接口访问URI
+    private static final String appKey = "s2i0pqQJ30D2dYu3BXPw43nSc0qx"; //APP_Key
+    private static final String appSecret = "X8At6jIo08fWMIMZx85xCfpvyf2K"; //APP_Secret
+    private static final String sender = "99200620888880005050"; //国内短信签名通道号或国际/港澳台短信通道号
+    private static final String templateId = "dc556371ed4a48dda9a148a7dc050875"; //模板ID
+    private static final String signature = "华为云短信测试"; //签名名称
+
+    private static final String templateId_repair = "dc556371ed4a48dda9a148a7dc050875"; //模板ID
+
+    public static void main(String[] args) throws Exception {
+        //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
+        String receiver = "+8615855129255"; //短信接收人号码
+
+        /**
+         * 选填,使用无变量模板时请赋空值 String templateParas = "";
+         * 单变量模板示例:模板内容为"您的验证码是${1}"时,templateParas可填写为"[\"369751\"]"
+         * 双变量模板示例:模板内容为"您有${1}件快递请到${2}领取"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+         * 模板中的每个变量都必须赋值，且取值不能为空
+         * 查看更多模板和变量规范:产品介绍>模板和变量规范
+         */
+        String templateParas = "[\"369751\"]"; //模板变量，此处以单变量验证码短信为例，请客户自行生成6位验证码，并定义为字符串类型，以杜绝首位0丢失的问题（例如：002569变成了2569）。
+        sendCodeSms(receiver, templateParas);
+
+        /**
+         * 选填,使用无变量模板时请赋空值 String templateParas = "";
+         * 单变量模板示例:模板内容为"您的验证码是${1}"时,templateParas可填写为"[\"369751\"]"
+         * 双变量模板示例:模板内容为"设备${1}发生报修，设备位置${2}，报修人${3}"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+         * 模板中的每个变量都必须赋值，且取值不能为空
+         * 查看更多模板和变量规范:产品介绍>模板和变量规范
+         */
+        String templateParas_repair = "[\"C-001\",\"1号车间\",\"熊超\"]";
+        sendRepairSms(receiver, templateParas_repair);
+    }
+
+    public static void sendCodeSms(String receiver, String templateParas)  throws Exception {
+        //选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+        String statusCallBack = "";
+
+        //请求Body,不携带签名名称时,signature请填null
+        String body = buildRequestBody(sender, receiver, templateId, templateParas, statusCallBack, signature);
+        if (null == body || body.isEmpty()) {
+            System.out.println("body is null.");
+            return;
+        }
+
+        //请求Headers中的X-WSSE参数值
+        String wsseHeader = buildWsseHeader(appKey, appSecret);
+        if (null == wsseHeader || wsseHeader.isEmpty()) {
+            System.out.println("wsse header is null.");
+            return;
+        }
+
+        Writer out = null;
+        BufferedReader in = null;
+        StringBuffer result = new StringBuffer();
+        HttpsURLConnection connection = null;
+        InputStream is = null;
+
+        HostnameVerifier hv = new HostnameVerifier() {
+            @Override
+            public boolean verify(String hostname, SSLSession session) {
+                return true;
+            }
+        };
+        trustAllHttpsCertificates();
+
+        try {
+            URL realUrl = new URL(url);
+            connection = (HttpsURLConnection) realUrl.openConnection();
+            connection.setHostnameVerifier(hv);
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            connection.setUseCaches(true);
+            //请求方法
+            connection.setRequestMethod("POST");
+            //请求Headers参数
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            connection.setRequestProperty("Authorization", AUTH_HEADER_VALUE);
+            connection.setRequestProperty("X-WSSE", wsseHeader);
+
+            connection.connect();
+            out = new OutputStreamWriter(connection.getOutputStream());
+            out.write(body); //发送请求Body参数
+            out.flush();
+            out.close();
+
+            int status = connection.getResponseCode();
+            if (200 == status) { //200
+                is = connection.getInputStream();
+            } else { //400/401
+                is = connection.getErrorStream();
+            }
+            in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            String line = "";
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            System.out.println(result.toString()); //打印响应消息实体
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != out) {
+                    out.close();
+                }
+                if (null != is) {
+                    is.close();
+                }
+                if (null != in) {
+                    in.close();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void sendRepairSms(String receiver, String templateParas)  throws Exception {
+        //选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+        String statusCallBack = "";
+
+        //请求Body,不携带签名名称时,signature请填null
+        String body = buildRequestBody(sender, receiver, templateId_repair, templateParas, statusCallBack, signature);
+        if (null == body || body.isEmpty()) {
+            System.out.println("body is null.");
+            return;
+        }
+
+        //请求Headers中的X-WSSE参数值
+        String wsseHeader = buildWsseHeader(appKey, appSecret);
+        if (null == wsseHeader || wsseHeader.isEmpty()) {
+            System.out.println("wsse header is null.");
+            return;
+        }
+
+        Writer out = null;
+        BufferedReader in = null;
+        StringBuffer result = new StringBuffer();
+        HttpsURLConnection connection = null;
+        InputStream is = null;
+
+        HostnameVerifier hv = new HostnameVerifier() {
+            @Override
+            public boolean verify(String hostname, SSLSession session) {
+                return true;
+            }
+        };
+        trustAllHttpsCertificates();
+
+        try {
+            URL realUrl = new URL(url);
+            connection = (HttpsURLConnection) realUrl.openConnection();
+            connection.setHostnameVerifier(hv);
+            connection.setDoOutput(true);
+            connection.setDoInput(true);
+            connection.setUseCaches(true);
+            //请求方法
+            connection.setRequestMethod("POST");
+            //请求Headers参数
+            connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            connection.setRequestProperty("Authorization", AUTH_HEADER_VALUE);
+            connection.setRequestProperty("X-WSSE", wsseHeader);
+
+            connection.connect();
+            out = new OutputStreamWriter(connection.getOutputStream());
+            out.write(body); //发送请求Body参数
+            out.flush();
+            out.close();
+
+            int status = connection.getResponseCode();
+            if (200 == status) { //200
+                is = connection.getInputStream();
+            } else { //400/401
+                is = connection.getErrorStream();
+            }
+            in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+            String line = "";
+            while ((line = in.readLine()) != null) {
+                result.append(line);
+            }
+            System.out.println(result.toString()); //打印响应消息实体
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (null != out) {
+                    out.close();
+                }
+                if (null != is) {
+                    is.close();
+                }
+                if (null != in) {
+                    in.close();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    /**
+     * 构造请求Body体
+     * @param sender
+     * @param receiver
+     * @param templateId
+     * @param templateParas
+     * @param statusCallBack
+     * @param signature | 签名名称,使用国内短信通用模板时填写
+     * @return
+     */
+    private static String buildRequestBody(String sender, String receiver, String templateId, String templateParas,
+                                   String statusCallBack, String signature) {
+        if (null == sender || null == receiver || null == templateId || sender.isEmpty() || receiver.isEmpty()
+                || templateId.isEmpty()) {
+            System.out.println("buildRequestBody(): sender, receiver or templateId is null.");
+            return null;
+        }
+        Map<String, String> map = new HashMap<String, String>();
+
+        map.put("from", sender);
+        map.put("to", receiver);
+        map.put("templateId", templateId);
+        if (null != templateParas && !templateParas.isEmpty()) {
+            map.put("templateParas", templateParas);
+        }
+        if (null != statusCallBack && !statusCallBack.isEmpty()) {
+            map.put("statusCallback", statusCallBack);
+        }
+        if (null != signature && !signature.isEmpty()) {
+            map.put("signature", signature);
+        }
+
+        StringBuilder sb = new StringBuilder();
+        String temp = "";
+
+        for (String s : map.keySet()) {
+            try {
+                temp = URLEncoder.encode(map.get(s), "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            sb.append(s).append("=").append(temp).append("&");
+        }
+
+        return sb.deleteCharAt(sb.length()-1).toString();
+    }
+
+    /**
+     * 构造X-WSSE参数值
+     * @param appKey
+     * @param appSecret
+     * @return
+     */
+    static String buildWsseHeader(String appKey, String appSecret) {
+        if (null == appKey || null == appSecret || appKey.isEmpty() || appSecret.isEmpty()) {
+            System.out.println("buildWsseHeader(): appKey or appSecret is null.");
+            return null;
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        String time = sdf.format(new Date()); //Created
+        String nonce = UUID.randomUUID().toString().replace("-", ""); //Nonce
+
+        MessageDigest md;
+        byte[] passwordDigest = null;
+
+        try {
+            md = MessageDigest.getInstance("SHA-256");
+            md.update((nonce + time + appSecret).getBytes());
+            passwordDigest = md.digest();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+
+        //如果JDK版本是1.8,请加载原生Base64类,并使用如下代码
+        String passwordDigestBase64Str = Base64.getEncoder().encodeToString(passwordDigest); //PasswordDigest
+        //如果JDK版本低于1.8,请加载三方库提供Base64类,并使用如下代码
+        //String passwordDigestBase64Str = Base64.encodeBase64String(passwordDigest); //PasswordDigest
+        //若passwordDigestBase64Str中包含换行符,请执行如下代码进行修正
+        //passwordDigestBase64Str = passwordDigestBase64Str.replaceAll("[\\s*\t\n\r]", "");
+        return String.format(WSSE_HEADER_FORMAT, appKey, passwordDigestBase64Str, nonce, time);
+    }
+
+    /*** @throws Exception
+     */
+    static void trustAllHttpsCertificates() throws Exception {
+        TrustManager[] trustAllCerts = new TrustManager[] {
+                new X509TrustManager() {
+                    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                        return;
+                    }
+                    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+                        return;
+                    }
+                    public X509Certificate[] getAcceptedIssuers() {
+                        return null;
+                    }
+                }
+        };
+        SSLContext sc = SSLContext.getInstance("SSL");
+        sc.init(null, trustAllCerts, null);
+        HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+    }
+}
+

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -48,6 +48,7 @@ import com.platform.service.repair.RepairFormService;
 import com.platform.service.sb.SbInfoService;
 import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.upms.SysUserService;
+import com.platform.service.wechat.util.WeChatMessageUtil;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -249,17 +250,23 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         model.setNo(IdGeneratorUtils.getRepairApplicaitonFormNo(++count));
 
         // 循环给第一维修人和第二维修人发消息
+        List<String> openIds = new ArrayList<>();
         List<String> userIds = new ArrayList<>();
         List<String> mails = new ArrayList<>();
         SbInfo sbInfo = sbInfoService.getModelById(model.getSbId());
+
+        String receiver = "";
         if(StringUtils.isNotBlank(sbInfo.getRepairUser())){
             SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUser());
+            receiver = user.getPhone();
             userIds.add(sbInfo.getRepairUser());
+            openIds.add(user.getWxOpenid());
             mails.add(user.getEmail());
         }
         if(StringUtils.isNotBlank(sbInfo.getRepairUserSecond())){
             SysUserVO user = sysUserService.selectUserVO(sbInfo.getRepairUserSecond());
             userIds.add(sbInfo.getRepairUserSecond());
+            openIds.add(user.getWxOpenid());
             mails.add(user.getEmail());
         }
         model.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
@@ -287,6 +294,35 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 MessageTemplateUtil.getFreemarkerHtmlContent(repairUrl,model,sb),
                 model.getId(), userIds, mails));
 
+        // 发送微信通知给第一维修人，第二维修人
+      /*  for(String openId : openIds){
+            WeChatMessageUtil.repairMessage( openId, repairUrl,model,sb);
+        }*/
+        // 发送短信通知给第一维修人,省钱，其他人不发短信
+        if(StringUtils.isNotBlank(receiver)){
+            // String templateParas_repair = "[\"C-001\",\"1号车间\",\"熊超\"]";
+            String templateParas_repair = "[\"" + sb.getNo() + "\",\"" + model.getSbCph()  + "\",\""+ model.getActualUser()+ "\"]";
+            try {
+                String numStr = RedisUtils.getString(RedisKeyConstants.HW_SMS);
+                boolean isSend = false;
+                if(StringUtils.isBlank(numStr)){
+                   isSend =true;
+                   RedisUtils.setString(RedisKeyConstants.HW_SMS + receiver, "1",24, TimeUnit.HOURS);
+                }else if( Integer.valueOf(numStr)<5){
+                    isSend =true;
+                    RedisUtils.setString(RedisKeyConstants.HW_SMS + receiver, String.valueOf(Integer.valueOf(numStr) + 1),24, TimeUnit.HOURS);
+                }
+                if(isSend){
+                    System.out.println("templateParas_repair: " + templateParas_repair);
+                    String template = "[\"369751\"]";
+                    SendSms.sendCodeSms(receiver, template);
+                    // SendSms.sendRepairSms(receiver, templateParas);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
         // 启动接收超时监控
         String minuteStr = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_WARN_MINUTE.name());
         int minute = 30;// 默认30分钟

platform-service/src/main/java/com/platform/service/wechat/model/request/WechatTemplateRequestBuilder.java

@@ -14,25 +14,30 @@ import java.util.Map;
 
 
 public class WechatTemplateRequestBuilder {
-	
+
 	/**
 	 * 通用模板keys 模板ID:H9d_l46Xjfm8PuxdDtjTBGy0K4krJzS8LMRQTvwRMcU  交易提醒
 	 */
 	public static String[] COMMON_TEMPLATE_KEYS = new String[]{"first", "OPERATE", "AMT", "STATUS", "DATE", "remark"};
-	
+
 	/**
 	 * 登录提醒模板keys 模板ID:XR41muCzGBkF_2HZb-H9suLIF18ZXqdVsBA3pCx-kyk  登录提醒
 	 */
 	public static String[] LOGIN_TEMPLATE_KEYS = new String[]{"first", "keyword1", "keyword2","keyword3", "remark"};
-	
-	/**
+
+    /**
+     * 维修提醒模板keys 模板ID:njA6sdMf0EPi1k8iruwe2aw0miH6q-0AvB_GCEyzJpE  维修提醒
+     */
+    public static String[] TEMPLATE_KEYS_REPAIR = new String[]{"first", "keyword1", "keyword2","keyword3", "keyword4", "remark"};
+
+    /**
 	 * 修改提醒模板keys 模板6VegnWIea-Gj1F1GeLPFlekkznoPaqS-vs1H-liFp10  修改提醒
 	 */
 	public static String[] UPDATE_TEMPLATE_KEYS = new String[]{"first", "keyword1", "keyword2", "keyword3", "remark"};
 
 	/**
 	 * 模版消息请求参数
-	 * 
+	 *
 	 * @param url
 	 *            详情信息url，用户点击url跳转到详情
 	 * @param templateId
@@ -68,7 +73,7 @@ public class WechatTemplateRequestBuilder {
 		wechatTemplateRequest.setData(m);
 		return wechatTemplateRequest;
 	}
-	
+
 	/**
 	 * 模版消息请求参数--交易：充值，提现，投资，放款，还款等
 	 * {{first.DATA}}
@@ -114,7 +119,7 @@ public class WechatTemplateRequestBuilder {
 		wechatTemplateRequest.setData(m);
 		return wechatTemplateRequest;
 	}
-	
+
 	/**
 	 * 获取开头语
 	 * 尊敬的路人甲，您发起的：
@@ -124,7 +129,7 @@ public class WechatTemplateRequestBuilder {
 	public static String getCommonFirstContent(String userName){
 		return "亲爱的用户[" + userName + "]，您发起的:";
 	}
-	
+
 	/**
 	 * {{first.DATA}}
 	 * 账户名称：{{keyword1.DATA}}
@@ -165,7 +170,7 @@ public class WechatTemplateRequestBuilder {
 		wechatTemplateRequest.setData(m);
 		return wechatTemplateRequest;
 	}
-	
+
 	/**
 	 * 获取开头语
 	 * 尊敬的路人甲，您发起的：
@@ -175,7 +180,7 @@ public class WechatTemplateRequestBuilder {
 	public static String getLoginFirstContent(String userName){
 		return "亲爱的用户[" + userName + "]，您已成功登录！";
 	}
-	
+
 	/**
 	 * 模版消息请求参数--修改操作
 	 *  {{first.DATA}}
@@ -217,7 +222,7 @@ public class WechatTemplateRequestBuilder {
 		wechatTemplateRequest.setData(m);
 		return wechatTemplateRequest;
 	}
-	
+
 
 	/**
 	 * 获取开头语
@@ -229,26 +234,47 @@ public class WechatTemplateRequestBuilder {
 		return "亲爱的用户[" + userName + "]，您已成功修改" + item + "。";
 	}
 
-//	/**
-//	 * 菜单
-//	 *
-//	 */
-//	public static Menu getMenu() {
-//		CommonButton btn11 = new CommonButton();
-//		btn11.setName("授权绑定微信");
-//		btn11.setType(ButtonTypeEnum.VIEW.getValue());
-//		btn11.setUrl("http://www.yuexiang.cn/wechat/bind");
-//
-//		ComplexButton mainBtn1 = new ComplexButton();
-//		mainBtn1.setName("绑定微信");
-//		// 一级下有4个子菜单
-//		mainBtn1.setSub_button(new CommonButton[] { btn11 });
-//
-//		// 封装整个菜单
-//		Menu menu = new Menu();
-//		menu.setButton(new BaseButton[] { mainBtn1 });
-//
-//		return menu;
-//	}
+    /**
+     * {{first.DATA}}
+     * 报修机台：{{keyword1.DATA}}
+     * 报修人：{{keyword2.DATA}}
+     * 报修时间：{{keyword3.DATA}}
+     * 报修描述：{{keyword4.DATA}}
+     * {{remark.DATA}}
+     *
+     * 您有接受到一个报修消息！
+     * 报修机台：粗纱001
+     * 报修人：张三
+     * 报修时间：2019-1-26 19:20:23
+     * 报修描述：电机坏了
+     * 请及时进行维修处理
+     *
+     * @param url
+     *            详情信息url，用户点击url跳转到详情
+     * @param templateId
+     *            模版id
+     * @param openId
+     *            用户微信id
+     * @param values
+     *            模版消息value数组
+     * @param colors
+     *            消息字体颜色
+     */
+    public static WechatTemplateRequest getRepairRequest(String url, String templateId, String openId, String[] values, String[] colors) {
+        WechatTemplateRequest wechatTemplateRequest = new WechatTemplateRequest();
+        wechatTemplateRequest.setUrl(url);
+        wechatTemplateRequest.setTemplate_id(templateId);
+        wechatTemplateRequest.setTouser(openId);
+        // 填充模版数据
+        Map<String, WechatTemplateRequestData> m = new HashMap<String, WechatTemplateRequestData>();
+        for (int i = 0; i < TEMPLATE_KEYS_REPAIR.length; i++) {
+            WechatTemplateRequestData data = new WechatTemplateRequestData();
+            data.setValue(values[i]);
+            data.setColor(colors[i]);
+            m.put(TEMPLATE_KEYS_REPAIR[i], data);
+        }
+        wechatTemplateRequest.setData(m);
+        return wechatTemplateRequest;
+    }
 
 }

platform-service/src/main/java/com/platform/service/wechat/service/WeChatConnectService.java

@@ -34,14 +34,17 @@ import java.util.Date;
 @Slf4j
 public class WeChatConnectService {
 
-    // 微信token，把这个配置到微信：消息推送平台Token(令牌)
+    // 微信token，把这个配置到微信：消息推送平台Token(令牌), 乾元的
+   // public static final String ACCESS_TOKEN = "wwwqykh2009com";
+   // private static final String APPID = "wx6e063fb37c1ba333";
+    //   private static final String APPSECRET = "e74b6b4d7582ed12b141c62e7737af20";
+    // 微信token，把这个配置到微信：消息推送平台Token(令牌), 重庆建设集团
     public static final String ACCESS_TOKEN = "wwwqykh2009com";
+    private static final String APPID = "wx43364e4c23c5a89d";
+    private static final String APPSECRET = "MXTCTc6QzahLKuKwvRyh4jFHgCdwdkhKBiNhPEpvQHn";
 
-    private static final String APPID = "wx6e063fb37c1ba333";
-//    private static final String APPID = DictCache.getLabelByValue(DictTypeEnum.WECHAT.getType(), CommonConstants.WECHAT_APP_ID);
-
-    private static final String APPSECRET = "e74b6b4d7582ed12b141c62e7737af20";
-//    private static final String APPSECRET = DictCache.getLabelByValue(DictTypeEnum.WECHAT.getType(), CommonConstants.WECHAT_APP_ID);
+    //  private static final String APPID = DictCache.getLabelByValue(DictTypeEnum.WECHAT.getType(), CommonConstants.WECHAT_APP_ID);
+    //   private static final String APPSECRET = DictCache.getLabelByValue(DictTypeEnum.WECHAT.getType(), CommonConstants.WECHAT_APP_ID);
 
     // 获取access token的授权类型
     private static final String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token";

platform-service/src/main/java/com/platform/service/wechat/util/WeChatMessageUtil.java

@@ -4,7 +4,9 @@ import com.platform.common.cache.ConfigCache;
 import com.platform.common.util.DateUtils;
 import com.platform.common.util.SpringContextHolder;
 import com.platform.common.util.StringUtils;
+import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.enums.SysConfigEnum;
+import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.event.WechatEvent;
 import com.platform.service.wechat.model.request.WechatTemplateRequestBuilder;
 import com.platform.service.wechat.model.request.template.WechatTemplateRequest;
@@ -19,7 +21,9 @@ import java.time.LocalDateTime;
  */
 @Slf4j
 public class WeChatMessageUtil {
-
+    private static String url = "http://h5.demo.qykh2009.com/";
+    private static String template_id_login = "ckoOKCyzY4cMBznwhfabNwpVBLK3cqxQdvEnAeV-Nwk";
+    private static String template_id_repair = "njA6sdMf0EPi1k8iruwe2aw0miH6q-0AvB_GCEyzJpE";
     private static boolean isSend() {
         String isSend = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.IS_SEND_WX_MESSAGE.name());
         return "1".equals(isSend);
@@ -47,4 +51,38 @@ public class WeChatMessageUtil {
         }
     }
 
+    /**
+     * 报修微信通知
+     *
+     * @param url
+     * @param model
+     * @param vo
+     */
+    public static void repairMessage(String openId, String url, RepairApplicationFormDTO model, SbInfoVO vo) {
+        try {
+            if (isSend() && StringUtils.isNotBlank(openId)) {
+                String systemName = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.SYSTEM_NAME.name());
+                if (StringUtils.isBlank(systemName)) {
+                    systemName = "设备管理系统";
+                }
+                WechatTemplateRequest request = WechatTemplateRequestBuilder.
+                        getRepairRequest(url,
+                                template_id_repair,
+                                openId,
+                                new String[]{
+                                        "有新的报修消息等待您接收",
+                                        vo.getNo(),
+                                        model.getActualUser(),
+                                        DateUtils.dateToString(model.getApplyTime()),
+                                        model.getContent(),
+                                        vo.getName()
+                                }, new String[]{"#000000",
+                                        "#000000", "#000000", "#000000", "#000000", "#000000" });
+                SpringContextHolder.publishEvent(new WechatEvent(request));
+            }
+        } catch (Exception e) {
+            log.error("发送微信消息失败", e);
+        }
+    }
+
 }