From 165070fa735e3dbd136a8a8fae0cd6a455459431 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 14 May 2025 20:06:09 +0800 Subject: [PATCH] =?UTF-8?q?del:=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=A3=9F=E5=A0=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/api/feign/RemoteUserService.java | 3 - .../com/bsd/pjcloud/admin/api/vo/UserVO.java | 3 - .../admin/controller/SysUserController.java | 19 ---- .../pjcloud/admin/service/SysUserService.java | 15 ---- .../service/impl/SysUserServiceImpl.java | 89 ------------------- .../impl/SysUserTransactionServiceImpl.java | 4 - 6 files changed, 133 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java index c4e46891d..a4e15a1d7 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java @@ -40,9 +40,6 @@ import java.util.Set; @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.UPMS_SERVICE) public interface RemoteUserService { - @NoToken - @PostMapping("/user/inner/sync-user-canteen") - R syncUserCanteen(@RequestParam(required = false) Long userId, @RequestParam(required = false) Long deptId, @RequestParam(required = false) Boolean foure); @NoToken @PostMapping("/user/inner-page") diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java index 671a1acfb..efcbf9924 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserVO.java @@ -237,9 +237,6 @@ public class UserVO implements BaseFacesInterface, Serializable { */ private Boolean isCheckUser = false; - @Schema(description = "用户所属的商户id") - private Long canteenId; - /** * 商户相关 */ diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index c34a88fd0..37c61c3ff 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -23,7 +23,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.admin.api.dto.UserDTO; @@ -86,24 +85,6 @@ public class SysUserController { /* ************************************* end 回调 end ************************************* */ - /* ************************************* start 远程调用 start ************************************* */ - - @Inner() - @PostMapping("/inner/sync-user-canteen") - public R syncUserCanteen(@RequestParam(required = false) Long userId, @RequestParam(required = false) Long deptId, @RequestParam(required = false) Boolean foure) { - if (ObjectUtil.isEmpty(foure)) foure = true; - userService.syncUserCanteen(userId, deptId, foure); - return R.ok(); - } - - /* ************************************* end 远程调用 end ************************************* */ - - @Operation(summary = "同步用户食堂信息", description = "同步用户食堂信息") - @PostMapping("/sync-user-canteen") - public R syncUserCanteen() { - userService.syncUserCanteen(); - return R.ok(); - } /** * 获取指定用户全部信息 diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java index a4d1561be..16fd28f7d 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserService.java @@ -228,19 +228,4 @@ public interface SysUserService extends IService { * @return */ List listUserIdByDeptId(Long deptId, String name); - - /** - * 同步所有用户食堂信息 - */ - void syncUserCanteen(); - - /** - * 按条件同步用户食堂信息 - */ - void syncUserCanteen(Long userId, Long deptId, boolean foure); - - /** - * 获取用户食堂id - */ - Long getUserCanteenId(Long deptId); } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java index 0cb08a46a..32f512702 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java @@ -133,7 +133,6 @@ public class SysUserServiceImpl extends ServiceImpl impl private final CacheManager cacheManager; private final RemoteWalletService remoteWalletService; - private final RemoteMchService remoteMchService; private final SysFileService sysFileService; @@ -175,8 +174,6 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setUpdateBy(userDto.getUsername()); sysUser.setPassword(ENCODER.encode(userDto.getPassword())); sysUser.setPasswordModifyTime(LocalDateTime.now()); - // 获取用户食堂id - sysUser.setCanteenId(getUserCanteenId(sysUser.getDeptId())); baseMapper.insert(sysUser); // 保存用户岗位信息 Optional.ofNullable(userDto.getPost()).ifPresent(posts -> { @@ -267,16 +264,6 @@ public class SysUserServiceImpl extends ServiceImpl impl List faceList = sysUserFaceMapper.groupConcatFaces(faceDto); DataUtil.convertFacesList(list.getRecords(), CollectionUtils.convertMap(faceList, SysUserFaceVo::getUserId)); } - // 商户列表 - List mchIds = list.getRecords().stream().map(UserVO::getCanteenId).distinct().toList(); - if (ObjectUtil.isNotEmpty(mchIds)) { - List mchList = remoteMchService.getByIds(mchIds).getData(); - if (ObjectUtil.isNotEmpty(mchList)) { - for (UserVO v : list.getRecords()) { - mchList.stream().filter(m -> ObjectUtil.equals(m.getId(), v.getCanteenId())).findFirst().ifPresent(mch -> v.setMerchantName(mch.getName())); - } - } - } // 审批流程 if (userDTO.getIsFindCheckUser()) { List processInstanceIds = list.getRecords().stream().map(UserVO::getProcessId).filter(ObjectUtil::isNotEmpty).distinct().toList(); @@ -895,7 +882,6 @@ public class SysUserServiceImpl extends ServiceImpl impl updateUser.setUserId(detail.getUserId()); updateUser.setProcessStatus(processStatus); updateUser.setProcessTime(LocalDateTime.now()); - if (isConsent) updateUser.setCanteenId(getUserCanteenId(detail.getDeptId())); baseMapper.updateById(updateUser); if (isConsent) { // 创建用户默认钱包 @@ -952,79 +938,4 @@ public class SysUserServiceImpl extends ServiceImpl impl .like(StrUtil.isNotBlank(name), SysUser::getName, name)); return com.bsd.pjcloud.common.core.util.BeanUtils.toBean(sysUsers, SimpleUserListVO.class); } - - /** - * 同步用户食堂信息 - */ - @Override - public void syncUserCanteen() { - SysUser userDto = new SysUser(); - Long current = 1L; - while (true) { - boolean result = syncUserCanteenGroup(current, userDto, true); - if (!result) break; - current++; - } - } - - /** - * 按条件同步用户食堂信息 - */ - @Override - public void syncUserCanteen(Long userId, Long deptId, boolean foure) { - SysUser userDto = new SysUser(); - userDto.setUserId(userId); - userDto.setDeptId(deptId); - Long current = 1L; - while (true) { - boolean result = syncUserCanteenGroup(current, userDto, foure); - if (!result) break; - current++; - } - } - - /** - * 获取用户食堂id - */ - @Override - public Long getUserCanteenId(Long deptId) { - if (ObjectUtil.isEmpty(deptId)) return -1L; - MchManageVo mchDetail = remoteMchService.getFirstMchByDeptId(deptId, MerchantTypeEnum.CANTEEN).getData(); - if (ObjectUtil.isNotEmpty(mchDetail) && ObjectUtil.isNotEmpty(mchDetail.getTypes()) && ObjectUtil.equals(mchDetail.getTypes(), MerchantTypeEnum.CANTEEN.getType())) { - return mchDetail.getId(); - } - return -1L; - } - - public boolean syncUserCanteenGroup(Long current, SysUser userDto, boolean foure) { - Page page = new Page<>(); - page.setCurrent(current); - page.setSize(100); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper() - .eq(ObjectUtil.isNotEmpty(userDto.getUserId()), SysUser::getUserId, userDto.getUserId()) - .eq(ObjectUtil.isNotEmpty(userDto.getDeptId()), SysUser::getDeptId, userDto.getDeptId()); - Page pageList = baseMapper.selectPageByScope(page, wrapper, null); - boolean result = pageList.getRecords().size() == page.getSize(); - if (ObjectUtil.isEmpty(pageList.getRecords())) return result; - - int noneMchUserSum = 0; - List updateUserList = new ArrayList<>(); - - for (SysUser v : pageList.getRecords()) { - if (!foure && ObjectUtil.isNotEmpty(v.getCanteenId())) continue; - SysUser item = new SysUser(); - item.setUserId(v.getUserId()); - Long mchId = getUserCanteenId(v.getDeptId()); - if (ObjectUtil.equals(mchId, -1L)) { - item.setCanteenId(-1L); - noneMchUserSum++; - } else { - item.setCanteenId(mchId); - } - updateUserList.add(item); - } - baseMapper.updateById(updateUserList); - log.info("|{}|同步用户食堂信息,用户总数量:{},无食堂用户数:{}", TAG, pageList.getCurrent(), noneMchUserSum); - return result; - } } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java index 1d5e3beef..6610bcf71 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserTransactionServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.admin.api.constant.UserTransactionEnum; import com.bsd.pjcloud.admin.api.dto.SysUserTransactionDto; -import com.bsd.pjcloud.admin.api.dto.UserDTO; import com.bsd.pjcloud.admin.api.entity.SysDept; import com.bsd.pjcloud.admin.api.entity.SysUser; import com.bsd.pjcloud.admin.api.entity.SysUserTransactionEntity; @@ -24,7 +23,6 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.common.data.resolver.ParamResolver; import com.bsd.pjcloud.common.data.tenant.TenantContextHolder; import com.bsd.pjcloud.common.security.service.PjcloudUser; -import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.flow.task.api.feign.RemoteFlowEngineService; import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto; @@ -33,7 +31,6 @@ import com.bsd.pjcloud.wallet.api.feign.RemoteWalletService; import com.bsd.pjcloud.wallet.api.feign.RemoteWalletThirdZyService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestAttributes; @@ -205,7 +202,6 @@ public class SysUserTransactionServiceImpl extends ServiceImpl