lin 3 years ago
parent
commit
e7d2d26fe9

+ 88 - 0
zoniot-rmcp/zoniot-rmcp-web/src/main/java/com/zcxk/rmcp/web/controller/TestController.java

@@ -0,0 +1,88 @@
+package com.zcxk.rmcp.web.controller;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.RandomUtil;
+import com.zcxk.core.common.util.SnowflakeIdWorker;
+import com.zcxk.rmcp.core.dao.DeviceMapper;
+import com.zcxk.rmcp.core.entity.Device;
+import io.swagger.annotations.Api;
+import org.apache.commons.collections4.ListUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @author linqingwei
+ * @date 2021-08-17 9:48
+ */
+@Controller
+@ResponseBody
+@RequestMapping("/test")
+@Api(tags = "cs")
+public class TestController {
+
+    @Autowired
+    private SnowflakeIdWorker idWorker;
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @PostMapping("test")
+    public void addDevice(){
+
+
+        List<Device> list = new ArrayList<>();
+        for (int i = 0; i < 200000; i++) {
+            Device device = new Device();
+            device.setId(idWorker.nextId());
+            device.setTenantId("487170559310123008");
+            device.setCategoryId(2);
+            device.setCompanyOrgId(266);
+            device.setDeptOrgId(0);
+            device.setProductId(2);
+            device.setDeviceNo(RandomUtil.randomString(10));
+            device.setMeterNo(RandomUtil.randomString(10));
+            device.setFileNo(RandomUtil.randomString(10));
+            device.setSealNo("");
+            device.setDeviceStatus(RandomUtil.randomInt(1,4));
+            device.setAddress(RandomUtil.randomString(10));
+            device.setLng(new BigDecimal("0"));
+            device.setLat(new BigDecimal("0"));
+            device.setCommunityId(RandomUtil.randomInt(1,3));
+            device.setReadData(RandomUtil.randomNumbers(3));
+            device.setValveStatus(1);
+            device.setLastReceiveTime(LocalDateTime.now());
+            device.setUserName("");
+            device.setUserPhone("");
+            device.setIdCard("");
+            device.setOldEndDegree("");
+            device.setOldImageUrl("");
+            device.setLastAlarmDate(LocalDateTime.now());
+            device.setOfflineDate(LocalDateTime.now());
+            device.setAcceptDate(LocalDateTime.now());
+            device.setInstallDate(LocalDateTime.now());
+            device.setIsInstall(0);
+            device.setIsAccept(0);
+            device.setStatus(1);
+            device.setCreateBy("system");
+            device.setCreateDate(LocalDateTime.now());
+            device.setUpdateBy("system");
+            device.setUpdateDate(LocalDateTime.now());
+            list.add(device);
+        }
+        List<List<Device>> subList2 =  ListUtil.split(list, 5000);
+
+        for (List<Device> devices : subList2) {
+            System.out.println("===========");
+            deviceMapper.batchInsert(devices);
+        }
+
+
+    }
+}

+ 6 - 0
zoniot-rmcp/zoniot-xxljob-client/src/main/java/com/zcxk/xxljob/controller/TestController.java

@@ -24,4 +24,10 @@ public class TestController {
         meterReadJob.meterReadJobHandler(null);
         return "ok";
     }
+
+    @PostMapping("syncMeterReadJobHandler")
+    public String syncMeterReadJobHandler(){
+        meterReadJob.syncMeterReadJobHandler(null);
+        return "ok";
+    }
 }

+ 13 - 13
zoniot-rmcp/zoniot-xxljob-client/src/main/java/com/zcxk/xxljob/jobs/MeterReadJob.java

