Merge branch 'dev_power_axis' of http://121.42.41.42:7070/r/epmet-plugins into dev_power_axis

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

@@ -1,6 +1,7 @@
 package com.epmet.plugin.power.dto.axis;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import lombok.Data;
@@ -57,6 +58,10 @@ public class PowerAxisStructDTO implements Serializable {
      */
     private String pids;
 
+    private BigDecimal longitude;
+
+    private BigDecimal latitude;
+
     /**
      * 类别编码
      */

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

@@ -75,9 +75,9 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
 
     List<String> getIdsByAgencyId(String agencyId, String customerId);
 
-    int queryGridParty(PowerAxisStructViewFormDTO form);
+    int queryGridParty(PowerAxisStructViewFormDTO form,String gridCateGoryCode);
 
-    int queryGroupParty(PowerAxisStructViewFormDTO form);
+    int queryGroupParty(PowerAxisStructViewFormDTO form,String groupCateGoryCode);
 
     int getKernelHouseHold(PowerAxisStructViewFormDTO form);
 
@@ -102,4 +102,16 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
      * @date 2022/4/23/0023 14:38
      */
     List<PowerAxisStructTreeResultDTO> listParentTreeByLevel(@Param("structLevel") int structLevel, @Param("customerId") String customerId);
+
+    /**
+     * 查询cateGoryCode
+     *
+     * @param customerId
+ * @param level
+ * @param tagCateGory
+     * @return java.lang.String
+     * @author LZN
+     * @date 2022/4/24 19:29
+     */
+    String getCateGoryCode(String customerId, int level, String tagCateGory);
 }

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

@@ -10,6 +10,7 @@ import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResult
 import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO;
 import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,10 +28,15 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
 
     long getTotal(PowerKernelHouseHoldViewListFormDTO form);
 
-    List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form);
+    List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form,List<String> axisStructIds);
 
     long getListTotal(PowerKernelListPostitionFormDTO form);
 
 
     List<String> queryHouseIdList(String[] houseIdList, String customerId,String axisStructId);
+
+
+    List<String> queryIds(String customerId, String axisStructId);
+
+    List<PowerKernelListPostitionResultDTO> queryListPosition(String axisStructId, String customerId, int limit);
 }

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

@@ -228,10 +228,14 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
     @Override
     public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) {
         form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+
+        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_FIRST.level(),PowerTagCategoryEnum.STRUCT.category());
         // 查网格党支部数 grid_party
-        int gridParty = baseDao.queryGridParty(form);
+        int gridParty = baseDao.queryGridParty(form,gridCateGoryCode);
+
+        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_SECOND.level(),PowerTagCategoryEnum.STRUCT.category());
         // 查楼院党小组数 group_party
-        int groupParty = baseDao.queryGroupParty(form);
+        int groupParty = baseDao.queryGroupParty(form,groupCateGoryCode);
         // 查询党员数
         int partyNum = 0;
         // 查询党员中心户数

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

@@ -21,9 +21,11 @@ import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO;
+import com.epmet.plugin.power.enums.PowerTagCategoryEnum;
 import com.epmet.plugin.power.modules.axis.dao.PowerKernelHouseholdDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity;
 import com.epmet.plugin.power.modules.axis.redis.PowerKernelHouseholdRedis;
+import com.epmet.plugin.power.modules.axis.service.PowerAxisTagService;
 import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
@@ -55,6 +57,9 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     @Autowired
     private PowerKernelHouseholdService powerKernelHouseholdService;
 
