用户数据及网格数量接口调整

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GriddingCountDTO.java

@@ -1,5 +1,7 @@
 package com.elink.esua.epdc.dto.user.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @author: wangtong
  * @create: 2020-02-11 14:50
  **/
+@Data
 public class GriddingCountDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -15,10 +18,11 @@ public class GriddingCountDTO implements Serializable {
     /**
      *   网格总计
      **/
-    private String gridTotle;
+    private Integer gridTotle;
 
     /**
      *   开通网格数量
      **/
-    private String gridCount;
+    private Integer gridCount;
+
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -246,7 +246,7 @@
         SELECT
         t.userCount,
         t.partyMemberCount,
-        t.residentCount - t.partyMemberCount residentCount
+        t.residentCount - t.partyMemberCount allUserCount
         FROM
         (
         SELECT

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AnalysisUserServiceImpl.java

@@ -100,12 +100,12 @@ public class AnalysisUserServiceImpl implements AnalysisUserService {
 
     @Override
     public Result getGridStatistics(UserCountDTO formDto) {
-        return analysisUserFeignClient.getUserStatistics(formDto);
+        return analysisUserFeignClient.getGridStatistics(formDto);
     }
 
     @Override
     public Result getUserStatistics(UserCountDTO formDto) {
-        return analysisUserFeignClient.getGridStatistics(formDto);
+        return analysisUserFeignClient.getUserStatistics(formDto);
     }