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

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

@@ -2,6 +2,7 @@ package com.xunmei.core.access.service.impl;
 
 import java.util.List;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.utils.DateUtils;
@@ -18,7 +19,7 @@ import org.springframework.stereotype.Service;
 import java.util.Arrays;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -27,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  * @author xunmei
  * @date 2023-08-29
  */
+@Transactional
 @Service
 public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMonitoringTaskMonitorInfoMapper, CoreMonitoringTaskMonitorInfo> implements ICoreMonitoringTaskMonitorInfoService {
     @Autowired
@@ -74,18 +76,20 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskMonitorInfo.setCreateTime(DateUtils.getNowDate());
         coreMonitoringTaskMonitorInfo.setCreateBy(SecurityUtils.getUsername());
         coreMonitoringTaskMonitorInfo.setId(IdWorker.getId());
-        coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
+        int i = 0;
+        i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo);
         //新增项目
         List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();
-        int i = 0;
-        for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
-            c.setCreateTime(DateUtils.getNowDate());
-            c.setCreateBy(SecurityUtils.getUsername());
-            c.setId(IdWorker.getId());
-            c.setTaskMonitorId(coreMonitoringTaskMonitorInfo.getId());
-            i = coreMonitoringTaskMonitorInfoMapper.insert(c);
-            if (i < 1) {
-                return i;
+        if (CollectionUtils.isNotEmpty(coreMonitoringTaskMonitorInfoList)) {
+            for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskMonitorInfoList) {
+                c.setCreateTime(DateUtils.getNowDate());
+                c.setCreateBy(SecurityUtils.getUsername());
+                c.setId(IdWorker.getId());
+                c.setTaskMonitorId(coreMonitoringTaskMonitorInfo.getId());
+                i = coreMonitoringTaskMonitorInfoMapper.insert(c);
+                if (i < 1) {
+                    return i;
+                }
             }
         }
         return i;
@@ -106,8 +110,8 @@ public class CoreMonitoringTaskMonitorInfoServiceImpl extends ServiceImpl<CoreMo
         coreMonitoringTaskRegistrationMonitor.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringTaskRegistrationMonitor.setUpdateBy(SecurityUtils.getUsername());
         coreMonitoringTaskRegistrationMonitorMapper.updateById(coreMonitoringTaskRegistrationMonitor);
-        QueryWrapper<CoreMonitoringTaskMonitorInfo> queryWrapper=new QueryWrapper();
-        queryWrapper.eq("task_monitor_id",coreMonitoringTaskRegistrationMonitor.getId());
+        QueryWrapper<CoreMonitoringTaskMonitorInfo> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("task_monitor_id", coreMonitoringTaskRegistrationMonitor.getId());
         coreMonitoringTaskMonitorInfoMapper.delete(queryWrapper);
         int i = 0;
         for (CoreMonitoringTaskMonitorInfo c : coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList()) {

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

@@ -101,7 +101,7 @@
         <if test="orgId != null ">
             and org_id = #{orgId}
         </if>
-        <if test="status !=null">
+        <if test="status !=null and status !='' ">
             and status =#{status}
         </if>
      <if test="ymdDate !=null">

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

@@ -83,7 +83,7 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
     public List<SysDevice> getHostByOrgId(Long orgId, Long monitorId) {
         List<SysDevice> hostByOrgId = sysDeviceMapper.getHostByOrgId(orgId);
         if (null != monitorId) {
-            for (int i = hostByOrgId.size() - 1; i > 0; i--) {
+            for (int i = hostByOrgId.size() - 1; i >= 0; i--) {
                 List<Long> longs = sysDeviceMapper.selectVideoChannelByMonitorId(monitorId);
                 QueryWrapper queryWrapper = new QueryWrapper();
                 queryWrapper.eq("del_flag", "0");
@@ -114,7 +114,9 @@ public class SysDeviceServiceImpl extends ServiceImpl<SysDeviceMapper, SysDevice
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("del_flag", "0");
         queryWrapper.eq("host_id", hostId);
-        queryWrapper.notIn("id", longs);
+        if (CollectionUtils.isNotEmpty(longs)){
+            queryWrapper.notIn("id", longs);
+        }
         List<SysDevice> list = baseMapper.selectList(queryWrapper);
         return list;
     }

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

@@ -96,7 +96,7 @@
         FROM
             core_monitoring_task_registration_monitor
         WHERE
-            id = #{monitorId}
+            task_registration_id = #{monitorId}
     </select>
 
     <insert id="insertSysDevice" parameterType="com.xunmei.system.api.domain.SysDevice">