Merge remote-tracking branch 'origin/master'

C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java

@@ -8,11 +8,19 @@ import pps.core.base.entity.BasePhotovoltaicPlantEnt;
 import pps.core.base.mapper.BasePhotovoltaicPlantMapper;
 import pps.core.base.service.data.base_photovoltaic_plant.*;
 import pps.core.base.utils.SessionSimulation;
+import pps.core.common.constant.UserConstant;
 import pps.core.common.session.PpsUserSession;
+import pps.core.system.constant.SysOrganizationCode;
+import pps.core.system.entity.SysOrganizationView;
+import pps.core.system.mapper.SysOrganizationViewMapper;
+import pps.core.system.service.data.sys_organization.GetSysOrganizationViewOutput;
+import pps.core.system.service.data.sys_organization_rel.GetSysOrganizationRelInput;
 import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.base.util.XCopyUtils;
+import xstartup.base.util.XStringUtils;
+import xstartup.data.XListResult;
 import xstartup.data.XPageResult;
 import xstartup.data.XServiceResult;
 import xstartup.data.XSingleResult;
@@ -130,4 +138,45 @@ public class BasePhotovoltaicPlantService extends BaseService{
         return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);
     }
 
+    @XText("根据父级id查询儿子级(含电站)")
+    @XApiPost
+    public XListResult<GetSysOrganizationViewOutput> selectOuAndPhotovoltaicPlantInfoByParentOuId(XContext context, GetSysOrganizationRelInput input) {
+        SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
+        BasePhotovoltaicPlantMapper plantMapper = context.getBean(BasePhotovoltaicPlantMapper.class);
+        QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
+        SysOrganizationView record = new SysOrganizationView();
+        XCopyUtils.copyObject(input, record);
+        record.setIsDeleted(SysOrganizationCode.NORMAL);
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        Integer isSuperAdmin = session.getIsSuperAdmin();
+        List<SysOrganizationView> viewList;
+        String ouId = "00000000-0000-0000-0000-000000000000";
+        if (XStringUtils.isEmpty(input.getParentOuId())) {
+            //如果是超级管理员查所以组织机构
+            if (UserConstant.ISSUPERADMIN_TRUE.equals(isSuperAdmin)) {
+                record.setParentOuId("00000000-0000-0000-0000-000000000000");
+                viewList = mapper.selectOuSonByParentOuId(record);
+            } else {
+                ouId = session.getOuId();
+                record.setId(session.getOuId());
+                viewList = mapper.selectOuByOuId(record);
+            }
+        } else {
+            ouId = input.getParentOuId();
+            viewList = mapper.selectOuSonByParentOuId(record);
+        }
+        queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId , ouId);
+        List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper);
+        plantList.forEach(item->{
+            SysOrganizationView view = new SysOrganizationView();
+            view.setId(item.getId());
+            view.setOuName(item.getStationName());
+            view.setShortName(item.getStationName());
+            view.setOuLevel("PLANT");
+            viewList.add(view);
+        });
+        List<GetSysOrganizationViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationViewOutput.class);
+        return XListResult.success(outputs);
+    }
+
 }

C12-prediction/pps-cloud-prediction/pom.xml

@@ -8,6 +8,7 @@
         <version>1.15.169-xstartup-cloud</version>
         <relativePath/>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
     <groupId>gf</groupId>
     <artifactId>pps-cloud-prediction</artifactId>