2 Commits b0d163d5a9 ... 0ad4e4751b

Author SHA1 Message Date
  lijin 0ad4e4751b Merge branch 'master' into master-果昔项目 1 day ago
  lijin 499831798f 果昔独立部署 1 day ago

+ 3 - 1
device-api-service/src/main/java/com/xy/service/DeviceAnnualFeeServiceImpl.java

@@ -312,8 +312,10 @@ public class DeviceAnnualFeeServiceImpl extends ServiceImpl<DeviceAnnualFeeMappe
                                             .setRegisterTime(now);
                                     updateById(deviceAnnualFee);
                                     //发送环境切换指令
-                                    JSONObject env = JSONUtil.parseObj(value)
+                                    JSONObject env = JSONUtil.parseObj(value);
+                                    JSONObject data = env.getJSONObject("data")
                                             .set("env", obj.getStr("env"));
+                                    env.set("data", data);
                                     CommandMqtt commandMqtt = new CommandMqtt()
                                             .setDeviceId(deviceId)
                                             .setTemplet(env);