feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysDictionaryServiceImpl.java

@@ -65,9 +65,9 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
                     String ouId = sysOrganizationRelEnt.getOuId();
                     if (StringUtils.isNotBlank(ouIdPath)) {
                         List<String> dicIds = sysOrganizationDictionaryEnts.stream().map(p -> {
-                            if (ouIdPath.indexOf(p.getOuId()) != -1 && p.getUseLowerLevel() == 1) {
+                            if (ouIdPath.contains(p.getOuId()) && p.getUseLowerLevel() == 1) {
                                 return p.getDicCode();
-                            } else if (ouId.indexOf(p.getOuId()) != -1) {
+                            } else if (ouId.contains(p.getOuId())) {
                                 return p.getDicCode();
                             } else {
                                 return "1";
@@ -86,14 +86,11 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
                             list.add(cache);
                         }
                     }
-                    Collections.sort(sysDictionaryList, new Comparator<SysDictionaryEnt>() {
-                        @Override
-                        public int compare(SysDictionaryEnt o1, SysDictionaryEnt o2) {
-                            if (ObjectUtils.isNotEmpty(o1.getSort()) && ObjectUtils.isNotEmpty(o2.getSort())) {
-                                return o1.getSort() - o2.getSort();
-                            } else {
-                                return 0;
-                            }
+                    sysDictionaryList.sort((o1, o2) -> {
+                        if (ObjectUtils.isNotEmpty(o1.getSort()) && ObjectUtils.isNotEmpty(o2.getSort())) {
+                            return o1.getSort() - o2.getSort();
+                        } else {
+                            return 0;
                         }
                     });
                     List<QuerySysDictionaryViewOutput> outputs = XCopyUtils.copyNewList(sysDictionaryList, QuerySysDictionaryViewOutput.class);
@@ -116,9 +113,9 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
             String ouId = sysOrganizationRelEnt.getOuId();
             if (StringUtils.isNotBlank(ouIdPath)) {
                 List<String> dicIds = sysOrganizationDictionaryEnts.stream().map(p -> {
-                    if (ouIdPath.indexOf(p.getOuId()) != -1 && p.getUseLowerLevel() == 1) {
+                    if (ouIdPath.contains(p.getOuId()) && p.getUseLowerLevel() == 1) {
                         return p.getDicCode();
-                    } else if (ouId.indexOf(p.getOuId()) != -1) {
+                    } else if (ouId.contains(p.getOuId())) {
                         return p.getDicCode();
                     } else {
                         return "1";
@@ -127,7 +124,7 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
                 list = list.stream().filter(i -> dicIds.contains(i.getId())).collect(Collectors.toList());
             }
         }
-        Collections.sort(list, (o1, o2) -> {
+        list.sort((o1, o2) -> {
             if (ObjectUtils.isNotEmpty(o1.getSort()) && ObjectUtils.isNotEmpty(o2.getSort())) {
                 return o1.getSort() - o2.getSort();
             } else {

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysOrganizationCloudServiceImpl.java

@@ -83,7 +83,7 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         view.setIsDeleted(1);
         view.setId(input.getOuId());
         List<SysOrganizationView> list = mapper.selectAllListByOuId(view);
-        if (list.size() > 0) {
+        if (!list.isEmpty()) {
             for (SysOrganizationView item : list) {
                 GetOuListTreeOutput out = new GetOuListTreeOutput();
                 out.setOuId(item.getId());
@@ -102,7 +102,7 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         List<GetOuListTreeOutput> outputs = new ArrayList<>();
         SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
         List<SysOrganizationView> list = mapper.selectListByOuIds(input.getOuIdList());
-        if (list.size() > 0) {
+        if (!list.isEmpty()) {
             for (SysOrganizationView item : list) {
                 GetOuListTreeOutput out = new GetOuListTreeOutput();
                 out.setOuId(item.getId());