更新！

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/OperationMessageDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessage;
 
 /**
  * @author TRX

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/OperationMessageResultDao.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt;
 
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageResultDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessageResult;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 /**

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/OperationMessageDaoExtend.java

@@ -1,7 +1,6 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
-import com.zhongshu.iot.client.model.iot.ping.DeviceOnLineRecordSearch;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessage;
 import com.zhongshu.iot.client.model.artemis.OperationMessageSearchParam;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/extend/OperationMessageResultDaoExtend.java

@@ -1,7 +1,7 @@
 package com.zhongshu.iot.server.core.dao.mqtt.extend;
 
 import com.zhongshu.iot.client.model.artemis.OperationMessageResultSearch;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessageResult;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/OperationMessageDaoImpl.java

@@ -4,8 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.zhongshu.iot.client.model.artemis.OperationMessageSearchParam;
 import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageDaoExtend;
-import com.zhongshu.iot.server.core.domain.iot.device.DeviceOnLineRecord;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessage;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.TokenUtil;
 import org.apache.commons.lang3.ObjectUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dao/mqtt/impl/OperationMessageResultDaoImpl.java

@@ -6,7 +6,7 @@ import com.zhongshu.iot.server.core.dao.base.BaseImpl;
 import com.zhongshu.iot.server.core.dao.mqtt.extend.OperationMessageResultDaoExtend;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessageResult;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dataConfig/PasswordCheckConf.java

@@ -93,12 +93,12 @@ public class PasswordCheckConf {
     /**
      * 键盘横向方向规则
      */
-    public static String[] KEYBOARD_HORIZONTAL_ARR = { "01234567890", "qwertyuiop", "asdfghjkl", "zxcvbnm", };
+    public static String[] KEYBOARD_HORIZONTAL_ARR = {"01234567890", "qwertyuiop", "asdfghjkl", "zxcvbnm",};
     /**
      * 键盘斜线方向规则
      */
-    public static String[] KEYBOARD_SLOPE_ARR = { "1qaz", "2wsx", "3edc", "4rfv", "5tgb", "6yhn", "7ujm", "8ik,",
-            "9ol.", "0p;/", "=[;.", "-pl,", "0okm", "9ijn", "8uhb", "7ygv", "6tfc", "5rdx", "4esz" };
+    public static String[] KEYBOARD_SLOPE_ARR = {"1qaz", "2wsx", "3edc", "4rfv", "5tgb", "6yhn", "7ujm", "8ik,",
+            "9ol.", "0p;/", "=[;.", "-pl,", "0okm", "9ijn", "8uhb", "7ygv", "6tfc", "5rdx", "4esz"};
 
     /**
      * 是否检测常用词库
@@ -108,7 +108,7 @@ public class PasswordCheckConf {
     /**
      * 常用词库
      */
-    public static String[] SIMPLE_WORDS = { "admin", "szim", "epicrouter", "password", "grouter", "dare", "root",
+    public static String[] SIMPLE_WORDS = {"admin", "szim", "epicrouter", "password", "grouter", "dare", "root",
             "guest", "user", "success", "pussy", "mustang", "fuckme", "jordan", "test", "hunter", "jennifer", "batman",
             "thomas", "soccer", "sexy", "killer", "george", "asshole", "fuckyou", "summer", "hello", "secret", "fucker",
             "enter", "cookie", "administrator",
@@ -116,5 +116,5 @@ public class PasswordCheckConf {
             "xiaoming", "taobao", "iloveyou", "woaini", "982464",
             // 国外网民常用密码
             "monkey", "letmein", "trustno1", "dragon", "baseball", "master", "sunshine", "ashley", "bailey", "shadow",
-            "superman", "football", "michael", "qazwsx" };
+            "superman", "football", "michael", "qazwsx"};
 }

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/dataConfig/ResultMessage.java

