fix(ys):联动单位信息排序

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyUnitService.java

@@ -26,7 +26,7 @@ public interface IYsEmergencyUnitService {
 
     YsEmergencyUnitDto querySafeUnitBySeq(Long sequenceNbr);
 
-    Page<YsEmergencyUnitDto> querySafeUnitsByPage(Page<YsEmergencyUnit> page,YsEmergencyUnitDto ysEmergencyUnitDto);
+    Page<YsEmergencyUnitDto> querySafeUnitsByPage(Page<YsEmergencyUnit> page,String sort,YsEmergencyUnitDto ysEmergencyUnitDto);
 
     void export(HttpServletResponse response, List<String> asList);
 

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyUnitController.java

@@ -143,13 +143,15 @@ public class YsEmergencyUnitController extends BaseController {
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<YsEmergencyUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,YsEmergencyUnitDto ysEmergencyUnitDto) {
-	    Page<YsEmergencyUnit> page = new Page<YsEmergencyUnit>();
+	@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+	public ResponseModel<Page<YsEmergencyUnitDto>> queryForPage(@RequestParam(value = "current") int current,
+																@RequestParam(value = "size") int size,
+																@RequestParam(value = "", required = false) String sort,
+																YsEmergencyUnitDto ysEmergencyUnitDto) {
+		Page<YsEmergencyUnit> page = new Page<YsEmergencyUnit>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(iYsEmergencyUnitService.querySafeUnitsByPage(page,ysEmergencyUnitDto));
+	    return ResponseHelper.buildResponse(iYsEmergencyUnitService.querySafeUnitsByPage(page,sort,ysEmergencyUnitDto));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyUnitServiceImpl.java

@@ -132,25 +132,42 @@ public class YsEmergencyUnitServiceImpl extends BaseService<YsEmergencyUnitDto,
      * @return
      */
     @Override
-    public Page<YsEmergencyUnitDto> querySafeUnitsByPage(Page<YsEmergencyUnit> page,YsEmergencyUnitDto ysEmergencyUnitDto) {
+    public Page<YsEmergencyUnitDto> querySafeUnitsByPage(Page<YsEmergencyUnit> page, String sort, YsEmergencyUnitDto ysEmergencyUnitDto) {
         LambdaQueryWrapper<YsEmergencyUnit> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(YsEmergencyUnit::getIsDelete,Boolean.FALSE);
-        //条件查询 -> 根据名称查询
-        if(StringUtil.isNotEmpty(ysEmergencyUnitDto.getName())){
-            queryWrapper.like(YsEmergencyUnit::getName,ysEmergencyUnitDto.getName());
+        queryWrapper.eq(YsEmergencyUnit::getIsDelete, Boolean.FALSE);
+        // 条件查询 -> 根据名称查询
+        if (StringUtil.isNotEmpty(ysEmergencyUnitDto.getName())) {
+            queryWrapper.like(YsEmergencyUnit::getName, ysEmergencyUnitDto.getName());
         }
-        //条件查询 -> 根据应急服务内容查询
-        if(StringUtils.isNotEmpty(ysEmergencyUnitDto.getEmergencyService())){
-            queryWrapper.like(YsEmergencyUnit::getEmergencyService,ysEmergencyUnitDto.getEmergencyService());
+        // 条件查询 -> 根据应急服务内容查询
+        if (StringUtils.isNotEmpty(ysEmergencyUnitDto.getEmergencyService())) {
+            queryWrapper.like(YsEmergencyUnit::getEmergencyService, ysEmergencyUnitDto.getEmergencyService());
         }
-        //条件查询 -> 根据关联消防队查询
+        // 条件查询 -> 根据关联消防队查询
         if (ysEmergencyUnitDto.getTeamId() != null) {
-            queryWrapper.like(YsEmergencyUnit::getTeamId,ysEmergencyUnitDto.getTeamId());
+            queryWrapper.like(YsEmergencyUnit::getTeamId, ysEmergencyUnitDto.getTeamId());
+        }
+        if (StringUtils.isNotBlank(sort)) {
+            String[] split = sort.split(",");
+            String field = split[0];
+            String sortDirection = split[1];
+            // 使用switch匹配字段, 确保字段类型安全
+            switch (field) {
+                case "name":
+                    if (sortDirection.startsWith("asc")) {
+                        queryWrapper.orderByAsc(YsEmergencyUnit::getName);
+                    } else {
+                        queryWrapper.orderByDesc(YsEmergencyUnit::getName);
+                    }
+                    break;
+                default:
+                    break;
+            }
         }
         this.page(page, queryWrapper);
-        //数据脱敏
+        // 数据脱敏
         Page<YsEmergencyUnitDto> ysEmergencyUnitDtoPage = new Page<YsEmergencyUnitDto>();
-        BeanUtils.copyProperties(page,ysEmergencyUnitDtoPage);
+        BeanUtils.copyProperties(page, ysEmergencyUnitDtoPage);
         return ysEmergencyUnitDtoPage;
     }