accseeToken+字段定义修改

portal-service-application/src/test/java/com/hfln/portal/application/controller/wap/DeviceControllerTest.java

@@ -273,8 +273,8 @@ class DeviceControllerTest {
         // 准备测试数据
         DeviceLocationParams params = new DeviceLocationParams();
         params.setDevId(TEST_DEV_ID);
-        params.setXValue(new BigDecimal("100.5"));
-        params.setYValue(new BigDecimal("109.5"));
+        params.setXxValue(new BigDecimal("100.5"));
+        params.setYyValue(new BigDecimal("109.5"));
         
         // 模拟Gateway行为
         when(deviceGateway.updateDeviceLocation(params)).thenReturn(true);
@@ -295,8 +295,8 @@ class DeviceControllerTest {
         // 准备测试数据
         DeviceLocationParams params = new DeviceLocationParams();
         params.setDevId(TEST_DEV_ID);
-        params.setXValue(new BigDecimal("100.5"));
-        params.setYValue(new BigDecimal("109.5"));
+        params.setXxValue(new BigDecimal("100.5"));
+        params.setYyValue(new BigDecimal("109.5"));
         
         // 模拟Gateway行为
         when(deviceGateway.updateDeviceLocation(params)).thenReturn(false);

portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceBandingParams.java

@@ -43,21 +43,21 @@ public class DeviceBandingParams extends BaseVO {
     private String mountPlain;
 
     @ApiModelProperty(value = "安装坐标x开始")
-    private BigDecimal xStart;
+    private BigDecimal xxStart;
     @ApiModelProperty(value = "安装坐标x结束")
-    private BigDecimal xEnd;
+    private BigDecimal xxEnd;
 
 
     @ApiModelProperty(value = "安装坐标y开始")
-    private BigDecimal yStart;
+    private BigDecimal yyStart;
     @ApiModelProperty(value = "安装坐标y结束")
-    private BigDecimal yEnd;
+    private BigDecimal yyEnd;
 
 
     @ApiModelProperty(value = "安装坐标z开始")
-    private BigDecimal zStart;
+    private BigDecimal zzStart;
     @ApiModelProperty(value = "安装坐标z结束")
-    private BigDecimal zEnd;
+    private BigDecimal zzEnd;
 
 
     @ApiModelProperty(value = "指示灯开关")

portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceListQueryReq.java

@@ -1,17 +1,23 @@
 package com.hfln.portal.common.request.device;
 
 import com.hfln.portal.common.vo.PageVo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;
 
 @Data
 public class DeviceListQueryReq extends PageVo {
 
+    @NotEmpty(message = "设备Id不能为空")
+    @ApiModelProperty(value = "设备ID",required = true)
     private String clientId;
 
+    @ApiModelProperty(value = "起始时间")
     private LocalDate createTimeStart;
 
+    @ApiModelProperty(value = "结束时间")
     private LocalDate createTimeEnd;
 
 }

portal-service-common/src/main/java/com/hfln/portal/common/request/device/DeviceLocationParams.java

@@ -19,8 +19,8 @@ public class DeviceLocationParams extends BaseVO {
     private Long devId;
 
     @ApiModelProperty(value = "X坐标")
-    private BigDecimal xValue;
+    private BigDecimal xxValue;
 
     @ApiModelProperty(value = "Y坐标")
-    private BigDecimal yValue;
+    private BigDecimal yyValue;
 }

portal-service-common/src/main/java/com/hfln/portal/common/request/group/GroupShareHandleParams.java

@@ -21,11 +21,11 @@ public class GroupShareHandleParams extends BaseVO {
     private String  uuid;
 
     @NotNull(message = "分享状态不能为空")
-    @ApiModelProperty(value = "分享状态：0-待确认，1-已接收，2-已拒绝，3-已确认",required = true)
+    @ApiModelProperty(value = "分享状态仅限：1-已接收，2-已拒绝",required = true)
     private Integer state;
 
     @AssertTrue(message = "分享状态值无效")
     private boolean isStateValid(){
-         return state != null && (state == 1 || state == 2 || state == 3);
+         return state != null && (state == 1 || state == 2);
     }
 }

portal-service-domain/src/main/java/com/hfln/portal/domain/customer/util/WxOfficeAccountClient.java

@@ -130,7 +130,7 @@ public class WxOfficeAccountClient {
                     String accessToken = (String) map.get("access_token");
 
                     //4.写入redis，有效期7080秒
-                    stringRedisTemplate.opsForValue().set(ACCESS_TOKEN_KEY, accessToken, 7080, TimeUnit.SECONDS);
+                    stringRedisTemplate.opsForValue().set(ACCESS_TOKEN_KEY, accessToken, 120, TimeUnit.SECONDS);
                     log.info("从微信中获取 access_token 并写入Redis：{}", accessToken);
                     return accessToken;
                 } else {

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/DeviceGatewayImpl.java

@@ -292,10 +292,10 @@ public class DeviceGatewayImpl implements DeviceGateway {
         BigDecimal halfWidth = width.divide(BigDecimal.valueOf(2), 10, RoundingMode.HALF_UP);
 
         // 3. 设置默认值
-        setIfNull(request::getXStart, () -> halfLength, request::setXStart);
-        setIfNull(request::getXEnd, () -> halfLength, request::setXEnd);
-        setIfNull(request::getYStart, () -> halfWidth, request::setYStart);
-        setIfNull(request::getYEnd, () -> halfWidth, request::setYEnd);
+        setIfNull(request::getXxStart, () -> halfLength, request::setXxStart);
+        setIfNull(request::getXxEnd, () -> halfLength, request::setXxEnd);
+        setIfNull(request::getYyStart, () -> halfWidth, request::setYyStart);
+        setIfNull(request::getYyEnd, () -> halfWidth, request::setYyEnd);
 
 
         Boolean flag = devInfoService.updateDevice(request.getClientId(), request);
@@ -337,14 +337,14 @@ public class DeviceGatewayImpl implements DeviceGateway {
         }
         LambdaUpdateWrapper<DevInfo> updateWrapper = Wrappers.lambdaUpdate();
         // 仅当字段非空时才更新
-        if (Objects.nonNull(params.getXValue())) {
-            updateWrapper.set(DevInfo::getX, params.getXValue());
+        if (Objects.nonNull(params.getXxValue())) {
+            updateWrapper.set(DevInfo::getX, params.getXxValue());
         }
-        if (Objects.nonNull(params.getYValue())) {
-            updateWrapper.set(DevInfo::getY, params.getYValue());
+        if (Objects.nonNull(params.getYyValue())) {
+            updateWrapper.set(DevInfo::getY, params.getYyValue());
         }
         // 如果所有字段均为空，无需更新
-        if (params.getXValue() == null && params.getYValue() == null) {
+        if (params.getXxValue() == null && params.getYyValue() == null) {
             return false;
         }
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/DevInfoServiceImpl.java

@@ -97,12 +97,12 @@ public class DevInfoServiceImpl extends ServiceImpl<DevInfoMapper, DevInfo> impl
                 .setIfNotNull(DevInfo::getWidth, request.getWidth())
                 .setIfNotNull(DevInfo::getHeight, request.getHeight())
                 .setIfNotNull(DevInfo::getNorthAngle, request.getNorthAngle())
-                .setIfNotNull(DevInfo::getStartX, request.getXStart())
-                .setIfNotNull(DevInfo::getStopX, request.getXEnd())
-                .setIfNotNull(DevInfo::getStartY, request.getYStart())
-                .setIfNotNull(DevInfo::getStopY, request.getYEnd())
-                .setIfNotNull(DevInfo::getStartZ, request.getZStart())
-                .setIfNotNull(DevInfo::getStopZ, request.getZEnd())
+                .setIfNotNull(DevInfo::getStartX, request.getXxStart())
+                .setIfNotNull(DevInfo::getStopX, request.getXxEnd())
+                .setIfNotNull(DevInfo::getStartY, request.getYyStart())
+                .setIfNotNull(DevInfo::getStopY, request.getYyEnd())
+                .setIfNotNull(DevInfo::getStartZ, request.getZzStart())
+                .setIfNotNull(DevInfo::getStopZ, request.getZzEnd())
                 // 无条件更新的字段
                 .set(DevInfo::getUpdateTime, LocalDateTime.now())
                 .set(DevInfo::getOnline, 1);