message:

完善接口传参

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisDataListPositionFormDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.plugin.power.dto.axis.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class PowerAxisDataListPositionFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 832591628268584219L;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+}

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java

@@ -101,9 +101,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:19
      */
     @PostMapping("axis/{structLevel}/listPosition")
-    public ResultDTO getListPosition(@PathVariable int structLevel) {
-        List<PowerAxisListPositionResultDTO> list = powerAxisStructService.getListPosition(structLevel);
-        return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel));
+    public ResultDTO getListPosition(@PathVariable int structLevel,@RequestBody PowerAxisDataListPositionFormDTO form) {
+        List<PowerAxisListPositionResultDTO> list = powerAxisStructService.getListPosition(structLevel,form);
+        return ResultDTO.success("成功", list, powerAxisStructService.queryTotal(structLevel,form));
     }
 
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java

@@ -87,10 +87,10 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
 
     String queryCategoryCode(PowerAxisListPositionFormDTO form);
 
-    List<PowerAxisListPositionResultDTO> querylistPosition(String customerId, String code);
+    List<PowerAxisListPositionResultDTO> querylistPosition(@Param("customerId") String customerId,@Param("code") String code ,@Param("agencyId") String agencyId);
 
 
-    long queryTotal(String customerId, String code);
+    long queryTotal(@Param("customerId") String customerId,@Param("code") String code,@Param("agencyId") String agencyId);
 
     /**
      * 根据节点接报，组装其上级节点树

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java

@@ -143,9 +143,9 @@ public interface PowerAxisStructService extends BaseService<PowerAxisStructEntit
      */
     List<PowerAxisStructTreeResultDTO> getStructTree(PowerAxisStructStructTreeFormDTO form);
 
-    List<PowerAxisListPositionResultDTO> getListPosition(int structLevel);
+    List<PowerAxisListPositionResultDTO> getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form);
 
-    long queryTotal(int structLevel);
+    long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form);
 
     /**
      * 根据节点接报，组装其上级节点树

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -258,26 +258,26 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
     }
 
     @Override
-    public List<PowerAxisListPositionResultDTO> getListPosition(int structLevel) {
-        PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO();
+    public List<PowerAxisListPositionResultDTO> getListPosition(int structLevel,PowerAxisDataListPositionFormDTO form) {
+        PowerAxisListPositionFormDTO dto = new PowerAxisListPositionFormDTO();
         String customerId = loginUserUtil.getLoginUserCustomerId();
-        form.setCustomerId(customerId);
-        form.setStructLevel(structLevel);
-        form.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
-        String code = baseDao.queryCategoryCode(form);
-        List<PowerAxisListPositionResultDTO> list = baseDao.querylistPosition(customerId, code);
+        dto.setCustomerId(customerId);
+        dto.setStructLevel(structLevel);
+        dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
+        String code = baseDao.queryCategoryCode(dto);
+        List<PowerAxisListPositionResultDTO> list = baseDao.querylistPosition(customerId, code ,form.getAgencyId());
         return list;
     }
 
     @Override
-    public long queryTotal(int structLevel) {
-        PowerAxisListPositionFormDTO form = new PowerAxisListPositionFormDTO();
+    public long queryTotal(int structLevel,PowerAxisDataListPositionFormDTO form) {
+        PowerAxisListPositionFormDTO dto = new PowerAxisListPositionFormDTO();
         String customerId = loginUserUtil.getLoginUserCustomerId();
-        form.setCustomerId(customerId);
-        form.setStructLevel(structLevel);
-        form.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
-        String code = baseDao.queryCategoryCode(form);
-        long total = baseDao.queryTotal(customerId, code);
+        dto.setCustomerId(customerId);
+        dto.setStructLevel(structLevel);
+        dto.setTagCategory(PowerTagCategoryEnum.STRUCT.category());
+        String code = baseDao.queryCategoryCode(dto);
+        long total = baseDao.queryTotal(customerId, code, form.getAgencyId());
         return total;
     }
 

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml

@@ -191,6 +191,8 @@
 	            CUSTOMER_ID = #{customerId}
 	        and
 	            CATEGORY_CODE = #{code}
+	        and
+	            AGENCY_ID = #{agencyId}
     </select>
     <select id="queryTotal" resultType="java.lang.Long">
         select
@@ -201,6 +203,8 @@
 	        CUSTOMER_ID = #{customerId}
 	    AND
 	        CATEGORY_CODE = #{code}
+	    and
+	        AGENCY_ID = #{agencyId}
     </select>
     <select id="listParentTreeByLevel"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisStructTreeResultDTO">