feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/SysOrganizationCloudService.java

@@ -23,7 +23,14 @@ public interface SysOrganizationCloudService {
     @XText("根据组织机构id获取所有的子级组织机构列表")
     XListResult<GetSysOrganizationViewOutput> getAllListByOuId(XContext context, GetAllOuListByOuIdInput input);
 
+    /**
+     * 查采油厂列表
+     *
+     * @param context 上下文
+     * @param input   输入
+     * @return {@link XListResult }<{@link GetSysOrganizationViewOutput }>
+     */
     @XText("查采油厂列表")
-    XListResult<GetSysOrganizationViewOutput> getPlantList(XContext context);
+    XListResult<GetSysOrganizationViewOutput> getPlantList(XContext context, GetSysOrganizationViewInput input);
 }
 

C02-system/pps-cloud-system/src/main/java/pps/cloud/system/service/data/sys_organization/GetAllOuListByOuIdInput.java

 package pps.cloud.system.service.data.sys_organization;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import xstartup.annotation.XText;
 
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
 public class GetAllOuListByOuIdInput {
 
     @XText("组织机构id")
     private String ouId;
 
-    public String getOuId() {
-        return ouId;
-    }
-
-    public void setOuId(String ouId) {
-        this.ouId = ouId;
-    }
+    @XText("单位级别（从系统字典中来）")
+    private String ouLevel;
 }

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

@@ -121,13 +121,14 @@ public class SysOrganizationCloudServiceImpl implements SysOrganizationCloudServ
         SysOrganizationView view = new SysOrganizationView();
         view.setIsDeleted(1);
         view.setId(input.getOuId());
+        view.setOuLevel(input.getOuLevel());
         List<SysOrganizationView> list = mapper.selectAllListByOuId(view);
         List<GetSysOrganizationViewOutput> viewList = XCopyUtils.copyNewList(list, GetSysOrganizationViewOutput.class);
         return XListResult.success(viewList);
     }
 
     @Override
-    public XListResult<GetSysOrganizationViewOutput> getPlantList(XContext context) {
+    public XListResult<GetSysOrganizationViewOutput> getPlantList(XContext context, GetSysOrganizationViewInput input) {
         SysOrganizationMapper mapper = context.getBean(SysOrganizationMapper.class);
         List<SysOrganizationEnt> plant = mapper.selectList(new LambdaQueryWrapper<SysOrganizationEnt>()
                 .eq(SysOrganizationEnt::getIsDeleted, BusinessConstant.ONE)

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysOrganizationViewMapper.xml

@@ -213,11 +213,19 @@
 
     <select id="selectAllListByOuId" parameterType="pps.core.system.entity.SysOrganizationView"
             resultMap="BaseResultMap">
-        select r.ou_id as id, r.parent_ou_id, s.ou_name, s.short_name
+        select s.id,
+        r.parent_ou_id,
+        s.ou_name,
+        s.short_name,
+        s.longitude,
+        s.latitude
         from sys_organization_rel r
-                 left join sys_organization s on r.ou_id = s.id
+        left join sys_organization s on r.ou_id = s.id
         where s.is_deleted = #{isDeleted}
-          and (r.ou_id = #{id} or r.ou_id_path like '%${id}%')
+        and (r.ou_id = #{id} or r.ou_id_path like '%${id}%')
+        <if test="ouLevel != null and ouLevel !=''">
+            and s.ou_level = #{ouLevel}
+        </if>
         order by s.create_time
     </select>
 

C09-base/pps-core-base/src/main/java/pps/core/base/utils/ServiceUtil.java

@@ -11,6 +11,7 @@ import pps.cloud.system.service.data.sys_dictionary.GetSysDictionaryViewOutput;
 import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewInput;
 import pps.cloud.system.service.data.sys_dictionary.QuerySysDictionaryViewOutput;
 import pps.cloud.system.service.data.sys_organization.GetAllOuListByOuIdInput;
+import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewInput;
 import pps.cloud.system.service.data.sys_organization.GetSysOrganizationViewOutput;
 import xstartup.base.XContext;
 import xstartup.data.XListResult;
@@ -90,7 +91,7 @@ public class ServiceUtil {
      */
     public static List<GetSysOrganizationViewOutput> getPlantList(XContext context) {
         SysOrganizationCloudService bean = context.getBean(SysOrganizationCloudService.class);
-        XListResult<GetSysOrganizationViewOutput> result = bean.getPlantList(context);
+        XListResult<GetSysOrganizationViewOutput> result = bean.getPlantList(context, GetSysOrganizationViewInput.builder().build());
         result.throwIfFail();
         return result.getResult();
     }

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/HomePageService.java

@@ -78,12 +78,13 @@ public class HomePageService {
         List<GetStationViewOutput> outputs;
         String stationId = input.getStationId();
         if (CharSequenceUtil.isBlank(stationId)) {
-            //查组织
-            SysOrganizationCloudService service = context.getBean(SysOrganizationCloudService.class);
-            XListResult<GetSysOrganizationViewOutput> result = service.getPlantList(context);
-            result.throwIfFail();
-            outputs = new ArrayList<>(result.getResult().size());
-            result.getResult().forEach(item -> {
+            stationId = context.getSession(PpsUserSession.class).getOuId();
+            List<GetSysOrganizationViewOutput> ouList = ServiceUtil.getOrgIdsByPath(context, GetAllOuListByOuIdInput.builder()
+                    .ouId(stationId)
+                    .ouLevel("PLANT")
+                    .build());
+            outputs = new ArrayList<>(ouList.size());
+            ouList.forEach(item -> {
                 outputs.add(GetStationViewOutput.builder()
                         .stationId(item.getId())
                         .stationName(item.getOuName())

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/utils/ServiceUtil.java

@@ -314,6 +314,20 @@ public class ServiceUtil {
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 获取所有path包含组织ID的组织
+     *
+     * @param context   上下文
+     * @param ouIdInput ou id输入
+     * @return {@link List }<{@link GetSysOrganizationViewOutput }>
+     */
+    public static List<GetSysOrganizationViewOutput> getOrgIdsByPath(XContext context, GetAllOuListByOuIdInput ouIdInput) {
+        SysOrganizationCloudService organizationCloudService = context.getBean(SysOrganizationCloudService.class);
+        XListResult<GetSysOrganizationViewOutput> allListByOuId = organizationCloudService.getAllListByOuId(context, ouIdInput);
+        allListByOuId.throwIfFail();
+        return allListByOuId.getResult();
+    }
+
     /**
      * 获取电源线列表
      *