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

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysRole.java

@@ -23,7 +23,10 @@ public class SysRole extends BaseEntity
 
     /**角色id */
     private Long id;
-
+    /**
+     * 机构类型
+     */
+    private String orgType;
     /**角色名字*/
     private String roleName;
 

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

@@ -0,0 +1,91 @@
+package com.xunmei.core.access.controller;
+
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
+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-29
+ */
+@Api(tags = {"CoreMonitoringTaskMonitorInfo"})
+@RestController
+@RequestMapping("/info")
+public class CoreMonitoringTaskMonitorInfoController extends BaseController {
+    @Autowired
+    private ICoreMonitoringTaskMonitorInfoService coreMonitoringTaskMonitorInfoService;
+
+    /**
+     * 查询调阅任务登记检查情况列表
+     */
+    @ApiOperation(value = "查询CoreMonitoringTaskMonitorInfo列表")
+    @RequiresPermissions("system:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<CoreMonitoringTaskMonitorInfo> list(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+        return null;
+        //  return coreMonitoringTaskMonitorInfoService.selectPage( coreMonitoringTaskMonitorInfo);
+    }
+
+
+    /**
+     * 获取调阅任务登记检查情况详细信息
+     */
+    @ApiOperation(value = "获取CoreMonitoringTaskMonitorInfo详细信息")
+    @RequiresPermissions("system:info:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(coreMonitoringTaskMonitorInfoService.selectCoreMonitoringTaskMonitorInfoById(id));
+    }
+
+    /**
+     * 新增调阅任务登记检查情况
+     */
+    @ApiOperation(value = "新增CoreMonitoringTaskMonitorInfo")
+    @RequiresPermissions("system:info:add")
+    @Log(title = "调阅任务登记检查情况", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+        return toAjax(coreMonitoringTaskMonitorInfoService.insertCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
+    }
+
+    /**
+     * 修改调阅任务登记检查情况
+     */
+    @ApiOperation(value = "修改CoreMonitoringTaskMonitorInfo")
+    @RequiresPermissions("system:info:edit")
+    @Log(title = "调阅任务登记检查情况", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+        return toAjax(coreMonitoringTaskMonitorInfoService.updateCoreMonitoringTaskMonitorInfo(coreMonitoringTaskMonitorInfo));
+    }
+
+    /**
+     * 删除调阅任务登记检查情况
+     */
+    @ApiOperation(value = "删除CoreMonitoringTaskMonitorInfo")
+    @RequiresPermissions("system:info:remove")
+    @Log(title = "调阅任务登记检查情况", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(coreMonitoringTaskMonitorInfoService.deleteCoreMonitoringTaskMonitorInfoByIds(ids));
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.xunmei.core.access.controller;
+
+import com.xunmei.common.core.web.controller.BaseController;
+import com.xunmei.common.core.web.domain.AjaxResult;
+import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+
+/**
+ * 调阅任务登记监控Controller
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+@Api(tags = {"CoreMonitoringTaskRegistrationMonitor" })
+@RestController
+@RequestMapping("/monitor")
+public class CoreMonitoringTaskRegistrationMonitorController extends BaseController {
+    @Autowired
+    private ICoreMonitoringTaskRegistrationMonitorService coreMonitoringTaskRegistrationMonitorService;
+
+/**
+ * 查询调阅任务登记监控列表
+ */
+@ApiOperation(value = "查询CoreMonitoringTaskRegistrationMonitor列表")
+@RequiresPermissions("system:monitor:list")
+@GetMapping("/list")
+    public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> list(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+
+      //  return coreMonitoringTaskRegistrationMonitorService.selectPage( coreMonitoringTaskRegistrationMonitor);
+   return  null;
+    }
+
+
+
+    /**
+     * 获取调阅任务登记监控详细信息
+     */
+    @ApiOperation(value = "获取CoreMonitoringTaskRegistrationMonitor详细信息")
+    @RequiresPermissions("system:monitor:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(coreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationMonitorById(id));
+    }
+
+    /**
+     * 新增调阅任务登记监控
+     */
+    @ApiOperation(value = "新增CoreMonitoringTaskRegistrationMonitor")
+    @RequiresPermissions("system:monitor:add")
+    @Log(title = "调阅任务登记监控" , businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+        return toAjax(coreMonitoringTaskRegistrationMonitorService.insertCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskRegistrationMonitor));
+    }
+
+    /**
+     * 修改调阅任务登记监控
+     */
+    @ApiOperation(value = "修改CoreMonitoringTaskRegistrationMonitor")
+    @RequiresPermissions("system:monitor:edit")
+    @Log(title = "调阅任务登记监控" , businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+        return toAjax(coreMonitoringTaskRegistrationMonitorService.updateCoreMonitoringTaskRegistrationMonitor(coreMonitoringTaskRegistrationMonitor));
+    }
+
+    /**
+     * 删除调阅任务登记监控
+     */
+    @ApiOperation(value = "删除CoreMonitoringTaskRegistrationMonitor")
+    @RequiresPermissions("system:monitor:remove")
+    @Log(title = "调阅任务登记监控" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(coreMonitoringTaskRegistrationMonitorService.deleteCoreMonitoringTaskRegistrationMonitorByIds(ids));
+    }
+}

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

@@ -0,0 +1,88 @@
+package com.xunmei.core.access.domain;
+
+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_monitor_info
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_monitoring_task_monitor_info")
+@ApiModel(value = "CoreMonitoringTaskMonitorInfo对象" , description = "调阅任务登记检查情况")
+public class CoreMonitoringTaskMonitorInfo extends BaseEntity
+        {
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 监控id */
+            @ApiModelProperty(value = "监控id")
+    private Long taskMonitorId;
+
+    /** 项目 */
+            @ApiModelProperty(value = "项目")
+    private String project;
+
+    /** 情况 */
+            @ApiModelProperty(value = "情况")
+    private String situation;
+
+    /** 异常说明 */
+            @ApiModelProperty(value = "异常说明")
+    private String abnormalIllustrate;
+
+    /** 0未2已删 */
+    private String delFlag;
+
+                                                                                                                                                                                                                                                                                                                                                                                                                                                
+@Override
+public String toString(){
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id" ,getId())
+
+
+                .append("taskMonitorId" ,getTaskMonitorId())
+
+
+                .append("project" ,getProject())
+
+
+                .append("situation" ,getSituation())
+
+
+                .append("abnormalIllustrate" ,getAbnormalIllustrate())
+
+
+                .append("createTime" ,getCreateTime())
+
+
+                .append("createBy" ,getCreateBy())
+
+
+                .append("updateTime" ,getUpdateTime())
+
+
+                .append("updateBy" ,getUpdateBy())
+
+
+                .append("delFlag" ,getDelFlag())
+        .toString();
+        }
+        }

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

@@ -0,0 +1,81 @@
+package com.xunmei.core.access.domain;
+
+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_monitor
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("core_monitoring_task_registration_monitor")
+@ApiModel(value = "CoreMonitoringTaskRegistrationMonitor对象" , description = "调阅任务登记监控")
+public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity
+        {
+private static final long serialVersionUID=1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 调阅任务扫描主键 */
+            @ApiModelProperty(value = "调阅任务扫描主键")
+    private Long taskRegistrationId;
+
+    /** 监控主机id */
+            @ApiModelProperty(value = "监控主机id")
+    private Long host;
+
+    /** 视频通道 */
+            @ApiModelProperty(value = "视频通道")
+    private String videoChannel;
+
+    /** 0未删除2已删除 */
+    private String delFlag;
+
+                                                                                                                                                                                                                                                                                                                                                                        
+@Override
+public String toString(){
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+
+                .append("id" ,getId())
+
+
+                .append("taskRegistrationId" ,getTaskRegistrationId())
+
+
+                .append("host" ,getHost())
+
+
+                .append("videoChannel" ,getVideoChannel())
+
+
+                .append("createTime" ,getCreateTime())
+
+
+                .append("createBy" ,getCreateBy())
+
+
+                .append("updateTime" ,getUpdateTime())
+
+
+                .append("updateBy" ,getUpdateBy())
+
+
+                .append("delFlag" ,getDelFlag())
+        .toString();
+        }
+        }

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

@@ -0,0 +1,63 @@
+package com.xunmei.core.access.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+
+import java.util.List;
+
+/**
+ * 调阅任务登记检查情况Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+public interface CoreMonitoringTaskMonitorInfoMapper extends BaseMapper<CoreMonitoringTaskMonitorInfo> {
+    /**
+     * 查询调阅任务登记检查情况
+     *
+     * @param id 调阅任务登记检查情况主键
+     * @return 调阅任务登记检查情况
+     */
+    CoreMonitoringTaskMonitorInfo selectCoreMonitoringTaskMonitorInfoById(Long id);
+
+    /**
+     * 查询调阅任务登记检查情况列表
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 调阅任务登记检查情况集合
+     */
+    List<CoreMonitoringTaskMonitorInfo> selectCoreMonitoringTaskMonitorInfoList(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
+    /**
+     * 新增调阅任务登记检查情况
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 结果
+     */
+    int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
+    /**
+     * 修改调阅任务登记检查情况
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 结果
+     */
+    int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
+    /**
+     * 删除调阅任务登记检查情况
+     *
+     * @param id 调阅任务登记检查情况主键
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskMonitorInfoById(Long id);
+
+    /**
+     * 批量删除调阅任务登记检查情况
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskMonitorInfoByIds(Long[] ids);
+}

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

@@ -0,0 +1,79 @@
+package com.xunmei.core.access.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+
+import java.util.List;
+
+/**
+ * 调阅任务登记监控Mapper接口
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<CoreMonitoringTaskRegistrationMonitor> {
+    /**
+     * 查询调阅任务登记监控
+     *
+     * @param id 调阅任务登记监控主键
+     * @return 调阅任务登记监控
+     */
+    CoreMonitoringTaskRegistrationMonitor selectCoreMonitoringTaskRegistrationMonitorById(String id);
+
+    /**
+     * 查询调阅任务登记监控列表
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 调阅任务登记监控集合
+     */
+    List<CoreMonitoringTaskRegistrationMonitor> selectCoreMonitoringTaskRegistrationMonitorList(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+
+    /**
+     * 新增调阅任务登记监控
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 结果
+     */
+    int insertCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+
+    /**
+     * 修改调阅任务登记监控
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 结果
+     */
+    int updateCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+
+    /**
+     * 删除调阅任务登记监控
+     *
+     * @param id 调阅任务登记监控主键
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationMonitorById(String id);
+
+    /**
+     * 批量删除调阅任务登记监控
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationMonitorByIds(String[] ids);
+
+    /**
+     * 查询任务与开始时间
+     * @param taskId
+     * @return
+     */
+    CoreMonitoringTaskRegistrationVO selectTaskName(Long taskId);
+
+    /**
+     * 查询监控集合根据任务调阅任务登记扫描表id
+     * @param taskRegistrationId
+     * @return
+     */
+ List<CoreMonitoringTaskRegistrationMonitorVO>    selectMonitorByTaskRegistrationId(Long taskRegistrationId);
+}

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

@@ -0,0 +1,72 @@
+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.CoreMonitoringTaskMonitorInfo;
+
+import java.util.List;
+
+/**
+ * 调阅任务登记检查情况Service接口
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+public interface ICoreMonitoringTaskMonitorInfoService extends IService<CoreMonitoringTaskMonitorInfo> {
+    /**
+     * 查询调阅任务登记检查情况
+     *
+     * @param id 调阅任务登记检查情况主键
+     * @return 调阅任务登记检查情况
+     */
+     CoreMonitoringTaskMonitorInfo selectCoreMonitoringTaskMonitorInfoById(Long id);
+
+    /**
+     * 查询调阅任务登记检查情况列表
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 调阅任务登记检查情况集合
+     */
+    List<CoreMonitoringTaskMonitorInfo> selectCoreMonitoringTaskMonitorInfoList(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
+    /**
+     * 新增调阅任务登记检查情况
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 结果
+     */
+    int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
+    /**
+     * 修改调阅任务登记检查情况
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 结果
+     */
+    int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+
+    /**
+     * 批量删除调阅任务登记检查情况
+     *
+     * @param ids 需要删除的调阅任务登记检查情况主键集合
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskMonitorInfoByIds(Long[] ids);
+
+    /**
+     * 删除调阅任务登记检查情况信息
+     *
+     * @param id 调阅任务登记检查情况主键
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskMonitorInfoById(Long id);
+
+    /**
+     * 查询调阅任务登记检查情况分页数据
+     *
+     * @param coreMonitoringTaskMonitorInfo 查询条件对象
+     * @return Page
+     */
+  //  TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo);
+}

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

@@ -0,0 +1,74 @@
+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.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+
+import java.util.List;
+
+/**
+ * 调阅任务登记监控Service接口
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<CoreMonitoringTaskRegistrationMonitor> {
+    /**
+     * 查询调阅任务登记监控
+     *
+     * @param id 调阅任务登记监控主键
+     * @return 调阅任务登记监控
+     */
+     CoreMonitoringTaskRegistrationMonitor selectCoreMonitoringTaskRegistrationMonitorById(String id);
+
+    /**
+     * 查询调阅任务登记监控列表
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 调阅任务登记监控集合
+     */
+    List<CoreMonitoringTaskRegistrationMonitor> selectCoreMonitoringTaskRegistrationMonitorList(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+
+    /**
+     * 新增调阅任务登记监控
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 结果
+     */
+    int insertCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+
+    /**
+     * 修改调阅任务登记监控
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 结果
+     */
+    int updateCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+
+    /**
+     * 批量删除调阅任务登记监控
+     *
+     * @param ids 需要删除的调阅任务登记监控主键集合
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationMonitorByIds(String[] ids);
+
+    /**
+     * 删除调阅任务登记监控信息
+     *
+     * @param id 调阅任务登记监控主键
+     * @return 结果
+     */
+    int deleteCoreMonitoringTaskRegistrationMonitorById(String id);
+
+    /**
+     * 查询调阅任务登记监控数据
+     *
+     * @param taskId
+     * @return CoreMonitoringTaskRegistrationVO
+     */
+
+    CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId);
+}

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

@@ -0,0 +1,130 @@
+package com.xunmei.core.access.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
+import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+
+/**
+ * 调阅任务登记检查情况Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+@Service
+public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMonitoringTaskMonitorInfoMapper, CoreMonitoringTaskMonitorInfo> implements ICoreMonitoringTaskMonitorInfoService {
+    @Autowired
+    private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
+
+
+/*    @Override
+    public TableDataInfo<CoreMonitoringTaskMonitorInfo> selectPage(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+        //未删除
+        coreMonitoringTaskMonitorInfo.setDeleted(0L);
+        Page<CoreMonitoringTaskMonitorInfo> page;
+        //分页
+        if (coreMonitoringTaskMonitorInfo.getPageNum()!=null&&coreMonitoringTaskMonitorInfo.getPageSize()!=null)
+        {
+            page = new Page<>(coreMonitoringTaskMonitorInfo.getPageNum(), coreMonitoringTaskMonitorInfo.getPageSize());
+        }else{
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<CoreMonitoringTaskMonitorInfo> query = new QueryWrapper<>(coreMonitoringTaskMonitorInfo);
+        //下穿
+        if (coreMonitoringTaskMonitorInfo.getCheckSub()){
+            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskMonitorInfo.getOrgId());
+            //清空前端传递的org_id
+            coreMonitoringTaskMonitorInfo.setOrgId(null);
+            //添加in条件
+            query.in("org_id",ids);
+        }
+        //时间范围查询
+        if (coreMonitoringTaskMonitorInfo.getParams().get("beginTime")!=null&&coreMonitoringTaskMonitorInfo.getParams().get("endTime")!=null){
+            query.between("create_time", coreMonitoringTaskMonitorInfo.getParams().get("beginTime"), coreMonitoringTaskMonitorInfo.getParams().get("endTime"));
+        }
+        //获取数据
+        page = coreMonitoringTaskMonitorInfoMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+    }*/
+
+
+    /**
+     * 查询调阅任务登记检查情况
+     *
+     * @param id 调阅任务登记检查情况主键
+     * @return 调阅任务登记检查情况
+     */
+    @Override
+    public CoreMonitoringTaskMonitorInfo selectCoreMonitoringTaskMonitorInfoById(Long id) {
+        return coreMonitoringTaskMonitorInfoMapper.selectById(id);
+    }
+
+    /**
+     * 查询调阅任务登记检查情况列表
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 调阅任务登记检查情况
+     */
+    @Override
+    public List<CoreMonitoringTaskMonitorInfo> selectCoreMonitoringTaskMonitorInfoList(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+        return coreMonitoringTaskMonitorInfoMapper.selectList(new QueryWrapper<>(coreMonitoringTaskMonitorInfo));
+    }
+
+    /**
+     * 新增调阅任务登记检查情况
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 结果
+     */
+    @Override
+    public int insertCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+                coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
+            return coreMonitoringTaskMonitorInfoMapper.insert(coreMonitoringTaskMonitorInfo);
+    }
+
+    /**
+     * 修改调阅任务登记检查情况
+     *
+     * @param coreMonitoringTaskMonitorInfo 调阅任务登记检查情况
+     * @return 结果
+     */
+    @Override
+    public int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskMonitorInfo coreMonitoringTaskMonitorInfo) {
+                coreMonitoringTaskMonitorInfo.setUpdateTime(DateUtils.getNowDate());
+        return coreMonitoringTaskMonitorInfoMapper.updateById(coreMonitoringTaskMonitorInfo);
+    }
+
+    /**
+     * 批量删除调阅任务登记检查情况
+     *
+     * @param ids 需要删除的调阅任务登记检查情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskMonitorInfoByIds(Long[] ids) {
+        return coreMonitoringTaskMonitorInfoMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除调阅任务登记检查情况信息
+     *
+     * @param id 调阅任务登记检查情况主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskMonitorInfoById(Long id) {
+        return coreMonitoringTaskMonitorInfoMapper.deleteById(id);
+    }
+}

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

@@ -0,0 +1,146 @@
+package com.xunmei.core.access.service.impl;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMonitorMapper;
+import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
+import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.web.page.TableDataInfo;
+
+
+/**
+ * 调阅任务登记监控Service业务层处理
+ *
+ * @author xunmei
+ * @date 2023-08-29
+ */
+@Service
+public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMonitorMapper, CoreMonitoringTaskRegistrationMonitor> implements ICoreMonitoringTaskRegistrationMonitorService {
+    @Autowired
+    private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
+
+
+/*    @Override
+    public TableDataInfo<CoreMonitoringTaskRegistrationMonitor> selectPage(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+        //未删除
+        coreMonitoringTaskRegistrationMonitor.setDeleted(0L);
+        Page<CoreMonitoringTaskRegistrationMonitor> page;
+        //分页
+        if (coreMonitoringTaskRegistrationMonitor.getPageNum()!=null&&coreMonitoringTaskRegistrationMonitor.getPageSize()!=null)
+        {
+            page = new Page<>(coreMonitoringTaskRegistrationMonitor.getPageNum(), coreMonitoringTaskRegistrationMonitor.getPageSize());
+        }else{
+            page = new Page<>();
+        }
+        //查询条件
+        QueryWrapper<CoreMonitoringTaskRegistrationMonitor> query = new QueryWrapper<>(coreMonitoringTaskRegistrationMonitor);
+        //下穿
+        if (coreMonitoringTaskRegistrationMonitor.getCheckSub()){
+            List<Long> ids = orgService.selectCheckSubOrgIdList(coreMonitoringTaskRegistrationMonitor.getOrgId());
+            //清空前端传递的org_id
+            coreMonitoringTaskRegistrationMonitor.setOrgId(null);
+            //添加in条件
+            query.in("org_id",ids);
+        }
+        //时间范围查询
+        if (coreMonitoringTaskRegistrationMonitor.getParams().get("beginTime")!=null&&coreMonitoringTaskRegistrationMonitor.getParams().get("endTime")!=null){
+            query.between("create_time", coreMonitoringTaskRegistrationMonitor.getParams().get("beginTime"), coreMonitoringTaskRegistrationMonitor.getParams().get("endTime"));
+        }
+        //获取数据
+        page = coreMonitoringTaskRegistrationMonitorMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
+        return TableDataInfo.build(page);
+    }*/
+
+
+    /**
+     * 查询调阅任务登记监控
+     *
+     * @param id 调阅任务登记监控主键
+     * @return 调阅任务登记监控
+     */
+    @Override
+    public CoreMonitoringTaskRegistrationMonitor selectCoreMonitoringTaskRegistrationMonitorById(String id) {
+        return coreMonitoringTaskRegistrationMonitorMapper.selectById(id);
+    }
+
+    /**
+     * 查询调阅任务登记监控列表
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 调阅任务登记监控
+     */
+    @Override
+    public List<CoreMonitoringTaskRegistrationMonitor> selectCoreMonitoringTaskRegistrationMonitorList(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+        return coreMonitoringTaskRegistrationMonitorMapper.selectList(new QueryWrapper<>(coreMonitoringTaskRegistrationMonitor));
+    }
+
+    /**
+     * 新增调阅任务登记监控
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 结果
+     */
+    @Override
+    public int insertCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+                coreMonitoringTaskRegistrationMonitor.setCreateTime(DateUtils.getNowDate());
+            return coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskRegistrationMonitor);
+    }
+
+    /**
+     * 修改调阅任务登记监控
+     *
+     * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
+     * @return 结果
+     */
+    @Override
+    public int updateCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
+                coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
+        return coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
+    }
+
+    /**
+     * 批量删除调阅任务登记监控
+     *
+     * @param ids 需要删除的调阅任务登记监控主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskRegistrationMonitorByIds(String[] ids) {
+        return coreMonitoringTaskRegistrationMonitorMapper.deleteBatchIds(Arrays.asList((ids)));
+    }
+
+    /**
+     * 删除调阅任务登记监控信息
+     *
+     * @param id 调阅任务登记监控主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCoreMonitoringTaskRegistrationMonitorById(String id) {
+        return coreMonitoringTaskRegistrationMonitorMapper.deleteById(id);
+    }
+
+    @Override
+    public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId) {
+       // CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO=new CoreMonitoringTaskRegistrationVO();
+        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = coreMonitoringTaskRegistrationMonitorMapper.selectTaskName(taskId);
+       if (null!=coreMonitoringTaskRegistrationVO){
+           List<CoreMonitoringTaskRegistrationMonitorVO> coreMonitoringTaskRegistrationMonitorVOS = coreMonitoringTaskRegistrationMonitorMapper.selectMonitorByTaskRegistrationId(coreMonitoringTaskRegistrationVO.getId());
+
+
+       }
+
+
+        return null;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.xunmei.core.access.vo;
+
+import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/8/29
+ */
+@Data
+public class CoreMonitoringTaskRegistrationMonitorVO extends CoreMonitoringTaskRegistrationMonitor {
+    private String hostName;
+    private String videoChannelName;
+    private List<CoreMonitoringTaskMonitorInfo>coreMonitoringTaskMonitorInfoList;
+}

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

