ソースを参照

fix:修复监控对象分页报错
feat:根据用户查询监控对象列表接口新增按创建时间排序,并增加userId为空逻辑

黄渊昊 6 ヶ月 前
コミット
7c3e511300

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

@@ -93,25 +93,25 @@ public class MonitorTarget {
      * 记录创建时间
      */
     @Schema(description = "记录创建时间")
-    private Date createdTime;
+    private Date createTime;
 
     /**
      * 记录创建用户
      */
     @Schema(description = "记录创建用户")
-    private String createdBy;
+    private String createBy;
 
     /**
      * 记录修改时间
      */
     @Schema(description = "记录修改时间")
-    private Date updatedTime;
+    private Date updateTime;
 
     /**
      * 记录修改用户
      */
     @Schema(description = "记录修改用户")
-    private String updatedBy;
+    private String updateBy;
 
     /**
      * 设备区域列表

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

@@ -120,7 +120,10 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     @Override
     public List<MonitorTarget> getListByUser(String userId) {
         LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<MonitorTarget>();
-        queryWrapper.eq(MonitorTarget::getCreatedBy,userId).orderByDesc(MonitorTarget::getCreatedTime);
+        if (ObjectUtil.isNotNull(userId)) {
+            queryWrapper.eq(MonitorTarget::getCreateBy,userId).orderByDesc(MonitorTarget::getCreateTime);
+        }
+        queryWrapper.orderByDesc(MonitorTarget::getCreateTime);
         List<MonitorTarget> monitorTargetList = list(queryWrapper);
         monitorTargetList.forEach(monitorTarget -> {
             monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
@@ -141,7 +144,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         } else {
             queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
         }
-        queryWrapper.lambda().eq(MonitorTarget::getCreatedBy,monitorTargetPageParam.getUserId());
+        queryWrapper.lambda().eq(MonitorTarget::getCreateBy,monitorTargetPageParam.getUserId());
         Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         //获取设备区域列表并赋值返回
         page.getRecords().forEach(monitorTarget -> {