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

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/panel/vo/PanelListVo.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class PanelListVo {
@@ -40,5 +41,9 @@ public class PanelListVo {
     @ApiModelProperty(value = "是否存在监控",notes = "0不存在1存在")
     private Integer isExist;
 
+    @ApiModelProperty(value = "同名任务分组",notes = "仅安全检查使用该字段")
+    private List<PanelListVo> uncompleted;
 
+    @ApiModelProperty(value = "面板功能名称")
+    private String beCheckedOrgName;
 }

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

@@ -42,10 +42,10 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
    // @RequiresPermissions("core:info:query")
     @GetMapping(value = "/getInfo")
     public AjaxResult getInfo( Long taskId,Long hostId,Long videoId,String areaValue,String areaName) {
-        if(ObjectUtil.isNotNull(hostId) && ObjectUtil.isNotNull(videoId) ){
-            //传入监控id，因为一个监控对应一个项目
-            return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,hostId,videoId));
-        }
+//        if(ObjectUtil.isNotNull(hostId) && ObjectUtil.isNotNull(videoId) ){
+//            //传入监控id，因为一个监控对应一个项目
+//            return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,hostId,videoId));
+//        }
 
         return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,areaValue,areaName));
     }

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

@@ -85,9 +85,9 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
       * @param id
      * @return
      */
- CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
+// CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 
-    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(@Param("taskId") Long taskId,@Param("host") Long host, @Param("videoChannel")Long videoChannel);
+//    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(@Param("taskId") Long taskId,@Param("host") Long host, @Param("videoChannel")Long videoChannel);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorByAreaCode(@Param("taskId") Long taskId,@Param("areaCode") String host);
 

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

@@ -72,9 +72,9 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
 
     CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId);
 
-    CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
+//    CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
 
-    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,Long hostId,Long videoId);
+//    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,Long hostId,Long videoId);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,String areaCode,String areaName);
 

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

@@ -131,41 +131,41 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
         return coreMonitoringTaskRegistrationVO;
     }
 
