sdk模块对外接口参数类型修改

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

@@ -50,7 +50,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警时间
      */
-    private Long alarmTime;
+    private Date alarmTime;
 
     /**
      * 报警里程位置
@@ -80,7 +80,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 报警病害属性（可以给出泥石流的框定范围）
      */
-    private String alarmArrr;
+    private String alarmAttr;
     /**
      * 报警图片地址
      */
@@ -99,7 +99,7 @@ public class MsgAlarm extends BaseEntity implements Serializable {
     /**
      * 解除时间
      */
-    private Long releasedTime;
+    private Date releasedTime;
     /**
      * 报警线路
      */

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

@@ -65,9 +65,7 @@ public class MsgAlarmFrequency extends BaseEntity implements Serializable {
     /**
      * 报警病害属性（可以给出泥石流的框定范围）
      */
-    private String alarmArrr;
-
-    private String files;
+    private String alarmAttr;
 
     /**
      * 报警图片地址

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmVo.java

@@ -49,12 +49,12 @@ public class MsgAlarmVo extends PageVo implements Serializable {
     /**
      * 起始报警病害属性（可以给出泥石流的框定范围）
      */
-    private String beginAlarmArrr;
+    private String beginAlarmAttr;
     
     /**
      * 结束报警病害属性（可以给出泥石流的框定范围）
      */
-    private String endAlarmArrr;
+    private String endAlarmAttr;
 
     /**
      * 开始报警时间

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -70,11 +70,11 @@ public class MsgAlarmController extends BaseController {
         if (!StringUtils.isBlank(msgAlarmVo.getAlarmMile())) {
             lw.eq(MsgAlarm::getAlarmMile, msgAlarmVo.getAlarmMile());
         }
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginAlarmArrr())) {
-            lw.ge(MsgAlarm::getAlarmArrr, msgAlarmVo.getBeginAlarmArrr());
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginAlarmAttr())) {
+            lw.ge(MsgAlarm::getAlarmAttr, msgAlarmVo.getBeginAlarmAttr());
         }
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndAlarmArrr())) {
-            lw.le(MsgAlarm::getAlarmArrr, msgAlarmVo.getEndAlarmArrr());
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getEndAlarmAttr())) {
+            lw.le(MsgAlarm::getAlarmAttr, msgAlarmVo.getEndAlarmAttr());
         }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginAlarmTime())) {
             lw.ge(MsgAlarm::getAlarmTime, msgAlarmVo.getBeginAlarmTime());
@@ -103,7 +103,7 @@ public class MsgAlarmController extends BaseController {
         msgAlarm.setIsLock(1);
         msgAlarm.setUpdateBy(getUsername());
         msgAlarm.setReleasedBy(getUsername());
-        msgAlarm.setReleasedTime(System.currentTimeMillis());
+        msgAlarm.setReleasedTime(new Date());
         return AjaxResult.success(msgAlarmService.updateById(msgAlarm));
     }
 

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

@@ -8,10 +8,12 @@ import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.AppTokenUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.stateSecrets.SM4Utils;
+import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.MsgAlarmFrequency;
 import com.ozs.service.entity.SvcAddress;
+import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.MsgAlarmFrequencyService;
 import com.ozs.service.service.MsgAlarmService;
@@ -58,6 +60,8 @@ public class GeoHazardMonitorTokenController {
     MsgAlarmFrequencyService msgAlarmFrequencyService;
     @Autowired
     SvcAddressService svcAddressService;
+    @Autowired
+    BaseCameraManagementService baseCameraManagementService;
 
 
     /**
@@ -86,7 +90,7 @@ public class GeoHazardMonitorTokenController {
                 RespGeoHazardMonitorVo respGeoHazardMonitorVo = new RespGeoHazardMonitorVo();
                 respGeoHazardMonitorVo.setAccessToken(objects.get(1));
                 Long l = Long.valueOf(objects.get(0));
-                respGeoHazardMonitorVo.setExpiresIn(l/1000);
+                respGeoHazardMonitorVo.setExpiresIn(l / 1000);
                 respGeoHazardMonitorVo.setTokenType("令牌类型");
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "成功");
@@ -119,6 +123,14 @@ public class GeoHazardMonitorTokenController {
             String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
             RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+            if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmCamera())) {
+                wrapper.eq(BaseCameraManagement::getCameraCode, reqMsgAlarmVo.getAlarmCamera());
+            }
+            BaseCameraManagement  baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
+                reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
+            }
             LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
             if (!ObjectUtils.isEmpty(reqMsgAlarmVo.getAlarmId())) {
                 lw.eq(MsgAlarm::getAlarmId, reqMsgAlarmVo.getAlarmId());
@@ -128,6 +140,8 @@ public class GeoHazardMonitorTokenController {
                 MsgAlarm msgAlarm = new MsgAlarm();
                 BeanUtils.copyProperties(reqMsgAlarmVo, msgAlarm);
 //                msgAlarm.setCreateBy(getUsername());
+                msgAlarm.setAlarmLine(baseCameraManagement.getRailwayName());
+                msgAlarm.setAlarmTime(new Date(reqMsgAlarmVo.getAlarmTime()));
                 msgAlarmService.save(msgAlarm);
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
                 respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
@@ -141,7 +155,10 @@ public class GeoHazardMonitorTokenController {
                 respMsgAlarmVo.setAlarmId(reqMsgAlarmVo.getAlarmId());
                 respMsgAlarmVo.setCameraCode(reqMsgAlarmVo.getAlarmCamera());
                 respMsgAlarmVo.setIsCancel(alarm.getIsLock());
-                respMsgAlarmVo.setCancelTime(alarm.getReleasedTime());
+                if (!ObjectUtils.isEmpty(alarm.getReleasedTime())) {
+                    respMsgAlarmVo.setCancelTime(alarm.getReleasedTime().getTime());
+                }
+                respMsgAlarmVo.setCancelTime(null);
             }
             jsonObject.put("resultCode", 1);
             jsonObject.put("message", "成功");
@@ -173,9 +190,9 @@ public class GeoHazardMonitorTokenController {
                 lw.eq(BaseDeviceDynamicManagement::getCameraCode, reqDeviceVo.getCameraCode());
             }
             BaseDeviceDynamicManagement baseDynamicManagement = baseDeviceDynamicManagementService.getOne(lw);
-            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()));
+            baseDynamicManagement.setElectricity(reqDeviceVo.getElectricity());
+            baseDynamicManagement.setUpdateTime(new Date(reqDeviceVo.getTime()));
+            baseDynamicManagement.setCameraState(reqDeviceVo.getCameraState());
             if (baseDeviceDynamicManagementService.updateById(baseDynamicManagement)) {
                 jsonObject.put("resultCode", 1);
                 jsonObject.put("message", "成功");

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

@@ -39,7 +39,8 @@ public class UploadController {
     public AjaxResult upLoadImage(@RequestParam("stream") MultipartFile stream,
                                   @RequestParam(value = "cameraCode", required = false) String cameraCode,
                                   @RequestParam(value = "size", required = false) Long size,
-                                  @RequestParam(value = "contentType", required = false) String contentType) throws Exception {
+                                  @RequestParam(value = "contentType", required = false) String contentType,
+                                  @RequestParam(value = "lineDir", required = false) Integer lineDir) throws Exception {
         if (stream.isEmpty()) {
             return AjaxResult.error("不能上传空文件哦");
         }
@@ -59,9 +60,15 @@ public class UploadController {
                 String filename = IdUtils.fastSimpleUUID() + stream.getOriginalFilename().substring(stream.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
                 String format1 = dateFormat1.format(new Date());
-                String imgName = baseCameraManagement.getRailwayName() + "/" + (baseCameraManagement.getLineDir()==1L ? "上行" : "下行") + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
+                String line = "";
+                if (!ObjectUtils.isEmpty(lineDir)) {
+                    line = lineDir == 1 ? "上行" : "下行";
+                } else {
+                    line = baseCameraManagement.getLineDir() == 1L ? "上行" : "下行";
+                }
+                String imgName = baseCameraManagement.getRailwayName() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
                 minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
-                uploadFile = "/" + baseCameraManagement.getRailwayName() + "/" + (baseCameraManagement.getLineDir()==1L ? "上行" : "下行") + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
+                uploadFile = "/" + baseCameraManagement.getRailwayName() + "/" + line + "/" + baseCameraManagement.getInstallMile() +"/"+ format1 + "/" + filename;
 
             }
         } else {

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

@@ -1,6 +1,7 @@
 package com.ozs.vo;
 
 import lombok.Data;
+import org.omg.PortableInterceptor.INACTIVE;
 
 import java.io.Serializable;
 
@@ -18,13 +19,13 @@ public class ReqDeviceVo implements Serializable {
     /**
      * 时间
      */
-    private String time;
+    private Long time;
     /**
      * 剩余电量
      */
-    private String electricity;
+    private Integer electricity;
     /**
      * 剩余电量
      */
-    private String cameraState;
+    private Integer cameraState;
 }

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

@@ -41,7 +41,7 @@ public class ReqMsgAlarmVo implements Serializable {
     private Integer alarmType;
 
     /** 报警病害属性（可以给出泥石流的框定范围） */
-    private String alarmArrr;
+    private String alarmAttr;
     
     /** 报警图片地址 */
     private String imageUrl;