@@ -1,13 +0,0 @@
-package com.zhongshu.iot.server.core.dataConfig;
-
-/**
- * @author TRX
- * @date 2024/6/20
- */
-public class ResultMessage {
-
-    public static final String DATA_NOT_EXIST = "数据不存在：%s";
-
-    public static final String NAME_EXIT = "名称存在：%s";
-
-}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/OperationMessage.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/message/OperationMessage.java

@@ -1,10 +1,11 @@
-package com.zhongshu.iot.server.core.domain.iot.device;
+package com.zhongshu.iot.server.core.domain.iot.message;
 
 import cn.hutool.json.JSONObject;
 import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.iot.client.type.OperationBusType;
 import com.zhongshu.iot.client.type.OperationType;
 import com.zhongshu.iot.server.core.domain.base.SuperEntity;
+import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -91,7 +92,7 @@ public class OperationMessage extends SuperEntity {
     @Schema(description = "mqtt消息类型: 发送 接收")
     private OperationType operationType;
 
-    @Schema(description = "消息创建时间，服务器的时间")
+    @Schema(description = "消息创建时间，服务器的时间（可阅读的）")
     private String time;
 
     @Schema(description = "消息的过期时间")

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/device/OperationMessageResult.java → OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/message/OperationMessageResult.java

@@ -1,4 +1,4 @@
-package com.zhongshu.iot.server.core.domain.iot.device;
+package com.zhongshu.iot.server.core.domain.iot.message;
 
 import cn.hutool.json.JSONObject;
 import com.github.microservice.types.FunctionType;
@@ -23,6 +23,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 import java.util.Date;
 
 /**
+ * mqtt 消息处理结果
  * @author TRX
  * @date 2024/7/15
  */
@@ -68,6 +69,9 @@ public class OperationMessageResult extends SuperEntity {
     @Schema(description = "本数据的业务ID")
     private String messageId;
 
+    @Schema(description = "响应对应的数据id")
+    private String responseId;
+
     @Schema(description = "mqtt消息类型: 发送 接收")
     private OperationType operationType;
 

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/artemis/OperationMessageService.java

@@ -23,13 +23,14 @@ import com.zhongshu.iot.server.core.dao.other.ExecuteMethodInfoDao;
 import com.zhongshu.iot.server.core.dataConfig.MqttConfig;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessageResult;
 import com.zhongshu.iot.server.core.domain.other.ExecuteMethodInfo;
 import com.zhongshu.iot.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.iot.server.core.service.device.DeviceInfoService;
 import com.zhongshu.iot.server.core.service.device.GateWayManagerService;
 import com.zhongshu.iot.server.core.service.iot.IotDataVerifyService;
+import com.zhongshu.iot.server.core.service.iot.IotFreshService;
 import com.zhongshu.iot.server.core.service.iotPlatform.PlatformTopic;
 import com.zhongshu.iot.server.core.util.CommonUtil;
 import com.zhongshu.iot.server.core.util.DateUtils;
@@ -103,6 +104,9 @@ public class OperationMessageService {
     @Value("${artemisstore.time}")
     public Long ttlMill = 30 * 24L * 60 * 60 * 1000L;
 
+    @Autowired
+    private IotFreshService iotFreshService;
+
     /**
      * 发送指令
      *

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceInfoService.java

@@ -4,6 +4,7 @@ import com.github.microservice.busInfoModel.device.DeviceInfoModel;
 import com.github.microservice.busInfoModel.device.DeviceInfoMoreModel;
 import com.github.microservice.busInfoModel.device.IotTemplateSimpleModel;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.FunctionType;
 import com.github.microservice.types.deviceUse.DeviceState;
 import com.github.microservice.types.deviceUse.OnLineState;
@@ -19,7 +20,6 @@ import com.zhongshu.iot.server.core.dao.iot.IotTemplateDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.GateWay2DeviceDao;
 import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
-import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
 import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/GateWayManagerService.java

@@ -13,6 +13,7 @@ import com.zhongshu.iot.server.core.dao.iot.IotTemplateDao;
 import com.zhongshu.iot.server.core.dao.mqtt.*;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.device.*;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessage;
 import com.zhongshu.iot.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/docker/DockerMetaService.java

@@ -2,11 +2,11 @@ package com.zhongshu.iot.server.core.service.docker;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.iot.client.model.docker.*;
 import com.zhongshu.iot.server.core.dao.docker.AkSkConfigDao;
 import com.zhongshu.iot.server.core.dao.docker.DockerMetaDao;
 import com.zhongshu.iot.server.core.dao.docker.DockerMetaLastTimeDao;
-import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.docker.AkSkConfig;
 import com.zhongshu.iot.server.core.domain.docker.DockerMeta;
 import com.zhongshu.iot.server.core.domain.docker.DockerMetaLastTime;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotFreshService.java

@@ -0,0 +1,62 @@
+package com.zhongshu.iot.server.core.service.iot;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.github.microservice.dataConfig.IotTtlConfig;
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.iot.server.core.domain.iot.IotMain;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessageResult;
+import com.zhongshu.iot.server.core.util.DateUtils;
+import com.zhongshu.iot.server.core.util.mqtt.mqttConfig.client.MQClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 页面刷新 消息发送
+ * @author TRX
+ * @date 2025/3/14
+ */
+@Slf4j
+@Service
+public class IotFreshService {
+
+    @Autowired
+    private MQClient mqClient;
+
+    /**
+     * 发送页面刷新消息
+     * @param messageResult
+     * @return
+     */
+    public ResultContent sendPageFreshMessage(OperationMessageResult messageResult) {
+        if (ObjectUtils.isEmpty(messageResult)) {
+            return ResultContent.buildFail("消息信息为空");
+        }
+        String iotThingId = messageResult.getIotThingId();
+        String deviceId = messageResult.getDeviceId();
+        String messageId = messageResult.getMessageId();
+        String topic = String.format("/page/fresh/%s", iotThingId);
+
+        JSONObject data = new JSONObject();
+        data.set("iotThingId", iotThingId);
+        data.set("deviceId", deviceId);
+        IotMain iotMain = messageResult.getIotMain();
+        if (iotMain != null) {
+            data.set("functionType", iotMain.getFunctionType());
+        }
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.set("id", messageId);
+        jsonObject.set("data", data);
+        jsonObject.set("timeStr", DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyySSS));
+        jsonObject.set("time", System.currentTimeMillis());
+        jsonObject.set("ttl", IotTtlConfig.MQTT_TIME_OUT_TTL);
+        jsonObject.set("issued", Boolean.TRUE);
+        mqClient.sendObject(topic, JSONUtil.toJsonStr(jsonObject), messageId);
+        log.info("sendPageFreshMessage: {}", jsonObject.toString());
+        return ResultContent.buildSuccess();
+    }
+
+}

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotSendMessageService.java

@@ -21,8 +21,8 @@ import com.zhongshu.iot.server.core.dao.mqtt.OperationMessageDao;
 import com.zhongshu.iot.server.core.dao.mqtt.OperationMessageResultDao;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.device.DeviceInfo;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessage;
-import com.zhongshu.iot.server.core.domain.iot.device.OperationMessageResult;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessage;
+import com.zhongshu.iot.server.core.domain.iot.message.OperationMessageResult;
 import com.zhongshu.iot.server.core.service.artemis.OperationMessageService;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.CommonUtil;
@@ -73,8 +73,11 @@ public class IotSendMessageService extends SuperService {
     @Value("${artemisstore.time}")
     public Long ttlMill = 30 * 24L * 60 * 60 * 1000L;
 
+    @Autowired
+    private IotFreshService iotFreshService;
+
     /**
-     *
+     * 根据物模型 服务id 下发消息
      * @param param
      * @return
      */
@@ -85,10 +88,15 @@ public class IotSendMessageService extends SuperService {
         if (param.getData() == null) {
             return ResultContent.buildFail("data不能为空");
         }
+
         IotMain iotMain = iotMainDao.findTopById(param.getId());
         if (ObjectUtils.isEmpty(iotMain)) {
             return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
         }
+        if (iotMain.getIotDataType() != IotDataType.Device) {
+            return ResultContent.buildFail(String.format("该数据不是物模型服务"));
+        }
+
         IotSendParam iotSendParam = new IotSendParam();
         iotSendParam.setData(param.getData());
         iotSendParam.setId(param.getId());
@@ -200,6 +208,7 @@ public class IotSendMessageService extends SuperService {
             entity.setDataId(dataId);
             entity.setExpireAt(param.getTtl() + System.currentTimeMillis());
             entity.setEvent(param.getEvent());
+            entity.setTime(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
 
             if (ObjectUtils.isNotEmpty(gateWayInfo)) {
                 entity.setGateWayInfo(gateWayInfo);
@@ -221,11 +230,11 @@ public class IotSendMessageService extends SuperService {
                 String topic = iotMain.getRealIotTopic();
                 String messageId = CommonUtil.UUID();
                 jsonObject.set("id", messageId);
+                jsonObject.set("responseId", messageId);
 
                 OperationMessageResult messageResult = new OperationMessageResult();
                 operationMessageService.buildOperationMessageResultIotInfo(messageResult, iotMain);
                 messageResult.setOperationMessage(entity);
-                messageResult.setGateWayId(entity.getGateWayId());
                 messageResult.setOperationType(entity.getOperationType());
 
                 messageResult.setMessageId(messageId);
@@ -246,6 +255,8 @@ public class IotSendMessageService extends SuperService {
                 messageResult.setOperationType(OperationType.Push);
                 messageResult.setIsNeedReplay(param.getIsNeedReplay());
                 operationMessageResultDao.save(messageResult);
+
+                iotFreshService.sendPageFreshMessage(messageResult);
             }
         } else {
             return ResultContent.buildFail("dataId重复");

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/iot/IotServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhongshu.iot.server.core.service.iot;
 import com.github.microservice.busInfoModel.device.IotTemplateSimpleModel;
 import com.github.microservice.models.baseParam.NameModel;
 import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.FunctionType;
 import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
@@ -16,7 +17,6 @@ import com.zhongshu.iot.server.core.dao.iot.IotThingDao;
 import com.zhongshu.iot.server.core.dao.iot.IotTopicDao;
 import com.zhongshu.iot.server.core.dao.mqtt.DeviceInfoDao;
 import com.zhongshu.iot.server.core.dao.mqtt.GateWay2DeviceDao;
-import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.iot.IotMain;
 import com.zhongshu.iot.server.core.domain.iot.IotTemplate;
 import com.zhongshu.iot.server.core.domain.iot.IotThing;
@@ -109,7 +109,7 @@ public class IotServiceImpl extends SuperService {
                 return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
             }
             if (ObjectUtils.isNotEmpty(nameTemp) && !nameTemp.getId().equals(template.getId())) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
             template.setName(param.getName());
             template.setRemark(param.getRemark());
@@ -140,7 +140,7 @@ public class IotServiceImpl extends SuperService {
             // 新增加
             template = new IotTemplate();
             if (ObjectUtils.isNotEmpty(nameTemp)) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
             template.setIotDataType(IotDataType.IotTemplate);
             BeanUtils.copyProperties(param, template);
@@ -168,7 +168,7 @@ public class IotServiceImpl extends SuperService {
                 return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, param.getId()));
             }
             if (ObjectUtils.isNotEmpty(temp) && !temp.getId().equals(param.getId())) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
             template.setName(param.getName());
             template.setRemark(param.getRemark());
@@ -263,13 +263,13 @@ public class IotServiceImpl extends SuperService {
             // 产品
             IotTemplate temp = iotTemplateDao.findTopByNameAndIotDataType(param.getName(), IotDataType.IotTemplate);
             if (ObjectUtils.isNotEmpty(temp) && !temp.getId().equals(template.getId())) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
         } else if (template.getIotDataType() == IotDataType.Device) {
             // 物模型
             IotTemplate temp = iotTemplateDao.findTopByNameAndDeviceIdAndIotDataType(param.getName(), template.getDeviceId(), IotDataType.Device);
             if (ObjectUtils.isNotEmpty(temp) && !temp.getId().equals(template.getId())) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
         }
         BeanUtils.copyProperties(param, template);
@@ -442,7 +442,7 @@ public class IotServiceImpl extends SuperService {
             }
 
             if (ObjectUtils.isNotEmpty(nameTemp) && !nameTemp.getId().equals(param.getId())) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
             if (ObjectUtils.isNotEmpty(topicTemp) && !topicTemp.getId().equals(param.getId())) {
                 return ResultContent.buildFail(String.format("iotTopic已存在：%s", param.getIotTopic()));
@@ -455,7 +455,7 @@ public class IotServiceImpl extends SuperService {
             entity = new IotMain();
             initEntity(entity);
             if (ObjectUtils.isNotEmpty(nameTemp)) {
-                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIT, param.getName()));
+                return ResultContent.buildFail(String.format(ResultMessage.NAME_EXIST, param.getName()));
             }
             if (ObjectUtils.isNotEmpty(topicTemp)) {
                 return ResultContent.buildFail(String.format("iotTopic已存在：%s", param.getIotTopic()));

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/DepartmentServiceImpl.java

@@ -1,12 +1,12 @@
 package com.zhongshu.iot.server.core.service.user.impl;
 
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.iot.client.model.user.DepartmentModel;
 import com.zhongshu.iot.client.model.user.DepartmentParam;
 import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.utils.ITree;
 import com.zhongshu.iot.client.utils.TreeUtil;
 import com.zhongshu.iot.server.core.dao.DepartmentDao;
-import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.user.Department;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.service.user.DepartmentService;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/RoleServiceImpl.java

@@ -1,17 +1,17 @@
 package com.zhongshu.iot.server.core.service.user.impl;
 
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.net.ResultMessage;
+import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.model.user.RoleAddParam;
 import com.zhongshu.iot.client.model.user.RoleModel;
 import com.zhongshu.iot.client.model.user.RoleSearchParam;
-import com.github.microservice.types.common.DataState;
 import com.zhongshu.iot.client.type.RoleType;
 import com.zhongshu.iot.server.core.dao.RoleDao;
-import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.user.Role;
 import com.zhongshu.iot.server.core.service.base.SuperService;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
-import com.github.microservice.net.ResultContent;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/user/impl/UserManagerServiceImpl.java

@@ -1,6 +1,7 @@
 package com.zhongshu.iot.server.core.service.user.impl;
 
 import com.github.microservice.busInfoModel.device.ProjectInfoModel;
+import com.github.microservice.net.ResultMessage;
 import com.zhongshu.iot.client.model.user.*;
 import com.zhongshu.iot.client.type.ResultState;
 import com.zhongshu.iot.client.type.UserType;
@@ -8,7 +9,6 @@ import com.zhongshu.iot.server.core.dao.DepartmentDao;
 import com.zhongshu.iot.server.core.dao.RoleDao;
 import com.zhongshu.iot.server.core.dao.UserDao;
 import com.zhongshu.iot.server.core.dao.mqtt.ProjectInfoDao;
-import com.zhongshu.iot.server.core.dataConfig.ResultMessage;
 import com.zhongshu.iot.server.core.domain.iot.device.ProjectInfo;
 import com.zhongshu.iot.server.core.domain.user.Department;
 import com.zhongshu.iot.server.core.domain.user.Role;