添加温湿度的redis类

jyzb-api/src/main/java/com/junmp/jyzb/api/constant/JYZBConstant.java

@@ -30,5 +30,10 @@ public interface JYZBConstant {
      */
     String JYZB_CACHE_PREFIX = "jyzb:";
 
+    /**
+     * 温度前缀
+     */
+    String JYZB_TEMP_PREFIX = "temp";
+
     String JYZB_JWT_KEY = "JWT";
 }

jyzb-biz/src/main/java/com/junmp/jyzb/cache/JYZBRedisCache.java → jyzb-biz/src/main/java/com/junmp/jyzb/cache/MsgRedisCache.java

@@ -18,9 +18,9 @@ import org.springframework.stereotype.Component;
  * </pre>
  */
 @Component
-public class JYZBRedisCache extends AbstractRedisCache<String> {
+public class MsgRedisCache extends AbstractRedisCache<String> {
 
-    public JYZBRedisCache(RedisTemplate<String, String> redisTemplate) {
+    public MsgRedisCache(RedisTemplate<String, String> redisTemplate) {
         super(redisTemplate);
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/cache/TemperatureRedisCache.java

+package com.junmp.jyzb.cache;
+
+import com.junmp.jyzb.api.constant.JYZBConstant;
+import com.junmp.jyzb.entity.Temp.HumidityAndtemperature;
+import com.junmp.v2.cache.AbstractRedisCache;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+
+@Component
+public class TemperatureRedisCache extends AbstractRedisCache<HumidityAndtemperature> {
+    public TemperatureRedisCache(RedisTemplate<String, HumidityAndtemperature> redisTemplate) {
+        super(redisTemplate);
+    }
+
+    @Override
+    public String getCommonKeyPrefix() {
+        return JYZBConstant.JYZB_TEMP_PREFIX;
+    }
+
+    public void addTemperatureHumidity(String warehouseId,String warehouseName,long timestamp, double humidity, double temperature) {
+        HumidityAndtemperature data = new HumidityAndtemperature();
+        data.setHumidity(humidity);
+        data.setTemperature(temperature);
+        data.setCreateTime(timestamp);
+        data.setWarehouseId(warehouseId);
+        data.setWarehouseName(warehouseName);
+        String key = warehouseId + ":" + timestamp;
+        put(key, data);
+    }
+    public List<HumidityAndtemperature> getDataByTimestampRange(String warehouseId, long startTimestamp, long endTimestamp) {
+        String keyPattern = warehouseId + ":*";
+        Set<String> keys = getRedisTemplate().keys(keyPattern);
+
+        List<String> keysInRange = keys.stream()
+                .filter(key -> {
+                    long timestamp = Long.parseLong(key.split(":")[1]);
+                    return timestamp >= startTimestamp && timestamp <= endTimestamp;
+                })
+                .collect(Collectors.toList());
+
+        List<HumidityAndtemperature> result = new ArrayList<>();
+        for (String key : keysInRange) {
+            result.add(get(key));
+        }
+
+        return result;
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/controller/LoginController.java

@@ -3,7 +3,7 @@ package com.junmp.jyzb.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.junmp.jyzb.api.constant.JYZBConstant;
-import com.junmp.jyzb.cache.JYZBRedisCache;
+import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.doc.LoginDoc;
 import com.junmp.v2.auth.api.bean.auth.LoginReq;
 import com.junmp.v2.auth.api.bean.auth.LoginRes;
@@ -39,7 +39,7 @@ public class LoginController implements LoginDoc {
 
 
     @Resource
-    private JYZBRedisCache goldRedisCache ;
+    private MsgRedisCache goldRedisCache ;
 
 
     @PostMapping(name = "用户登录", path = "/auth/login")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Temp/HumidityAndtemperature.java

+package com.junmp.jyzb.entity.Temp;
+
+import lombok.Data;
+
+import java.sql.Time;
+import java.util.Date;
+
+@Data
+public class HumidityAndtemperature {
+    //湿度
+    private Double humidity;
+    //温度
+    private Double temperature;
+
+    //仓库ID
+    private String warehouseId;
+    //仓库ID
+    private String warehouseName;
+    //设备类型
+    private String device;
+    //上报时间
+    private Long createTime;
+}

jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java

 package com.junmp.jyzb.listener;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -11,40 +9,23 @@ import com.junmp.junmpProcess.dto.UserListDTO;
 import com.junmp.junmpProcess.dto.json.*;
 import com.junmp.junmpProcess.exception.WorkFlowException;
 import com.junmp.junmpProcess.mapper.OrgUserMapper;
-import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
-import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
-import com.junmp.jyzb.cache.JYZBRedisCache;
+import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.service.BusFormService;
 import com.junmp.jyzb.service.OrderMainService;
 import com.junmp.jyzb.service.ReassignmentService;
 import com.junmp.jyzb.service.StocktakeService;
-import com.junmp.v2.auth.api.LoginUserApi;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
-import com.junmp.v2.common.exception.base.ServiceException;
-import com.junmp.v2.dict.entity.SysDict;
 import com.junmp.v2.message.api.MessageApi;
-import com.junmp.v2.message.api.bean.req.MessageReq;
 import com.junmp.v2.message.api.bean.req.MessageSendReq;
-import com.junmp.v2.sys.api.UserServiceApi;
-import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
-import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
-import com.junmp.v2.sys.user.entity.SysUserOrg;
 import com.junmp.v2.sys.user.service.SysUserOrgService;
-import com.junmp.v2.sys.user.service.SysUserService;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.UserTask;
 import org.flowable.engine.*;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.delegate.ExecutionListener;
-import com.junmp.junmpProcess.enums.AssigneeTypeEnums;
-import org.flowable.engine.history.HistoricProcessInstance;
-import org.flowable.engine.runtime.Execution;
 import org.flowable.engine.runtime.ProcessInstance;
-import org.flowable.task.api.Task;
-import org.flowable.task.api.TaskQuery;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -79,7 +60,7 @@ public class CounterSignListener implements ExecutionListener {
     private SysUserOrgService sysUserOrgService;
 
     @Resource
-    private JYZBRedisCache redisCache;
+    private MsgRedisCache redisCache;
 
 
     @Resource

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java

@@ -20,7 +20,7 @@ import com.junmp.jyzb.api.exception.JYZBAppException;
 import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrgExceptionEnum;
-import com.junmp.jyzb.cache.JYZBRedisCache;
+import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.service.*;
@@ -30,7 +30,6 @@ import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
 import com.junmp.v2.common.exception.base.ServiceException;
-import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
 import com.junmp.v2.db.api.factory.PageResultFactory;
 import com.junmp.v2.db.api.page.PageResult;
@@ -45,7 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
 * @author lxh专属坐骑
@@ -57,7 +55,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
     @Resource
     public StocktakeService stocktakeService;
     @Resource
-    private JYZBRedisCache redisCache;
+    private MsgRedisCache redisCache;
     @Resource
     private IFlowInstanceService FlowInstanceService;
     @Resource

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java

@@ -2,31 +2,23 @@ package com.junmp.jyzb.service.impl;
 
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableStatement;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
-import com.junmp.jyzb.api.bean.dto.CabinetDto;
 import com.junmp.jyzb.api.bean.dto.EquipmentListDto;
-import com.junmp.jyzb.api.bean.dto.OrderMainDto;
 import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
 import com.junmp.jyzb.api.bean.query.InventorySumReq;
 import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
-import com.junmp.jyzb.api.bean.req.UpdateStocktakeReq;
 import com.junmp.jyzb.api.bean.req.UploadInventoryReq;
-import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.InventoryExceptionEnum;
-import com.junmp.jyzb.cache.JYZBRedisCache;
+import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.entity.*;
-import com.junmp.jyzb.mapper.BussinessInventoryDetailMapper;
 import com.junmp.jyzb.mapper.BussinessInventoryMapper;
-import com.junmp.jyzb.mapper.CabinetBoxPoliceMapper;
 import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.RabbitMQSendMsg;
@@ -41,8 +33,6 @@ import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.dict.service.SysDictService;
 import com.junmp.v2.message.api.MessageApi;
 import com.junmp.v2.message.api.bean.req.MessageSendReq;
-import com.junmp.v2.sys.api.OrganizationServiceApi;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,15 +40,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.beans.Transient;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Service
 public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventoryMapper, BussinessInventory>
@@ -81,7 +68,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
     @Resource
     private PubOrgService orgService;
     @Resource
-    private JYZBRedisCache redisCache;
+    private MsgRedisCache redisCache;
     @Resource
     private MessageApi messageApi;
     @Resource

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -11,26 +10,20 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
 import com.junmp.junmpProcess.service.IFlowInstanceService;
 import com.junmp.jyzb.api.bean.dto.*;
 import com.junmp.jyzb.api.bean.query.*;
-import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.OutInLogsReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
 import com.junmp.jyzb.api.bean.req.UpdateOrderReq;
 import com.junmp.jyzb.api.bean.vo.InOrderInfo;
-import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
 import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
-import com.junmp.jyzb.cache.JYZBRedisCache;
+import com.junmp.jyzb.cache.MsgRedisCache;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.InventorySummaryMapper;
 import com.junmp.jyzb.mapper.OrderMainMapper;
 import com.junmp.jyzb.service.*;
 import com.junmp.jyzb.utils.DateTimeUtil;
 import com.junmp.jyzb.utils.RabbitMQSendMsg;
-import com.junmp.jyzb.utils.RedisUtils;
-import com.junmp.v2.auth.api.LoginUserApi;
 import com.junmp.v2.auth.api.bean.login.LoginUser;
 import com.junmp.v2.auth.api.context.LoginContext;
-import com.junmp.v2.common.bean.response.ApiRes;
 import com.junmp.v2.common.exception.base.ServiceException;
-import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
 import com.junmp.v2.common.util.BeanPlusUtil;
 import com.junmp.v2.common.util.HttpServletUtil;
 import com.junmp.v2.db.api.factory.PageFactory;
@@ -41,10 +34,7 @@ import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.dict.service.SysDictService;
 import com.junmp.v2.message.api.MessageApi;
-import com.junmp.v2.message.api.bean.req.MessageReq;
 import com.junmp.v2.message.api.bean.req.MessageSendReq;
-import com.junmp.v2.message.api.bean.res.MessageRes;
-import com.junmp.v2.message.api.enums.MsgReadStateEnum;
 import com.junmp.v2.office.api.OfficeExcelApi;
 import com.junmp.v2.office.api.bean.ExcelExportParam;
 import com.junmp.v2.sys.user.entity.SysUser;
@@ -60,7 +50,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.management.remote.rmi._RMIConnection_Stub;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -68,7 +57,6 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 
 @Service
@@ -87,7 +75,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     @Resource
     private MessageApi messageApi;
     @Resource
-    private JYZBRedisCache redisCache;
+    private MsgRedisCache redisCache;
     @Resource
     private OrderMainMapper orderMainMapper;