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

project_data/sql/0.0.7/soc/soc.sql

@@ -50,12 +50,21 @@ CREATE PROCEDURE schema_change () BEGIN
             ADD COLUMN `out_in_request_effective_end_time` datetime NULL COMMENT '出入申请生效结束时间' AFTER `out_in_request_effective_start_time`,
             ADD COLUMN `out_in_request_id` bigint NULL COMMENT '出入申请Id' AFTER `out_in_request_effective_end_time`,
             ADD COLUMN `out_in_request_user_id` bigint NULL COMMENT '出入人员在出入申请中的人员ID' AFTER `out_in_request_id`,
-            ADD COLUMN `submit_sign` varchar(125) NULL COMMENT '登记人签名' AFTER `out_in_request_user_id`,
+            ADD COLUMN `submit_sign` varchar(255) NULL COMMENT '登记人签名' AFTER `out_in_request_user_id`,
             ADD COLUMN `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人' AFTER `submit_sign`,
             ADD COLUMN `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间' AFTER `update_by`;
     END IF;
 
     IF EXISTS(SELECT *
+              FROM information_schema.columns
+              WHERE table_schema = DATABASE()
+                AND table_name = 'core_out_in_record'
+                AND column_name = 'submit_sign') THEN
+        ALTER TABLE `core_out_in_record`
+            MODIFY COLUMN `submit_sign` varchar(255) NULL DEFAULT NULL COMMENT '登记人签名' AFTER `out_in_request_user_id`;
+    END IF;
+
+    IF EXISTS(SELECT *
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_introduce_letter_approve_log'
@@ -67,7 +76,7 @@ CREATE PROCEDURE schema_change () BEGIN
     IF NOT EXISTS(SELECT *
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
-                    AND table_name = 'core_introduce_letter_approve_log'
+                    AND table_name = 'core_introduce_letter_out_in_request'
                     AND column_name = 'letter_name') THEN
             ALTER TABLE `core_introduce_letter_out_in_request`
                 ADD COLUMN `approve_sign_img` varchar(255) NULL COMMENT '审批人签名' AFTER `approve_remark`,

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/retrieval/domain/CoreMonitoringRetrievalTask.java

@@ -177,6 +177,8 @@ public class CoreMonitoringRetrievalTask extends BaseEntity {
 
     private String pdfUrl;
 
+    @ApiModelProperty(value = "结束调阅签名图片")
+    private String signImg;
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -1,6 +1,7 @@
 package com.xunmei.core.access.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.xunmei.core.access.dto.CoreMonitoringTaskRegistrationMonitorDTO;
 import com.xunmei.core.access.service.ICoreMonitoringTaskMonitorInfoService;
 import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
@@ -40,9 +41,13 @@ public class CoreMonitoringTaskMonitorInfoController extends BaseController {
     @ApiOperation(value = "获取CoreMonitoringTaskMonitorInfo详细信息")
    // @RequiresPermissions("core:info:query")
     @GetMapping(value = "/getInfo")
-    public AjaxResult getInfo( Long taskId,Long hostId,Long videoId) {
-        //传入监控id，因为一个监控对应一个项目
-        return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,hostId,videoId));
+    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));
+        }
+
+        return success(coreMonitoringTaskRegistrationMonitorService.selectMonitorByInfo(taskId,areaValue,areaName));
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.xunmei.core.access.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -76,4 +77,11 @@ public class CoreMonitoringTaskRegistration extends BaseEntity {
     private String endPicture;
     @ApiModelProperty(value = "调阅时长")
     private Double   averageDuration;
+
+    /**
+     * 图片地址
+     */
+    @TableField(exist = false)
+    @ApiModelProperty(value = "结束调阅签名图片")
+    private String signImgUrl;
 }

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

