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/RemoteDeviceService.java

@@ -16,10 +16,8 @@ import java.util.List;
  * @author :LuoWei
  * @date : 2023/8/29
  */
-@FeignClient(contextId = "remoteDeviceService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteDeviceFallbackFactory.class)
+@FeignClient(contextId = "remoteDeviceService", value = ServiceNameConstants.SYSTEM_SERVICE)
 public interface RemoteDeviceService {
-    @GetMapping("/device/getSysDeviceByOrgId")
-    List<SysDevice> getSysDeviceByOrgId(@RequestParam("orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
-    @GetMapping("/device/getSysDeviceByHostId")
-    List<SysDevice> getSysDeviceByHostId(@RequestParam("hostId")Long hostId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @GetMapping("/device/getInfoById")
+    SysDevice getInfoById(@RequestParam("id") Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }

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

@@ -226,6 +226,10 @@ public class SysWorkTime extends BaseEntity {
      */
     @ApiModelProperty(value = "是否手动配置1是0否")
     private Long isManual;
+    @TableField(exist = false)
+    private Integer page;
+    @TableField(exist = false)
+    private Integer size;
 
 
     @Override

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteDeviceFallbackFactory.java

@@ -22,12 +22,7 @@ public class RemoteDeviceFallbackFactory implements FallbackFactory<RemoteDevice
         log.error("用户服务调用失败:{}", cause.getMessage());
         return new RemoteDeviceService() {
             @Override
-            public List<SysDevice> getSysDeviceByOrgId(Long orgId, String source) {
-                return null;
-            }
-
-            @Override
-            public List<SysDevice> getSysDeviceByHostId(Long hostId, String source) {
+            public SysDevice getInfoById(Long id, String source) {
                 return null;
             }
         };

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

@@ -41,10 +41,10 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
      */
     @ApiOperation(value = "获取CoreMonitoringTaskMonitorInfo详细信息")
     @RequiresPermissions("core:info:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    @GetMapping(value = "/getInfo")
+    public AjaxResult getInfo( Long taskId,Long hostId,Long videoId) {
         //传入监控id，因为一个监控对应一个项目
-        return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorById(id));
+        return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,hostId,videoId));
     }
 
     /**

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

@@ -25,65 +25,74 @@ import com.xunmei.common.core.web.domain.BaseEntity;
 @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;
+@ApiModel(value = "CoreMonitoringTaskRegistrationMonitor对象", description = "调阅任务登记监控")
+public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     @TableId(type = IdType.AUTO)
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 调阅任务扫描主键 */
-            @ApiModelProperty(value = "调阅任务扫描主键")
-            @JsonSerialize(using = ToStringSerializer.class)
+    /**
+     * 调阅任务扫描主键
+     */
+    @ApiModelProperty(value = "调阅任务扫描主键")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long taskRegistrationId;
 
-    /** 监控主机id */
-            @ApiModelProperty(value = "监控主机id")
-            @JsonSerialize(using = ToStringSerializer.class)
+    /**
+     * 监控主机id
+     */
+    @ApiModelProperty(value = "监控主机id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long host;
 
-    /** 视频通道 */
-            @ApiModelProperty(value = "视频通道")
-            @JsonSerialize(using = ToStringSerializer.class)
+    /**
+     * 视频通道
+     */
+    @ApiModelProperty(value = "视频通道")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long videoChannel;
 
-    /** 0未删除2已删除 */
+    /**
+     * 0未删除2已删除
+     */
     private String delFlag;
 
-                                                                                                                                                                                                                                                                                                                                                                        
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
 
 
-                .append("id" ,getId())
+                .append("id", getId())
 
 
-                .append("taskRegistrationId" ,getTaskRegistrationId())
+                .append("taskRegistrationId", getTaskRegistrationId())
 
 
-                .append("host" ,getHost())
+                .append("host", getHost())
 
 
-                .append("videoChannel" ,getVideoChannel())
+                .append("videoChannel", getVideoChannel())
 
 
-                .append("createTime" ,getCreateTime())
+                .append("createTime", getCreateTime())
 
 
-                .append("createBy" ,getCreateBy())
+                .append("createBy", getCreateBy())
 
 
-                .append("updateTime" ,getUpdateTime())
+                .append("updateTime", getUpdateTime())
 
 
-                .append("updateBy" ,getUpdateBy())
+                .append("updateBy", getUpdateBy())
 
 
-                .append("delFlag" ,getDelFlag())
-        .toString();
-        }
-        }
+                .append("delFlag", getDelFlag())
+                .toString();
+    }
+}

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

@@ -6,6 +6,7 @@ import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO;
 import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -85,4 +86,6 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
      * @return
      */
  CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
+
+    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(@Param("taskId") Long taskId,@Param("host") Long host, @Param("videoChannel")Long videoChannel);
 }

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

@@ -73,4 +73,6 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
     CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId);
 
     CoreMonitoringTaskRegistrationMonitorVO selectMonitorById(Long id);
