代码迁移，修改远程调用

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteOrgService.java

@@ -23,10 +23,19 @@ public interface RemoteOrgService {
     R<List<SysOrg>> getAllOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/dept/selectCheckSubOrgIdList")
-    R<List<Long>> selectCheckSubOrgIdList(Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    List<Long> selectCheckSubOrgIdList(@RequestParam("orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/dept/selectSysOrgById")
-    R<SysOrg> selectSysOrgById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    SysOrg selectSysOrgById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /**
+     * 查询第一级机构
+     * @param source
+     * @return
+     */
+    @GetMapping("/org/selectSysOrgByParentId")
+    List<SysOrg> selectSysOrgByParentId(@RequestParam("id")Long id,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
 
     @GetMapping("/dept/get/{orgId}")
     SysOrg selectOrgById(@PathVariable("orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRoleService.java

@@ -0,0 +1,23 @@
+package com.xunmei.system.api;
+
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.constant.ServiceNameConstants;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.system.api.domain.SysRole;
+import com.xunmei.system.api.factory.RemoteRoleFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/25
+ */
+@FeignClient(contextId = "remoteRoleService", value = ServiceNameConstants.SYSTEM_SERVICE)
+public interface RemoteRoleService {
+
+    @GetMapping("/role/getRoleById")
+    R<SysRole> getRoleById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+}

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteUserService.java

@@ -13,22 +13,23 @@ import java.util.List;
 
 /**
  * 用户服务
- * 
+ *
  * @author xunmei
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService
-{
+public interface RemoteUserService {
     /**
      * 通过用户名查询用户信息
      *
      * @param username 用户名
-     * @param source 请求来源
+     * @param source   请求来源
      * @return 结果
      */
     @GetMapping("/user/info/{username}")
     public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping("/user/getUserById")
+    public SysUser getUserById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /**
      * 通过用户名查询用户信息
@@ -40,11 +41,11 @@ public interface RemoteUserService
     public R<List<SysUser>> getAllSyncUser(@RequestBody SysUser request, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
 
-
     /**
      * 批量保存同步用户
+     *
      * @param userList
-     * @param source userList
+     * @param source   userList
      * @return
      */
     @PostMapping("/user/sync/batch")

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteOrgFallbackFactory.java

@@ -31,12 +31,17 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             }
 
             @Override
-            public R<List<Long>> selectCheckSubOrgIdList(Long orgId, String source) {
+            public List<Long> selectCheckSubOrgIdList(Long orgId, String source) {
                 return null;
             }
 
             @Override
-            public R<SysOrg> selectSysOrgById(Long id, String source) {
+            public SysOrg selectSysOrgById(Long id, String source) {
+                return null;
+            }
+
+            @Override
+            public List<SysOrg> selectSysOrgByParentId(Long id, String source) {
                 return null;
             }
 

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -0,0 +1,34 @@
+package com.xunmei.system.api.factory;
+
+
+import com.xunmei.common.core.domain.R;
+import com.xunmei.system.api.RemoteRoleService;
+import com.xunmei.system.api.domain.SysRole;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/25
+ */
+@Component
+public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteRoleFallbackFactory.class);
+
+
+    @Override
+    public RemoteRoleService create(Throwable cause) {
+        log.error("用户服务调用失败:{}", cause.getMessage());
+        return new RemoteRoleService() {
+            @Override
+            public R<SysRole> getRoleById(Long id, String source) {
+                return null;
+            }
+        };
+
+    
+    }
+}

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteUserFallbackFactory.java

@@ -34,6 +34,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
             }
 
             @Override
+            public SysUser getUserById(Long id, String source) {
+                return null;
+            }
+
+            @Override
             public R<List<SysUser>> getAllSyncUser(SysUser request, String source) {
                 return null;
             }

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/auth/AuthLogic.java

@@ -347,6 +347,7 @@ public class AuthLogic
         }
         catch (Exception e)
         {
+            e.printStackTrace();
             return new HashSet<>();
         }
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/TMonitoringRetrievalPlanController.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -1,29 +1,17 @@
-package com.xunmei.system.controller;
+package com.xunmei.core.access.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.system.domain.TMonitoringRetrievalPlan;
-import com.xunmei.system.service.ITMonitoringRetrievalPlanService;
-import com.xunmei.common.core.web.controller.BaseController;
-import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
+import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 监控调阅计划Controller
@@ -33,7 +21,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
  */
 @Api(tags = {"TMonitoringRetrievalPlan"})
 @RestController
-@RequestMapping("/plan")
+@RequestMapping("/accessPlan")
 public class TMonitoringRetrievalPlanController extends BaseController {
     @Autowired
     private ITMonitoringRetrievalPlanService tMonitoringRetrievalPlanService;
@@ -42,7 +30,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 查询监控调阅计划列表
      */
     @ApiOperation(value = "查询TMonitoringRetrievalPlan列表")
-    @RequiresPermissions("system:plan:list")
+    @RequiresPermissions("core:access:list")
     @GetMapping("/list")
     public TableDataInfo<TMonitoringRetrievalPlan> list(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
 
@@ -53,7 +41,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 下发
      */
     @ApiOperation(value = "下发")
-    @RequiresPermissions("system:plan:add")
+    @RequiresPermissions("core:accessPlan:add")
     @GetMapping(value = "/distribute/{id}")
     public AjaxResult distribute(@PathVariable(value = "id", required = false) Long id) {
         return success(tMonitoringRetrievalPlanService.distribute(id));
@@ -63,7 +51,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 获取监控调阅计划详细信息
      */
     @ApiOperation(value = "获取TMonitoringRetrievalPlan详细信息")
-    @RequiresPermissions("system:plan:query")
+    @RequiresPermissions("core:accessPlan:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(tMonitoringRetrievalPlanService.selectTMonitoringRetrievalPlanById(id));
@@ -73,7 +61,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 新增监控调阅计划
      */
     @ApiOperation(value = "新增TMonitoringRetrievalPlan")
-    @RequiresPermissions("system:plan:add")
+    @RequiresPermissions("core:accessPlan:add")
     @Log(title = "监控调阅计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
@@ -84,7 +72,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 修改监控调阅计划
      */
     @ApiOperation(value = "修改TMonitoringRetrievalPlan")
-    @RequiresPermissions("system:plan:edit")
+    @RequiresPermissions("core:accessPlan:edit")
     @Log(title = "监控调阅计划", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
@@ -95,7 +83,7 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 删除监控调阅计划
      */
     @ApiOperation(value = "删除TMonitoringRetrievalPlan")
-    @RequiresPermissions("system:plan:remove")
+    @RequiresPermissions("core:accessPlan:remove")
     @Log(title = "监控调阅计划", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/TMonitoringRetrievalPlan.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/TMonitoringRetrievalPlan.java

@@ -1,18 +1,16 @@
-package com.xunmei.system.domain;
+package com.xunmei.core.access.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.xunmei.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 监控调阅计划对象 t_monitoring_retrieval_plan
@@ -126,7 +124,7 @@ public class TMonitoringRetrievalPlan extends BaseEntity {
 
 
                 .append("roleId", getRoleId())
-                .append("roleName",getRoleName())
+                .append("roleName", getRoleName())
 
                 .append("planCycle", getPlanCycle())
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/TMonitoringRetrievalPlanMapper.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/TMonitoringRetrievalPlanMapper.java

@@ -1,11 +1,12 @@
-package com.xunmei.system.mapper;
+package com.xunmei.core.access.mapper;
 
-import java.util.List;
 
-import com.xunmei.system.domain.TMonitoringRetrievalPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 监控调阅计划Mapper接口
  *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ITMonitoringRetrievalPlanService.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ITMonitoringRetrievalPlanService.java

@@ -1,11 +1,11 @@
-package com.xunmei.system.service;
+package com.xunmei.core.access.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.domain.TMonitoringRetrievalPlan;
-
+import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import java.util.List;
 
+
 /**
  * 监控调阅计划Service接口
  *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/TMonitoringRetrievalPlanServiceImpl.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -1,29 +1,33 @@
-package com.xunmei.system.service.impl;
+package com.xunmei.core.access.service.impl;
 
-import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
+import com.xunmei.core.access.mapper.TMonitoringRetrievalPlanMapper;
+import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.RemoteRoleService;
+import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
-import com.xunmei.system.domain.SysAreaCheck;
-import com.xunmei.system.mapper.SysOrgMapper;
-import com.xunmei.system.mapper.SysRoleMapper;
-import com.xunmei.system.mapper.SysUserMapper;
+import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
 
-import java.util.Arrays;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.system.mapper.TMonitoringRetrievalPlanMapper;
-import com.xunmei.system.domain.TMonitoringRetrievalPlan;
-import com.xunmei.system.service.ITMonitoringRetrievalPlanService;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 
 /**
  * 监控调阅计划Service业务层处理
@@ -36,14 +40,11 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Autowired
     private TMonitoringRetrievalPlanMapper tMonitoringRetrievalPlanMapper;
     @Autowired
-    private ISysOrgService orgService;
+    private RemoteUserService remoteUserService;
     @Autowired
-    private SysOrgMapper sysOrgMapper;
+    private RemoteOrgService remoteOrgService;
     @Autowired
-    private SysRoleMapper sysRoleMapper;
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
+    private RemoteRoleService remoteRoleService;
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
@@ -62,14 +63,13 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         QueryWrapper<TMonitoringRetrievalPlan> query = new QueryWrapper<>(tMonitoringRetrievalPlan);
         //下穿
         tMonitoringRetrievalPlan.setCheckSub(true);
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("parent_id", -1);
-        SysOrg sysOrg1 = sysOrgMapper.selectOne(queryWrapper);
+        List<SysOrg> data = remoteOrgService.selectSysOrgByParentId(-1L, SecurityConstants.INNER);
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
-            tMonitoringRetrievalPlan.setOrgId(sysOrg1.getId());
+            tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
         if (tMonitoringRetrievalPlan.getCheckSub()) {
-            List<Long> ids = orgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId());
+            //List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
+            List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(),SecurityConstants.INNER);
             //清空前端传递的org_id
             tMonitoringRetrievalPlan.setOrgId(null);
             //添加in条件
@@ -82,6 +82,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         if (tMonitoringRetrievalPlan.getParams().get("beginTime") != null && tMonitoringRetrievalPlan.getParams().get("endTime") != null) {
             query.between("create_time", tMonitoringRetrievalPlan.getParams().get("beginTime"), tMonitoringRetrievalPlan.getParams().get("endTime"));
         }
+        query.orderByDesc("create_time");
         //获取数据
         page = tMonitoringRetrievalPlanMapper.selectPage(page, query);
         //抓换为TableDataInfo适配前端
@@ -108,9 +109,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         TMonitoringRetrievalPlan tMonitoringRetrievalPlan = tMonitoringRetrievalPlanMapper.selectById(id);
         tMonitoringRetrievalPlan.setPlanStatus(0);
         tMonitoringRetrievalPlanMapper.updateById(tMonitoringRetrievalPlan);
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("parent_id", tMonitoringRetrievalPlan.getOrgId());
-        List<SysOrg> list = sysOrgMapper.selectList(queryWrapper);
+        List<SysOrg> list = remoteOrgService.selectSysOrgByParentId(-1L, SecurityConstants.INNER);
         Integer i = 0;
         for (SysOrg l : list) {
             TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
@@ -158,13 +157,16 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Override
     public int insertTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         tMonitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
-        SysUser sysUser = sysUserMapper.selectById(SecurityUtils.getUserId());
-        tMonitoringRetrievalPlan.setOrgName(sysOrgMapper.selectSysOrgById(sysUser.getOrgId()).getName());
+        SysUser sysUser = remoteUserService.getUserById(SecurityUtils.getUserId(), SecurityConstants.INNER);
+    SysOrg data = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
+        tMonitoringRetrievalPlan.setOrgName(data.getName());
         tMonitoringRetrievalPlan.setOrgId(sysUser.getOrgId());
         tMonitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
         tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
         tMonitoringRetrievalPlan.setUpdateBy(SecurityUtils.getUsername());
-        tMonitoringRetrievalPlan.setRoleName(sysRoleMapper.selectRoleById(tMonitoringRetrievalPlan.getRoleId()).getRoleName());
+        R<SysRole> roleById = remoteRoleService.getRoleById(tMonitoringRetrievalPlan.getRoleId(), SecurityConstants.INNER);
+        SysRole sysRole = roleById.getData();
+        tMonitoringRetrievalPlan.setRoleName(sysRole.getRoleName());
         if (tMonitoringRetrievalPlan.getOrgType().equals("1")) {
             tMonitoringRetrievalPlan.setPlanStatus(1);
         } else {
@@ -216,4 +218,39 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int deleteTMonitoringRetrievalPlanById(Long id) {
         return tMonitoringRetrievalPlanMapper.deleteById(id);
     }
+
+    @Override
+    public boolean saveBatch(Collection<TMonitoringRetrievalPlan> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<TMonitoringRetrievalPlan> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean updateBatchById(Collection<TMonitoringRetrievalPlan> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdate(TMonitoringRetrievalPlan entity) {
+        return false;
+    }
+
+    @Override
+    public TMonitoringRetrievalPlan getOne(Wrapper<TMonitoringRetrievalPlan> queryWrapper, boolean throwEx) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> getMap(Wrapper<TMonitoringRetrievalPlan> queryWrapper) {
+        return null;
+    }
+
+    @Override
+    public <V> V getObj(Wrapper<TMonitoringRetrievalPlan> queryWrapper, Function<? super Object, V> mapper) {
+        return null;
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/SysLearningMaterialsServiceImpl.java

@@ -73,8 +73,8 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
     }
 
     private void dealParentOrgId(SysLearningMaterialsPageDto sysLearningMaterials) {
-        R<SysOrg> r = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
-        SysOrg sysOrg = r.getData();
+        SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
+       // SysOrg sysOrg = r.getData();
         if (sysOrg == null || ObjectUtil.isEmpty(sysOrg.getPath())) {
             throw new RuntimeException("机构不存在或机构信息缺失!");
         }
@@ -130,8 +130,8 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
         sysLearningMaterials.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         sysLearningMaterials.setUpdateTime(DateUtils.getNowDate());
         sysLearningMaterials.setIsOpen(0);
-        final R<SysOrg> r = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
-        SysOrg sysOrg = r.getData();
+        final SysOrg sysOrg = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
+       // SysOrg sysOrg = r.getData();
         if (sysOrg != null) {
             sysLearningMaterials.setOrgName(sysOrg.getName());
             sysLearningMaterials.setOrgPath(sysOrg.getPath());
@@ -192,8 +192,8 @@ public class SysLearningMaterialsServiceImpl extends ServiceImpl<SysLearningMate
 
         SysOrg sysOrg = null;
         try {
-            R<SysOrg> sysOrgR = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
-            sysOrg = sysOrgR.getData();
+            SysOrg sysOrgR = remoteOrgService.selectSysOrgById(sysLearningMaterials.getOrgId(), SecurityConstants.INNER);
+            sysOrg = sysOrgR;
         } catch (Exception e) {
             throw new RuntimeException("获取机构信息失败,请确认服务可用!");
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -394,7 +394,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         }
 
         if (info.getOrgId() != null) {
-            SysOrg org = orgService.selectSysOrgById(info.getOrgId(), SecurityConstants.INNER).getData();
+            SysOrg org = orgService.selectSysOrgById(info.getOrgId(), SecurityConstants.INNER);
             qw.lambda().eq(AppRule::getOrgType, org.getType()).eq(AppRule::getStatus, 0);
         }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/SysResumptionServiceImpl.java

@@ -63,11 +63,11 @@ public class SysResumptionServiceImpl extends ServiceImpl<SysResumptionMapper, S
         QueryWrapper<SysResumption> query = new QueryWrapper<>(sysResumption);
         //下穿
         if (sysResumption.getCheckSub()) {
-            R<List<Long>> checkSubOrgIdList = orgService.selectCheckSubOrgIdList(sysResumption.getOrgId(),SecurityConstants.INNER);
-            if(checkSubOrgIdList.getCode()!=200){
-//                return checkSubOrgIdList.getMsg();
-            }
-            List<Long> ids = checkSubOrgIdList.getData();
+            List<Long> ids = orgService.selectCheckSubOrgIdList(sysResumption.getOrgId(),SecurityConstants.INNER);
+//            if(checkSubOrgIdList.getCode()!=200){
+////                return checkSubOrgIdList.getMsg();
+//            }
+          //  List<Long> ids = checkSubOrgIdList.getData();
             //清空前端传递的org_id
             sysResumption.setOrgId(null);
             //添加in条件

soc-modules/soc-modules-system/src/main/resources/mapper/system/TMonitoringRetrievalPlanMapper.xml → soc-modules/soc-modules-core/src/main/resources/mapper/access/TMonitoringRetrievalPlanMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.system.mapper.TMonitoringRetrievalPlanMapper">
+<mapper namespace="com.xunmei.core.access.mapper.TMonitoringRetrievalPlanMapper">
 
-    <resultMap type="com.xunmei.system.domain.TMonitoringRetrievalPlan" id="TMonitoringRetrievalPlanResult">
+    <resultMap type="com.xunmei.core.access.domain.TMonitoringRetrievalPlan" id="TMonitoringRetrievalPlanResult">
                 <result property="id" column="id"/>
                 <result property="planName" column="plan_name"/>
                 <result property="orgId" column="org_id"/>
@@ -28,7 +28,7 @@
         from t_monitoring_retrieval_plan
     </sql>
 
-    <select id="selectTMonitoringRetrievalPlanList" parameterType="com.xunmei.system.domain.TMonitoringRetrievalPlan"
+    <select id="selectTMonitoringRetrievalPlanList" parameterType="com.xunmei.core.access.domain.TMonitoringRetrievalPlan"
             resultMap="TMonitoringRetrievalPlanResult">
         <include refid="selectTMonitoringRetrievalPlanVo"/>
         <where>
@@ -74,7 +74,7 @@
             where id = #{id}
     </select>
 
-    <insert id="insertTMonitoringRetrievalPlan" parameterType="com.xunmei.system.domain.TMonitoringRetrievalPlan">
+    <insert id="insertTMonitoringRetrievalPlan" parameterType="com.xunmei.core.access.domain.TMonitoringRetrievalPlan">
         insert into t_monitoring_retrieval_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -146,7 +146,7 @@
         </trim>
     </insert>
 
-    <update id="updateTMonitoringRetrievalPlan" parameterType="com.xunmei.system.domain.TMonitoringRetrievalPlan">
+    <update id="updateTMonitoringRetrievalPlan" parameterType="com.xunmei.core.access.domain.TMonitoringRetrievalPlan">
         update t_monitoring_retrieval_plan
         <trim prefix="SET" suffixOverrides=",">
                     <if test="planName != null">plan_name =

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -149,13 +149,13 @@ public class SysDeptController extends BaseController {
     }
 
     @GetMapping("/selectCheckSubOrgIdList")
-    public R<List<Long>> selectCheckSubOrgIdList(Long orgId) {
-        return R.ok(orgService.selectCheckSubOrgIdList(orgId));
+    public List<Long> selectCheckSubOrgIdList(Long orgId) {
+        return orgService.selectCheckSubOrgIdList(orgId);
     }
 
     @GetMapping("/selectSysOrgById")
-    public R<SysOrg> selectSysOrgById(Long id) {
-        return R.ok(orgService.getById(id));
+    public SysOrg selectSysOrgById(Long id) {
+        return orgService.getById(id);
     }
 
     @GetMapping("/listByIds")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgController.java

@@ -1,5 +1,6 @@
 package com.xunmei.system.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -10,6 +11,7 @@ import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.model.LoginUser;
+import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.service.ISysOrgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,6 +32,8 @@ import java.util.List;
 public class SysOrgController extends BaseController {
     @Autowired
     private ISysOrgService sysOrgService;
+    @Autowired
+    private SysOrgMapper sysOrgMapper;
 
     /**
      * 查询【机构管理】列表
@@ -117,4 +121,17 @@ public class SysOrgController extends BaseController {
     public SysOrg selectSysOrgById(@PathVariable("orgId") Long orgId) {
         return sysOrgService.getById(orgId);
     }
+
+    /**
+     * 通过父类查询子集合
+     */
+    @ApiOperation(value = "通过父类查询子集合")
+    @InnerAuth
+    @GetMapping("/selectSysOrgByParentId")
+    public List<SysOrg> selectSysOrgByParentId(Long id) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("parent_id", id);
+        return sysOrgMapper.selectList(queryWrapper);
+    }
+
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -1,10 +1,12 @@
 package com.xunmei.system.controller;
 
+import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.log.annotation.Log;
 import com.xunmei.common.log.enums.BusinessType;
+import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysDept;
@@ -29,8 +31,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/role")
-public class SysRoleController extends BaseController
-{
+public class SysRoleController extends BaseController {
     @Autowired
     private ISysRoleService roleService;
 
@@ -48,14 +49,12 @@ public class SysRoleController extends BaseController
     }
 
 
-
     /**
      * 根据角色编号获取详细信息
      */
     @RequiresPermissions("system:role:query")
     @GetMapping(value = "/{roleId}")
-    public AjaxResult getInfo(@PathVariable Long roleId)
-    {
+    public AjaxResult getInfo(@PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
         return success(roleService.selectRoleById(roleId));
     }
@@ -66,14 +65,10 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
-    {
-        if (!roleService.checkRoleNameUnique(role))
-        {
+    public AjaxResult add(@Validated @RequestBody SysRole role) {
+        if (!roleService.checkRoleNameUnique(role)) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (!roleService.checkRoleKeyUnique(role))
-        {
+        } else if (!roleService.checkRoleKeyUnique(role)) {
             return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setCreateBy(SecurityUtils.getUsername());
@@ -87,16 +82,12 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getId());
-        if (!roleService.checkRoleNameUnique(role))
-        {
+        if (!roleService.checkRoleNameUnique(role)) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (!roleService.checkRoleKeyUnique(role))
-        {
+        } else if (!roleService.checkRoleKeyUnique(role)) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
         }
         role.setUpdateBy(SecurityUtils.getUsername());
@@ -109,8 +100,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
-    {
+    public AjaxResult dataScope(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getId());
         return toAjax(roleService.authDataScope(role));
@@ -122,8 +112,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
-    {
+    public AjaxResult changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getId());
         role.setUpdateBy(SecurityUtils.getUsername());
@@ -136,8 +125,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(roleService.deleteRoleByIds(ids));
     }
 
@@ -146,17 +134,16 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:query")
     @GetMapping("/optionselect")
-    public AjaxResult optionselect()
-    {
+    public AjaxResult optionselect() {
         return success(roleService.selectRoleAll());
     }
+
     /**
      * 查询已分配用户角色列表
      */
     @RequiresPermissions("system:role:list")
     @GetMapping("/authUser/allocatedList")
-    public TableDataInfo allocatedList(SysUserVO user)
-    {
+    public TableDataInfo allocatedList(SysUserVO user) {
         return userService.selectAllocatedList(user);
     }
 
@@ -165,8 +152,7 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:list")
     @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo unallocatedList(SysUserVO user)
-    {
+    public TableDataInfo unallocatedList(SysUserVO user) {
         return userService.selectUnallocatedList(user);
     }
 
@@ -176,8 +162,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
-    {
+    public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -187,8 +172,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
-    {
+    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds) {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
 
@@ -198,8 +182,7 @@ public class SysRoleController extends BaseController
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
-    {
+    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }
@@ -209,8 +192,7 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissions("system:role:query")
     @GetMapping(value = "/deptTree/{roleId}")
-    public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
-    {
+    public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.selectDeptTreeList(new SysOrg()));
@@ -221,7 +203,14 @@ public class SysRoleController extends BaseController
      * 获取所有可用的角色信息
      */
     @GetMapping(value = "/all")
-    public AjaxResult all(){
+    public AjaxResult all() {
         return success(roleService.selectSimpleRoleAll());
     }
+
+    @InnerAuth
+    @GetMapping(value = "/getRoleById")
+    public R<SysRole> getRoleById(Long id) {
+        SysRole byId = roleService.getById(id);
+        return R.ok(byId);
+    }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -58,8 +58,9 @@ public class SysUserController extends BaseController {
     private ISysConfigService configService;
     @Autowired
     private ISysUserRoleService sysUserRoleService;
-@Autowired
-private ISysUserInformationService sysUserInformationService;
+    @Autowired
+    private ISysUserInformationService sysUserInformationService;
+
     /**
      * 获取用户列表
      */
@@ -144,32 +145,33 @@ private ISysUserInformationService sysUserInformationService;
         ajax.put("posts", null);
         if (StringUtils.isNotNull(userId)) {
             SysUserInformation informationByUserId = sysUserInformationService.getInformationByUserId(userId);
-           if (null==informationByUserId){
-               informationByUserId=new SysUserInformation();
-           }
+            if (null == informationByUserId) {
+                informationByUserId = new SysUserInformation();
+            }
             SysUser sysUser = userService.selectUserById(userId);
             List<SysUserRole> userRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("user_id", userId));
             sysUser.setRoles(roles);
-          String sex="男";
-          String status="禁用";
-          if (null!=sysUser){
-           if ( sysUser.getGender().equals("1")) {
-                  sex="女";
-              }
-           if (sysUser.getIsLock().equals("0")){
-               status="启用";
-           }
-          }
+            String sex = "男";
+            String status = "禁用";
+            if (null != sysUser) {
+                if (sysUser.getGender().equals("1")) {
+                    sex = "女";
+                }
+                if (sysUser.getIsLock().equals("0")) {
+                    status = "启用";
+                }
+            }
             ajax.put(AjaxResult.DATA_TAG, sysUser);
-            ajax.put("information",informationByUserId);
+            ajax.put("information", informationByUserId);
             ajax.put("postIds", null);
             ajax.put("roleIds", userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()));
-            ajax.put("roleName",roleService.getRoleName(userId));
-            ajax.put("sex",sex);
-            ajax.put("status",status);
+            ajax.put("roleName", roleService.getRoleName(userId));
+            ajax.put("sex", sex);
+            ajax.put("status", status);
         }
         return ajax;
     }
+
     /**
      * 新增用户
      */
@@ -227,7 +229,7 @@ private ISysUserInformationService sysUserInformationService;
 //        {
 //            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
 //        }
-        if (user.getRoleIds()!=null&&user.getRoleIds().length > 0) {
+        if (user.getRoleIds() != null && user.getRoleIds().length > 0) {
             sysUserRoleService.remove(new QueryWrapper<SysUserRole>().eq("user_id", user.getId()));
             for (Long roleId :
                     user.getRoleIds()) {
@@ -327,6 +329,11 @@ private ISysUserInformationService sysUserInformationService;
         }
     }
 
+    @InnerAuth
+    @GetMapping("/getUserById")
+    public SysUser getUserById(Long id) {
+        return userService.selectUserById(id);
+    }
 
     /**
      * 查询机构列表