Merge remote-tracking branch 'origin/master'

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

@@ -11,8 +11,10 @@ import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.exception.base.BaseException;
+import com.ozs.common.utils.ApiTokenUtils;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.ChineseToPingyin;
+import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.http.HttpUtils;
@@ -92,6 +94,8 @@ public class BaseCameraManagementController extends BaseController {
     private ServerConfig serverConfig;
     @Autowired
     private CaneraConfig caneraConfig;
+    @Autowired
+    private IdempotenceUtils idempotenceUtils;
 
     /**
      * 所有相机列表+权限
@@ -221,6 +225,11 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("新增相机台账管理信息")
     @Transactional
     public AjaxResult saveAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
+        String idempotence = idempotenceUtils.getIdempotence(baseCameraManagement.getCameraCode());
+        if (StringUtils.isNotEmpty(idempotence)){
+            return  error("你的网络卡顿,请不要一直添加!!!");
+        }
+        idempotenceUtils.createIdempotence(baseCameraManagement.getCameraCode());
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             lw.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
@@ -249,8 +258,10 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setStartRecording(2);
         }
         if (baseCameraManagementService.save(baseCameraManagement) && baseDeviceDynamicManagementService.save(baseDynamicManagement)) {
+            idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return AjaxResult.success();
         }
+        idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
         return AjaxResult.error();
     }
 

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

@@ -9,6 +9,7 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysDictData;
 import com.ozs.common.utils.AppendUtils;
+import com.ozs.common.utils.IdempotenceUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
@@ -58,6 +59,8 @@ public class BaseRailwayManagementController extends BaseController {
     private ISysDictTypeService dictTypeService;
     @Autowired
     private BaseCameraManagementService baseCameraManagementService;
+    @Autowired
+    private IdempotenceUtils idempotenceUtils;
 
     /**
      * 线路管理表分页
@@ -148,6 +151,11 @@ public class BaseRailwayManagementController extends BaseController {
     @PutMapping("/editRailwayManagement")
     @ApiOperation("修改线路管理表信息")
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
+        String idempotence = idempotenceUtils.getIdempotence(baseRailwayManagement.getRailwayCode());
+        if (StringUtils.isNotEmpty(idempotence)){
+            return  error("你的网络卡顿,请不要一直添加!!!");
+        }
+        idempotenceUtils.createIdempotence(baseRailwayManagement.getRailwayCode());
         BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(baseRailwayManagement.getId());
         if (ObjectUtils.isEmpty(baseRailwayManagement1)) {
             return error("主键不存在");
@@ -162,8 +170,10 @@ public class BaseRailwayManagementController extends BaseController {
         }
         baseRailwayManagement.setUpdateBy(getUserId());
         if (baseRailwayManagementService.updateById(baseRailwayManagement)) {
+            idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
             return AjaxResult.success();
         }
+        idempotenceUtils.deleteIdempotence(baseRailwayManagement.getRailwayCode());
         return AjaxResult.error();
     }
 

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

@@ -73,8 +73,6 @@ public class MsgAlarmController extends BaseController {
     BaseCameraManagementService baseCameraManagementService;
     @Autowired
     BaseRailwayManagementService baseRailwayManagementService;
-    @Value("${base.imgUrl:http://124.71.171.71:18801/picbucket}")
-    private String imgUrl;
     @Autowired
     private MsgWebPushService msgWebPushService;
 
@@ -154,13 +152,6 @@ public class MsgAlarmController extends BaseController {
         IPage<MsgAlarm> page = msgAlarmService.page(new Page<>(msgAlarmVo.getPageNum(), msgAlarmVo.getPageSize()), lw);
         if(!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())){
             List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
-                ArrayList<String> objects = new ArrayList<>();
-                String[] split = o.getImageUrl().split(";");
-                for (String s : split) {
-                    s = imgUrl + s;
-                    objects.add(s);
-                }
-                o.setImageUrls(objects);
                 LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
                 if (!ObjectUtils.isEmpty(o.getCameraCode())) {
                     cameraManagementLambdaQueryWrapper.eq(BaseCameraManagement::getCameraCode, o.getCameraCode());
@@ -212,13 +203,6 @@ public class MsgAlarmController extends BaseController {
         String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         msgAlarmResp.setAlarmMile(mile);
         msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude()+","+baseCameraManagement.getInstallLatitude());
-        ArrayList<String> objects = new ArrayList<>();
-        String[] split = msgAlarm.getImageUrl().split(";");
-        for (String s : split) {
-            s = imgUrl + s;
-            objects.add(s);
-        }
-        msgAlarmResp.setImageUrls(objects);
         return AjaxResult.success(msgAlarmResp);
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/websocket/WebSocketConteoller.java

@@ -42,8 +42,6 @@ public class WebSocketConteoller extends BaseController {
     private BaseCameraManagementService baseCameraManagementService;
     @Autowired
     private UserRegistrationidService userRegistrationidService;
-    @Value("${base.imgUrl:http://124.71.171.71:18801/picbucket}")
-    private String imgUrl;
 
     @ResponseBody
     @PostMapping("/publish")
@@ -69,16 +67,6 @@ public class WebSocketConteoller extends BaseController {
         msgAlarmResp.setRailwayName(cameraName != null ? cameraName : "");
         msgAlarmResp.setLineDirStr(baseCameraManagement.getLineDir() == 1 ? "上行" : "下行");
         msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime() != null ? msgAlarm.getAlarmTime() : new Date());
-        // 图片
-        ArrayList<String> objects = new ArrayList<>();
-        if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
-            String[] split = msgAlarm.getImageUrl().split(";");
-            for (String s : split) {
-                s = imgUrl + s;
-                objects.add(s);
-            }
-            msgAlarmResp.setImageUrls(objects);
-        }
         // 推送消息reqMsgAlarmVo
         webSocketServer.sendMoreMessage(list, objStr(msgAlarmResp));
 

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

@@ -37,6 +37,8 @@ public class UploadController {
     MinioUtils minioUtils;
     @Autowired
     BaseCameraManagementService baseCameraManagementService;
+    @Value("${base.imgUrl:http://124.71.171.71:18801/picbucket}")
+    private String imgUrl;
 
 
     @PostMapping("/putObject")
@@ -77,7 +79,7 @@ public class UploadController {
                 }
                 String imgName = baseCameraManagement.getRailwayCode() + "/" + line + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
                 minioUtils.minIoClientUpload(stream.getInputStream(), imgName);
-                uploadFile = "/" + baseCameraManagement.getRailwayCode() + "/" + line + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
+                uploadFile = imgUrl+"/" + baseCameraManagement.getRailwayCode() + "/" + line + "/" + baseCameraManagement.getInstallMile() + "/" + format1 + "/" + filename;
             }
         } else {
             jsonObject.put("resultCode", 2);