+
+    CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,Long hostId,Long videoId);
 }

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

@@ -80,7 +80,7 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
         //新增项目
         List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
-        if (CollectionUtils.isNotEmpty(coreMonitoringTaskMonitorInfoList)) {
+        if (coreMonitoringTaskMonitorInfoList!=null&&coreMonitoringTaskMonitorInfoList.size()>0) {
             for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
                 c.setCreateTime(DateUtils.getNowDate());
                 c.setCreateBy(SecurityUtils.getUsername());
@@ -104,33 +104,61 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
     @Override
     public int updateCoreMonitoringTaskMonitorInfo(CoreMonitoringTaskRegistrationMonitorDTO coreMonitoringTaskRegistrationMonitorDTO) {
         //修改监控
-        CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor = coreMonitoringTaskRegistrationMonitorMapper.selectById(coreMonitoringTaskRegistrationMonitorDTO.getId());
-        coreMonitoringTaskRegistrationMonitor.setHost(coreMonitoringTaskRegistrationMonitorDTO.getHost());
-        coreMonitoringTaskRegistrationMonitor.setVideoChannel(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel());
-        coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
-        coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
-        coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
-        QueryWrapper<CoreMonitoringTaskMonitorInfo> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("task_monitor_id", coreMonitoringTaskRegistrationMonitor.getId());
-        coreMonitoringTaskMonitorInfoMapper.delete(queryWrapper);
         int i = 0;
-        if (CollectionUtils.isNotEmpty(coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList())) {
-            for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList()) {
-                c.setUpdateTime(DateUtils.getNowDate());
-                c.setUpdateBy(SecurityUtils.getUsername());
-                c.setId(IdWorker.getId());
-                c.setCreateTime(DateUtils.getNowDate());
-                c.setCreateBy(SecurityUtils.getUsername());
-                c.setDelFlag("0");
-                c.setTaskMonitorId(coreMonitoringTaskRegistrationMonitorDTO.getId());
-                i = coreMonitoringTaskMonitorInfoMapper.insert(c);
-                if (i < 1) {
-                    return i;
-                }
-            }
-        } else {
-            i = 1;
-        }
+      if (null!= coreMonitoringTaskRegistrationMonitorDTO.getId()){
+          CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor = coreMonitoringTaskRegistrationMonitorMapper.selectById(coreMonitoringTaskRegistrationMonitorDTO.getId());
+          coreMonitoringTaskRegistrationMonitor.setHost(coreMonitoringTaskRegistrationMonitorDTO.getHost());
+          coreMonitoringTaskRegistrationMonitor.setVideoChannel(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel());
+          coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
+          coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
+          coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
+          QueryWrapper<CoreMonitoringTaskMonitorInfo> queryWrapper = new QueryWrapper();
+          queryWrapper.eq("task_monitor_id", coreMonitoringTaskRegistrationMonitor.getId());
+          coreMonitoringTaskMonitorInfoMapper.delete(queryWrapper);
+
+          if (CollectionUtils.isNotEmpty(coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList())) {
+              for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList()) {
+                  c.setUpdateTime(DateUtils.getNowDate());
+                  c.setUpdateBy(SecurityUtils.getUsername());
+                  c.setId(IdWorker.getId());
+                  c.setCreateTime(DateUtils.getNowDate());
+                  c.setCreateBy(SecurityUtils.getUsername());
+                  c.setDelFlag("0");
+                  c.setTaskMonitorId(coreMonitoringTaskRegistrationMonitorDTO.getId());
+                  i = coreMonitoringTaskMonitorInfoMapper.insert(c);
+                  if (i < 1) {
+                      return i;
+                  }
+              }
+          } else {
+              i = 1;
+          }
+      }else {
+          CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskMonitorInfo1 = new CoreMonitoringTaskRegistrationMonitor();
+          coreMonitoringTaskMonitorInfo1.setDelFlag("0");
+          coreMonitoringTaskMonitorInfo1.setHost(coreMonitoringTaskRegistrationMonitorDTO.getHost());
+          coreMonitoringTaskMonitorInfo1.setVideoChannel(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel());
+          coreMonitoringTaskMonitorInfo1.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
+          coreMonitoringTaskMonitorInfo1.setCreateTime(DateUtils.getNowDate());
+          coreMonitoringTaskMonitorInfo1.setCreateBy(SecurityUtils.getUsername());
+          coreMonitoringTaskMonitorInfo1.setId(IdWorker.getId());
+          coreMonitoringTaskMonitorInfo1.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
+          i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo1);
+          //新增项目
+          List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
+          if (CollectionUtils.isNotEmpty(coreMonitoringTaskMonitorInfoList)) {
+              for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
+                  c.setCreateTime(DateUtils.getNowDate());
+                  c.setCreateBy(SecurityUtils.getUsername());
+                  c.setId(IdWorker.getId());
+                  c.setTaskMonitorId(coreMonitoringTaskMonitorInfo1.getId());
+                  i = coreMonitoringTaskMonitorInfoMapper.insert(c);
+                  if (i < 1) {
+                      return i;
+                  }
+              }
+          }
+      }
         return i;
     }
 

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

