台账线路逻辑修改

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

@@ -1,6 +1,7 @@
 package com.ozs.service.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
@@ -79,4 +80,10 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
      * 备注
      */
     private String remark;
+
+    /**
+     *线路类型名称
+     */
+    @TableField(exist = false)
+    private String railwayTypeName;
 }

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

@@ -6,14 +6,21 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.core.domain.entity.SysDictData;
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.file.FileUtils;
 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.BaseRailwayManagementService;
+import com.ozs.system.service.ISysDictDataService;
+import com.ozs.system.service.ISysDictTypeService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -30,6 +37,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -45,6 +53,8 @@ import java.util.List;
 public class BaseRailwayManagementController extends BaseController {
     @Resource
     BaseRailwayManagementService baseRailwayManagementService;
+    @Autowired
+    private ISysDictTypeService dictTypeService;
 
     /**
      * 线路管理表分页
@@ -63,6 +73,18 @@ public class BaseRailwayManagementController extends BaseController {
             lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
         }
         IPage<BaseRailwayManagement> page = baseRailwayManagementService.page(new Page<BaseRailwayManagement>(baseRailwayManagementVo.getPageNum(), baseRailwayManagementVo.getPageSize()), lw);
+        List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+            List<BaseRailwayManagement> dto1 = page.getRecords().stream().map(o -> {
+                for (SysDictData datum : data) {
+                    if (datum.getDictValue().equals(o.getRailwayType().toString())) {
+                        o.setRailwayTypeName(datum.getDictLabel());
+                    }
+                }
+                return o;
+            }).collect(Collectors.toList());
+            page.setRecords(dto1);
+        }
         return AjaxResult.success(page);
     }
 
@@ -107,6 +129,12 @@ 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.setUpdateBy(getUserId());
         if (baseRailwayManagementService.updateById(baseRailwayManagement)) {
             return AjaxResult.success();
@@ -117,7 +145,14 @@ public class BaseRailwayManagementController extends BaseController {
     @GetMapping(value = "/{id}")
     @ApiOperation("根据台账ID获取线路管理表详细信息")
     public AjaxResult getInfo(@PathVariable Long id) {
-        return AjaxResult.success(baseRailwayManagementService.getById(id));
+        BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getById(id);
+        List<SysDictData> data = dictTypeService.selectDictDataByType("railway_type");
+        for (SysDictData datum : data) {
+            if (datum.getDictValue().equals(baseRailwayManagement.getRailwayType().toString())) {
+                baseRailwayManagement.setRailwayTypeName(datum.getDictLabel());
+            }
+        }
+        return AjaxResult.success(baseRailwayManagement);
     }
 
     /**
@@ -150,7 +185,7 @@ public class BaseRailwayManagementController extends BaseController {
             lw.like(BaseRailwayManagement::getRailwayCode, "%" + baseRailwayManagementVo.getRailwayCode() + "%");
         }
         if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
-            lw.eq(BaseRailwayManagement::getRailwayType,  baseRailwayManagementVo.getRailwayType());
+            lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
         }
         List<BaseRailwayManagement> list = baseRailwayManagementService.list(lw);
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<>(BaseRailwayManagement.class);