@@ -30,7 +30,7 @@ public class MeterReadJob {
 
     @XxlJob("meterReadJobHandler")
     public ReturnT<String> meterReadJobHandler(String param) {
-        XxlJobLogger.log("XXL-JOB, Meter Read Job.Param = {}",param);
+        XxlJobLogger.log("XXL-JOB,begin Meter Read Job.Param = {}",param);
 
 
         Map<String,Object> map = null ;
@@ -40,7 +40,7 @@ public class MeterReadJob {
         else{
             map = new HashMap<>(10);
             // more执行明天的未抄记录
-            map.put("readDay",getYesterdayDay());
+            map.put("readDay",getTomorrowDay());
         }
 
         // 分片参数
@@ -53,7 +53,7 @@ public class MeterReadJob {
         // 业务逻辑
         meterReadRecordService.executeCreateMeterUnReadRecord(map,shardingVO.getIndex(), shardingVO.getTotal());
 
-        XxlJobLogger.log("XXL-JOB, Meter Read Job. Job Result = {}");
+        XxlJobLogger.log("XXL-JOB,end Meter Read Job.");
         return ReturnT.SUCCESS;
     }
 
@@ -72,7 +72,7 @@ public class MeterReadJob {
 
     @XxlJob("syncMeterReadJobHandler")
     public ReturnT<String> syncMeterReadJobHandler(String param) {
-        XxlJobLogger.log("XXL-JOB,syncMeterReadJobHandler.Param = {}",param);
+        XxlJobLogger.log("XXL-JOB,begin syncMeterReadJobHandler.Param = {}",param);
 
 
         Map<String,Object> map = null ;
@@ -90,13 +90,13 @@ public class MeterReadJob {
         // 业务逻辑
         meterReadRecordService.executeSyncMeterReadRecord(map);
 
-        XxlJobLogger.log("XXL-JOB, syncMeterReadJobHandler. Job Result = {}");
+        XxlJobLogger.log("XXL-JOB,end syncMeterReadJobHandler.");
         return ReturnT.SUCCESS;
     }
 
     @XxlJob("todayReadRateJobHandler")
     public ReturnT<String> todayReadRateJobHandler(String param) {
-        XxlJobLogger.log("XXL-JOB,todayReadRateJobHandler.Param = {}",param);
+        XxlJobLogger.log("XXL-JOB,begin todayReadRateJobHandler.Param = {}",param);
 
 
         Map<String,Object> map = null ;
@@ -111,14 +111,14 @@ public class MeterReadJob {
         // 业务逻辑
         meterReadRecordService.todayReadRateJobHandler(map);
 
-        XxlJobLogger.log("XXL-JOB, recent7daysReadRateJobHandler. Job Result = {}");
+        XxlJobLogger.log("XXL-JOB,end todayReadRateJobHandler. ");
         return ReturnT.SUCCESS;
     }
 
 
     @XxlJob("yesterdayReadRateJobHandler")
     public ReturnT<String> yesterdayReadRateJobHandler(String param) {
-        XxlJobLogger.log("XXL-JOB,recent7daysReadRateJobHandler.Param = {}",param);
+        XxlJobLogger.log("XXL-JOB,begin yesterdayReadRateJobHandler.Param = {}",param);
 
 
         Map<String,Object> map = null ;
@@ -133,14 +133,14 @@ public class MeterReadJob {
         // 业务逻辑
         meterReadRecordService.yesterdayReadRateJobHandler(map);
 
-        XxlJobLogger.log("XXL-JOB, recent7daysReadRateJobHandler. Job Result = {}");
+        XxlJobLogger.log("XXL-JOB,end yesterdayReadRateJobHandler. ");
         return ReturnT.SUCCESS;
     }
 
 
     @XxlJob("recent7daysReadRateJobHandler")
     public ReturnT<String> recent7daysReadRateJobHandler(String param) {
-        XxlJobLogger.log("XXL-JOB,recent7daysReadRateJobHandler.Param = {}",param);
+        XxlJobLogger.log("XXL-JOB,begin recent7daysReadRateJobHandler.Param = {}",param);
 
 
         Map<String,Object> map = null ;
@@ -156,13 +156,13 @@ public class MeterReadJob {
         meterReadRecordService.recent7daysReadRateJobHandler(map);
 
 
-        XxlJobLogger.log("XXL-JOB, recent7daysReadRateJobHandler. Job Result = {}");
+        XxlJobLogger.log("XXL-JOB,end recent7daysReadRateJobHandler. ");
         return ReturnT.SUCCESS;
     }
 
     @XxlJob("lastMonthReadRateJobHandler")
     public ReturnT<String> lastMonthReadRateJobHandler(String param) {
-        XxlJobLogger.log("XXL-JOB,recent7daysReadRateJobHandler.Param = {}",param);
+        XxlJobLogger.log("XXL-JOB,begin lastMonthReadRateJobHandler.Param = {}",param);
 
 
         Map<String,Object> map = null ;
@@ -177,7 +177,7 @@ public class MeterReadJob {
         // 业务逻辑
         meterReadRecordService.lastMonthReadRateJobHandler(map);
 
-        XxlJobLogger.log("XXL-JOB, recent7daysReadRateJobHandler. Job Result = {}");
+        XxlJobLogger.log("XXL-JOB,end lastMonthReadRateJobHandler");
         return ReturnT.SUCCESS;
     }