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

xueyi-gateway/src/main/resources/bootstrap.yml

@@ -37,7 +37,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 172.17.0.1:18848
+            server-addr: @nacos.host@:@nacos.port@
             # namespace: 6d0ee265-2a92-44cc-a6de-f34b3ea104e6
             # server-addr: 39.107.77.235:18848
             dataId: sentinel-xueyi-gateway

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/digitalmans/controller/DmDigitalmanController.java

@@ -300,6 +300,8 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
         try {
             occurTime = DateUtils.formatDate(DateUtils.parseLongToDate(timestamp),"HH:mm");
         } catch (ParseException e) {
+            System.err.println(e.getMessage());
+            e.printStackTrace();
             throw new RuntimeException(e);
         }
 
@@ -391,4 +393,9 @@ public class DmDigitalmanController extends BaseController<DmDigitalmanQuery, Dm
         }
         return R.fail("请检查请求参数");
     }
+
+    @GetMapping("/api/checkNetwork")
+    public R netInfo() {
+        return R.ok();
+    }
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/emcs/service/BaseRedisListDataCache.java

@@ -6,10 +6,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
 import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @author yk
@@ -45,9 +42,6 @@ public class BaseRedisListDataCache {
 
 
     public void setListExpiration(String key, Duration duration) {
-        // 计算过期时间的秒数
-        long expirationSeconds = LocalDateTime.now().plus(duration).until(LocalDateTime.now(), ChronoUnit.SECONDS);
-        // 设置键的过期时间
-        redisTemplate.expire(key, expirationSeconds, TimeUnit.SECONDS);
+        redisTemplate.expire(key, duration);
     }
 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/pass/controller/api/DmRecognizedRecordsInnerApiController.java

@@ -64,6 +64,7 @@ public class DmRecognizedRecordsInnerApiController extends BaseApiController {
         Long userId = recognizedRecordsDto.getUserId();
         String imgBase64 = recognizedRecordsDto.getImgbase64();
         String sign = recognizedRecordsDto.getSign();
+        Integer type = recognizedRecordsDto.getType();//1:staff;2:stranger
 
         MyResponse myResponse = commonCheck(deviceId, timestamp.doubleValue(), sign);
         if (myResponse.getStatus() != 0) {
@@ -71,18 +72,22 @@ public class DmRecognizedRecordsInnerApiController extends BaseApiController {
         }
 
         DmRecognizedRecordsPo cr = recordsConverter.mapperPo(recognizedRecordsDto);
-        DmStaffPo emp = dmStaffMapper.selectById(userId);
 
-        if (ObjectUtils.anyNotNull(emp)) {
-            cr.setUserName(emp.getUserName());
-            cr.setDeptId(emp.getDeptId());
-        }
         try {
             cr.setRecognizedTime(DateUtils.parseLongToDate(timestamp.longValue()));
         } catch (ParseException e) {
             e.printStackTrace();
             return output(ResponseCode.ILLEGAL_PARAMETER, "timestamp").toJSON();
         }
+        if (type != DmRecognizedRecordsDto.TYPE_STRANGER) {
+            DmStaffPo emp = dmStaffMapper.selectById(userId);
+            if (ObjectUtils.anyNotNull(emp)) {
+                cr.setUserName(emp.getUserName());
+                cr.setDeptId(emp.getDeptId());
+
+                dmStaffService.updateOrInsertAttendance(cr);
+            }
+        }
 
         if (StringUtils.isNotEmpty(imgBase64)) {
             R<SysFile> fileResult = fileService.upload(imageUtil.base64ToMultipartFile(imgBase64));
@@ -92,9 +97,6 @@ public class DmRecognizedRecordsInnerApiController extends BaseApiController {
             cr.setFaceUrl(url);
         }
 
-        if (ObjectUtils.anyNotNull(emp)) {//员工不为空更新考勤
-            dmStaffService.updateOrInsertAttendance(cr);
-        }
         dmRecognizedRecordsMapper.insert(cr);
 
         return outputSuccess().toJSON();