feat(能源管理系统): 间开制度管理

1.开发定期校准模块-校准周期新增接口,完成接口冒烟测试并生成接口文档;
2.开发定期校准模块-校准周期修改接口,完成接口冒烟测试并生成接口文档;
3.开发定期校准模块-校准周期详情接口,完成接口冒烟测试并生成接口文档;
4.开发定期校准模块-校准历史分页列表接口,完成接口冒烟测试并生成接口文档;
5.开发定期校准模块-校准历史获取线路及井口树接口,完成接口冒烟测试并生成接口文档;
6.开发定期校准模块-校准历史重新优化接口,完成接口冒烟测试并生成接口文档;
7.开发系统管理-组织机构管理查询组织和线路列表接口,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/mapper/SysOrganizationViewMapper.java

@@ -61,6 +61,14 @@ public interface SysOrganizationViewMapper {
      */
     List<SysOrganizationView> selectOrgListDynamicQuery(SysOrganizationView record);
 
+    /**
+     * 查询登录人组织下线路列表
+     *
+     * @param record 记录
+     * @return {@link List}<{@link SysOrganizationView}>
+     */
+    List<SysOrganizationView> selectLineList(SysOrganizationView record);
+
     /**
      * 查询组织和线路列表
      *

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

@@ -462,10 +462,9 @@ public class SysOrganizationService {
     @XApiGet
     public XListResult<DynamicQuerySysOrganizationOutput> queryOrgAndLineList(XContext context, DynamicQuerySysOrganizationInput input) {
         SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
-        SysOrganizationView view;
-        if (StringUtils.isAllBlank(input.getId(), input.getOuName())) {
+        SysOrganizationView view = new SysOrganizationView();
+        if (StringUtils.isBlank(input.getId())) {
             //如果条件都为空,则从登录信息获取条件
-            view = new SysOrganizationView();
             PpsUserSession session = context.getSession(PpsUserSession.class);
             if (UserConstant.ISSUPERADMIN_TRUE.equals(session.getIsSuperAdmin())) {
                 view.setId(BusinessConstant.PARENT_OU_ID);
@@ -473,9 +472,15 @@ public class SysOrganizationService {
                 view.setId(session.getOuId());
             }
         } else {
-            view = XCopyUtils.copyNewObject(input, SysOrganizationView.class);
+            view.setId(input.getId());
+        }
+        List<SysOrganizationView> viewList;
+        if (StringUtils.isNotBlank(input.getOuName())) {
+            view.setOuName(input.getOuName());
+            viewList = mapper.selectLineList(view);
+        } else {
+            viewList = mapper.selectOrgAndLineList(view);
         }
-        List<SysOrganizationView> viewList = mapper.selectOrgAndLineList(view);
         List<DynamicQuerySysOrganizationOutput> outputs = XCopyUtils.copyNewList(viewList, DynamicQuerySysOrganizationOutput.class);
         return XListResult.success(outputs);
     }

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

@@ -557,6 +557,18 @@
         <result column="line_id" property="lineId" jdbcType="VARCHAR"/>
     </resultMap>
 
+    <select id="selectLineList" parameterType="pps.core.system.entity.SysOrganizationView"
+            resultMap="ExtendResultMap">
+        SELECT ou_id,
+               line_name AS ou_name,
+               id        AS line_id,
+               'LINE'    AS ou_level
+        FROM base_power_line
+        WHERE ou_id = #{id}
+          AND line_name LIKE CONCAT( '%', #{ouName}, '%' )
+        ORDER BY modify_time DESC
+    </select>
+
     <select id="selectOrgAndLineList" parameterType="pps.core.system.entity.SysOrganizationView"
             resultMap="ExtendResultMap">
         (SELECT o.id,