@@ -1,17 +1,24 @@
 package com.xunmei.core.access.service.impl;
 
 
+import java.util.ArrayList;
 import java.util.List;
+
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
+import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
+import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
 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 com.xunmei.system.api.RemoteDeviceService;
+import com.xunmei.system.api.domain.SysDevice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -32,6 +39,10 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
     private CoreMonitoringTaskRegistrationMonitorMapper coreMonitoringTaskRegistrationMonitorMapper;
     @Autowired
     private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;
+    @Autowired
+    private RemoteDeviceService remoteDeviceService;
+    @Autowired
+    private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
 
     /**
      * 查询调阅任务登记监控
@@ -103,12 +114,12 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
 
     @Override
     public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationList(Long taskId) {
-       //查询任务
+        //查询任务
         CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = coreMonitoringTaskRegistrationMonitorMapper.selectTaskName(taskId);
         if (null != coreMonitoringTaskRegistrationVO) {
             //查询视频
             List<CoreMonitoringTaskRegistrationMonitorVO> coreMonitoringTaskRegistrationMonitorVOS = coreMonitoringTaskRegistrationMonitorMapper.selectMonitorByTaskRegistrationId(coreMonitoringTaskRegistrationVO.getId());
-            if (CollectionUtils.isNotEmpty(coreMonitoringTaskRegistrationMonitorVOS)) {
+            if (coreMonitoringTaskRegistrationMonitorVOS!=null&&coreMonitoringTaskRegistrationMonitorVOS.size()>0) {
                 coreMonitoringTaskRegistrationMonitorVOS.forEach(c -> {
                     //查询项目
                     List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(c.getId());
@@ -124,9 +135,36 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
     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 = new 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;
+    }
 }

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

@@ -221,7 +221,11 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             }
         }
         if (tMonitoringRetrievalPlan.getPlanCycle().equals(ZERO.toString()) && CollectionUtils.isNotEmpty(tMonitoringRetrievalPlans)) {
-            iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+           try {
+               iCoreMonitoringRetrievalTaskService.noCycleTask(tMonitoringRetrievalPlans);
+           }catch (Exception e){
+               throw new ServiceException("下发任务异常，请联系管理员");
+           }
         }
         return i;
     }

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

@@ -1,5 +1,7 @@
 package com.xunmei.core.access.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.core.access.domain.CoreMonitoringTaskMonitorInfo;
 import com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,6 +19,9 @@ public class CoreMonitoringTaskRegistrationMonitorVO extends CoreMonitoringTaskR
     private String hostName;
     @ApiModelProperty(value = "监控通道名")
     private String videoChannelName;
+    @ApiModelProperty(value = "nfcId")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long registrationId;
     @ApiModelProperty(value = "项目列表")
     private List<CoreMonitoringTaskMonitorInfo>coreMonitoringTaskMonitorInfoList;
 }

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

@@ -23,6 +23,7 @@ import com.xunmei.common.core.domain.retrieval.vo.TaskDataVo;
 import com.xunmei.common.core.enums.RetrievalTaskCycle;
 import com.xunmei.common.core.utils.*;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.access.domain.TMonitoringRetrievalPlan;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationDTO;
 import com.xunmei.core.access.service.ITMonitoringRetrievalPlanService;
@@ -33,6 +34,7 @@ import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysDictData;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import com.xunmei.system.api.model.LoginUser;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
@@ -142,6 +144,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (null == coreMonitoringTaskRegistrationDTO.getOrgId()) {
+            coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
+        }
         Page<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
         TableDataInfo<CoreMonitoringRetrievalTask> tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");

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

@@ -85,6 +85,25 @@
         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>
 
     <insert id="insertCoreMonitoringTaskRegistrationMonitor" parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
         insert into core_monitoring_task_registration_monitor

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

@@ -4,6 +4,9 @@ import java.util.List;
 
 import com.xunmei.common.security.annotation.InnerAuth;
 import com.xunmei.system.api.domain.SysDevice;
+import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.domain.SysRole;
+import com.xunmei.system.service.impl.SysDeviceServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -64,7 +67,7 @@ public class SysDeviceController extends BaseController {
     @RequiresPermissions("system:device:query")
     @GetMapping(value = "/getHostByOrgId/{orgId}")
     public AjaxResult getHostByOrgId(@PathVariable(value = "orgId", required = false) Long orgId) {
-        return success(sysDeviceService.getHostByOrgId(orgId,null));
+        return success(sysDeviceService.getHostByOrgId(orgId, null));
     }
 
     /**
@@ -73,15 +76,22 @@ public class SysDeviceController extends BaseController {
     @ApiOperation(value = "通过机构id查询主机")
     @RequiresPermissions("system:device:query")
     @GetMapping(value = "/getSysDeviceByOrgId")
-    public AjaxResult getSysDeviceByOrgId(Long orgId,Long monitorId) {
-        return success(sysDeviceService.getHostByOrgId(orgId,monitorId));
+    public AjaxResult getSysDeviceByOrgId(Long orgId, Long monitorId) {
+        return success(sysDeviceService.getHostByOrgId(orgId, monitorId));
+    }
+
+    @ApiOperation(value = "通过任务id查询主机和主机下的视频，并且返回状态")
+    @RequiresPermissions("system:device:query")
+    @GetMapping(value = "/getSysDeviceByTaskId/{taskId}")
+    public AjaxResult getSysDeviceByTaskId(@PathVariable(value = "taskId", required = false) Long taskId) {
+        return success(sysDeviceService.getHostVideoByTaskId(taskId));
     }
 
     @ApiOperation(value = "通过主机查询视频监控")
     @RequiresPermissions("system:device:query")
     @GetMapping(value = "/getSysDeviceByHostId")
-    public AjaxResult getSysDeviceByHostId(Long hostId,Long monitorId) {
-        return success(sysDeviceService.getSysDeviceByHostId(hostId,monitorId));
+    public AjaxResult getSysDeviceByHostId(Long hostId, Long monitorId) {
+        return success(sysDeviceService.getSysDeviceByHostId(hostId, monitorId));
     }
 
     /**
@@ -94,7 +104,18 @@ public class SysDeviceController extends BaseController {
     public AjaxResult add(@RequestBody SysDevice sysDevice) {
         return toAjax(sysDeviceService.insertSysDevice(sysDevice));
     }
+/*    @InnerAuth
+    @PostMapping("/getInfoById")
+    public List<SysDevice> getInfoById( SysOrg sysOrg) {
+        return orgService.listByParentIdAndType(sysOrg.getParentId(), sysOrg.getType(), sysOrg.getPath());
+    }*/
 
