优化report启动失败

java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="baseDataStatisticsServiceDaoImpl">
+
+    <!-- 查询房屋数 -->
+    <select id="getRoomCount" parameterType="Map" resultType="Map">
+
+    </select>
+
+    <!-- 查询单月欠费 -->
+    <select id="getRoomInfo" parameterType="Map" resultType="Map">
+
+    </select>
+
+
+</mapper>

java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java

@@ -1,6 +1,7 @@
 package com.java110.intf.report;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.RoomDto;
 import com.java110.dto.report.QueryStatisticsDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,7 +13,7 @@ import java.util.Map;
 
 /**
  * @ClassName IReportFeeStatisticsInnerServiceSMO
- * @Description 费用统计类 服务类
+ * @Description 报表 基础数据统计表
  * @Author wuxw
  * @Date 2019/4/24 9:04
  * @Version 1.0
@@ -24,79 +25,20 @@ public interface IBaseDataStatisticsInnerServiceSMO {
 
 
     /**
-     * <p>查询历史月欠费</p>
+     * <p>查询房屋总数</p>
      *
      * @param queryFeeStatisticsDto 数据对象分享
      */
-    @RequestMapping(value = "/getHisMonthOweFee", method = RequestMethod.POST)
-    double getHisMonthOweFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
+    @RequestMapping(value = "/getRoomCount", method = RequestMethod.POST)
+    double getRoomCount(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
 
-    /**
-     * 查询当月欠费
-     *
-     * @param queryFeeStatisticsDto
-     * @return
-     */
-    @RequestMapping(value = "/getCurMonthOweFee", method = RequestMethod.POST)
-    double getCurMonthOweFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
-
-
-    /**
-     * 查询当月应收
-     *
-     * @param queryStatisticsDto
-     * @return
-     */
-    @RequestMapping(value = "/getCurReceivableFee", method = RequestMethod.POST)
-    double getCurReceivableFee(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
-    @RequestMapping(value = "/getHisReceivedFee", method = RequestMethod.POST)
-    double getHisReceivedFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
-
-    @RequestMapping(value = "/getPreReceivedFee", method = RequestMethod.POST)
-    double getPreReceivedFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
-
-    @RequestMapping(value = "/getReceivedFee", method = RequestMethod.POST)
-    double getReceivedFee(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
-
-    /**
-     * 欠费户数
-     *
-     * @param queryStatisticsDto
-     * @return
-     */
-    @RequestMapping(value = "/getOweRoomCount", method = RequestMethod.POST)
-    int getOweRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
 
-    /**
-     * 查询收费房屋数
-     *
-     * @param queryStatisticsDto
-     * @return
-     */
-    @RequestMapping(value = "/getFeeRoomCount", method = RequestMethod.POST)
-    long getFeeRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
 
     /**
-     * 楼栋收费率信息统计
+     * <p>查询房屋</p>
      *
-     * @param queryStatisticsDto
-     * @return
-     */
-    @RequestMapping(value = "/getFloorFeeSummary", method = RequestMethod.POST)
-    List<Map> getFloorFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
-    /**
-     * 费用项收费率统计
-     * @param queryStatisticsDto
-     * @return
+     * @param queryFeeStatisticsDto 数据对象分享
      */
-    @RequestMapping(value = "/getConfigFeeSummary", method = RequestMethod.POST)
-    List<Map> getConfigFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
-    @RequestMapping(value = "/getObjFeeSummaryCount", method = RequestMethod.POST)
-    int getObjFeeSummaryCount(@RequestBody QueryStatisticsDto queryStatisticsDto);
-
-    @RequestMapping(value = "/getObjFeeSummary", method = RequestMethod.POST)
-    List<Map> getObjFeeSummary(@RequestBody QueryStatisticsDto queryStatisticsDto);
+    @RequestMapping(value = "/getRoomCount", method = RequestMethod.POST)
+    List<RoomDto> getRoomInfo(@RequestBody QueryStatisticsDto queryFeeStatisticsDto);
 }

service-report/src/main/java/com/java110/report/dao/IBaseDataStatisticsServiceDao.java

@@ -0,0 +1,22 @@
+package com.java110.report.dao;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IBaseDataStatisticsServiceDao {
+    /**
+     * 查询房屋数量
+     *
+     * @param info
+     * @return
+     */
+    int getRoomCount(Map info);
+
+    /**
+     * 查询房屋信息
+     *
+     * @param info
+     * @return
+     */
+    List<Map> getRoomInfo(Map info);
+}

service-report/src/main/java/com/java110/report/dao/impl/BaseDataStatisticsServiceDaoImpl.java

@@ -0,0 +1,33 @@
+package com.java110.report.dao.impl;
+
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.report.dao.IBaseDataStatisticsServiceDao;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 基础数据dao
+ */
+public class BaseDataStatisticsServiceDaoImpl extends BaseServiceDao implements IBaseDataStatisticsServiceDao {
+    @Override
+    public int getRoomCount(Map info) {
+        List<Map> businessReportFeeMonthStatisticsInfos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getRoomCount", info);
+        if (businessReportFeeMonthStatisticsInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessReportFeeMonthStatisticsInfos.get(0).get("count").toString());
+    }
+
+    /**
+     * 查询 数据库
+     * @param info
+     * @return
+     */
+    @Override
+    public List<Map> getRoomInfo(Map info) {
+        List<Map> infos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getRoomInfo", info);
+        return infos;
+    }
+}

service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java

@@ -0,0 +1,63 @@
+package com.java110.report.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.RoomDto;
+import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.intf.report.IBaseDataStatisticsInnerServiceSMO;
+import com.java110.report.dao.IBaseDataStatisticsServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName BaseDataStatisticsInnerServiceSMOImpl
+ * @Description 基础数据统计实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class BaseDataStatisticsInnerServiceSMOImpl extends BaseServiceSMO implements IBaseDataStatisticsInnerServiceSMO {
+
+
+    @Autowired
+    private IBaseDataStatisticsServiceDao baseDataStatisticsServiceDaoImpl;
+
+
+    /**
+     * 查询房屋总数
+     *
+     * @param queryStatisticsDto 数据对象分享
+     * @return
+     */
+    @Override
+    public double getRoomCount(@RequestBody QueryStatisticsDto queryStatisticsDto) {
+        int info = baseDataStatisticsServiceDaoImpl.getRoomCount(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+        return info;
+    }
+
+    /**
+     * 查询房屋信息
+     *
+     * @param queryStatisticsDto 数据对象分享
+     * @return
+     */
+    @Override
+    public List<RoomDto> getRoomInfo(@RequestBody QueryStatisticsDto queryStatisticsDto) {
+        int page = queryStatisticsDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            queryStatisticsDto.setPage((page - 1) * queryStatisticsDto.getRow());
+        }
+
+        List<Map> info = baseDataStatisticsServiceDaoImpl.getRoomInfo(BeanConvertUtil.beanCovertMap(queryStatisticsDto));
+        return BeanConvertUtil.covertBeanList(info, RoomDto.class);
+    }
+}