温湿度按时间降序

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -688,9 +688,6 @@ public class BaseDeviceHandler implements IDeviceHandler {
      */
      */
     private void updateCheckoutData(DataLog task,OP_STATUS outBoxStatus) throws ValidateException {
     private void updateCheckoutData(DataLog task,OP_STATUS outBoxStatus) throws ValidateException {
 
 
-        //从队列里面移除操作
-        taskService.removeQueueTask(task);
-
         StoragePos storagePos = storagePosManager.get(task.getPosId());
         StoragePos storagePos = storagePosManager.get(task.getPosId());
 
 
         Barcode barcode = storagePos.getBarcode();
         Barcode barcode = storagePos.getBarcode();
@@ -735,6 +732,10 @@ public class BaseDeviceHandler implements IDeviceHandler {
 
 
         //记录日志
         //记录日志
         task.setStatus(outBoxStatus.name());
         task.setStatus(outBoxStatus.name());
+
+        //从队列里面移除操作
+        taskService.removeQueueTask(task);
+
         taskService.updateFinishedTask(task);
         taskService.updateFinishedTask(task);
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/humiture/rest/HumitureController.java

@@ -74,7 +74,7 @@ public class HumitureController {
             criteria.setCids(SecurityUtils.getUserGroupCid());
             criteria.setCids(SecurityUtils.getUserGroupCid());
         }
         }
         Query query = QueryHelp.getQuery(criteria);
         Query query = QueryHelp.getQuery(criteria);
-        query.with(Sort.by(Sort.Direction.ASC, "createDate"));
+        //query.with(Sort.by(Sort.Direction.ASC, "createDate"));
         query.addCriteria(Criteria.where("humiAndtempListStr").exists(true));
         query.addCriteria(Criteria.where("humiAndtempListStr").exists(true));
 
 
         PageData<Humiture> resultList = new PageData<>();
         PageData<Humiture> resultList = new PageData<>();