用户

web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudImgFilesFacadeImpl.java

@@ -0,0 +1,33 @@
+package com.zcloud.basic.info.facade;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.zcloud.basic.info.api.ImgFilesServiceI;
+import com.zcloud.basic.info.command.convertor.ImgFilesCoConvertor;
+import com.zcloud.basic.info.dto.ImgFilesQryCmd;
+import com.zcloud.basic.info.dto.clientobject.ImgFilesCO;
+import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade;
+import com.zcloud.gbscommon.zcloudimgfiles.request.ZcloudImgFilesQryCmd;
+import com.zcloud.gbscommon.zcloudimgfiles.response.ZcloudImgFilesCO;
+import org.springframework.beans.BeanUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author zhangyue
+ * @date 2025/12/3 10:43
+ */
+public class ZcloudImgFilesFacadeImpl implements ZcloudImgFilesFacade {
+    @Resource
+    private ImgFilesServiceI imgFilesService;
+    @Resource
+    private ImgFilesCoConvertor imgFilesCoConvertor;
+    @Override
+    public MultiResponse<ZcloudImgFilesCO> listAll(ZcloudImgFilesQryCmd zcloudImgFilesQryCmd) {
+        ImgFilesQryCmd imgFilesQryCmd = new ImgFilesQryCmd();
+        BeanUtils.copyProperties(zcloudImgFilesQryCmd, imgFilesQryCmd);
+        MultiResponse<ImgFilesCO> response = imgFilesService.listAll(imgFilesQryCmd);
+        List<ZcloudImgFilesCO> zcloudImgFilesCo = imgFilesCoConvertor.converCOsToDubboCOs(response.getData());
+        return MultiResponse.of(zcloudImgFilesCo);
+    }
+}

