diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoRespVO.java index 5645e818..2d4e15b6 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoRespVO.java @@ -45,4 +45,5 @@ public class FaceDeviceInfoRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + private Boolean clear; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/facedeviceinfo/AppFaceDeviceInfoController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/facedeviceinfo/AppFaceDeviceInfoController.java index b946e38b..d8dae38a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/facedeviceinfo/AppFaceDeviceInfoController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/facedeviceinfo/AppFaceDeviceInfoController.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.controller.app.facedeviceinfo; +import cn.hutool.core.date.DateUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -14,11 +15,14 @@ import cn.iocoder.yudao.module.system.service.facedeviceinfo.FaceDeviceInfoServi import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.commons.lang3.StringUtils; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.annotation.security.PermitAll; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; @@ -38,15 +42,29 @@ public class AppFaceDeviceInfoController { @Resource private FaceDeviceInfoService faceDeviceInfoService; + @Resource + private StringRedisTemplate clearRedisTemplate; + @GetMapping("/get") @Operation(summary = "获得人脸设备信息关联门店") @Parameter(name = "mac", description = "设备mac码", required = true, example = "1024") public CommonResult getFaceDeviceInfo(@RequestParam("mac") String mac) { FaceDeviceInfoDO faceDeviceInfo = faceDeviceInfoService.getInfo(mac); - return success(BeanUtils.toBean(faceDeviceInfo, FaceDeviceInfoRespVO.class)); + String today = DateUtil.date().toString("yyyyMMdd"); + FaceDeviceInfoRespVO bean = BeanUtils.toBean(faceDeviceInfo, FaceDeviceInfoRespVO.class); + String s = clearRedisTemplate.opsForValue().get(today+faceDeviceInfo.getCarteenId()); + if(StringUtils.isNotBlank(s)){ + bean.setClear(false); + }else { + bean.setClear(true); + clearRedisTemplate.opsForValue().set(today+faceDeviceInfo.getCarteenId(),"true"); + String yesterday = DateUtil.format(DateUtil.yesterday(), "yyyyMMdd"); + clearRedisTemplate.delete(yesterday+faceDeviceInfo.getCarteenId()); + } + + return success(bean); } - } \ No newline at end of file