@@ -3,6 +3,8 @@ package com.xunmei.core.access.vo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author :LuoWei
  * @date : 2023/8/28
@@ -10,4 +12,5 @@ import lombok.Data;
 @Data
 public class CoreMonitoringTaskRegistrationVO extends CoreMonitoringTaskRegistration {
     private String taskName;
+    private List<CoreMonitoringTaskRegistrationMonitorVO>coreMonitoringTaskRegistrationMonitorVOList;
 }

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

@@ -352,7 +352,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
     }
 
     private AppPlan convertToAppPlan(AppPlanVo app) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
         AppPlan plan = new AppPlan();
         plan.setCheckType(app.getExecType());
         plan.setCheckOrgType(app.getOrgType());
@@ -361,8 +361,8 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             plan.setCreateTime(time);
         }
         plan.setUpdateTime(time);
-        plan.setModifiedName(loginUser.getUsername());
-        plan.setModifiedBy(loginUser.getUserid());
+        plan.setModifiedName(SecurityUtils.getUsername());
+        plan.setModifiedBy(SecurityUtils.getUserId());
         plan.setExecOrgType(app.getOrgType());
         plan.setExecType(app.getExecType());
 

soc-modules/soc-modules-core/src/main/resources/mapper/access/CoreMonitoringTaskMonitorInfoMapper.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.mapper.CoreMonitoringTaskMonitorInfoMapper">
+
+    <resultMap type="com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo" id="CoreMonitoringTaskMonitorInfoResult">
+                <result property="id" column="id"/>
+                <result property="taskMonitorId" column="task_monitor_id"/>
+                <result property="project" column="project"/>
+                <result property="situation" column="situation"/>
+                <result property="abnormalIllustrate" column="abnormal_illustrate"/>
+                <result property="createTime" column="create_time"/>
+                <result property="createBy" column="create_by"/>
+                <result property="updateTime" column="update_time"/>
+                <result property="updateBy" column="update_by"/>
+                <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <sql id="selectCoreMonitoringTaskMonitorInfoVo">
+        select id, task_monitor_id, project, situation, abnormal_illustrate, create_time, create_by, update_time, update_by, del_flag
+        from core_monitoring_task_monitor_info
+    </sql>
+
+    <select id="selectCoreMonitoringTaskMonitorInfoList" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo"
+            resultMap="CoreMonitoringTaskMonitorInfoResult">
+        <include refid="selectCoreMonitoringTaskMonitorInfoVo"/>
+        <where>
+                        <if test="taskMonitorId != null ">
+                            and task_monitor_id = #{taskMonitorId}
+                        </if>
+                        <if test="project != null  and project != ''">
+                            and project = #{project}
+                        </if>
+                        <if test="situation != null  and situation != ''">
+                            and situation = #{situation}
+                        </if>
+                        <if test="abnormalIllustrate != null  and abnormalIllustrate != ''">
+                            and abnormal_illustrate = #{abnormalIllustrate}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectCoreMonitoringTaskMonitorInfoById" parameterType="Long"
+            resultMap="CoreMonitoringTaskMonitorInfoResult">
+            <include refid="selectCoreMonitoringTaskMonitorInfoVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertCoreMonitoringTaskMonitorInfo" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo">
+        insert into core_monitoring_task_monitor_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,
+                    </if>
+                    <if test="taskMonitorId != null">task_monitor_id,
+                    </if>
+                    <if test="project != null">project,
+                    </if>
+                    <if test="situation != null">situation,
+                    </if>
+                    <if test="abnormalIllustrate != null">abnormal_illustrate,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="delFlag != null">del_flag,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="taskMonitorId != null">#{taskMonitorId},
+                    </if>
+                    <if test="project != null">#{project},
+                    </if>
+                    <if test="situation != null">#{situation},
+                    </if>
+                    <if test="abnormalIllustrate != null">#{abnormalIllustrate},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="delFlag != null">#{delFlag},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreMonitoringTaskMonitorInfo" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo">
+        update core_monitoring_task_monitor_info
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="taskMonitorId != null">task_monitor_id =
+                        #{taskMonitorId},
+                    </if>
+                    <if test="project != null">project =
+                        #{project},
+                    </if>
+                    <if test="situation != null">situation =
+                        #{situation},
+                    </if>
+                    <if test="abnormalIllustrate != null">abnormal_illustrate =
+                        #{abnormalIllustrate},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="delFlag != null">del_flag =
+                        #{delFlag},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreMonitoringTaskMonitorInfoById" parameterType="Long">
+        delete
+        from core_monitoring_task_monitor_info where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreMonitoringTaskMonitorInfoByIds" parameterType="String">
+        delete from core_monitoring_task_monitor_info 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/CoreMonitoringTaskRegistrationMapper.xml

