更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/ProjectAgreementConfigParam.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/projectCommon/ProjectAgreementConfigParam.java

@@ -1,12 +1,7 @@
-package com.zhongshu.card.client.model.projectAbout;
+package com.zhongshu.card.client.model.projectAbout.projectCommon;
 
-import com.zhongshu.card.client.type.PassWordDefaultType;
-import com.zhongshu.card.client.type.PassWordType;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,11 +13,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProjectAgreementConfigParam {
-
-    @NotEmpty
-    @Schema(description = "项目id")
-    private String projectOid;
+public class ProjectAgreementConfigParam extends ProjectCommonSuperParam {
 
     @Schema(description = "用户协议")
     @NotEmpty

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/ProjectCommonConfigModel.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/projectCommon/ProjectCommonConfigModel.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout;
+package com.zhongshu.card.client.model.projectAbout.projectCommon;
 
 import com.zhongshu.card.client.type.PassWordDefaultType;
 import com.zhongshu.card.client.type.PassWordType;
@@ -47,6 +47,9 @@ public class ProjectCommonConfigModel {
     @Schema(description = "允许游客消费")
     private Boolean isAllowConsume = Boolean.FALSE;
 
+
+    //----------------协议信息 start---------
+
     @Schema(description = "用户协议")
     private String userAgreement = "";
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/ProjectCommonConfigParam.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/projectCommon/ProjectCommonConfigParam.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.projectAbout;
+package com.zhongshu.card.client.model.projectAbout.projectCommon;
 
 import com.zhongshu.card.client.type.PassWordDefaultType;
 import com.zhongshu.card.client.type.PassWordType;

FullCardClient/src/main/java/com/zhongshu/card/client/model/projectAbout/projectCommon/ProjectCommonSuperParam.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.model.projectAbout.projectCommon;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+/**
+ * 项目通用设置的超类
+ *
+ * @author TRX
+ * @date 2025/2/10
+ */
+@Data
+public class ProjectCommonSuperParam {
+
+    @NotEmpty
+    @Schema(description = "项目id")
+    private String projectOid;
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/projectAbout/ProjectCommonConfigController.java

@@ -4,9 +4,9 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.ProjectOidParam;
-import com.zhongshu.card.client.model.projectAbout.ProjectAgreementConfigParam;
-import com.zhongshu.card.client.model.projectAbout.ProjectCommonConfigModel;
-import com.zhongshu.card.client.model.projectAbout.ProjectCommonConfigParam;
+import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectAgreementConfigParam;
+import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectCommonConfigModel;
+import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectCommonConfigParam;
 import com.zhongshu.card.server.core.service.projectAbout.ProjectCommonConfigService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
@@ -49,18 +49,21 @@ public class ProjectCommonConfigController {
         return projectCommonConfigService.getInfo(param.getProjectOid());
     }
 
+    //----------------------------协议配置 start-------------------------
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "保存项目的协议配置", description = "保存项目的协议配置")
     @RequestMapping(value = "saveAgreementInfo", method = {RequestMethod.POST})
     public ResultContent saveAgreementInfo(@RequestBody @Valid ProjectAgreementConfigParam param) {
-        return projectCommonConfigService.saveAgreementInfo(param);
+        return projectCommonConfigService.saveCommonConfigInfo(param);
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "得到项目的协议配置", description = "得到项目的协议配置")
     @RequestMapping(value = "getAgreementInfo", method = {RequestMethod.POST})
     public ResultContent<ProjectAgreementConfigParam> getAgreementInfo(@RequestBody ProjectOidParam param) {
-        return projectCommonConfigService.getAgreementInfo(param.getProjectOid());
+        ProjectAgreementConfigParam model = new ProjectAgreementConfigParam();
+        return projectCommonConfigService.getCommonConfigInfo(param.getProjectOid(), model);
     }
 
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/visitor/package-info.java

@@ -0,0 +1,4 @@
+package com.zhongshu.card.server.core.controller.visitor;
+/**
+ * 访客应用相关的
+ */

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/visitor/package-info.java

@@ -0,0 +1,4 @@
+package com.zhongshu.card.server.core.dao.visitor;
+/**
+ * 访客应用相关的
+ */

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceProduct.java

@@ -11,7 +11,7 @@ import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
- * 设备信息
+ * 产品信息
  *
  * @author TRX
  * @date 2025/1/8

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceProductBindDevice.java

@@ -27,7 +27,7 @@ public class DeviceProductBindDevice extends SuperMain {
     @DBRef(lazy = true)
     private DeviceProduct deviceProduct;
 
-    @Schema(description = "")
+    @Schema(description = "产品信息ID")
     @Indexed
     private String deviceProductId;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/projectAbout/OrgUserFace.java

@@ -41,4 +41,5 @@ public class OrgUserFace extends SuperMain {
 
     @Schema(description = "权限中心的人脸id")
     private String updateFaceFileId;
+
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/visitor/package-info.java

@@ -0,0 +1,4 @@
+package com.zhongshu.card.server.core.domain.visitor;
+/**
+ * 访客应用相关的模型
+ */

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/mqtt/MqttServiceImpl.java

@@ -2,11 +2,12 @@ package com.zhongshu.card.server.core.service.mqtt;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import com.github.microservice.net.ResultContent;
 import com.google.gson.JsonObject;
 import com.zhongshu.card.client.model.mqtt.MqttConfigModel;
 import com.zhongshu.card.client.model.mqtt.SendMessageModel;
-import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.type.ArtemisType;
+import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.dao.mqtt.ArtemisMessageDao;
 import com.zhongshu.card.server.core.dao.mqtt.MqttConfigDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
@@ -19,7 +20,6 @@ import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.mqtt.mqttConfig.client.MQClient;
 import com.zhongshu.card.server.core.service.mqtt.mqttConfig.constant.MQConstant;
 import com.zhongshu.card.server.core.util.BeanUtils;
-import com.zhongshu.card.client.utils.DateUtils;
 import jakarta.jms.Message;
 import jakarta.jms.TextMessage;
 import lombok.extern.slf4j.Slf4j;
@@ -88,6 +88,7 @@ public class MqttServiceImpl extends SuperService {
             jsonObject.addProperty("ttl", 10 * 1000);
             mqClient.sendObject(param.getTopic(), jsonObject.toString());
 
+            // 保存消息记录
             ArtemisMessage artemisMessage = new ArtemisMessage();
             artemisMessage.setJsonObject(jsonObject);
             artemisMessage.setTopIc(param.getTopic());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/projectAbout/ProjectCommonConfigService.java

@@ -1,12 +1,13 @@
 package com.zhongshu.card.server.core.service.projectAbout;
 
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.projectAbout.*;
+import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectCommonConfigModel;
+import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectCommonConfigParam;
+import com.zhongshu.card.client.model.projectAbout.projectCommon.ProjectCommonSuperParam;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.projectAbout.ProjectCommonConfigDao;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.projectAbout.ProjectCommonConfig;
-import com.zhongshu.card.server.core.domain.projectAbout.ProjectIotInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -63,12 +64,27 @@ public class ProjectCommonConfigService extends SuperService {
     }
 
     /**
-     * 保存配置信息
+     * 得到项目
+     *
+     * @param projectOid
+     * @return
+     */
+    public ResultContent<ProjectCommonConfigModel> getInfo(String projectOid) {
+        ProjectCommonConfig entity = commonConfigDao.findTopByProjectOid(projectOid);
+        ProjectCommonConfigModel model = null;
+        if (ObjectUtils.isNotEmpty(entity)) {
+            model = toModel(entity);
+        }
+        return ResultContent.buildSuccess(model);
+    }
+
+    /**
+     * 保存通用配置信息
      *
      * @param param
      * @return
      */
-    public ResultContent saveAgreementInfo(ProjectAgreementConfigParam param) {
+    public ResultContent saveCommonConfigInfo(ProjectCommonSuperParam param) {
         String projectOid = param.getProjectOid();
         Organization projectInfo = organizationDao.findTopByOid(projectOid);
         if (ObjectUtils.isEmpty(projectInfo)) {
@@ -83,6 +99,7 @@ public class ProjectCommonConfigService extends SuperService {
             initUpdateEntity(entity);
         }
         BeanUtils.copyProperties(param, entity);
+
         entity.setProjectInfo(projectInfo);
         entity.setProjectName(projectInfo.getName());
         entity.setProjectCode(projectInfo.getCode());
@@ -94,25 +111,15 @@ public class ProjectCommonConfigService extends SuperService {
     }
 
     /**
-     * 得到项目
+     * 通用得到配置信息
      *
      * @param projectOid
+     * @param model
      * @return
      */
-    public ResultContent<ProjectCommonConfigModel> getInfo(String projectOid) {
-        ProjectCommonConfig entity = commonConfigDao.findTopByProjectOid(projectOid);
-        ProjectCommonConfigModel model = null;
-        if (ObjectUtils.isNotEmpty(entity)) {
-            model = toModel(entity);
-        }
-        return ResultContent.buildSuccess(model);
-    }
-
-    public ResultContent<ProjectAgreementConfigParam> getAgreementInfo(String projectOid) {
+    public ResultContent getCommonConfigInfo(String projectOid, ProjectCommonSuperParam model) {
         ProjectCommonConfig entity = commonConfigDao.findTopByProjectOid(projectOid);
-        ProjectAgreementConfigParam model = null;
-        if (ObjectUtils.isNotEmpty(entity)) {
-            model = new ProjectAgreementConfigParam();
+        if (ObjectUtils.isNotEmpty(entity) && ObjectUtils.isNotEmpty(model)) {
             org.springframework.beans.BeanUtils.copyProperties(entity, model);
         }
         return ResultContent.buildSuccess(model);