添加手动刷新

device-manager/src/main/java/com/mortals/xhx/daemon/task/DeviceTotalStatTaskImpl.java

@@ -62,7 +62,8 @@ public class DeviceTotalStatTaskImpl implements ITaskExcuteService {
 
     @Override
     public void excuteTask(ITask task) throws AppException {
-        doDeviceStat();
+        deviceService.deviceStat(null);
+        //doDeviceStat();
     }
 
 

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

@@ -53,6 +53,12 @@ public interface DeviceService extends ICRUDCacheService<DeviceEntity,Long>{
 
     DeviceDao getDeviceDao();
 
+    /**
+     * 设备统计当天情况
+     * @param context
+     */
+    void deviceStat(Context context);
+
 
 
 

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.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+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 org.springframework.beans.factory.annotation.Autowired;
 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.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import java.util.*;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
-import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 设备统计
-*
-* @author zxfei
-* @date 2022-07-05
-*/
+ * 设备统计
+ *
+ * @author zxfei
+ * @date 2022-07-05
+ */
 @RestController
 @RequestMapping("device/stat")
-public class DeviceStatController extends BaseCRUDJsonBodyMappingController<DeviceStatService,DeviceStatEntity,Long> {
+public class DeviceStatController extends BaseCRUDJsonBodyMappingController<DeviceStatService, DeviceStatEntity, Long> {
 
     @Autowired
-    private ParamService paramService;
+    private DeviceService deviceService;
 
-    public DeviceStatController(){
-        super.setModuleDesc( "设备统计");
+    public DeviceStatController() {
+        super.setModuleDesc("设备统计");
     }
 
     @Override
@@ -46,4 +55,24 @@ public class DeviceStatController extends BaseCRUDJsonBodyMappingController<Devi
     }
 
 
+    /**
+     * 站点信息
+     */
+    @PostMapping(value = "syncDeviceStat")
+    public Rest<Object> syncDeviceStat() {
+        try {
+            //刷新成功，返回列表
+            deviceService.deviceStat(getContext());
+            DeviceStatQuery deviceStatQuery = new DeviceStatQuery();
+            deviceStatQuery.setYear(DateUtil.year(new Date()));
+            deviceStatQuery.setMonth(DateUtil.month(new Date()) + 1);
+            deviceStatQuery.setDay(DateUtil.dayOfMonth(new Date()));
+            Rest<Object> resp = this.list(deviceStatQuery);
+            return resp;
+        } catch (Exception e) {
+            log.error("刷新异常", e);
+            return Rest.fail(KEY_RESULT_CODE, super.convertException(e));
+        }
+    }
+
 }
\ No newline at end of file

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

@@ -14,11 +14,14 @@ import com.mortals.xhx.common.pdu.site.SitePdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.feign.user.IUserFeign;
+import com.mortals.xhx.module.device.service.DeviceService;
 import com.mortals.xhx.module.sitestat.model.SitestatEntity;
+import com.mortals.xhx.module.sitestat.model.SitestatQuery;
 import com.mortals.xhx.module.sitestat.service.SitestatService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -39,6 +42,8 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
 
     @Autowired
     private IAuthTokenService authTokenService;
+    @Autowired
+    private DeviceService deviceService;
 
 
     @Autowired
@@ -148,4 +153,7 @@ public class SitestatController extends BaseCRUDJsonBodyMappingController<Sitest
         return jsonObject.toJSONString();
     }
 
+
+
+
 }
\ No newline at end of file