From 0be54c0692192119e5f772bd783b6799aea38666 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 3 Dec 2025 10:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=8F=91=E7=8F=AD?= =?UTF-8?q?=E7=BB=84=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-prod.yml | 31 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../service/impl/FileUtilsServiceImpl.java | 3 +- .../com/bonus/urk/handle/UserFaceHandle.java | 18 +++++++++++ .../com/bonus/urk/service/ResultService.java | 12 ++++--- .../urk/service/UserFaceHandleService.java | 5 +-- 6 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 bonus-modules/bonus-bmw/src/main/resources/bootstrap-prod.yml diff --git a/bonus-modules/bonus-bmw/src/main/resources/bootstrap-prod.yml b/bonus-modules/bonus-bmw/src/main/resources/bootstrap-prod.yml new file mode 100644 index 0000000..9e8e313 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/resources/bootstrap-prod.yml @@ -0,0 +1,31 @@ +# Tomcat +server: + port: 38083 + +# Spring +spring: + cloud: + nacos: + username: nacos + password: Bonus@admin123! + discovery: + # 服务注册地址 + server-addr: 192.168.0.58:18849 + namespace: huadong_realname_prod + config: + # 配置中心地址 + server-addr: 192.168.0.58:18849 + namespace: huadong_realname_prod + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + +#加密组件 +jasypt: + encryptor: + password: Encrypt + +face: + path: http://112.29.103.165:1616/faceIdentification diff --git a/bonus-modules/bonus-bmw/src/main/resources/bootstrap.yml b/bonus-modules/bonus-bmw/src/main/resources/bootstrap.yml index e231d0e..e7406cf 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-bmw/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-bmw profiles: # 环境配置 - active: dev + active: prod task: scheduling: pool: diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java index 7ec202f..cc4d5d0 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FileUtilsServiceImpl.java @@ -464,7 +464,8 @@ public class FileUtilsServiceImpl { if(StringHelper.isNullOrEmptyString(bucketName)){ bucketName=minioConfig.getBucketName(); } - return minioUtils.getFileUrl(bucketName,filePath,60*60*12); + String url= minioUtils.getFileUrl(bucketName,filePath,60*60*12); + return url.replace(minioConfig.getEndpoint(),minioConfig.getUrl()); }catch (Exception e) { e.printStackTrace(); diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java index f37acf8..35e14bf 100644 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java +++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/handle/UserFaceHandle.java @@ -31,10 +31,21 @@ public class UserFaceHandle { public static SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static SimpleDateFormat YMD_SDF=new SimpleDateFormat("yyyy-MM-dd"); + public static SimpleDateFormat MM_SDF=new SimpleDateFormat("MM"); @Autowired private UserFaceHandleService service; + + public static void main(String[] args) { + String month="2025-12-12 13:26:00"; + DateTime datetime= DateUtil.parse(month); + System.out.println(YMD_SDF.format(datetime)); + System.out.println(MM_SDF.format(datetime)); + + } + /** * 人员数据处理 * @param deviceVo @@ -58,6 +69,8 @@ public class UserFaceHandle { String devCode= deviceVo.getDevCode(); DateTime datetime= DateUtil.parse(jsonObject.getString("time"), DatePattern.PURE_DATETIME_FORMAT); String time=sdf.format(datetime); + String attDay= YMD_SDF.format(datetime); + String month=MM_SDF.format(datetime); String bast64 = ""; if(jsonObject.getString("logPhoto")!=null) { //文件图片 @@ -72,8 +85,12 @@ public class UserFaceHandle { BmWorkerEinUserVo vo=service.getOnUserInfo(userId,proId); if(vo==null){ vo=createAttendanceVo(deviceVo,userId,devCode,time,bast64); + vo.setAttDay(attDay); + vo.setAttMonth(month); service.addWrcUser(vo); }else { + vo.setAttDay(attDay); + vo.setAttMonth(month); vo.setAttPhoto(bast64); vo.setAttTime(time); vo.setDevCode(devCode); @@ -96,6 +113,7 @@ public class UserFaceHandle { private BmWorkerEinUserVo createAttendanceVo(DeviceVo deviceVo, String userId, String devCode, String time, String base64Photo) { BmWorkerEinUserVo vo = new BmWorkerEinUserVo(); + vo.setAttPhoto(base64Photo); vo.setAttTime(time); vo.setDevCode(devCode); diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/ResultService.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/ResultService.java index 0a4897a..87b7290 100644 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/ResultService.java +++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/ResultService.java @@ -185,7 +185,9 @@ public class ResultService { List faceList=mapper.getFaceList(taskVo.getDeviceCode()); if(faceList!=null&& !faceList.isEmpty()){ for (String face : faceList) { - fileService.remoteFile(face); + if(StringUtils.isNotBlank(face)) { + fileService.remoteFile(face); + } } } mapper.delAllDeviceUserId(taskVo.getDeviceCode()); @@ -196,9 +198,11 @@ public class ResultService { DevUserVo dto=new DevUserVo(); String face=users.getJSONObject(i).getString("photo"); String id=deviceCode+"-"+userId; - UploadFileVo uploadFileVo=fileService.upload("kq_user_list",id,"考勤机照片","face",face,null); - if(uploadFileVo!=null){ - dto.setImagePath(uploadFileVo.getPath()); + if(StringUtils.isNotBlank(face)){ + UploadFileVo uploadFileVo=fileService.upload("kq_user_list",id,"考勤机照片","face",face,null); + if(uploadFileVo!=null){ + dto.setImagePath(uploadFileVo.getPath()); + } } String name=users.getJSONObject(i).getString("name"); dto.setUserId(userId); diff --git a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java index 6ac72e9..e48d270 100644 --- a/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java +++ b/bonus-modules/bonus-urk/src/main/java/com/bonus/urk/service/UserFaceHandleService.java @@ -59,8 +59,6 @@ public class UserFaceHandleService { try{ String id=StringUtils.randomUUID(); vo.setId(id); - vo.setAttMonth(DateUtils.getCurrentMonth()); - vo.setAttDay(DateUtils.getDate()); vo.setCreateTime(DateUtils.getTime()); Integer num=mapper.getTodayIsExit(vo); //每日新增一条考勤信息 @@ -84,12 +82,11 @@ public class UserFaceHandleService { + public void addWrcUser(BmWorkerEinUserVo vo) { try{ String id=StringUtils.randomUUID(); vo.setId(id); - vo.setAttMonth(DateUtils.getCurrentMonth()); - vo.setAttDay(DateUtils.getDate()); vo.setCreateTime(DateUtils.getTime()); Integer num=mapper.getTodayNoRootIsExit(vo); //每日新增一条考勤信息