统计昨天、近7天、近15天和上月未抄表设备

smart-city-job/src/main/java/com/zcxk/job/controller/TestController.java

@@ -1,6 +1,7 @@
 package com.zcxk.job.controller;
 
 import com.zcxk.job.service.WaterMeterReadRateService;
+import com.zcxk.job.service.WaterMeterUnreadDeviceService;
 import com.zcxk.job.service.jobhandler.WaterMeterReadJob;
 import com.zcxk.zoniot.smartcity.common.model.MeterReadRecord;
 import com.zcxk.job.repository.MeterReadRecordRepository;
@@ -21,6 +22,8 @@ public class TestController {
     private WaterMeterReadJob waterMeterReadJob;
     @Autowired
     private WaterMeterReadRateService waterMeterReadRateService;
+    @Autowired
+    private WaterMeterUnreadDeviceService waterMeterUnreadDeviceService;
 
     @GetMapping("/test/")
     public String test(){
@@ -52,5 +55,19 @@ public class TestController {
         return "ok";
     }
 
+    @GetMapping("yesterdayUnreadDeviceJobHandler")
+    public String yesterdayUnreadDeviceJobHandler(){
+        try {
+            waterMeterUnreadDeviceService.yesterdayUnreadDeviceJobHandler("        {\n" +
+                    "            \"statDay\": 20200619,\n" +
+                    "            \"startDate\": 20200619,\n" +
+                    "            \"endDate\": 20200619\n" +
+                    "        }");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "ok";
+    }
+
 
 }

smart-city-job/src/main/java/com/zcxk/job/dao/StatMeterUnreadDeviceMapper.java

@@ -0,0 +1,11 @@
+package com.zcxk.job.dao;
+
+import com.zcxk.job.entity.StatMeterUnreadDevice;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface StatMeterUnreadDeviceMapper {
+    int batchInsert(@Param("tableName") String tableName,@Param("list") List<StatMeterUnreadDevice> list);
+}

smart-city-job/src/main/java/com/zcxk/job/entity/StatMeterUnreadDevice.java

@@ -0,0 +1,32 @@
+package com.zcxk.job.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.Data;
+
+@ApiModel(value="com-zcxk-job-entity-StatMeterUnreadDevice")
+@Data
+public class StatMeterUnreadDevice {
+
+    @ApiModelProperty(value="统计日期")
+    private Integer statDay;
+
+    @ApiModelProperty(value="站点")
+    private Integer siteId;
+
+    @ApiModelProperty(value="场景，对应了水表类型")
+    private Integer channelId;
+
+    @ApiModelProperty(value="客户")
+    private Integer customerId;
+
+    @ApiModelProperty(value="建筑")
+    private Integer buildingId;
+
+    @ApiModelProperty(value="设备")
+    private Long deviceId;
+
+    @ApiModelProperty(value="创建时间")
+    private LocalDateTime dateCreate;
+}

smart-city-job/src/main/java/com/zcxk/job/service/WaterMeterUnreadDeviceService.java

@@ -0,0 +1,11 @@
+package com.zcxk.job.service;
+
+public interface WaterMeterUnreadDeviceService {
+    void yesterdayUnreadDeviceJobHandler(String param);
+
+    void recent7daysUnreadDeviceJobHandler(String param);
+
+    void recent15daysUnreadDeviceJobHandler(String param);
+
+    void lastMonthUnreadDeviceJobHandler(String param);
+}

smart-city-job/src/main/java/com/zcxk/job/service/impl/WaterMeterUnreadDeviceServiceImpl.java

@@ -0,0 +1,218 @@
+package com.zcxk.job.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xxl.job.core.log.XxlJobLogger;
+import com.zcxk.job.dao.StatMeterUnreadDeviceMapper;
+import com.zcxk.job.entity.StatMeterUnreadDevice;
+import com.zcxk.job.service.WaterMeterUnreadDeviceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.ConditionalOperators;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Service
+public class WaterMeterUnreadDeviceServiceImpl implements WaterMeterUnreadDeviceService {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+    @Autowired
+    private StatMeterUnreadDeviceMapper statMeterUnreadDeviceMapper;
+
+    @Override
+    public void yesterdayUnreadDeviceJobHandler(String param) {
+        JSONObject obj = JSONObject.parseObject(param);
+        XxlJobLogger.log("obj:{}", obj);
+        Integer statDay = 0;
+        Integer startDate = 0;
+        Integer endDate = 0;
+        if (obj != null) {
+            statDay =  obj.getInteger("statDay");
+            startDate =  obj.getInteger("startDate");
+            endDate =  obj.getInteger("endDate");
+        }
+
+        if (statDay == null || statDay == 0) {
+            statDay = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (startDate == null || startDate == 0) {
+            startDate = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (endDate == null || endDate == 0) {
+            endDate = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        XxlJobLogger.log("statDay:{}，startDate:{},endDate:{}",statDay, startDate, endDate);
+
+        List<StatMeterUnreadDevice> results = this.findUnreadDevice(statDay,startDate,endDate);
+        System.out.println(results);
+        if (results != null && results.size() > 0) {
+            log.info("结果数量，size:{}", results.size());
+            XxlJobLogger.log("结果数量，size:{}", results.size());
+            statMeterUnreadDeviceMapper.batchInsert("sc_stat_meter_unread_device_by_building",results);
+        }
+    }
+
+    @Override
+    public void recent7daysUnreadDeviceJobHandler(String param) {
+        JSONObject obj = JSONObject.parseObject(param);
+        XxlJobLogger.log("obj:{}", obj);
+        Integer statDay = 0;
+        Integer startDate = 0;
+        Integer endDate = 0;
+        if (obj != null) {
+            statDay =  obj.getInteger("statDay");
+            startDate =  obj.getInteger("startDate");
+            endDate =  obj.getInteger("endDate");
+        }
+
+        if (statDay == null || statDay == 0) {
+            statDay = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (startDate == null || startDate == 0) {
+            startDate = Integer.valueOf(LocalDateTime.now().plusDays(-7).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (endDate == null || endDate == 0) {
+            endDate = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        XxlJobLogger.log("statDay:{}，startDate:{},endDate:{}",statDay, startDate, endDate);
+
+        List<StatMeterUnreadDevice> results = this.findUnreadDevice(statDay,startDate,endDate);
+        if (results != null && results.size() > 0) {
+            XxlJobLogger.log("结果数量，size:{}", results.size());
+            statMeterUnreadDeviceMapper.batchInsert("sc_stat_meter_unread_device_by_building_7day",results);
+        }
+    }
+
+    @Override
+    public void recent15daysUnreadDeviceJobHandler(String param) {
+        JSONObject obj = JSONObject.parseObject(param);
+        XxlJobLogger.log("obj:{}", obj);
+        Integer statDay = 0;
+        Integer startDate = 0;
+        Integer endDate = 0;
+        if (obj != null) {
+            statDay =  obj.getInteger("statDay");
+            startDate =  obj.getInteger("startDate");
+            endDate =  obj.getInteger("endDate");
+        }
+
+        if (statDay == null || statDay == 0) {
+            statDay = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (startDate == null || startDate == 0) {
+            startDate = Integer.valueOf(LocalDateTime.now().plusDays(-15).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (endDate == null || endDate == 0) {
+            endDate = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        XxlJobLogger.log("statDay:{}，startDate:{},endDate:{}",statDay, startDate, endDate);
+
+        List<StatMeterUnreadDevice> results = this.findUnreadDevice(statDay,startDate,endDate);
+        if (results != null && results.size() > 0) {
+            XxlJobLogger.log("结果数量，size:{}", results.size());
+            statMeterUnreadDeviceMapper.batchInsert("sc_stat_meter_unread_device_by_building_15day",results);
+        }
+    }
+
+    @Override
+    public void lastMonthUnreadDeviceJobHandler(String param) {
+        JSONObject obj = JSONObject.parseObject(param);
+        XxlJobLogger.log("obj:{}", obj);
+        Integer statDay = 0;
+        Integer startDate = 0;
+        Integer endDate = 0;
+        if (obj != null) {
+            statDay =  obj.getInteger("statDay");
+            startDate =  obj.getInteger("startDate");
+            endDate =  obj.getInteger("endDate");
+        }
+
+        if (statDay == null || statDay == 0) {
+            statDay = Integer.valueOf(LocalDateTime.now().plusMonths(-1).format(DateTimeFormatter.ofPattern("yyyyMM")));
+        }
+        if (startDate == null || startDate == 0) {
+            startDate = Integer.valueOf(LocalDateTime.now().plusMonths(-1).with(TemporalAdjusters.firstDayOfMonth()).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        if (endDate == null || endDate == 0) {
+            endDate = Integer.valueOf(LocalDateTime.now().plusMonths(-1).with(TemporalAdjusters.lastDayOfMonth()).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
+        }
+        XxlJobLogger.log("statDay:{}，startDate:{},endDate:{}",statDay, startDate, endDate);
+
+        List<StatMeterUnreadDevice> results = this.findUnreadDevice(statDay,startDate,endDate);
+        if (results != null && results.size() > 0) {
+            XxlJobLogger.log("结果数量，size:{}", results.size());
+            statMeterUnreadDeviceMapper.batchInsert("sc_stat_meter_unread_device_by_building_month",results);
+        }
+    }
+
+    protected List<StatMeterUnreadDevice> findUnreadDevice(Integer statDay, Integer startDate, Integer endDate){
+        /*
+            db.sc_meter_read_record.aggregate(
+             [
+              {$match:{status:1,readDate:20200619}},
+                {$group:{_id:{
+                        "siteId": "$siteId","channelId": "$channelId","customerId": "$customerId","buildingId": "$buildingId","deviceId": "$deviceId",
+                    },
+                            realReadTimes:{$sum:{
+                         $cond: { if: { $eq: ["$readStatus", "1"] }, then: 1, else: 0 }
+                       }}
+                }},
+				{$match:{realReadTimes:0}},
+                { $project : {
+                    siteId : 1 ,
+                    channelId : 1 ,
+                    customerId : 1 ,
+                    buildingId : 1 ,
+                    realReadTimes : 1 ,
+              }}
+             ]
+             ,{ allowDiskUse: true }
+             )
+         */
+
+
+        List<AggregationOperation> operations = new ArrayList<>();
+        operations.add(Aggregation.match(Criteria.where("status").is(1)));
+        operations.add(Aggregation.match(Criteria.where("readDate").gte(startDate).lte(endDate)));
+        // 1,添加分组条件
+        ConditionalOperators.Cond readTimesCond = ConditionalOperators.when(new Criteria("readStatus").is("1")).then(1).otherwise(0);
+        operations.add(Aggregation.group("siteId","channelId","customerId","buildingId","deviceId")
+                .sum(readTimesCond).as("realReadTimes"));
+
+        //2、再次过滤未抄的设备
+        operations.add(Aggregation.match(Criteria.where("realReadTimes").is(0)));
+
+        operations.add(Aggregation.project("realReadTimes").
+                and("_id.siteId").as("siteId").
+                and("_id.channelId").as("channelId").
+                and("_id.customerId").as("customerId").
+                and("_id.buildingId").as("buildingId").
+                and("_id.deviceId").as("deviceId").
+                        andExclude("_id"));
+        //operations.add(Aggregation.sort(Sort.Direction.DESC, "total"));
+
+        // 3,聚合查询所有信息
+        Aggregation aggregation = Aggregation.newAggregation(operations);
+        // 4,查询结果
+        AggregationResults<StatMeterUnreadDevice> aggregationResults = mongoTemplate.aggregate(aggregation, "sc_meter_read_record", StatMeterUnreadDevice.class);
+        // 5,获取结果
+        List<StatMeterUnreadDevice> results = aggregationResults.getMappedResults();
+        if (results != null && results.size() > 0) {
+            for (StatMeterUnreadDevice result : results) {
+                result.setStatDay(statDay);
+                result.setDateCreate(LocalDateTime.now());
+            }
+        }
+        return results;
+    }
+}

smart-city-job/src/main/java/com/zcxk/job/service/jobhandler/NewDeviceJob.java

@@ -0,0 +1,7 @@
+package com.zcxk.job.service.jobhandler;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class NewDeviceJob {
+}

smart-city-job/src/main/java/com/zcxk/job/service/jobhandler/WaterMeterReadRateJob.java

@@ -56,7 +56,7 @@ public class WaterMeterReadRateJob {
     }
 
     /**
-     * 最近15抄表率
+     * 最近15天抄表率
      * @param param
      * @return
      * @throws Exception

smart-city-job/src/main/java/com/zcxk/job/service/jobhandler/WaterMeterUnreadDeviceJob.java

@@ -0,0 +1,101 @@
+package com.zcxk.job.service.jobhandler;
+
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import com.zcxk.job.service.WaterMeterReadRateService;
+import com.zcxk.job.service.WaterMeterUnreadDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WaterMeterUnreadDeviceJob {
+    @Autowired
+    private WaterMeterUnreadDeviceService waterMeterUnreadDeviceService;
+
+    /**
+     * 昨天未抄表设备
+     * @param param
+     * @return
+     * @throws Exception
+     */
+    @XxlJob("yesterdayUnreadDeviceJobHandler")
+    public ReturnT<String> yesterdayUnreadDeviceJobHandler(String param) throws Exception {
+
+        /*
+        参数格式如下:
+        {
+            "statDay": 20200619,
+            "startDate": 20200619,
+            "endDate": 20200619
+        }
+         */
+        waterMeterUnreadDeviceService.yesterdayUnreadDeviceJobHandler(param);
+
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 最近7天未抄表设备
+     * @param param
+     * @return
+     * @throws Exception
+     */
+    @XxlJob("recent7daysUnreadDeviceJobHandler")
+    public ReturnT<String> recent7daysUnreadDeviceJobHandler(String param) throws Exception {
+        /*
+        参数格式如下:
+        {
+            "statDay": 20200619,
+            "startDate": 20200619,
+            "endDate": 20200619
+        }
+         */
+        waterMeterUnreadDeviceService.recent7daysUnreadDeviceJobHandler(param);
+
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 最近15天未抄表设备
+     * @param param
+     * @return
+     * @throws Exception
+     */
+    @XxlJob("recent15daysUnreadDeviceJobHandler")
+    public ReturnT<String> recent15daysUnreadDeviceJobHandler(String param) throws Exception {
+
+        /*
+        参数格式如下:
+        {
+            "statDay": 20200619,
+            "startDate": 20200619,
+            "endDate": 20200619
+        }
+         */
+        waterMeterUnreadDeviceService.recent15daysUnreadDeviceJobHandler(param);
+
+        return ReturnT.SUCCESS;
+    }
+
+    /**
+     * 上月未抄表设备
+     * @param param
+     * @return
+     * @throws Exception
+     */
+    @XxlJob("lastMonthUnreadDeviceJobHandler")
+    public ReturnT<String> lastMonthReadRateJobHandler(String param) throws Exception {
+
+        /*
+        参数格式如下:
+        {
+            "statDay": 202006,
+            "startDate": 20200601,
+            "endDate": 20200630
+        }
+         */
+        waterMeterUnreadDeviceService.lastMonthUnreadDeviceJobHandler(param);
+
+        return ReturnT.SUCCESS;
+    }
+}

smart-city-job/src/main/resources/mapper/StatMeterUnreadDeviceMapper.xml

@@ -0,0 +1,24 @@
+<?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="com.zcxk.job.dao.StatMeterUnreadDeviceMapper">
+  <resultMap id="BaseResultMap" type="com.zcxk.job.entity.StatMeterUnreadDevice">
+    <!--@mbg.generated-->
+    <result column="stat_day" property="statDay" />
+    <result column="site_id" property="siteId" />
+    <result column="channel_id" property="channelId" />
+    <result column="customer_id" property="customerId" />
+    <result column="building_id" property="buildingId" />
+    <result column="device_id" property="deviceId" />
+    <result column="date_create" property="dateCreate" />
+  </resultMap>
+  <insert id="batchInsert" parameterType="map">
+    <!--@mbg.generated-->
+    insert into ${tableName}
+    (stat_day, site_id, channel_id, customer_id, building_id, device_id, date_create)
+    values
+    <foreach collection="list" item="item" separator=",">
+      (#{item.statDay}, #{item.siteId}, #{item.channelId}, #{item.customerId}, #{item.buildingId}, 
+        #{item.deviceId}, #{item.dateCreate})
+    </foreach>
+  </insert>
+</mapper>