From 4b9aa5c327a058073620e25daa0c039785d5b9cf Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Sat, 16 Aug 2025 17:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ilsService.java => RemoteUrkUtilsService.java} | 13 ++++--------- ...ry.java => RemoteUrkUtilsFallbackFactory.java} | 15 +++++---------- ...k.boot.autoconfigure.AutoConfiguration.imports | 2 +- .../core/constant/ServiceNameConstants.java | 2 +- .../bmw/service/impl/PmAttDeviceServiceImpl.java | 8 ++++---- .../bmw/service/impl/PmWorkerServiceImpl.java | 14 ++++++-------- 6 files changed, 21 insertions(+), 33 deletions(-) rename bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/{RemoteUakUtilsService.java => RemoteUrkUtilsService.java} (80%) rename bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/{RemoteUakUtilsFallbackFactory.java => RemoteUrkUtilsFallbackFactory.java} (73%) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUakUtilsService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUrkUtilsService.java similarity index 80% rename from bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUakUtilsService.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUrkUtilsService.java index 7ffe7a9..65603e9 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUakUtilsService.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUrkUtilsService.java @@ -2,16 +2,11 @@ package com.bonus.system.api; import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.constant.ServiceNameConstants; -import com.bonus.common.core.domain.R; -import com.bonus.system.api.factory.RemoteUakUtilsFallbackFactory; -import com.bonus.system.api.model.UploadFileVo; +import com.bonus.system.api.factory.RemoteUrkUtilsFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.multipart.MultipartFile; /** * 考勤机指令下发 @@ -20,8 +15,8 @@ import org.springframework.web.multipart.MultipartFile; * * @author 黑子 */ -@FeignClient(contextId = "remoteUakUtilsService", value = ServiceNameConstants.UAK_SERVICE, fallbackFactory = RemoteUakUtilsFallbackFactory.class) -public interface RemoteUakUtilsService { +@FeignClient(contextId = "remoteUrkUtilsService", value = ServiceNameConstants.URK_SERVICE, fallbackFactory = RemoteUrkUtilsFallbackFactory.class) +public interface RemoteUrkUtilsService { /** * 新增-修改人员触发 * @param userId @@ -45,7 +40,7 @@ public interface RemoteUakUtilsService { /** * 考勤机解绑 - * @param String + * @param * @param proId * @param source */ diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUakUtilsFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUrkUtilsFallbackFactory.java similarity index 73% rename from bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUakUtilsFallbackFactory.java rename to bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUrkUtilsFallbackFactory.java index 547a105..0b512d2 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUakUtilsFallbackFactory.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUrkUtilsFallbackFactory.java @@ -1,16 +1,11 @@ package com.bonus.system.api.factory; import com.bonus.common.core.domain.R; -import com.bonus.system.api.RemoteUakUtilsService; -import com.bonus.system.api.RemoteUploadUtilsService; -import com.bonus.system.api.model.UploadFileVo; +import com.bonus.system.api.RemoteUrkUtilsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; /** @@ -19,13 +14,13 @@ import java.util.List; * @author bonus */ @Component -public class RemoteUakUtilsFallbackFactory implements FallbackFactory +public class RemoteUrkUtilsFallbackFactory implements FallbackFactory { - private static final Logger log = LoggerFactory.getLogger(RemoteUakUtilsFallbackFactory.class); + private static final Logger log = LoggerFactory.getLogger(RemoteUrkUtilsFallbackFactory.class); @Override - public RemoteUakUtilsService create(Throwable throwable) { + public RemoteUrkUtilsService create(Throwable throwable) { log.error("考勤机服务调用失败:{}", throwable.getMessage()); - return new RemoteUakUtilsService(){ + return new RemoteUrkUtilsService(){ @Override public void sendUserToDevice(int userId, int proId, String update, String source) { diff --git a/bonus-api/bonus-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bonus-api/bonus-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index c81329c..203d8e3 100644 --- a/bonus-api/bonus-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bonus-api/bonus-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -10,5 +10,5 @@ com.bonus.system.api.factory.RemotePostFallbackFactory com.bonus.system.api.factory.RemoteRoleFallbackFactory com.bonus.system.api.factory.RemoteNoticeFallbackFactory com.bonus.system.api.factory.RemoteProfileFallbackFactory -com.bonus.system.api.factory.RemoteUakUtilsFallbackFactory +com.bonus.system.api.factory.RemoteUrkUtilsFallbackFactory com.bonus.system.api.factory.RemoteUploadUtilsFallbackFactory diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ServiceNameConstants.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ServiceNameConstants.java index 0c47833..83b8154 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ServiceNameConstants.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ServiceNameConstants.java @@ -25,5 +25,5 @@ public class ServiceNameConstants /** * 考勤机服务模块 */ - public static final String UAK_SERVICE = "bonus-uak"; + public static final String URK_SERVICE = "bonus-urk"; } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java index ed7ce37..9967ed6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java @@ -7,7 +7,7 @@ import com.bonus.bmw.service.PmAttDeviceService; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.redis.service.RedisService; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.system.api.RemoteUakUtilsService; +import com.bonus.system.api.RemoteUrkUtilsService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +28,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService { private PmAttDeviceMapper pmAttDeviceMapper; @Resource - private RemoteUakUtilsService remoteUakUtilsService; + private RemoteUrkUtilsService remoteUrkUtilsService; @Resource private RedisService redisService; @@ -59,7 +59,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService { pmAttDevice.setUpdateUser(SecurityUtils.getUsername()); pmAttDevice.setUpdateTime(new Date()); //新增考勤机触发 - remoteUakUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null); + remoteUrkUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null); return pmAttDeviceMapper.addPmAttDevice(pmAttDevice); } @@ -78,7 +78,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService { pmAttDeviceMapper.addPmAttDeviceHis(pmAttDeviceOld); } //考勤机解绑 - remoteUakUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null); + remoteUrkUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null); return pmAttDeviceMapper.updatePmAttDevice(pmAttDevice); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java index bc71dc0..449be80 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java @@ -1,7 +1,6 @@ package com.bonus.bmw.service.impl; import cn.hutool.core.date.DateUtil; -import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.PmWorkerDto; import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.vo.BmWorkerContract; @@ -10,10 +9,9 @@ import com.bonus.bmw.service.BmWorkerContractService; import com.bonus.bmw.service.BmWorkerWageCardService; import com.bonus.common.core.constant.Constants; import com.bonus.common.core.constant.SecurityConstants; -import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.system.api.RemoteUakUtilsService; +import com.bonus.system.api.RemoteUrkUtilsService; import com.bonus.system.api.model.UploadFileVo; import com.github.pagehelper.util.StringUtil; import org.springframework.stereotype.Service; @@ -46,7 +44,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{ private FileUploadUtils fileUploadUtils; @Resource - private RemoteUakUtilsService remoteUakUtilsService; + private RemoteUrkUtilsService remoteUrkUtilsService; @Override public int deleteByPrimaryKey(Integer id) { @@ -77,7 +75,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{ //入场相关数据添加 addWorkerEinData(record,fileMsg); //下发人脸到考勤机 - remoteUakUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); + remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); } return new AjaxResult(200, "添加成功"); } @@ -167,10 +165,10 @@ public class PmWorkerServiceImpl implements PmWorkerService{ //下发人脸到考勤机 if(record.getEinStatus() == 1){ //没换工程换人脸 - remoteUakUtilsService.sendUserToDevice(record.getId(),record.getProId(),"1", SecurityConstants.INNER); + remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"1", SecurityConstants.INNER); }else{ //换工程换人脸 - remoteUakUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); + remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); } } //更新入场记录最新记录标识 再入场，清除最新标识 @@ -180,7 +178,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{ addWorkerWageCardDataAndContract(record,fileMsg); }else { //换工程没换人脸 - remoteUakUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); + remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); addWorkerEinData(record,fileMsg); } return 1;