温湿度图表

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

@@ -66,7 +66,7 @@ public class HumitureController {
 
     @ApiOperation("获取温湿度")
     @GetMapping("api/humiture/list")
-    public HumitureDto info(HumitureQueryCriteria criteria) {
+    public HumitureDto info(HumitureQueryCriteria criteria, Pageable pageable) {
         MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting);
         if (msdSettiings == null){
             msdSettiings = new MSDSettiings();
@@ -75,24 +75,7 @@ public class HumitureController {
         Float maxHumidity = msdSettiings.getMaxHumidity();
         Query query = QueryHelp.getQuery(criteria);
         query.with(Sort.by(Sort.Direction.ASC, "id"));
-        query.limit(100000);
-        List<Humiture> humitureList = humitureManager.findByQuery(query);
-        if(humitureList.isEmpty()){
-            Humiture humiture1 = new Humiture();
-            humiture1.setHumidity("13");
-            humiture1.setCid("001");
-            humiture1.setTemperature("22.3");
-            humiture1.setCodeAirTemp("5");
-            humitureList.add(humiture1);
-
-            Humiture humiture = new Humiture();
-            humiture.setHumidity("12");
-            humiture.setCid("001");
-            humiture.setTemperature("23");
-            humiture.setCodeAirTemp("5");
-            humitureList.add(humiture);
-        }
-
+        PageData<Humiture> humitureList = humitureManager.findByPage(query,pageable);
         HumitureDto restultDto = new HumitureDto();
         restultDto.setMaxHumidity(maxHumidity);
         restultDto.setMaxTemperature(maxTemperature);

src/main/java/com/neotel/smfcore/core/humiture/rest/bean/dto/HumitureDto.java

 package com.neotel.smfcore.core.humiture.rest.bean.dto;
 
+import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto;
 import com.neotel.smfcore.core.system.service.po.Humiture;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,5 +30,5 @@ public class HumitureDto {
     @ApiModelProperty("最大湿度")
     private float maxHumidity = 100.0F;
     @ApiModelProperty("温湿度数据")
-    List<Humiture> humitureList;
+    PageData<Humiture> humitureList;
 }

src/main/java/com/neotel/smfcore/core/humiture/rest/bean/query/HumitureQueryCriteria.java

@@ -16,6 +16,12 @@ public class HumitureQueryCriteria {
     @QueryCondition(type = QueryCondition.Type.IN, propName = "cid")
     private List<String> cids;
 
+    /**
+     * 仅搜索大于此ID的温湿度值
+     */
+    @QueryCondition(type = QueryCondition.Type.GT, propName = "id")
+    private String humitureId;
+
     @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "createDate")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private BetweenData<Date> createDate;

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -142,8 +142,7 @@ public class BoxKanbanController {
         }
         List<DataLog> allTasks=taskService.getAllTasks();
         List<BoxTaskDto> dtos=new ArrayList<>();
-        for (DataLog datalog :
-                allTasks) {
+        for (DataLog datalog : allTasks) {
             //判断类型
             if (criteria.getType() != null && (!criteria.getType().equals(datalog.getType()))) {
                 continue;
@@ -194,8 +193,7 @@ public class BoxKanbanController {
                 String[] valueArray = new String[]{datalog.getPosName(), datalog.getStorageName(), datalog.getCid(), datalog.getPartNumber(), datalog.getBarcode(), datalog.getSourceName()};
                 for (String s : blurrys) {
                     if(ObjectUtil.isNotEmpty(s)){
-                        for (String v :
-                                valueArray) {
+                        for (String v : valueArray) {
                                 try {
                                     Pattern pattern = Pattern.compile(QueryHelp.escapeExprSpecialWord(s), Pattern.CASE_INSENSITIVE);
                                     Matcher m = pattern.matcher(v);
@@ -224,37 +222,6 @@ public class BoxKanbanController {
             }
         }
         return new PageData<>(dtos, dtos.size());
-//        Query query = QueryHelp.getQuery(criteria);
-//        String groupId = criteria.getGroupId();
-//        List<String> cidList = dataCache. getCidsByGroupId(groupId,true);
-//        query.addCriteria(Criteria.where("cid").in(cidList));
-//
-//        //只查找近12个小时未完成的任务
-//        //暂时改成48小时
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.add(Calendar.HOUR_OF_DAY, -48);
-//        query.addCriteria(Criteria.where("updateDate").gte(calendar.getTime()));
-//
-//        Calendar ca2 = Calendar.getInstance();
-//        ca2.add(Calendar.MINUTE, -10);
-//
-//        Date lastUpdateTime=new Date((new Date().getTime())-10 * 60 * 1000);
-//        //正常
-//        if(criteria.getTaskStatus()==1){
-//             query.addCriteria(Criteria.where("updateDate").gte(ca2.getTime()).and("status").is(OP_STATUS.EXECUTING.name()));
-//        }//异常
-//        else if(criteria.getTaskStatus()==2){
-//            query.addCriteria(Criteria.where("updateDate").lte(ca2.getTime()).and("status").is(OP_STATUS.EXECUTING.name()));
-//        }//等待
-//        else if(criteria.getTaskStatus()==3){
-//            query.addCriteria(Criteria.where("status").is(OP_STATUS.WAIT.name()));
-//        }else{
-//            query.addCriteria(Criteria.where("status").nin(OP_STATUS.CANCEL.name(), OP_STATUS.FINISHED.name()));
-//        }
-//
-//        PageData<DataLog> dataLogPageData=dataLogManager.findByPage(query,pageable);
-//        List<BoxTaskDto> boxTaskDtos=boxTaskMapper.toDto(dataLogPageData.getContent());
-//        return new PageData(boxTaskDtos, boxTaskDtos.size());
 
     }
 

src/main/java/com/neotel/smfcore/core/solder/rest/bean/dto/SpBoxDto.java

@@ -15,11 +15,11 @@ public class SpBoxDto {
     @ApiModelProperty("是否是单盘出库（联电指出库项目,默认为false即默认批量出库）")
     private boolean singleOut = false;
 
-    @ApiModelProperty("料仓名称")
-    private String storageName;
+    @ApiModelProperty("入料区门状态")
+    private String inDoorStatus;
 
-    @ApiModelProperty("料仓 ID")
-    private String storageId;
+    @ApiModelProperty("出料区门状态")
+    private String outDoorStatus;
 
     @ApiModelProperty("库位号ID")
     private String posId;

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -304,12 +304,12 @@ public class DataLog extends BasePo implements Serializable {
     }
 
     /**
-     * 超过5秒的任务不再显示
+     * 超过15秒的任务不再显示
      * @return
      */
     public boolean needRemoveFromShow(){
-        if(isFinished() || isCancel()){
-            if(System.currentTimeMillis() - super.getUpdateDate().getTime() > 25 * 1000){
+        if(isFinished() || isCancel() || isEnd()){
+            if(System.currentTimeMillis() - super.getUpdateDate().getTime() > 15 * 1000){
                 return true;
             }
         }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -260,7 +260,9 @@ public class TaskService {
             if (task.needRemoveFromCache()) {
                 theFinishedTaskMap.remove(task.getId());
             } else {
-                resultTasks.add(task);
+                if(!task.needRemoveFromShow()){
+                    resultTasks.add(task);
+                }
             }
         }
         return resultTasks;