Explorar el Código

personId统一为long

zhengqiang hace 5 años
padre
commit
b6ed04ed09

+ 1 - 2
common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceFilterLog.java

@@ -36,8 +36,7 @@ public class PersonDeviceFilterLog {
      * 人员id
      */
     @ApiModelProperty(value = "人员id")
-    private Integer personId;
-
+    private Long personId;
 
 
     /**

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/base/entity/PersonDeviceLog.java

@@ -38,7 +38,7 @@ public class PersonDeviceLog {
      * 人员id
      */
     @ApiModelProperty(value = "人员id")
-    private Integer personId;
+    private Long personId;
 
     /**
      * 人员姓名

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceFilterLogServiceImpl.java

@@ -110,7 +110,7 @@ public class PersonDeviceFilterLogServiceImpl implements PersonDeviceFilterLogSe
                 } else {
                     PersonDeviceFilterLog personDeviceFilterLog1 = new PersonDeviceFilterLog();
                     personDeviceFilterLog1.setDeviceNo(deviceNo);
-                    personDeviceFilterLog1.setPersonId(Math.toIntExact(personInfo.getId()));
+                    personDeviceFilterLog1.setPersonId(personInfo.getId());
                     personDeviceFilterLog1.setTemperature(temperature);
                     if (StringUtils.isNotBlank(libMatInfoListJson.getStr("MatchStatus"))) {
                         personDeviceFilterLog1.setMatchStatus(libMatInfoListJson.getInt("MatchStatus"));

+ 1 - 1
common/src/main/java/com/jpsoft/smart/modules/base/service/impl/PersonDeviceLogServiceImpl.java

@@ -77,7 +77,7 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
         PersonDeviceLog personDeviceLog = new PersonDeviceLog();
         personDeviceLog.setId(UUID.randomUUID().toString());
         personDeviceLog.setDeviceNo(deviceNo);
-        personDeviceLog.setPersonId(Math.toIntExact(personInfo.getId()));
+        personDeviceLog.setPersonId(personInfo.getId());
         personDeviceLog.setPersonName(personInfo.getName());
         personDeviceLog.setIdentityNo(personInfo.getIdCard());
 

+ 1 - 1
web/src/test/java/com/jpsoft/smart/LApiTest.java

@@ -214,7 +214,7 @@ public class LApiTest {
           //  WechatMessageUtil.sendTemperatureAlarmInfo("oLowyuOQ9ULF3LUGt6h3fTrsnbVE","荆鹏软件_门房考勤机","wx0b3c41a903053808","43557bd62f77b0c3d6670e991872f0e7","Mg9Ldk_kaoHAUwXFHEatrGugTlOz3yrMmMk7VoBca4M");
             PersonDeviceLog personDeviceLog = new PersonDeviceLog();
             personDeviceLog.setDeviceNo("210235C4C33203000165");
-            personDeviceLog.setPersonId(11622);
+            personDeviceLog.setPersonId(11622L);
             personDeviceLog.setRecordTime(new Date());
             personDeviceLog.setId("000733db-2945-4a1f-862f-86c24b50f84c");
             personDeviceLogService.sendTemperatureAlarmsyncTask(personDeviceLog);