调阅任务登记

soc-modules/soc-modules-core/pom.xml

@@ -41,13 +41,6 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
         <!-- Mysql Connector -->
         <dependency>
             <groupId>mysql</groupId>

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -0,0 +1,96 @@
+package com.xunmei.core.access.controller;
+
+import java.util.List;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.xunmei.common.log.annotation.Log;
+import com.xunmei.common.log.enums.BusinessType;
+import com.xunmei.common.security.annotation.RequiresPermissions;
+
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+
+/**
+ * 【请填写功能名称】Controller
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+@Api(tags = {"CoreMonitoringTaskRegistration" })
+@RestController
+@RequestMapping("/registration")
+public class CoreMonitoringTaskRegistrationController extends BaseController {
+    @Autowired
+    private ICoreMonitoringTaskRegistrationService coreMonitoringTaskRegistrationService;
+
+/**
+ * 查询【请填写功能名称】列表
+ */
+@ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
+@RequiresPermissions("system:registration:list")
+@GetMapping("/list")
+    public TableDataInfo<CoreMonitoringTaskRegistration> list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+
+     //   return coreMonitoringTaskRegistrationService.selectPage( coreMonitoringTaskRegistration);
+    return null;
+    }
+
+
+
+    /**
+     * 获取【请填写功能名称】详细信息
+     */
+    @ApiOperation(value = "获取CoreMonitoringTaskRegistration详细信息")
+    @RequiresPermissions("system:registration:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(coreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
+    }
+
+    /**
+     * 新增【调阅任务登记NCF开始】
+     */
+    @ApiOperation(value = "新增CoreMonitoringTaskRegistration")
+    @RequiresPermissions("system:registration:add")
+    @Log(title = "【调阅任务登记NCF开始】" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return toAjax(coreMonitoringTaskRegistrationService.insertCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     */
+    @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
+    @RequiresPermissions("system:registration:edit")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return toAjax(coreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
+    }
+
+    /**
+     * 删除【请填写功能名称】
+     */
+    @ApiOperation(value = "删除CoreMonitoringTaskRegistration")
+    @RequiresPermissions("system:registration:remove")
+    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(coreMonitoringTaskRegistrationService.deleteCoreMonitoringTaskRegistrationByIds(ids));
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/domain/CoreMonitoringTaskRegistration.java

@@ -0,0 +1,91 @@
+package com.xunmei.core.access.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_task_registration
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_monitoring_task_registration")
+@ApiModel(value = "CoreMonitoringTaskRegistration对象" , description = "【请填写功能名称】")
+public class CoreMonitoringTaskRegistration extends BaseEntity
+        {
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 任务id */
+            @ApiModelProperty(value = "任务id")
+    private Long taskId;
+
+    /** 调阅任务填报开始时间 */
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+            @ApiModelProperty(value = "调阅任务填报开始时间")
+    private Date taskStartTime;
+
+    /** $column.columnComment */
+    private String delFlag;
+
+    /** nfc标识 */
+            @ApiModelProperty(value = "nfc标识")
+    private String nfc;
+
+    /** 图片标识 */
+            @ApiModelProperty(value = "图片标识")
+    private String picture;
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                
+@Override
+public String toString(){
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id" ,getId())
+
+
+                .append("taskId" ,getTaskId())
+
+
+                .append("taskStartTime" ,getTaskStartTime())
+
+
+                .append("delFlag" ,getDelFlag())
+
+
+                .append("nfc" ,getNfc())
+
+
+                .append("picture" ,getPicture())
+
+
+                .append("createBy" ,getCreateBy())
+
+
+                .append("updateBy" ,getUpdateBy())
+
+
+                .append("createTime" ,getCreateTime())
+
+
+                .append("updateTime" ,getUpdateTime())
+        .toString();
+        }
+        }

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

@@ -21,7 +21,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("t_monitoring_retrieval_plan")
+@TableName("core_monitoring_retrieval_plan")
 @ApiModel(value = "TMonitoringRetrievalPlan对象", description = "监控调阅计划")
 public class TMonitoringRetrievalPlan extends BaseEntity {
     private static final long serialVersionUID = 1L;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/dto/CoreMonitoringTaskRegistrationDTO.java

@@ -0,0 +1,15 @@
+package com.xunmei.core.access.dto;
+
+import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/28
+ */
+@Data
+public class CoreMonitoringTaskRegistrationDTO extends CoreMonitoringRetrievalTask {
+    private Date moth;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/mapper/CoreMonitoringTaskRegistrationMapper.java

@@ -0,0 +1,63 @@
+package com.xunmei.core.access.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+public interface CoreMonitoringTaskRegistrationMapper extends BaseMapper<CoreMonitoringTaskRegistration> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreMonitoringTaskRegistration selectCoreMonitoringTaskRegistrationById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreMonitoringTaskRegistration> selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationByIds(Long[] ids);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/ICoreMonitoringTaskRegistrationService.java

@@ -0,0 +1,73 @@
+package com.xunmei.core.access.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+public interface ICoreMonitoringTaskRegistrationService extends IService<CoreMonitoringTaskRegistration> {
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    List<CoreMonitoringTaskRegistration> selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    int insertCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    int updateCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键集合
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationById(Long id);
+
+    /**
+     * 查询【请填写功能名称】分页数据
+     *
+     * @param coreMonitoringTaskRegistration 查询条件对象
+     * @return Page
+     */
+  //  TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration);
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -0,0 +1,142 @@
+package com.xunmei.core.access.service.impl;
+
+import java.util.Arrays;
+import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.bean.BeanUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
+import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
+import com.xunmei.core.retrieval.service.impl.CoreMonitoringRetrievalTaskServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-08-28
+ */
+@Service
+public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
+    @Autowired
+    private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
+@Autowired
+private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;
+
+  /*  @Override
+    public TableDataInfo<CoreMonitoringTaskRegistration> selectPage(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        //未删除
+        coreMonitoringTaskRegistration.setDeleted(0L);
+        Page<CoreMonitoringTaskRegistration> page;
+        //分页
+        if (coreMonitoringTaskRegistration.getPageNum()!=null&&coreMonitoringTaskRegistration.getPageSize()!=null)
+        {
+            page = new Page<>(coreMonitoringTaskRegistration.getPageNum(), coreMonitoringTaskRegistration.getPageSize());
+        }else{
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<CoreMonitoringTaskRegistration> query = new QueryWrapper<>(coreMonitoringTaskRegistration);
+        //下穿
+        if (coreMonitoringTaskRegistration.getCheckSub()){
+            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskRegistration.getOrgId());
+            //清空前端传递的org_id
+            coreMonitoringTaskRegistration.setOrgId(null);
+            //添加in条件
+            query.in("org_id",ids);
+        }
+        //时间范围查询
+        if (coreMonitoringTaskRegistration.getParams().get("beginTime")!=null&&coreMonitoringTaskRegistration.getParams().get("endTime")!=null){
+            query.between("create_time", coreMonitoringTaskRegistration.getParams().get("beginTime"), coreMonitoringTaskRegistration.getParams().get("endTime"));
+        }
+        //获取数据
+        page = coreMonitoringTaskRegistrationMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+    }*/
+
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationById(Long id) {
+        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO=new CoreMonitoringTaskRegistrationVO();
+        CoreMonitoringTaskRegistration coreMonitoringTaskRegistration = coreMonitoringTaskRegistrationMapper.selectById(id);
+        BeanUtils.copyProperties(coreMonitoringTaskRegistration,coreMonitoringTaskRegistrationVO);
+        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
+        coreMonitoringTaskRegistrationVO.setTaskName(coreMonitoringRetrievalTask.getTaskName());
+        return coreMonitoringTaskRegistrationVO;
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<CoreMonitoringTaskRegistration> selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        return coreMonitoringTaskRegistrationMapper.selectList(new QueryWrapper<>(coreMonitoringTaskRegistration));
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        coreMonitoringTaskRegistration.setCreateTime(DateUtils.getNowDate());
+        coreMonitoringTaskRegistration.setTaskStartTime(DateUtils.getNowDate());
+        coreMonitoringTaskRegistration.setDelFlag("0");
+        coreMonitoringTaskRegistration.setCreateBy(SecurityUtils.getUsername());
+        return coreMonitoringTaskRegistrationMapper.insert(coreMonitoringTaskRegistration);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param coreMonitoringTaskRegistration 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
+        coreMonitoringTaskRegistration.setUpdateTime(DateUtils.getNowDate());
+        return coreMonitoringTaskRegistrationMapper.updateById(coreMonitoringTaskRegistration);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskRegistrationByIds(Long[] ids) {
+        return coreMonitoringTaskRegistrationMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskRegistrationById(Long id) {
+        return coreMonitoringTaskRegistrationMapper.deleteById(id);
+    }
+}

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

@@ -45,6 +45,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     private RemoteOrgService remoteOrgService;
     @Autowired
     private RemoteRoleService remoteRoleService;
+
     @Override
     public TableDataInfo<TMonitoringRetrievalPlan> selectPage(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         //未删除
@@ -69,7 +70,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         }
         if (tMonitoringRetrievalPlan.getCheckSub()) {
             //List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
-            List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(),SecurityConstants.INNER);
+            List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
             //清空前端传递的org_id
             tMonitoringRetrievalPlan.setOrgId(null);
             //添加in条件
@@ -158,7 +159,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     public int insertTMonitoringRetrievalPlan(TMonitoringRetrievalPlan tMonitoringRetrievalPlan) {
         tMonitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
         SysUser sysUser = remoteUserService.getUserById(SecurityUtils.getUserId(), SecurityConstants.INNER);
-    SysOrg data = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
+        SysOrg data = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
         tMonitoringRetrievalPlan.setOrgName(data.getName());
         tMonitoringRetrievalPlan.setOrgId(sysUser.getOrgId());
         tMonitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/vo/CoreMonitoringTaskRegistrationVO.java

@@ -0,0 +1,13 @@
+package com.xunmei.core.access.vo;
+
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/28
+ */
+@Data
+public class CoreMonitoringTaskRegistrationVO extends CoreMonitoringTaskRegistration {
+    private String taskName;
+}

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

@@ -7,6 +7,7 @@ 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.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
@@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * 监控调阅任务Controller
@@ -41,6 +43,14 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
         return coreMonitoringRetrievalTaskService.selectPage( request);
     }
     /**
+     * 查询监控调阅任务列表app
+     */
+    @ApiOperation(value = "app查询调阅任务列表")
+    @GetMapping("/selectListApp")
+    public List<CoreMonitoringRetrievalTask>selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO){
+      return   coreMonitoringRetrievalTaskService.selectListApp(coreMonitoringTaskRegistrationDTO);
+    }
+    /**
      * 导出excel
      */
     @ApiOperation(value = "导出监控调阅任务")

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

@@ -7,6 +7,7 @@ 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.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
 
@@ -76,4 +77,6 @@ public interface ICoreMonitoringRetrievalTaskService extends IService<CoreMonito
     public TableDataInfo selectPage(RetrievalTaskPageDto request);
 
     void export(RetrievalTaskPageDto request, HttpServletResponse response) throws IOException;
+
+    List<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO);
 }

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

@@ -10,6 +10,7 @@ import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateHelper;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.retrieval.domain.CoreMonitoringRetrievalTask;
 import com.xunmei.core.retrieval.dto.RetrievalTaskPageDto;
 import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
@@ -108,6 +109,15 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         writer.close();
     }
 
+    @Override
+    public List<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
+       QueryWrapper queryWrapper=new QueryWrapper();
+        queryWrapper.eq("org_id",coreMonitoringTaskRegistrationDTO.getOrgId());
+        queryWrapper.eq("status",coreMonitoringTaskRegistrationDTO.getStatus());
+        queryWrapper.like("ymd_date",coreMonitoringTaskRegistrationDTO.getMoth());
+        return baseMapper.selectList(queryWrapper);
+    }
+
 
     /**
      * 查询监控调阅任务

soc-modules/soc-modules-core/src/main/resources/mapper/access/CoreMonitoringTaskRegistrationMapper.xml

@@ -0,0 +1,143 @@
+<?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.access.domain.CoreMonitoringTaskRegistration">
+
+    <resultMap type="com.xunmei.core.access.domain.CoreMonitoringTaskRegistration" id="CoreMonitoringTaskRegistrationResult">
+                <result property="id" column="id"/>
+                <result property="taskId" column="task_id"/>
+                <result property="taskStartTime" column="task_start_time"/>
+                <result property="delFlag" column="del_flag"/>
+                <result property="nfc" column="nfc"/>
+                <result property="picture" column="picture"/>
+                <result property="createBy" column="create_by"/>
+                <result property="updateBy" column="update_by"/>
+                <result property="createTime" column="create_time"/>
+                <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectCoreMonitoringTaskRegistrationVo">
+        select id, task_id, task_start_time, del_flag, nfc, picture, create_by, update_by, create_time, update_time
+        from core_monitoring_task_registration
+    </sql>
+
+    <select id="selectCoreMonitoringTaskRegistrationList" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistration"
+            resultMap="CoreMonitoringTaskRegistrationResult">
+        <include refid="selectCoreMonitoringTaskRegistrationVo"/>
+        <where>
+                        <if test="taskId != null ">
+                            and task_id = #{taskId}
+                        </if>
+                        <if test="taskStartTime != null ">
+                            and task_start_time = #{taskStartTime}
+                        </if>
+                        <if test="nfc != null  and nfc != ''">
+                            and nfc = #{nfc}
+                        </if>
+                        <if test="picture != null  and picture != ''">
+                            and picture = #{picture}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectCoreMonitoringTaskRegistrationById" parameterType="Long"
+            resultMap="CoreMonitoringTaskRegistrationResult">
+            <include refid="selectCoreMonitoringTaskRegistrationVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertCoreMonitoringTaskRegistration" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistration">
+        insert into core_monitoring_task_registration
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,
+                    </if>
+                    <if test="taskId != null">task_id,
+                    </if>
+                    <if test="taskStartTime != null">task_start_time,
+                    </if>
+                    <if test="delFlag != null">del_flag,
+                    </if>
+                    <if test="nfc != null">nfc,
+                    </if>
+                    <if test="picture != null">picture,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="taskId != null">#{taskId},
+                    </if>
+                    <if test="taskStartTime != null">#{taskStartTime},
+                    </if>
+                    <if test="delFlag != null">#{delFlag},
+                    </if>
+                    <if test="nfc != null">#{nfc},
+                    </if>
+                    <if test="picture != null">#{picture},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreMonitoringTaskRegistration" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistration">
+        update core_monitoring_task_registration
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="taskId != null">task_id =
+                        #{taskId},
+                    </if>
+                    <if test="taskStartTime != null">task_start_time =
+                        #{taskStartTime},
+                    </if>
+                    <if test="delFlag != null">del_flag =
+                        #{delFlag},
+                    </if>
+                    <if test="nfc != null">nfc =
+                        #{nfc},
+                    </if>
+                    <if test="picture != null">picture =
+                        #{picture},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreMonitoringTaskRegistrationById" parameterType="Long">
+        delete
+        from core_monitoring_task_registration where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreMonitoringTaskRegistrationByIds" parameterType="String">
+        delete from core_monitoring_task_registration where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -25,7 +25,7 @@
 
     <sql id="selectTMonitoringRetrievalPlanVo">
         select id, plan_name, org_id, org_path, org_name, org_type, role_id, plan_cycle, plan_frequency, plan_status, create_time, create_by, update_time, update_by, description, is_deleted
-        from t_monitoring_retrieval_plan
+        from core_monitoring_retrieval_plan
     </sql>
 
     <select id="selectTMonitoringRetrievalPlanList" parameterType="com.xunmei.core.access.domain.TMonitoringRetrievalPlan"
@@ -200,11 +200,11 @@
 
     <delete id="deleteTMonitoringRetrievalPlanById" parameterType="Long">
         delete
-        from t_monitoring_retrieval_plan where id = #{id}
+        from core_monitoring_retrieval_plan where id = #{id}
     </delete>
 
     <delete id="deleteTMonitoringRetrievalPlanByIds" parameterType="String">
-        delete from t_monitoring_retrieval_plan where id in
+        delete from core_monitoring_retrieval_plan where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>