温湿度图表

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -212,6 +212,7 @@ public class DataInitManager {
         Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report", 2, "inOutData",null);
         Menu pMenuReport = Menu.CreatePMenu("报表", 7, "report", 2, "inOutData",null);
         addNewFunctionMenu(71, pMenuReport, "inOutData", "出入库", "inOutData", "neolight/inOutData/index", "outPut",functionMenuMap);
         addNewFunctionMenu(71, pMenuReport, "inOutData", "出入库", "inOutData", "neolight/inOutData/index", "outPut",functionMenuMap);
         addNewFunctionMenu(72, pMenuReport,"inventory", "库存", "inventory", "neolight/inventory/index", "inventory",functionMenuMap);
         addNewFunctionMenu(72, pMenuReport,"inventory", "库存", "inventory", "neolight/inventory/index", "inventory",functionMenuMap);
+        addNewFunctionMenu(73, pMenuReport,"humiture", "温湿度", "humiture", "humiture/humitureReport/index", "humiture",functionMenuMap);
 
 
         //可观测性：物料追踪
         //可观测性：物料追踪
         Menu guanceMenu = Menu.CreatePMenu("可观测性", 8, "observability", 2, "scanKey",null);
         Menu guanceMenu = Menu.CreatePMenu("可观测性", 8, "observability", 2, "scanKey",null);

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

+package com.neotel.smfcore.core.humiture.rest;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.google.common.base.Strings;
+import com.neotel.smfcore.common.bean.PageData;
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.Constants;
+import com.neotel.smfcore.common.utils.QueryHelp;
+import com.neotel.smfcore.common.utils.SecurityUtils;
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.service.po.Barcode;
+import com.neotel.smfcore.core.device.bean.BoxStatusBean;
+import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.humiture.rest.bean.dto.HumitureDto;
+import com.neotel.smfcore.core.humiture.rest.bean.query.HumitureQueryCriteria;
+import com.neotel.smfcore.core.kanban.rest.bean.dto.*;
+import com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper;
+import com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter;
+import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
+import com.neotel.smfcore.core.msd.bean.MSDSettiings;
+import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
+import com.neotel.smfcore.core.storage.service.po.Storage;
+import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.core.system.service.manager.IHumitureManager;
+import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
+import com.neotel.smfcore.core.system.service.po.DataLog;
+import com.neotel.smfcore.core.system.service.po.Humiture;
+import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
+import com.neotel.smfcore.core.system.util.TaskService;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
+import com.neotel.smfcore.security.service.manager.IGroupManager;
+import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
+import com.neotel.smfcore.security.service.po.Group;
+import com.neotel.smfcore.security.service.po.User;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+@Slf4j
+@RestController
+@Api(tags = "温湿度")
+public class HumitureController {
+
+    @Autowired
+    IHumitureManager humitureManager;
+    @Autowired
+    DataCache dataCache;
+
+    @ApiOperation("获取温湿度")
+    @GetMapping("api/humiture/list")
+    public HumitureDto info(HumitureQueryCriteria criteria) {
+        MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting);
+        if (msdSettiings == null){
+            msdSettiings = new MSDSettiings();
+        }
+        Float maxTemperature = msdSettiings.getMaxTemperature();
+        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);
+        }
+
+        HumitureDto restultDto = new HumitureDto();
+        restultDto.setMaxHumidity(maxHumidity);
+        restultDto.setMaxTemperature(maxTemperature);
+        restultDto.setHumitureList(humitureList);
+        return restultDto;
+    }
+}

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.core.kanban.rest.bean.dto.BoxStatusDto;
+import com.neotel.smfcore.core.system.service.po.Humiture;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @date 2022-12-05
+ * @author sunke
+ */
+@Getter
+@Setter
+public class HumitureDto {
+
+    /**
+     * 最高温度
+     */
+    @ApiModelProperty("最高温度")
+    private float maxTemperature = 38.0F;
+
+    /**
+     * 最大湿度值
+     */
+    @ApiModelProperty("最大湿度")
+    private float maxHumidity = 100.0F;
+    @ApiModelProperty("温湿度数据")
+    List<Humiture> humitureList;
+}

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

+package com.neotel.smfcore.core.humiture.rest.bean.query;
+
+import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class HumitureQueryCriteria {
+
+    @ApiModelProperty("料仓CID列表")
+    @QueryCondition(type = QueryCondition.Type.IN, propName = "cid")
+    private List<String> cids;
+
+    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "createDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private BetweenData<Date> createDate;
+}

src/main/java/com/neotel/smfcore/core/system/service/manager/impl/HumitureManagerImpl.java

@@ -2,8 +2,12 @@ package com.neotel.smfcore.core.system.service.manager.impl;
 
 
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.core.system.service.dao.IDataLogDao;
+import com.neotel.smfcore.core.system.service.dao.IHumitureDao;
 import com.neotel.smfcore.core.system.service.manager.IHumitureManager;
 import com.neotel.smfcore.core.system.service.manager.IHumitureManager;
+import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.Humiture;
 import com.neotel.smfcore.core.system.service.po.Humiture;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -12,28 +16,34 @@ import java.util.List;
 
 
 @Service
 @Service
 public class HumitureManagerImpl implements IHumitureManager {
 public class HumitureManagerImpl implements IHumitureManager {
+
+    @Autowired
+    private IHumitureDao humitureDao;
+
     @Override
     @Override
     public Humiture get(String id) {
     public Humiture get(String id) {
-        return null;
+        return humitureDao.findOneById(id);
     }
     }
 
 
     @Override
     @Override
     public Humiture save(Humiture object) throws ValidateException {
     public Humiture save(Humiture object) throws ValidateException {
-        return null;
+        return humitureDao.save(object);
     }
     }
 
 
     @Override
     @Override
     public void delete(Humiture object) throws ValidateException {
     public void delete(Humiture object) throws ValidateException {
-
+        humitureDao.removeOne(object);
     }
     }
 
 
     @Override
     @Override
     public PageData<Humiture> findByPage(Query query, Pageable pageable) {
     public PageData<Humiture> findByPage(Query query, Pageable pageable) {
-        return null;
+        int totalCount = humitureDao.countByQuery(query);
+        List<Humiture> list = humitureDao.findByQuery(query, pageable);
+        return new PageData<Humiture>(list,totalCount);
     }
     }
 
 
     @Override
     @Override
     public List<Humiture> findByQuery(Query query) {
     public List<Humiture> findByQuery(Query query) {
-        return null;
+        return humitureDao.findByQuery(query);
     }
     }
 }
 }

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

@@ -31,9 +31,4 @@ public class Humiture extends BasePo implements Serializable {
      */
      */
     private String humidity;
     private String humidity;
 
 
-
-
-    public String getBoxKey(){
-        return cid;
-    }
 }
 }