From a5002f1379c08fa7520a8e06232e9a008d83114f Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 11 May 2022 09:45:56 +0800
Subject: [PATCH] update

---
 .../axis/form/PowerAxisStructViewFormDTO.java   |  3 +++
 .../form/PowerKernelListPostitionFormDTO.java   |  2 +-
 .../result/PowerAxisStructViewResultDTO.java    |  4 ++--
 .../PowerAxisDataVisualController.java          |  6 ++++--
 .../impl/PowerAxisStructServiceImpl.java        | 17 +++++++++--------
 .../impl/PowerKernelHouseholdServiceImpl.java   |  7 ++++++-
 .../mapper/poweraxis/PowerAxisStructDao.xml     |  2 ++
 7 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java
index c22c881..a597f68 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerAxisStructViewFormDTO.java
@@ -2,6 +2,7 @@ package com.epmet.plugin.power.dto.axis.form;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Data
@@ -11,10 +12,12 @@ public class PowerAxisStructViewFormDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "所属客户不能为空")
     private String customerId;
 
     /**
      * 组织id
      */
+    @NotBlank(message = "所属组织不能为空")
     private String agencyId;
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java
index b2eb8ee..72923d7 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/form/PowerKernelListPostitionFormDTO.java
@@ -19,7 +19,7 @@ public class PowerKernelListPostitionFormDTO implements Serializable {
     /**
      * 条数
      */
-    private int limit;
+    private Integer limit;
 
     /**
      * 客户id
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructViewResultDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructViewResultDTO.java
index 5944990..fafb304 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructViewResultDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/result/PowerAxisStructViewResultDTO.java
@@ -22,7 +22,7 @@ public class PowerAxisStructViewResultDTO implements Serializable {
     /**
      * 党员数
      */
-    private int partyMemberNum;
+//    private int partyMemberNum;
 
     /**
      * 党员中心户数
@@ -37,5 +37,5 @@ public class PowerAxisStructViewResultDTO implements Serializable {
     /**
      * 志愿队伍数
      */
-    private int volunteerTeamNum;
+//    private int volunteerTeamNum;
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
index 63c9820..a9de19f 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisDataVisualController.java
@@ -60,7 +60,9 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:20
      */
     @PostMapping("axis/statistics")
-    public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form) {
+    public Result getStatistics(@RequestBody PowerAxisStructViewFormDTO form, @LoginUser TokenDto tokenDto) {
+        form.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(form);
         PowerAxisStructViewResultDTO result = powerAxisStructService.getStatistics(form);
         return new Result().ok(result);
     }
@@ -130,7 +132,7 @@ public class PowerAxisDataVisualController {
      * @date 2022/4/23 10:20
      */
     @PostMapping("kernelHousehold/listPosition")
-    public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@Valid @RequestBody PowerKernelListPostitionFormDTO form, @LoginUser TokenDto tokenDto) {
+    public Result<List<PowerKernelListPostitionResultDTO>> getListPosition(@RequestBody PowerKernelListPostitionFormDTO form, @LoginUser TokenDto tokenDto) {
         ValidatorUtils.validateEntity(form);
         form.setCustomerId(tokenDto.getCustomerId());
         return new Result().ok(powerKernelHouseholdService.getListPosition(form));
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
index 5e14c34..df6c554 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.NotBlank;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -227,19 +228,19 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
 
     @Override
     public PowerAxisStructViewResultDTO getStatistics(PowerAxisStructViewFormDTO form) {
-        form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
-
+        String customerId = form.getCustomerId();
+        String agencyId = form.getAgencyId();
         // 查网格党支部数 grid_party
-        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_FIRST.level(), PowerTagCategoryEnum.STRUCT.category());
-        int gridParty = baseDao.queryGridParty(form.getAgencyId(), form.getCustomerId(), gridCateGoryCode);
+        String gridCateGoryCode = baseDao.getCateGoryCode(customerId, PowerTagLevelEnum.CHILD_FIRST.level(), PowerTagCategoryEnum.STRUCT.category());
+        int gridParty = baseDao.queryGridParty(agencyId, customerId, gridCateGoryCode);
 
         // 查楼院党小组数 group_party
-        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
-        int groupParty = baseDao.queryGroupParty(form.getAgencyId(), form.getCustomerId(), groupCateGoryCode);
+        String groupCateGoryCode = baseDao.getCateGoryCode(customerId, PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
+        int groupParty = baseDao.queryGroupParty(agencyId, customerId, groupCateGoryCode);
         // 查询党员中心户数
-        int kernelHouseHold = baseDao.getKernelHouseHold(form.getAgencyId(), form.getCustomerId());
+        int kernelHouseHold = baseDao.getKernelHouseHold(agencyId, customerId);
         // 查询服务站数
-        int serviceStation = baseDao.getServiceStation(form.getAgencyId(),form.getCustomerId());
+        int serviceStation = baseDao.getServiceStation(agencyId, customerId);
 
         PowerAxisStructViewResultDTO result = new PowerAxisStructViewResultDTO();
         result.setGridNum(gridParty);
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
index d4ad420..198ead8 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
@@ -139,7 +140,11 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
 
     @Override
     public List<PowerKernelListPostitionResultDTO> getListPosition(PowerKernelListPostitionFormDTO form) {
-        return baseDao.queryListPosition(form.getAxisStructId(), form.getCustomerId(), form.getLimit());
+        Integer limit = form.getLimit();
+        if (null == limit || NumConstant.ZERO_L == limit) {
+            limit = 999;
+        }
+        return baseDao.queryListPosition(form.getAxisStructId(), form.getCustomerId(), limit);
     }
 
     @Override
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
index 7b8d66f..a3e9c5e 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
@@ -131,6 +131,7 @@
 	        CATEGORY_CODE = #{gridCateGoryCode}
 	    AND
 	        customer_id = #{customerId}
+	    AND del_flag = '0'
     </select>
     <select id="queryGroupParty" resultType="java.lang.Integer">
         SELECT
@@ -143,6 +144,7 @@
 	        CATEGORY_CODE = #{groupCateGoryCode}
 	    AND
 	        customer_id = #{customerId}
+	    AND del_flag = '0'
     </select>
 
     <select id="getServiceStation" resultType="java.lang.Integer">