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/LoginService.java

@@ -183,11 +183,11 @@ public class LoginService {
     }
 
     private void checkCode(XContext context, String code, String codeIden) {
-        if (code == null) {
+        if (CharSequenceUtil.isBlank(code)) {
             throw new XServiceException(context, LoginError.NotExistCode);
         }
         LoginVerCodeCache isUse = LoginVerCodeCache.exist(context, codeIden);
-        if (isUse == null) {
+        if (ObjectUtil.isNull(isUse)) {
             throw new XServiceException(context, LoginError.NotUsedCode);
         }
         if (!CharSequenceUtil.equalsAnyIgnoreCase(isUse.getCode(), code)) {
@@ -224,7 +224,7 @@ public class LoginService {
         queryWrapper.lambda().eq(SysUserLoginLogEnt::getLoginName, loginName);
         queryWrapper.lambda().ge(SysUserLoginLogEnt::getCreateTime, XDateUtils.getDayBeginTime(new Date()));
         Long count = userLoginLogMapper.selectCount(queryWrapper);
-        if (count >= 5 && sysUserEnt != null) {
+        if (count >= 5 && ObjectUtil.isNotNull(sysUserEnt)) {
             SysUserMapper mapper = context.getBean(SysUserMapper.class);
             sysUserEnt.setStatus(2);
             sysUserEnt.setModifyTime(new Date());

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

 package pps.core.system.service;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.util.CollectionUtils;
 import pps.core.common.constant.BusinessConstant;
 import pps.core.system.cache.SysAreaCache;
 import pps.core.system.entity.SysAreaEnt;
@@ -41,20 +42,20 @@ public class SysAreaService {
         if (ObjectUtils.isNotEmpty(input.getLev()) && input.getLev() == 1) {
             List<SysAreaCache> items = new ArrayList<>();
             for (SysAreaCache ent : sysAreaCaches) {
-                if (!CollectionUtils.isEmpty(ent.getChildren())) {
+                if (CollUtil.isNotEmpty(ent.getChildren())) {
                     items.addAll(ent.getChildren());
                 }
             }
             sysAreaCaches = items;
         }
         //缓存不存在从数据库获取
-        if (CollectionUtils.isEmpty(sysAreaCaches)) {
+        if (CollUtil.isEmpty(sysAreaCaches)) {
             List<SysAreaCache> caches = selectSysAreaTree(context, input);
             List<GetSysAreaViewOutputTree> resultTree = XCopyUtils.copyNewList(caches, GetSysAreaViewOutputTree.class);
             if (ObjectUtils.isNotEmpty(input.getLev()) && input.getLev() == 1) {
                 List<GetSysAreaViewOutputTree> items = new ArrayList<>();
                 for (GetSysAreaViewOutputTree ent : resultTree) {
-                    if (!CollectionUtils.isEmpty(ent.getChildren())) {
+                    if (CollUtil.isNotEmpty(ent.getChildren())) {
                         items.addAll(ent.getChildren());
                     }
                 }
@@ -105,10 +106,10 @@ public class SysAreaService {
     @XApiPost
     public XServiceResult updateSysArea(XContext context, UpdateSysAreaInput input) {
         SysAreaMapper mapper = context.getBean(SysAreaMapper.class);
-        QueryWrapper<SysAreaEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysAreaEnt::getId, input.getId());
-        SysAreaEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
+        SysAreaEnt entity = mapper.selectOne(new QueryWrapper<SysAreaEnt>()
+                .lambda()
+                .eq(SysAreaEnt::getId, input.getId()));
+        if (ObjectUtil.isNull(entity)) {
             return XServiceResult.error(context, XError.NotFound);
         }
         XCopyUtils.copyObject(input, entity);
@@ -119,10 +120,10 @@ public class SysAreaService {
     @XApiPost
     public XServiceResult deleteSysArea(XContext context, DeleteSysAreaInput input) {
         SysAreaMapper mapper = context.getBean(SysAreaMapper.class);
-        QueryWrapper<SysAreaEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysAreaEnt::getId, input.getId());
-        SysAreaEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
+        SysAreaEnt entity = mapper.selectOne(new QueryWrapper<SysAreaEnt>()
+                .lambda()
+                .eq(SysAreaEnt::getId, input.getId()));
+        if (ObjectUtil.isNull(entity)) {
             return XServiceResult.error(context, XError.NotFound);
         }
         mapper.deleteById(entity);
@@ -132,10 +133,10 @@ public class SysAreaService {
     @XApiGet
     public XSingleResult<GetSysAreaOutput> getSysArea(XContext context, GetSysAreaInput input) {
         SysAreaMapper mapper = context.getBean(SysAreaMapper.class);
-        QueryWrapper<SysAreaEnt> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysAreaEnt::getId, input.getId());
-        SysAreaEnt entity = mapper.selectOne(queryWrapper);
-        if (entity == null) {
+        SysAreaEnt entity = mapper.selectOne(new QueryWrapper<SysAreaEnt>()
+                .lambda()
+                .eq(SysAreaEnt::getId, input.getId()));
+        if (ObjectUtil.isNull(entity)) {
             return XSingleResult.error(context, XError.NotFound);
         }
         GetSysAreaOutput output = new GetSysAreaOutput();