Merge remote-tracking branch 'origin/V0.1.1_alarm' into V0.1.1_alarm

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/util/LogUtils.java

@@ -172,4 +172,9 @@ public class LogUtils {
      * websocket 主机上报上下班规则
      */
     public  static  final Logger SOCKET_WORK_RULE_DATA=LoggerFactory.getLogger("socketWorkRuleData");
+
+    /**
+     * fsu动环和报警主机传感器短信日志
+     */
+    public  static  final Logger SMS_NOTICE_LOG=LoggerFactory.getLogger("smsNoticeLog");
 }

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/protection/service/impl/IotAlarmHostServiceImpl.java

@@ -404,7 +404,7 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
         Long vipDeviceCode = input.getId();
 
         QueryWrapper<IotAlarmSystemField> fieldWrapper = new QueryWrapper<>();
-        fieldWrapper.eq("sys_field_code",sensorType);
+        fieldWrapper.eq("product_type",sensorType);
         fieldWrapper.eq("enable",1);
         List<IotAlarmSystemField> fieldList = alarmSystemFieldMapper.selectList(fieldWrapper);
         IotPropertiesRes resParam = new IotPropertiesRes();

soc-modules/soc-modules-host/src/main/resources/logback.xml

@@ -188,6 +188,21 @@
         </encoder>
     </appender>
 
+    <appender name="statusSensorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <maxFileSize>${max.file.size}</maxFileSize>
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/status_info_sensor/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>${max.history}</maxHistory>
+            <totalSizeCap>${total.size.cap}</totalSizeCap>
+            <cleanHistoryOnStart>true</cleanHistoryOnStart>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
 
     <logger name="websocketMsgLog" additivity="false" level="info">
         <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
@@ -227,6 +242,11 @@
         <appender-ref ref="videoDiagnosisLog"/>
     </logger>
 
+    <logger name="statusSensorLog" additivity="false" level="info">
+        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
+        <appender-ref ref="statusSensorLog"/>
+    </logger>
+
     <!-- 日志输出级别 -->
     <root level="INFO">
         <appender-ref ref="STDOUT"/>

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/vo/webStatisticBoard/BoardAlarmInfoVo.java

@@ -2,6 +2,7 @@ package com.xunmei.iot.vo.webStatisticBoard;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,9 +15,11 @@ public class BoardAlarmInfoVo {
     private String deviceName;
 
     @ApiModelProperty("报警开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date alarmStartTime;
 
     @ApiModelProperty("报警结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date alarmEndTime;
 
     @ApiModelProperty("报警信息")