+    @Autowired
+    private PowerAxisTagService powerAxisTagService;
+
     @Override
     public PageData<PowerKernelHouseholdDTO> page(Map<String, Object> params) {
         IPage<PowerKernelHouseholdEntity> page = baseDao.selectPage(
@@ -130,11 +135,10 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
 
     @Override
     public List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form) {
-        form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+        return baseDao.queryListPosition(form.getAxisStructId(),form.getCustomerId(),form.getLimit());
-        List<PowerKernelListPostitionResultDTO> dto = baseDao.getListPosition(form);
-        return dto;
     }
 
+
     @Override
     public long getListTotal(PowerKernelListPostitionFormDTO form) {
         form.setCustomerId(loginUserUtil.getLoginUserCustomerId());

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

@@ -50,7 +50,7 @@
         left join pli_power_axis_struct_leader sl on s.ID = sl.STRUCT_REFERENCE_ID
         left join pli_power_axis_leader l on l.ID = sl.LEADER_ID
         left join pli_power_axis_tag t on s.CATEGORY_CODE = t.CATEGORY_CODE
-        where s.DEL_FLAG = '0'
+        where s.DEL_FLAG = '0' and sl.del_flag = '0' and l.del_flag = '0'
         <if test="agencyId != null and agencyId != ''">
             and s.AGENCY_ID = #{agencyId}
         </if>
@@ -127,7 +127,7 @@
         WHERE
 	        AGENCY_ID = #{agencyId}
 	    AND
-	        CATEGORY_CODE = 'grid_party'
+	        CATEGORY_CODE = #{gridCateGoryCode}
 	    AND
 	        customer_id = #{customerId}
     </select>
@@ -139,7 +139,7 @@
         WHERE
 	        AGENCY_ID = #{agencyId}
 	    AND
-	        CATEGORY_CODE = 'group_party'
+	        CATEGORY_CODE = #{groupCateGoryCode}
 	    AND
 	        customer_id = #{customerId}
     </select>
@@ -216,6 +216,18 @@
             AND struct.customer_id = #{customerId}
             AND tag.struct_level &lt; #{structLevel}
     </select>
+    <select id="getCateGoryCode" resultType="java.lang.String">
+        SELECT
+            CATEGORY_CODE
+        FROM
+            pli_power_axis_tag
+        WHERE
+            customer_id = #{customerId}
+        AND
+            TAG_CATEGORY = #{tagCateGory}
+        AND
+            STRUCT_LEVEL = #{level}
+    </select>
 
 
 </mapper>

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

@@ -22,14 +22,20 @@
     </resultMap>
 
     <select id="getTotal" resultType="java.lang.Long">
-        select
+        SELECT
             count(*)
         FROM
-            pli_power_kernel_household
+            pli_power_kernel_household k
+        LEFT JOIN
+            pli_power_axis_struct s
+        ON
+            s.id = k.STRUCT_REFERENCE_ID
         WHERE
-	        STRUCT_REFERENCE_ID = #{axisStructId}
+            s.DEL_FLAG = '0'
-	    AND
+        AND k.DEL_FLAG = '0'
-	        customer_id = #{customerId}
+        AND k.CUSTOMER_ID = #{customerId}
+        AND (s.pids LIKE '%${axisStructId}%'
+        OR s.id = #{axisStructId})
     </select>
     <select id="getListPosition"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO">
@@ -41,35 +47,46 @@
         FROM
             pli_power_kernel_household
         WHERE
-	        STRUCT_REFERENCE_ID = #{axisStructId}
+	        STRUCT_REFERENCE_ID in
+	        <foreach collection="list" item="axStrId" open="(" close=")" separator=",">
+                #{axStrId}
+            </foreach>
 	    AND
 	        customer_id = #{customerId}
 	    limit #{limit}
     </select>
     <select id="getListTotal" resultType="java.lang.Long">
-        select
+        SELECT
-            count(*)
+                count(*)
-        from
+            FROM
-            pli_power_kernel_household
+                pli_power_axis_struct AS s
-        where
+                LEFT JOIN pli_power_kernel_household h ON s.id = h.STRUCT_REFERENCE_ID
-            STRUCT_REFERENCE_ID = #{axisStructId}
+            WHERE
-        AND
+                s.DEL_FLAG = '0'
-            customer_id = #{customerId}
+                AND h.DEL_FLAG = '0' AND h.CUSTOMER_ID = #{customerId}
+                and s.pids LIKE '%${axisStructId}%'
     </select>
     <select id="getList"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO">
         SELECT
-                OWNER_NAME,
+            k.OWNER_NAME,
-                HOUSE_ID,
+            k.HOUSE_ID,
-                ADDRESS
+            k.ADDRESS
-            FROM
+        FROM
-                pli_power_kernel_household
+            pli_power_kernel_household k
-            WHERE
+        LEFT JOIN
-	            STRUCT_REFERENCE_ID = #{axisStructId}
+            pli_power_axis_struct s
-	        and
+        ON
-	            customer_id = #{customerId}
+            s.id = k.STRUCT_REFERENCE_ID
-	        limit
+        WHERE
-                #{pageNo},#{pageSize}
+            s.DEL_FLAG = '0'
+        AND k.DEL_FLAG = '0'
+        AND k.CUSTOMER_ID = #{customerId}
+        AND (s.pids LIKE '%${axisStructId}%'
+        OR s.id = #{axisStructId})
+        GROUP BY k.id
+	    ORDER BY s.SORT
+        limit #{pageNo},#{pageSize}
     </select>
     <select id="queryHouseIdList" resultType="java.lang.String">
         SELECT
@@ -89,6 +106,34 @@
                 del_flag = '0'
         </where>
     </select>
+    <select id="queryIds" resultType="java.lang.String">
+        SELECT
+            id
+        FROM
+            pli_power_axis_struct
+        WHERE
+            pids
+        LIKE
+            '%${axisStructId}%'
+    </select>
+    <select id="queryListPosition"
+            resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO">
+            SELECT
+                h.id AS houseId,
+                h.longitude,
+                h.latitude,
+                h.address
+            FROM
+                pli_power_axis_struct AS s
+                LEFT JOIN pli_power_kernel_household h ON s.id = h.STRUCT_REFERENCE_ID
+            WHERE
+                s.DEL_FLAG = '0'
+                AND h.DEL_FLAG = '0' AND h.CUSTOMER_ID = #{customerId}
+                and s.pids LIKE '%${axisStructId}%'
+                GROUP BY h.id
+                ORDER BY s.SORT
+                limit #{limit}
+    </select>
 
 
 </mapper>