@@ -2,7 +2,7 @@
 <!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">
+<mapper namespace="com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper">
 
     <resultMap type="com.xunmei.core.access.domain.CoreMonitoringTaskRegistration" id="CoreMonitoringTaskRegistrationResult">
                 <result property="id" column="id"/>

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

@@ -0,0 +1,158 @@
+<?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.mapper.CoreMonitoringTaskRegistrationMonitorMapper">
+
+    <resultMap type="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor" id="CoreMonitoringTaskRegistrationMonitorResult">
+                <result property="id" column="id"/>
+                <result property="taskRegistrationId" column="task_registration_id"/>
+                <result property="host" column="host"/>
+                <result property="videoChannel" column="video_channel"/>
+                <result property="createTime" column="create_time"/>
+                <result property="createBy" column="create_by"/>
+                <result property="updateTime" column="update_time"/>
+                <result property="updateBy" column="update_by"/>
+                <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <sql id="selectCoreMonitoringTaskRegistrationMonitorVo">
+        select id, task_registration_id, host, video_channel, create_time, create_by, update_time, update_by, del_flag
+        from core_monitoring_task_registration_monitor
+    </sql>
+
+    <select id="selectCoreMonitoringTaskRegistrationMonitorList" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor"
+            resultMap="CoreMonitoringTaskRegistrationMonitorResult">
+        <include refid="selectCoreMonitoringTaskRegistrationMonitorVo"/>
+        <where>
+                        <if test="taskRegistrationId != null ">
+                            and task_registration_id = #{taskRegistrationId}
+                        </if>
+                        <if test="host != null ">
+                            and host = #{host}
+                        </if>
+                        <if test="videoChannel != null  and videoChannel != ''">
+                            and video_channel = #{videoChannel}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectCoreMonitoringTaskRegistrationMonitorById" parameterType="String"
+            resultMap="CoreMonitoringTaskRegistrationMonitorResult">
+            <include refid="selectCoreMonitoringTaskRegistrationMonitorVo"/>
+            where id = #{id}
+    </select>
+    <select id="selectTaskName" resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO">
+        SELECT
+            cmtr.id as id,
+            cmrt.task_name as  taskName,
+            cmtr.task_start_time as taskStartTime
+        FROM
+            core_monitoring_retrieval_task cmrt
+                LEFT JOIN core_monitoring_task_registration cmtr ON cmtr.task_id = cmrt.id
+        WHERE
+            cmtr.task_id =#{taskId}
+    </select>
+    <select id="selectMonitorByTaskRegistrationId"
+            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">
+        SELECT
+            cmtrm.id AS id,
+            cmtrm.`host` AS `host`,
+            cmtrm.video_channel AS videoChannel,
+            sd.device_name AS hostName,
+            sd1.device_name AS videoChannelName
+        FROM
+            core_monitoring_task_registration_monitor cmtrm
+                LEFT JOIN sys_device sd ON sd.id = cmtrm.`host`
+                LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id
+        WHERE
+            cmtrm.task_registration_id =#{taskRegistrationId}
+    </select>
+
+    <insert id="insertCoreMonitoringTaskRegistrationMonitor" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
+        insert into core_monitoring_task_registration_monitor
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,
+                    </if>
+                    <if test="taskRegistrationId != null">task_registration_id,
+                    </if>
+                    <if test="host != null">host,
+                    </if>
+                    <if test="videoChannel != null">video_channel,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="delFlag != null">del_flag,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="taskRegistrationId != null">#{taskRegistrationId},
+                    </if>
+                    <if test="host != null">#{host},
+                    </if>
+                    <if test="videoChannel != null">#{videoChannel},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="delFlag != null">#{delFlag},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updateCoreMonitoringTaskRegistrationMonitor" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
+        update core_monitoring_task_registration_monitor
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="taskRegistrationId != null">task_registration_id =
+                        #{taskRegistrationId},
+                    </if>
+                    <if test="host != null">host =
+                        #{host},
+                    </if>
+                    <if test="videoChannel != null">video_channel =
+                        #{videoChannel},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="delFlag != null">del_flag =
+                        #{delFlag},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCoreMonitoringTaskRegistrationMonitorById" parameterType="String">
+        delete
+        from core_monitoring_task_registration_monitor where id = #{id}
+    </delete>
+
+    <delete id="deleteCoreMonitoringTaskRegistrationMonitorByIds" parameterType="String">
+        delete from core_monitoring_task_registration_monitor where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -127,23 +127,23 @@
 
     <select id="selectByPlanId" resultType="com.xunmei.core.resumption.vo.appPlan.RuleItemVo">
         SELECT a.id,
