Merge remote-tracking branch 'origin/V0.0.1' into V0.0.1

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/Eto/OrgListByTypesConditionEto.java

@@ -1,11 +1,15 @@
 package com.xunmei.system.api.Eto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder
 public class OrgListByTypesConditionEto {
     Long orgId;

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

@@ -42,7 +42,7 @@ public interface RemoteOrgService {
     R<Boolean> batchSaveSyncOrg(@RequestBody List<SysOrg> orgList, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @PostMapping("/dept/findListByOrgTypes")
-    R<List<SysOrg>> listByTypes( @RequestBody OrgListByTypesConditionEto conditionEto, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    R<List<SysOrg>> listByTypes(@RequestBody OrgListByTypesConditionEto eto);
     @GetMapping("/dept/top")
     SysOrg selectTopOrg(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 

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

@@ -59,9 +59,10 @@ public class RemoteOrgFallbackFactory implements FallbackFactory<RemoteOrgServic
             }
 
             @Override
-            public R<List<SysOrg>> listByTypes(OrgListByTypesConditionEto conditionEto,String srouce) {
+            public R<List<SysOrg>> listByTypes(OrgListByTypesConditionEto eto) {
                 return null;
             }
+
             @Override
             public SysOrg selectTopOrg(String source) {
                 return null;

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

@@ -12,9 +12,9 @@ import lombok.Data;
 @Data
 public class PageDto<T> {
 
-    private Long page = 0L;
+    private int page = 0;
 
-    private Long size = 10L;
+    private int size = 10;
 
     public Page<T> getPageDto(){
         Page<T> mePage = new Page<>();

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

@@ -8,6 +8,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 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.service.IAppRuleItemService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -37,13 +38,13 @@ public class AppRuleItemController extends BaseController {
     }
 
     @ApiOperation(value = "分页查询")
-    @PostMapping("page")
-    public TableDataInfo page(@RequestBody AppRuleItem itemPageDto) {
+    @GetMapping("page")
+    public TableDataInfo page(AppRuleItemPageDto itemPageDto) {
         return appRuleItemService.pageQuery(itemPageDto);
     }
 
     @ApiOperation(value = "删除")
-    @GetMapping("del/{id}")
+    @DeleteMapping("{id}")
     public AjaxResult del(@PathVariable("id") Long id) {
         return success(appRuleItemService.del(id));
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRuleItem.java

@@ -40,6 +40,6 @@ public class AppRuleItem extends BaseEntity {
     private String name;
 
     @ApiModelProperty(value = "标准及要求")
-    @TableField("desc")
+    @TableField("`desc`")
     private String desc;
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRulePoint.java

@@ -47,7 +47,7 @@ public class AppRulePoint extends BaseEntity {
 
     @TableField("business_type")
     @ApiModelProperty(value = "该要点关联的业务类型")
-    private Integer businessType;
+    private String businessType;
 
    @ApiModelProperty(value = "时间类型,0无，1时分")
     @TableField("remark")

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

@@ -1,5 +1,7 @@
 package com.xunmei.core.resumption.dto.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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,6 +15,7 @@ import java.util.List;
 @Data
 public class AppRuleItemDetailDto {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "检查项id")
     private Long id;
 

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

@@ -20,8 +20,8 @@ public class AppRuleItemDto {
 //    @ApiModelProperty(value = "规则编号")
 //    private Integer itemNum;
 
-//    @ApiModelProperty(value = "规则名称")
-//    private String itemName;
+    @ApiModelProperty(value = "规则名称")
+    private String name;
 
 //    @ApiModelProperty(value = "")
 //    private String desc;

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

@@ -15,7 +15,9 @@ public class AppRuleItemPageDto extends PageDto<AppRuleItem> {
     @ApiModelProperty(value = "id")
     private  Long ruleId;
 
-    @ApiModelProperty(value = "检查项名称")
-    private  String name;
+    @ApiModelProperty(value = "履职项名称")
+    private  String itemName;
 
+    @ApiModelProperty(value = "履职内容名称")
+    private String pointName;
 }

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

@@ -13,6 +13,7 @@ import lombok.Data;
 public class AppRulePointDetailDto {
 
     @ApiModelProperty(value = "检查点id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
 //    @ApiModelProperty(value = "规范id")
@@ -68,5 +69,5 @@ public class AppRulePointDetailDto {
     private Long nfcBindId;*/
 
     @ApiModelProperty(value = "要点关联的业务类型")
-    private Integer businessType;
+    private String businessType;
 }

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

@@ -59,6 +59,6 @@ public class AppRulePointDto {
     private Long nfcBindId;*/
 
     @ApiModelProperty(value = "要点关联的业务类型")
-    private Integer businessType;
+    private String businessType;
 
 }

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

@@ -4,6 +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.vo.appRuleItem.AppRuleItemPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface AppRuleItemMapper extends BaseMapper<AppRuleItem> {
 
-    Page<AppRuleItemPageVo> pageQuery(Page<AppRuleItemPageVo> page, @Param("itemPageDto") AppRuleItem itemPageDto);
+    Page<AppRuleItemPageVo> pageQuery(Page<AppRuleItem> page, @Param("itemPageDto") AppRuleItemPageDto itemPageDto);
 
 //    List<SecBookDtInstDto> selectDataTypeList();
 
@@ -27,9 +28,9 @@ public interface AppRuleItemMapper extends BaseMapper<AppRuleItem> {
 //    List<AreaListVo> selectCheckAreaList();
 
 
-    Integer checkItemIsUse(@Param("id") Long id);
+//    Integer checkItemIsUse(@Param("id") Long id);
 
-    Integer checkItemNumRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemNum") Integer itemNum);
+//    Integer checkItemNumRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemNum") Integer itemNum);
 
     Integer checkItemNameRepeat(@Param("id") Long id, @Param("ruleId") Long ruleId, @Param("itemName") String itemName);
 }

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

@@ -25,7 +25,7 @@ public interface AppRulePointMapper extends BaseMapper<AppRulePoint> {
 
     List<AppRulePointDetailDto> selectDataListByItemId(Long id);
 
-    List<AppRulePointInfoDto> selectDataListByIdList(@Param("pointIds") List<Long> pointIds, @Param("planIdList") List<Long> planIdList);
+//    List<AppRulePointInfoDto> selectDataListByIdList(@Param("pointIds") List<Long> pointIds, @Param("planIdList") List<Long> planIdList);
 
     List<AppRulePointInfoDto> selectPointListByIdList(@Param("pointIds") List<Long> pointIds, @Param("normIdList") List<Long> planIdList);
 
@@ -43,7 +43,7 @@ public interface AppRulePointMapper extends BaseMapper<AppRulePoint> {
 
     void updatePlanItem(@Param("id") Long id, @Param("newId") Long newId);
 
-    Integer checkPointNumRepeat(@Param("itemId") Long itemId, @Param("pointId") Long pointId, @Param("pointNum") Integer pointNum);
+//    Integer checkPointNumRepeat(@Param("itemId") Long itemId, @Param("pointId") Long pointId, @Param("pointNum") Integer pointNum);
 
     Integer checkPointNameRepeat(@Param("itemId") Long itemId, @Param("pointId") Long pointId, @Param("pointName") String pointName);
 
@@ -55,5 +55,5 @@ public interface AppRulePointMapper extends BaseMapper<AppRulePoint> {
 
     Integer checkIsJoinResumptionPlan(@Param("pointIds") List<Long> pointIds);
 
-    Integer checkIsJoinSafetyCheckTaskPlan(@Param("pointIds") List<Long> pointIds);
+//    Integer checkIsJoinSafetyCheckTaskPlan(@Param("pointIds") List<Long> pointIds);
 }

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

@@ -5,6 +5,7 @@ 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.vo.appRuleItem.RuleTreeItem;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public interface IAppRuleItemService extends IService<AppRuleItem> {
 
     long edit(AppRuleItemDto appRuleItemDto);
 
-    TableDataInfo pageQuery(AppRuleItem itemPageDto);
+    TableDataInfo pageQuery(AppRuleItemPageDto itemPageDto);
 
     AppRuleItemDetailDto findOne(Long id);
 

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

@@ -13,6 +13,7 @@ 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.appRulePoint.AppRulePointDetailDto;
 import com.xunmei.core.resumption.mapper.AppRuleItemMapper;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
@@ -113,9 +114,11 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
             AppRulePoint point = new AppRulePoint();
             BeanUtils.copyProperties(appRulePointDto, point);
             point.setItemId(item.getId());
+            point.setRuleId(item.getRuleId());
             if (point.getId() == null) {
                 //新增
                 point.setId(IDHelper.id());
+
                 appRulePointService.save(point);
             } else {
                 //修改
@@ -137,11 +140,13 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
     }
 
     @Override
-    public TableDataInfo pageQuery(AppRuleItem itemPageDto) {
+    public TableDataInfo pageQuery(AppRuleItemPageDto itemPageDto) {
          Page<AppRuleItemPageVo> page;
 
-        page = appRuleItemMapper.pageQuery(itemPageDto.toPage(), itemPageDto);
+        page = appRuleItemMapper.pageQuery(itemPageDto.getPageDto(), itemPageDto);
+        int order=itemPageDto.getPage()* itemPageDto.getSize();
         for (AppRuleItemPageVo vo : page.getRecords()) {
+            vo.setOrder(++order);
             final List<AppRulePointDetailDto> pointList = appRulePointMapper.selectDataListByItemId(vo.getId());
             vo.setPointDtoList(pointList);
         }
@@ -151,7 +156,6 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
 
     @Override
     public AppRuleItemDetailDto findOne(Long id) {
-
         final AppRuleItem appRuleItem = appRuleItemMapper.selectById(id);
         if (ObjectUtil.isNull(appRuleItem)) {
             return null;
@@ -171,8 +175,7 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
         if (idList.size() > 0) {
 
             Integer num1 = appRulePointMapper.checkIsJoinResumptionPlan(idList);
-            Integer num2 = appRulePointMapper.checkIsJoinSafetyCheckTaskPlan(idList);
-            if (ObjectUtil.isNotNull(num1) || ObjectUtil.isNotNull(num2)) {
+            if (ObjectUtil.isNotNull(num1)) {
                 throw new RuntimeException("该检查项已被检查计划或履职计划关联,请先删除检查计划或履职计划!");
             }
         }
@@ -184,9 +187,9 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
     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(), SecurityConstants.INNER)
+                .listByTypes(OrgListByTypesConditionEto.builder().orgId(orgId).orgTypes(Arrays.asList("1","2","3","4","11")).build())
                 .getData();
-        if(ObjectUtil.isNull(orgs)){
+        if(ObjectUtil.isEmpty(orgs)){
             return  tree;
         }
         Map<Long,SysOrg> orgMap= orgs.stream().collect(Collectors.toMap(o->o.getId(),o->o));
@@ -203,9 +206,9 @@ public class AppRuleItemServiceImpl extends ServiceImpl<AppRuleItemMapper, AppRu
     }
 
     private RuleTreeItem generateTree(SysOrg parent,List<SysOrg> allOrg,List<AppRule> allRule){
-        RuleTreeItem item=RuleTreeItem.builder().isRule(false).id(parent.getId()).label(parent.getName()).children(new ArrayList<>()).build();
+        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(true).id(o.getId()).label(o.getName()).orgType(o.getOrgType()).build())
+                .map(o->RuleTreeItem.builder().isRule(1).id(o.getId()).label(o.getName()).orgType(parent.getType().toString()).build())
                 .collect(Collectors.toList());
         item.getChildren().addAll(ruleItems);
 

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

@@ -16,6 +16,9 @@ import java.util.List;
 public class AppRuleItemPageVo {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
+
+    private int order;
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long ruleId;
     private String name;
 //    private Integer itemNum;

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

@@ -1,5 +1,7 @@
 package com.xunmei.core.resumption.vo.appRuleItem;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Builder;
 import lombok.Data;
 
@@ -9,11 +11,12 @@ import java.util.List;
 @Builder
 
 public class RuleTreeItem {
+     @JsonSerialize(using = ToStringSerializer.class)
      Long id;
 
      String label;
 
-     boolean isRule;
+     int isRule;
 
      /**
       * 履职机构类型

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/controller/CoreMonitoringRetrievalTaskController.java

@@ -0,0 +1,99 @@
+package com.xunmei.core.retrieval.controller;
+
+import com.xunmei.common.core.domain.edu.dto.SysLearningMaterialsPageDto;
+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.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * 监控调阅任务Controller
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Api(tags = {"CoreMonitoringRetrievalTask" })
+@RestController
+@RequestMapping("/task")
+public class CoreMonitoringRetrievalTaskController extends BaseController {
+    @Autowired
+    private ICoreMonitoringRetrievalTaskService coreMonitoringRetrievalTaskService;
+
+/**
+ * 查询监控调阅任务列表
+ */
+@ApiOperation(value = "查询CoreMonitoringRetrievalTask列表")
+@GetMapping("/list")
+    public TableDataInfo list(RetrievalTaskPageDto request) {
+
+        return coreMonitoringRetrievalTaskService.selectPage( request);
+    }
+    /**
+     * 导出excel
+     */
+    @ApiOperation(value = "导出监控调阅任务")
+    @RequiresPermissions("core:task:export")
+    @Log(title = "导出监控调阅任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(RetrievalTaskPageDto request, HttpServletResponse response) throws IOException {
+        coreMonitoringRetrievalTaskService.export(request,response);
+    }
+
+
+
+
+    /**
+     * 获取监控调阅任务详细信息
+     */
+    @ApiOperation(value = "获取CoreMonitoringRetrievalTask详细信息")
+    @RequiresPermissions("core:task:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(coreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(id));
+    }
+
+    /**
+     * 新增监控调阅任务
+     */
+    @ApiOperation(value = "新增CoreMonitoringRetrievalTask")
+    @RequiresPermissions("core:task:add")
+    @Log(title = "监控调阅任务" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
+        return toAjax(coreMonitoringRetrievalTaskService.insertCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask));
+    }
+
+    /**
+     * 修改监控调阅任务
+     */
+    @ApiOperation(value = "修改CoreMonitoringRetrievalTask")
+    @RequiresPermissions("core:task:edit")
+    @Log(title = "监控调阅任务" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
+        return toAjax(coreMonitoringRetrievalTaskService.updateCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask));
+    }
+
+    /**
+     * 删除监控调阅任务
+     */
+    @ApiOperation(value = "删除CoreMonitoringRetrievalTask")
+    @RequiresPermissions("core:task:remove")
+    @Log(title = "监控调阅任务" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(coreMonitoringRetrievalTaskService.deleteCoreMonitoringRetrievalTaskByIds(ids));
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -0,0 +1,200 @@
+package com.xunmei.core.retrieval.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 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;
+
+/**
+ * 监控调阅任务对象 core_monitoring_retrieval_task
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_monitoring_retrieval_task")
+@ApiModel(value = "CoreMonitoringRetrievalTask对象" , description = "监控调阅任务")
+public class CoreMonitoringRetrievalTask extends BaseEntity
+        {
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 计划id */
+    private Long planId;
+
+    /** 任务名称 */
+            @ApiModelProperty(value = "任务名称")
+    private String taskName;
+
+    /** 调阅机构 */
+    private Long orgId;
+
+    /** 调阅机构 */
+    private String orgPath;
+
+    /** 调阅机构 */
+            @ApiModelProperty(value = "调阅机构")
+    private String orgName;
+
+    /** 年月日 */
+    private Date ymdDate;
+
+    /** 年 */
+    private Long ymdYear;
+
+    /** 半年 */
+    private Long ymdHalfyear;
+
+    /** 季度 */
+    private Long ymdQuarter;
+
+    /** 月 */
+    private Long ymdMonth;
+
+    /** 周 */
+    private Long ymdWeek;
+
+    /** 日 */
+    private Long ymdDay;
+
+    /** 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6） */
+    private Long cycle;
+
+    /** 开始时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "开始时间")
+    private Date planStartTime;
+
+    /** 结束时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "结束时间")
+    private Date planEndTime;
+
+    /** 调阅开始时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "调阅开始时间")
+    private Date startTime;
+
+    /** 调阅结束时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "调阅结束时间")
+    private Date endTime;
+
+    /** 状态 */
+            @ApiModelProperty(value = "状态")
+    private Long status;
+
+    /** 角色id */
+    private Long roleId;
+
+    /** 调阅人 */
+    private Long retrievalUser;
+
+    /** 第几次调阅（根据计划的频次计算的来） */
+    private Long orderNum;
+
+    /** 批次号（同一计划多频次为一个批次号） */
+    private Long batchNum;
+
+    /** 提交时间 */
+    private Date submitTime;
+
+    /** 异常数 */
+            @ApiModelProperty(value = "异常数")
+    private Long exceptionCount;
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
+@Override
+public String toString(){
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id" ,getId())
+
+
+                .append("planId" ,getPlanId())
+
+
+                .append("taskName" ,getTaskName())
+
+
+                .append("orgId" ,getOrgId())
+
+
+                .append("orgPath" ,getOrgPath())
+
+
+                .append("orgName" ,getOrgName())
+
+
+                .append("ymdDate" ,getYmdDate())
+
+
+                .append("ymdYear" ,getYmdYear())
+
+
+                .append("ymdHalfyear" ,getYmdHalfyear())
+
+
+                .append("ymdQuarter" ,getYmdQuarter())
+
+
+                .append("ymdMonth" ,getYmdMonth())
+
+
+                .append("ymdWeek" ,getYmdWeek())
+
+
+                .append("ymdDay" ,getYmdDay())
+
+
+                .append("cycle" ,getCycle())
+
+
+                .append("planStartTime" ,getPlanStartTime())
+
+
+                .append("planEndTime" ,getPlanEndTime())
+
+
+                .append("startTime" ,getStartTime())
+
+
+                .append("endTime" ,getEndTime())
+
+
+                .append("status" ,getStatus())
+
+
+                .append("roleId" ,getRoleId())
+
+
+                .append("retrievalUser" ,getRetrievalUser())
+
+
+                .append("orderNum" ,getOrderNum())
+
+
+                .append("batchNum" ,getBatchNum())
+
+
+                .append("submitTime" ,getSubmitTime())
+
+
+                .append("exceptionCount" ,getExceptionCount())
+        .toString();
+        }
+        }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/dto/RetrievalTaskPageDto.java

@@ -0,0 +1,60 @@
+package com.xunmei.core.retrieval.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 监控调阅任务对象 core_monitoring_retrieval_task
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Data
+@ApiModel(value = "CoreMonitoringRetrievalTask对象" , description = "监控调阅任务")
+public class RetrievalTaskPageDto extends BaseEntity
+    {
+        /**
+         * 任务名称
+         */
+    private String taskName;
+
+    /** 调阅机构 */
+    private Long orgId;
+
+    /** 调阅机构 */
+    private String orgPath;
+
+
+    /** 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6） */
+    private Integer cycle;
+    /** 状态 */
+    private Integer status;
+
+    /** 角色id */
+    private Long roleId;
+        /**
+         * 页面
+         */
+    private Long pageNum;
+        /**
+         * 每页大小
+         */
+    private Long pageSize;
+        /**
+         * 是否下穿
+         */
+    private Boolean checkSub = false;
+
+    private Date[] dateRange;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/mapper/CoreMonitoringRetrievalTaskMapper.java

@@ -0,0 +1,68 @@
+package com.xunmei.core.retrieval.mapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 监控调阅任务Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+public interface CoreMonitoringRetrievalTaskMapper extends BaseMapper<CoreMonitoringRetrievalTask> {
+    /**
+     * 查询监控调阅任务
+     *
+     * @param id 监控调阅任务主键
+     * @return 监控调阅任务
+     */
+    public CoreMonitoringRetrievalTask selectCoreMonitoringRetrievalTaskById(Long id);
+
+    /**
+     * 查询监控调阅任务列表
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 监控调阅任务集合
+     */
+    public List<CoreMonitoringRetrievalTask> selectCoreMonitoringRetrievalTaskList(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask);
+
+    /**
+     * 新增监控调阅任务
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 结果
+     */
+    public int insertCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask);
+
+    /**
+     * 修改监控调阅任务
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 结果
+     */
+    public int updateCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask);
+
+    /**
+     * 删除监控调阅任务
+     *
+     * @param id 监控调阅任务主键
+     * @return 结果
+     */
+    public int deleteCoreMonitoringRetrievalTaskById(Long id);
+
+    /**
+     * 批量删除监控调阅任务
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCoreMonitoringRetrievalTaskByIds(Long[] ids);
+
+    Page<CoreMonitoringRetrievalTaskVo> selectPageList(Page<CoreMonitoringRetrievalTaskVo> page, @Param("request") RetrievalTaskPageDto request);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/ICoreMonitoringRetrievalTaskService.java

@@ -0,0 +1,79 @@
+package com.xunmei.core.retrieval.service;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 监控调阅任务Service接口
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonitoringRetrievalTask> {
+    /**
+     * 查询监控调阅任务
+     *
+     * @param id 监控调阅任务主键
+     * @return 监控调阅任务
+     */
+    public CoreMonitoringRetrievalTask selectCoreMonitoringRetrievalTaskById(Long id);
+
+    /**
+     * 查询监控调阅任务列表
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 监控调阅任务集合
+     */
+    public List<CoreMonitoringRetrievalTask> selectCoreMonitoringRetrievalTaskList(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask);
+
+    /**
+     * 新增监控调阅任务
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 结果
+     */
+    public int insertCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask);
+
+    /**
+     * 修改监控调阅任务
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 结果
+     */
+    public int updateCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask);
+
+    /**
+     * 批量删除监控调阅任务
+     *
+     * @param ids 需要删除的监控调阅任务主键集合
+     * @return 结果
+     */
+    public int deleteCoreMonitoringRetrievalTaskByIds(Long[] ids);
+
+    /**
+     * 删除监控调阅任务信息
+     *
+     * @param id 监控调阅任务主键
+     * @return 结果
+     */
+    public int deleteCoreMonitoringRetrievalTaskById(Long id);
+
+    /**
+     * 查询监控调阅任务分页数据
+     *
+     * @param CoreMonitoringRetrievalTask 查询条件对象
+     * @return Page
+     */
+    public TableDataInfo selectPage(RetrievalTaskPageDto request);
+
+    void export(RetrievalTaskPageDto request, HttpServletResponse response) throws IOException;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -0,0 +1,180 @@
+package com.xunmei.core.retrieval.service.impl;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.List;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.utils.DateHelper;
+import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
+import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
+import com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo;
+import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+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 javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * 监控调阅任务Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Service
+public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMonitoringRetrievalTaskMapper, CoreMonitoringRetrievalTask> implements ICoreMonitoringRetrievalTaskService {
+    @Resource
+    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;
+    @Resource
+    private RemoteOrgService orgService;
+
+    @Override
+    public TableDataInfo selectPage(RetrievalTaskPageDto request) {
+
+        Page<CoreMonitoringRetrievalTaskVo> page;
+        //分页
+        if (request.getPageNum()!=null&&request.getPageSize()!=null)
+        {
+            page = new Page<>(request.getPageNum(), request.getPageSize());
+        }else{
+            page = new Page<>();
+        }
+        //下穿
+        if (request.getCheckSub()) {
+            SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), "获取机构信息失败!");
+            request.setOrgPath(sysOrg.getPath());
+            request.setOrgId(null);
+        }
+        //获取数据
+        page = coreMonitoringRetrievalTaskMapper.selectPageList(page, request);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+    }
+
+    @Override
+    public void export(RetrievalTaskPageDto request, HttpServletResponse response) throws IOException {
+        //不分页
+        request.setPageSize(null);
+        request.setPageNum(null);
+        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectTopOrg(SecurityConstants.INNER), "获取机构信息失败!");
+
+        final TableDataInfo tableDataInfo = this.selectPage(request);
+        if (ObjectUtil.isEmpty(tableDataInfo.getRows())) {
+            throw new RuntimeException("导出数据为空!");
+        }
+        List<CoreMonitoringRetrievalTaskVo> list = this.selectPage(request).getRows();
+        list.forEach(r->r.setNo(list.indexOf(r)+1));
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        writer.addHeaderAlias("序号", "no");
+        writer.addHeaderAlias("任务名称", "taskName");
+        writer.addHeaderAlias("开始时间", "planStartTime");
+        writer.addHeaderAlias("结束时间", "planEndTime");
+        writer.addHeaderAlias("状态", "");
+        writer.addHeaderAlias("调阅机构", "orgName");
+        writer.addHeaderAlias("调阅角色", "roleName");
+        writer.addHeaderAlias("调阅开始时间", "startTime");
+        writer.addHeaderAlias("调阅结束时间", "endTime");
+        writer.addHeaderAlias("调阅人", "retrievalUserName");
+        writer.addHeaderAlias("异常数", "exceptionCount");
+        //只保留别名的数据
+        writer.setOnlyAlias(true);
+        // 默认配置
+        writer.write(list, true);
+        // 设置content—type
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset:utf-8");
+        // 设置标题
+        String fileName = URLEncoder.encode("【" + sysOrg.getName() + "】-监控调阅任务记录" + DateHelper.getDateString(new Date()), "UTF-8");
+        //Content-disposition是MIME协议的扩展，MIME协议指示MIME用户代理如何显示附加的文件。
+        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".et");
+        ServletOutputStream outputStream = response.getOutputStream();
+        //将Writer刷新到OutPut
+        writer.flush(outputStream, true);
+        outputStream.close();
+        writer.close();
+    }
+
+
+    /**
+     * 查询监控调阅任务
+     *
+     * @param id 监控调阅任务主键
+     * @return 监控调阅任务
+     */
+    @Override
+    public CoreMonitoringRetrievalTask selectCoreMonitoringRetrievalTaskById(Long id) {
+        return coreMonitoringRetrievalTaskMapper.selectById(id);
+    }
+
+    /**
+     * 查询监控调阅任务列表
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 监控调阅任务
+     */
+    @Override
+    public List<CoreMonitoringRetrievalTask> selectCoreMonitoringRetrievalTaskList(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
+        return coreMonitoringRetrievalTaskMapper.selectList(new QueryWrapper<>(CoreMonitoringRetrievalTask));
+    }
+
+    /**
+     * 新增监控调阅任务
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 结果
+     */
+    @Override
+    public int insertCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
+            return coreMonitoringRetrievalTaskMapper.insert(CoreMonitoringRetrievalTask);
+    }
+
+    /**
+     * 修改监控调阅任务
+     *
+     * @param CoreMonitoringRetrievalTask 监控调阅任务
+     * @return 结果
+     */
+    @Override
+    public int updateCoreMonitoringRetrievalTask(CoreMonitoringRetrievalTask CoreMonitoringRetrievalTask) {
+        return coreMonitoringRetrievalTaskMapper.updateById(CoreMonitoringRetrievalTask);
+    }
+
+    /**
+     * 批量删除监控调阅任务
+     *
+     * @param ids 需要删除的监控调阅任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringRetrievalTaskByIds(Long[] ids) {
+        return coreMonitoringRetrievalTaskMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除监控调阅任务信息
+     *
+     * @param id 监控调阅任务主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringRetrievalTaskById(Long id) {
+        return coreMonitoringRetrievalTaskMapper.deleteById(id);
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/vo/CoreMonitoringRetrievalTaskVo.java

@@ -0,0 +1,170 @@
+package com.xunmei.core.retrieval.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 监控调阅任务对象 core_monitoring_retrieval_task
+ *
+ * @author xunmei
+ * @date 2023-08-25
+ */
+@Data
+@ApiModel(value = "CoreMonitoringRetrievalTask对象", description = "监控调阅任务")
+public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 计划id
+     */
+    private Long planId;
+
+    /**
+     * 任务名称
+     */
+    @ApiModelProperty(value = "任务名称")
+    private String taskName;
+
+    /**
+     * 调阅机构
+     */
+    private Long orgId;
+
+    /**
+     * 调阅机构
+     */
+    private String orgPath;
+
+    /**
+     * 调阅机构
+     */
+    @ApiModelProperty(value = "调阅机构")
+    private String orgName;
+
+    /**
+     * 年月日
+     */
+    private Date ymdDate;
+
+    /**
+     * 年
+     */
+    private Long ymdYear;
+
+    /**
+     * 半年
+     */
+    private Long ymdHalfyear;
+
+    /**
+     * 季度
+     */
+    private Long ymdQuarter;
+
+    /**
+     * 月
+     */
+    private Long ymdMonth;
+
+    /**
+     * 周
+     */
+    private Long ymdWeek;
+
+    /**
+     * 日
+     */
+    private Long ymdDay;
+
+    /**
+     * 周期无周期、每日、每周、每月、每季度、每半年、每年（0-6）
+     */
+    private Long cycle;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "开始时间")
+    private Date planStartTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "结束时间")
+    private Date planEndTime;
+
+    /**
+     * 调阅开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅开始时间")
+    private Date startTime;
+
+    /**
+     * 调阅结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "调阅结束时间")
+    private Date endTime;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty(value = "状态")
+    private Long status;
+
+    /**
+     * 角色id
+     */
+    private Long roleId;
+
+    private String roleName;
+
+    /**
+     * 调阅人
+     */
+    private Long retrievalUser;
+
+    private String retrievalUserName;
+
+    /**
+     * 第几次调阅（根据计划的频次计算的来）
+     */
+    private Long orderNum;
+
+    /**
+     * 批次号（同一计划多频次为一个批次号）
+     */
+    private Long batchNum;
+
+    /**
+     * 提交时间
+     */
+    private Date submitTime;
+
+    /**
+     * 异常数
+     */
+    @ApiModelProperty(value = "异常数")
+    private Long exceptionCount;
+
+
+    private Integer no;
+}

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

@@ -2,16 +2,19 @@
 <!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.AppRuleItemMapper">
     <select id="pageQuery" resultType="com.xunmei.core.resumption.vo.appRuleItem.AppRuleItemPageVo">
-        select i.id as id,i.item_name as itemName ,i.item_num as itemNum,
-        i.item_desc as itemDesc,i.rule_id as ruleId,
-        (select count(p.id) from t_app_rule_point p where p.item_id=i.id and p.deleted=0) as pointNums from
-        t_app_rule_item i
+        select i.*,
+        (select count(p.id) from core_resumption_rule_point p where p.item_id=i.id and p.deleted=0
+            <if test="itemPageDto.pointName!=null and itemPageDto.pointName!=''">and `name` like concat('%',#{itemPageDto.pointName},'%'))</if>) as pointNums from
+        core_resumption_rule_item i
         <where>
             <if test="itemPageDto.ruleId != null and itemPageDto.ruleId !=''">
                 and i.rule_id = #{itemPageDto.ruleId}
             </if>
-            <if test="itemPageDto.ruleItemName != null and itemPageDto.ruleItemName !=''">
-                and i.item_name like CONCAT('%',#{itemPageDto.ruleItemName},'%')
+            <if test="itemPageDto.itemName != null and itemPageDto.itemName!=''">
+                and i.iname like CONCAT('%',#{itemPageDto.itemName},'%')
+            </if>
+            <if test="itemPageDto.pointName!=null and itemPageDto.pointName!=''">
+                and i.id in (select item_id from core_resumption_rule_point  where rule_id= #{itemPageDto.ruleId} and `name` like concat('%',#{itemPageDto.pointName},'%'))
             </if>
         </where>
     </select>
@@ -28,22 +31,18 @@
 <!--        where deleted = 0-->
 <!--    </select>-->
 
-    <select id="checkItemIsUse" resultType="java.lang.Integer">
-        select 1
-        from t_app_plan_to_item
-        where item_id = #{id}
-    </select>
 
-    <select id="checkItemNumRepeat" resultType="java.lang.Integer">
-        select count(id) from t_app_rule_item where rule_id=#{ruleId} and item_num=#{itemNum}
-        <if test="id != null">
-            and id != #{id}
-        </if>
 
-    </select>
+<!--    <select id="checkItemNumRepeat" resultType="java.lang.Integer">-->
+<!--        select count(id) from core_resumption_rule_item where rule_id=#{ruleId} and item_num=#{itemNum}-->
+<!--        <if test="id != null">-->
+<!--            and id != #{id}-->
+<!--        </if>-->
+
+<!--    </select>-->
 
     <select id="checkItemNameRepeat" resultType="java.lang.Integer">
-        select count(id) from t_app_rule_item where rule_id=#{ruleId} and item_name=#{itemName}
+        select count(id) from core_resumption_rule_item where rule_id=#{ruleId} and name=#{itemName}
         <if test="id != null">
             and id != #{id}
         </if>

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

@@ -2,72 +2,51 @@
 <!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 p.id,
-               rule_id       as ruleId,
-               point_num     as pointNum,
-               point_name    as pointName,
-               area_id       as areaId,
-               a.name        as areaName,
-               safe_type     as safeType,
-               d.name        as safeTypeName,
-               reform_day    as reformDay,
-               inspection    as inspection,
-               d1.name       as inspectionName,
-               p.data_type   as dataType,
-               i.DATA_NAME   as dataTypeName,
-               time_type     as timeType,
-               remark        as remark,
-               degree_risk as degreeRisk,
-               d2.name as degreeRiskName,
-               p.business_type as businessType
-        from t_app_rule_point p
-                 inner join t_area a on p.area_id = a.id
-                 left join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'
-                 left join sys_dict_detail d1 on d1.id = p.inspection and d1.dict_code = 'check_method'
-                 left join sys_dict_detail d2 on d2.code = p.degree_risk and d2.dict_code = 'degree_risk'
-                 inner join sec_book_dt_inst i on p.data_type = i.ID
+        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"
-            parameterType="java.util.List">
-        select
-        ri.id as itemId,
-        ri.item_name as itemName,
-        ri.item_num as itemNum,
-        ri.item_desc as itemDesc,
-        p.id as id,
-        p.point_num as pointNum,
-        p.point_name as pointName,
-        p.safe_type as safeType,
-        d.name as safeTypeText,
-        p.area_id as areaId,
-        p.business_type as businessType,
-        a.name as areaName,
-        ap.plan_name as planName,
-        ap.id as planId,
-        1 as pointSource
-
-        from t_app_rule_point p
-        inner join t_app_rule_item ri on ri.id=p.item_id
-        inner join t_area a on p.area_id = a.id
-        inner join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'
-        inner join t_app_plan_to_item ti on ti.item_id=p.id
-        inner join t_app_plan ap on ti.plan_id =ap.id
-        where p.deleted = 0
-        <if test="pointIds != null and pointIds.size > 0">
-            and p.id in
-            <foreach collection="pointIds" item="pointId" open="(" separator="," close=")">
-                #{pointId}
-            </foreach>
-        </if>
-        <if test="planIdList != null and planIdList.size > 0">
-            and ap.id in
-            <foreach collection="planIdList" item="planId" open="(" separator="," close=")">
-                #{planId}
-            </foreach>
-        </if>
-    </select>
+<!--    <select id="selectDataListByIdList" resultType="com.xunmei.core.resumption.dto.appRulePoint.AppRulePointInfoDto"-->
+<!--            parameterType="java.util.List">-->
+<!--        select-->
+<!--        ri.id as itemId,-->
+<!--        ri.item_name as itemName,-->
+<!--        ri.item_num as itemNum,-->
+<!--        ri.item_desc as itemDesc,-->
+<!--        p.id as id,-->
+<!--        p.point_num as pointNum,-->
+<!--        p.point_name as pointName,-->
+<!--        p.safe_type as safeType,-->
+<!--        d.name as safeTypeText,-->
+<!--        p.area_id as areaId,-->
+<!--        p.business_type as businessType,-->
+<!--        a.name as areaName,-->
+<!--        ap.plan_name as planName,-->
+<!--        ap.id as planId,-->
+<!--        1 as pointSource-->
+
+<!--        from core_resumption_rule_point p-->
+<!--        inner join t_app_rule_item ri on ri.id=p.item_id-->
+<!--        inner join sys_area a on p.area_id = a.id-->
+<!--        inner join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'-->
+<!--        inner join t_app_plan_to_item ti on ti.item_id=p.id-->
+<!--        inner join t_app_plan ap on ti.plan_id =ap.id-->
+<!--        where p.deleted = 0-->
+<!--        <if test="pointIds != null and pointIds.size > 0">-->
+<!--            and p.id in-->
+<!--            <foreach collection="pointIds" item="pointId" open="(" separator="," close=")">-->
+<!--                #{pointId}-->
+<!--            </foreach>-->
+<!--        </if>-->
+<!--        <if test="planIdList != null and planIdList.size > 0">-->
+<!--            and ap.id in-->
+<!--            <foreach collection="planIdList" item="planId" open="(" separator="," close=")">-->
+<!--                #{planId}-->
+<!--            </foreach>-->
+<!--        </if>-->
+<!--    </select>-->
     <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.AppRulePointTaskVo">
         SELECT a.*, b.point_scan
         from sys_rule_point a
@@ -93,7 +72,7 @@
         ap.rule_name as planName,
         ap.id as planId,
         2 as pointSource
-        from t_app_rule_point p
+        from core_resumption_rule_point p
         inner join t_app_rule_item ri on ri.id=p.item_id
         inner join t_area a on p.area_id = a.id
         inner join sys_dict_detail d on d.code = p.safe_type and d.dict_code = 'check_type'
@@ -116,7 +95,7 @@
 
 <!--    <select id="findPointByPlan" parameterType="Long" resultType="com.xunmei.core.resumption.vo.resumption.AppRulePointTaskVo">-->
 <!--        SELECT a.*, b.point_scan-->
-<!--        from t_app_rule_point a-->
+<!--        from core_resumption_rule_point a-->
 <!--                 LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id-->
 <!--                 LEFT JOIN t_app_plan c ON b.plan_id = c.id-->
 <!--        WHERE c.id = #{planid}-->
@@ -124,7 +103,7 @@
 
     <select id="findAreaListPlan" parameterType="Long" resultType="java.util.Map">
         SELECT a.area_id as areaid, d.name as areaname
-        from t_app_rule_point a
+        from core_resumption_rule_point a
                  LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id
                  LEFT JOIN t_app_plan c ON b.plan_id = c.id
                  LEFT JOIN t_area d ON a.area_id = d.id
@@ -134,14 +113,14 @@
 
     <select id="findByName" parameterType="java.util.HashMap" resultType="java.util.Map">
         SELECT id, area_id
-        FROM t_app_rule_point a
-        WHERE a.point_name = #{name}
+        FROM core_resumption_rule_point a
+        WHERE a.name = #{name}
           and rule_id = #{ruleId}
     </select>
 
     <select id="checkIsUsed" resultType="java.lang.Integer">
         SELECT 1
-        FROM t_app_resumption_data a
+        FROM core_resumption_data a
         WHERE a.item_id = #{pointId}
         limit 1
     </select>
@@ -149,13 +128,13 @@
 
     <select id="selectPointIds" resultType="java.lang.Long">
         select id
-        from t_app_rule_point
+        from core_resumption_rule_point
         where item_id = #{id}
           and deleted = 0
     </select>
 
     <update id="updateDeleted">
-        update t_app_rule_point
+        update core_resumption_rule_point
         set deleted=#{deleted}
         where id = #{id}
     </update>
@@ -166,21 +145,21 @@
         where item_id = #{id}
     </update>
 
-    <select id="checkPointNumRepeat" resultType="java.lang.Integer">
-        select count(*)
-        from t_app_rule_point
-        where point_num = #{pointNum}
-        and item_id = #{itemId}
-        and deleted = 0
-        <if test="pointId != null">
-            and id != #{pointId}
-        </if>
-    </select>
+<!--    <select id="checkPointNumRepeat" resultType="java.lang.Integer">-->
+<!--        select count(*)-->
+<!--        from core_resumption_rule_point-->
+<!--        where -->
+<!--        and item_id = #{itemId}-->
+<!--        and deleted = 0-->
+<!--        <if test="pointId != null">-->
+<!--            and id != #{pointId}-->
+<!--        </if>-->
+<!--    </select>-->
 
     <select id="checkPointNameRepeat" resultType="java.lang.Integer">
         select count(*)
-        from t_app_rule_point
-        where point_name = #{pointName}
+        from core_resumption_rule_point
+        where name = #{pointName}
         and item_id = #{itemId}
         and deleted = 0
         <if test="pointId != null">
@@ -191,7 +170,7 @@
 <!--    <select id="findPointBySafetyPlan" parameterType="java.util.HashMap" resultType="com.isp.safecheck.vo.PointVo">-->
 <!--        SELECT a.id as pointId,a.point_name as pointName ,a.point_num as pointNum,a.item_id as itemId,a.area_id as areaId,f.name as areaName,a.time_type as timeType,-->
 <!--        b.plan_id as planId,e.item_name as itemName,b.point_scan as pointScan,d.DATA_NAME as dataName,d1.DATA_ITEM_NAME as dataDetailNameA,d2.DATA_ITEM_NAME as dataDetailNameB-->
-<!--        from t_app_rule_point a-->
+<!--        from core_resumption_rule_point a-->
 <!--                 LEFT JOIN t_app_safecheck_plan_to_item b ON a.id = b.item_id-->
 <!--                 LEFT JOIN t_app_safecheck_plan c ON b.plan_id = c.id-->
 <!--                 LEFT JOIN t_app_rule_item e ON a.item_id = e.id-->
@@ -206,7 +185,7 @@
 <!--        SELECT  b.id as pointId,b.point_name as pointName ,b.point_num as pointNum,b.item_id as itemId,b.area_id as areaId,b.time_type as timeType,f.name as areaName,-->
 <!--        a.plan_id as planId,e.item_name as itemName,a.id as pointDataId,a.res_value as resValue,a.res_time as resTime,a.res_value as resValue,d.DATA_NAME as dataName,-->
 <!--       d1.DATA_ITEM_NAME as dataDetailNameA,d2.DATA_ITEM_NAME as dataDetailNameB-->
-<!--       FROM t_app_safety_task_data a LEFT JOIN t_app_rule_point b ON a.point_id  = b.id-->
+<!--       FROM t_app_safety_task_data a LEFT JOIN core_resumption_rule_point b ON a.point_id  = b.id-->
 <!--       LEFT JOIN t_area f ON a.area_id = f.id-->
 <!--       LEFT JOIN t_app_rule_item e ON a.item_id = e.id-->
 <!--       left join sec_book_dt_inst d on b.data_type = d.id-->
@@ -219,7 +198,7 @@
     <select id="findPointByRulePlan" resultType="com.xunmei.core.resumption.vo.ResumptionPointVo">
          SELECT a.id as pointid,a.point_name as pointname ,a.point_num as pointnum,a.item_id as itemid,a.area_id as areaid,f.name as areaname,a.time_type as timeType,
         b.plan_id as planId,e.item_name as itemname,b.point_scan as pointScan,b.required,a.business_type as businessType
-        from t_app_rule_point a
+        from core_resumption_rule_point a
                  LEFT JOIN t_app_plan_to_item b ON a.id = b.item_id
                  LEFT JOIN t_app_plan c ON b.plan_id = c.id
                  LEFT JOIN t_app_rule_item e ON a.item_id = e.id
@@ -228,20 +207,20 @@
     </select>
     <select id="checkIsJoinResumptionPlan" resultType="java.lang.Integer">
         SELECT DISTINCT 1
-        FROM t_app_plan_to_item
-        WHERE item_id in
-        <foreach collection="pointIds" item="pointId" index="index" open="(" separator="," close=")">
-            #{pointId}
-        </foreach>
-        limit 1
-    </select>
-    <select id="checkIsJoinSafetyCheckTaskPlan" resultType="java.lang.Integer">
-        SELECT DISTINCT 1
-        FROM t_app_safecheck_plan_to_item
+        FROM sys_plan_to_item
         WHERE item_id in
         <foreach collection="pointIds" item="pointId" index="index" open="(" separator="," close=")">
             #{pointId}
         </foreach>
         limit 1
     </select>
+<!--    <select id="checkIsJoinSafetyCheckTaskPlan" resultType="java.lang.Integer">-->
+<!--        SELECT DISTINCT 1-->
+<!--        FROM t_app_safecheck_plan_to_item-->
+<!--        WHERE item_id in-->
+<!--        <foreach collection="pointIds" item="pointId" index="index" open="(" separator="," close=")">-->
+<!--            #{pointId}-->
+<!--        </foreach>-->
+<!--        limit 1-->
+<!--    </select>-->
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -0,0 +1,293 @@
+<?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.retrieval.mapper.CoreMonitoringRetrievalTaskMapper">
+
+    <resultMap type="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask" id="CoreMonitoringRetrievalTaskResult">
+                <result property="id" column="id"/>
+                <result property="planId" column="plan_id"/>
+                <result property="taskName" column="task_name"/>
+                <result property="orgId" column="org_id"/>
+                <result property="orgPath" column="org_path"/>
+                <result property="orgName" column="org_name"/>
+                <result property="ymdDate" column="ymd_date"/>
+                <result property="ymdYear" column="ymd_year"/>
+                <result property="ymdHalfyear" column="ymd_halfyear"/>
+                <result property="ymdQuarter" column="ymd_quarter"/>
+                <result property="ymdMonth" column="ymd_month"/>
+                <result property="ymdWeek" column="ymd_week"/>
+                <result property="ymdDay" column="ymd_day"/>
+                <result property="cycle" column="cycle"/>
+                <result property="planStartTime" column="plan_start_time"/>
+                <result property="planEndTime" column="plan_end_time"/>
+                <result property="startTime" column="start_time"/>
+                <result property="endTime" column="end_time"/>
+                <result property="status" column="status"/>
+                <result property="roleId" column="role_id"/>
+                <result property="retrievalUser" column="retrieval_user"/>
+                <result property="orderNum" column="order_num"/>
+                <result property="batchNum" column="batch_num"/>
+                <result property="submitTime" column="submit_time"/>
+                <result property="exceptionCount" column="exception_count"/>
+    </resultMap>
+
+    <sql id="selectCoreMonitoringRetrievalTaskVo">
+        select id, plan_id, task_name, org_id, org_path, org_name, ymd_date, ymd_year, ymd_halfyear, ymd_quarter, ymd_month, ymd_week, ymd_day, cycle, plan_start_time, plan_end_time, start_time, end_time, status, role_id, retrieval_user, order_num, batch_num, submit_time, exception_count
+        from core_monitoring_retrieval_task
+    </sql>
+
+    <select id="selectCoreMonitoringRetrievalTaskList" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask"
+            resultMap="CoreMonitoringRetrievalTaskResult">
+        <include refid="selectCoreMonitoringRetrievalTaskVo"/>
+        <where>
+                        <if test="taskName != null  and taskName != ''">
+                            and task_name like concat('%', #{taskName}, '%')
+                        </if>
+                        <if test="cycle != null ">
+                            and cycle = #{cycle}
+                        </if>
+                        <if test="planStartTime != null ">
+                            and plan_start_time = #{planStartTime}
+                        </if>
+                        <if test="planEndTime != null ">
+                            and plan_end_time = #{planEndTime}
+                        </if>
+                        <if test="status != null ">
+                            and status = #{status}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectCoreMonitoringRetrievalTaskById" parameterType="Long"
+            resultMap="CoreMonitoringRetrievalTaskResult">
+            <include refid="selectCoreMonitoringRetrievalTaskVo"/>
+            where id = #{id}
+    </select>
+    <select id="selectPageList" resultType="com.xunmei.core.retrieval.vo.CoreMonitoringRetrievalTaskVo">
+        select a.*,b.name as roleName,c.name as retrievalUserName from core_monitoring_retrieval_task a left join sys_role b on a.role_id = b.id left join sys_user c on a.retrieval_user = c.id
+        where 1=1
+        <if test="request.orgId != null ">
+            and a.org_id = #{request.orgId}
+        </if>
+        <if test="request.orgPath != null  and request.orgPath != ''">
+            and a.org_path = #{request.orgPath}
+        </if>
+        <if test="request.taskName != null  and request.taskName != ''">
+            and a.task_name like concat('%', #{request.taskName}, '%')
+        </if>
+        <if test="request.cycle != null ">
+            and a.cycle = #{request.cycle}
+        </if>
+        <if test="request.dateRange != null and request.dateRange.length>0">
+            and a.ymd_date >= #{request.dateRange[0]}
+            and #{request.dateRange[1]}>=a.ymd_date
+        </if>
+        <if test="request.status != null ">
+            and a.status = #{request.status}
+        </if>
+        <if test="request.roleId != null ">
+            and a.role_id = #{request.roleId}
+        </if>
+        order by a.ymd_date desc
+    </select>
+
+    <insert id="insertCoreMonitoringRetrievalTask" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask">
+        insert into core_monitoring_retrieval_task
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,
+                    </if>
+                    <if test="planId != null">plan_id,
+                    </if>
+                    <if test="taskName != null">task_name,
+                    </if>
+                    <if test="orgId != null">org_id,
+                    </if>
+                    <if test="orgPath != null">org_path,
+                    </if>
+                    <if test="orgName != null">org_name,
+                    </if>
+                    <if test="ymdDate != null">ymd_date,
+                    </if>
+                    <if test="ymdYear != null">ymd_year,
+                    </if>
+                    <if test="ymdHalfyear != null">ymd_halfyear,
+                    </if>
+                    <if test="ymdQuarter != null">ymd_quarter,
+                    </if>
+                    <if test="ymdMonth != null">ymd_month,
+                    </if>
+                    <if test="ymdWeek != null">ymd_week,
+                    </if>
+                    <if test="ymdDay != null">ymd_day,
+                    </if>
+                    <if test="cycle != null">cycle,
+                    </if>
+                    <if test="planStartTime != null">plan_start_time,
+                    </if>
+                    <if test="planEndTime != null">plan_end_time,
+                    </if>
+                    <if test="startTime != null">start_time,
+                    </if>
+                    <if test="endTime != null">end_time,
+                    </if>
+                    <if test="status != null">status,
+                    </if>
+                    <if test="roleId != null">role_id,
+                    </if>
+                    <if test="retrievalUser != null">retrieval_user,
+                    </if>
+                    <if test="orderNum != null">order_num,
+                    </if>
+                    <if test="batchNum != null">batch_num,
+                    </if>
+                    <if test="submitTime != null">submit_time,
+                    </if>
+                    <if test="exceptionCount != null">exception_count,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="planId != null">#{planId},
+                    </if>
+                    <if test="taskName != null">#{taskName},
+                    </if>
+                    <if test="orgId != null">#{orgId},
+                    </if>
+                    <if test="orgPath != null">#{orgPath},
+                    </if>
+                    <if test="orgName != null">#{orgName},
+                    </if>
+                    <if test="ymdDate != null">#{ymdDate},
+                    </if>
+                    <if test="ymdYear != null">#{ymdYear},
+                    </if>
+                    <if test="ymdHalfyear != null">#{ymdHalfyear},
+                    </if>
+                    <if test="ymdQuarter != null">#{ymdQuarter},
+                    </if>
+                    <if test="ymdMonth != null">#{ymdMonth},
+                    </if>
+                    <if test="ymdWeek != null">#{ymdWeek},
+                    </if>
+                    <if test="ymdDay != null">#{ymdDay},
+                    </if>
+                    <if test="cycle != null">#{cycle},
+                    </if>
+                    <if test="planStartTime != null">#{planStartTime},
+                    </if>
+                    <if test="planEndTime != null">#{planEndTime},
+                    </if>
+                    <if test="startTime != null">#{startTime},
+                    </if>
+                    <if test="endTime != null">#{endTime},
+                    </if>
+                    <if test="status != null">#{status},
+                    </if>
+                    <if test="roleId != null">#{roleId},
+                    </if>
+                    <if test="retrievalUser != null">#{retrievalUser},
+                    </if>
+                    <if test="orderNum != null">#{orderNum},
+                    </if>
+                    <if test="batchNum != null">#{batchNum},
+                    </if>
+                    <if test="submitTime != null">#{submitTime},
+                    </if>
+                    <if test="exceptionCount != null">#{exceptionCount},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreMonitoringRetrievalTask" parameterType="com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask">
+        update core_monitoring_retrieval_task
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="planId != null">plan_id =
+                        #{planId},
+                    </if>
+                    <if test="taskName != null">task_name =
+                        #{taskName},
+                    </if>
+                    <if test="orgId != null">org_id =
+                        #{orgId},
+                    </if>
+                    <if test="orgPath != null">org_path =
+                        #{orgPath},
+                    </if>
+                    <if test="orgName != null">org_name =
+                        #{orgName},
+                    </if>
+                    <if test="ymdDate != null">ymd_date =
+                        #{ymdDate},
+                    </if>
+                    <if test="ymdYear != null">ymd_year =
+                        #{ymdYear},
+                    </if>
+                    <if test="ymdHalfyear != null">ymd_halfyear =
+                        #{ymdHalfyear},
+                    </if>
+                    <if test="ymdQuarter != null">ymd_quarter =
+                        #{ymdQuarter},
+                    </if>
+                    <if test="ymdMonth != null">ymd_month =
+                        #{ymdMonth},
+                    </if>
+                    <if test="ymdWeek != null">ymd_week =
+                        #{ymdWeek},
+                    </if>
+                    <if test="ymdDay != null">ymd_day =
+                        #{ymdDay},
+                    </if>
+                    <if test="cycle != null">cycle =
+                        #{cycle},
+                    </if>
+                    <if test="planStartTime != null">plan_start_time =
+                        #{planStartTime},
+                    </if>
+                    <if test="planEndTime != null">plan_end_time =
+                        #{planEndTime},
+                    </if>
+                    <if test="startTime != null">start_time =
+                        #{startTime},
+                    </if>
+                    <if test="endTime != null">end_time =
+                        #{endTime},
+                    </if>
+                    <if test="status != null">status =
+                        #{status},
+                    </if>
+                    <if test="roleId != null">role_id =
+                        #{roleId},
+                    </if>
+                    <if test="retrievalUser != null">retrieval_user =
+                        #{retrievalUser},
+                    </if>
+                    <if test="orderNum != null">order_num =
+                        #{orderNum},
+                    </if>
+                    <if test="batchNum != null">batch_num =
+                        #{batchNum},
+                    </if>
+                    <if test="submitTime != null">submit_time =
+                        #{submitTime},
+                    </if>
+                    <if test="exceptionCount != null">exception_count =
+                        #{exceptionCount},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreMonitoringRetrievalTaskById" parameterType="Long">
+        delete
+        from core_monitoring_retrieval_task where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreMonitoringRetrievalTaskByIds" parameterType="String">
+        delete from core_monitoring_retrieval_task where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -93,7 +93,7 @@ public class SysAreaController extends BaseController {
      */
     @ApiOperation(value = "按机构类型获取所有区域")
 //    @RequiresPermissions("system:area:list
-    @DeleteMapping("/orgType/{orgType}")
+    @GetMapping("/orgType/{orgType}")
     public AjaxResult listByOrgType(@PathVariable Integer orgType) {
         SysArea condition = new SysArea();
         condition.setOrgType(orgType.toString());

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

@@ -168,7 +168,7 @@ public class SysDeptController extends BaseController {
     }
 
     @PostMapping("/findListByOrgTypes")
-    public R<List<SysOrg>> listByTypes(OrgListByTypesConditionEto eto){
+    public R<List<SysOrg>> listByTypes(@RequestBody OrgListByTypesConditionEto eto){
         return R.ok(orgService.listByTypes(eto.getOrgId(),eto.getOrgTypes()));
     }
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -96,7 +96,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         LambdaQueryWrapper<SysOrg> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysOrg::getDeleted, 0);
         wrapper.in(SysOrg::getType, types);
-        wrapper.likeLeft(SysOrg::getPath,top.getPath());
+        wrapper.likeRight(SysOrg::getPath,top.getPath());
         return sysOrgMapper.selectList(wrapper);
     }