-    @Override
-    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id) {
-        //查询视频
-        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorById(id);
-        //根据视频查询项目
-        List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
-        coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
-        return coreMonitoringTaskRegistrationMonitorVO;
-    }
-
-    @Override
-    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId, Long hostId, Long videoId) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("task_id", taskId);
-        List<CoreMonitoringTaskRegistration> list = coreMonitoringTaskRegistrationMapper.selectList(queryWrapper);
-        //查询视频
-        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByInfo(taskId, hostId, videoId);
-        if (null != coreMonitoringTaskRegistrationMonitorVO) {
-            List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
-            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
-        } else {
-            coreMonitoringTaskRegistrationMonitorVO = new CoreMonitoringTaskRegistrationMonitorVO();
-            SysDevice device = remoteDeviceService.getInfoById(hostId, SecurityConstants.INNER);
-            SysDevice video = remoteDeviceService.getInfoById(videoId, SecurityConstants.INNER);
-            coreMonitoringTaskRegistrationMonitorVO.setHostName(device.getDeviceName());
-            coreMonitoringTaskRegistrationMonitorVO.setVideoChannelName(video.getDeviceName());
-            coreMonitoringTaskRegistrationMonitorVO.setHost(hostId);
-            coreMonitoringTaskRegistrationMonitorVO.setVideoChannel(videoId);
-            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(new ArrayList<>());
-        }
-        if (CollectionUtils.isNotEmpty(list)) {
-            coreMonitoringTaskRegistrationMonitorVO.setRegistrationId(list.get(0).getId());
-        }
-        return coreMonitoringTaskRegistrationMonitorVO;
-    }
+//    @Override
+//    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id) {
+//        //查询视频
+//        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorById(id);
+//        //根据视频查询项目
+//        List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
+//        coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+//        return coreMonitoringTaskRegistrationMonitorVO;
+//    }
+
+//    @Override
+//    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId, Long hostId, Long videoId) {
+//        QueryWrapper queryWrapper = new QueryWrapper();
+//        queryWrapper.eq("task_id", taskId);
+//        List<CoreMonitoringTaskRegistration> list = coreMonitoringTaskRegistrationMapper.selectList(queryWrapper);
+//        //查询视频
+//        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByInfo(taskId, hostId, videoId);
+//        if (null != coreMonitoringTaskRegistrationMonitorVO) {
+//            List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
+//            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+//        } else {
+//            coreMonitoringTaskRegistrationMonitorVO = new CoreMonitoringTaskRegistrationMonitorVO();
+//            SysDevice device = remoteDeviceService.getInfoById(hostId, SecurityConstants.INNER);
+//            SysDevice video = remoteDeviceService.getInfoById(videoId, SecurityConstants.INNER);
+//            coreMonitoringTaskRegistrationMonitorVO.setHostName(device.getDeviceName());
+//            coreMonitoringTaskRegistrationMonitorVO.setVideoChannelName(video.getDeviceName());
+//            coreMonitoringTaskRegistrationMonitorVO.setHost(hostId);
+//            coreMonitoringTaskRegistrationMonitorVO.setVideoChannel(videoId);
+//            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(new ArrayList<>());
+//        }
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            coreMonitoringTaskRegistrationMonitorVO.setRegistrationId(list.get(0).getId());
+//        }
+//        return coreMonitoringTaskRegistrationMonitorVO;
+//    }
 
     @Override
     public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,String areaCode,String areaName) {

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

@@ -1363,6 +1363,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
     @Transactional
     @Override
     public int updateTMonitoringRetrievalPlan(TMonitoringRetrievalPlanDto tMonitoringRetrievalPlanDto) throws ParseException {
+        Integer result=1;
         try {
             TMonitoringRetrievalPlan newPlan =new TMonitoringRetrievalPlan();
             BeanUtils.copyProperties(tMonitoringRetrievalPlanDto, newPlan);
@@ -1402,25 +1403,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     // 编辑的非行社创建计划，需处理子计划
                     if(oldPlan.getOrgType()!="3")
                     {
-//                        SysOrg oldPlanOrg = remoteOrgService.selectSysOrgById(oldPlan.getOrgId(), SecurityConstants.INNER);
-//                        List<TMonitoringRetrievalPlan> subPlans= buildSubPlans(oldPlan,tMonitoringRetrievalPlanDto.getPlanExecOrgIdList(),oldPlanOrg);
-//                        List<TMonitoringRetrievalPlanToExecOrg> planToExecOrgs=new ArrayList<>();
-//                        if(ObjectUtil.isNotEmpty(tMonitoringRetrievalPlanDto.getPlanExecOrgIdList()))
-//                        {
-//                            final List<SysOrg> sysOrgs = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-//                                            remoteOrgService.selectOrgByIdList(tMonitoringRetrievalPlanDto.getPlanExecOrgIdList(), SecurityConstants.INNER),
-//                                    ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
-//                            planToExecOrgs = buildPlanExecOrgs(subPlans, sysOrgs);
-//                        }
-//                        //保存子计划和子计划具体执行机构
-//                        if(ObjectUtil.isNotEmpty(subPlans))
-//                        {
-//                            this.saveBatch(subPlans);
-//                            itMonitoringRetrievalPlanToExecOrgService.saveBatch(planToExecOrgs);
-//                        }
                         iCoreMonitoringRetrievalTaskService.updateComplete(!isComplete, newPlan, oldPlan);
                     }
-                    return 1;
+                    return result;
                 }
                 else // 任务中存在已完成的任务，只能修改任务名称
                 {
@@ -1431,26 +1416,31 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     if(ObjectUtil.isNotEmpty(subPlanList))
                     {
                         subPlanList.forEach(x->x.setPlanName(oldPlan.getPlanName()));
-                        this.saveBatch(subPlanList);
+                        this.saveOrUpdateBatch(subPlanList);
                     }
-//                    CompletableFuture.runAsync(() -> {
-//                        try{
-//                            clearTaskByPlanId(oldPlan.getId());
-//                            distribute(oldPlan.getId(),true);
-//                        }
-//                        catch (Exception e) {
-//                            e.getMessage();
-//                        }
-//                    }, threadPoolTaskExecutor);
+                    return result;
+                }
+            }
+            // 停用状态 肯定存在已完成的任务， 只能修改任务名称
+            else if(oldPlan.getPlanStatus()==2)
+            {
+                tMonitoringRetrievalPlanMapper.updateById(oldPlan);
+                QueryWrapper queryWrapper = new QueryWrapper();
+                queryWrapper.eq(PARENT_ID, oldPlan.getId());
+                List<TMonitoringRetrievalPlan> subPlanList = tMonitoringRetrievalPlanMapper.selectList(queryWrapper);
+                if(ObjectUtil.isNotEmpty(subPlanList))
+                {
+                    subPlanList.forEach(x->x.setPlanName(oldPlan.getPlanName()));
+                    this.saveOrUpdateBatch(subPlanList);
                 }
-                return 0;
+                return result;
             }
         }
         catch (Exception e) {
             e.getMessage();
             return 0;
         }
