台账相机逻辑修改

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

@@ -45,7 +45,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "相机编码")
     private String cameraCode;
-    
+
     /**
      * 通道编号
      */
@@ -56,7 +56,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      * 所属工务段编码(单位id)
      */
     @Excel(name = "所属工务段编码(单位id)")
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 行别(1上行2下行）
@@ -124,4 +124,16 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     @TableField(exist = false)
     private String endMiles;
-}
+
+    /**
+     *线路名称
+     */
+    @TableField(exist = false)
+    private String railwayName;
+
+    /**
+     *所属工务段名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+}

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

@@ -44,7 +44,7 @@ public class MsgAlarmResp implements Serializable {
     /**
      * 所属工务段编码(单位id)
      */
-    private Integer deptId;
+    private Long deptId;
 
     /**
      * 报警里程位置

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ozs.common.config.BaseConfig;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.exception.base.BaseException;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
@@ -25,6 +26,7 @@ import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAlarmService;
+import com.ozs.system.service.ISysDeptService;
 import com.ozs.web.core.util.CameraUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.MediaType;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -72,7 +75,7 @@ public class BaseCameraManagementController extends BaseController {
     @Resource
     BaseDeviceDynamicManagementService baseDeviceDynamicManagementService;
     @Autowired
-    private ServerConfig serverConfig;
+    private ISysDeptService deptService;
     @Autowired
     private MsgAlarmService msgAlarmService;
     @Autowired
@@ -106,7 +109,14 @@ public class BaseCameraManagementController extends BaseController {
         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>();
+                LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+                if (!ObjectUtils.isEmpty(o.getRailwayCode())) {
+                    queryWrapper.eq(BaseRailwayManagement::getRailwayCode, o.getRailwayCode());
+                }
+                BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+                SysDept sysDept = deptService.selectDeptById(o.getDeptId());
+                o.setDeptName(sysDept.getDeptName());
+                o.setRailwayName(baseRailwayManagement.getRailwayName());
                 String mils = AppendUtils.stringAppend(o.getInstallMile());
                 o.setInstallMiles(mils);
                 String end = AppendUtils.stringAppend(o.getEndMile());
@@ -128,11 +138,18 @@ public class BaseCameraManagementController extends BaseController {
      */
     @DeleteMapping("/{accountManagementIds}")
     @ApiOperation("删除相机台账管理信息")
+    @Transactional
     public AjaxResult removeAccountManagement(@PathVariable List<Long> accountManagementIds) {
-        if (baseCameraManagementService.removeByIds(accountManagementIds)) {
-            return AjaxResult.success();
+        LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+        for (Long accountManagementId : accountManagementIds) {
+            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(accountManagementId);
+            baseCameraManagementService.removeById(accountManagementId);
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
+            }
+            baseDeviceDynamicManagementService.remove(queryWrapper);
         }
-        return AjaxResult.error();
+        return AjaxResult.success();
     }
 
     /**
@@ -143,6 +160,7 @@ public class BaseCameraManagementController extends BaseController {
      */
     @PostMapping("/saveAccountManagement")
     @ApiOperation("新增相机台账管理信息")
+    @Transactional
     public AjaxResult saveDistributionModule(@RequestBody BaseCameraManagement baseCameraManagement) {
         int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
         baseCameraManagement.setBeginMile(miles);
@@ -171,6 +189,14 @@ public class BaseCameraManagementController extends BaseController {
     @PutMapping("/editAccountManagement")
     @ApiOperation("修改相机台账管理信息")
     public AjaxResult editAccountManagement(@RequestBody BaseCameraManagement baseCameraManagement) {
+        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayName())) {
+            queryWrapper.eq(BaseRailwayManagement::getRailwayName, baseCameraManagement.getRailwayName());
+        }
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+        SysDept sysDept = deptService.selectDeptByDeptName(baseCameraManagement.getDeptName());
+        baseCameraManagement.setDeptId(sysDept.getDeptId());
+        baseCameraManagement.setRailwayCode(baseRailwayManagement.getRailwayCode());
         int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
         baseCameraManagement.setBeginMile(miles);
         int install = AppendUtils.stringSplit(baseCameraManagement.getInstallMiles());
@@ -188,6 +214,14 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("根据相机ID获取相机台账管理信息")
     public AjaxResult getInfo(@PathVariable Long id) {
         BaseCameraManagement baseCameraManagement = baseCameraManagementService.getById(id);
+        LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
+        if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
+            queryWrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
+        }
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(queryWrapper);
+        SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+        baseCameraManagement.setDeptName(sysDept.getDeptName());
+        baseCameraManagement.setRailwayName(baseRailwayManagement.getRailwayName());
         String mils = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
         baseCameraManagement.setInstallMiles(mils);
         String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());