fix

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,6 +1,7 @@
 package com.ruoyi;
 
 //import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -14,10 +15,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 @SpringBootApplication
 @EnableDiscoveryClient
 //@NacosPropertySource(dataId = "YJZH_SQ-dev.properties",groupId = "1685c502-a710-455b-b9e5-c7301f6d01cd",autoRefreshed = true)
-public class RuoYiApplication
-{
-    public static void main(String[] args)
-    {
+public class RuoYiApplication {
+    public static void main(String[] args) {
         System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  TOCC-SQ启动成功   ლ(´ڡ`ლ)ﾞ");

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -11,16 +11,10 @@ import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.zhdd.feign.FeignUserManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -38,6 +32,8 @@ import java.util.Map;
 public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
+    @Autowired
+    private FeignUserManageService feignUserManageService;
 
     /**
      * 获取部门列表
@@ -48,6 +44,23 @@ public class SysDeptController extends BaseController {
         return AjaxResult.success(depts);
     }
 
+    @GetMapping("/gateway/pageList")
+    public AjaxResult gatewayPageList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                      @RequestParam(defaultValue = "10") Integer pageSize,
+                                      @RequestParam(required = false) String name) {
+        return AjaxResult.success(feignUserManageService.deptPageList(pageNum, pageSize, name));
+    }
+
+    @GetMapping("/gateway/list")
+    public AjaxResult gatewayList() {
+        return AjaxResult.success(feignUserManageService.deptList());
+    }
+
+    @GetMapping("/gateway/detail")
+    public AjaxResult gatewayList(@RequestParam String id) {
+        return AjaxResult.success(feignUserManageService.deptDetail(id));
+    }
+
     /**
      * 查询部门列表（排除节点）
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/SysGatewayUserTask.java

@@ -7,10 +7,13 @@ import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.framework.websocket.WebSocketServer;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.FindsDepartsChildrenUtil;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.zhdd.domain.GatewayDept;
+import com.ruoyi.zhdd.domain.GatewaySUser;
 import com.ruoyi.zhdd.domain.SingleDevice;
 import com.ruoyi.zhdd.domain.bo.SingleDeviceBo;
 import com.ruoyi.zhdd.service.ISingleDeviceService;
@@ -35,165 +38,136 @@ public class SysGatewayUserTask {
     @Autowired
     private ISysDictTypeService sysDictTypeService;
 
-    @Autowired
-    private WebSocketServer webSocketServer;
-
-    /*@KafkaListener(topics = "t_uc_user")
-    public void onUserMessage(String message) {
-        log.info("kafka用户信息消费：{}", message);
-        try {
-            GatewaySUser gatewaySUser = JSONUtil.toBean(message, GatewaySUser.class);
-            if (gatewaySUser != null) {
-                SysUser quser = new SysUser();
-                quser.setUserId(gatewaySUser.getUserId());
-                List<SysUser> userList = userService.selectUserList(quser);
-                if (userList.isEmpty()) {
-                    //插入
-                    SysUser user = new SysUser();
-                    user.setUserId(gatewaySUser.getUserId());
-                    *//*{
-                        SysDept qdept = new SysDept();
-                        qdept.setOtherId(gatewaySUser.getDeptId());
-                        List<SysDept> deptList = deptService.selectDeptList(qdept);
-                        if (!deptList.isEmpty()) {
-                            user.setDeptId(deptList.get(0).getDeptId());
-                        } else {
-                            //还未有部门暂不设置  //需要先同步部门
-                        }
-                    }*//*
-                    user.setPhonenumber(gatewaySUser.getMobile());
-                    user.setNickName(gatewaySUser.getName());
-                    user.setUserName(gatewaySUser.getUserName());
-                    user.setDeptId(gatewaySUser.getDeptId());
-                    user.setUserType(Convert.toStr(gatewaySUser.getUserGroupId()));
-                    user.setUpdateBy("kafka");
-                    user.setUpdateTime(new Date());
-                    user.setCreateBy("kafka");
-                    user.setCreateTime(new Date());
-                    user.setSex(gatewaySUser.getSex());
-                    user.setOrgId(gatewaySUser.getOrgId());
-                    user.setSuperior(gatewaySUser.getSuperior());
-                    user.setIdNumber(gatewaySUser.getIdNumber());
-                    user.setPassword(SecurityUtils.encryptPassword("tocc!suqian"));
-                    user.setStatus(gatewaySUser.getStatus());
-                    user.setDelFlag(gatewaySUser.getDelFlag());
-                    userService.insertUser(user);
-                } else {
-                    //更新
-                    SysUser user = userList.get(0);
-                    *//*{
-                        SysDept qdept = new SysDept();
-                        qdept.setOtherId(gatewaySUser.getDeptId());
-                        List<SysDept> deptList = deptService.selectDeptList(qdept);
-                        if (!deptList.isEmpty()) {
-                            user.setDeptId(deptList.get(0).getDeptId());
-                        } else {
-                            //还未有部门暂不设置  //需要先同步部门
-
-                        }
-                    }*//*
-                    user.setPhonenumber(gatewaySUser.getMobile());
-                    user.setNickName(gatewaySUser.getName());
-                    user.setUserName(gatewaySUser.getUserName());
-                    user.setDeptId(gatewaySUser.getDeptId());
-                    user.setUserType(Convert.toStr(gatewaySUser.getUserGroupId()));
-                    user.setUpdateBy("kafka");
-                    user.setUpdateTime(new Date());
-                    user.setSex(gatewaySUser.getSex());
-                    user.setOrgId(gatewaySUser.getOrgId());
-                    user.setSuperior(gatewaySUser.getSuperior());
-                    user.setIdNumber(gatewaySUser.getIdNumber());
-                    user.setPassword(SecurityUtils.encryptPassword("tocc!suqian"));
-                    user.setStatus(gatewaySUser.getStatus());
-                    user.setDelFlag(gatewaySUser.getDelFlag());
-                    user.setUpdateBy("kafka");
-                    user.setUpdateTime(new Date());
-                    userService.updateUser(user);
-                }
-            }
-        } catch (Exception e) {
-            log.error("t_uc_use的kafka消费异常：{}", e.getMessage());
-        }
-    }*/
+//    @Autowired
+//    private WebSocketServer webSocketServer;
 
     /**
-     * 四维组织部门数据消费
-     * {"id":"f124bfe4b43c49c5b7451b11355cc499","name":"市运输服务中心","parentId":null,"parentName":null,"flag":0,"createTime":"2021-10-21 14:02:28","createUser":"admin","updateTime":"2021-10-21 14:02:28","updateUser":"admin","delFlag":"0"}
+     * kfka用户同步
      *
      * @param message
      */
-//    @KafkaListener(topics = "t_uc_orgdept")
-//    public void onDeptMessage(String message) {
-//        log.info("kafka部门信息消费：{}", message);
-//        try {
-//            GatewayDept gatewayDept = JSONUtil.toBean(message, GatewayDept.class);
-//            if (gatewayDept != null) {
-//                SysDept qdept = new SysDept();
-//                qdept.setDeptId(gatewayDept.getId());
-//                List<SysDept> deptList = deptService.selectDeptList(qdept);
-//                if (deptList.isEmpty()) {
+    @KafkaListener(topics = "t_uc_user")
+    public void onUserMessage(String message) {
+        log.info("kafka用户信息消费：{}", message);
+        try {
+            GatewaySUser gatewaySUser = JSONUtil.toBean(message, GatewaySUser.class);
+//            if (gatewaySUser != null) {
+//                SysUser quser = new SysUser();
+//                quser.setUserId(gatewaySUser.getUserId());
+//                List<SysUser> userList = userService.selectUserList(quser);
+//                if (userList.isEmpty()) {
 //                    //插入
-////                    SysDept dept = new SysDept();
-//                    /*//查询父部门
+//                    SysUser user = new SysUser();
+//                    user.setUserId(gatewaySUser.getUserId());
 //                    {
-//                        SysDept qdept1 = new SysDept();
-//                        if (gatewayDept.getParentId() == null || gatewayDept.getParentId().equals("")) {
-//                            qdept1.setParentId("0");
-//                            qdept1.setOtherId(gatewayDept.getOrgId());
+//                        SysDept qdept = new SysDept();
+//                        qdept.setOtherId(gatewaySUser.getDeptId());
+//                        List<SysDept> deptList = deptService.selectDeptList(qdept);
+//                        if (!deptList.isEmpty()) {
+//                            user.setDeptId(deptList.get(0).getDeptId());
 //                        } else {
-//                            qdept1.setOtherId(gatewayDept.getParentId());
+//                            //还未有部门暂不设置  //需要先同步部门
 //                        }
-//                        List<SysDept> deptList1 = deptService.selectDeptList(qdept1);
-//                        if (!deptList1.isEmpty()) {
-//                            dept.setParentId(deptList1.get(0).getDeptId());
-//                        } else {
-//                            //无父组织或部门 暂不处理吧
-//                        }
-//                    }*/
-//                    qdept.setParentId(StrUtil.emptyToDefault(gatewayDept.getParentId(), "0"));
-//                    qdept.setDeptName(gatewayDept.getName());
-//                    qdept.setUpdateBy(gatewayDept.getUpdateUser());
-//                    qdept.setUpdateTime(DateUtil.parseDateTime(gatewayDept.getUpdateTime()));
-//                    qdept.setCreateBy(gatewayDept.getCreateUser());
-//                    qdept.setCreateTime(DateUtil.parseDateTime(gatewayDept.getCreateTime()));
-//                    qdept.setDelFlag(gatewayDept.getDelFlag());
-//                    qdept.setFlag(Convert.toStr(gatewayDept.getFlag()));
-//
-//                    deptService.insertDept(qdept);
+//                    }
+//                    user.setPhonenumber(gatewaySUser.getMobile());
+//                    user.setNickName(gatewaySUser.getName());
+//                    user.setUserName(gatewaySUser.getUserName());
+//                    user.setDeptId(gatewaySUser.getDeptId());
+//                    user.setUserType(Convert.toStr(gatewaySUser.getUserGroupId()));
+//                    user.setUpdateBy("kafka");
+//                    user.setUpdateTime(new Date());
+//                    user.setCreateBy("kafka");
+//                    user.setCreateTime(new Date());
+//                    user.setSex(gatewaySUser.getSex());
+//                    user.setOrgId(gatewaySUser.getOrgId());
+//                    user.setSuperior(gatewaySUser.getSuperior());
+//                    user.setIdNumber(gatewaySUser.getIdNumber());
+//                    user.setPassword(SecurityUtils.encryptPassword("tocc!suqian"));
+//                    user.setStatus(gatewaySUser.getStatus());
+//                    user.setDelFlag(gatewaySUser.getDelFlag());
+//                    userService.insertUser(user);
 //                } else {
 //                    //更新
-//                    qdept = deptList.get(0);
-//                    //查询父部门
-//                    /*{
-//                        SysDept qdept1 = new SysDept();
-//                        if (gatewayDept.getParentId() == null || gatewayDept.getParentId().equals("")) {
-//                            qdept1.setParentId("0");
-//                            qdept1.setOtherId(gatewayDept.getOrgId());
-//                        } else {
-//                            qdept1.setOtherId(gatewayDept.getParentId());
-//                        }
-//                        List<SysDept> deptList1 = deptService.selectDeptList(qdept1);
-//                        if (!deptList1.isEmpty()) {
-//                            dept.setParentId(deptList1.get(0).getDeptId());
+//                    SysUser user = userList.get(0);
+//                    {
+//                        SysDept qdept = new SysDept();
+//                        qdept.setOtherId(gatewaySUser.getDeptId());
+//                        List<SysDept> deptList = deptService.selectDeptList(qdept);
+//                        if (!deptList.isEmpty()) {
+//                            user.setDeptId(deptList.get(0).getDeptId());
 //                        } else {
-//                            //无父组织或部门 暂不处理吧
+//                            //还未有部门暂不设置  //需要先同步部门
+//
 //                        }
-//                    }*/
-//                    qdept.setParentId(StrUtil.emptyToDefault(gatewayDept.getParentId(), "0"));
-//                    qdept.setDeptName(gatewayDept.getName());
-//                    qdept.setUpdateBy(gatewayDept.getUpdateUser());
-//                    qdept.setUpdateTime(DateUtil.parseDateTime(gatewayDept.getUpdateTime()));
-//                    qdept.setCreateBy(gatewayDept.getCreateUser());
-//                    qdept.setCreateTime(DateUtil.parseDateTime(gatewayDept.getCreateTime()));
-//                    qdept.setDelFlag(gatewayDept.getDelFlag());
-//                    qdept.setFlag(Convert.toStr(gatewayDept.getFlag()));
-//                    deptService.updateDept(qdept);
+//                    }
+//                    user.setPhonenumber(gatewaySUser.getMobile());
+//                    user.setNickName(gatewaySUser.getName());
+//                    user.setUserName(gatewaySUser.getUserName());
+//                    user.setDeptId(gatewaySUser.getDeptId());
+//                    user.setUserType(Convert.toStr(gatewaySUser.getUserGroupId()));
+//                    user.setUpdateBy("kafka");
+//                    user.setUpdateTime(new Date());
+//                    user.setSex(gatewaySUser.getSex());
+//                    user.setOrgId(gatewaySUser.getOrgId());
+//                    user.setSuperior(gatewaySUser.getSuperior());
+//                    user.setIdNumber(gatewaySUser.getIdNumber());
+//                    user.setPassword(SecurityUtils.encryptPassword("tocc!suqian"));
+//                    user.setStatus(gatewaySUser.getStatus());
+//                    user.setDelFlag(gatewaySUser.getDelFlag());
+//                    user.setUpdateBy("kafka");
+//                    user.setUpdateTime(new Date());
+//                    userService.updateUser(user);
 //                }
 //            }
-//        } catch (Exception e) {
-//            log.error("t_uc_orgdept的kafka消费异常：{}", e.getMessage());
-//        }
-//    }
+        } catch (Exception e) {
+            log.error("t_uc_use的kafka消费异常：{}", e.getMessage());
+        }
+    }
+
+    /**
+     * 四维组织部门数据消费
+     * '{"id":"6913667dddd34c5ab8894164fb58d296","name":"华设测试","parentId":"310c4af66f1a4f9586bfee9c432e1ab2","parentName":"沭阳县交通运输局","flag":0,"createTime":"2022-09-14 11:20:07","createUser":"sqadmin1","updateTime":"2022-09-14 11:53:07","updateUser":"sqadmin1","delFlag":"0","fullName":null,"ordinal":null}'
+     *
+     * @param message
+     */
+    @KafkaListener(topics = "t_uc_orgdept")
+    public void onDeptMessage(String message) {
+        log.info("kafka部门信息消费：{}", message);
+        try {
+            GatewayDept gatewayDept = JSONUtil.toBean(message, GatewayDept.class);
+            if (gatewayDept != null) {
+                if ("2".equals(gatewayDept.getDelFlag())) {
+                    // 2为删除部门
+                    deptService.removeById(gatewayDept.getId());
+                    return;
+                }
+                SysDept qdept = new SysDept();
+                qdept.setDeptId(gatewayDept.getId());
+                qdept.setParentId(StrUtil.emptyToDefault(gatewayDept.getParentId(), "0"));
+                qdept.setDeptName(gatewayDept.getName());
+                qdept.setUpdateBy(gatewayDept.getUpdateUser());
+                qdept.setUpdateTime(DateUtil.parseDateTime(gatewayDept.getUpdateTime()));
+                qdept.setCreateBy(gatewayDept.getCreateUser());
+                qdept.setCreateTime(DateUtil.parseDateTime(gatewayDept.getCreateTime()));
+                qdept.setDelFlag(gatewayDept.getDelFlag());
+                qdept.setFlag(Convert.toStr(gatewayDept.getFlag()));
+
+                SysDept info = deptService.getById(qdept.getParentId());
+                if (info != null) {
+                    qdept.setAncestors(info.getAncestors() + "," + qdept.getParentId());
+                } else {
+                    // 找不到父类
+                    // 情况1：有父类，但是之前的部门缺失了
+//                    deptService.dealMissDept(qdept.getParentId());
+                }
+                String departFullNamePrefix = FindsDepartsChildrenUtil.departFullName(deptService.list(), qdept.getParentId());
+                qdept.setFullName(StrUtil.isBlank(departFullNamePrefix) ? qdept.getDeptName() : departFullNamePrefix + qdept.getDeptName());
+                deptService.saveOrUpdate(qdept);
+            }
+        } catch (Exception e) {
+            log.error("t_uc_orgdept的kafka消费异常：{}", e.getMessage());
+        }
+    }
 
     /**
      * 单兵实时位置消费

ruoyi-admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
+    active: test
 ruoyi:
   # 名称
   name: YJZH-SQ-temp

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -133,4 +133,12 @@ public interface ISysDeptService extends IService<SysDept> {
      * @return
      */
     List<String> queryChildDeptId(String deptId);
+
+    /**
+     * 处理缺失的部门数据
+     *
+     * @param parentId
+     * @return
+     */
+    SysDept dealMissDept(String parentId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -43,6 +43,9 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
     @Autowired
     private SysUserMapper userMapper;
 
+//    @Autowired
+//    private FeignUserManageService feignUserManageService;
+
     /**
      * 查询部门管理数据
      *
@@ -337,4 +340,25 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
     public List<String> queryChildDeptId(String deptId) {
         return baseMapper.queryChildDeptId(deptId);
     }
+
+    @Override
+    public SysDept dealMissDept(String parentId) {
+//        // 查询parentId对应的部门
+//        GatewayDeptDetail gatewayDeptDetail = feignUserManageService.deptDetail(parentId);
+//        if (gatewayDeptDetail.getCode() == 0) {
+//            GatewayDeptDetail.DeptDetail data = gatewayDeptDetail.getData();
+//            // 查询该部门是否存在
+//            SysDept sysDept = new SysDept();
+//            sysDept.setDeptId(data.getId());
+//            sysDept.setParentId(StrUtil.emptyToDefault(data.getParentId(), "0"));
+//            sysDept.setDeptName(data.getName());
+//            sysDept.setUpdateBy(data.getUpdateUser());
+//            sysDept.setUpdateTime(DateUtil.parseDateTime(data.getUpdateTime()));
+//            sysDept.setCreateBy(data.getCreateUser());
+//            sysDept.setCreateTime(DateUtil.parseDateTime(data.getCreateTime()));
+//            sysDept.setDelFlag(data.getDelFlag());
+//            sysDept.setFlag(Convert.toStr(data.getFlag()));
+//        }
+        return null;
+    }
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/GatewayDept.java

@@ -8,7 +8,7 @@ public class GatewayDept {
     private String name;
     private String parentId;
     private String parentName;
-    // 0机构；1部门
+    // 0单位；1部门
     private Integer flag;
     private String createTime;
     private String createUser;

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/GatewayDeptDetail.java

@@ -0,0 +1,29 @@
+package com.ruoyi.zhdd.domain;
+
+import lombok.Data;
+
+@Data
+public class GatewayDeptDetail {
+    private Integer code;
+    private String message;
+    private DeptDetail data;
+
+    @Data
+    public static class DeptDetail {
+        private String id;
+        private String name;
+        private String fullName;
+        private String parentId;
+        private String parentName;
+        // 组织部门标志(0:组织，1:部门）
+        private Integer flag;
+        private String createTime;
+        private String createUser;
+        private String updateTime;
+        private String updateUser;
+        private String delFlag;
+        // 同级别内展示顺序
+        private Integer ordinal;
+    }
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/GatewayDeptList.java

@@ -0,0 +1,31 @@
+package com.ruoyi.zhdd.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GatewayDeptList {
+    private Integer code;
+    private String message;
+    private List<DeptDetail> data;
+
+    @Data
+    public static class DeptDetail {
+        private String id;
+        private String name;
+        private String fullName;
+        private String parentId;
+        private String parentName;
+        // 组织部门标志(0:组织，1:部门）
+        private Integer flag;
+        private String createTime;
+        private String createUser;
+        private String updateTime;
+        private String updateUser;
+        private String delFlag;
+        // 同级别内展示顺序
+        private Integer ordinal;
+    }
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/GatewayDeptPage.java

@@ -0,0 +1,37 @@
+package com.ruoyi.zhdd.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GatewayDeptPage {
+    private Integer code;
+    private String message;
+    private DeptPage data;
+
+    @Data
+    public static class DeptDetail {
+        private String id;
+        private String name;
+        private String fullName;
+        private String parentId;
+        private String parentName;
+        // 组织部门标志(0:组织，1:部门）
+        private Integer flag;
+        private String createTime;
+        private String createUser;
+        private String updateTime;
+        private String updateUser;
+        private String delFlag;
+        // 同级别内展示顺序
+        private Integer ordinal;
+    }
+
+    @Data
+    public static class DeptPage {
+        private List<GatewayDeptPage.DeptDetail> rows;
+        private int total;
+    }
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/GatewaySUser.java

@@ -4,20 +4,19 @@ import lombok.Data;
 
 @Data
 public class GatewaySUser {
-        private String delFlag;
-        private String updateTime;
-        private String userId;
-        private String name;
-        private String sex;
-        private String userName;
-        private String deptId;
-        private String superior;
-        private String deptName;
-        private String orgId;
-        private String orgName;
-        private String status;
-        private String idNumber;
-        private String mobile;
-        private int userGroupId;
-        private EntInfo entInfo;
+    private String userId;
+    private String name;
+    private String sex;
+    private String userName;
+    private String orgId;
+    private String orgName;
+    private String deptId;
+    private String deptName;
+    private String status;
+    private String mobile;
+    private String idNumber;
+    private int userGroupId;
+    private EntInfo entInfo;
+    private String delFlag;
+    private String updateTime;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/FeignUserManageService.java

@@ -2,6 +2,9 @@ package com.ruoyi.zhdd.feign;
 
 import cn.hutool.json.JSONObject;
 import com.ruoyi.zhdd.domain.AppInfo;
+import com.ruoyi.zhdd.domain.GatewayDeptDetail;
+import com.ruoyi.zhdd.domain.GatewayDeptList;
+import com.ruoyi.zhdd.domain.GatewayDeptPage;
 import com.ruoyi.zhdd.domain.GatewayUserDetail;
 import com.ruoyi.zhdd.domain.GatewayUserPage;
 import com.ruoyi.zhdd.feign.fallback.FeignUserManageFallback;
@@ -32,6 +35,34 @@ public interface FeignUserManageService {
     GatewayUserPage userPage(@RequestParam(value = "name") String name, @RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize);
 
     /**
+     * 部门详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/orgdept/detail")
+    GatewayDeptDetail deptDetail(@RequestParam(value = "id") String id);
+
+    /**
+     * 部门所有数据
+     *
+     * @return
+     */
+    @GetMapping("/orgdept/list")
+    GatewayDeptList deptList();
+
+    /**
+     * 部门分页数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param name
+     * @return
+     */
+    @GetMapping("/orgdept/pageList")
+    GatewayDeptPage deptPageList(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize, @RequestParam(value = "name") String name);
+
+    /**
      * 第三方进行更新应用操作
      *
      * @return

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/fallback/FeignUserManageFallback.java

@@ -2,6 +2,9 @@ package com.ruoyi.zhdd.feign.fallback;
 
 import cn.hutool.json.JSONObject;
 import com.ruoyi.zhdd.domain.AppInfo;
+import com.ruoyi.zhdd.domain.GatewayDeptDetail;
+import com.ruoyi.zhdd.domain.GatewayDeptList;
+import com.ruoyi.zhdd.domain.GatewayDeptPage;
 import com.ruoyi.zhdd.domain.GatewayUserDetail;
 import com.ruoyi.zhdd.domain.GatewayUserPage;
 import com.ruoyi.zhdd.feign.FeignUserManageService;
@@ -32,6 +35,24 @@ public class FeignUserManageFallback implements FeignUserManageService {
     }
 
     @Override
+    public GatewayDeptDetail deptDetail(String id) {
+        log.error("获取部门详情失败");
+        return null;
+    }
+
+    @Override
+    public GatewayDeptList deptList() {
+        log.error("获取部门列表失败");
+        return null;
+    }
+
+    @Override
+    public GatewayDeptPage deptPageList(Integer pageNum, Integer pageSize, String name) {
+        log.error("获取部门分页列表失败");
+        return null;
+    }
+
+    @Override
     public JSONObject updateSystemInfo(AppInfo appInfo) {
         log.error("更新应用信息失败");
         return null;