diff --git a/iot-common/iot-base/pom.xml b/iot-common/iot-base/pom.xml index fb2ce62..e17052a 100644 --- a/iot-common/iot-base/pom.xml +++ b/iot-common/iot-base/pom.xml @@ -30,6 +30,13 @@ 5.8.21 + + + com.alibaba + fastjson + 1.2.83 + compile + org.projectlombok lombok diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/NlpKey.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/NlpKey.java index d5bee46..365727b 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/NlpKey.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/NlpKey.java @@ -1,7 +1,6 @@ package com.qiuguo.iot.base.nlp; import com.qiuguo.iot.base.enums.ChinesePartSpeechEnum; -import io.swagger.models.auth.In; import lombok.Data; import java.math.BigDecimal; diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java index 8cf26ae..984860a 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java @@ -38,7 +38,8 @@ public class LacNlp implements INlp { if (!Objects.equals(res.getInteger("status"), 0)) { throw new RuntimeException(res.getString("info")); } - log.info("res{}", res); + //log.info("", res); + //log.info("res{}", res.toString()); }); } diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/StringUtils.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/StringUtils.java index b0d48dc..2835476 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/StringUtils.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/StringUtils.java @@ -2,7 +2,7 @@ package com.qiuguo.iot.base.utils; import java.util.Random; -public class StringUtils{ +public class StringUtils extends cn.hutool.core.util.StrUtil{ private static final String chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; /** * 获取随机字符串 0-9, a-z, A-Z diff --git a/iot-common/iot-data/pom.xml b/iot-common/iot-data/pom.xml index 72a2896..52e955b 100644 --- a/iot-common/iot-data/pom.xml +++ b/iot-common/iot-data/pom.xml @@ -42,16 +42,19 @@ compile - - org.projectlombok - lombok - + org.hswebframework hsweb-easy-orm-core 4.1.1 compile + + com.qiuguo.iot + iot-base + 0.0.1-SNAPSHOT + compile + ${project.artifactId} diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceAlarmClockRecordService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceAlarmClockRecordService.java index a75f09a..36caf52 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceAlarmClockRecordService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceAlarmClockRecordService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.device; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceAlarmClockRecordEntity; import com.qiuguo.iot.data.request.device.DeviceAlarmClockRecordRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceBatchService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceBatchService.java index bdc3c16..8da1e71 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceBatchService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceBatchService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.device; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceBatchEntity; import com.qiuguo.iot.data.request.device.DeviceBatchRequest; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; +import lombok.extern.slf4j.Slf4j;; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceInfoService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceInfoService.java index f197457..f47d6c3 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceInfoService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceInfoService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.device; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceInfoEntity; import com.qiuguo.iot.data.request.device.DeviceInfoRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceProductFactoryInfoService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceProductFactoryInfoService.java index 1cd5484..3df3736 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceProductFactoryInfoService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceProductFactoryInfoService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.device; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceProductFactoryInfoEntity; import com.qiuguo.iot.data.request.device.DeviceProductFactoryInfoRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java index 0d43b11..6421e5f 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.device; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceUserBindEntity; import com.qiuguo.iot.data.request.device.DeviceUserBindRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserTalkRecordService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserTalkRecordService.java index 0678f1c..3c931fd 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserTalkRecordService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserTalkRecordService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.device; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.device.DeviceUserTalkRecordEntity; import com.qiuguo.iot.data.request.device.DeviceUserTalkRecordRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinActionService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinActionService.java index 289edcf..314f921 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinActionService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinActionService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.operation.OperatinActionEntity; import com.qiuguo.iot.data.request.operation.OperatinActionRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinConditionService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinConditionService.java index 6a9a75e..4ac1340 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinConditionService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinConditionService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.operation.OperatinConditionEntity; import com.qiuguo.iot.data.request.operation.OperatinConditionRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinEventConfigService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinEventConfigService.java index df92e99..7ca2de9 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinEventConfigService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinEventConfigService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.operation.OperatinEventConfigEntity; import com.qiuguo.iot.data.request.operation.OperatinEventConfigRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinModeService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinModeService.java index 0ebc061..10d6d27 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinModeService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinModeService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.operation.OperatinModeEntity; import com.qiuguo.iot.data.request.operation.OperatinModeRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinSceneService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinSceneService.java index a3eaed9..d215a23 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinSceneService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinSceneService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.operation.OperatinSceneEntity; import com.qiuguo.iot.data.request.operation.OperatinSceneRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaRecordService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaRecordService.java index 3c15730..cbd607e 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaRecordService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaRecordService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.ota; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.ota.OtaRecordEntity; import com.qiuguo.iot.data.request.ota.OtaRecordRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaVersionInfoService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaVersionInfoService.java index 0e7a06f..1feaf0e 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaVersionInfoService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaVersionInfoService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.ota; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.ota.OtaVersionInfoEntity; import com.qiuguo.iot.data.request.ota.OtaVersionInfoRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java index 1046eca..f34887b 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.system; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.system.SystemTalkAnswerConfigEntity; import com.qiuguo.iot.data.request.system.SystemTalkAnswerConfigRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdConfigInfoService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdConfigInfoService.java index 456b925..bf73a6e 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdConfigInfoService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdConfigInfoService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.third; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.third.ThirdConfigInfoEntity; import com.qiuguo.iot.data.request.third.ThirdConfigInfoRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdUserBindService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdUserBindService.java index 7d51003..c027d0d 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdUserBindService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdUserBindService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.third; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.third.ThirdUserBindEntity; import com.qiuguo.iot.data.request.third.ThirdUserBindRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/u3d/U3dActionService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/u3d/U3dActionService.java index e832574..360c829 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/u3d/U3dActionService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/u3d/U3dActionService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.u3d; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.u3d.U3dActionEntity; import com.qiuguo.iot.data.request.u3d.U3dActionRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserHomeService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserHomeService.java index c4a0486..e78a771 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserHomeService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserHomeService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.user; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.user.UserHomeEntity; import com.qiuguo.iot.data.request.user.UserHomeRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import java.util.Date; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserRoomService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserRoomService.java index 10db86d..8545767 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserRoomService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserRoomService.java @@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.user; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.user.UserRoomEntity; import com.qiuguo.iot.data.request.user.UserRoomRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import java.util.Date; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; diff --git a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserSuggestionRecordService.java b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserSuggestionRecordService.java index dbc72d4..e427656 100644 --- a/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserSuggestionRecordService.java +++ b/iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserSuggestionRecordService.java @@ -1,10 +1,10 @@ package com.qiuguo.iot.data.service.user; +import com.qiuguo.iot.base.utils.StringUtils; import com.qiuguo.iot.data.entity.user.UserSuggestionRecordEntity; import com.qiuguo.iot.data.request.user.UserSuggestionRecordRequest; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; diff --git a/iot-common/pom.xml b/iot-common/pom.xml index e1715ad..fe1fcb2 100644 --- a/iot-common/pom.xml +++ b/iot-common/pom.xml @@ -22,13 +22,7 @@ UTF-8 ${hswebframework.version} - - - cn.123tool.chen - commons - 1.0.0 - - + \ No newline at end of file diff --git a/iot-modules/iot-box-user-api/pom.xml b/iot-modules/iot-box-user-api/pom.xml index b240751..648f8f8 100644 --- a/iot-modules/iot-box-user-api/pom.xml +++ b/iot-modules/iot-box-user-api/pom.xml @@ -83,11 +83,7 @@ reactor-test test - - cn.123tool.chen - commons - 1.0.0 - + com.qiuguo.iot iot-data diff --git a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java index a4d6c11..673e18a 100644 --- a/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java +++ b/iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java @@ -2,7 +2,6 @@ package com.qiuguo.iot.box.websocket.api.handler; import cn.hutool.crypto.digest.MD5; import com.alibaba.fastjson.JSONObject; -import com.chen.tools.util.StringUtils; import com.qiuguo.iot.base.annotation.WebSocketMapping; import com.qiuguo.iot.base.constans.RedisConstans; import com.qiuguo.iot.box.websocket.api.domain.box.BoxSession; @@ -60,7 +59,7 @@ public class BoxWebSocketHandler implements WebSocketHandler { ReactiveValueOperations operations = reactiveStringRedisTemplate.opsForValue(); // operations.get(RedisConstans.DEVICE_INFO + sn).defaultIfEmpty("").flatMap(s -> { - if(StringUtils.isNotBlank(s)){ + if(com.qiuguo.iot.base.utils.StringUtils.isNotBlank(s)){ try{ DeviceInfoEntity dv = JSONObject.parseObject(s, DeviceInfoEntity.class); return Mono.just(dv); diff --git a/iot-modules/pom.xml b/iot-modules/pom.xml index 34d662f..c8f0317 100644 --- a/iot-modules/pom.xml +++ b/iot-modules/pom.xml @@ -39,12 +39,13 @@ ${redis.boot.reactor.version} - + - org.projectlombok - lombok - ${lombok.version} - provided + org.springframework.boot + spring-boot-starter-actuator + + + diff --git a/pom.xml b/pom.xml index 3ce2306..416ac37 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,11 @@ 3.1.2 test - + + org.projectlombok + lombok + ${lombok.version} +