Merge branch 'master' of http://git.nzklabs.com:3000/huangyuanhao/jfcloud-coldchain

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/entity/MonitorTarget.java

@@ -24,6 +24,7 @@ import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.NotificationChannelListTypeHandler;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.entity.MonitorTargetRegion;
+import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.util.Date;
 import java.util.List;
@@ -37,7 +38,7 @@ import java.util.List;
 @Getter
 @Setter
 @TableName("monitor_target")
-public class MonitorTarget {
+public class MonitorTarget extends CommonEntity {
 
     /**
      * ID
@@ -76,30 +77,6 @@ public class MonitorTarget {
     @Schema(description = "报警下限")
     private Float limitDown;
 
-    /**
-     * 记录创建时间
-     */
-    @Schema(description = "记录创建时间")
-    private Date createTime;
-
-    /**
-     * 记录创建用户
-     */
-    @Schema(description = "记录创建用户")
-    private String createBy;
-
-    /**
-     * 记录修改时间
-     */
-    @Schema(description = "记录修改时间")
-    private Date updateTime;
-
-    /**
-     * 记录修改用户
-     */
-    @Schema(description = "记录修改用户")
-    private String updateBy;
-
     /**
      * 设备区域列表
      */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -121,9 +121,9 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     public List<MonitorTarget> getListByUser(String userId) {
         LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<MonitorTarget>();
         if (ObjectUtil.isNotNull(userId)) {
-            queryWrapper.eq(MonitorTarget::getCreateBy, userId).orderByDesc(MonitorTarget::getCreateTime);
+            queryWrapper.eq(MonitorTarget::getCreateUser, userId).orderByDesc(MonitorTarget::getCreateTime);
         } else {
-            queryWrapper.eq(MonitorTarget::getCreateBy, StpLoginUserUtil.getLoginUser().getId());
+            queryWrapper.eq(MonitorTarget::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
         }
         queryWrapper.orderByDesc(MonitorTarget::getCreateTime);
         List<MonitorTarget> monitorTargetList = list(queryWrapper);
@@ -140,9 +140,9 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
             queryWrapper.lambda().like(MonitorTarget::getName, monitorTargetPageParam.getName());
         }
         if (ObjectUtil.isNull(monitorTargetPageParam.getUserId())) {
-            queryWrapper.lambda().eq(MonitorTarget::getCreateBy, StpLoginUserUtil.getLoginUser().getId());
+            queryWrapper.lambda().eq(MonitorTarget::getCreateUser, StpLoginUserUtil.getLoginUser().getId());
         } else {
-            queryWrapper.lambda().eq(MonitorTarget::getCreateBy, monitorTargetPageParam.getUserId());
+            queryWrapper.lambda().eq(MonitorTarget::getCreateUser, monitorTargetPageParam.getUserId());
         }
         if (ObjectUtil.isAllNotEmpty(monitorTargetPageParam.getSortField(), monitorTargetPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(monitorTargetPageParam.getSortOrder());

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortargetregion/entity/MonitorTargetRegion.java

@@ -28,6 +28,7 @@ import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.NotificationChannelListTypeHandler;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 import vip.xiaonuo.coldchain.modular.app.param.FloatNullToDashSerializer;
+import vip.xiaonuo.common.pojo.CommonEntity;
 
 import java.util.Date;
 import java.util.List;
@@ -41,7 +42,7 @@ import java.util.List;
 @Getter
 @Setter
 @TableName("monitor_target_region")
-public class MonitorTargetRegion {
+public class MonitorTargetRegion extends CommonEntity {
     /**
      * 区域唯一标识符，UUID
      */
@@ -85,30 +86,6 @@ public class MonitorTargetRegion {
     @Schema(description = "传感器路数")
     private Integer sensorRoute;
 
-    /**
-     * 记录创建时间
-     */
-    @Schema(description = "记录创建时间")
-    private Date createdAt;
-
-    /**
-     * 记录创建用户
-     */
-    @Schema(description = "记录创建用户")
-    private String createdBy;
-
-    /**
-     * 记录修改时间
-     */
-    @Schema(description = "记录修改时间")
-    private Date updatedAt;
-
-    /**
-     * 记录修改用户
-     */
-    @Schema(description = "记录修改用户")
-    private String updatedBy;
-
     /**
      * 监控设备型号
      */