@@ -72,8 +72,7 @@ public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity {
 
     @TableField(value = "area_name")
     @ApiModelProperty(value = "区域名")
-    private String areaName
-            ;
+    private String areaName;
 
 
     @Override
@@ -106,6 +105,8 @@ public class CoreMonitoringTaskRegistrationMonitor extends BaseEntity {
 
 
                 .append("delFlag", getDelFlag())
+                .append("areaCode", getAreaCode())
+                .append("areaName", getAreaName())
                 .toString();
     }
 }

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

@@ -40,7 +40,7 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
      * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
      * @return 结果
      */
-    int insertCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+//    int insertCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
 
     /**
      * 修改调阅任务登记监控
@@ -48,7 +48,7 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
      * @param coreMonitoringTaskRegistrationMonitor 调阅任务登记监控
      * @return 结果
      */
-    int updateCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
+//    int updateCoreMonitoringTaskRegistrationMonitor(CoreMonitoringTaskRegistrationMonitor coreMonitoringTaskRegistrationMonitor);
 
     /**
      * 删除调阅任务登记监控
@@ -89,4 +89,6 @@ public interface CoreMonitoringTaskRegistrationMonitorMapper extends BaseMapper<
 
     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

@@ -76,4 +76,6 @@ public interface ICoreMonitoringTaskRegistrationMonitorService extends IService<
 
     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/CoreMonitoringTaskMonitorInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.access.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -154,10 +155,14 @@ private RemoteDeviceService remoteDeviceService;
           coreMonitoringTaskMonitorInfo1.setAreaCode(coreMonitoringTaskRegistrationMonitorDTO.getAreaCode());
           coreMonitoringTaskMonitorInfo1.setAreaName(coreMonitoringTaskRegistrationMonitorDTO.getAreaName());
           coreMonitoringTaskMonitorInfo1.setTaskRegistrationId(coreMonitoringTaskRegistrationMonitorDTO.getTaskRegistrationId());
-          SysDevice sysDevice = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getHost(), SecurityConstants.INNER);
-          SysDevice sysDevice1 = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel(), SecurityConstants.INNER);
-          coreMonitoringTaskMonitorInfo1.setHostName(sysDevice.getDeviceName());
-          coreMonitoringTaskMonitorInfo1.setVideoChannelName(sysDevice1.getDeviceName());
+          if(ObjectUtil.isNotNull(coreMonitoringTaskRegistrationMonitorDTO.getHost()))
+          {
+              SysDevice sysDevice = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getHost(), SecurityConstants.INNER);
+              SysDevice sysDevice1 = remoteDeviceService.getInfoById(coreMonitoringTaskRegistrationMonitorDTO.getVideoChannel(), SecurityConstants.INNER);
+              coreMonitoringTaskMonitorInfo1.setHostName(sysDevice.getDeviceName());
+              coreMonitoringTaskMonitorInfo1.setVideoChannelName(sysDevice1.getDeviceName());
+          }
+
           i = coreMonitoringTaskRegistrationMonitorMapper.insert(coreMonitoringTaskMonitorInfo1);
           //新增项目
           List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfoList = coreMonitoringTaskRegistrationMonitorDTO.getCoreMonitoringTaskMonitorInfoList();

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

@@ -167,5 +167,27 @@ public class CoreMonitoringTaskRegistrationMonitorServiceImpl extends ServiceImp
         return coreMonitoringTaskRegistrationMonitorVO;
     }
 
+    @Override
+    public CoreMonitoringTaskRegistrationMonitorVO selectMonitorByInfo(Long taskId,String areaCode,String areaName) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("task_id", taskId);
+        List<CoreMonitoringTaskRegistration> list = coreMonitoringTaskRegistrationMapper.selectList(queryWrapper);
+        //查询视频
+        CoreMonitoringTaskRegistrationMonitorVO coreMonitoringTaskRegistrationMonitorVO = baseMapper.selectMonitorByAreaCode(taskId,areaCode);
+        if (null != coreMonitoringTaskRegistrationMonitorVO) {
+            List<CoreMonitoringTaskMonitorInfo> coreMonitoringTaskMonitorInfos = coreMonitoringTaskMonitorInfoMapper.selectCoreMonitoringTaskMonitorInfoByMonitorId(coreMonitoringTaskRegistrationMonitorVO.getId());
+            coreMonitoringTaskRegistrationMonitorVO.setCoreMonitoringTaskMonitorInfoList(coreMonitoringTaskMonitorInfos);
+        } else {
+            coreMonitoringTaskRegistrationMonitorVO = new CoreMonitoringTaskRegistrationMonitorVO();
+            coreMonitoringTaskRegistrationMonitorVO.setAreaCode(areaCode);
+            coreMonitoringTaskRegistrationMonitorVO.setAreaName(areaName);
+            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/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -147,6 +147,8 @@ private ITMonitoringRetrievalPlanService itMonitoringRetrievalPlanService;
         coreMonitoringRetrievalTask.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTask.setSubmitTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTask.setRetrievalUser(SecurityUtils.getUserId());
+        coreMonitoringRetrievalTask.setSignImg(coreMonitoringTaskRegistration.getSignImgUrl());
+
         int i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
         coreMonitoringRetrievalTask.setExceptionCount(i);
         coreMonitoringRetrievalTaskMapper.updateCoreMonitoringRetrievalTask(coreMonitoringRetrievalTask);

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

@@ -70,7 +70,9 @@ SELECT
     `host` AS `host`,
     video_channel AS videoChannel,
     video_channel_name AS videoChannelName,
-    host_name AS hostName
+    host_name AS hostName,
+    area_code,
+    area_name
 FROM
     core_monitoring_task_registration_monitor
 WHERE task_registration_id = #{taskRegistrationId}
@@ -104,82 +106,94 @@ WHERE task_registration_id = #{taskRegistrationId}
           AND sd1.id = #{videoChannel}
     </select>
 
-    <insert id="insertCoreMonitoringTaskRegistrationMonitor"
-            parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
-        insert into core_monitoring_task_registration_monitor
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,
-            </if>
-            <if test="taskRegistrationId != null">task_registration_id,
-            </if>
-            <if test="host != null">host,
-            </if>
-            <if test="videoChannel != null">video_channel,
-            </if>
-            <if test="createTime != null">create_time,
-            </if>
-            <if test="createBy != null">create_by,
-            </if>
-            <if test="updateTime != null">update_time,
-            </if>
-            <if test="updateBy != null">update_by,
-            </if>
-            <if test="delFlag != null">del_flag,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},
-            </if>
-            <if test="taskRegistrationId != null">#{taskRegistrationId},
-            </if>
-            <if test="host != null">#{host},
-            </if>
-            <if test="videoChannel != null">#{videoChannel},
-            </if>
-            <if test="createTime != null">#{createTime},
-            </if>
-            <if test="createBy != null">#{createBy},
-            </if>
-            <if test="updateTime != null">#{updateTime},
-            </if>
-            <if test="updateBy != null">#{updateBy},
-            </if>
-            <if test="delFlag != null">#{delFlag},
-            </if>
-        </trim>
-    </insert>
+    <select id="selectMonitorByAreaCode"
+            resultType="com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationMonitorVO">
+        SELECT b.id            AS id,
+               b.area_code,
+               b.area_name
+        FROM core_monitoring_task_registration a
+                 LEFT JOIN core_monitoring_task_registration_monitor b ON a.id = b.task_registration_id
+        WHERE a.task_id = #{taskId}
+          AND b.area_code = #{areaCode}
+    </select>
 
-    <update id="updateCoreMonitoringTaskRegistrationMonitor"
-            parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">
-        update core_monitoring_task_registration_monitor
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="taskRegistrationId != null">task_registration_id =
-                #{taskRegistrationId},
-            </if>
-            <if test="host != null">host =
-                #{host},
-            </if>
-            <if test="videoChannel != null">video_channel =
-                #{videoChannel},
-            </if>
-            <if test="createTime != null">create_time =
-                #{createTime},
-            </if>
-            <if test="createBy != null">create_by =
-                #{createBy},
-            </if>
-            <if test="updateTime != null">update_time =
-                #{updateTime},
-            </if>
-            <if test="updateBy != null">update_by =
-                #{updateBy},
-            </if>
-            <if test="delFlag != null">del_flag =
-                #{delFlag},
-            </if>
-        </trim>
-        where id = #{id}
-    </update>
+
+<!--    <insert id="insertCoreMonitoringTaskRegistrationMonitor"-->
+<!--            parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">-->
+<!--        insert into core_monitoring_task_registration_monitor-->
+<!--        <trim prefix="(" suffix=")" suffixOverrides=",">-->
+<!--            <if test="id != null">id,-->
+<!--            </if>-->
+<!--            <if test="taskRegistrationId != null">task_registration_id,-->
+<!--            </if>-->
+<!--            <if test="host != null">host,-->
+<!--            </if>-->
+<!--            <if test="videoChannel != null">video_channel,-->
+<!--            </if>-->
+<!--            <if test="createTime != null">create_time,-->
+<!--            </if>-->
+<!--            <if test="createBy != null">create_by,-->
+<!--            </if>-->
+<!--            <if test="updateTime != null">update_time,-->
+<!--            </if>-->
+<!--            <if test="updateBy != null">update_by,-->
+<!--            </if>-->
+<!--            <if test="delFlag != null">del_flag,-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--        <trim prefix="values (" suffix=")" suffixOverrides=",">-->
+<!--            <if test="id != null">#{id},-->
+<!--            </if>-->
+<!--            <if test="taskRegistrationId != null">#{taskRegistrationId},-->
+<!--            </if>-->
+<!--            <if test="host != null">#{host},-->
+<!--            </if>-->
+<!--            <if test="videoChannel != null">#{videoChannel},-->
+<!--            </if>-->
+<!--            <if test="createTime != null">#{createTime},-->
+<!--            </if>-->
+<!--            <if test="createBy != null">#{createBy},-->
+<!--            </if>-->
+<!--            <if test="updateTime != null">#{updateTime},-->
+<!--            </if>-->
+<!--            <if test="updateBy != null">#{updateBy},-->
+<!--            </if>-->
+<!--            <if test="delFlag != null">#{delFlag},-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--    </insert>-->
+
+<!--    <update id="updateCoreMonitoringTaskRegistrationMonitor"-->
+<!--            parameterType="com.xunmei.core.access.domain.CoreMonitoringTaskRegistrationMonitor">-->
+<!--        update core_monitoring_task_registration_monitor-->
+<!--        <trim prefix="SET" suffixOverrides=",">-->
+<!--            <if test="taskRegistrationId != null">task_registration_id =-->
+<!--                #{taskRegistrationId},-->
+<!--            </if>-->
+<!--            <if test="host != null">host =-->
+<!--                #{host},-->
+<!--            </if>-->
+<!--            <if test="videoChannel != null">video_channel =-->
+<!--                #{videoChannel},-->
+<!--            </if>-->
+<!--            <if test="createTime != null">create_time =-->
+<!--                #{createTime},-->
+<!--            </if>-->
+<!--            <if test="createBy != null">create_by =-->
+<!--                #{createBy},-->
+<!--            </if>-->
+<!--            <if test="updateTime != null">update_time =-->
+<!--                #{updateTime},-->
+<!--            </if>-->
+<!--            <if test="updateBy != null">update_by =-->
+<!--                #{updateBy},-->
+<!--            </if>-->
+<!--            <if test="delFlag != null">del_flag =-->
+<!--                #{delFlag},-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--        where id = #{id}-->
+<!--    </update>-->
 
     <delete id="deleteCoreMonitoringTaskRegistrationMonitorById" parameterType="String">
         delete

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

@@ -499,6 +499,10 @@
                 exception_count =
                 #{exceptionCount},
             </if>
+            <if test="signImg != null">
+                sign_img =
+                #{signImg},
+            </if>
         </trim>
         where id = #{id}
     </update>