Merge branch 'V0.0.1' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.1

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/domain/CoreEduTrainingTask.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.xunmei.common.core.enums.edu.EduTrainingDoStatus;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -55,16 +54,6 @@ public class CoreEduTrainingTask extends BaseEntity {
     private String orgPath;
 
 
-    @TableField("role_ids")
-    @ApiModelProperty(value = "岗位id集合")
-    private String roleIds;
-
-
-    @TableField("role_names")
-    @ApiModelProperty(value = "岗位名集合")
-    private String roleNames;
-
-
     @TableField("title")
     @ApiModelProperty(value = "学习主题")
     private String title;
@@ -98,9 +87,12 @@ public class CoreEduTrainingTask extends BaseEntity {
     @ApiModelProperty(value = "培训时间")
     private Date dateTime;
 
+    /**
+     * @see com.xunmei.common.core.enums.edu.EduTrainingDoStatus
+     */
     @TableField("status")
-    @ApiModelProperty(value = "时间")
-    private EduTrainingDoStatus status;
+    @ApiModelProperty(value = "状态")
+    private Integer status;
 
 
     @TableField("content")
@@ -140,8 +132,6 @@ public class CoreEduTrainingTask extends BaseEntity {
                 .append("startDate", getStartDate())
                 .append("endDate", getEndDate())
                 .append("content", getContent())
-                .append("roleIds", getRoleIds())
-                .append("roleNames", getRoleNames())
                 .append("title", getTitle())
                 .append("note", getNote())
                 .append("dateTime", getDateTime())

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/domain/CoreEduTrainingTaskToRole.java

@@ -2,7 +2,6 @@ package com.xunmei.common.core.domain.edu.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -22,7 +21,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 @Accessors(chain = true)
 @TableName("core_edu_training_task_to_role")
 @ApiModel(value = "CoreEduTrainingTaskToRole对象", description = "教育培训任务角色关系")
-public class CoreEduTrainingTaskToRole extends BaseEntity {
+public class CoreEduTrainingTaskToRole {
     private static final long serialVersionUID = 1L;
 
     @TableField("edu_training_task_id")

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingTaskPageDto.java

@@ -0,0 +1,26 @@
+package com.xunmei.common.core.domain.edu.dto;
+
+import com.xunmei.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CoreEduTrainingTaskPageDto extends BaseEntity {
+
+
+    @ApiModelProperty(value = "学习主题")
+    private String title;
+
+
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty("任务时间范围")
+    private Date[] range;
+
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/vo/CoreEduTrainingTaskPageVo.java

@@ -0,0 +1,7 @@
+package com.xunmei.common.core.domain.edu.vo;
+
+import lombok.Data;
+
+@Data
+public class CoreEduTrainingTaskPageVo {
+}

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/edu/controller/CoreEduTrainingTaskController.java

@@ -2,6 +2,8 @@ package com.xunmei.core.edu.controller;
 
 
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -33,7 +35,7 @@ public class CoreEduTrainingTaskController extends BaseController {
     @ApiOperation(value = "查询CoreEduTrainingTask列表")
     @RequiresPermissions("core:eduTask:list")
     @GetMapping("/list")
-    public TableDataInfo<CoreEduTrainingTask> list(CoreEduTrainingTask coreEduTrainingTask) {
+    public TableDataInfo<CoreEduTrainingTaskPageVo> list(CoreEduTrainingTaskPageDto coreEduTrainingTask) {
 
         return coreEduTrainingTaskService.selectPage(coreEduTrainingTask);
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingTaskMapper.java

@@ -2,7 +2,11 @@ package com.xunmei.core.edu.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,51 +17,9 @@ import java.util.List;
  * @date 2023-08-27
  */
 public interface CoreEduTrainingTaskMapper extends BaseMapper<CoreEduTrainingTask> {
-    /**
-     * 查询教育任务
-     *
-     * @param id 教育任务主键
-     * @return 教育任务
-     */
-    CoreEduTrainingTask selectCoreEduTrainingTaskById(Long id);
 
-    /**
-     * 查询教育任务列表
-     *
-     * @param coreEduTrainingTask 教育任务
-     * @return 教育任务集合
-     */
-    List<CoreEduTrainingTask> selectCoreEduTrainingTaskList(CoreEduTrainingTask coreEduTrainingTask);
+    Integer checkHasTaskIsDone(@Param("list") List<Long> list);
 
-    /**
-     * 新增教育任务
-     *
-     * @param coreEduTrainingTask 教育任务
-     * @return 结果
-     */
-    int insertCoreEduTrainingTask(CoreEduTrainingTask coreEduTrainingTask);
+    Page<CoreEduTrainingTaskPageVo> selectPageData(Page<CoreEduTrainingTaskPageVo> page, @Param("request") CoreEduTrainingTaskPageDto request);
 
-    /**
-     * 修改教育任务
-     *
-     * @param coreEduTrainingTask 教育任务
-     * @return 结果
-     */
-    int updateCoreEduTrainingTask(CoreEduTrainingTask coreEduTrainingTask);
-
-    /**
-     * 删除教育任务
-     *
-     * @param id 教育任务主键
-     * @return 结果
-     */
-    int deleteCoreEduTrainingTaskById(Long id);
-
-    /**
-     * 批量删除教育任务
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteCoreEduTrainingTaskByIds(Long[] ids);
 }

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

@@ -3,7 +3,9 @@ package com.xunmei.core.edu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 import java.util.Date;
@@ -70,7 +72,7 @@ public interface ICoreEduTrainingTaskService extends IService<CoreEduTrainingTas
      * @param coreEduTrainingTask 查询条件对象
      * @return Page
      */
-    TableDataInfo<CoreEduTrainingTask> selectPage(CoreEduTrainingTask coreEduTrainingTask);
+    TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto coreEduTrainingTask);
 
 
     void createTaskForNow(CoreEduTrainingPlanDataVo plan, Date start, Date end);

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

@@ -27,9 +27,11 @@ import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.edu.mapper.CoreEduTrainingPlanMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingPlanToExecOrgMapper;
 import com.xunmei.core.edu.mapper.CoreEduTrainingPlanToRoleMapper;
+import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanService;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanToExecOrgService;
 import com.xunmei.core.edu.service.ICoreEduTrainingPlanToRoleService;
+import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
@@ -67,6 +69,10 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     @Autowired
     private CoreEduTrainingPlanToExecOrgMapper coreEduTrainingPlanToExecOrgMapper;
     @Autowired
+    private ICoreEduTrainingTaskService coreEduTrainingTaskService;
+    @Autowired
+    private CoreEduTrainingTaskMapper coreEduTrainingTaskMapper;
+    @Autowired
     private RemoteOrgService orgService;
 
     @Override
@@ -168,11 +174,12 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             plan.setStandard(1);
             plan.setIssue(0);
         }
-
-
         int insert = coreEduTrainingPlanMapper.insert(plan);
-        if ((!checkOrgType(org.getType())) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(0, plan.getBuildTaskNow()))) {
-            // TODO 生成任务
+
+        //如果不是省联社或者办事处，并且是无周期或者立即生效
+        if ((!checkOrgType(plan.getExecOrgType())) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(0, plan.getBuildTaskNow()))) {
+            CoreEduTrainingPlanDataVo detailPlanData = coreEduTrainingPlanMapper.getDetailPlanData(plan.getId());
+            coreEduTrainingTaskService.createTaskForNow(detailPlanData, plan.getStartDate(), plan.getEndDate());
         }
 
         return insert;
@@ -252,6 +259,10 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteCoreEduTrainingPlanByIds(Long[] ids) {
+        Integer count = coreEduTrainingTaskMapper.checkHasTaskIsDone(Arrays.asList(ids));
+        if (count != null && count > 0) {
+            throw new RuntimeException("已有任务完成，无法删除");
+        }
         return coreEduTrainingPlanMapper.deleteBatchIds(Arrays.asList((ids)));
     }
 
@@ -296,7 +307,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void publishPlan(Long planId) {
         final CoreEduTrainingPlan plan = coreEduTrainingPlanMapper.selectById(planId);
         if (plan == null) {

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

@@ -3,8 +3,8 @@ package com.xunmei.core.edu.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.ErrorMsgConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
@@ -12,22 +12,25 @@ import com.xunmei.common.core.domain.DateRange;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToExecOrg;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingPlanToRole;
 import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask;
+import com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTaskToRole;
+import com.xunmei.common.core.domain.edu.dto.CoreEduTrainingTaskPageDto;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
+import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo;
 import com.xunmei.common.core.enums.edu.EduTrainingDoStatus;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper;
 import com.xunmei.core.edu.service.ICoreEduTrainingTaskService;
+import com.xunmei.core.edu.service.ICoreEduTrainingTaskToRoleService;
 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 org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -43,31 +46,14 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private CoreEduTrainingTaskMapper coreEduTrainingTaskMapper;
     @Autowired
     private RemoteOrgService orgService;
+    @Autowired
+    private ICoreEduTrainingTaskToRoleService coreEduTrainingTaskToRoleService;
 
     @Override
-    public TableDataInfo<CoreEduTrainingTask> selectPage(CoreEduTrainingTask coreEduTrainingTask) {
-        //未删除
-        Page<CoreEduTrainingTask> page;
-        //分页
-        if (coreEduTrainingTask.getPageNum() != null && coreEduTrainingTask.getPageSize() != null) {
-            page = new Page<>(coreEduTrainingTask.getPageNum(), coreEduTrainingTask.getPageSize());
-        } else {
-            page = new Page<>();
-        }
-        //查询条件
-        QueryWrapper<CoreEduTrainingTask> query = new QueryWrapper<>(coreEduTrainingTask);
-        //下穿
-        if (coreEduTrainingTask.getCheckSub()) {
-
-        }
-        //时间范围查询
-        if (coreEduTrainingTask.getParams().get("beginTime") != null && coreEduTrainingTask.getParams().get("endTime") != null) {
-            query.between("create_time", coreEduTrainingTask.getParams().get("beginTime"), coreEduTrainingTask.getParams().get("endTime"));
-        }
-        //获取数据
-        page = coreEduTrainingTaskMapper.selectPage(page, query);
+    public TableDataInfo<CoreEduTrainingTaskPageVo> selectPage(CoreEduTrainingTaskPageDto request) {
+        IPage<CoreEduTrainingTaskPageVo> pageData = coreEduTrainingTaskMapper.selectPageData(request.getPage(), request);
         //抓换为TableDataInfo适配前端
-        return TableDataInfo.build(page);
+        return TableDataInfo.build(pageData);
 
 
     }
@@ -142,6 +128,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public void createTaskForNow(CoreEduTrainingPlanDataVo plan, Date start, Date end) {
 
         //如果不是无周期的计划，那么需要查询出他的时间范围
@@ -159,37 +146,57 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             List<Long> list = planExecOrgList.stream().map(CoreEduTrainingPlanToExecOrg::getOrgId).collect(Collectors.toList());
             orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgByIdList(list, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         }
+        Integer execTimes = plan.getExecTimes();
+        Map<Integer, DateRange> dateMap = DateUtils.splitDateRange(start, end, execTimes);
+        saveTaskAndRoleData(plan, start, end, orgList, dateMap);
+    }
+
+    private void saveTaskAndRoleData(CoreEduTrainingPlanDataVo plan, Date start, Date end, List<SysOrg> orgList, Map<Integer, DateRange> dateMap) {
         List<CoreEduTrainingPlanToRole> planRoleList = plan.getPlanRoleList();
-        String roleIds = planRoleList.stream().map(CoreEduTrainingPlanToRole::getRoleId).map(String::valueOf).collect(Collectors.joining(","));
-        String roleNames = planRoleList.stream().map(CoreEduTrainingPlanToRole::getRoleName).collect(Collectors.joining(","));
-        ArrayList<CoreEduTrainingTask> list = new ArrayList<>();
+        List<CoreEduTrainingTask> taskList = new ArrayList<>();
+        List<CoreEduTrainingTaskToRole> taskRoleList = new ArrayList<>();
         for (SysOrg org : orgList) {
-            CoreEduTrainingTask trainingTask = new CoreEduTrainingTask();
-            trainingTask.setId(IdWorker.getId());
-            trainingTask.setPlanId(plan.getId());
-            trainingTask.setPlanCycle(plan.getPlanCycle());
-            trainingTask.setStartDate(start);
-            trainingTask.setEndDate(end);
-            trainingTask.setContent(null);
-            trainingTask.setRoleIds(roleIds);
-            trainingTask.setRoleNames(roleNames);
-            trainingTask.setTitle(plan.getPlanName());
-            trainingTask.setNote(null);
-            trainingTask.setDateTime(null);
-            trainingTask.setHostId(null);
-            trainingTask.setFileList(ObjectUtil.isEmpty(plan.getFileList()) ? null : JSON.toJSONString(plan.getFileList()));
-            trainingTask.setImageList(null);
-            trainingTask.setOrgId(org.getId());
-            trainingTask.setType(null);
-            trainingTask.setOrgName(org.getName());
-            trainingTask.setOrgPath(org.getPath());
-            trainingTask.setStatus(EduTrainingDoStatus.UN_START);
-            trainingTask.setPdfUrl(null);
-            trainingTask.setCreateTime(new Date());
-            trainingTask.setUpdateTime(new Date());
+            for (Map.Entry<Integer, DateRange> entry : dateMap.entrySet()) {
+                Date startTime = entry.getValue().getStartTime();
+                Date endTime = entry.getValue().getEndTime();
+                CoreEduTrainingTask trainingTask = new CoreEduTrainingTask();
+                trainingTask.setId(IdWorker.getId());
+                trainingTask.setPlanId(plan.getId());
+                trainingTask.setPlanCycle(plan.getPlanCycle());
+                trainingTask.setStartDate(startTime);
+                trainingTask.setEndDate(endTime);
+                trainingTask.setContent(null);
+                trainingTask.setTitle(plan.getPlanName());
+                trainingTask.setNote(null);
+                trainingTask.setDateTime(null);
+                trainingTask.setHostId(null);
+                trainingTask.setFileList(ObjectUtil.isEmpty(plan.getFileList()) ? null : JSON.toJSONString(plan.getFileList()));
+                trainingTask.setImageList(null);
+                trainingTask.setOrgId(org.getId());
+                trainingTask.setType(null);
+                trainingTask.setOrgName(org.getName());
+                trainingTask.setOrgPath(org.getPath());
+                trainingTask.setStatus(EduTrainingDoStatus.UN_START.getCode());
+                trainingTask.setPdfUrl(null);
+                trainingTask.setCreateTime(new Date());
+                trainingTask.setUpdateTime(new Date());
+                taskList.add(trainingTask);
+                for (CoreEduTrainingPlanToRole planToRole : planRoleList) {
+                    CoreEduTrainingTaskToRole coreEduTrainingTaskToRole = new CoreEduTrainingTaskToRole();
+                    coreEduTrainingTaskToRole.setEduTrainingTaskId(trainingTask.getId());
+                    coreEduTrainingTaskToRole.setRoleId(planToRole.getRoleId());
+                    coreEduTrainingTaskToRole.setRoleName(planToRole.getRoleName());
+                    taskRoleList.add(coreEduTrainingTaskToRole);
+                }
+            }
+
+
+        }
+        if (ObjectUtil.isNotEmpty(taskList)) {
+            this.saveBatch(taskList);
         }
-        if (ObjectUtil.isNotEmpty(list)) {
-            this.saveBatch(list);
+        if (ObjectUtil.isNotEmpty(taskRoleList)) {
+            coreEduTrainingTaskToRoleService.saveBatch(taskRoleList);
         }
     }
 }

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>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -5,27 +5,22 @@
 <mapper namespace="com.xunmei.core.edu.mapper.CoreEduTrainingTaskMapper">
     <resultMap type="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask" id="CoreEduTrainingTaskResult">
         <result property="id" column="id"/>
+        <result property="planCycle" column="plan_cycle"/>
         <result property="planId" column="plan_id"/>
-        <result property="roleId" column="role_id"/>
-        <result property="startDate" column="start_date"/>
-        <result property="endDate" column="end_date"/>
-        <result property="actualCount" column="actual_count"/>
-        <result property="content" column="content"/>
-        <result property="roleName" column="role_name"/>
-        <result property="roleIds" column="role_ids"/>
-        <result property="roleNames" column="role_names"/>
+        <result property="orgId" column="org_id"/>
+        <result property="orgName" column="org_name"/>
+        <result property="orgPath" column="org_path"/>
         <result property="title" column="title"/>
+        <result property="type" column="type"/>
+        <result property="status" column="status"/>
+        <result property="content" column="content"/>
         <result property="note" column="note"/>
-        <result property="dateTime" column="date_time"/>
-        <result property="dueCount" column="due_count"/>
         <result property="hostId" column="host_id"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="dateTime" column="date_time"/>
         <result property="fileList" column="file_list"/>
         <result property="imageList" column="image_list"/>
-        <result property="orgId" column="org_id"/>
-        <result property="recorderId" column="recorder_id"/>
-        <result property="type" column="type"/>
-        <result property="orgName" column="org_name"/>
-        <result property="orgPath" column="org_path"/>
         <result property="pdfUrl" column="pdf_url"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -35,27 +30,22 @@
 
     <sql id="selectCoreEduTrainingTaskVo">
         select id,
+               plan_cycle,
                plan_id,
-               role_id,
-               start_date,
-               end_date,
-               actual_count,
-               content,
-               role_name,
-               role_ids,
-               role_names,
+               org_id,
+               org_name,
+               org_path,
                title,
+               type,
+               status,
+               content,
                note,
-               date_time,
-               due_count,
                host_id,
+               start_date,
+               end_date,
+               date_time,
                file_list,
                image_list,
-               org_id,
-               recorder_id,
-               type,
-               org_name,
-               org_path,
                pdf_url,
                create_by,
                create_time,
@@ -64,377 +54,14 @@
         from core_edu_training_task
     </sql>
 
-    <select id="selectCoreEduTrainingTaskList"
-            parameterType="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask"
-            resultMap="CoreEduTrainingTaskResult">
-        <include refid="selectCoreEduTrainingTaskVo"/>
-        <where>
-            <if test="planId != null ">
-                and plan_id = #{planId}
-            </if>
-            <if test="roleId != null ">
-                and role_id = #{roleId}
-            </if>
-            <if test="startDate != null ">
-                and start_date = #{startDate}
-            </if>
-            <if test="endDate != null ">
-                and end_date = #{endDate}
-            </if>
-            <if test="actualCount != null ">
-                and actual_count = #{actualCount}
-            </if>
-            <if test="content != null  and content != ''">
-                and content = #{content}
-            </if>
-            <if test="roleName != null  and roleName != ''">
-                and role_name like concat('%', #{roleName}, '%')
-            </if>
-            <if test="roleIds != null  and roleIds != ''">
-                and role_ids = #{roleIds}
-            </if>
-            <if test="roleNames != null  and roleNames != ''">
-                and role_names = #{roleNames}
-            </if>
-            <if test="title != null  and title != ''">
-                and title = #{title}
-            </if>
-            <if test="note != null  and note != ''">
-                and note = #{note}
-            </if>
-            <if test="dateTime != null ">
-                and date_time = #{dateTime}
-            </if>
-            <if test="dueCount != null ">
-                and due_count = #{dueCount}
-            </if>
-            <if test="hostId != null ">
-                and host_id = #{hostId}
-            </if>
-            <if test="fileList != null  and fileList != ''">
-                and file_list = #{fileList}
-            </if>
-            <if test="imageList != null  and imageList != ''">
-                and image_list = #{imageList}
-            </if>
-            <if test="orgId != null ">
-                and org_id = #{orgId}
-            </if>
-            <if test="recorderId != null ">
-                and recorder_id = #{recorderId}
-            </if>
-            <if test="type != null ">
-                and type = #{type}
-            </if>
-            <if test="orgName != null  and orgName != ''">
-                and org_name like concat('%', #{orgName}, '%')
-            </if>
-            <if test="orgPath != null  and orgPath != ''">
-                and org_path = #{orgPath}
-            </if>
-            <if test="pdfUrl != null  and pdfUrl != ''">
-                and pdf_url = #{pdfUrl}
-            </if>
-        </where>
+    <select id="checkHasTaskIsDone" resultType="java.lang.Integer">
+        select 1 from core_edu_training_task where status !=0 and plan_id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        limit 1
     </select>
 
-    <select id="selectCoreEduTrainingTaskById" parameterType="Long"
-            resultMap="CoreEduTrainingTaskResult">
-        <include refid="selectCoreEduTrainingTaskVo"/>
-        where id = #{id}
+    <select id="selectPageData" resultType="com.xunmei.common.core.domain.edu.vo.CoreEduTrainingTaskPageVo">
     </select>
-
-    <insert id="insertCoreEduTrainingTask" parameterType="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask">
-        insert into core_edu_training_task
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="planId != null">
-                plan_id,
-            </if>
-            <if test="roleId != null">
-                role_id,
-            </if>
-            <if test="startDate != null">
-                start_date,
-            </if>
-            <if test="endDate != null">
-                end_date,
-            </if>
-            <if test="actualCount != null">
-                actual_count,
-            </if>
-            <if test="content != null">
-                content,
-            </if>
-            <if test="roleName != null">
-                role_name,
-            </if>
-            <if test="roleIds != null">
-                role_ids,
-            </if>
-            <if test="roleNames != null">
-                role_names,
-            </if>
-            <if test="title != null">
-                title,
-            </if>
-            <if test="note != null">
-                note,
-            </if>
-            <if test="dateTime != null">
-                date_time,
-            </if>
-            <if test="dueCount != null">
-                due_count,
-            </if>
-            <if test="hostId != null">
-                host_id,
-            </if>
-            <if test="fileList != null">
-                file_list,
-            </if>
-            <if test="imageList != null">
-                image_list,
-            </if>
-            <if test="orgId != null">
-                org_id,
-            </if>
-            <if test="recorderId != null">
-                recorder_id,
-            </if>
-            <if test="type != null">
-                type,
-            </if>
-            <if test="orgName != null">
-                org_name,
-            </if>
-            <if test="orgPath != null">
-                org_path,
-            </if>
-            <if test="pdfUrl != null">
-                pdf_url,
-            </if>
-            <if test="createBy != null">
-                create_by,
-            </if>
-            <if test="createTime != null">
-                create_time,
-            </if>
-            <if test="updateBy != null">
-                update_by,
-            </if>
-            <if test="updateTime != null">
-                update_time,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id},
-            </if>
-            <if test="planId != null">
-                #{planId},
-            </if>
-            <if test="roleId != null">
-                #{roleId},
-            </if>
-            <if test="startDate != null">
-                #{startDate},
-            </if>
-            <if test="endDate != null">
-                #{endDate},
-            </if>
-            <if test="actualCount != null">
-                #{actualCount},
-            </if>
-            <if test="content != null">
-                #{content},
-            </if>
-            <if test="roleName != null">
-                #{roleName},
-            </if>
-            <if test="roleIds != null">
-                #{roleIds},
-            </if>
-            <if test="roleNames != null">
-                #{roleNames},
-            </if>
-            <if test="title != null">
-                #{title},
-            </if>
-            <if test="note != null">
-                #{note},
-            </if>
-            <if test="dateTime != null">
-                #{dateTime},
-            </if>
-            <if test="dueCount != null">
-                #{dueCount},
-            </if>
-            <if test="hostId != null">
-                #{hostId},
-            </if>
-            <if test="fileList != null">
-                #{fileList},
-            </if>
-            <if test="imageList != null">
-                #{imageList},
-            </if>
-            <if test="orgId != null">
-                #{orgId},
-            </if>
-            <if test="recorderId != null">
-                #{recorderId},
-            </if>
-            <if test="type != null">
-                #{type},
-            </if>
-            <if test="orgName != null">
-                #{orgName},
-            </if>
-            <if test="orgPath != null">
-                #{orgPath},
-            </if>
-            <if test="pdfUrl != null">
-                #{pdfUrl},
-            </if>
-            <if test="createBy != null">
-                #{createBy},
-            </if>
-            <if test="createTime != null">
-                #{createTime},
-            </if>
-            <if test="updateBy != null">
-                #{updateBy},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime},
-            </if>
-        </trim>
-    </insert>
-
-    <update id="updateCoreEduTrainingTask" parameterType="com.xunmei.common.core.domain.edu.domain.CoreEduTrainingTask">
-        update core_edu_training_task
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="planId != null">
-                plan_id =
-                #{planId},
-            </if>
-            <if test="roleId != null">
-                role_id =
-                #{roleId},
-            </if>
-            <if test="startDate != null">
-                start_date =
-                #{startDate},
-            </if>
-            <if test="endDate != null">
-                end_date =
-                #{endDate},
-            </if>
-            <if test="actualCount != null">
-                actual_count =
-                #{actualCount},
-            </if>
-            <if test="content != null">
-                content =
-                #{content},
-            </if>
-            <if test="roleName != null">
-                role_name =
-                #{roleName},
-            </if>
-            <if test="roleIds != null">
-                role_ids =
-                #{roleIds},
-            </if>
-            <if test="roleNames != null">
-                role_names =
-                #{roleNames},
-            </if>
-            <if test="title != null">
-                title =
-                #{title},
-            </if>
-            <if test="note != null">
-                note =
-                #{note},
-            </if>
-            <if test="dateTime != null">
-                date_time =
-                #{dateTime},
-            </if>
-            <if test="dueCount != null">
-                due_count =
-                #{dueCount},
-            </if>
-            <if test="hostId != null">
-                host_id =
-                #{hostId},
-            </if>
-            <if test="fileList != null">
-                file_list =
-                #{fileList},
-            </if>
-            <if test="imageList != null">
-                image_list =
-                #{imageList},
-            </if>
-            <if test="orgId != null">
-                org_id =
-                #{orgId},
-            </if>
-            <if test="recorderId != null">
-                recorder_id =
-                #{recorderId},
-            </if>
-            <if test="type != null">
-                type =
-                #{type},
-            </if>
-            <if test="orgName != null">
-                org_name =
-                #{orgName},
-            </if>
-            <if test="orgPath != null">
-                org_path =
-                #{orgPath},
-            </if>
-            <if test="pdfUrl != null">
-                pdf_url =
-                #{pdfUrl},
-            </if>
-            <if test="createBy != null">
-                create_by =
-                #{createBy},
-            </if>
-            <if test="createTime != null">
-                create_time =
-                #{createTime},
-            </if>
-            <if test="updateBy != null">
-                update_by =
-                #{updateBy},
-            </if>
-            <if test="updateTime != null">
-                update_time =
-                #{updateTime},
-            </if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCoreEduTrainingTaskById" parameterType="Long">
-        delete
-        from core_edu_training_task
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteCoreEduTrainingTaskByIds" parameterType="String">
-        delete from core_edu_training_task where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
 </mapper>