修改迁移

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

@@ -225,12 +225,13 @@ public class MqttUtil {
                         System.out.println("mqttutil--有跌倒事件");
                         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);
@@ -266,7 +267,7 @@ 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(dev_name.toString(), user.getPhone(), fwhOpenId);
+                                wxSendMessage.queryAccessToken(devId, dev_name.toString(), user.getPhone(), fwhOpenId);
                                 System.out.println("发送微信公众号消息发完了");
                             }
 

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

@@ -743,10 +743,11 @@ public class WxxcxIndexController<AesException extends Throwable> {
             return r;
         }
 
-        JSONObject jsonObj = JSON.parseObject(devRoomVO.getRoom_params());
-
+        JSONArray res = new JSONArray();
+        res.addAll(JSON.parseArray(devRoomVO.getFurniture()));
+        res.addAll(JSON.parseArray(devRoomVO.getSub_regions()));
         // 向前端发送数据
-        r.data.put("data", jsonObj);
+        r.data.put("data", res);
         return r;
     }
 
@@ -776,39 +777,40 @@ public class WxxcxIndexController<AesException extends Throwable> {
                 baseDAO.insertAll(room);
             }
 
-            StringBuffer sql = new StringBuffer("update dev_room set room_params= JSON_OBJECT(");
+//            StringBuffer sql = new StringBuffer("update dev_room set room_params= JSON_OBJECT(");
+            StringBuffer sql = new StringBuffer("update dev_room set ");
 
-            sql.append("'openid','" + obj.getString("openid") + "',");
-            sql.append("'dev_id','" + obj.getString("dev_id") + "',");
-            sql.append("'start_x','" + obj.getString("start_x") + "',");
-            sql.append("'stop_x','" + obj.getString("stop_x") + "',");
-            sql.append("'start_y','" + obj.getString("start_y") + "',");
-            sql.append("'stop_y','" + obj.getString("stop_y") + "',");
-            sql.append("'roomParams'," +  "JSON_ARRAY(");
+//            sql.append("'openid','" + obj.getString("openid") + "',");
+//            sql.append("'dev_id','" + obj.getString("dev_id") + "',");
+//            sql.append("'start_x','" + obj.getString("start_x") + "',");
+//            sql.append("'stop_x','" + obj.getString("stop_x") + "',");
+//            sql.append("'start_y','" + obj.getString("start_y") + "',");
+//            sql.append("'stop_y','" + obj.getString("stop_y") + "',");
+//            sql.append("'roomParams'," +  "JSON_ARRAY(");
 
             // 子区域插入sql
-            StringBuffer subBuffer = new StringBuffer(", sub_regions= JSON_ARRAY(");
+            StringBuffer subBuffer = new StringBuffer("sub_regions= JSON_ARRAY(");
             // 家具插入sql
