Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

# Conflicts:
#	zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/controller/UploadController.java

zd-model/src/main/java/com/zd/model/constant/CacheDevice.java

@@ -10,7 +10,7 @@ public enum CacheDevice {
     /**
      * 老传感器缓存前缀
      */
-    SENSOR_KEY("sensor_fedc_01:", 5 * 60 * 60L),
+    SENSOR_KEY("sensor_fedc_01:", 5 * 60L),
 
     /**
      * 老传感器失效周期
@@ -25,7 +25,7 @@ public enum CacheDevice {
     /**
      * 继电器失效周期
      */
-    RELAY_LIFE("relay_life:", 10 * 60 * 60L),
+    RELAY_LIFE("relay_life:", 10 * 60L),
 
     /**
      * 火灾摄像头前缀

zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/controller/UploadController.java

@@ -5,6 +5,7 @@ import com.zd.base.files.bigupload.dto.FileChunkDTO;
 import com.zd.base.files.bigupload.dto.FileChunkResultDTO;
 import com.zd.base.files.bigupload.service.IUploadService;
 import com.zd.model.domain.ResultData;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,13 +16,14 @@ import org.springframework.web.bind.annotation.*;
  **/
 @RestController
 @RequestMapping("/file/upload")
+@Slf4j
 public class UploadController {
 
     @Autowired
     private IUploadService uploadService;
 
     /**
-     * 检查分片是否存在
+     * 检查分片是否存��
      *
      * @return
      */
@@ -37,6 +39,32 @@ public class UploadController {
     }
 
     /**
+     * 检查分片是否存�
+     * @param identifier  文件秘钥
+     * @param filename 文件�
+     * @param totalChunks 分片总数
+     * @return
+     */
+    @GetMapping("/apk/chunk")
+    public ResultData<Object> checkChunkExist(@RequestParam("identifier") String identifier,
+                                              @RequestParam("filename") String filename,
+                                              @RequestParam("totalChunks") Integer totalChunks) {
+        FileChunkResultDTO fileChunkCheckDTO;
+        try {
+            log.info("apk文件上传入参 identifier {}�filename {}, totalChunks {}", identifier, filename, totalChunks);
+            FileChunkDTO chunkDTO = new FileChunkDTO();
+            chunkDTO.setIdentifier(identifier);
+            chunkDTO.setFilename(filename);
+            chunkDTO.setTotalChunks(totalChunks);
+            fileChunkCheckDTO = uploadService.checkChunkExist(chunkDTO);
+            return ResultData.success(fileChunkCheckDTO);
+        } catch (Exception e) {
+            return ResultData.fail(e.getMessage());
+        }
+    }
+
+
+    /**
      * 上传文件分片
      *
      * @param chunkDTO
@@ -53,6 +81,22 @@ public class UploadController {
     }
 
     /**
+     * 上传文件分片
+     *
+     * @param chunkDTO
+     * @return
+     */
+    @PostMapping("/apk/chunk")
+    public ResultData<Object> uploadChunkByAPK(@RequestBody FileChunkDTO chunkDTO) {
+        try {
+            uploadService.uploadChunk(chunkDTO);
+            return ResultData.success(chunkDTO.getIdentifier());
+        } catch (Exception e) {
+            return ResultData.fail(e.getMessage());
+        }
+    }
+
+    /**
      * 请求合并文件分片
      *
      * @param chunkDTO

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabAbnormalServiceImpl.java

@@ -1,9 +1,7 @@
 package com.zd.laboratory.service.impl;
 
-import com.zd.model.constant.CacheConstants;
-import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.utils.DateUtils;
 import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.utils.DateUtils;
 import com.zd.laboratory.domain.LabAbnormal;
 import com.zd.laboratory.domain.LabHardware;
 import com.zd.laboratory.domain.LabSensor;
@@ -15,6 +13,7 @@ import com.zd.laboratory.mapper.LabHardwareMapper;
 import com.zd.laboratory.mapper.LabSensorMapper;
 import com.zd.laboratory.mapper.LabSubjectHardwarePositionMapper;
 import com.zd.laboratory.service.ILabAbnormalService;
+import com.zd.model.domain.per.PerPrefix;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -197,7 +196,7 @@ public class LabAbnormalServiceImpl implements ILabAbnormalService {
     @Override
     public void insertRelayAbnormal(String expiredKey) {
 
-        logger.warn("继电器上报超时：" + expiredKey + " --  上报时长超过10分钟");
+        logger.error("继电器上报超时：" + expiredKey + " --  上报时长超过10分钟");
 
         LabHardware labHardware = new LabHardware();
         labHardware.setRelayCode(expiredKey);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/SocketService.java

@@ -108,7 +108,7 @@ public class SocketService {
                 SpringUtils.getApplicationContext().publishEvent(sensorStatusEvent);
             }
             //缓存数据
-            redisService.setCacheObject(redisKey, transmissionVo.toString(), 5L, TimeUnit.MINUTES);
+            redisService.setCacheObject(redisKey, transmissionVo.toString(), CacheDevice.SENSOR_KEY.getRedisTime(), TimeUnit.SECONDS);
             redisService.setCacheObject( CacheDevice.SENSOR_LIFE.getRedisKey() + transmissionVo.getA3(), transmissionVo.getA3(),
                     CacheDevice.SENSOR_LIFE.getRedisTime() ,TimeUnit.SECONDS);