定时任务状态bug修复

2024年9月27日16:52:20

modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java

@@ -69,7 +69,7 @@ public class IotThingModelController {
             @Parameter(name = "gateway", description = "网关") @RequestParam(required = false) String gateway,
             @Parameter(name = "startTime", description = "开始时间") @RequestParam(required = false)  Long startTime,
             @Parameter(name = "endTime", description = "结束时间") @RequestParam(required = false)  Long endTime) {
-        List<ObjectNode> list = service.findList(orderField, order, code, token, origin, status, realType,gateway,startTime, endTime);
+        List<ObjectNode> list = service.findList1(orderField, order, code, token, origin, status, realType,gateway,startTime, endTime);
         return new Result<List<ObjectNode>>().ok(list);
     }
 

modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java

@@ -23,6 +23,9 @@ public interface IotThingModelService extends IBaseService<IotThingModelEntity>
     List<ObjectNode> findList(String orderField, String order,
                               String code, String token,String origin,String status,String realType, String gateway,Long startTime,Long endTime);
 
+    List<ObjectNode> findList1(String orderField, String order,
+                              String code, String token,String origin,String status,String realType, String gateway,Long startTime,Long endTime);
+
     ModelDetailDTO findById(Long id);
 
     Optional<ModelDetailDTO> findByCode(String code);

modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java

@@ -117,7 +117,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
                                          String gateway,
                                          Long startTime,
                                          Long endTime) {
-        List<ObjectNode> list = findList(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime);
+        List<ObjectNode> list = findList1(orderField, order, code, token, origin, status, realType,gateway, startTime, endTime);
         if (CollectionUtils.isEmpty(list)) {
             return PageData.empty();
         }
@@ -126,6 +126,24 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
     }
 
 
+    @Override
+    public List<ObjectNode> findList1(String orderField, String order,
+                                     String code,
+                                     String token,
+                                     String origin,
+                                     String status,
+                                     String realType,
+                                     String gateway,
+                                     Long startTime,
+                                     Long endTime) {
+
+        List<IotThingModelDTO> list = mapper.selectListByQueryAs(getWrapper(orderField, order, code, token, origin,
+                status, realType,gateway,startTime, endTime), IotThingModelDTO.class);
+        List<ObjectNode> modelList = JsonConverter.convertToJsonObjectListObjectNode(list);
+        return modelList;
+    }
+
+
     @Override
     public List<ObjectNode> findList(String orderField, String order,
                                      String code,