Merge remote-tracking branch 'origin/developer' into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireBuildingDto.java

@@ -36,6 +36,10 @@ public class FireBuildingDto extends BaseDto {
     @ApiModelProperty(value = "楼层数量")
     private String floorNumber;
 
+    @ApiModelProperty(value = "包含装备数量")
+    private String equipmentNumber;
+
+
     @ApiModelProperty(value = "父级mrid")
     private String parentMrid;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/entity/FireBuilding.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ccs.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -57,6 +58,11 @@ public class FireBuilding extends BaseEntity {
     private String floorNumber;
 
     /**
+     * 包含装备数量
+     */
+    private String equipmentNumber;
+
+    /**
      * 父级mrid
      */
     @TableField("parent_mrid")

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/enums/StationOrderByTypeEnum.java

+package com.yeejoin.amos.boot.module.ccs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * @author DELL
+ */
+
+@Getter
+@AllArgsConstructor
+public enum StationOrderByTypeEnum {
+
+    SAFETY_INDEX_DESC("1", "安全指数倒序", "order by safety_index desc"),
+    ALARM_TIMES_DESC("2", "今日告警数倒序", "order by todayAlarmTimes desc");
+
+    private String code;
+    private String name;
+    private String orderBy;
+
+    public static Optional<StationOrderByTypeEnum> getEnum(String code) {
+        return Arrays.stream(StationOrderByTypeEnum.values()).filter(e -> e.getCode().equals(code)).findFirst();
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireStationInfoMapper.java

@@ -17,6 +17,7 @@ public interface FireStationInfoMapper extends BaseMapper<FireStationInfo> {
     /**
      * 换流站列表
      * @return List<FireStationInfoDto>
+     * @param orderBy
      */
-    List<FireStationInfoDto> queryStationListWithStatistics();
+    List<FireStationInfoDto> queryStationListWithStatistics(String orderBy);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireStationInfoMapper.xml

@@ -11,5 +11,8 @@
         FROM
         `asf_fire_station_info` i
         where i.status = false
+        <if test="orderBy != null and orderBy != ''">
+            ${orderBy}
+        </if>
     </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireBuildingController.java

@@ -13,9 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 消防建筑表
  *
@@ -30,44 +27,6 @@ public class FireBuildingController extends BaseController {
     @Autowired
     FireBuildingServiceImpl fireBuildingServiceImpl;
 
-    /**
-     * 新增消防建筑表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增消防建筑表", notes = "新增消防建筑表")
-    public ResponseModel<FireBuildingDto> save(@RequestBody FireBuildingDto model) {
-        model = fireBuildingServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消防建筑表", notes = "根据sequenceNbr删除消防建筑表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireBuildingServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个消防建筑表", notes = "根据sequenceNbr查询单个消防建筑表")
-    public ResponseModel<FireBuildingDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryBySeq(sequenceNbr));
-    }
 
     /**
      * 列表分页查询
@@ -77,25 +36,16 @@ public class FireBuildingController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
+    @GetMapping(value = "{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防建筑表分页查询", notes = "消防建筑表分页查询")
-    public ResponseModel<Page<FireBuildingDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
+    public ResponseModel<Page<FireBuildingDto>> queryForPage(
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size,
+            @PathVariable String stationCode) {
         Page<FireBuildingDto> page = new Page<FireBuildingDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryForFireBuildingPage(page));
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "消防建筑表列表全部数据查询", notes = "消防建筑表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireBuildingDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryForFireBuildingList());
+        return ResponseHelper.buildResponse(fireBuildingServiceImpl.queryForFireBuildingPage(page, name, stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireStationInfoController.java

@@ -2,12 +2,15 @@ package com.yeejoin.amos.boot.module.ccs.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto;
+import com.yeejoin.amos.boot.module.ccs.api.enums.StationOrderByTypeEnum;
 import com.yeejoin.amos.boot.module.ccs.biz.service.impl.FireStationInfoServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -15,6 +18,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 站端信息表
@@ -38,7 +42,8 @@ public class FireStationInfoController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "站端信息表列表", notes = "站端信息表列表")
     @GetMapping(value = "/list")
-    public ResponseModel<List<FireStationInfoDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireStationInfoServiceImpl.queryForFireStationInfoList());
+    public ResponseModel<List<FireStationInfoDto>> selectForList(
+            @ApiParam(value = "排序条件") @RequestParam(required = false) String orderBy) throws Exception {
+        return ResponseHelper.buildResponse(fireStationInfoServiceImpl.queryForFireStationInfoList(orderBy));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireVehicleController.java

@@ -13,9 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 消防车辆信息
  *
@@ -31,45 +28,6 @@ public class FireVehicleController extends BaseController {
     FireVehicleServiceImpl fireVehicleServiceImpl;
 
     /**
-     * 新增消防车辆信息
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增消防车辆信息", notes = "新增消防车辆信息")
-    public ResponseModel<FireVehicleDto> save(@RequestBody FireVehicleDto model) {
-        model = fireVehicleServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消防车辆信息", notes = "根据sequenceNbr删除消防车辆信息")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireVehicleServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个消防车辆信息", notes = "根据sequenceNbr查询单个消防车辆信息")
-    public ResponseModel<FireVehicleDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireVehicleServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
      * 列表分页查询
      *
      * @param current 当前页
@@ -77,25 +35,16 @@ public class FireVehicleController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
+    @GetMapping(value = "{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防车辆信息分页查询", notes = "消防车辆信息分页查询")
-    public ResponseModel<Page<FireVehicleDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
+    public ResponseModel<Page<FireVehicleDto>> queryForPage(
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size,
+            @PathVariable String stationCode) {
         Page<FireVehicleDto> page = new Page<FireVehicleDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireVehicleServiceImpl.queryForFireVehiclePage(page));
-    }
-
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "消防车辆信息列表全部数据查询", notes = "消防车辆信息列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireVehicleDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireVehicleServiceImpl.queryForFireVehicleList());
+        return ResponseHelper.buildResponse(fireVehicleServiceImpl.queryForFireVehiclePage(page, name, stationCode));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireVideoController.java

@@ -13,9 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
 /**
  * 消防视频表
  *
@@ -30,58 +27,6 @@ public class FireVideoController extends BaseController {
     @Autowired
     FireVideoServiceImpl fireVideoServiceImpl;
 
-    /**
-     * 新增消防视频表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增消防视频表", notes = "新增消防视频表")
-    public ResponseModel<FireVideoDto> save(@RequestBody FireVideoDto model) {
-        model = fireVideoServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新消防视频表", notes = "根据sequenceNbr更新消防视频表")
-    public ResponseModel<FireVideoDto> updateBySequenceNbrFireVideo(@RequestBody FireVideoDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消防视频表", notes = "根据sequenceNbr删除消防视频表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个消防视频表", notes = "根据sequenceNbr查询单个消防视频表")
-    public ResponseModel<FireVideoDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryBySeq(sequenceNbr));
-    }
 
     /**
      * 列表分页查询
@@ -91,25 +36,17 @@ public class FireVideoController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
+    @GetMapping(value = "{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防视频表分页查询", notes = "消防视频表分页查询")
-    public ResponseModel<Page<FireVideoDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
-        Page<FireVideoDto> page = new Page<FireVideoDto>();
+    public ResponseModel<Page<FireVideoDto>> queryForPage(
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size,
+            @PathVariable String stationCode) {
+        Page<FireVideoDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoPage(page));
+        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoPage(page, name, stationCode));
     }
 
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "消防视频表列表全部数据查询", notes = "消防视频表列表全部数据查询")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<FireVideoDto>> selectForList() {
-        return ResponseHelper.buildResponse(fireVideoServiceImpl.queryForFireVideoList());
-    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/controller/FireWaterController.java

@@ -13,7 +13,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -31,59 +30,6 @@ public class FireWaterController extends BaseController {
     FireWaterServiceImpl fireWaterServiceImpl;
 
     /**
-     * 新增消防水源表
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/save")
-    @ApiOperation(httpMethod = "POST", value = "新增消防水源表", notes = "新增消防水源表")
-    public ResponseModel<FireWaterDto> save(@RequestBody FireWaterDto model) {
-        model = fireWaterServiceImpl.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
-    }
-
-    /**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PutMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新消防水源表", notes = "根据sequenceNbr更新消防水源表")
-    public ResponseModel<FireWaterDto> updateBySequenceNbrFireWater(@RequestBody FireWaterDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(fireWaterServiceImpl.updateWithModel(model));
-    }
-
-    /**
-     * 根据sequenceNbr删除
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除消防水源表", notes = "根据sequenceNbr删除消防水源表")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireWaterServiceImpl.removeById(sequenceNbr));
-    }
-
-    /**
-     * 根据sequenceNbr查询
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个消防水源表", notes = "根据sequenceNbr查询单个消防水源表")
-    public ResponseModel<FireWaterDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(fireWaterServiceImpl.queryBySeq(sequenceNbr));
-    }
-
-    /**
      * 列表分页查询
      *
      * @param current 当前页
@@ -91,14 +37,17 @@ public class FireWaterController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/page")
+    @GetMapping(value = "{stationCode}/page")
     @ApiOperation(httpMethod = "GET", value = "消防水源表分页查询", notes = "消防水源表分页查询")
-    public ResponseModel<Page<FireWaterDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size) {
+    public ResponseModel<Page<FireWaterDto>> queryForPage(
+            @RequestParam(value = "name", required = false) String name,
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size,
+            @PathVariable String stationCode) {
         Page<FireWaterDto> page = new Page<FireWaterDto>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(fireWaterServiceImpl.queryForFireWaterPage(page));
+        return ResponseHelper.buildResponse(fireWaterServiceImpl.queryForFireWaterPage(page, name, stationCode));
     }
 
     /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireBuildingServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireBuildingDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireBuilding;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireBuildingMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireBuildingService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireBuildingDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +19,19 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireBuildingServiceImpl extends BaseService<FireBuildingDto,FireBuilding,FireBuildingMapper> implements IFireBuildingService {
+public class FireBuildingServiceImpl extends BaseService<FireBuildingDto, FireBuilding, FireBuildingMapper> implements IFireBuildingService {
     /**
      * 分页查询
      */
-    public Page<FireBuildingDto> queryForFireBuildingPage(Page<FireBuildingDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<FireBuildingDto> queryForFireBuildingPage(Page<FireBuildingDto> page, @Condition(Operator.like) String name,@Condition String stationCode) {
+        return this.queryForPage(page, "createDate", false, name, stationCode);
     }
 
+
     /**
      * 列表查询 示例
      */
-    public List<FireBuildingDto> queryForFireBuildingList()   {
-        return this.queryForList("" , false);
+    public List<FireBuildingDto> queryForFireBuildingList() {
+        return this.queryForList("", false);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireStationInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireStationInfo;
+import com.yeejoin.amos.boot.module.ccs.api.enums.StationOrderByTypeEnum;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireStationInfoMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireStationInfoService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireStationInfoDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.foundation.utils.StringUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 站端信息表服务实现类
@@ -18,16 +22,16 @@ import java.util.List;
 @Service
 public class FireStationInfoServiceImpl extends BaseService<FireStationInfoDto,FireStationInfo,FireStationInfoMapper> implements IFireStationInfoService {
     /**
-     * 分页查询
-     */
-    public Page<FireStationInfoDto> queryForFireStationInfoPage(Page<FireStationInfoDto> page)   {
-        return this.queryForPage(page, null, false);
-    }
-
-    /**
      * 列表查询 示例
+     * @param orderBy
      */
-    public List<FireStationInfoDto> queryForFireStationInfoList()   {
-        return this.baseMapper.queryStationListWithStatistics();
+    public List<FireStationInfoDto> queryForFireStationInfoList(String orderBy) throws Exception {
+        if(StringUtils.isNotBlank(orderBy)){
+            Optional<StationOrderByTypeEnum> op = StationOrderByTypeEnum.getEnum(orderBy);
+            op.orElseThrow(()->new Exception("不存在查询排序条件"));
+            return this.baseMapper.queryStationListWithStatistics(op.get().getOrderBy());
+        } else {
+            return this.baseMapper.queryStationListWithStatistics(null);
+        }
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireVehicleServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireVehicleDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireVehicle;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireVehicleMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireVehicleService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireVehicleDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +19,18 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireVehicleServiceImpl extends BaseService<FireVehicleDto,FireVehicle,FireVehicleMapper> implements IFireVehicleService {
+public class FireVehicleServiceImpl extends BaseService<FireVehicleDto, FireVehicle, FireVehicleMapper> implements IFireVehicleService {
     /**
      * 分页查询
      */
-    public Page<FireVehicleDto> queryForFireVehiclePage(Page<FireVehicleDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<FireVehicleDto> queryForFireVehiclePage(Page<FireVehicleDto> page, @Condition(Operator.like) String name, String stationCode) {
+        return this.queryForPage(page, "createDate", false, name, stationCode);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<FireVehicleDto> queryForFireVehicleList()   {
-        return this.queryForList("" , false);
+    public List<FireVehicleDto> queryForFireVehicleList() {
+        return this.queryForList("", false);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireVideoServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireVideoDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireVideo;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireVideoMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireVideoService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireVideoDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +19,18 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireVideoServiceImpl extends BaseService<FireVideoDto,FireVideo,FireVideoMapper> implements IFireVideoService {
+public class FireVideoServiceImpl extends BaseService<FireVideoDto, FireVideo, FireVideoMapper> implements IFireVideoService {
     /**
      * 分页查询
      */
-    public Page<FireVideoDto> queryForFireVideoPage(Page<FireVideoDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<FireVideoDto> queryForFireVideoPage(Page<FireVideoDto> page, @Condition(Operator.like) String name, String stationCode) {
+        return this.queryForPage(page, "createDate", false, name, stationCode);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<FireVideoDto> queryForFireVideoList()   {
-        return this.queryForList("" , false);
+    public List<FireVideoDto> queryForFireVideoList() {
+        return this.queryForList("", false);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireWaterServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ccs.api.dto.FireWaterDto;
 import com.yeejoin.amos.boot.module.ccs.api.entity.FireWater;
 import com.yeejoin.amos.boot.module.ccs.api.mapper.FireWaterMapper;
 import com.yeejoin.amos.boot.module.ccs.api.service.IFireWaterService;
-import com.yeejoin.amos.boot.module.ccs.api.dto.FireWaterDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.annotation.Condition;
+import org.typroject.tyboot.core.rdbms.annotation.Operator;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -16,18 +19,18 @@ import java.util.List;
  * @date 2021-11-09
  */
 @Service
-public class FireWaterServiceImpl extends BaseService<FireWaterDto,FireWater,FireWaterMapper> implements IFireWaterService {
+public class FireWaterServiceImpl extends BaseService<FireWaterDto, FireWater, FireWaterMapper> implements IFireWaterService {
     /**
      * 分页查询
      */
-    public Page<FireWaterDto> queryForFireWaterPage(Page<FireWaterDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<FireWaterDto> queryForFireWaterPage(Page<FireWaterDto> page, @Condition(Operator.like) String name, String stationCode) {
+        return this.queryForPage(page, "createDate", false, name, stationCode);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<FireWaterDto> queryForFireWaterList()   {
-        return this.queryForList("" , false);
+    public List<FireWaterDto> queryForFireWaterList() {
+        return this.queryForList("", false);
     }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -1336,7 +1336,12 @@ public class CommandController extends BaseController {
         UserCar userCar=userCarService.selectByAmosUserId(Long.valueOf(agencyUserModel.getUserId()));
 
          id =userCar!=null?userCar.getCarId():null;
-
+         if(id==null&&isNo!=null&&isNo){
+             Map map =new HashMap();
+             map.put("select",null);
+             map.put("data",null);
+             return ResponseHelper.buildResponse(null);
+         }
         ResponseModel<Object> data=  equipFeignClient.equipmentCarList(teamId,name,code , pageNum,pageSize,id,isNo);
         Map map =new HashMap();
         map.put("select",userCar!=null?userCar.getCarId():null);

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java

@@ -227,7 +227,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                 alertSubmitted.setSchedulingType(alertSchedulingTypeEnum.get().getName());
                 alertSubmitted.setSubmissionContent(JSONObject.toJSONString(objectToMap(calledRo)));
 //                String token = RequestContext.getToken();
-//                ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
+//                ReginParams reginParams = JSONObject.parseObject(.get(RedisredisUtilsKey.buildReginKey(RequestContext.getExeUserId(),token)).toString(),
 //                        ReginParams.class);
 //                alertSubmitted.setRecUserName(reginParams.getUserModel().getUserName());
 //                alertSubmitted.setSender(reginParams.getUserModel().getUserName());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -149,7 +149,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
     public List<FireBrigadeResourceDto> getPowerTree(String type) {
         List<FireBrigadeResourceDto> fireBrigadeResourceList = Lists.newArrayList();
 
-        if(type!=null&&!"".equals(type)){
+        if(type!=null&&!"".equals(type)&&"1214".equals(type)){
             // 3.消防队伍-监控大队
             List<FireBrigadeResourceDto> monitorFireBrigadeList1 = fireTeamService.listMonitorFireBrigade(FireBrigadeTypeEnum.医疗救援队.getCode());
             FireBrigadeResourceDto monitorResourceDto1 = new FireBrigadeResourceDto();