optimize statistics

java110-bean/src/main/java/com/java110/dto/report/QueryStatisticsDto.java

@@ -0,0 +1,26 @@
+package com.java110.dto.report;
+
+import java.io.Serializable;
+
+public class QueryStatisticsDto implements Serializable {
+
+    private String communityId;
+    private String queryDate;
+
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getQueryDate() {
+        return queryDate;
+    }
+
+    public void setQueryDate(String queryDate) {
+        this.queryDate = queryDate;
+    }
+}

service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java

@@ -2002,7 +2002,7 @@ public class ExportReportFeeSMOImpl extends DefaultAbstractComponentSMO implemen
         JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
         reqJson.put("page", 1);
         reqJson.put("row", 10000);
-        apiUrl = "/reportFeeMonthStatistics/queryReportFeeSummary" + mapToUrlParam(reqJson);
+        apiUrl = "/reportFeeMonthStatistics.queryReportFeeSummary" + mapToUrlParam(reqJson);
         responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
         if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过 保存单元信息
             return null;

service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java

@@ -29,7 +29,7 @@ import java.util.List;
 /**
  * 查询费用汇总表
  */
-@Java110Cmd(serviceCode = "/reportFeeMonthStatistics/queryReportFeeSummary")
+@Java110Cmd(serviceCode = "reportFeeMonthStatistics.queryReportFeeSummary")
 public class QueryReportFeeSummaryCmd extends Cmd {
 
     @Autowired

service-report/src/main/java/com/java110/report/statistics/IBaseDataStatistics.java

@@ -0,0 +1,28 @@
+package com.java110.report.statistics;
+
+import com.java110.dto.report.QueryStatisticsDto;
+
+/**
+ * 基础数据统计
+ */
+public interface IBaseDataStatistics {
+
+    /**
+     * 查询房屋数
+     * @param queryStatisticsDto
+     * @return
+     */
+    long getRoomCount(QueryStatisticsDto queryStatisticsDto);
+
+    /**
+     * 查询空闲房屋数
+     * @param queryStatisticsDto
+     * @return
+     */
+    long getFreeRoomCount(QueryStatisticsDto queryStatisticsDto);
+
+
+
+
+
+}

service-report/src/main/java/com/java110/report/statistics/IFeeStatistics.java

@@ -0,0 +1,51 @@
+package com.java110.report.statistics;
+
+
+import com.java110.dto.report.QueryStatisticsDto;
+
+/**
+ * 费用统计类
+ */
+public interface IFeeStatistics {
+
+    /**
+     * 查询历史 欠费功能
+     *
+     * @return
+     */
+    double getHisMonthOweFee(QueryStatisticsDto queryFeeStatisticsDto);
+
+    /**
+     * 查询 当月欠费
+     *
+     * @param queryFeeStatisticsDto
+     * @return
+     */
+    double getCurMonthOweFee(QueryStatisticsDto queryFeeStatisticsDto);
+
+
+    /**
+     * 欠费追回
+     *
+     * @param queryFeeStatisticsDto
+     * @return
+     */
+    double getHisReceivedFee(QueryStatisticsDto queryFeeStatisticsDto);
+
+    /**
+     * 预交费用
+     *
+     * @param queryFeeStatisticsDto
+     * @return
+     */
+    double getPreReceivedFee(QueryStatisticsDto queryFeeStatisticsDto);
+
+    /**
+     * 查询实收数据
+     *
+     * @param queryFeeStatisticsDto
+     * @return
+     */
+    double getReceivedFee(QueryStatisticsDto queryFeeStatisticsDto);
+
+}

service-report/src/main/java/com/java110/report/statistics/impl/BaseDataStatisticsImpl.java

@@ -0,0 +1,21 @@
+package com.java110.report.statistics.impl;
+
+import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.report.statistics.IBaseDataStatistics;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基础数据统计类
+ */
+@Service
+public class BaseDataStatisticsImpl implements IBaseDataStatistics {
+    @Override
+    public long getRoomCount(QueryStatisticsDto queryStatisticsDto) {
+        return 0;
+    }
+
+    @Override
+    public long getFreeRoomCount(QueryStatisticsDto queryStatisticsDto) {
+        return 0;
+    }
+}

service-report/src/main/java/com/java110/report/statistics/impl/FeeStatisticsImpl.java

@@ -0,0 +1,36 @@
+package com.java110.report.statistics.impl;
+
+import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.report.statistics.IFeeStatistics;
+import org.springframework.stereotype.Service;
+
+/**
+ * 基础报表统计 实现类
+ */
+@Service
+public class FeeStatisticsImpl implements IFeeStatistics {
+    @Override
+    public double getHisMonthOweFee(QueryStatisticsDto queryFeeStatisticsDto) {
+        return 0;
+    }
+
+    @Override
+    public double getCurMonthOweFee(QueryStatisticsDto queryFeeStatisticsDto) {
+        return 0;
+    }
+
+    @Override
+    public double getHisReceivedFee(QueryStatisticsDto queryFeeStatisticsDto) {
+        return 0;
+    }
+
+    @Override
+    public double getPreReceivedFee(QueryStatisticsDto queryFeeStatisticsDto) {
+        return 0;
+    }
+
+    @Override
+    public double getReceivedFee(QueryStatisticsDto queryFeeStatisticsDto) {
+        return 0;
+    }
+}

springboot/src/main/java/com/java110/boot/smo/assetExport/impl/ExportReportFeeSMOImpl.java

@@ -2001,7 +2001,7 @@ public class ExportReportFeeSMOImpl extends DefaultAbstractComponentSMO implemen
         JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
         reqJson.put("page", 1);
         reqJson.put("row", 10000);
-        apiUrl = "/reportFeeMonthStatistics/queryReportFeeSummary" + mapToUrlParam(reqJson);
+        apiUrl = "/reportFeeMonthStatistics.queryReportFeeSummary" + mapToUrlParam(reqJson);
         responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
         if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过 保存单元信息
             return null;