表名称修改

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -58,7 +58,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     private String publicWorksSection;
 
     /**
-     * 行别
+     * 行别(1上行2下行）
      */
     @Excel(name = "行别")
     private Integer lineDir;

business-service/src/main/java/com/ozs/service/entity/MsgAlarm.java

@@ -45,7 +45,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 相机编码
      */
-    private Integer cameraCode;
+    private Integer alarmCamera;
 
     /**
      * 报警时间

hazard-admin/src/main/java/com/ozs/web/controller/upload/UploadController.java

@@ -50,7 +50,7 @@ public class UploadController {
             if (StringUtils.isNotBlank(imageName)) {
                 LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
                 if (!ObjectUtils.isEmpty(cameraCode)) {
-                    lw.eq(MsgAlarm::getCameraCode, cameraCode);
+                    lw.eq(MsgAlarm::getAlarmCamera, cameraCode);
                     lw.orderByDesc(MsgAlarm::getAlarmTime);
                 }
                 List<MsgAlarm> list = msgAlarmService.list(lw);

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -65,7 +65,7 @@ public class GeoHazardMonitorTokenController {
      *
      * @return
      */
-    @PostMapping("/IPAddress/token")
+    @PostMapping("/token")
     public String getWebToken(@RequestBody SvcAddress svcAddress) {
         // 生成令牌
         JSONObject jsonObject = new JSONObject();
@@ -85,7 +85,8 @@ public class GeoHazardMonitorTokenController {
             if (objects.size() > 0) {
                 RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
                 respGeoHazardMonitorVo.setAccessToken(objects.get(1));
-                respGeoHazardMonitorVo.setExpiresIn(Long.valueOf(objects.get(0)));
+                Long l = Long.valueOf(objects.get(0));
+                respGeoHazardMonitorVo.setExpiresIn(l/1000);
                 respGeoHazardMonitorVo.setTokenType("令牌类型");
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "成功");
@@ -110,7 +111,7 @@ public class GeoHazardMonitorTokenController {
      *
      * @return // 生成令牌
      */
-    @PostMapping("/IPAddress/alarm")
+    @PostMapping("/alarm")
     public String alarm(@RequestParam("parameter") String parameter, HttpServletRequest request) {
         String token = apiTokenUtils.getGeoHazardMonitorToken(request);
         JSONObject jsonObject = new JSONObject();
@@ -129,7 +130,7 @@ public class GeoHazardMonitorTokenController {
 //                msgAlarm.setCreateBy(getUsername());
                 msgAlarmService.save(msgAlarm);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
-                respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getCameraCode());
+                respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
                 respMsgAlarmVo.setIsCancel(2);
                 respMsgAlarmVo.setCancelTime(null);
             } else {
@@ -138,7 +139,7 @@ public class GeoHazardMonitorTokenController {
 //                msgAlarmVice.setCreateBy(getUsername());
                 msgAlarmFrequencyService.save(msgAlarmVice);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
-                respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getCameraCode());
+                respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
                 respMsgAlarmVo.setIsCancel(alarm.getIsLock());
                 respMsgAlarmVo.setCancelTime(alarm.getReleasedTime());
             }
@@ -160,7 +161,7 @@ public class GeoHazardMonitorTokenController {
      *
      * @return
      */
-    @PostMapping("/IPAddress/device/state")
+    @PostMapping("/device/state")
     public String deviceState(@RequestParam("parameter") String parameter, HttpServletRequest request) throws
             ParseException {
         JSONObject jsonObject = new JSONObject();
@@ -172,8 +173,9 @@ public class GeoHazardMonitorTokenController {
                 lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             }
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
-            baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
-            baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
+            baseDynamicManagement.setElectricity(Integer.parseInt(reqDeviceVo.getElectricity()));
+            baseDynamicManagement.setUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(reqDeviceVo.getTime()));
+            baseDynamicManagement.setCameraState(Integer.parseInt(reqDeviceVo.getCameraState()));
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "成功");
@@ -188,4 +190,4 @@ public class GeoHazardMonitorTokenController {
             return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
         }
     }
-}
+}

hazard-sdk/src/main/java/com/ozs/controller/upload/UploadController.java

