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

@@ -5,7 +5,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import pps.cloud.system.service.SystemDictionaryService;
 import pps.cloud.system.service.data.sys_dictionary.*;
-import pps.core.common.pattern.Builder;
 import pps.core.system.cache.SysDictionaryCache;
 import pps.core.system.entity.SysDictionaryEnt;
 import pps.core.system.entity.SysDictionaryView;
@@ -20,7 +19,9 @@ import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
 import xstartup.data.XListResult;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @XService
@@ -139,16 +140,12 @@ public class SysDictionaryServiceImpl implements SystemDictionaryService {
     public XListResult<QuerySysDictionaryViewOutput> queryChildSysDictionarysByParentAlias(XContext context, QuerySysDictionaryViewInput input) {
         List<QuerySysDictionaryViewOutput> resultList = new ArrayList<>();
         SysDictionaryMapper sysDictionaryMapper = context.getBean(SysDictionaryMapper.class);
-        List<SysDictionaryEnt> list = sysDictionaryMapper.selectList(Builder.create(QueryWrapper.class).build(queryWrapper -> {
-            queryWrapper.eq("alias", input.getAlias());
-        }));
+        List<SysDictionaryEnt> list = sysDictionaryMapper.selectList(new QueryWrapper<SysDictionaryEnt>().eq("alias", input.getAlias()));
         if (list.isEmpty()) {
             return XListResult.success(resultList);
         }
         SysDictionaryEnt parentDictionaryEnt = list.get(0);
-        list = sysDictionaryMapper.selectList(Builder.create(QueryWrapper.class).build(queryWrapper -> {
-            queryWrapper.eq("pid", parentDictionaryEnt.getId());
-        }));
+        list = sysDictionaryMapper.selectList(new QueryWrapper<SysDictionaryEnt>().eq("pid", parentDictionaryEnt.getId()));
         resultList = XCopyUtils.copyNewList(list, QuerySysDictionaryViewOutput.class);
         return XListResult.success(resultList);
     }