-        return 0;
+        return result;
     }
 
     // 根据计划Id清除计划下的所有任务

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

@@ -287,7 +287,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }
@@ -302,7 +301,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }
@@ -317,7 +315,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }
@@ -332,8 +329,6 @@ public class CoreResumptionConfigurationServiceImpl extends ServiceImpl<CoreResu
         if (CollectionUtils.isNotEmpty(coreResumptionConfigurations) && CollectionUtils.isNotEmpty(resumptions)) {
             resumptions.forEach(r -> {
                 addMassageCenter(r.getName(), null, coreResumptionConfigurations.get(0).getTimeUnit(), r.getOrgId(), r.getPlanId());
-
-                remoteSmsService.sendSmsTodo(r.getOrgId(),r.getName(), r.getPlanEndTime());
             });
         }
     }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -167,7 +167,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
                 String orgNames = orgIds.stream().map(orgId -> {
                     final SysOrg sysOrg = orgList.stream().filter(org -> org.getId().equals(orgId)).findFirst().get();
                     if (ObjectUtil.isNotEmpty(sysOrg)) {
-                        if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || sysOrg.getType() < 4 || sysOrg.getShortName().endsWith("地区行社")) {
+                        if (StringUtil.isNullOrEmpty(sysOrg.getAffiliatedArea()) || (ObjectUtil.isNotNull(sysOrg.getType()) && sysOrg.getType() < 4) || sysOrg.getShortName().endsWith("地区行社")) {
                             return sysOrg.getShortName();
                         }
                         return sysOrg.getAffiliatedBank() + "-" + sysOrg.getShortName();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -37,6 +37,7 @@ import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -178,7 +179,29 @@ public class PanelServiceImpl implements PanelService {
             List<PanelListVo> data = map.getValue();
             vo.setNums(data.size());
             vo.setTaskTypeText(PanelTypeEnums.getName(map.getKey()));
-            vo.setDataList(data);
+            if(ObjectUtil.equal(map.getKey(),PanelTypeEnums.SAFETY_CHECK.getCode())){
+                if(data.size()>0)
+                {
+                    Map<String, List<PanelListVo>> groupedItems = data.stream()
+                            .collect(Collectors.groupingBy(PanelListVo::getTaskName));
+                    List<PanelListVo> tempData=new ArrayList<>();
+
+                    for (Map.Entry<String, List<PanelListVo>> entry : groupedItems.entrySet()) {
+                        PanelListVo parentItem=new PanelListVo();
+                        BeanUtils.copyProperties(entry.getValue().get(0),parentItem);
+                        parentItem.setUncompleted(entry.getValue());
+                        tempData.add(parentItem);
+                    }
+                    vo.setDataList(tempData);
+                }
+                else {
+                    vo.setDataList(data);
+                }
+            }
+            else {
+
+                vo.setDataList(data);
+            }
             list.add(vo);
         }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -444,10 +444,10 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
         if (!isNewTask) {
             CoreSafetyTask safetyTask = getById(data.getId());
-            if (ObjectUtil.equal(data.getIsSubmit(), 0) && ObjectUtil.notEqual(safetyTask.getStatus(), SafetyCheckTaskStatus.Waiting.getValue())) {
+            if (ObjectUtil.equal(data.getIsSubmit(), 0) && ObjectUtil.equal(safetyTask.getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
                 throw new ServiceException("当前状态不允许修改,请退出当前页面后刷新重试!");
             }
-            if (ObjectUtil.equal(data.getIsSubmit(), 1) && ObjectUtil.notEqual(safetyTask.getStatus(), SafetyCheckTaskStatus.UnderWay.getValue())) {
+            if (ObjectUtil.equal(data.getIsSubmit(), 1) && ObjectUtil.equal(safetyTask.getStatus(), SafetyCheckTaskStatus.Completed.getValue())) {
                 throw new ServiceException("当前状态不允许修改,请退出当前页面后刷新重试!");
             }
 

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

@@ -77,34 +77,34 @@ FROM
     core_monitoring_task_registration_monitor
 WHERE 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>
-    <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}
-          AND b.`host` = #{host}
-          AND b.video_channel = #{videoChannel}
-          AND sd1.id = #{videoChannel}
-    </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>-->
+<!--    <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}-->
+<!--          AND b.`host` = #{host}-->
+<!--          AND b.video_channel = #{videoChannel}-->
+<!--          AND sd1.id = #{videoChannel}-->
+<!--    </select>-->
 
     <select id="selectMonitorByAreaCode"
             resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">

soc-modules/soc-modules-core/src/main/resources/mapper/board/AppCockpitMapper.xml

@@ -307,11 +307,11 @@
     </select>
     <select id="selectSyntheticInout" resultType="com.xunmei.core.board.vo.app.AppSyntheticInOutVo">
         SELECT COUNT(*)        as total,
-               sum(l.type = 1) as department,
-               sum(l.type = 2) as temporary,
-               sum(l.type = 3) as emergency
+               sum(l.letter_type = 1) as department,
+               sum(l.letter_type = 2) as temporary,
+               sum(l.letter_type = 3) as emergency
         FROM core_out_in_record r
-                 INNER JOIN core_introduce_letter l ON r.letter_id = l.id
+                 INNER JOIN core_introduce_letter_out_in_request l ON r.out_in_request_id = l.id
                  INNER JOIN sys_org o ON r.org_id = o.id
         where arrival_time >= #{startDate}
           AND arrival_time &lt;= #{endDate}

soc-modules/soc-modules-core/src/main/resources/mapper/board/CockpitMapper.xml

@@ -189,11 +189,11 @@
     </select>
     <select id="currentMonthVisitInfo" resultType="com.xunmei.core.board.vo.web.VisitInfoVo">
         SELECT COUNT(*)        as total,
-               sum(l.type = 1) as electronicCount,
-               sum(l.type = 2) as paperCount,
-               sum(l.type = 3) as urgencyCount
+               sum(l.letter_type = 1) as electronicCount,
+               sum(l.letter_type = 2) as paperCount,
+               sum(l.letter_type = 3) as urgencyCount
         FROM core_out_in_record r
-                 INNER JOIN core_introduce_letter l ON r.letter_id = l.id
+                 INNER JOIN core_introduce_letter_out_in_request l ON r.out_in_request_id = l.id
                  INNER JOIN sys_org o ON r.org_id = o.id
         where arrival_time >= #{startDate}
           and o.path LIKE CONCAT(#{orgPath}, '%')

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

@@ -135,24 +135,10 @@
     <select id="selectListApp"
             resultType="com.xunmei.common.core.domain.retrieval.vo.AppCoreMonitoringRetrievalTaskVO">
         SELECT
-        IF
-        (
-        IF
-        ( COUNT( b.id ) > 0, 1, 0 )+
-        IF
-        ( COUNT( c.id ) > 0, 1, 0 )= 2,
-        1,
-        0
-        ) as isExist,
+        1 as isExist,
         a.*
         FROM
         core_monitoring_retrieval_task a
-        LEFT JOIN sys_device b ON a.org_id = b.org_id
-        AND b.del_flag = '0'
-        AND b.device_type = '0'
-        LEFT JOIN sys_device c ON c.org_id = a.org_id
-        AND c.del_flag = '0'
-        AND c.device_type = '2'
         WHERE 1=1 and is_deleted=0
         <if test="request.orgId != null ">
             and a.org_id = #{request.orgId}
@@ -657,21 +643,9 @@
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
         select distinct t.id as id, task_name as taskName,t.plan_start_time as startTime,t.plan_end_time as
         endTime,t.status,
-        IF
-        (
-        IF
-        ( COUNT( b.id ) > 0, 1, 0 )+
-        IF
-        ( COUNT( c.id ) > 0, 1, 0 )= 2,
-        1,
-        0
-        ) AS isExist
-        from core_monitoring_retrieval_task t LEFT JOIN sys_device b ON t.org_id = b.org_id
-        AND b.del_flag = '0'
-        AND b.device_type = '0'
-        LEFT JOIN sys_device c ON c.org_id = t.org_id
-        AND c.del_flag = '0'
-        AND c.device_type = '2' where t.org_id =#{request.orgId} and t.role_id in
+        1 AS isExist
+        from core_monitoring_retrieval_task t
+        where t.org_id =#{request.orgId} and t.role_id in
         <foreach collection="request.roleIdList" item="roleId" open="(" separator="," close=")">
             #{roleId}
         </foreach>

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -888,7 +888,7 @@
     </select>
 
     <select id="selectCurUserTaskList" resultType="com.xunmei.common.core.domain.panel.vo.PanelListVo">
-        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status
+        select distinct t.id as id, title as taskName,t.plan_start_time as startTime,t.plan_end_time as endTime,t.status,t.org_name as beCheckedOrgName
         from core_safety_task t
         where (t.grant_user_id = #{request.userId} or ( t.check_org_id =#{request.orgId}
         and t.plan_id in (select id from core_safecheck_plan p