添加批量激活设备

device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java

 package com.mortals.xhx.module.device.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlPath;
 import cn.hutool.core.util.IdUtil;
@@ -363,32 +362,35 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
     @Override
     public void deviceStat(Long siteId, Context context) {
         //查询当天统计，如果有 则更新统计结果，否则新增
+        Calendar calendar = Calendar.getInstance();
         DeviceStatEntity deviceStatEntity = deviceStatService.selectOne(new DeviceStatQuery()
                 .siteId(siteId)
-                .year(DateUtil.year(new Date()))
-                .month(DateUtil.month(new Date()) + 1)
-                .day(DateUtil.dayOfMonth(new Date())));
+                .year(calendar.get(Calendar.YEAR))
+                .month(calendar.get(Calendar.MONTH) + 1)
+                .day(calendar.get(Calendar.DAY_OF_MONTH)));
         if (ObjectUtils.isEmpty(deviceStatEntity)) {
             deviceStatEntity = new DeviceStatEntity();
             deviceStatEntity.initAttrValue();
             deviceStatEntity.setSiteId(siteId);
             deviceStatEntity.setCreateTime(new Date());
-            deviceStatEntity.setYear(DateUtil.year(new Date()));
-            deviceStatEntity.setMonth(DateUtil.month(new Date()) + 1);
-            deviceStatEntity.setDay(DateUtil.dayOfMonth(new Date()));
+
+            deviceStatEntity.setYear(calendar.get(Calendar.YEAR));
+            deviceStatEntity.setMonth(calendar.get(Calendar.MONTH)+1);
+            deviceStatEntity.setDay(calendar.get(Calendar.DAY_OF_MONTH));
         }
 
         //获取昨天统计数据
         DeviceStatEntity yesterdayDeviceStat = deviceStatService.selectOne(new DeviceStatQuery()
                 .siteId(siteId)
-                .year(DateUtil.year(DateUtil.yesterday()))
-                .month(DateUtil.month(DateUtil.yesterday()) + 1)
-                .day(DateUtil.dayOfMonth(DateUtil.yesterday())));
+                .year(calendar.get(Calendar.YEAR))
+                .month(calendar.get(Calendar.MONTH) + 1)
+                .day(calendar.get(Calendar.DAY_OF_MONTH)));
         if (ObjectUtils.isEmpty(yesterdayDeviceStat)) {
             yesterdayDeviceStat = new DeviceStatEntity();
             yesterdayDeviceStat.initAttrValue();
             yesterdayDeviceStat.setSiteId(siteId);
-            yesterdayDeviceStat.setYear(DateUtil.year(DateUtil.yesterday()));
+           // yesterdayDeviceStat.setYear(DateUtil.year(DateUtil.yesterday()));
+            yesterdayDeviceStat.setYear(calendar.get(Calendar.YEAR));
         }
         try {
 

device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceStatController.java

 package com.mortals.xhx.module.device.web;
 
-import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.device.model.DeviceStatEntity;
 import com.mortals.xhx.module.device.model.DeviceStatQuery;
 import com.mortals.xhx.module.device.service.DeviceService;
-import com.mortals.xhx.module.sitestat.model.SitestatQuery;
+import com.mortals.xhx.module.device.service.DeviceStatService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.device.model.DeviceStatEntity;
-import com.mortals.xhx.module.device.service.DeviceStatService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
-import com.alibaba.fastjson.JSONObject;
-
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import static com.mortals.framework.ap.SysConstains.*;
+import java.util.Calendar;
+import java.util.Map;
 
 /**
  * 设备统计
@@ -70,11 +55,15 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi
             //刷新成功，返回列
             //deviceService.deviceStat(deviceQuery.getSiteId(),getContext());
             DeviceStatQuery deviceStatQuery = new DeviceStatQuery();
-            deviceStatQuery.setYear(DateUtil.year(new Date()));
-            deviceStatQuery.setMonth(DateUtil.month(new Date()) + 1);
-            deviceStatQuery.setDay(DateUtil.dayOfMonth(new Date()));
+            Calendar calendar = Calendar.getInstance();
+            deviceStatQuery.setYear(calendar.get(Calendar.YEAR));
+            deviceStatQuery.setMonth(calendar.get(Calendar.MONTH)+1);
+            deviceStatQuery.setDay(calendar.get(Calendar.DAY_OF_MONTH));
             deviceStatQuery.setSiteId(deviceQuery.getSiteId());
             Rest<Object> resp = this.list(deviceStatQuery);
+
+
+
             return resp;
         } catch (Exception e) {
             log.error("刷新异常", e);
@@ -82,4 +71,14 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi
         }
     }
 
+
+    public static void main(String[] args) {
+        System.out.println( DateUtils.getThisYear());
+        System.out.println( DateUtils.getCurrMonth());
+        System.out.println( DateUtils.getCurrMonth());
+        Calendar calendar = Calendar.getInstance();
+        System.out.println(calendar.get (Calendar.MONTH));
+        System.out.println(calendar.get (Calendar.DAY_OF_MONTH));
+    }
+
 }
\ No newline at end of file

device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "page": 1,
-  "size": 100
+  "size": 10
 }