台账相机逻辑修改

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

@@ -105,4 +105,23 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "物联网卡号")
     private String cardNum;
+
+
+    /**
+     * 监控相机安装里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String installMiles;
+
+    /**
+     * 监控范围开始里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String beginMiles;
+
+    /**
+     * 监控范围结束里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String endMiles;
 }

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

@@ -51,6 +51,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -101,6 +102,19 @@ public class BaseCameraManagementController extends BaseController {
             lw.le(BaseCameraManagement::getEndMile, baseCameraManagementVo.getEndMile());
         }
         IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
+        if(!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())){
+            List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
+                LambdaQueryWrapper<BaseCameraManagement> cameraManagementLambdaQueryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
+                String mils = AppendUtils.stringAppend(o.getInstallMile());
+                o.setInstallMiles(mils);
+                String end = AppendUtils.stringAppend(o.getEndMile());
+                o.setEndMiles(end);
+                String begin = AppendUtils.stringAppend(o.getBeginMile());
+                o.setBeginMiles(begin);
+                return o;
+            }).collect(Collectors.toList());
+            page.setRecords(dto1);
+        }
         return AjaxResult.success(page);
     }
 
@@ -128,6 +142,12 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/saveAccountManagement")
     @ApiOperation("新增相机台账管理信息")
     public AjaxResult saveDistributionModule(@RequestBody BaseCameraManagement baseCameraManagement) {
+        int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
+        baseCameraManagement.setBeginMile(miles);
+        int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
+        baseCameraManagement.setInstallMile(install);
+        int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
+        baseCameraManagement.setEndMile(end);
         baseCameraManagement.setCreateBy(getUserId());
         baseCameraManagement.setUpdateBy(getUserId());    
         BaseDeviceDynamicManagement baseDynamicManagement = new BaseDeviceDynamicManagement();
@@ -149,6 +169,12 @@ public class BaseCameraManagementController extends BaseController {
     @PutMapping("/editAccountManagement")
     @ApiOperation("修改相机台账管理信息")
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
+        int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
+        baseCameraManagement.setBeginMile(miles);
+        int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
+        baseCameraManagement.setInstallMile(install);
+        int end = AppendUtils.stringSplit(baseCameraManagement.getEndMiles());
+        baseCameraManagement.setEndMile(end);
         baseCameraManagement.setUpdateBy(getUserId());
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return AjaxResult.success();
@@ -159,7 +185,14 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiOperation("根据相机ID获取相机台账管理信息")
     public AjaxResult getInfo(@PathVariable Long id) {
-        return AjaxResult.success(baseCameraManagementService.getById(id));
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
+        baseCameraManagement.setInstallMiles(mils);
+        String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
+        baseCameraManagement.setEndMiles(end);
+        String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
+        baseCameraManagement.setBeginMiles(begin);
+        return AjaxResult.success(baseCameraManagement);
     }
 
     /**

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

@@ -84,8 +84,9 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation(value = "报警信息分页")
     @PostMapping("/list")
     public AjaxResult selectMsgAlarm(@RequestBody MsgAlarmVo msgAlarmVo) {
+        BaseCameraManagement baseCameraManagement=new BaseCameraManagement();
         LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(msgAlarmVo.getLineDir())) {
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getRailwayCode())) {
             wrapper.eq(BaseCameraManagement::getRailwayCode, msgAlarmVo.getRailwayCode());
         }
         if (!ObjectUtils.isEmpty(msgAlarmVo.getBeginMile())) {
@@ -94,7 +95,9 @@ public class MsgAlarmController extends BaseController {
         if (!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
             wrapper.le(BaseCameraManagement::getEndMile, msgAlarmVo.getEndMile());
         }
-        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+        if (!ObjectUtils.isEmpty(msgAlarmVo.getRailwayCode())||!ObjectUtils.isEmpty(msgAlarmVo.getBeginMile())||!ObjectUtils.isEmpty(msgAlarmVo.getEndMile())) {
+            baseCameraManagement = baseCameraManagementService.getOne(wrapper);
+        }
         LambdaQueryWrapper<MsgAlarm> lw = new LambdaQueryWrapper<MsgAlarm>();
         if (!ObjectUtils.isEmpty(msgAlarmVo.getLineDir())) {
             lw.eq(MsgAlarm::getLineDir, msgAlarmVo.getLineDir());