监控调阅任务

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

@@ -2,6 +2,8 @@ package com.xunmei.common.core.domain.retrieval.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -28,9 +30,11 @@ public class CoreMonitoringRetrievalTask extends BaseEntity
 private static final long serialVersionUID=1L;
 
     /** 主键 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 计划id */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long planId;
 
     /** 任务名称 */
@@ -38,6 +42,7 @@ private static final long serialVersionUID=1L;
     private String taskName;
 
     /** 调阅机构 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /** 调阅机构 */
@@ -96,15 +101,19 @@ private static final long serialVersionUID=1L;
     private String status;
 
     /** 角色id */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     /** 调阅人 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long retrievalUser;
 
     /** 第几次调阅（根据计划的频次计算的来） */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer orderNum;
 
     /** 批次号（同一计划多频次为一个批次号） */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long batchNum;
 
     /** 提交时间 */
@@ -112,7 +121,7 @@ private static final long serialVersionUID=1L;
 
     /** 异常数 */
             @ApiModelProperty(value = "异常数")
-    private Long exceptionCount;
+    private Integer exceptionCount;
 
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         
 @Override

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

@@ -3,6 +3,8 @@ package com.xunmei.common.core.domain.retrieval.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,6 +32,7 @@ public class RetrievalTaskPageDto extends BaseEntity
     private String taskName;
 
     /** 调阅机构 */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /** 调阅机构 */
@@ -42,6 +45,7 @@ public class RetrievalTaskPageDto extends BaseEntity
     private String status;
 
     /** 角色id */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
         /**
          * 页面

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

@@ -1,6 +1,8 @@
 package com.xunmei.common.core.domain.retrieval.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +25,7 @@ public class CoreMonitoringRetrievalTaskOneVo {
     /**
      * 主键
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

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

@@ -2,6 +2,8 @@ package com.xunmei.common.core.domain.retrieval.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.xunmei.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,11 +29,13 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 主键
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 计划id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long planId;
 
     /**
@@ -43,6 +47,7 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 调阅机构
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orgId;
 
     /**
@@ -135,6 +140,7 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 角色id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     private String roleName;
@@ -142,6 +148,7 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 调阅人
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long retrievalUser;
 
     private String retrievalUserName;
@@ -149,11 +156,13 @@ public class CoreMonitoringRetrievalTaskVo extends BaseEntity {
     /**
      * 第几次调阅（根据计划的频次计算的来）
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long orderNum;
 
     /**
      * 批次号（同一计划多频次为一个批次号）
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long batchNum;
 
     /**

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

@@ -23,7 +23,7 @@ public interface CoreMonitoringTaskMonitorInfoMapper extends BaseMapper<CoreMoni
      */
     CoreMonitoringTaskMonitorInfo selectCoreMonitoringTaskMonitorInfoById(Long id);
 
-    long selectAbnormalByTaskId(Long taskId);
+    int selectAbnormalByTaskId(Long taskId);
     /**
      * 查询调阅任务登记检查情况列表
      *

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

@@ -104,7 +104,7 @@ public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreM
         coreMonitoringRetrievalTask.setUpdateTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTask.setSubmitTime(DateUtils.getNowDate());
         coreMonitoringRetrievalTask.setRetrievalUser(SecurityUtils.getUserId());
-        Long i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
+        int i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
         coreMonitoringRetrievalTask.setExceptionCount(i);
         coreMonitoringRetrievalTaskMapper.updateCoreMonitoringRetrievalTask(coreMonitoringRetrievalTask);
         return coreMonitoringTaskRegistrationMapper.updateById(coreMonitoringTaskRegistration);

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

@@ -51,7 +51,7 @@
         <include refid="selectCoreMonitoringTaskMonitorInfoVo"/>
         where task_monitor_id = #{monitorId}
     </select>
-    <select id="selectAbnormalByTaskId" resultType="java.lang.Long">
+    <select id="selectAbnormalByTaskId" resultType="java.lang.Integer">
         SELECT
             COUNT( cmtmi.id )
         FROM