bug修复

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/controller/AlarmSettingController.java

@@ -29,8 +29,7 @@ import java.util.List;
 
 /**
  * 报警设置控制层
- * @author yjy
- * @since 2020-11-17
+ * @author Andy
  */
 @RestController
 @RequestMapping("/alarmSetting")

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/controller/DayMonthYearReportController.java

@@ -33,8 +33,7 @@ import java.util.List;
 
 /**
  * 标签信息页面控制器
- * @author WYY
- * @date 2020-12-03 16:50
+ * @author Andy
  */
 @RestController
 @RequestMapping("/report")

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/controller/MapSettingController.java

@@ -15,8 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * 地图设置控制层
- * @author yjy
- * @since 2020-12-4
+ * @author Andy
  */
 @RestController
 @RequestMapping("/mapSetting")

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/controller/MonitorDataReportController.java

@@ -24,8 +24,7 @@ import java.util.stream.Collectors;
 
 /**
  * @description
- * @author  wangli
- * @data 2020-12-02 8:19
+ * @author  Andy
  */
 @RestController
 @RequestMapping("/monitorDataReport")

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/controller/OnlineMonitorController.java

@@ -33,9 +33,7 @@ import java.util.Map;
 
 /**
  * 在线监测控制层
- *
- * @author yjy
- * @since 2020-12-2
+ * @author Andy
  */
 @RestController
 @RequestMapping("/onlineMonitor")

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/controller/SceneController.java

@@ -37,8 +37,7 @@ import java.util.Map;
 
 /**
  * 场景信息页面控制器
- * @author WYY
- * @date 2020-11-17 21:15
+ * @author Andy
  */
 @RestController
 @RequestMapping("/scene")

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/service/AlarmSettingService.java

