修改迁移

src/main/java/com/pub/util/MqttUtil.java

@@ -28,9 +28,9 @@ import com.wxxcx.ws.PushMsgWebSocket;
 
 @Slf4j
 public class MqttUtil {
-    //    private static String HOST = "tcp://119.45.12.173:1883";
+        private static String HOST = "tcp://119.45.12.173:1883";
     //	测试websocket
-    private static String HOST = "tcp://43.137.10.199:1883";
+//    private static String HOST = "tcp://43.137.10.199:1883";
     private static String clientId = UUID.randomUUID().toString();
     private static String username = "lnradar";
     private static String password = "lnradar";
@@ -61,6 +61,7 @@ public class MqttUtil {
         sub("/das/realtime_pos");
         sub("/das/dev_status");
         sub("/das/exist");
+        sub("/das/alarm_event");
     }
 
     public static void init() throws MqttException {
@@ -266,14 +267,64 @@ public class MqttUtil {
                                 }
                                 System.out.println("mqttutil--当前useropenid=" + user.getOpenid() +", fwhopenId=" + fwhOpenId);
                                 System.out.println("发送微信公众号信息：devName=" + dev_name.toString() + ", phoneNo=" + user.getPhone() + "fwhOpenId=" + fwhOpenId);
-//                                log.info("mqttutil--发送微信公众号信息：devName=" + dev.getDev_name() + ", phoneNo=" + phoneNo + "fwhOpenId=" + fwhOpenId);
-                                wxSendMessage.queryAccessToken(devId, dev_name.toString(), user.getPhone(), fwhOpenId);
+                                wxSendMessage.queryAccessToken(devId, dev_name.toString(), user.getPhone(), fwhOpenId, "设备检测到跌倒，请前往小程序查看详细信息");
                                 System.out.println("发送微信公众号消息发完了");
                             }
 
                         }
                     }
                 }
+                if (topic.equals("/das/alarm_event")) {
+                    JSONObject obj = JSONObject.parseObject(pl);
+                    String dev_id = obj.getString("dev_id");
+
+                    List<DevVO> devs = baseDAO.queryAllByCondition(DevVO.class, " and dev_id='" + dev_id + "' ", null);
+
+                    List<String> openids = new ArrayList<String>();
+                    StringBuffer dev_name = new StringBuffer("");
+                    String devId = "";
+                    // 设备拥有者openid
+                    if (devs != null && devs.size() > 0) {
+                        DevVO dev = devs.get(0);
+                        openids.add(dev.getUser_openid());
+                        dev_name.append(dev.getDev_name());
+                        devId= dev.getDev_id();
+                    }
+                    // 被分享者openid
+//						List<ShareVO> shares = baseDAO.queryAllByCondition(ShareVO.class, " and dev_id ='"+dev_id+"' ", null);
+//						if(shares !=null && shares.size()>0) {
+//							for(int i=0;i<shares.size();i++) {
+//								ShareVO share =shares.get(i);
+//								openids.add(share.getShared());
+//							}
+//						}
+
+                    if (openids.size() > 0) {
+                        // 拥有者和被分享者phone
+                        StringBuffer sqlBuffer = new StringBuffer("and openid in(");
+                        for (int i = 0; i < openids.size(); i++) {
+                            sqlBuffer.append("'" + openids.get(i) + "',");
+                        }
+                        sqlBuffer.setLength(sqlBuffer.length() - 1);
+                        sqlBuffer.append(")");
+                        List<MiniUserVO> users = baseDAO.queryAllByCondition(MiniUserVO.class, sqlBuffer.toString(), null);
+                        for (int i = 0; i < users.size(); i++) {
+                            MiniUserVO user = users.get(i);
+
+                            System.out.println("mqttUtil--消息发完了");
+                            List<WxRelatiion> wxRelatiions = baseDAO.queryAllByConditionNocare(WxRelatiion.class, "and openid = '" + user.getOpenid() + "'", null);
+                            String fwhOpenId = "";
+                            if (wxRelatiions != null && !wxRelatiions.isEmpty()) {
+                                fwhOpenId = wxRelatiions.get(0).getFwhopenid();
+                            }
+                            System.out.println("mqttutil--当前useropenid=" + user.getOpenid() +", fwhopenId=" + fwhOpenId);
+                            System.out.println("发送微信公众号信息：devName=" + dev_name.toString() + ", phoneNo=" + user.getPhone() + "fwhOpenId=" + fwhOpenId);
+                            wxSendMessage.queryAccessToken(devId, dev_name.toString(), user.getPhone(), fwhOpenId, "检测到异常滞留，请前往小程序查看详细信息");
+                            System.out.println("发送微信公众号消息发完了");
+                        }
+
+                    }
+                }
                 if (topic.equals("/das/dev_status")) {
                     JSONObject obj = JSONObject.parseObject(pl);
                     String dev_id = obj.getString("dev_id");

src/main/java/com/wxxcx/index/WxMpOauthController.java

@@ -29,6 +29,9 @@ public class WxMpOauthController {
     @Autowired
     private BaseDAO baseDAO;
 
+    private static final String REDIRECT_URL_DEV = "https://jkld.radar-power.cn";
+    private static final String REDIRECT_URL_PRD = "https://jkld.radar-power.com";
+
     /**
      * 自动跳转微信授权
      * @return
@@ -37,7 +40,7 @@ public class WxMpOauthController {
     public R auth(HttpServletResponse response) throws IOException {
         System.out.println("进来了");
         R r = JSONUtil.getSuccessMsg(null);
-        String redirectUrl = "https://jkld.radar-power.cn/wx/callback"; // 微信后台配置的回调地址
+        String redirectUrl =  REDIRECT_URL_PRD + "/wx/callback"; // 微信后台配置的回调地址
         String authUrl = wxMpService.getOAuth2Service()
                 .buildAuthorizationUrl(redirectUrl, "snsapi_userinfo", "state123");
         response.sendRedirect(authUrl);

src/main/java/com/wxxcx/index/WxxcxIndexController.java

@@ -1878,7 +1878,7 @@ public class WxxcxIndexController<AesException extends Throwable> {
     public R getAccessTokenTwo() {
         R r = JSONUtil.getSuccessMsg(null);
         // 发送模板消息
-        wxSendMessage.queryAccessToken("devId", "测试设备", "17356519496", "oWlo-6iXL0pQeYWZxEpwB8knv6D8");
+        wxSendMessage.queryAccessToken("devId", "测试设备", "17356519496", "oWlo-6iXL0pQeYWZxEpwB8knv6D8", "test");
         return r;
     }
 

src/main/java/com/wxxcx/index/wxSendMessage.java

@@ -24,7 +24,7 @@ public class wxSendMessage {
     private static final String SECRET = "426effb7b58f9ba7c5f6dd1062db0074";
     private static final Gson gson = new Gson();
 
-    public static void queryAccessToken(String devId, String devName, String phoneNo, String fwhOpenId) {
+    public static void queryAccessToken(String devId, String devName, String phoneNo, String fwhOpenId, String msg) {
         // 1. 获取 access_token
         String accessToken = getAccessToken();
         if (accessToken == null) {
@@ -58,7 +58,7 @@ public class wxSendMessage {
         time3.put("value", currentTime);  // 时间字段需符合格式要求
         data.put("time3", time3);
         Map<String, String> const2 = new HashMap<>();
-        const2.put("value", "设备检测到跌倒，请前往小程序查看详细信息");
+        const2.put("value", msg);
         data.put("const2", const2);
         System.out.println(data);
         log.info("mqttutil--sendmessage:{}", JSON.toJSONString(data));