skyline 2 роки тому
батько
коміт
1ed888fb81

+ 2 - 1
admin/src/main/java/com/kym/admin/controller/StationController.java

@@ -49,9 +49,10 @@ public class StationController {
         // 判断数据权限
         var adminStationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
         var res = stationService.lambdaQuery()
+                .eq(Station::getStationStatus,Station.STATION_STATUS_正常使用)
                 .eq(isNotNull(adminStationId), Station::getStationId, adminStationId)
                 .like(isNotNull(stationName), Station::getStationName, stationName)
-                .orderByDesc(Station::getStationId).list();
+                .orderByAsc(Station::getStationId).list();
         return R.success(res);
     }
 

+ 7 - 0
entity/src/main/java/com/kym/entity/admin/Station.java

@@ -27,6 +27,13 @@ public class Station extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    // 站点状态:0:未知 1:建设中 5:关闭下线 6:维护中 50:正常使用
+    public static final int STATION_STATUS_未知 = 0;
+    public static final int STATION_STATUS_建设中 = 1;
+    public static final int STATION_STATUS_关闭下线 = 5;
+    public static final int STATION_STATUS_维护中= 6;
+    public static final int STATION_STATUS_正常使用 = 50;
+
     /**
      * 公司id
      */