修改bug

@@ -82,7 +82,7 @@ public class ClienNoticeService {
      */
     public void sendMessage(String topic,MqttMessage mqttMessage) throws MqttException, InterruptedException {
         //发生指令，等待通知
-        System.out.println(topic+"发送的消息内容"+ ByteUtil.hexStringToSpace(ByteUtil.toHexString(mqttMessage.getPayload()).toUpperCase())+" 转化为字符串："+new String(mqttMessage.getPayload()));
+        log.info(topic+"发送的消息内容"+ ByteUtil.hexStringToSpace(ByteUtil.toHexString(mqttMessage.getPayload()).toUpperCase())+" 转化为字符串："+new String(mqttMessage.getPayload()));
         terminalService.publish(topic,mqttMessage);
     }
 

@@ -117,7 +117,12 @@ public class DeviceService {
             {
                 if(isLog ||(null!=thingsModelItemBase.getSaveView() && null != oldjs && oldjs.containsKey(sk) && !thingsModelItemBase.getSaveView().equals(oldjs.getJSONObject(sk).getString("saveView"))))
                 {
-                    logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),oldjs.getJSONObject(sk).getString("saveView"),operationType+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
+                    if(null!=thingsModelItemBase.getSaveView() && null != oldjs && oldjs.containsKey(sk) && !thingsModelItemBase.getSaveView().equals(oldjs.getJSONObject(sk).getString("saveView")))
+                    {
+                        logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),oldjs.getJSONObject(sk).getString("saveView"),operationType+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
+                    }else{
+                        logDeviceOperationList.add(dviceLogService.newLogDeviceOperation(id,thingsModelItemBase.getSaveView(),null,operationType+thingsModelItemBase.getName()+"为"+thingsModelItemBase.getView(),null));
+                    }
                 }
             }
             oldjs.put(sk,saveJson.get(sk));