@@ -24,9 +24,7 @@ import java.util.List;
 
 /**
  * 报警设置服务接口
- *
- * @author yjy
- * @since 2020-11-17
+ * @author Andy
  */
 @Service
 public class AlarmSettingService extends ServiceImpl<AlarmSettingMapper, AlarmSetting> {

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/service/MapSettingService.java

@@ -8,9 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * 地图设置服务接口
- *
- * @author yjy
- * @since 2020-12-4
+ * @author Andy
  */
 @Service
 public class MapSettingService extends ServiceImpl<MapSettingMapper, MapSetting> {

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/service/SceneService.java

@@ -30,9 +30,7 @@ import static com.google.common.collect.Lists.newArrayList;
 
 /**
  * 场景信息Service接口
- *
- * @author: WYY
- * @date 2020-11-17 21:15
+ * @author: Andy
  */
 @Service
 public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/service/impl/MonitorDataReportServiceImpl.java

@@ -42,8 +42,7 @@ import java.util.stream.Collectors;
 
 /**
  * @description
- * @author  wangli
- * @data 2020/12/7 20:23
+ * @author  Andy
  */
 @Service
 public class MonitorDataReportServiceImpl implements MonitorDataReportService {

zoniot-common/zoniot-core-mongo/src/main/java/com/zcxk/core/mongo/base/BaseDao.java

@@ -29,10 +29,15 @@ import java.util.*;
  */
 public class BaseDao<T, PK extends Serializable> {
 
+    /**
+     * 主键
+     */
+    private static final String ID_FIELD = "_id";
+
     @Autowired
     public MongoTemplate mongoTemplate;
+
     protected Class<T> entityClass;
-    private static final String ID_FIELD = "_id";
 
     public BaseDao() {
         Class<?> c = this.getClass();

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRate7DayMapper.java

@@ -41,10 +41,11 @@ public interface ReadRate7DayMapper {
     /**
     * 统计总数
     * @author Andy
-    * @date 15:01 2021/8/3
+    * @date 18:31 2021/8/31
     * @param dto:
+    * @param statDay:
     * @param condition:
     * @return com.zcxk.rmcp.api.vo.StatisticsReadRateVo
     **/
-    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("userCondition") UserCondition condition);
+    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("statDay") int statDay, @Param("userCondition") UserCondition condition);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateMonthMapper.java

@@ -41,10 +41,11 @@ public interface ReadRateMonthMapper {
     /**
     * 统计总数
     * @author Andy
-    * @date 15:01 2021/8/3
+    * @date 18:31 2021/8/31
     * @param dto:
+    * @param statDay:
     * @param condition:
     * @return com.zcxk.rmcp.api.vo.StatisticsReadRateVo
     **/
-    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("userCondition") UserCondition condition);
+    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("statDay") int statDay, @Param("userCondition") UserCondition condition);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateTodayMapper.java

@@ -41,10 +41,11 @@ public interface ReadRateTodayMapper {
     /**
     * 统计总数
     * @author Andy
-    * @date 15:02 2021/8/3
+    * @date 18:31 2021/8/31
     * @param dto:
+    * @param statDay:
     * @param condition:
     * @return com.zcxk.rmcp.api.vo.StatisticsReadRateVo
     **/
-    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("userCondition") UserCondition condition);
+    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("statDay") int statDay,@Param("userCondition") UserCondition condition);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/dao/ReadRateYesterdayMapper.java

@@ -41,10 +41,11 @@ public interface ReadRateYesterdayMapper {
     /**
     * 统计总数
     * @author Andy
-    * @date 15:03 2021/8/3
+    * @date 18:32 2021/8/31
     * @param dto:
+    * @param statDay:
     * @param condition:
     * @return com.zcxk.rmcp.api.vo.StatisticsReadRateVo
     **/
-    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("userCondition") UserCondition condition);
+    StatisticsReadRateVo countReadRate(@Param("dto") ReadRateDto dto, @Param("statDay") int statDay, @Param("userCondition") UserCondition condition);
 }

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRate7Day.xml

@@ -58,6 +58,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <if test="dto.categoryId != null and dto.categoryId != ''">
       and rd.category_id = #{dto.categoryId}
     </if>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateMonth.xml

@@ -57,6 +57,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <if test="dto.categoryId != null and dto.categoryId != ''">
       and rd.category_id = #{dto.categoryId}
     </if>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateToday.xml

@@ -58,6 +58,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <if test="dto.categoryId != null and dto.categoryId != ''">
       and rd.category_id = #{dto.categoryId}
     </if>

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/ReadRateYesterday.xml

@@ -57,6 +57,7 @@
     LEFT JOIN rmcp_product_category rc on rd.category_id = rc.id
     where
     1 = 1
+    and stat_day = #{statDay}
     <if test="dto.categoryId != null and dto.categoryId != ''">
       and rd.category_id = #{dto.categoryId}
     </if>

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/ImportController.java

@@ -49,10 +49,11 @@ public class ImportController {
     public void downloadFailFile(
             @ApiParam(value = "id", required = true) @RequestParam(required = true) Integer objId,
             @ApiParam(value = "access_token", required = false) @RequestParam(required = false) String access_token,
-            HttpServletRequest request, HttpServletResponse response
-    ) {
+            HttpServletRequest request, HttpServletResponse response) {
         importFileService.downloadFailFile(objId,response);
     }
+
+
     public void sendOperateLog(Integer importType){
         if(importType == 1){
             LoginUser user = UserUtil.getCurrentUser();

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/AbstractReadRateService.java

@@ -23,7 +23,6 @@ import java.util.List;
  **/
 public abstract class AbstractReadRateService implements ReadRateService{
 
-
     @Override
     public List<StatisticsReadRateVo> statReadRateGroupCategory(){
         List<StatisticsReadRateVo> list = this.statReadRateGroupCategory(UserUtil.getCurrentUser().getUserCondition());

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRate7DayServiceImpl.java

@@ -39,7 +39,7 @@ public class ReadRate7DayServiceImpl extends AbstractReadRateService {
 
     @Override
     public StatisticsReadRateVo countReadRate(ReadRateDto dto, UserCondition userCondition) {
-        return readRate7DayMapper.countReadRate(dto, userCondition);
+        return readRate7DayMapper.countReadRate(dto, DateUtil.parseInt(new Date(), -1), userCondition);
     }
 
     @Override

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRateMonthServiceImpl.java

@@ -34,16 +34,13 @@ public class ReadRateMonthServiceImpl extends AbstractReadRateService {
 
     @Override
     public List<ReadRateVo> listReadRate(ReadRateDto dto, UserCondition userCondition) {
-        LocalDate localDate = DateUtil.parseLocalDate(new Date());
-        localDate = localDate.plusMonths(-1);
-        String month =  (localDate.getMonthValue() +"").length() == 1 ? "0" + localDate.getMonthValue() : localDate.getMonthValue() +"";
-        int queryDate = Integer.parseInt(localDate.getYear() + "" + month);
-        return readRateMonthMapper.listReadRate(dto, queryDate, userCondition);
+        return readRateMonthMapper.listReadRate(dto, queryDate(), userCondition);
     }
 
     @Override
     public StatisticsReadRateVo countReadRate(ReadRateDto dto, UserCondition userCondition) {
-        return readRateMonthMapper.countReadRate(dto, userCondition);
+
+        return readRateMonthMapper.countReadRate(dto, queryDate(), userCondition);
     }
 
     @Override
@@ -51,4 +48,12 @@ public class ReadRateMonthServiceImpl extends AbstractReadRateService {
         return ReadRateEnum.MONTH;
     }
 
+
+    private int queryDate(){
+        LocalDate localDate = DateUtil.parseLocalDate(new Date());
+        localDate = localDate.plusMonths(-1);
+        String month =  (localDate.getMonthValue() +"").length() == 1 ? "0" + localDate.getMonthValue() : localDate.getMonthValue() +"";
+        return Integer.parseInt(localDate.getYear() + "" + month);
+    }
+
 }

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRateTodayServiceImpl.java

@@ -38,7 +38,7 @@ public class ReadRateTodayServiceImpl extends AbstractReadRateService {
 
     @Override
     public StatisticsReadRateVo countReadRate(ReadRateDto dto, UserCondition userCondition) {
-        return readRateTodayMapper.countReadRate(dto, userCondition);
+        return readRateTodayMapper.countReadRate(dto, DateUtil.parseInt(new Date(), 0),userCondition);
     }
 
 

zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/service/impl/readrate/ReadRateYesterdayServiceImpl.java

@@ -38,7 +38,7 @@ public class ReadRateYesterdayServiceImpl extends AbstractReadRateService {
 
     @Override
     public StatisticsReadRateVo countReadRate(ReadRateDto dto, UserCondition userCondition) {
-        return readRateYesterdayMapper.countReadRate(dto, userCondition);
+        return readRateYesterdayMapper.countReadRate(dto, DateUtil.parseInt(new Date(), -1), userCondition);
     }
 
 

zoniot-rmcp/zoniot-xxljob-client/src/main/java/com/zcxk/xxljob/jobs/MeterReadWaterRecordHandler.java

@@ -97,6 +97,4 @@ public class MeterReadWaterRecordHandler {
         }
     }
 
-
-
 }