+    @ApiOperation(value = "根据id查询设备")
+    @InnerAuth
+    @GetMapping(value = "/getInfoById")
+    public SysDevice getInfoById(Long id) {
+        return sysDeviceService.getById(id);
+    }
     /**
      * 修改【请填写功能名称】
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/domain/SysAreaCheck.java

@@ -39,7 +39,8 @@ public class SysAreaCheck extends BaseEntity {
      */
     @ApiModelProperty(value = "采集点名称")
     private String checkName;
-
+    @ApiModelProperty(value = "机构路径")
+private String orgPath;
     /**
      * 区域id
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/dto/SysAreaCheckDTO.java

@@ -6,6 +6,8 @@ import com.xunmei.common.core.web.domain.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author :LuoWei
  * @date : 2023/9/8
@@ -27,14 +29,13 @@ public class SysAreaCheckDTO extends PageRequest {
     @ApiModelProperty(value = "区域id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long areaId;
-
+private String orgPath;
     /**
      * 机构id
      */
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
-
     /**
      * 修改人id
      */

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysDeviceMapper.java

@@ -1,10 +1,14 @@
 package com.xunmei.system.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysDevice;
-import org.apache.ibatis.annotations.Mapper;
+import com.xunmei.system.vo.area.AccessType;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -12,7 +16,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author xunmei
  * @date 2023-08-22
  */