@@ -5,7 +5,9 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.MinioUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.uuid.IdUtils;
+import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.MsgAlarmService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -22,7 +24,6 @@ import java.util.Date;
 import java.util.List;
 
 @RestController
-@RequestMapping("/system/upLoad")
 public class UploadController {
 
     @Value("${minio.bucketName}")
@@ -31,37 +32,36 @@ public class UploadController {
     @Resource
     MinioUtils minioUtils;
     @Autowired
-    MsgAlarmService msgAlarmService;
+    BaseCameraManagementService baseCameraManagementService;
 
 
-    @PostMapping("/upLoadImage")
-    public AjaxResult upLoadImage(@RequestParam("file") MultipartFile image,
+    @PostMapping("/putObject")
+    public AjaxResult upLoadImage(@RequestParam("stream") MultipartFile stream,
                                   @RequestParam(value = "cameraCode", required = false) String cameraCode,
-                                  @RequestParam(value = "lineType", required = false) String lineType) throws Exception {
-        if (image.isEmpty()) {
+                                  @RequestParam(value = "size", required = false) Long size,
+                                  @RequestParam(value = "contentType", required = false) String contentType) throws Exception {
+        if (stream.isEmpty()) {
             return AjaxResult.error("不能上传空文件哦");
         }
         //图片保存路径
         //String fileUploadPath ="/"+userId+"/image";
         String uploadFile = null;
-        if (image != null && !image.isEmpty()) {
+        if (stream != null && !stream.isEmpty()) {
 
-            String imageName = image.getOriginalFilename();
+            String imageName = stream.getOriginalFilename();
             if (StringUtils.isNotBlank(imageName)) {
-                LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
+                LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(cameraCode)) {
-                    lw.eq(MsgAlarm::getCameraCode, cameraCode);
-                    lw.orderByDesc(MsgAlarm::getAlarmTime);
+                    wrapper.eq(BaseCameraManagement::getCameraCode, cameraCode);
                 }
-                List<MsgAlarm> list = msgAlarmService.list(lw);
-                MsgAlarm msgAlarm = list.get(0);
-                String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-                String filename = IdUtils.fastSimpleUUID() + image.getOriginalFilename().substring(image.getOriginalFilename().lastIndexOf("."));
+                List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+                BaseCameraManagement baseCameraManagement = list.get(0);
+                String filename = IdUtils.fastSimpleUUID() + stream.getOriginalFilename().substring(stream.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
-                String format1 = dateFormat1.format(new Date(msgAlarm.getAlarmTime()));
-                String imgName = msgAlarm.getAlarmLine() + "/" + lineType + "/" + msgAlarm.getAlarmMile() + format1 + "/" + filename;
-                minioUtils.minIoClientUpload(image.getInputStream(), imgName);
-                uploadFile = "/" + msgAlarm.getAlarmLine() + "/" + lineType + "/" + msgAlarm.getAlarmMile() + "/" + format1 + "/" + filename;
+                String format1 = dateFormat1.format(new Date());
+                String imgName = baseCameraManagement.getRailwayName() + "/" + (baseCameraManagement.getLineDir()==1L ? "上行" : "下行") + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
+                minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
+                uploadFile = "/" + baseCameraManagement.getRailwayName() + "/" + (baseCameraManagement.getLineDir()==1L ? "上行" : "下行") + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
 
             }
         } else {

hazard-sdk/src/main/java/com/ozs/vo/ReqDeviceVo.java

@@ -14,13 +14,17 @@ public class ReqDeviceVo implements Serializable {
     /**
      * 相机编码
      */
-    private Integer cameraCode;
+    private String cameraCode;
     /**
      * 时间
      */
-    private Long time;
+    private String time;
     /**
      * 剩余电量
      */
-    private Integer electricity;
+    private String electricity;
+    /**
+     * 剩余电量
+     */
+    private String cameraState;
 }

hazard-sdk/src/main/java/com/ozs/vo/ReqMsgAlarmVo.java

@@ -23,7 +23,7 @@ public class ReqMsgAlarmVo implements Serializable {
     private Long alarmTime;
 
     /** 相机编码 */
-    private Integer cameraCode;
+    private Integer alarmCamera;
 
     /** 报警里程位置 */
     private String alarmMile;