Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -39,7 +39,7 @@ public class BaseCameraVersion {
     private String versionName;
 
     /**
-     * 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
+     * 升级类型 0.固件 1.算法 2:算法及硬件升级
      */
     private String upgradeType;
 

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

@@ -43,7 +43,7 @@ public class BaseCameraVersionVo {
     private String versionName;
 
     /**
-     * 升级类型 1:算法升级,2:硬件升级,3:算法及硬件升级
+     * 升级类型 0.固件 1.算法 2:算法及硬件升级
      */
     private String upgradeType;
     private String upgradeTypename;

hazard-admin/src/main/java/com/ozs/web/controller/mqtt/MqttController.java

@@ -8,6 +8,8 @@ import com.ozs.service.utils.SubscribeClient;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,16 +20,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/service/mqtt")
 @Slf4j
-public class MqttController {
-
-    @ApiOperation(value = "设备心跳")
-    @GetMapping("/deviceHeartbeat")
-    @Log(title = "MQTT", businessType = BusinessType.SELECT)
-    public AjaxResult selectCameraAll() {
-        new SubscribeClient("heart", "heart").start();
-        return AjaxResult.success();
-    }
-
+public class MqttController implements ApplicationRunner {
+    
 
     @ApiOperation(value = "置信度修改")
     @GetMapping("/confidenceCoefficient")
@@ -37,4 +31,9 @@ public class MqttController {
         new SubscribeClient("config", "config").start();
         return AjaxResult.success();
     }
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        new SubscribeClient("heart", "heart").start();
+    }
 }

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

@@ -101,12 +101,12 @@ public class UploadController {
             String imageName = image.getOriginalFilename();
             if (StringUtils.isNotBlank(imageName)) {
                 // String date = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date());
-                String filename = image.getOriginalFilename().substring(0,image.getOriginalFilename().lastIndexOf("."));
+                // String filename = image.getOriginalFilename().substring(0,image.getOriginalFilename().lastIndexOf("."));
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
                 String format1 = dateFormat1.format(new Date());
-                String imgName = "cameraVersion" + "/" + format1 + "/" + filename;
+                String imgName = "cameraVersion" + "/" + format1 + "/" + imageName;
                 minioUtils.minIoClientUpload(image.getInputStream(), imgName);
-                uploadFile = "/cameraVersion/" + format1 + "/" + filename;
+                uploadFile = "/cameraVersion/" + format1 + "/" + imageName;
             }
         } else {
             return AjaxResult.error("上传功能出错");