-               b.item_name,
-               b.item_desc,
-               b.item_num,
-               a.safe_type,
+               b.name as item_name,
+               b.desc as item_desc,
+--                b.item_num,
+--                a.safe_type,
                c.`name`           area_name,
-               a.point_name,
-               a.point_num,
+               a.name as point_name,
+--                a.point_num,
                h.point_scan,
                h.required,
-               d.rule_name     as ruleName,
+               d.name  as ruleName,
                a.business_type as businessType
         FROM (SELECT item_id, point_scan, required FROM sys_plan_to_item WHERE plan_id = #{planId}) h
-                 LEFT JOIN sys_rule_point a ON h.item_id = a.id
-                 LEFT JOIN sys_rule_item b ON a.item_id = b.id
-                 LEFT JOIN t_area c ON a.area_id = c.id
-                 LEFT JOIN sys_rule d on b.rule_id = d.id
-        order by b.item_num, a.point_num
+                 LEFT JOIN core_resumption_rule_point a ON h.item_id = a.id
+                 LEFT JOIN core_resumption_rule_item b ON a.item_id = b.id
+                 LEFT JOIN sys_area c ON a.area_id = c.id
+                 LEFT JOIN core_resumption_rule d on b.rule_id = d.id
+--         order by b.item_num, a.point_num
     </select>
 
     <select id="findExecOrgByPlan" parameterType="Long" resultType="Long">

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

@@ -272,11 +272,23 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
     @Override
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
     public List<SysWorkTime> batchnew(Long orgId, List<SysWorkTime> workTimeDtoList) {
+        Date now = DateUtil.beginOfDay(new Date());
+        Date updateTime = new Date();
 
         for (SysWorkTime s : workTimeDtoList) {
-            s.setId(null);
-            s.setOrgId(orgId);
-            baseMapper.insert(s);
+            if (s.getIsEnable() == null || s.getYmdDate().before(now)) {
+//                WORKTIMEBUSINESSLOG.info("作息时间[ {} ]小于现在时间, 不允许改变", workDate);
+//                return null;
+            }else {
+                s.setId(null);
+                s.setOrgId(orgId);
+                s.setIsManual(1L);
+                s.setUpdateTime(updateTime);
+
+                baseMapper.insert(s);
+
+            }
+
         }
         return workTimeDtoList;
     }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -105,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<insert id="insertRole" parameterType="com.xunmei.system.api.domain.SysRole" useGeneratedKeys="true" keyProperty="id">
  		insert into sys_role(
  			<if test="id != null and id != 0">id,</if>
+		<if test="orgType !=null and orgType != ''"> org_type,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
  			<if test="roleSort != null">role_sort,</if>
@@ -117,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			create_time
  		)values(
  			<if test="id != null and id != 0">#{id},</if>
+		<if test="orgType !=null and orgType != ''"> #{orgType},</if>
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
  			<if test="roleSort != null">#{roleSort},</if>
@@ -134,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_role
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
+ 		    <if test="orgType !=null and orgType != ''"> org_type =#{orgType},</if>
  			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
  			<if test="roleSort != null">role_sort = #{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>