钟来 / Luhui · 提交

转到一个项目

作者 钟来
提交 6fb205e679512c9f4b398b75b107d0d3bc897dc9 1 个父辈 bee6879e

修改bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 2 行删除
@@ -82,7 +82,7 @@ public class ClienNoticeService { @@ -82,7 +82,7 @@ public class ClienNoticeService {
82 */ 82 */
83 public void sendMessage(String topic,MqttMessage mqttMessage) throws MqttException, InterruptedException { 83 public void sendMessage(String topic,MqttMessage mqttMessage) throws MqttException, InterruptedException {
84 //发生指令，等待通知 84 //发生指令，等待通知
85 - System.out.println(topic+"发送的消息内容"+ ByteUtil.hexStringToSpace(ByteUtil.toHexString(mqttMessage.getPayload()).toUpperCase())+" 转化为字符串："+new String(mqttMessage.getPayload())); 85 + log.info(topic+"发送的消息内容"+ ByteUtil.hexStringToSpace(ByteUtil.toHexString(mqttMessage.getPayload()).toUpperCase())+" 转化为字符串："+new String(mqttMessage.getPayload()));
86 terminalService.publish(topic,mqttMessage); 86 terminalService.publish(topic,mqttMessage);
87 } 87 }
88 88
@@ -117,7 +117,12 @@ public class DeviceService { @@ -117,7 +117,12 @@ public class DeviceService {
117 { 117 {
118 if(isLog ||(null!=thingsModelItemBase.getSaveView() && null != oldjs && oldjs.containsKey(sk) && !thingsModelItemBase.getSaveView().equals(oldjs.getJSONObject(sk).getString("saveView")))) 118 if(isLog ||(null!=thingsModelItemBase.getSaveView() && null != oldjs && oldjs.containsKey(sk) && !thingsModelItemBase.getSaveView().equals(oldjs.getJSONObject(sk).getString("saveView"))))
119 { 119 {
120 - logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),oldjs.getJSONObject(sk).getString("saveView"),operationType+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null)); 120 + if(null!=thingsModelItemBase.getSaveView() && null != oldjs && oldjs.containsKey(sk) && !thingsModelItemBase.getSaveView().equals(oldjs.getJSONObject(sk).getString("saveView")))
  121 + {
  122 + logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),oldjs.getJSONObject(sk).getString("saveView"),operationType+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
  123 + }else{
  124 + logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),null,operationType+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
  125 + }
121 } 126 }
122 } 127 }
123 oldjs.put(sk,saveJson.get(sk)); 128 oldjs.put(sk,saveJson.get(sk));