-            StringBuffer furBuffer = new StringBuffer(", furniture= JSON_ARRAY(");
+            StringBuffer furBuffer = new StringBuffer("furniture= JSON_ARRAY(");
             if (roomParams.size() > 0) {
 
                 boolean hasSub = false;
                 boolean hasFur = false;
                 for (int i = 0; i < roomParams.size(); i++) {
                     JSONObject itemObj = roomParams.getJSONObject(i);
-                    sql.append("JSON_OBJECT('name','" + itemObj.getString("name") + "',");
-                    sql.append("'type','" + itemObj.getString("type") + "',");
-                    sql.append("'width'," + itemObj.getString("width") + ",");
-                    sql.append("'height'," + itemObj.getString("height") + ",");
-                    sql.append("'heightToM'," + itemObj.getString("heightToM") + ",");
-                    sql.append("'left'," + itemObj.getString("left") + ",");
-                    sql.append("'rotate'," + itemObj.getString("rotate") + ",");
-                    sql.append("'top'," + itemObj.getString("top") + ",");
-                    sql.append("'widthToM'," + itemObj.getString("widthToM") + ",");
-                    sql.append("'x'," + itemObj.getString("x") + ",");
-                    sql.append("'y'," + itemObj.getString("y") + ",");
-                    sql.append("'yuanX'," + itemObj.getString("yuanX") + ",");
-                    sql.append("'yuanY'," + itemObj.getString("yuanY") + "),");
+//                    sql.append("JSON_OBJECT('name','" + itemObj.getString("name") + "',");
+//                    sql.append("'type','" + itemObj.getString("type") + "',");
+//                    sql.append("'width'," + itemObj.getString("width") + ",");
+//                    sql.append("'height'," + itemObj.getString("height") + ",");
+//                    sql.append("'heightToM'," + itemObj.getString("heightToM") + ",");
+//                    sql.append("'left'," + itemObj.getString("left") + ",");
+//                    sql.append("'rotate'," + itemObj.getString("rotate") + ",");
+//                    sql.append("'top'," + itemObj.getString("top") + ",");
+//                    sql.append("'widthToM'," + itemObj.getString("widthToM") + ",");
+//                    sql.append("'x'," + itemObj.getString("x") + ",");
+//                    sql.append("'y'," + itemObj.getString("y") + ",");
+//                    sql.append("'yuanX'," + itemObj.getString("yuanX") + ",");
+//                    sql.append("'yuanY'," + itemObj.getString("yuanY") + "),");
 
                     String type = itemObj.getString("type");
                     if (type.contains("area") || type.contains("otherArea")) {
@@ -848,17 +850,22 @@ public class WxxcxIndexController<AesException extends Throwable> {
                     }
                 }
 
-                sql.setLength(sql.length() - 1);
-                sql.append("))" );
+//                sql.setLength(sql.length() - 1);
+//                sql.append("))" );
 
 
                 if (hasSub) {
                     subBuffer.setLength(subBuffer.length() - 1);
                     sql.append(subBuffer).append(")");
+                } else {
+                    sql.append(" sub_regions=null ");
                 }
+                sql.append(",");
                 if (hasFur) {
                     furBuffer.setLength(furBuffer.length() - 1);
                     sql.append(furBuffer).append(")");
+                } else {
+                    sql.append(" furniture=null ");
                 }
 
                 sql.append(" where dev_id ='" + dev_id + "' ");
@@ -939,6 +946,11 @@ public class WxxcxIndexController<AesException extends Throwable> {
                     }
                 }
             } else {
+
+                sql.append(" sub_regions=null , furniture=null ");
+                sql.append(" where dev_id ='" + dev_id + "' ");
+                baseDAO.updateSQL(sql.toString());
+
                 JSONObject jsonObject = new JSONObject();
                 JSONArray extRegion = new JSONArray();
                 jsonObject.put("ext_sub_regions", extRegion);
@@ -1796,7 +1808,7 @@ public class WxxcxIndexController<AesException extends Throwable> {
     public R getAccessTokenTwo() {
         R r = JSONUtil.getSuccessMsg(null);
         // 发送模板消息
-        wxSendMessage.queryAccessToken("测试设备", "17356519496", "oWlo-6iXL0pQeYWZxEpwB8knv6D8");
+        wxSendMessage.queryAccessToken("devId", "测试设备", "17356519496", "oWlo-6iXL0pQeYWZxEpwB8knv6D8");
         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 devName, String phoneNo, String fwhOpenId) {
+    public static void queryAccessToken(String devId, String devName, String phoneNo, String fwhOpenId) {
         // 1. 获取 access_token
         String accessToken = getAccessToken();
         if (accessToken == null) {
@@ -40,7 +40,7 @@ public class wxSendMessage {
 
 // 1. 每个字段需要包装成包含 value 的 Map
         Map<String, String> characterString1 = new HashMap<>();
-        characterString1.put("value", "123456");
+        characterString1.put("value", devId);
         data.put("character_string1", characterString1);
         Map<String, String> thing8 = new HashMap<>();