台账线路逻辑修改

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

@@ -55,32 +55,6 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
      */
     @Excel(name = "线路名称")
     private String railwayName;
-
-    /**
-     * 创建人
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 修改人
-     */
-    private String updateBy;
-
-    /**
-     * 修改时间
-     */
-    private Date updateTime;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
     /**
      *线路类型名称
      */

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

@@ -189,14 +189,6 @@ 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());

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

@@ -15,6 +15,7 @@ import com.ozs.common.utils.poi.ExcelUtil;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.vo.BaseRailwayManagementVo;
+import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
@@ -55,6 +56,8 @@ public class BaseRailwayManagementController extends BaseController {
     BaseRailwayManagementService baseRailwayManagementService;
     @Autowired
     private ISysDictTypeService dictTypeService;
+    @Autowired
+    private BaseCameraManagementService baseCameraManagementService;
 
     /**
      * 线路管理表分页
@@ -97,6 +100,18 @@ public class BaseRailwayManagementController extends BaseController {
     @DeleteMapping("/{lineIds}")
     @ApiOperation("删除线路管理表信息")
     public AjaxResult removeLineManagement(@PathVariable List<Long> lineIds) {
+        for (Long lineId : lineIds) {
+            BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(lineId);
+            if (ObjectUtils.isEmpty(baseRailwayManagement1)) {
+                return error("主键"+lineId+":不存在");
+            }
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper();
+            wrapper.eq(BaseCameraManagement::getRailwayCode, baseRailwayManagement1.getRailwayCode());
+            List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+            if (list.size() > 0) {
+                return error("主键"+lineId+"已绑定相机，不能删除");
+            }
+        }
         if (baseRailwayManagementService.removeByIds(lineIds)) {
             return AjaxResult.success();
         }
@@ -129,10 +144,16 @@ public class BaseRailwayManagementController extends BaseController {
     @PutMapping("/editRailwayManagement")
     @ApiOperation("修改线路管理表信息")
     public AjaxResult editLineManagement(@RequestBody BaseRailwayManagement baseRailwayManagement) {
-        List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
-        for (SysDictData datum : data) {
-            if (datum.getDictLabel().equals(baseRailwayManagement.getRailwayTypeName())) {
-                baseRailwayManagement.setRailwayType(Integer.valueOf(datum.getDictValue()));
+        BaseRailwayManagement baseRailwayManagement1 = baseRailwayManagementService.getById(baseRailwayManagement.getId());
+        if (ObjectUtils.isEmpty(baseRailwayManagement1)) {
+            return error("主键不存在");
+        }
+        if (!baseRailwayManagement1.getRailwayCode().equals(baseRailwayManagement.getRailwayCode())) {
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper();
+            wrapper.eq(BaseCameraManagement::getRailwayCode, baseRailwayManagement1.getRailwayCode());
+            List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+            if (list.size() > 0) {
+                return error("当前线路编码已绑定相机，不能修改");
             }
         }
         baseRailwayManagement.setUpdateBy(getUserId());