网络设备检测:表名修改类名修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDeviceDetection.java

@@ -29,22 +29,6 @@ public class IotDeviceDetection implements Serializable {
     @TableId("id")
     private Long id;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
     @ApiModelProperty(value = "机构")
     @TableField("org_id")
     private Long orgId;
@@ -69,5 +53,23 @@ public class IotDeviceDetection implements Serializable {
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "状态变更时间")
+    @TableField("state_update_time")
+    private LocalDateTime stateUpdateTime;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最后修改人id")
+    @TableField("modified_id")
+    private Long modifiedId;
+
+    @ApiModelProperty(value = "修改人名称")
+    @TableField("modified_name")
+    private String modifiedName;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
 }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDeviceDetectionLog.java

@@ -29,21 +29,6 @@ public class IotDeviceDetectionLog implements Serializable {
     @TableId("id")
     private Long id;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "机构")
     @TableField("org_id")
@@ -73,5 +58,24 @@ public class IotDeviceDetectionLog implements Serializable {
     @TableField("status")
     private Integer status;
 
+    @ApiModelProperty(value = "状态变更时间")
+    @TableField("state_update_time")
+    private LocalDateTime stateUpdateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "最后修改人id")
+    @TableField("modified_id")
+    private Long modifiedId;
+
+    @ApiModelProperty(value = "修改人名称")
+    @TableField("modified_name")
+    private String modifiedName;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/DataController.java

@@ -15,7 +15,6 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.util.LogUtils;
 import com.xunmei.system.api.RemoteDeviceService;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author jingyuanchao
@@ -41,7 +39,7 @@ public class DataController {
     @Resource
     private RemoteDeviceService remoteDeviceService;
     @Resource
-    private IMediatorNetworkDeviceDetectionService networkDeviceDetectionService;
+    private IotDeviceDetectionService networkDeviceDetectionService;
 
 
     /***

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorNetworkDeviceDetectionLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDeviceDetectionLogMapper.java

@@ -12,6 +12,6 @@ import com.xunmei.common.core.domain.iot.domain.IotDeviceDetectionLog;
  * @author oygj
  * @since 2024-01-31
  */
-public interface MediatorNetworkDeviceDetectionLogMapper extends BaseMapper<IotDeviceDetectionLog> {
+public interface IotDeviceDetectionLogMapper extends BaseMapper<IotDeviceDetectionLog> {
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorNetworkDeviceDetectionMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDeviceDetectionMapper.java

@@ -12,6 +12,6 @@ import com.xunmei.common.core.domain.iot.domain.IotDeviceDetection;
  * @author oygj
  * @since 2024-01-31
  */
-    public interface MediatorNetworkDeviceDetectionMapper extends BaseMapper<IotDeviceDetection> {
+    public interface IotDeviceDetectionMapper extends BaseMapper<IotDeviceDetection> {
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorNetworkDeviceDetectionLogService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDeviceDetectionLogService.java

@@ -12,6 +12,6 @@ import com.xunmei.common.core.domain.iot.domain.IotDeviceDetectionLog;
  * @author oygj
  * @since 2024-01-31
  */
-public interface IMediatorNetworkDeviceDetectionLogService extends IService <IotDeviceDetectionLog> {
+public interface IotDeviceDetectionLogService extends IService <IotDeviceDetectionLog> {
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorNetworkDeviceDetectionService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDeviceDetectionService.java

@@ -14,7 +14,7 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
  * @author oygj
  * @since 2024-01-31
  */
-public interface IMediatorNetworkDeviceDetectionService extends IService<IotDeviceDetection> {
+public interface IotDeviceDetectionService extends IService<IotDeviceDetection> {
 
     ReceiveErrorDto saveData(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, String msgId, String branchId) throws IllegalAccessException;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDeviceDetectionLogServiceImpl.java

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotDeviceDetectionLog;
+import com.xunmei.mediator.api.mapper.IotDeviceDetectionLogMapper;
+import com.xunmei.mediator.api.service.IotDeviceDetectionLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  网络设备检测日志 服务实现类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-01-31
+ */
+@Service
+public class IotDeviceDetectionLogServiceImpl extends ServiceImpl<IotDeviceDetectionLogMapper, IotDeviceDetectionLog> implements IotDeviceDetectionLogService {
+
+}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/MediatorNetworkDeviceDetectionServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDeviceDetectionServiceImpl.java

@@ -1,24 +1,19 @@
 package com.xunmei.mediator.api.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDeviceDetection;
 import com.xunmei.common.core.domain.iot.domain.IotDeviceDetectionLog;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmCode;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
-import com.xunmei.mediator.api.mapper.MediatorCategoryMapper;
-import com.xunmei.mediator.api.mapper.MediatorNetworkDeviceDetectionMapper;
-import com.xunmei.mediator.api.service.IMediatorAlarmCodeService;
+import com.xunmei.mediator.api.mapper.IotDeviceDetectionMapper;
 import com.xunmei.mediator.api.service.IMediatorCategoryService;
-import com.xunmei.mediator.api.service.IMediatorNetworkDeviceDetectionLogService;
-import com.xunmei.mediator.api.service.IMediatorNetworkDeviceDetectionService;
+import com.xunmei.mediator.api.service.IotDeviceDetectionLogService;
+import com.xunmei.mediator.api.service.IotDeviceDetectionService;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.system.api.RemoteDeviceService;
 import com.xunmei.system.api.RemoteOrgService;
@@ -29,12 +24,9 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.enums.DeviceOnlineStatus;
 import com.xunmei.system.api.enums.NetStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,12 +37,12 @@ import java.util.stream.Collectors;
  * @since 2024-01-31
  */
 @Service
-public class MediatorNetworkDeviceDetectionServiceImpl extends ServiceImpl<MediatorNetworkDeviceDetectionMapper, IotDeviceDetection> implements IMediatorNetworkDeviceDetectionService {
+public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectionMapper, IotDeviceDetection> implements IotDeviceDetectionService {
 
     @Resource
     IMediatorCategoryService categoryService;
     @Resource
-    IMediatorNetworkDeviceDetectionLogService networkDeviceDetectionLogService;
+    IotDeviceDetectionLogService networkDeviceDetectionLogService;
     @Resource
     RemoteOrgService orgService;
     @Resource

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/MediatorNetworkDeviceDetectionLogServiceImpl.java

@@ -1,20 +0,0 @@
-package com.xunmei.mediator.api.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.iot.domain.IotDeviceDetectionLog;
-import com.xunmei.mediator.api.mapper.MediatorNetworkDeviceDetectionLogMapper;
-import com.xunmei.mediator.api.service.IMediatorNetworkDeviceDetectionLogService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  网络设备检测日志 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-31
- */
-@Service
-public class MediatorNetworkDeviceDetectionLogServiceImpl extends ServiceImpl<MediatorNetworkDeviceDetectionLogMapper, IotDeviceDetectionLog> implements IMediatorNetworkDeviceDetectionLogService {
-
-}

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorNetworkDeviceDetectionMapper.xml → soc-modules/soc-modules-mediator/src/main/resources/mapper/IotDeviceDetectionLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.mapper.MediatorNetworkDeviceDetectionMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotDeviceDetectionLogMapper">
 
 </mapper>

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorNetworkDeviceDetectionLogMapper.xml → soc-modules/soc-modules-mediator/src/main/resources/mapper/IotDeviceDetectionMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.mapper.MediatorNetworkDeviceDetectionLogMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotDeviceDetectionMapper">
 
 </mapper>