From 0fb3bca338a4095a82125900e016c2acea7202a1 Mon Sep 17 00:00:00 2001 From: yangsb Date: Fri, 26 Apr 2024 14:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9es=E7=B4=A2=E5=BC=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=BA=BA=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cf/imes/framework/es/core/dal/ESDocument.java | 4 ++-- .../es/core/service/ESDocumentServiceImpl.java | 14 +++++++------- .../module/executor/dal/mysql/plan/PlanMapper.java | 1 + script/es/imes-order-plate-model.index | 5 +++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/dal/ESDocument.java b/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/dal/ESDocument.java index 116cd7608..2249999e1 100644 --- a/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/dal/ESDocument.java +++ b/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/dal/ESDocument.java @@ -19,11 +19,11 @@ public class ESDocument { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private String createTime; - private Long creator; + private String creator; @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private String updateTime; - private Long updater; + private String updater; private Long organId; } diff --git a/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/service/ESDocumentServiceImpl.java b/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/service/ESDocumentServiceImpl.java index c4f6bfccb..84f7c22fe 100644 --- a/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/service/ESDocumentServiceImpl.java +++ b/cf-framework/cf-spring-boot-starter-elasticsearch/src/main/java/com/cf/imes/framework/es/core/service/ESDocumentServiceImpl.java @@ -48,8 +48,8 @@ public class ESDocumentServiceImpl implements ESDocumentService { public IndexResponse createByFluentDSL(String idxName, String idxId, ESDocument document) throws Exception { Date date = new Date(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - document.setCreator(loginUser.getId()); - document.setUpdater(loginUser.getId()); + document.setCreator(loginUser.getNickname()); + document.setUpdater(loginUser.getNickname()); document.setOrganId(loginUser.getOrganId()); document.setCreateTime(simpleDateFormat.format(date)); document.setUpdateTime(simpleDateFormat.format(date)); @@ -73,8 +73,8 @@ public class ESDocumentServiceImpl implements ESDocumentService { public IndexResponse createByBuilderPattern(String idxName, String idxId, ESDocument document) throws Exception { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); Date date = new Date(); - document.setCreator(loginUser.getId()); - document.setUpdater(loginUser.getId()); + document.setCreator(loginUser.getNickname()); + document.setUpdater(loginUser.getNickname()); document.setOrganId(loginUser.getOrganId()); document.setCreateTime(simpleDateFormat.format(date)); document.setUpdateTime(simpleDateFormat.format(date)); @@ -142,14 +142,14 @@ public class ESDocumentServiceImpl implements ESDocumentService { if (StrUtil.isBlank(esDocument.getId())) { esDocument.setId(snowflake.nextIdStr()); } - esDocument.setCreator(loginUser.getId()); + esDocument.setCreator(loginUser.getNickname()); esDocument.setCreateTime(simpleDateFormat.format(date)); - esDocument.setUpdater(loginUser.getId()); + esDocument.setUpdater(loginUser.getNickname()); esDocument.setUpdateTime(simpleDateFormat.format(date)); br.operations(op -> op.index(idx -> idx .index(idxName) - .id(esDocument.getId().toString()) + .id(esDocument.getId()) .document(esDocument))); }); return elasticsearchClient.bulk(br.build()); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index d7d5e5e9c..035463c15 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -31,6 +31,7 @@ public interface PlanMapper extends BaseMapperX { .betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PlanDO::getOperator, reqVO.getOperator()) .betweenIfPresent(PlanDO::getProduceTime, reqVO.getProduceTime()) + .orderByAsc(PlanDO::getSort) .orderByDesc(PlanDO::getId)); } diff --git a/script/es/imes-order-plate-model.index b/script/es/imes-order-plate-model.index index 3557b88f7..cf42f7a2b 100644 --- a/script/es/imes-order-plate-model.index +++ b/script/es/imes-order-plate-model.index @@ -1,3 +1,4 @@ +PUT imes_order_plate_model { "settings": {}, "mappings": { @@ -132,7 +133,7 @@ "format": "strict_date_optional_time||yyyy-MM-dd HH:mm:ss||epoch_millis" }, "creator": { - "type": "long" + "type": "keyword" }, "holeDetail": { "properties": { @@ -385,7 +386,7 @@ "format": "strict_date_optional_time||yyyy-MM-dd HH:mm:ss||epoch_millis" }, "updater": { - "type": "long" + "type": "keyword" } } }