1.新生源设备管理中型号查询无效。

2.新生源设备验证规则中温度误差无法修改。

common/src/main/java/com/jpsoft/shinestar/modules/uniview/service/ILapiService.java

@@ -141,11 +141,15 @@ public interface ILapiService {
      * @param type 测试验证类型 （0：测额温，1：测腕温）
      * @param minTemper 温度下限
      * @param maxTemper 温度上限
+     * @param preAlarmEnabled 体温预告警开关
+     * @param preAlarmOffset 体温预告警偏移值
      * @param alarmThreshold 报警温度
      * @return
      * @throws Exception
      */
-    Boolean setDeviceRule(String deviceInfoId, Integer needCap, Integer needMask, Integer measureTemperature, Integer type, BigDecimal minTemper, BigDecimal maxTemper, BigDecimal alarmThreshold) throws Exception;
+    Boolean setDeviceRule(String deviceInfoId, Integer needCap, Integer needMask,
+                          Integer measureTemperature, Integer type, BigDecimal minTemper, BigDecimal maxTemper,
+                          Integer preAlarmEnabled,BigDecimal preAlarmOffset,BigDecimal alarmThreshold) throws Exception;
 
     /**
      * 修改设备的服务器ip端口

common/src/main/java/com/jpsoft/shinestar/modules/uniview/service/impl/LapiServiceImpl.java

@@ -743,7 +743,9 @@ public class LapiServiceImpl implements ILapiService {
     }
 
     @Override
-    public Boolean setDeviceRule(String deviceInfoId, Integer needCap, Integer needMask, Integer measureTemperature, Integer type, BigDecimal minTemper, BigDecimal maxTemper, BigDecimal alarmThreshold) throws Exception {
+    public Boolean setDeviceRule(String deviceInfoId, Integer needCap, Integer needMask,
+                                 Integer measureTemperature, Integer type, BigDecimal minTemper, BigDecimal maxTemper,
+                                 Integer preAlarmEnabled,BigDecimal preAlarmOffset,BigDecimal alarmThreshold) throws Exception {
         DeviceInfo deviceInfo = deviceInfoService.get(deviceInfoId);
         if (deviceInfo == null) {
             throw new Exception("设备不存在");
@@ -773,12 +775,16 @@ public class LapiServiceImpl implements ILapiService {
         list.add(map2);
         list.add(map3);
         map.put("RuleList", list);
+
         if (measureTemperature == 1) {
             HashMap<String, Object> temperatureMap = new HashMap<>();
             temperatureMap.put("Type", type);
             temperatureMap.put("Minimum", minTemper);
             temperatureMap.put("Maximum", maxTemper);
             temperatureMap.put("AlarmThreshold", alarmThreshold);
+            temperatureMap.put("preAlarmEnabled", preAlarmEnabled);
+            temperatureMap.put("preAlarmOffset", preAlarmOffset);
+
             map.put("TemperatureRule", temperatureMap);
         }
 

common/src/main/resources/mapper/business/WorkScheduleAttendance.xml

@@ -272,8 +272,6 @@
         <if test="searchParams.noWorkStatus != null">
             AND work_status != #{searchParams.noWorkStatus}
         </if>
-        ORDER BY
-        attendance_date,record_time
     </select>
 
     <select id="findByPersonIdShiftIdAttendanceDateClassifyResult" resultMap="WorkScheduleAttendanceMap">

web/src/main/java/com/jpsoft/shinestar/modules/base/controller/DeviceInfoController.java

@@ -746,6 +746,7 @@ public class DeviceInfoController {
      * @param type 测试验证类型 （0：测额温，1：测腕温）
      * @param minTemper 温度下限
      * @param maxTemper 温度上限
+     * @param preAlarmOffset 温度误差
      * @param alarmThreshold 报警温度
      * @param mode 校验方式
      **/
@@ -757,6 +758,8 @@ public class DeviceInfoController {
             Integer type,
             BigDecimal minTemper,
             BigDecimal maxTemper,
+            Integer preAlarmEnabled,
+            BigDecimal preAlarmOffset,
             BigDecimal alarmThreshold,
             String mode,
             @RequestAttribute String subject){
@@ -765,7 +768,7 @@ public class DeviceInfoController {
         try {
             lapiService.setOpenDoorMode(deviceInfoId,mode);
             result = lapiService.setDeviceRule(deviceInfoId,needCap,needMask,measureTemperature,
-                    type,minTemper,maxTemper,alarmThreshold);
+                    type,minTemper,maxTemper,preAlarmEnabled,preAlarmOffset,alarmThreshold);
             msgResult.setResult(result);
             msgResult.setMessage("");
         }

web/src/main/resources/application-dev.yml

@@ -5,24 +5,24 @@ server:
 
 spring:
   datasource:
-     #url: jdbc:log4jdbc:mysql://192.168.33.20:3306/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     #username: root
-     #password: jpsoft2016
+     url: jdbc:log4jdbc:mysql://192.168.33.20:3306/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+     username: root
+     password: jpsoft2016
      #测试环境下
      #url: jdbc:log4jdbc:mysql://47.92.161.104:3336/jp_.shinestar._2.0?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
      #username: root
      #password: jpsoft8121234
      #正式环境下
-     url: jdbc:log4jdbc:mysql://223.75.170.44:3366/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-     username: root
-     password: jpsoft8121234
+#     url: jdbc:log4jdbc:mysql://223.75.170.44:3366/shine_star?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#     username: root
+#     password: jpsoft8121234
   devtools:
     add-properties: false
     restart:
       enabled: true
   rabbitmq:
     host: 192.168.33.20
-    virtual-host: tomatozq
+    virtual-host: shinestar-dev
 
 logger:
   level: WARN