修改统计逻辑

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -224,7 +224,7 @@ public class DeviceApiController {
                 query.setImageResolution(resolution);
                 query.setDistribute(DistributeEnum.是.getValue());
                 DeviceModuleDistributeEntity distribute = deviceModuleDistributeService.selectOne(query);
-                if(!ObjectUtils.isEmpty(distribute)){
+                if (!ObjectUtils.isEmpty(distribute)) {
                     //homeDeviceUrl/1/pdj/1920x1080
                     String homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", distribute.getSiteId(), distribute.getProductCode(), distribute.getImageResolutionValue());
                     //根据部署的资源 生成homeurl
@@ -240,10 +240,10 @@ public class DeviceApiController {
                         serverInfo.setHomeUrl(decodeStr);
                         serverInfo.setEventUrl(productEntity.getEventUrl());
                     }
-                }else{
+                } else {
                     buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
                 }
-            }else{
+            } else {
                 buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             }
             //对外地址，访问ip+端口 端口号由platformEntity.getSendUrl()获取
@@ -436,8 +436,6 @@ public class DeviceApiController {
         if (ObjectUtils.isEmpty(scheme)) {
             scheme = "http";
         }
-//        String serverName = request.getServerName();
-//        int serverPort = request.getServerPort();
         log.info("【设备前端新增或更新】【请求体】-->{}  ,serverName:{}", JSONObject.toJSONString(req), serverName);
         ApiResp<DeviceResp> rsp = new ApiResp<>();
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
@@ -514,7 +512,7 @@ public class DeviceApiController {
                 query.setImageResolution(resolution);
                 query.setDistribute(DistributeEnum.是.getValue());
                 DeviceModuleDistributeEntity distribute = deviceModuleDistributeService.selectOne(query);
-                if(!ObjectUtils.isEmpty(distribute)){
+                if (!ObjectUtils.isEmpty(distribute)) {
                     //homeDeviceUrl/1/pdj/1920x1080
                     String homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", distribute.getSiteId(), distribute.getProductCode(), distribute.getImageResolutionValue());
                     //根据部署的资源 生成homeurl
@@ -530,10 +528,10 @@ public class DeviceApiController {
                         serverInfo.setHomeUrl(decodeStr);
                         serverInfo.setEventUrl(productEntity.getEventUrl());
                     }
-                }else{
+                } else {
                     buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
                 }
-            }else{
+            } else {
                 buildHomeUrlBySite(deviceEntity, productEntity, serverInfo, serverName, serverPort);
             }
 
@@ -999,7 +997,7 @@ public class DeviceApiController {
             deviceEntity.setResolution(req.getResolution());
             deviceEntity.setResolutionValue(req.getResolution());
         }
-        deviceService.update(deviceEntity);
+        deviceService.getDeviceDao().update(deviceEntity);
     }
 
     private void deviceDel(DeviceReq req) throws AppException {

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

@@ -165,6 +165,12 @@ Content-Type: application/json
   "siteName": "会东县行政审批局"
 }
 
+###设备更新
+POST {{baseUrl}}/api/receive
+Content-Type: application/json
+
+{"deviceCode":"94-a4-08-ea-16-3e","deviceInBuilding":0,"deviceInFloor":0,"deviceMac":"94-a4-08-ea-16-3e","deviceName":"一楼A03","deviceRemark":"","ip":"","port":"","productCode":"hjq","receiveMethod":2,"resolution":"","siteCode":"510921000000-0001","siteId":1,"siteName":"蓬溪县政务服务中心"}
+
 
 
 

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

@@ -102,9 +102,9 @@ POST {{baseUrl}}/device/message/stat/list
 Content-Type: application/json
 
 {
-  "groupList": ["productCode","month"],
   "size": -1,
-  "productCode": "pdj",
+  "groupList": ["productCode","month"],
+  "productCodeList": ["pdj"],
   "year": 2024,
   "siteId": 1,
   "orderColList": [{"colName":"month","sortKind":"asc"}]