From 4d035492d47d7a3a484d4f47c2340038b2e88cf0 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 19:20:58 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 50 +++++++++++++++++++++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java | 1
server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 6 +--
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java | 11 ++---
server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java | 4 +-
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java | 6 +++
7 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
index 7919f10..441e001 100644
--- a/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
+++ b/server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java
@@ -28,7 +28,7 @@
*/
@Scheduled(fixedDelay=20*1000)
public void syncEmpowerResultData() {
- endId = hkSyncEmpowerService.syncEmpowerResultData(endId);
+ hkSyncEmpowerService.syncEmpowerResultData(endId);
}
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
index 42eb3cc..429286e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
@@ -74,6 +74,12 @@
deviceRoleService.updateStatusById(deviceRole);
return ApiResponse.success(null);
}
+ @ApiOperation("榛樿涓嬪彂闂ㄧ缁勮鑹�")
+ @PostMapping("/updateMemberRole")
+ public ApiResponse updateMemberRole(@RequestBody DeviceRole deviceRole) {
+ deviceRoleService.updateMemberRole(deviceRole);
+ return ApiResponse.success(null);
+ }
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
index 207f3ce..5fa143f 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/task/ScheduleTool.java
@@ -26,8 +26,8 @@
* @date 2021-10-10 14:40:35
* https://www.bejson.com/othertools/cron/ cron 琛ㄨ揪寮忕敓鎴愬湴鍧�
*/
-//@Component
-//@EnableScheduling
+@Component
+@EnableScheduling
public class ScheduleTool {
@Autowired
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
index cfda4ca..5b80629 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java
@@ -112,4 +112,5 @@
List<DeviceRoleVO> findListByType(Integer type);
+ void updateMemberRole(DeviceRole deviceRole);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index b7ba8c9..1ff3b10 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -163,6 +163,56 @@
tt.start();
}
}
+ @Override
+ public void updateMemberRole(DeviceRole deviceRole) {
+ deviceRole.setType("2");
+ deviceRole.setIsdeleted(Constants.ZERO);
+ List<DeviceRole> list =findList(deviceRole);
+ if(list == null || list.size()==0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ for(DeviceRole model :list){
+ updateMemberRoleDO(model);
+ }
+ }
+ public void updateMemberRoleDO(DeviceRole model) {
+ if(model.getDoorIds() == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String[] newIds =StringUtils.defaultString(model.getDoorIds()).split(",");
+ List<Integer> allids = getChangeIdsByArray(new String[]{},newIds);//鏈�鏂拌澶�
+ List<MemberRole> memberRoleList = memberRoleMapper.selectList(new QueryWrapper<MemberRole>().lambda()
+ .eq(MemberRole::getRoleId,model.getId())
+ .eq(MemberRole::getIsdeleted,Constants.ZERO)
+ );
+ if(memberRoleList!=null && memberRoleList.size()>0) {
+ int num =1;
+ for (MemberRole memberRole : memberRoleList) {
+ Member member = memberMapper.selectById(memberRole.getMemberId());
+ if(member==null || member.getIsdeleted().equals(Constants.ONE)){
+ continue;
+ }
+ List<Integer> addIds = new ArrayList<>();
+ for(Integer did : allids){
+ Empower empower = empowerMapper.selectOne(new QueryWrapper<Empower>().lambda()
+ .eq(Empower::getMemberId,member.getId())
+ .eq(Empower::getDeviceId,did )
+ .orderByDesc(Empower::getId)
+ .last("limit 1"));
+ if(empower ==null || Constants.equalsInteger(empower.getIsdeleted(),Constants.ONE)){
+ addIds.add(did);
+ }
+ }
+ try {
+ HkSyncOrgUserToHKServiceImpl.dealChangeDeviceRoleEmpower(member,addIds,null,deviceRoleMapper,empowerMapper,deviceMapper);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ System.out.println("姝ｅ湪澶勭悊銆�"+model.getName()+"銆�======闂ㄧ鏁版嵁銆�"+addIds.size()+"銆�====杩涘害锛氥��"+num+"|"+memberRoleList.size()+"銆�");
+ num ++;
+ }
+ }
+ }
/**
* 鏇存柊璇ユ潈闄愪笅鐩稿叧鐨勪汉鍛樻渶鏂板叏鏂颁笅鍙�
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 3b9e929..7e4ad77 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -119,15 +119,13 @@
//濡傛灉鏄凡鍒犻櫎鐨勬暟鎹紝涓嬪彂澶辫触锛堥槻姝㈣澶囩绾匡級锛屽垯灏濊瘯閲嶆柊涓嬪彂浠诲姟
if(Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
// && Constants.formatIntegerNum(c.getTryNum())+1 < tryNum ){
- empowerMapper.update(null, new UpdateWrapper<Empower>()
+ /* empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
.set(Empower::getRemark, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
-// .set(Empower::getHkId,null)
-// .set(Empower::getSendDate,null)
.set(Empower::getTryNum,Constants.formatIntegerNum(c.getTryNum())+1)
.set(Empower::getSendInfo, "涓嬪彂澶辫触锛岀瓑寰呴噸鏂板垹闄ゆ潈闄�")
- .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));
+ .set(Empower::getSendStatus, Constants.EmpowerStatus.wait));*/
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
index b3f28f6..f4066e7 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java
@@ -436,6 +436,10 @@
.in(Empower::getDeviceId,delDoorIds)
.set(Empower::getSendStatus,Constants.ZERO));
}
+ if(addDoorIds==null || addDoorIds.size()==0){
+ //寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
+ return;
+ }
if(StringUtils.isBlank(member.getFaceId())){
//濡傛灉娌℃湁鍗� 涔熸病鏈変汉鑴�
return;
@@ -469,13 +473,6 @@
list.add(model);
}
}
- //寰呯Щ闄ゆ潈闄愮殑璁惧鏁版嵁鎺堟潈璁板綍锛堥拡瀵瑰垹闄ゅ拰鏇存柊涓㈠け鐨勬潈闄愶紝闇�瑕佸悓姝ヤ笅鍙戝垹闄ゆ潈闄愶級
- empowerMapper.update(null,new UpdateWrapper<Empower>().lambda()
- .eq(Empower::getMemberId,member.getId())
- .set(Empower::getIsdeleted,Constants.ONE)
- .eq(Empower::getIsdeleted,Constants.ZERO)
- .notIn(deviceIds.size()>0,Empower::getDeviceId,deviceIds)
- .set(Empower::getSendStatus,Constants.ZERO));
//瀵煎叆鏂板鐨勬巿鏉冧俊鎭�
if(list.size()>0){
//鐩存帴瑕嗙洊閲嶅鐨勮澶囨潈闄愶紝鐩存帴鍒犻櫎鍗冲彲
--
Gitblit v1.9.3