|
@@ -13,11 +13,7 @@ import com.ozs.common.core.domain.entity.SysRole;
|
|
|
import com.ozs.common.core.redis.RedisCache;
|
|
|
import com.ozs.common.enums.BusinessType;
|
|
|
import com.ozs.common.exception.base.BaseException;
|
|
|
-import com.ozs.common.utils.AppendUtils;
|
|
|
-import com.ozs.common.utils.ChineseToPingyin;
|
|
|
-import com.ozs.common.utils.HttpClientUtil;
|
|
|
-import com.ozs.common.utils.IdempotenceUtils;
|
|
|
-import com.ozs.common.utils.StringUtils;
|
|
|
+import com.ozs.common.utils.*;
|
|
|
import com.ozs.common.utils.file.FileUtils;
|
|
|
import com.ozs.common.utils.http.HttpUtils;
|
|
|
import com.ozs.common.utils.poi.ExcelUtil;
|
|
@@ -754,9 +750,9 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
children.sort(new Comparator<CameraTree>() {
|
|
|
@Override
|
|
|
public int compare(CameraTree o1, CameraTree o2) {
|
|
|
- String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getName());
|
|
|
+ String name1 = PolyphoneHandler.getPolyphonePinyin(o1.getName());
|
|
|
String substring1 = name1.substring(0, 1);
|
|
|
- String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getName());
|
|
|
+ String name2 = PolyphoneHandler.getPolyphonePinyin(o2.getName());
|
|
|
String substring2 = name2.substring(0, 1);
|
|
|
return substring1.compareTo(substring2);
|
|
|
}
|
|
@@ -766,9 +762,9 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
children1.sort(new Comparator<CameraTree>() {
|
|
|
@Override
|
|
|
public int compare(CameraTree o1, CameraTree o2) {
|
|
|
- String name1 = ChineseToPingyin.convertHanziToPinyin(o1.getPublicWorksSection());
|
|
|
+ String name1 = PolyphoneHandler.getPolyphonePinyin(o1.getPublicWorksSection());
|
|
|
String substring1 = name1.substring(0, 1);
|
|
|
- String name2 = ChineseToPingyin.convertHanziToPinyin(o2.getPublicWorksSection());
|
|
|
+ String name2 = PolyphoneHandler.getPolyphonePinyin(o2.getPublicWorksSection());
|
|
|
String substring2 = name2.substring(0, 1);
|
|
|
return substring1.compareTo(substring2);
|
|
|
}
|