From 60c3154f56573cfbe8b72650c847465e3fe1b1e0 Mon Sep 17 00:00:00 2001 From: wulin Date: Thu, 19 Oct 2023 16:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BB=91=E5=AE=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiuguo/iot/base/utils/ChineseToAlaboUtils.java | 2 ++ .../data/service/device/DeviceUserBindService.java | 11 +---------- .../com/qiuguo/iot/third/nlp/action/ActionTime.java | 4 ++-- .../user/api/controller/device/DeviceController.java | 4 +--- .../websocket/api/handler/BoxWebSocketHandler.java | 2 +- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseToAlaboUtils.java b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseToAlaboUtils.java index b0cd8d9..0bcb39e 100644 --- a/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseToAlaboUtils.java +++ b/iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/ChineseToAlaboUtils.java @@ -51,6 +51,8 @@ public class ChineseToAlaboUtils { put("捌", 8L); put("玖", 9L); put("整", 9L); + put("日", 7L); + put("末", 7L); }}; public static Long getLong(String c){ char[] ch = new char[c.length()]; 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 eba5ddd..11f5baa 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 @@ -9,22 +9,13 @@ import com.qiuguo.iot.data.resp.device.DeviceUserBindResp; import lombok.extern.slf4j.Slf4j; import org.hswebframework.ezorm.core.param.Sort; import org.hswebframework.ezorm.core.param.Term; -import org.hswebframework.ezorm.rdb.executor.wrapper.ListResultWrapper; -import org.hswebframework.ezorm.rdb.executor.wrapper.ResultWrapper; import org.hswebframework.ezorm.rdb.executor.wrapper.ResultWrappers; import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery; import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate; -import org.hswebframework.ezorm.rdb.mapping.events.EventSupportWrapper; -import org.hswebframework.ezorm.rdb.mapping.wrapper.EntityResultWrapper; -import org.hswebframework.ezorm.rdb.metadata.RDBDatabaseMetadata; import org.hswebframework.ezorm.rdb.operator.DatabaseOperator; -import org.hswebframework.ezorm.rdb.operator.DefaultDatabaseOperator; import org.hswebframework.ezorm.rdb.operator.dml.QueryOperator; -import org.hswebframework.ezorm.rdb.operator.dml.delete.DeleteOperator; import org.hswebframework.ezorm.rdb.operator.dml.query.SelectColumn; import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder; -import org.hswebframework.ezorm.rdb.supports.mysql.MysqlDialect; -import org.hswebframework.ezorm.rdb.supports.mysql.MysqlSchemaMetadata; import org.hswebframework.web.api.crud.entity.PagerResult; import org.hswebframework.web.api.crud.entity.QueryParamEntity; import org.hswebframework.web.crud.service.GenericReactiveCrudService; @@ -439,7 +430,7 @@ public class DeviceUserBindService extends GenericReactiveCrudService updateDeviceUserBind(DeviceUserBindEntity deviceUserBindEntity) { + public Mono updateDeviceBindName(DeviceUserBindEntity deviceUserBindEntity) { return createUpdate().set("modify_time", new Date()) .set("bind_name", deviceUserBindEntity.getBindName()) .where("user_id", deviceUserBindEntity.getUserId()) diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java index ea3d503..28c5866 100644 --- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java +++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/nlp/action/ActionTime.java @@ -51,7 +51,7 @@ public class ActionTime { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter df1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - localDateTime = DateEnum.getWithCode(t).getDateTime(localDateTime); + localDateTime = DateEnum.getDateWithCodeAndLocalDateTime(t, localDateTime, 0);//.getDateTime(localDateTime); detailTime = localDateTime; dateTime = localDateTime.format(df); dateDetailTime = localDateTime.format(df1); @@ -63,7 +63,7 @@ public class ActionTime { LocalDateTime localDateTime = LocalDateTime.now(); //localDateTime = DateEnum.getWithCode("国庆").getDateTime(DateEnum.getWithCode("拂晓").getDateTime(localDateTime)); System.out.println(localDateTime.format(df1)); - System.out.println(DateEnum.getDateWithCodeAndLocalDateTime("今晚三点50分4秒", localDateTime, 0).format(df1)); + System.out.println(DateEnum.getDateWithCodeAndLocalDateTime("周日", localDateTime, 0).format(df1)); //System.out.println(DateEnum.getDateWithCodeAndLocalDateTime("下周一", localDateTime, 0).format(df1)); diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java index 3c889e4..39a5e58 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java +++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java @@ -16,7 +16,6 @@ import com.qiuguo.iot.data.request.device.DeviceUserBindRequest; import com.qiuguo.iot.data.request.device.DeviceUserTalkRecordRequest; import com.qiuguo.iot.data.resp.device.DeviceTalkRecordResp; import com.qiuguo.iot.data.resp.device.DeviceUserBindResp; -import com.qiuguo.iot.data.resp.device.DeviceUserTalkRecordResp; import com.qiuguo.iot.data.service.device.DeviceBatchService; import com.qiuguo.iot.data.service.device.DeviceInfoService; import com.qiuguo.iot.data.service.device.DeviceUserBindService; @@ -39,7 +38,6 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; @RestController @Slf4j @@ -210,7 +208,7 @@ public class DeviceController { deviceUserBindEntity.setUserId(bindName.getUserId()); deviceUserBindEntity.setDeviceId(bindName.getDeviceId()); deviceUserBindEntity.setBindName(bindName.getBindName()); - return deviceUserBindService.updateDeviceUserBind(deviceUserBindEntity); + return deviceUserBindService.updateDeviceBindName(deviceUserBindEntity); } 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 210a6fe..2d060fe 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 @@ -272,7 +272,7 @@ public class BoxWebSocketHandler extends BaseWebSocketProcess implements WebSock entity.setIsBind(YesNo.YES.getCode()); return deviceUserBindService.setNoMain(userId, DeviceTypeEnum.GUO_BOX.getCode()).defaultIfEmpty(0).flatMap(m -> { log.info("解除历史isMain标注个数{}", m); - return deviceUserBindService.updateDeviceUserBind(entity).flatMap(i -> { + return deviceUserBindService.updateDeviceUserBindById(entity).flatMap(i -> { return deviceBindSucess(userId, dv, entity); }); });