Merge remote-tracking branch 'origin/V1' into V1

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

@@ -94,13 +94,13 @@ public class PersonDeviceFilterLogServiceImpl implements PersonDeviceFilterLogSe
             String timeZones = TimeZonesUtil.getUpperTimeZone(recordTimeZons);
             PersonInfo personInfo = LApiUtil.getPersonCode(libMatInfoListJson, matchPersonInfo);
 
-            PersonInfo personInfoReturn = personInfoService.addPersonForCompany(personInfo,deviceNo);
+      //      PersonInfo personInfoReturn = personInfoService.addPersonForCompany(personInfo,deviceNo);
            // Integer personId = LApiUtil.getPersonCode(libMatInfoListJson, matchPersonInfo);
             LApiUtil lApiUtil = new LApiUtil();
-            if (personInfoReturn.getId() != 0L && temperature.compareTo(BigDecimal.ZERO) == 1) {
+            if (personInfo.getId() != 0L && temperature.compareTo(BigDecimal.ZERO) == 1) {
 
 
-                PersonDeviceFilterLog personDeviceFilterLog = personDeviceFilterLogDAO.findByPersonIdAndDeviceNoAndTimeZones(Math.toIntExact(personInfoReturn.getId()), deviceNo, timeZones);
+                PersonDeviceFilterLog personDeviceFilterLog = personDeviceFilterLogDAO.findByPersonIdAndDeviceNoAndTimeZones(Math.toIntExact(personInfo.getId()), deviceNo, timeZones);
 
                 if (personDeviceFilterLog != null) {
                     BigDecimal oldTemper = personDeviceFilterLog.getTemperature();
@@ -132,7 +132,7 @@ public class PersonDeviceFilterLogServiceImpl implements PersonDeviceFilterLogSe
                 } else {
                     PersonDeviceFilterLog personDeviceFilterLog1 = new PersonDeviceFilterLog();
                     personDeviceFilterLog1.setDeviceNo(deviceNo);
-                    personDeviceFilterLog1.setPersonId(Math.toIntExact(personInfoReturn.getId()));
+                    personDeviceFilterLog1.setPersonId(Math.toIntExact(personInfo.getId()));
                     personDeviceFilterLog1.setTemperature(temperature);
                     if (StringUtils.isNotBlank(libMatInfoListJson.getStr("MatchStatus"))) {
                         personDeviceFilterLog1.setMatchStatus(libMatInfoListJson.getInt("MatchStatus"));
@@ -153,7 +153,7 @@ public class PersonDeviceFilterLogServiceImpl implements PersonDeviceFilterLogSe
 
                 new Thread(() -> {
                     try {
-                        addCheckNumForCompany(Math.toIntExact(personInfoReturn.getId()), temperature, date);
+                        addCheckNumForCompany(Math.toIntExact(personInfo.getId()), temperature, date);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
                     }

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

@@ -94,14 +94,13 @@ public class PersonDeviceLogServiceImpl implements PersonDeviceLogService {
         }
 
         PersonInfo personInfo = LApiUtil.getPersonCode(libMatInfoListJson, matchPersonInfo);
-
-        PersonInfo peronInfoReturn = personInfoService.addPersonForCompany(personInfo,deviceNo);
+      //  PersonInfo peronInfoReturn = personInfoService.addPersonForCompany(personInfo,deviceNo);
       //  Integer personId = LApiUtil.getPersonCode(libMatInfoListJson, matchPersonInfo);
 
         PersonDeviceLog personDeviceLog = new PersonDeviceLog();
         personDeviceLog.setId(UUID.randomUUID().toString());
         personDeviceLog.setDeviceNo(deviceNo);
-        personDeviceLog.setPersonId(Math.toIntExact(peronInfoReturn.getId()));
+        personDeviceLog.setPersonId(Math.toIntExact(personInfo.getId()));
         personDeviceLog.setPersonName(personInfo.getName());
         personDeviceLog.setIdentityNo(personInfo.getIdCard());