-@Mapper
+@Component
 public interface SysDeviceMapper extends BaseMapper<SysDevice> {
     /**
      * 查询【请填写功能名称】
@@ -33,6 +37,14 @@ public interface SysDeviceMapper extends BaseMapper<SysDevice> {
     List<SysDevice> getHostByOrgId(Long orgId);
 
     /**
+     *
+     * @param orgId
+     * @param videoId
+     * @return
+     */
+
+    List<AccessType> getAccessByVideo(@Param("videoId") Long videoId,@Param("taskId") Long taskId);
+    /**
      * 查询【请填写功能名称】列表
      *
      * @param sysDevice 【请填写功能名称】

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -6,7 +6,7 @@ import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.vo.SysOrgVO;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -16,6 +16,7 @@ import java.util.List;
  * @author xunmei
  * @date 2023-08-10
  */
+@Component
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
     /**
      * 查询【请填写功能名称】
@@ -25,6 +26,7 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
      */
     SysOrg selectSysOrgById(Long id);
 
+    Long getOrgIdByTaskId(Long taskId);
     /**
      * 查询【请填写功能名称】列表
      *

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

@@ -6,6 +6,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.system.api.domain.SysDevice;
+import com.xunmei.system.vo.area.HostVO;
 
 /**
  * 【设备管理】Service接口
@@ -26,7 +27,9 @@ public interface ISysDeviceService extends IService<SysDevice> {
      * @param orgId
      * @return
      */
-    List<SysDevice> getHostByOrgId(Long orgId,Long monitorId);
+    List<SysDevice> getHostByOrgId(Long orgId, Long monitorId);
+
+    List<HostVO> getHostVideoByTaskId(Long taskId);
 
     /**
      * 查询【设备管理】列表
@@ -36,7 +39,7 @@ public interface ISysDeviceService extends IService<SysDevice> {
      */
     List<SysDevice> selectSysDeviceList(SysDevice sysDevice);
 
-    List<SysDevice> getSysDeviceByHostId(Long hostId,Long monitorId);
+    List<SysDevice> getSysDeviceByHostId(Long hostId, Long monitorId);
 
     /**
      * 新增【设备管理】

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

@@ -42,22 +42,19 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
     @Autowired
     private SysAreaCheckMapper sysAreaCheckMapper;
     @Autowired
-    private SysOrgMapper sysOrgMapper;
-    @Autowired
     private SysNfcBindMapper sysNfcBindMapper;
-
+    @Autowired
+    private ISysOrgService orgService;
     @Override
     public TableDataInfo<SysAreaCheckVO> selectPage(SysAreaCheckDTO sysAreaCheck) {
         //未删除
         sysAreaCheck.setDelFlag("0");
-        Page<SysAreaCheck> page;
-        //先全部查出
-        sysAreaCheck.setCheckSub(true);
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("parent_id", -1);
-        SysOrg sysOrg1 = sysOrgMapper.selectOne(queryWrapper);
-        if (null == sysAreaCheck.getOrgId()) {
-            sysAreaCheck.setOrgId(sysOrg1.getId());
+        if (sysAreaCheck.getCheckSub()){
+            SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
+            //清空前端传递的org_id
+            sysAreaCheck.setOrgId(null);
+            //添加in条件
+            sysAreaCheck.setOrgPath(sysOrg.getPath());
         }
         //获取数据
         Page<SysAreaCheckVO> sysAreaCheckVOPage = sysAreaCheckMapper.selectSysAreaVO(sysAreaCheck.getPageRequest(), sysAreaCheck);
@@ -116,6 +113,8 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         if (aLong > 0) {
             throw new ServiceException("名称不能重复");
         }
+        SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
+        sysAreaCheck.setOrgPath(sysOrg.getPath());
         sysAreaCheck.setCreateTime(DateUtils.getNowDate());
         sysAreaCheck.setCreateBy(SecurityUtils.getUsername());
         sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
@@ -141,6 +140,8 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         if (null != sysAreaCheck1 && sysAreaCheck1.getId() != sysAreaCheck.getId()) {
             throw new ServiceException("名称不能重复");
         }
+        SysOrg sysOrg = orgService.selectSysOrgById(sysAreaCheck.getOrgId());
+        sysAreaCheck.setOrgPath(sysOrg.getPath());
         sysAreaCheck.setUpdateBy(SecurityUtils.getUsername());
         sysAreaCheck.setUpdateTime(DateUtils.getNowDate());
         sysAreaCheck.setUpdateId(SecurityUtils.getUserId().toString());

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

@@ -1,6 +1,5 @@
 package com.xunmei.system.service.impl;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,11 +9,17 @@ import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.mapper.SysOrgMapper;
+import com.xunmei.system.vo.area.AccessType;
+import com.xunmei.system.vo.area.HostVO;
+import com.xunmei.system.vo.area.VideoVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import com.xunmei.system.service.ISysOrgService;
 
 import java.util.Arrays;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -35,6 +40,8 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
     private SysDeviceMapper sysDeviceMapper;
     @Autowired
     private ISysOrgService orgService;
+    @Autowired
+    private SysOrgMapper sysOrgMapper;
 
     @Override
     public TableDataInfo<SysDevice> selectPage(SysDevice sysDevice) {
@@ -104,6 +111,100 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         return hostByOrgId;
     }
 
+/*    @Override
+    public List<HostVO> getHostVideoByOrgId(Long orgId) {
+        List<HostVO> hostVOS = new ArrayList<>();
+        //查询所有视频主机
+        List<SysDevice> hostByOrgId = sysDeviceMapper.getHostByOrgId(orgId);
+        hostByOrgId.forEach(h -> {
+            HostVO hostVO = new HostVO();
+            hostVO.setHostId(h.getId());
+            hostVO.setHostName(h.getDeviceName());
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("del_flag", "0");
+            queryWrapper.eq("host_id", h.getId());
+            //查询视频
+            List<SysDevice> sysDevices = baseMapper.selectList(queryWrapper);
+            if (CollectionUtils.isNotEmpty(sysDevices)) {
+                List<VideoVO> videoVOS = new ArrayList<>();
+                sysDevices.forEach(s -> {
+                    VideoVO videoVO = new VideoVO();
+                    videoVO.setVideoId(s.getId());
+                    videoVO.setVideoName(s.getDeviceName());
+                    List<Map> accessByVideo = sysDeviceMapper.getAccessByVideo(orgId, s.getId());
+                    if (CollectionUtils.isNotEmpty(accessByVideo)) {
+                        accessByVideo.forEach(a -> {
+                            String situation = a.get("situation").toString();
+                            int num = Integer.parseInt(a.get("num").toString());
+                            videoVO.setType(1);
+                            if (situation.equals("1") && num > 0) {
+                                videoVO.setType(2);
+                            }
+                        });
+                    } else {
+                        videoVO.setType(0);
+                    }
+                    videoVOS.add(videoVO);
+                });
+                hostVO.setDeviceVOS(videoVOS);
+            }
+            hostVOS.add(hostVO);
+        });
+        return hostVOS;
+    }*/
+
+    @Override
+    public List<HostVO> getHostVideoByTaskId(Long taskId) {
+        List<HostVO> hostVOS = new ArrayList<>();
+        Long orgIdByTaskId = sysOrgMapper.getOrgIdByTaskId(taskId);
+        List<SysDevice> hostByOrgId = sysDeviceMapper.getHostByOrgId(orgIdByTaskId);
+        hostByOrgId.forEach(h -> {
+            HostVO hostVO = new HostVO();
+            hostVO.setHostId(h.getId());
+            hostVO.setHostName(h.getDeviceName());
+            QueryWrapper queryWrapper = new QueryWrapper();
+            queryWrapper.eq("del_flag", "0");
+            queryWrapper.eq("host_id", h.getId());
+            //查询视频
+            List<SysDevice> sysDevices = baseMapper.selectList(queryWrapper);
+            if (CollectionUtils.isNotEmpty(sysDevices)) {
+                List<VideoVO> videoVOS = new ArrayList<>();
+                sysDevices.forEach(s -> {
+                    VideoVO videoVO = new VideoVO();
+                    videoVO.setVideoId(s.getId());
+                    videoVO.setVideoName(s.getDeviceName());
+                    List<AccessType> accessByVideo = sysDeviceMapper.getAccessByVideo(s.getId(), taskId);
+                    if (accessByVideo.size()>0) {
+                        for (AccessType a:accessByVideo){
+                            String situation = a.getSituation();
+                            int num = a.getNum();
+                            videoVO.setType(1);
+                            if (situation.equals("1") && num > 0) {
+                                videoVO.setType(2);
+                                break;
+                            }
+                        }
+                  /*      accessByVideo.forEach(a -> {
+                            String situation = a.getSituation();
+                            int num = a.getNum();
+                            videoVO.setType(1);
+                            if (situation.equals("1") && num > 0) {
+                                videoVO.setType(2);
+                            }
+                        });*/
+
+                    } else {
+                        videoVO.setType(0);
+                    }
+                    videoVOS.add(videoVO);
+                });
+                hostVO.setDeviceVOS(videoVOS);
+            }
+            hostVOS.add(hostVO);
+        });
+        return hostVOS;
+    }
+
     /**
      * 查询【请填写功能名称】列表
      *

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

@@ -74,7 +74,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             query.like("role_name", role.getRoleName());
         }
         if (role.getParams().get("beginTime") != null && role.getParams().get("endTime") != null) {
-            query.between("create_time", role.getParams().get("beginTime"), role.getParams().get("endTime"));
+            query.between("create_time", role.getParams().get("beginTime")+" 00:00:00", role.getParams().get("endTime")+" 23:59:59");
         }
         page = roleMapper.selectPage(page, query);
         return TableDataInfo.build(page);

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

@@ -73,8 +73,8 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
 //        sysWorkTime.setDeleted(0L);
         Page<SysWorkTime> page;
         //分页
-        if (sysWorkTime.getPageNum() != null && sysWorkTime.getPageSize() != null) {
-            page = new Page<>(sysWorkTime.getPageNum(), sysWorkTime.getPageSize());
+        if (sysWorkTime.getPageNum() != null && sysWorkTime.getSize() != null) {
+            page = new Page<>(sysWorkTime.getPageNum(), sysWorkTime.getSize());
         } else {
             page = new Page<>();
         }

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

@@ -11,6 +11,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.utils.DateUtils;
+import com.xunmei.common.core.utils.Ymd;
 import com.xunmei.common.core.utils.snowId.DateHelper;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.system.api.domain.SysOrg;
@@ -19,6 +20,7 @@ import com.xunmei.system.domain.SysWorkTimeSetDayofweek;
 import com.xunmei.system.mapper.SysWorkTimeMapper;
 import com.xunmei.system.mapper.SysWorkTimeSetDayofweekMapper;
 import com.xunmei.common.core.util.BeanHelper;
+import com.xunmei.system.service.ISysWorkTimeService;
 import com.xunmei.system.util.StreamHelper;
 
 import org.springframework.beans.BeanUtils;
@@ -52,6 +54,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
     private SysWorkTimeSetDayofweekMapper sysWorkTimeSetDayofweekMapper;
     @Autowired
     private SysWorkTimeMapper sysWorkTimeMapper;
+    @Autowired
+    private ISysWorkTimeService workTimeService;
 
     @Override
     public TableDataInfo<SysWorkTimeSet> selectPage(SysWorkTimeSet sysWorkTimeSet) {
@@ -426,6 +430,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             }
 //            final SysWorkTime workTime = SysWorkTime.of(orgId, workTimeEditDto.getDate());
             final SysWorkTime workTime = new SysWorkTime();
+            workTime.setOrgId(orgId);
+            workTime.setYmd(Ymd.of(workTimeEditDto.getDate()));
             BeanHelper.copyProperties(workTime, workTimeEditDto);
             workTime.setIsManual(0L);
             workTime.setIsEnable(workTimeEditDto.getIsEnable());
@@ -444,11 +450,24 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         List<SysWorkTime> list1 = workTimeList.stream().filter(s -> {
             return list.stream().noneMatch(f -> f.getOrgId().equals(s.getOrgId()) && f.getYmdDate().equals(s.getYmd().getDate()));
         }).collect(Collectors.toList());
+//        for (SysWorkTime s :
+//                list1) {
+//            sysWorkTimeMapper.insert(s);
+//            workTimeList.add(s);
+//        }
         for (SysWorkTime s :
                 list1) {
-            sysWorkTimeMapper.insert(s);
-            workTimeList.add(s);
+            s.setYmdDate(s.getDate());
+            s.setYmdDay(Long.valueOf(s.getYmd().getDay()));
+            s.setYmdHalfyear(Long.valueOf(s.getYmd().getHalfyear()));
+            s.setYmdHour(Long.valueOf(s.getYmd().getHour()));
+            s.setYmdMinute(Long.valueOf(s.getYmd().getMinute()));
+            s.setYmdMonth(Long.valueOf(s.getYmd().getMonth()));
+            s.setYmdQuarter(Long.valueOf(s.getYmd().getQuarter()));
+            s.setYmdWeek(Long.valueOf(s.getYmd().getWeek()));
+            s.setYmdYear(Long.valueOf(s.getYmd().getYear()));
         }
+        workTimeService.saveOrUpdateBatch(list1);
 
         return workTimeList;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/vo/area/AccessType.java

@@ -0,0 +1,13 @@
+package com.xunmei.system.vo.area;
+
+import lombok.Data;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/9/11
+ */
+@Data
+public class AccessType {
+    private String situation;
+    private Integer num;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/vo/area/HostVO.java

@@ -0,0 +1,17 @@
+package com.xunmei.system.vo.area;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.util.List;
+
+/**
+ * @author :LuoWei
+ * @date : 2023/9/11
+ */
+@Data
+public class HostVO {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long hostId;
+    private String hostName;
+    private List<VideoVO> deviceVOS;
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/vo/area/VideoVO.java

@@ -0,0 +1,21 @@
+package com.xunmei.system.vo.area;
+
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
+import lombok.Data;
+
+
+
+/**
+ * @author :LuoWei
+ * @date : 2023/9/11
+ */
+@Data
+public class VideoVO {
+    @JsonSerialize(using = ToStringSerializer.class)
+    private  Long videoId;
+    private String videoName;
+    private Integer type;
+}

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

@@ -87,6 +87,9 @@
         <if test="sysAreaCheck.orgId !=null">
             and org_id=#{sysAreaCheck.orgId}
         </if>
+<if test="sysAreaCheck.orgPath !=null">
+    and org_path like concat(#{sysAreaCheck.orgPath}, '%')
+</if>
     </select>
 
 

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

@@ -91,13 +91,37 @@
         org_id =#{orgId} and del_flag='0' and device_type='0'
     </select>
     <select id="selectVideoChannelByMonitorId" resultType="java.lang.Long">
-        SELECT
-            video_channel
-        FROM
-            core_monitoring_task_registration_monitor
-        WHERE
-            task_registration_id = #{monitorId}
+        SELECT video_channel
+        FROM core_monitoring_task_registration_monitor
+        WHERE task_registration_id = #{monitorId}
+    </select>
+    <select id="getAccessByVideo" resultType="com.xunmei.system.vo.area.AccessType">
+        SELECT cmtmi.situation AS situation,
+                       COUNT(cmtrm.id) AS num
+                FROM core_monitoring_retrieval_task cmrt
+                     LEFT JOIN core_monitoring_task_registration cmtr ON cmrt.id = cmtr.task_id
+                  LEFT JOIN core_monitoring_task_registration_monitor cmtrm ON cmtrm.task_registration_id = cmtr.id
+                   LEFT JOIN core_monitoring_task_monitor_info cmtmi ON cmtmi.task_monitor_id = cmtrm.id
+          WHERE cmtmi.situation IS NOT NULL
+             AND cmtrm.video_channel = #{videoId}
+           and cmrt.id = #{taskId}
+           GROUP BY cmtmi.situation
+
     </select>
+    <!--    <select id="getAccessByVideo" resultType="java.util.Map">-->
+<!--        SELECT cmtmi.situation AS situation,-->
+<!--               COUNT(cmtrm.id) AS num-->
+<!--        FROM core_monitoring_retrieval_task cmrt-->
+<!--                 LEFT JOIN core_monitoring_task_registration cmtr ON cmrt.id = cmtr.task_id-->
+<!--                 LEFT JOIN core_monitoring_task_registration_monitor cmtrm ON cmtrm.task_registration_id = cmtr.id-->
+<!--                 LEFT JOIN core_monitoring_task_monitor_info cmtmi ON cmtmi.task_monitor_id = cmtrm.id-->
+<!--        WHERE 1 = 1-->
+<!--          AND cmtrm.video_channel = #{videoId}-->
+<!--          and cmrt.id = #{taskId}-->
+<!--          AND cmtmi.situation IS NOT NULL-->
+<!--        GROUP BY cmtmi.situation-->
+<!--    </select>-->
+
 
     <insert id="insertSysDevice" parameterType="com.xunmei.system.api.domain.SysDevice">
         insert into sys_device

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

@@ -640,6 +640,9 @@
         <if test="  org.isLock != null">
             and o.is_lock =#{org.isLock}
         </if>
+        <if test="  org.type != null and org.type !=''">
+            and o.type =#{org.type}
+        </if>
         <if test="  org.name != null and org.name !=''">
             and o.name like concat(concat('%',#{org.name}),'%')
         </if>
@@ -650,4 +653,7 @@
             and o.path like concat(concat('%',#{org.path}),'%')
         </if>
     </select>
+    <select id="getOrgIdByTaskId" resultType="java.lang.Long">
+        SELECT org_id FROM core_monitoring_retrieval_task cmrt WHERE id=#{taskId}
+    </select>
 </mapper>