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

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

@@ -31,7 +31,8 @@ import java.util.List;
 @ApiModel(value = "SysOrg对象", description = "【请填写功能名称】")
 public class SysOrg extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
+    @TableField(exist = false)
+    private Long removeId;
     @TableId
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;

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

@@ -40,7 +40,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      * 获取调阅任务登记检查情况详细信息
      */
     @ApiOperation(value = "获取CoreMonitoringTaskMonitorInfo详细信息")
-    @RequiresPermissions("core:info:query")
+   // @RequiresPermissions("core:info:query")
     @GetMapping(value = "/getInfo")
     public AjaxResult getInfo( Long taskId,Long hostId,Long videoId) {
         //传入监控id，因为一个监控对应一个项目
@@ -51,7 +51,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      * 新增调阅任务登记检查情况
      */
     @ApiOperation(value = "新增CoreMonitoringTaskMonitorInfo")
-    @RequiresPermissions("core:info:add")
+   // @RequiresPermissions("core:info:add")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO) {
@@ -62,7 +62,7 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      * 修改调阅任务登记检查情况
      */
     @ApiOperation(value = "修改CoreMonitoringTaskMonitorInfo")
-    @RequiresPermissions("core:info:edit")
+   // @RequiresPermissions("core:info:edit")
     @Log(title = "调阅任务登记检查情况", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskMonitorInfo) {

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

@@ -44,7 +44,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 查询【请填写功能名称】列表
      */
     @ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
-    @RequiresPermissions("core:registration:list")
+  //  @RequiresPermissions("core:registration:list")
     @GetMapping("/list")
     public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
@@ -54,7 +54,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation(value = "获取CoreMonitoringTaskRegistration详细信息")
-    @RequiresPermissions("core:registration:query")
+   // @RequiresPermissions("core:registration:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(iCoreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
@@ -64,7 +64,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 新增【调阅任务登记NCF开始】
      */
     @ApiOperation(value = "新增CoreMonitoringTaskRegistration")
-    @RequiresPermissions("core:registration:add")
+ //   @RequiresPermissions("core:registration:add")
     @Log(title = "【调阅任务登记NCF开始】", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
@@ -75,8 +75,7 @@ public class CoreMonitoringTaskRegistrationController extends BaseController {
      * 修改【请填写功能名称】
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
-    @RequiresPermissions("core:registration:edit")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+//    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
         return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));

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

@@ -37,7 +37,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
      * 获取调阅任务登记监控详细信息
      */
     @ApiOperation(value = "获取CoreMonitoringTaskRegistrationMonitor详细信息")
-    @RequiresPermissions("core:monitor:query")
+   // @RequiresPermissions("core:monitor:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(coreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationMonitorById(id));
@@ -47,7 +47,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
      * 新增调阅任务登记监控
      */
     @ApiOperation(value = "新增CoreMonitoringTaskRegistrationMonitor")
-    @RequiresPermissions("core:monitor:add")
+  //  @RequiresPermissions("core:monitor:add")
     @Log(title = "调阅任务登记监控" , businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {
@@ -58,7 +58,7 @@ public class CoreMonitoringTaskRegistrationMonitorController extends BaseControl
      * 修改调阅任务登记监控
      */
     @ApiOperation(value = "修改CoreMonitoringTaskRegistrationMonitor")
-    @RequiresPermissions("core:monitor:edit")
+  //  @RequiresPermissions("core:monitor:edit")
     @Log(title = "调阅任务登记监控" , businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor) {

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

@@ -50,7 +50,6 @@ public class TMonitoringRetrievalPlanController extends BaseController {
      * 获取监控调阅计划详细信息
      */
     @ApiOperation(value = "获取TMonitoringRetrievalPlan详细信息")
-    @RequiresPermissions("core:accessPlan:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(tMonitoringRetrievalPlanService.selectTMonitoringRetrievalPlanById(id));

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

@@ -19,6 +19,7 @@ public class CoreMonitoringTaskRegistrationMonitorVO extends CoreMonitoringTaskR
     private String hostName;
     @ApiModelProperty(value = "监控通道名")
     private String videoChannelName;
+
     @ApiModelProperty(value = "nfcId")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long registrationId;

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

@@ -202,7 +202,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         int insert = coreEduTrainingPlanMapper.insert(plan);
 
         //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
-        if (/*(!checkOrgType(org.getType())||org.getType()==3) &&*/ ObjectUtil.equal(0, plan.getPlanStatus()) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
+        if ((!checkOrgType(org.getType())) && ObjectUtil.equal(0, plan.getPlanStatus()) && (ObjectUtil.equal(0, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow()))) {
             CoreEduTrainingPlanDataVo detailPlanData = this.getCoreEduTrainingPlanDataVo(plan.getId());
             coreEduTrainingTaskService.createTaskForNow(detailPlanData, plan.getStartDate(), plan.getEndDate());
         }

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

@@ -293,8 +293,8 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             start = dateRange.getStartTime();
             end = dateRange.getEndTime();
         } else {
-            start = DateUtil.beginOfDay(start).setField(DateField.MILLISECOND,0);
-            end = DateUtil.endOfDay(end).setField(DateField.MILLISECOND,0);
+            start = DateUtil.beginOfDay(start).setField(DateField.MILLISECOND, 0);
+            end = DateUtil.endOfDay(end).setField(DateField.MILLISECOND, 0);
         }
         List<CoreEduTrainingPlanToExecOrg> planExecOrgList = plan.getPlanExecOrgList();
         List<SysOrg> orgList;
@@ -359,46 +359,63 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     @Override
     public List<CoreEduTrainingTaskReportVo> selectCoreEduTrainingTaskReport(CoreEduTrainingTaskReportDto request) {
         CoreEduTrainingPlan plan = coreEduTrainingPlanMapper.selectById(request.getPlanId());
-        if (ObjectUtil.isNull(plan)) {
+        if (plan == null) {
             throw new SystemException("未获取到该计划信息");
         }
+
         List<Long> planIdList = new ArrayList<>();
         Long planId = request.getPlanId();
         if (ObjectUtil.equal(1, plan.getStandard()) && ObjectUtil.equal(1, plan.getIssue())) {
             planIdList = coreEduTrainingPlanMapper.selectIdByParentId(plan.getId());
             planId = null;
         }
+
         request.setStartDate(DateUtil.beginOfMonth(request.getDate()));
         request.setEndDate(DateUtil.endOfMonth(request.getDate()));
-        Long orgId = request.getOrgId();
 
-        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(request.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
+        Long orgId = request.getOrgId();
+        SysOrg sysOrg = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectOrgById(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         request.setOrgPath(sysOrg.getPath());
+
         List<SysOrg> sysOrgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.selectSysOrgByParentId(orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
         if (ObjectUtil.isEmpty(sysOrgList)) {
             return new ArrayList<>();
         }
+
         List<CoreEduTrainingTaskReportVo> result = new ArrayList<>();
         List<CoreEduTrainingTaskReportVo> list = coreEduTrainingTaskMapper.selectReport(request, planId, planIdList);
-        for (SysOrg org : sysOrgList) {
-            List<CoreEduTrainingTaskReportVo> childrenOrgData = list.stream().filter(vo -> vo.getOrgPath().startsWith(org.getPath())).collect(Collectors.toList());
-            CoreEduTrainingTaskReportVo reportVo = new CoreEduTrainingTaskReportVo();
-            reportVo.setOrgId(org.getId());
-            reportVo.setOrgName(org.getName());
-            if (ObjectUtil.isEmpty(childrenOrgData)) {
+
+        if (list.size() == 1 && list.get(0).getOrgId() == null) {
+            //走到这 说明mapper没有查到数据 构建空数据返回
+            for (SysOrg org : sysOrgList) {
+                CoreEduTrainingTaskReportVo reportVo = new CoreEduTrainingTaskReportVo();
+                reportVo.setOrgId(org.getId());
+                reportVo.setOrgName(org.getName());
                 reportVo.setShouldFinish(0);
                 reportVo.setFinish(0);
                 reportVo.setFinishRate("0%");
-            } else {
-                childrenOrgData.stream().map(CoreEduTrainingTaskReportVo::getShouldFinish).reduce(Integer::sum).ifPresent(reportVo::setShouldFinish);
-                childrenOrgData.stream().map(CoreEduTrainingTaskReportVo::getFinish).reduce(Integer::sum).ifPresent(reportVo::setFinish);
-                reportVo.setFinishRate(calculatePercent(reportVo.getFinish(), reportVo.getShouldFinish()));
+                result.add(reportVo);
+            }
+            return result;
+        } else {
+            for (SysOrg org : sysOrgList) {
+                List<CoreEduTrainingTaskReportVo> childrenOrgData = list.stream()
+                        .filter(vo -> vo.getOrgPath().startsWith(org.getPath()))
+                        .collect(Collectors.toList());
+
+                int totalShouldFinish = childrenOrgData.stream().mapToInt(CoreEduTrainingTaskReportVo::getShouldFinish).sum();
+                int totalFinish = childrenOrgData.stream().mapToInt(CoreEduTrainingTaskReportVo::getFinish).sum();
+
+                CoreEduTrainingTaskReportVo reportVo = new CoreEduTrainingTaskReportVo();
+                reportVo.setOrgId(org.getId());
+                reportVo.setOrgName(org.getName());
+                reportVo.setShouldFinish(totalShouldFinish);
+                reportVo.setFinish(totalFinish);
+                reportVo.setFinishRate(calculatePercent(totalFinish, totalShouldFinish));
+                result.add(reportVo);
             }
-            result.add(reportVo);
+            return result;
         }
-
-
-        return result;
     }
 
     public static String calculatePercent(Integer num1, Integer num2) {

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

@@ -56,7 +56,7 @@ public class CoreResumptionConfigurationController extends BaseController {
      * 新增履职任务定时提醒
      */
     @ApiOperation(value = "新增CoreResumptionConfiguration")
-    @RequiresPermissions("system:configuration:add")
+   // @RequiresPermissions("system:configuration:add")
     @Log(title = "履职任务定时提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreResumptionConfigurationDTO coreResumptionConfigurationDTO) {

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

@@ -5,6 +5,7 @@ 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.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.CoreResumptionConfiguration;
 import com.xunmei.core.resumption.dto.CoreResumptionConfigurationDTO;
 import com.xunmei.core.resumption.mapper.CoreResumptionConfigurationMapper;
@@ -97,8 +98,11 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
     public int insertCoreResumptionConfiguration(CoreResumptionConfigurationDTO coreResumptionConfiguration) {
         int insert = 0;
         for (CoreResumptionConfiguration c : coreResumptionConfiguration.getCoreResumptionConfiguration()) {
-            c.setCreateTime(DateUtils.getNowDate());
-            insert = coreResumptionConfigurationMapper.insert(c);
+            if (null!=c.getAllDay()){
+                c.setCreateTime(DateUtils.getNowDate());
+                c.setCreateBy(SecurityUtils.getUsername());
+                insert = coreResumptionConfigurationMapper.insert(c);
+            }
             if (insert < 1) {
                 return insert;
             }

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

@@ -48,7 +48,7 @@ public class CoreMonitoringRetrievalTaskController extends BaseController {
      * 查询监控调阅任务列表app
      */
     @ApiOperation(value = "app查询调阅任务列表")
-    @RequiresPermissions("core:task:list")
+  //  @RequiresPermissions("core:task:list")
     @GetMapping("/selectListApp")
     public TableDataInfo<CoreMonitoringRetrievalTask> selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         return coreMonitoringRetrievalTaskService.selectListApp(coreMonitoringTaskRegistrationDTO);

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

@@ -4,186 +4,187 @@
         "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 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
+        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"
+    <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>
+            <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}
+        <include refid="selectCoreMonitoringTaskRegistrationMonitorVo"/>
+        where id = #{id}
     </select>
     <select id="selectTaskName" resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO">
-        SELECT
-               cmrt.org_id as orgId,
-            cmtr.id as id,
-            cmrt.task_name as  taskName,
-               cmrt.status as  taskStatus,
-            cmtr.task_start_time as taskStartTime,
-            cmrt.end_time AS taskEndTime
-        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 cmrt.org_id          as orgId,
+               cmtr.id              as id,
+               cmrt.task_name       as taskName,
+               cmrt.status          as taskStatus,
+               cmtr.task_start_time as taskStartTime,
+               cmrt.end_time        AS taskEndTime
+        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.video_channel
-                LEFT JOIN sys_device sd1 ON sd1.id = sd.host_id
-        WHERE
-            cmtrm.task_registration_id =#{taskRegistrationId}
+        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.video_channel
+                 LEFT JOIN sys_device sd1 ON sd1.id = sd.host_id
+        WHERE cmtrm.task_registration_id = #{taskRegistrationId}
     </select>
     <select id="selectMonitorById"
             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.id = #{id}
+        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.id = #{id}
     </select>
     <select id="selectMonitorByInfo"
             resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">
-        SELECT
-            b.id AS id,
-            b.`host` AS `host`,
-            b.video_channel AS videoChannel,
-            sd.device_name AS hostName,
-            sd1.device_name AS videoChannelName
-        FROM
-            core_monitoring_task_registration a
-                LEFT JOIN core_monitoring_task_registration_monitor b ON a.id = b.task_registration_id
-                LEFT JOIN sys_device sd ON sd.id = b.`host`
-                LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id
-        WHERE
-            a.task_id = #{taskId}
+        SELECT b.id            AS id,
+               b.`host`        AS `host`,
+               b.video_channel AS videoChannel,
+               sd.device_name  AS hostName,
+               CONCAT('通道',sd1.channel  )	AS videoChannelName
+        FROM core_monitoring_task_registration a
+                 LEFT JOIN core_monitoring_task_registration_monitor b ON a.id = b.task_registration_id
+                 LEFT JOIN sys_device sd ON sd.id = b.`host`
+                 LEFT JOIN sys_device sd1 ON sd1.host_id = sd.id
+        WHERE a.task_id = #{taskId}
           AND b.`host` = #{host}
-          AND b.video_channel =#{videoChannel}
-          AND sd1.id=#{videoChannel}
+          AND b.video_channel = #{videoChannel}
+          AND sd1.id = #{videoChannel}
     </select>
 
-    <insert id="insertCoreMonitoringTaskRegistrationMonitor" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
+    <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>
+            <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>
+            <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 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>
+            <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}
+        from core_monitoring_task_registration_monitor
+        where id = #{id}
     </delete>
 
     <delete id="deleteCoreMonitoringTaskRegistrationMonitorByIds" parameterType="String">

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

@@ -121,5 +121,8 @@
                 #{roleId}
             </foreach>
         </if>
+        <if test="res.dateTime != null ">
+            and r.ymd_date = #{res.dateTime}
+        </if>
     </select>
 </mapper>

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

@@ -144,7 +144,9 @@ public class SysDeptController extends BaseController {
      */
     @GetMapping("/deptTree")
     public AjaxResult deptTree(SysOrg dept) {
-        return success(deptService.selectDeptTreeList());
+        List<SysOrgVO> sysOrgVOS = deptService.selectDeptTreeList(dept);
+
+        return success(sysOrgVOS);
     }
 
     /**

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

@@ -11,6 +11,7 @@ import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.common.security.annotation.RequiresPermissions;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.Eto.RoleConditionEto;
+import com.xunmei.system.api.domain.SysDept;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
@@ -203,7 +204,7 @@ public class SysRoleController extends BaseController {
     public AjaxResult deptTree(@PathVariable("roleId") Long roleId) {
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        ajax.put("depts", deptService.selectDeptTreeList());
+        ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
         return ajax;
     }
 

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

@@ -61,7 +61,7 @@ public class SysWorkTimeController extends BaseController {
      * 修改作息设置
      */
     @ApiOperation(value = "指定日期配置作息")
-    @RequiresPermissions("system:set:monthedit")
+//    @RequiresPermissions("system:set:monthedit")
     @PostMapping("/month/edit")
     public AjaxResult monthedit(@RequestBody WorkTimeMonthEditNewDto sysWorkTimeSet) {
         Date today = DateUtil.beginOfDay(new Date());

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

@@ -29,7 +29,7 @@ public interface ISysDeptService extends IService<SysDept> {
      * @param dept 机构信息
      * @return 机构树信息集合
      */
-    List<SysOrgVO> selectDeptTreeList();
+    List<SysOrgVO> selectDeptTreeList(SysOrg dept);
 
     /**
      * 返回行社树

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

@@ -26,6 +26,7 @@ import com.xunmei.system.mapper.SysOrgMapper;
 import com.xunmei.system.mapper.SysRoleMapper;
 import com.xunmei.system.service.ISysDeptService;
 import com.xunmei.system.service.ISysOrgService;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -111,9 +112,10 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
      * @return 机构树信息集合
      */
     @Override
-    public List<SysOrgVO> selectDeptTreeList() {
+    public List<SysOrgVO> selectDeptTreeList(SysOrg dept) {
         Long s = System.currentTimeMillis();
-        SysOrg sysOrg = getLoginUserOrg();
+        SysOrg sysOrg = null;
+        sysOrg = getLoginUserOrg();
         List<SysOrgVO> cacheList = getOrgCache();
         List<SysOrgVO> orgs = new ArrayList<>();
         for (SysOrgVO org : cacheList) {
@@ -125,12 +127,14 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             if (StringUtils.isEmpty(org.getShortName())) {
                 org.setShortName(org.getName());
             }
-            if(org.getSort() == null){
+            if (org.getSort() == null) {
                 org.setSort(100000);
             }
             orgs.add(org);
         }
-
+        if (dept.getRemoveId() != null) {
+            orgs.removeIf(d -> d.getId().equals(dept.getRemoveId()));
+        }
         return generateTree(orgs, sysOrg);
     }
 
@@ -152,7 +156,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     public List<SysOrgVO> getHangsheTreeCache(String path) {
         List<SysOrgVO> cacheList = getOrgCache();
         List<SysOrgVO> hangshelist = cacheList.stream().filter(c -> ObjectUtil.equal(c.getType(), 3)
-                        && ObjectUtil.isNotEmpty(c.getPath()) && c.getPath().startsWith(path))
+                && ObjectUtil.isNotEmpty(c.getPath()) && c.getPath().startsWith(path))
                 .collect(Collectors.toList());
         Set<Long> hangsheSet = hangshelist.stream().map(o -> o.getId()).collect(Collectors.toSet());
         Set<Long> parentIds = new HashSet<>();

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

@@ -91,12 +91,11 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
         }
         //下穿
         if (sysWorkTime.getCheckSub()) {
-            List<Long> ids = orgService.selectCheckSubOrgIdList(sysWorkTime.getOrgId());
-            //清空前端传递的org_id
-            sysWorkTime.setOrgId(null);
-            //添加in条件
-            query.in("t.org_id", ids);
+                query.like("o.path", sysWorkTime.getOrgId());
+        }else{
+            query.likeLeft("o.path", sysWorkTime.getOrgId()+"-");
         }
+        sysWorkTime.setOrgId(null);
         query.orderByDesc("ymd_date");
         //时间范围查询
         if (sysWorkTime.getRange() != null && sysWorkTime.getRange().length > 1) {