web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -65,6 +66,7 @@ public class UserController {
 
     @ApiOperation("分页")
     @PostMapping("/list")
+    @PreAuthorize("@pms.hasAnyPermission('zhgl2','zgsyhgl','ryxxgl')")
     public PageResponse<UserCO> page(@RequestBody UserPageQry qry) {
         return userService.listPage(qry);
     }

web-app/src/main/java/com/zcloud/basic/info/command/convertor/ImgFilesCoConvertor.java

@@ -3,6 +3,7 @@ package com.zcloud.basic.info.command.convertor;
 import com.zcloud.basic.info.domain.model.ImgFilesE;
 import com.zcloud.basic.info.dto.clientobject.ImgFilesCO;
 import com.zcloud.basic.info.persistence.dataobject.ImgFilesDO;
+import com.zcloud.gbscommon.zcloudimgfiles.response.ZcloudImgFilesCO;
 import org.mapstruct.Mapper;
 
 import java.util.List;
@@ -24,5 +25,7 @@ public interface ImgFilesCoConvertor {
     List<ImgFilesDO> converEsToDOs(List<ImgFilesE> imgFilesEs);
     List<ImgFilesE> converDOsToEs(List<ImgFilesDO> imgFilesDOs);
 
+    List<ZcloudImgFilesCO> converCOsToDubboCOs(List<ImgFilesCO> imgFilesCOs);
+
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/UserMapper.java

@@ -3,6 +3,8 @@ package com.zcloud.basic.info.persistence.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jjb.saas.framework.datascope.annotation.DataScope;
+import com.jjb.saas.framework.datascope.annotation.DataScopes;
 import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO;
 import com.zcloud.basic.info.persistence.dataobject.UserDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,10 +20,13 @@ import java.util.Map;
  * @Date 2025-11-04 14:07:36
  */
 @Mapper
+@DataScopes({
+        @DataScope(method = "selectUserPage", menuPerms = ""),
+})
 public interface UserMapper extends BaseMapper<UserDO> {
     List<UserDO> selectListAll(@Param("params") Map<String, Object> params);
 
-    IPage<UserDO> selectUserPage(IPage<UserDO> page, @Param("ew") QueryWrapper<UserDO> queryWrapper);
+    IPage<UserDO> selectUserPage(IPage<UserDO> page, @Param("ew") QueryWrapper<UserDO> queryWrapper, String menuPerms);
 
     UserDO getInfoById(@Param("id") Long id);
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java

@@ -15,6 +15,14 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.jjb.saas.framework.event.producer.RemoteEventPublisher;
 import com.jjb.saas.framework.repository.common.PageHelper;
 import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
+import com.jjb.saas.message.client.message.facede.MessageFacade;
+import com.jjb.saas.message.client.message.request.MessageSendCmd;
+import com.jjb.saas.message.client.message.request.MessageTargetCmd;
+import com.jjb.saas.message.client.todotask.facade.BusTodoTaskFacade;
+import com.jjb.saas.message.client.todotask.request.HandelTaskAddCmd;
+import com.jjb.saas.message.client.todotask.request.TodoTaskAddCmd;
+import com.jjb.saas.system.client.menu.facade.MenuFacade;
+import com.jjb.saas.system.client.menu.response.MenuCO;
 import com.jjb.saas.system.client.role.facade.RoleFacade;
 import com.jjb.saas.system.client.role.response.RoleCO;
 import com.jjb.saas.system.client.user.facade.UserFacade;
@@ -26,15 +34,17 @@ import com.zcloud.basic.info.persistence.mapper.UserMapper;
 import com.zcloud.basic.info.persistence.repository.UserRepository;
 import com.zcloud.gbscommon.event.consttag.EventTagConst;
 import com.zcloud.gbscommon.event.user.ZcUserResignation;
-import com.zcloud.gbscommon.utils.PageQueryHelper;
+import com.zcloud.gbscommon.utils.*;
-import com.zcloud.gbscommon.utils.Query;
+import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade;
-import com.zcloud.gbscommon.utils.Tools;
+import com.zcloud.gbscommon.zcloudimgfiles.request.ZcloudImgFilesQryCmd;
+import com.zcloud.gbscommon.zcloudimgfiles.response.ZcloudImgFilesCO;
 import com.zcloud.gbscommon.utils.UuidUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -66,18 +76,74 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
     private AccountFacade accountFacade;
     @Autowired
     private RemoteEventPublisher remoteEventPublisher;
+    @DubboReference
+    private MenuFacade menuFacade;
+
+    public static String appKey;
+
+//    @Value("${sdk.server.app-key}")
+//    public void setAppKey(String appKeyProperties) {
+//        appKey = appKeyProperties;
+//    }
     @Override
     public PageResponse<UserDO> listPage(Map<String, Object> params) {
+        MultiResponse<MenuCO> s = menuFacade.listMenuByAppKey(appKey);
+        MultiResponse<MenuCO> s1 = menuFacade.listMenuByAppKeyAll(appKey);
+
+
+//        ZcloudImgFilesQryCmd zcloudImgFilesQryCmd = new ZcloudImgFilesQryCmd();
+//        MultiResponse<ZcloudImgFilesCO> s = zcloudImgFilesFacade.listAll(zcloudImgFilesQryCmd);
+//        TodoTaskAddCmd todoTaskAddCmd = new TodoTaskAddCmd();
+//        todoTaskAddCmd.setUserId(AuthContext.getCurrentUser().getUserId());
+//        String busId = UuidUtil.get32UUID();
+//        System.out.println(busId);
+//        todoTaskAddCmd.setBusId(busId);
+//        todoTaskAddCmd.setAppKey("9f41187e801e4de5843b1a9a3fe4318e");
+//        todoTaskAddCmd.setTitle(DateUtil.getSdfTimes());
+//        todoTaskAddCmd.setLevelEnum("IMPATIENT");
+//        todoTaskAddCmd.setBusTypeEnum("ssss");
+//        todoTaskAddCmd.setBusCode("wowowowo");
+//        todoTaskAddCmd.setButtonName("查看");
+//        todoTaskAddCmd.setContent("这是content");
+//        todoTaskAddCmd.setDetailUrl("/basicInfo/container/supervision/supervision/user/list?gbs_native=true&gbs_client_id=GWJZH&paginationKeys=current,pageSize&paginationValues=1,20");
+//        busTodoTaskFacade.addTask(todoTaskAddCmd);
+//        HandelTaskAddCmd handelTaskAddCmd = new HandelTaskAddCmd();
+//        handelTaskAddCmd.setUserId(AuthContext.getCurrentUser().getUserId());
+//        handelTaskAddCmd.setBusId("08ce77d4d7fa4291bc65d62cdbbd24a1");
+//        handelTaskAddCmd.setBusCode("wowowowo");
+//        busTodoTaskFacade.handleTask(handelTaskAddCmd);
         IPage<UserDO> iPage = new Query<UserDO>().getPage(params);
         QueryWrapper<UserDO> queryWrapper = new QueryWrapper<>();
         queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params, "u.");
         queryWrapper.eq("u.delete_enum", "FALSE");
         queryWrapper.apply("u.id != u.corpinfo_id");
         queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time");
-        IPage<UserDO> result = userMapper.selectUserPage(iPage, queryWrapper);
+        String menuPerms = "";
+        if(params.get("allFlag").toString().equals("1")){
+            menuPerms = "zhgl2";
+        }
+        if(params.get("allFlag").toString().equals("2")){
+            menuPerms = "zgsyhgl";
+        }
+        if(params.get("allFlag").toString().equals("3")){
+            menuPerms = "ryxxgl";
+        }
+        if(params.get("allFlag").toString().equals("4")){
+            menuPerms = "yhglqyd";
+        }
+        IPage<UserDO> result = userMapper.selectUserPage(iPage, queryWrapper, menuPerms);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
+    @DubboReference
+    private ZcloudImgFilesFacade zcloudImgFilesFacade;
+
+    @DubboReference
+    private MessageFacade messageFacade;
+
+    @DubboReference
+    private BusTodoTaskFacade busTodoTaskFacade;
+
     @Override
     public List<UserDO> listAll(Map<String, Object> params) {
         if (!ObjectUtils.isEmpty(params.get("corpinfoId"))) {