bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改服务名称

This commit is contained in:
haozq 2025-08-16 17:31:50 +08:00
parent c04fd0b89d
commit 4b9aa5c327
6 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUakUtilsService.java → bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteUrkUtilsService.java
View File

@ -2,16 +2,11 @@ package com.bonus.system.api;
import com.bonus.common.core.constant.SecurityConstants; import com.bonus.common.core.constant.SecurityConstants;
import com.bonus.common.core.constant.ServiceNameConstants; import com.bonus.common.core.constant.ServiceNameConstants;
import com.bonus.common.core.domain.R; import com.bonus.system.api.factory.RemoteUrkUtilsFallbackFactory;
import com.bonus.system.api.factory.RemoteUakUtilsFallbackFactory;
import com.bonus.system.api.model.UploadFileVo;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestParam; 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 黑子 * @author 黑子
*/ */
@FeignClient(contextId = "remoteUakUtilsService", value = ServiceNameConstants.UAK_SERVICE, fallbackFactory = RemoteUakUtilsFallbackFactory.class) @FeignClient(contextId = "remoteUrkUtilsService", value = ServiceNameConstants.URK_SERVICE, fallbackFactory = RemoteUrkUtilsFallbackFactory.class)
public interface RemoteUakUtilsService { public interface RemoteUrkUtilsService {
/** /**
* 新增-修改人员触发 * 新增-修改人员触发
* @param userId * @param userId
@ -45,7 +40,7 @@ public interface RemoteUakUtilsService {
/** /**
* 考勤机解绑 * 考勤机解绑
* @param String * @param
* @param proId * @param proId
* @param source * @param source
*/ */

15
bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUakUtilsFallbackFactory.java → bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUrkUtilsFallbackFactory.java
View File

@ -1,16 +1,11 @@
package com.bonus.system.api.factory; package com.bonus.system.api.factory;
import com.bonus.common.core.domain.R; import com.bonus.common.core.domain.R;
import com.bonus.system.api.RemoteUakUtilsService; import com.bonus.system.api.RemoteUrkUtilsService;
import com.bonus.system.api.RemoteUploadUtilsService;
import com.bonus.system.api.model.UploadFileVo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component; 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 * @author bonus
*/ */
@Component @Component
public class RemoteUakUtilsFallbackFactory implements FallbackFactory<RemoteUakUtilsService> public class RemoteUrkUtilsFallbackFactory implements FallbackFactory<RemoteUrkUtilsService>
{ {
private static final Logger log = LoggerFactory.getLogger(RemoteUakUtilsFallbackFactory.class); private static final Logger log = LoggerFactory.getLogger(RemoteUrkUtilsFallbackFactory.class);
@Override @Override
public RemoteUakUtilsService create(Throwable throwable) { public RemoteUrkUtilsService create(Throwable throwable) {
log.error("考勤机服务调用失败:{}", throwable.getMessage()); log.error("考勤机服务调用失败:{}", throwable.getMessage());
return new RemoteUakUtilsService(){ return new RemoteUrkUtilsService(){
@Override @Override
public void sendUserToDevice(int userId, int proId, String update, String source) { public void sendUserToDevice(int userId, int proId, String update, String source) {

2
bonus-api/bonus-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -10,5 +10,5 @@ com.bonus.system.api.factory.RemotePostFallbackFactory
com.bonus.system.api.factory.RemoteRoleFallbackFactory com.bonus.system.api.factory.RemoteRoleFallbackFactory
com.bonus.system.api.factory.RemoteNoticeFallbackFactory com.bonus.system.api.factory.RemoteNoticeFallbackFactory
com.bonus.system.api.factory.RemoteProfileFallbackFactory com.bonus.system.api.factory.RemoteProfileFallbackFactory
com.bonus.system.api.factory.RemoteUakUtilsFallbackFactory com.bonus.system.api.factory.RemoteUrkUtilsFallbackFactory
com.bonus.system.api.factory.RemoteUploadUtilsFallbackFactory com.bonus.system.api.factory.RemoteUploadUtilsFallbackFactory

2
bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/ServiceNameConstants.java
View File

@ -25,5 +25,5 @@ public class ServiceNameConstants
/** /**
* 考勤机服务模块 * 考勤机服务模块
*/ */
public static final String UAK_SERVICE = "bonus-uak"; public static final String URK_SERVICE = "bonus-urk";
} }

8
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java
View File

@ -7,7 +7,7 @@ import com.bonus.bmw.service.PmAttDeviceService;
import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.redis.service.RedisService; import com.bonus.common.redis.service.RedisService;
import com.bonus.common.security.utils.SecurityUtils; 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 lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -28,7 +28,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
private PmAttDeviceMapper pmAttDeviceMapper; private PmAttDeviceMapper pmAttDeviceMapper;
@Resource @Resource
private RemoteUakUtilsService remoteUakUtilsService; private RemoteUrkUtilsService remoteUrkUtilsService;
@Resource @Resource
private RedisService redisService; private RedisService redisService;
@ -59,7 +59,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
pmAttDevice.setUpdateUser(SecurityUtils.getUsername()); pmAttDevice.setUpdateUser(SecurityUtils.getUsername());
pmAttDevice.setUpdateTime(new Date()); pmAttDevice.setUpdateTime(new Date());
//新增考勤机触发 //新增考勤机触发
remoteUakUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null); remoteUrkUtilsService.getUserSendToDev(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null);
return pmAttDeviceMapper.addPmAttDevice(pmAttDevice); return pmAttDeviceMapper.addPmAttDevice(pmAttDevice);
} }
@ -78,7 +78,7 @@ public class PmAttDeviceServiceImpl implements PmAttDeviceService {
pmAttDeviceMapper.addPmAttDeviceHis(pmAttDeviceOld); pmAttDeviceMapper.addPmAttDeviceHis(pmAttDeviceOld);
} }
//考勤机解绑 //考勤机解绑
remoteUakUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null); remoteUrkUtilsService.delDevByProId(pmAttDevice.getDeviceCode(),pmAttDevice.getProId(),null);
return pmAttDeviceMapper.updatePmAttDevice(pmAttDevice); return pmAttDeviceMapper.updatePmAttDevice(pmAttDevice);
} }

14
bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmWorkerServiceImpl.java
View File

@ -1,7 +1,6 @@
package com.bonus.bmw.service.impl; package com.bonus.bmw.service.impl;
import cn.hutool.core.date.DateUtil; 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.PmWorkerDto;
import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.dto.WebFileDto;
import com.bonus.bmw.domain.vo.BmWorkerContract; 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.bmw.service.BmWorkerWageCardService;
import com.bonus.common.core.constant.Constants; import com.bonus.common.core.constant.Constants;
import com.bonus.common.core.constant.SecurityConstants; 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.core.web.domain.AjaxResult;
import com.bonus.common.security.utils.SecurityUtils; 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.bonus.system.api.model.UploadFileVo;
import com.github.pagehelper.util.StringUtil; import com.github.pagehelper.util.StringUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -46,7 +44,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{
private FileUploadUtils fileUploadUtils; private FileUploadUtils fileUploadUtils;
@Resource @Resource
private RemoteUakUtilsService remoteUakUtilsService; private RemoteUrkUtilsService remoteUrkUtilsService;
@Override @Override
public int deleteByPrimaryKey(Integer id) { public int deleteByPrimaryKey(Integer id) {
@ -77,7 +75,7 @@ public class PmWorkerServiceImpl implements PmWorkerService{
//入场相关数据添加 //入场相关数据添加
addWorkerEinData(record,fileMsg); 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, "添加成功"); return new AjaxResult(200, "添加成功");
} }
@ -167,10 +165,10 @@ public class PmWorkerServiceImpl implements PmWorkerService{
//下发人脸到考勤机 //下发人脸到考勤机
if(record.getEinStatus() == 1){ if(record.getEinStatus() == 1){
//没换工程换人脸 //没换工程换人脸
remoteUakUtilsService.sendUserToDevice(record.getId(),record.getProId(),"1", SecurityConstants.INNER); remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"1", SecurityConstants.INNER);
}else{ }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); addWorkerWageCardDataAndContract(record,fileMsg);
}else { }else {
//换工程没换人脸 //换工程没换人脸
remoteUakUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER); remoteUrkUtilsService.sendUserToDevice(record.getId(),record.getProId(),"0", SecurityConstants.INNER);
addWorkerEinData(record,fileMsg); addWorkerEinData(record,fileMsg);
} }
return 1; return 1;