gao.qiang 2 tahun lalu
induk
melakukan
26762d2de4

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

@@ -61,7 +61,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 行别(1上行2下行)
      */
-    @Excel(name = "行别")
+    @Excel(name = "行别",readConverterExp = "1=上行,2=下行")
     private Integer lineDir;
 
     /**
@@ -109,7 +109,7 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     /**
      * 是否开启录像(1开启2不开启)
      */
-    @Excel(name = "是否开启录像")
+    @Excel(name = "是否开启录像",readConverterExp = "1=开启,2=不开启")
     private Integer startRecording;
 
     /**

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

@@ -47,7 +47,7 @@ public class BaseRailwayManagement extends BaseEntity implements Serializable {
     /**
      * 线路类型(普铁/高铁 )
      */
-    @Excel(name = "线路类型")
+    @Excel(name = "线路类型",readConverterExp = "1=高铁,2=普快")
     private Integer railwayType;
 
     /**

+ 1 - 0
hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -86,6 +86,7 @@ public class SysUserController extends BaseController {
      */
     @ApiOperation(value = "获取用户列表")
     @PostMapping("/list")
+    @PreAuthorize("@ss.hasPermi('system:user:list')")
     public AjaxResult list(@RequestBody SysUserVo sysUserVo) {
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<SysUser>();
         if (!ObjectUtils.isEmpty(sysUserVo.getUserName())) {

TEMPAT SAMPAH
hazard-admin/src/main/resources/template/baseCameraManagement.xlsx