履职代码优化

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/web/domain/PageDto.java

@@ -22,7 +22,8 @@ public class PageDto<T> {
     @ApiModelProperty(value = "每页大小")
     private Long pageSize=10L;
 
-
+    @ApiModelProperty(value = "是否下穿查询")
+    private Boolean checkSub = false;
 
     public Page<T> getPageDto(){
         Page<T> mePage = new Page<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -7,6 +7,7 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.dto.DistributeDto;
+import com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto;
 import com.xunmei.core.resumption.service.AppPlanService;
 import com.xunmei.core.resumption.vo.appPlan.AppPlanVo;
 import com.xunmei.core.resumption.vo.appPlan.RuleItemVo;
@@ -47,7 +48,7 @@ public class ApiPlanController {
      */
     @PostMapping("/find")
     @RequiresPermissions("core:plan:find")
-    public AjaxResult hostList(@RequestBody AppPlanVo info) {
+    public AjaxResult hostList(@RequestBody CoreResumptionPlanPageDto info) {
 
         Page<AppPlan> result = appPlanService.selectPage(info);
         return AjaxResult.success(result);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleController.java

@@ -5,9 +5,10 @@ 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.security.annotation.RequiresPermissions;
-import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
-import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
-import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.resumption.dto.rule.AppRuleEditDto;
+import com.xunmei.core.resumption.dto.rule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.rule.AppRulePageDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiOperation;
@@ -77,4 +78,10 @@ public class AppRuleController  extends BaseController {
        List<IdNameVo> list=  appRuleService.ruleListForOrg(dto);
        return success(list);
     }
+
+    @ApiOperation(value = "获取")
+    @GetMapping("/orgtree")
+    public AjaxResult getRuleTree() {
+        return success(appRuleService.getRuleTree(SecurityUtils.getLoginUser().getSysUser().getOrgId()));
+    }
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleItemController.java

@@ -6,10 +6,9 @@ import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.core.resumption.domain.AppRuleItem;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemPageDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemPageDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRulePointSelectPageDto;
 import com.xunmei.core.resumption.service.IAppRuleItemService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ProtectionController.java

@@ -1,22 +1,17 @@
 package com.xunmei.core.resumption.controller;
 
-import cn.hutool.core.date.DateTime;
 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.security.annotation.RequiresPermissions;
 import com.xunmei.core.resumption.domain.Protection;
-import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.protection.ProtectionEditDto;
 import com.xunmei.core.resumption.dto.protection.ProtectionLogPageDto;
 import com.xunmei.core.resumption.dto.protection.ProtectionPageDto;
 import com.xunmei.core.resumption.service.IProtectionService;
-import com.xunmei.core.resumption.vo.protection.ProtectionPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/plan/CoreResumptionPlanPageDto.java

@@ -0,0 +1,47 @@
+package com.xunmei.core.resumption.dto.plan;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.xunmei.common.core.web.domain.PageDto;
+import com.xunmei.core.resumption.domain.AppPlan;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class CoreResumptionPlanPageDto extends PageDto<AppPlan> {
+    /**
+     * 计划名称
+     */
+    private String planName;
+
+    /**
+     * 计划状态
+     */
+    private Integer planStatus;
+
+    /**
+     * 计划周期
+     */
+    private Integer planCycle;
+
+    /**
+     * 执行时刻
+     */
+    private Integer planExec;
+
+    /**
+     * 执行机构类型
+     */
+    private Integer orgType;
+
+    /**
+     * 执行角色
+     */
+    private List<Long> roleList;
+
+    /**
+     * 执行机构id
+     */
+
+    private Long orgId;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRuleEditDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rule/AppRuleEditDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.resumption.dto.appRule;
+package com.xunmei.core.resumption.dto.rule;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRuleListForOrgDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rule/AppRuleListForOrgDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.resumption.dto.appRule;
+package com.xunmei.core.resumption.dto.rule;
 
 import lombok.Data;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRulePageDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rule/AppRulePageDto.java

@@ -1,6 +1,5 @@
-package com.xunmei.core.resumption.dto.appRule;
+package com.xunmei.core.resumption.dto.rule;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.xunmei.common.core.web.domain.PageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiModelProperty;
@@ -19,6 +18,4 @@ public class AppRulePageDto extends PageDto<AppRulePageVo> {
 
     private Long orgId;
 
-    @ApiModelProperty(value = "是否下穿查询")
-    private Boolean checkSub = false;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRuleItem/AppRuleItemDetailDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/ruleItem/AppRuleItemDetailDto.java

@@ -1,8 +1,8 @@
-package com.xunmei.core.resumption.dto.appRuleItem;
+package com.xunmei.core.resumption.dto.ruleItem;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDetailDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRuleItem/AppRuleItemDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/ruleItem/AppRuleItemDto.java

@@ -1,10 +1,9 @@
-package com.xunmei.core.resumption.dto.appRuleItem;
+package com.xunmei.core.resumption.dto.ruleItem;
 
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRuleItem/AppRuleItemPageDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/ruleItem/AppRuleItemPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.resumption.dto.appRuleItem;
+package com.xunmei.core.resumption.dto.ruleItem;
 
 import com.xunmei.common.core.web.domain.PageDto;
 import com.xunmei.core.resumption.domain.AppRuleItem;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRuleItem/AppRulePointSelectPageDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/ruleItem/AppRulePointSelectPageDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.resumption.dto.appRuleItem;
+package com.xunmei.core.resumption.dto.ruleItem;
 
 import com.xunmei.common.core.web.domain.PageDto;
 import com.xunmei.core.resumption.vo.appRuleItem.AppRulePointSelectVo;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRulePoint/AppRulePointDetailDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointDetailDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.resumption.dto.appRulePoint;
+package com.xunmei.core.resumption.dto.rulePoint;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRulePoint/AppRulePointDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointDto.java

@@ -1,10 +1,8 @@
-package com.xunmei.core.resumption.dto.appRulePoint;
+package com.xunmei.core.resumption.dto.rulePoint;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * @author jingyuanchao
  * @date 2022/4/27 16:59

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRulePoint/AppRulePointInfoDto.java → soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/rulePoint/AppRulePointInfoDto.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.resumption.dto.appRulePoint;
+package com.xunmei.core.resumption.dto.rulePoint;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppPlanMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.core.resumption.domain.AppPlan;
+import com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto;
 import com.xunmei.core.resumption.vo.appPlan.AppPlanVo;
 import com.xunmei.core.resumption.vo.appPlan.ObjectDataClass;
 import com.xunmei.core.resumption.vo.appPlan.RuleItemVo;
@@ -30,7 +31,7 @@ public interface AppPlanMapper extends BaseMapper<AppPlan> {
      * @param plan
      * @return
      */
-    Page<AppPlan> selectPage(Page<AppPlan> page, @Param("info") AppPlanVo plan);
+    Page<AppPlan> selectPage(Page<AppPlan> page, @Param("info") CoreResumptionPlanPageDto plan);
 
     /**
      *通过履职计划id获取履职任务执行机构

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRuleItemMapper.java

@@ -4,7 +4,7 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.resumption.domain.AppRuleItem;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemPageDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemPageDto;
 import com.xunmei.core.resumption.vo.appRuleItem.AppRuleItemPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRuleMapper.java

@@ -3,12 +3,9 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.resumption.domain.AppRule;
-import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
+import com.xunmei.core.resumption.dto.rule.AppRulePageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleGroupVo;
-import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
-import com.xunmei.core.resumption.vo.appRuleItem.AppRulePointSelectVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRulePointMapper.java

@@ -3,10 +3,9 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.resumption.domain.AppRulePoint;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDetailDto;
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointInfoDto;
-import com.xunmei.core.resumption.domain.AppResumptionDataRemarkimg;
+import com.xunmei.core.resumption.dto.ruleItem.AppRulePointSelectPageDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointInfoDto;
 import com.xunmei.core.resumption.vo.AppRulePointTaskVo;
 import com.xunmei.core.resumption.vo.ResumptionPointVo;
 import com.xunmei.core.resumption.vo.appRuleItem.AppRulePointSelectVo;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/CoreResumptionDataProtectionMapper.java

@@ -32,7 +32,7 @@ public interface CoreResumptionDataProtectionMapper extends BaseMapper<CoreResum
 
     List<ResumptionDataProtectionVo> selectProtection(@Param("orgId")Long orgId,@Param("resumptionDataId") Long resumptionDataId);
 
-    List<ResumptionDataProtectionVo> selectProtectionByResumption(@Param("resumptionId") Long resumptionId);
+    List<ResumptionDataProtectionVo> selectRegisteredProtection(@Param("resumptionId") Long resumptionId);
     /**
      * 新增【请填写功能名称】
      *

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.core.resumption.domain.AppPlan;
 import com.xunmei.core.resumption.dto.DistributeDto;
+import com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto;
 import com.xunmei.core.resumption.vo.appPlan.AppPlanVo;
 import com.xunmei.core.resumption.vo.appPlan.RuleItemVo;
 import com.xunmei.core.resumption.vo.appPlan.RuleRequestVo;
@@ -18,7 +19,7 @@ public interface AppPlanService extends IService<AppPlan> {
      *
      * @return
      */
-    Page<AppPlan> selectPage(AppPlanVo info);
+    Page<AppPlan> selectPage(CoreResumptionPlanPageDto info);
 
     List<Long> selectItemIdsByPlanId(Long id);
 

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

@@ -3,10 +3,10 @@ package com.xunmei.core.resumption.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppRuleItem;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemDetailDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemPageDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDetailDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemPageDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRulePointSelectPageDto;
 import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
 
 import java.util.List;

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

@@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppRule;
-import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
-import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
-import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
+import com.xunmei.core.resumption.dto.rule.AppRuleEditDto;
+import com.xunmei.core.resumption.dto.rule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.rule.AppRulePageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
+import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
 
 import java.util.List;
 
@@ -38,4 +39,6 @@ public interface IAppRuleService extends IService<AppRule> {
     AppRuleInfoVo get(Long id);
 
     List<IdNameVo> ruleListForOrg(AppRuleListForOrgDto dto);
+
+    List<RuleTreeItem> getRuleTree(Long orgId);
 }

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

@@ -10,6 +10,7 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.*;
 import com.xunmei.core.resumption.dto.DistributeDto;
 import com.xunmei.core.resumption.dto.DistributeStatusDto;
+import com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto;
 import com.xunmei.core.resumption.mapper.*;
 import com.xunmei.core.resumption.service.AppPlanService;
 import com.xunmei.core.resumption.vo.appPlan.AppPlanVo;
@@ -67,12 +68,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     RedisTemplate redisTemplate;
 
     @Override
-    public Page<AppPlan> selectPage(AppPlanVo info) {
-        Page<AppPlan> page = new Page<>();
-        long current = info.getPageNum();
-        long size = info.getPageSize();
-        page.setCurrent(current);
-        page.setSize(size);
+    public Page<AppPlan> selectPage(CoreResumptionPlanPageDto info) {
+        Page<AppPlan> page = info.getPageDto();
         Page<AppPlan> result = baseMapper.selectPage(page, info);
         return result;
     }

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

@@ -6,21 +6,20 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.utils.IDHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.domain.AppRuleItem;
 import com.xunmei.core.resumption.domain.AppRulePoint;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemDetailDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemPageDto;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDetailDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDetailDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemPageDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRulePointSelectPageDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto;
 import com.xunmei.core.resumption.mapper.AppRuleItemMapper;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
 import com.xunmei.core.resumption.mapper.AppRulePointMapper;
-import com.xunmei.core.resumption.dto.appRuleItem.AppRuleItemDto;
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDto;
+import com.xunmei.core.resumption.dto.ruleItem.AppRuleItemDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointDto;
 import com.xunmei.core.resumption.service.IAppRuleItemService;
 import com.xunmei.core.resumption.service.IAppRulePointService;
 import com.xunmei.core.resumption.vo.appRuleItem.AppRuleItemPageVo;

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

@@ -1,5 +1,7 @@
 package com.xunmei.core.resumption.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,14 +10,17 @@ import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRule;
-import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
-import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
+import com.xunmei.core.resumption.dto.rule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.rule.AppRulePageDto;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
-import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
+import com.xunmei.core.resumption.dto.rule.AppRuleEditDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
+import com.xunmei.core.resumption.vo.appRuleItem.RuleTreeItem;
+import com.xunmei.system.api.Eto.OrgListByTypesConditionEto;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -24,7 +29,9 @@ import com.xunmei.common.core.utils.IDHelper;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -119,4 +126,43 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
 
         return list;
     }
+
+    @Override
+    public List<RuleTreeItem> getRuleTree(Long orgId) {
+        List<RuleTreeItem> tree = new ArrayList<>();
+        List<SysOrg> orgs = remoteOrgService
+                .listByTypes(OrgListByTypesConditionEto.builder().orgId(orgId).orgTypes(Arrays.asList("1", "2", "3", "4", "11")).build())
+                .getData();
+        if (ObjectUtil.isEmpty(orgs)) {
+            return tree;
+        }
+        Map<Long, SysOrg> orgMap = orgs.stream().collect(Collectors.toMap(o -> o.getId(), o -> o));
+        List<SysOrg> tops = orgs.stream().filter(o -> !orgMap.containsKey(o.getParentId())).collect(Collectors.toList());
+        if (CollectionUtil.isEmpty(tops)) {
+            return tree;
+        }
+        List<Long> orgIds = orgs.stream().map(o -> o.getId()).collect(Collectors.toList());
+        List<AppRule> rules = appRuleMapper.selectList(new LambdaQueryWrapper<AppRule>().in(AppRule::getOrgId, orgIds));
+
+        tree = tops.stream().map(o -> generateTree(o, orgs, rules)).collect(Collectors.toList());
+
+        return tree;
+    }
+
+    private RuleTreeItem generateTree(SysOrg parent, List<SysOrg> allOrg, List<AppRule> allRule) {
+        RuleTreeItem item = RuleTreeItem.builder().isRule(0).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
+        List<RuleTreeItem> ruleItems = allRule.stream().filter(r -> ObjectUtil.equal(r.getOrgId(), parent.getId()))
+                .map(o -> RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(parent.getType().toString()).build())
+                .collect(Collectors.toList());
+        item.getChildren().addAll(ruleItems);
+
+        List<SysOrg> children = allOrg.stream()
+                .filter(o -> ObjectUtil.equal(o.getParentId(), parent.getId()))
+                .collect(Collectors.toList());
+        for (SysOrg child : children) {
+            item.getChildren().add(generateTree(child, allOrg, allRule));
+        }
+
+        return item;
+    }
 }

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

@@ -6,7 +6,6 @@ import com.xunmei.core.resumption.domain.CoreResumptionDataProtection;
 import com.xunmei.core.resumption.mapper.CoreResumptionDataProtectionMapper;
 import com.xunmei.core.resumption.service.ICoreResumptionDataProtectionService;
 import com.xunmei.core.resumption.vo.resumptionRegister.ResumptionDataProtectionVo;
-import com.xunmei.system.api.RemoteOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -82,7 +81,7 @@ public class CoreResumptionDataProtectionServiceImpl extends ServiceImpl<CoreRes
 
     @Override
     public List<ResumptionDataProtectionVo> selectProtection(Long resumptionId) {
-        return baseMapper.selectProtectionByResumption(resumptionId);
+        return baseMapper.selectRegisteredProtection(resumptionId);
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.vo.appPlan;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.PageDto;
+import com.xunmei.core.resumption.domain.AppPlan;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,7 +19,7 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class AppPlanVo extends PageDto {
+public class AppPlanVo extends PageDto<AppPlan> {
 
 
     private Long id;
@@ -55,6 +56,7 @@ public class AppPlanVo extends PageDto {
      * 执行机构类型
      */
     private Integer orgType;
+
     @JsonSerialize(using = ToStringSerializer.class)
     private Integer planType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appRuleItem/AppRuleItemPageVo.java

@@ -2,7 +2,7 @@ package com.xunmei.core.resumption.vo.appRuleItem;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDetailDto;
+import com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppPlanMapper.xml

@@ -31,7 +31,7 @@
     </resultMap>
 
 
-    <select id="selectPage" parameterType="com.xunmei.core.resumption.vo.appPlan.AppPlanVo" resultMap="appPlans">
+    <select id="selectPage" parameterType="com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto" resultMap="appPlans">
         SELECT
         a.*,
         d.roleNames,
@@ -89,16 +89,27 @@
                 </foreach>
                 )
             </if>
-            <if test="info.orgList != null and info.orgList.size > 0">
-                and a.id in (select plan_id from core_resumption_plan_to_exec_org where org_id in
-                <foreach collection="info.orgList" item="orgId" index="index" open="(" separator="," close=")">
-                    #{orgId}
-                </foreach>
-                )
-            </if>
+<!--            <if test="info.orgList != null and info.orgList.size > 0">-->
+<!--                and a.id in (select plan_id from core_resumption_plan_to_exec_org where org_id in-->
+<!--                (select id from sys_org-->
+<!--                where path like concat((select path from sys_org where id=#{info.orgId}),'%')-->
+<!--                )-->
+<!--            </if>-->
+            and a.id in (
+                select if(parent_id=-1,id,parent_id ) as id from core_resumption_plan
+                where 1=1
+                <if test="info.checkSub==false">
+                    and plan_of_org_id=#{info.orgId}
+                </if>
+                <if test="info.checkSub=true">
+                    and plan_of_org_id in (select id from sys_org
+                                            where path like concat((select path from sys_org where id=#{info.orgId}),'%'))
+                </if>
+            )
         </where>
     </select>
-    <select id="selectItemPage" parameterType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo" resultType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo">
+    <select id="selectItemPage" parameterType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo"
+            resultType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo">
         select
         a.id,
         a.item_id,
@@ -131,18 +142,17 @@
 
 
     <select id="selectByPlanId" resultType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo">
-        SELECT
-            h.point_id as id,
-            a.item_id,
-            b.NAME AS item_name,
-            b.DESC AS item_desc,--                b.item_num,
+        SELECT h.point_id      as id,
+               a.item_id,
+               b.NAME          AS item_name,
+               b.DESC          AS item_desc,--                b.item_num,
 --                a.safe_type,
-            c.`name` area_name,
-            a.NAME AS point_name,--                a.point_num,
-            h.point_scan,
-            h.required,
-            d.NAME AS ruleName,
-            a.business_type AS businessType
+               c.`name`           area_name,
+               a.NAME          AS point_name,--                a.point_num,
+               h.point_scan,
+               h.required,
+               d.NAME          AS ruleName,
+               a.business_type AS businessType
         FROM (SELECT point_id, point_scan, required FROM core_resumption_plan_to_point WHERE plan_id = #{planId}) h
                  LEFT JOIN core_resumption_rule_point a ON h.point_id = a.id
                  LEFT JOIN core_resumption_rule_item b ON a.item_id = b.id
@@ -154,7 +164,7 @@
     <select id="findExecOrgByPlan" parameterType="Long" resultType="Long">
         select org_id
         from core_resumption_plan_to_exec_org a
-        INNER JOIN sys_org o on a.org_id=o.id and o.deleted=0 and o.is_lock=0
+                 INNER JOIN sys_org o on a.org_id = o.id and o.deleted = 0 and o.is_lock = 0
         where a.plan_id = #{plan_id}
     </select>
     <select id="findRoleByPlan" parameterType="Long" resultType="Long">
@@ -212,17 +222,20 @@
     <select id="selectPlanByName" resultMap="appPlans">
         select *
         from core_resumption_plan
-        where plan_name like CONCAT('%', #{planName}, '%') and deleted=0
+        where plan_name like CONCAT('%', #{planName}, '%')
+          and deleted = 0
         limit 1
     </select>
     <select id="selectPlanNameById" resultType="java.lang.String">
-        select plan_name from core_resumption_plan where id = #{planId}
+        select plan_name
+        from core_resumption_plan
+        where id = #{planId}
     </select>
     <select id="selectPlanNames" resultType="com.xunmei.common.core.vo.IdNameVo">
         select id, plan_name as name from core_resumption_plan where id in
-            <foreach collection="ids" item="id" open="(" close=")" separator=",">
-                #{id}
-            </foreach>
+        <foreach collection="ids" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
         and deleted=0
     </select>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/AppRulePointMapper.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.resumption.mapper.AppRulePointMapper">
-    <select id="selectDataListByItemId" resultType="com.xunmei.core.resumption.dto.appRulePoint.AppRulePointDetailDto">
+    <select id="selectDataListByItemId" resultType="com.xunmei.core.resumption.dto.rulePoint.AppRulePointDetailDto">
         select p.*,a.name as areaName
         from core_resumption_rule_point p
                  inner join sys_area a on p.area_id = a.id
         where item_id = #{id}
           and p.deleted = 0
     </select>
-<!--    <select id="selectDataListByIdList" resultType="com.xunmei.core.resumption.dto.appRulePoint.AppRulePointInfoDto"-->
+<!--    <select id="selectDataListByIdList" resultType="com.xunmei.core.resumption.dto.rulePoint.AppRulePointInfoDto"-->
 <!--            parameterType="java.util.List">-->
 <!--        select-->
 <!--        ri.id as itemId,-->
@@ -54,7 +54,7 @@
                  LEFT JOIN core_resumption_plan c ON b.plan_id = c.id
         WHERE c.id = #{planid}
     </select>
-    <select id="selectPointListByIdList" resultType="com.xunmei.core.resumption.dto.appRulePoint.AppRulePointInfoDto"
+    <select id="selectPointListByIdList" resultType="com.xunmei.core.resumption.dto.rulePoint.AppRulePointInfoDto"
             parameterType="java.util.List">
         select
         ri.id as itemId,

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/CoreResumptionDataProtectionMapper.xml

@@ -61,13 +61,15 @@
           and cp.all_Hour = 0
           and cp.deleted = 0
     </select>
-    <select id="selectProtectionByResumption"
+    <select id="selectRegisteredProtection"
             resultType="com.xunmei.core.resumption.vo.resumptionRegister.ResumptionDataProtectionVo">
-        SELECT dp.id                as id,
-               cp.id                as protectionId,
-               cp.name              as protectionName,
-               dp.protection_status as protectionStatus,
-               dp.protection_time   as protectionTime
+        SELECT dp.id                 as id,
+               dp.resumption_data_id as resumptionDataId,
+               dp.resumption_id      as resumptionId,
+               cp.id                 as protectionId,
+               cp.name               as protectionName,
+               dp.protection_status  as protectionStatus,
+               dp.protection_time    as protectionTime
         FROM core_resumption_data_protection dp
                  LEFT JOIN core_protection cp ON cp.id = dp.protection_id
         where dp.resumption_id = #{resumptionId}

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

@@ -154,6 +154,7 @@ public class SysOrgController extends BaseController {
      * @return
      */
     @GetMapping("/getUpOrgs/{orgId}")
+    @InnerAuth
     public List<Long> getUpOrgs(@PathVariable("orgId") Long orgId) {
         SysOrg org=sysOrgMapper.selectById(orgId);
         if(ObjectUtil.isNull(org)){
@@ -178,6 +179,7 @@ public class SysOrgController extends BaseController {
      * @return
      */
     @PostMapping("/getParentNames")
+    @InnerAuth
     public R<List<IdNameVo>> getParentName(@RequestBody List<Long> ids) {
         return R.ok(sysOrgMapper.getParentName(ids));
     }