字段名更改

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

@@ -16,7 +16,7 @@ public class GroupShareConfirmParams extends BaseVO {
 
     @NotNull(message = "被分享人userid不能为空")
     @ApiModelProperty(value = "被分享人userid",required = true)
-    private Long shared;
+    private Long sharedUserId;
 
     @NotEmpty(message = "被分享人shared_phone不能为空")
     @ApiModelProperty(value = "被分享人shared_phone",required = true)

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

@@ -20,7 +20,7 @@ public class ShareGroupParams extends BaseVO {
 
     @NotNull(message = "分享人userid不能为空")
     @ApiModelProperty(value = "分享人userid",required = true)
-    private Long sharer;
+    private Long sharerUserId;
 
     @NotEmpty(message = "分享人手机号不能为空")
     @ApiModelProperty(value = "分享人手机号",required = true)

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

@@ -346,7 +346,7 @@ public class GroupGatewayImpl implements GroupGateway {
         String shareUuid = UUID.randomUUID().toString();
         groupShare.setUuid(shareUuid);
         // 设置分享人信息
-        groupShare.setSharer(request.getSharer());
+        groupShare.setSharerUserId(request.getSharerUserId());
         groupShare.setSharerPhone(request.getSharerPhone());
         // 初始化其他字段
         groupShare.setState(0); // 初始状态为待确认
@@ -383,7 +383,7 @@ public class GroupGatewayImpl implements GroupGateway {
         
         // 3. 更新分享记录
         groupShare.setState(3); // 更新状态为已确认
-        groupShare.setShared(request.getShared()); // 设置被分享人ID
+        groupShare.setSharedUserId(request.getSharedUserId()); // 设置被分享人ID
         groupShare.setSharedPhone(request.getSharedPhone()); // 设置被分享人手机号
         
         // 4. 保存更新

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

@@ -370,7 +370,7 @@ public class UserGatewayImpl implements UserGateway {
         // 更新群组分享表
         groupShareService.update(
                 Wrappers.<GroupShare>lambdaUpdate()
-                        .eq(GroupShare::getSharer, request.getUserId())
+                        .eq(GroupShare::getSharerUserId, request.getUserId())
                         .set(GroupShare::getIsDeleted, 1)
         );
     }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/DevRoom.java

@@ -19,7 +19,7 @@ public class DevRoom extends BasePO {
     private Long roomId;
     
     /**
-     * 设备ID
+     * 设备表（dev_info）主键
      */
     @TableField("dev_id")
     private Long devId;
@@ -34,7 +34,7 @@ public class DevRoom extends BasePO {
     /**
      * 家具
      */
-    @TableField("room_params")
+    @TableField("furnitures")
     private String furnitures;
 
 } 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/DevShare.java

@@ -23,7 +23,7 @@ public class DevShare extends BasePO {
     /**
      * 设备表（dev_info）主键
      */
-    private long devId;
+    private Long devId;
 
     /**
      * 分享人userId

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/GroupShare.java

@@ -34,8 +34,8 @@ public class GroupShare extends BasePO {
     /**
      * 分享人userId
      */
-    @TableField("sharer")
-    private Long sharer;
+    @TableField("sharer_user_id")
+    private Long sharerUserId;
 
     /**
      * 分享人手机号
@@ -46,8 +46,8 @@ public class GroupShare extends BasePO {
     /**
      * 被分享人userId
      */
-    @TableField("shared")
-    private Long shared;
+    @TableField("shared_user_id")
+    private Long sharedUserId;
 
     /**
      * 被分享人手机号
@@ -61,20 +61,6 @@ public class GroupShare extends BasePO {
     @TableField("state")
     private Integer state;
 
-
-    /**
-     * 删除标记：0-未删除，1-已删除
-     */
-    @TableField("is_deleted")
-    private Integer isDeleted;
-
-    /**
-     * 备注
-     */
-    @TableField("remark")
-    private String remark;
-
-
     /**
      * 分享常量类
      */

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/RecordPlan.java

@@ -23,12 +23,12 @@ public class RecordPlan extends BasePO {
     /**
      * dev_info表id
      */
-    private Long devInfoId;
+    private Long devId;
 
     /**
      * 设备id
      */
-    private String devId;
+    private String clientId;
 
     /**
      * 是否启用：0-不启用，1-启用

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/RecordPlanTime.java

@@ -22,7 +22,12 @@ public class RecordPlanTime extends BasePO {
     /**
      * record_plan表id
      */
-    private Long planId;
+    private Long recordPlanId;
+
+    /**
+     * 设备id
+     */
+    private String clientId;
 
     /**
      * 开始时间

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/StatInfo.java

@@ -17,12 +17,12 @@ public class StatInfo extends BasePO {
      * 主键ID（自增）
      */
     @TableId(type = IdType.ASSIGN_ID)
-    private Long statInfoId;
+    private Long statId;
 
     /**
-     * 设备id
+     * 设备表id
      */
-    private String devId;
+    private String clientId;
 
     /**
      * 设备名称
@@ -32,7 +32,7 @@ public class StatInfo extends BasePO {
     /**
      * dev_info表id
      */
-    private Long devInfoId;
+    private Long devId;
 
     /**
      * 进入时间

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/StayTime.java

@@ -21,7 +21,7 @@ public class StayTime extends BasePO {
     /**
      * 设备id
      */
-    private String devId;
+    private String clientId;
 
     /**
      * 设备名称
@@ -31,7 +31,7 @@ public class StayTime extends BasePO {
     /**
      * dev_info表id
      */
-    private Long devInfoId;
+    private Long devId;
 
     /**
      * 进入时间

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblOprLog.java

@@ -17,7 +17,7 @@ public class TblOprLog extends BasePO {
      * 主键 ID
      */
     @TableId(type = IdType.ASSIGN_ID)
-    private Long oprLogId;
+    private Long logId;
 
     /**
      * 用户 ID

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/WxRelation.java

@@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("wx_relation")
+@TableName("user_wx_relation")
 public class WxRelation extends BasePO {
 
     /**

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

@@ -25,7 +25,7 @@ public class GroupShareServiceImpl extends ServiceImpl<GroupShareMapper, GroupSh
         return this.baseMapper.selectObjs(
                         new LambdaQueryWrapper<GroupShare>()
                                 .select(GroupShare::getGroupUuid)
-                                .eq(GroupShare::getShared, userId)
+                                .eq(GroupShare::getSharedUserId, userId)
                                 .eq(GroupShare::getState, 1)
                                 .eq(GroupShare::getIsDeleted, 0)
                 ).stream()

portal-service-server/src/main/resources/bootstrap-local.yml

@@ -90,23 +90,23 @@ sa-token:
 #  automatic-reconnect: true
 #  clean-session: false   # 持久会话建议设置为 false
 #  keep-alive-interval: 60 # 保持心跳间隔（秒）
-emqx:
-  enabled: true
-  server-uris:
-    - tcp://8.130.28.21:1883
-  client-id: ${random.uuid}
+mqtt:
+  broker: tcp://8.130.28.21:1883
+  client-id: ${spring.application.name}
   username: admin
   password: public
-  connection-timeout: 30
-  keep-alive-interval: 60
-  automatic-reconnect: true
-  max-reconnect-delay: 10000
+  timeout: 30
+  keepalive: 60
   clean-session: true
-  max-inflight: 100
-  monitor:
-    enabled: true
-    interval: 30
-    max-reconnect-attempts: 10
-    reconnect-cooldown: 60
-  message:
-    process-timeout: 30
+  automatic-reconnect: true
+
+# oss 存储
+oss:
+  accessKey:
+    id: LTAI5t9ZjmmHVs7nseZx3xWT
+    secret: TbmTSDP9ztXrLa4gXBhAmjerQcKGj7
+  endpoint: oss-cn-shanghai.aliyuncs.com
+  bucket: lnxx.oss-cn-shanghai.aliyuncs.com
+  region: cn-shanghai
+  expire:
+    seconds: 300