bestunion/SY
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
yhy 2026-02-05 15:16:07 +08:00
commit 63a7321e9b
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-admin/src/main/java/com/ruoyi/web/controller/bussiness/PubApiController.java
View File

@ -1,7 +1,11 @@
package com.ruoyi.web.controller.bussiness; package com.ruoyi.web.controller.bussiness;
import java.io.Serializable;
import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -32,6 +36,19 @@ public class PubApiController extends BaseController {
@Autowired @Autowired
private ISendPoliceTaskStatService iSendPoliceTaskStatService; private ISendPoliceTaskStatService iSendPoliceTaskStatService;
public class PinyinComparator implements Comparator<String>, Serializable {
private static final long serialVersionUID = 1L;
final Collator collator;
public PinyinComparator() {
this.collator = Collator.getInstance(Locale.CHINESE);
}
public int compare(String o1, String o2) {
return this.collator.compare(o1, o2);
}
}
@ApiOperation("警察列表") @ApiOperation("警察列表")
@GetMapping("/list_police") @GetMapping("/list_police")
public AjaxResult listPolice(@RequestParam("unit_id") Long unitId) public AjaxResult listPolice(@RequestParam("unit_id") Long unitId)
@ -62,7 +79,8 @@ public class PubApiController extends BaseController {
results.add(su); results.add(su);
} }
results.sort((u1, u2) -> u1.getRemark().compareTo(u2.getRemark())); PinyinComparator pinyinComparator = new PinyinComparator();
results.sort((u1, u2) -> pinyinComparator.compare(u1.getRemark(), u2.getRemark()));
return AjaxResult.success(results); return AjaxResult.success(results);
} }
@ -77,11 +95,12 @@ public class PubApiController extends BaseController {
@GetMapping("/list_send_police") @GetMapping("/list_send_police")
public AjaxResult listSendPolice(@RequestParam("unit_id") Long unitId) public AjaxResult listSendPolice(@RequestParam("unit_id") Long unitId)
{ {
PinyinComparator pinyinComparator = new PinyinComparator();
JwSendPoliceQueryReq req = new JwSendPoliceQueryReq(); JwSendPoliceQueryReq req = new JwSendPoliceQueryReq();
req.setUnitId(unitId.toString()); req.setUnitId(unitId.toString());
req.setState("2"); req.setState("2");
List<Map> results = iSendPoliceTaskStatService.JwSendPoliceCountList(req); List<Map> results = iSendPoliceTaskStatService.JwSendPoliceCountList(req);
results.sort((u1, u2) -> objectToString(u1.get("remark")).compareTo(objectToString(u2.get("remark")))); results.sort((u1, u2) -> pinyinComparator.compare(objectToString(u1.get("remark")), objectToString(u2.get("remark"))));
return AjaxResult.success(results); return AjaxResult.success(results);
} }
} }