From a452ecc7a57885c0f438de9b957fd453bb2af354 Mon Sep 17 00:00:00 2001 From: yangsb Date: Thu, 11 Apr 2024 18:02:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86ES=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?mapping=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/es/core/dal/ESDocument.java | 2 -- .../core/service/ESDocumentServiceImpl.java | 20 ++++++------- .../controller/admin/plan/PlanController.java | 19 ++++++++++++ .../service/order/OrderInputProcessor.java | 29 ++++++++++++------- script/es/imes-order-plate-model.index | 28 +++++++++--------- 5 files changed, 62 insertions(+), 36 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 27a68d63b..116cd7608 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 @@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import java.time.LocalDateTime; -import java.util.Date; import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; 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 ead844bd9..c4f6bfccb 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 @@ -37,8 +37,7 @@ public class ESDocumentServiceImpl implements ESDocumentService { private Snowflake snowflake = IdUtil.getSnowflake(); - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ISO_DATE_TIME; - ZoneId utc = ZoneId.of("UTC"); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); public ESDocumentServiceImpl(ElasticsearchClient elasticsearchClient, ElasticsearchAsyncClient elasticsearchAsyncClient) { this.elasticsearchClient = elasticsearchClient; @@ -47,13 +46,13 @@ public class ESDocumentServiceImpl implements ESDocumentService { @Override public IndexResponse createByFluentDSL(String idxName, String idxId, ESDocument document) throws Exception { - LocalDateTime now = LocalDateTime.now(); + Date date = new Date(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); document.setCreator(loginUser.getId()); document.setUpdater(loginUser.getId()); document.setOrganId(loginUser.getOrganId()); - document.setCreateTime((now.atZone(utc).format(dateTimeFormatter))); - document.setUpdateTime((now.atZone(utc).format(dateTimeFormatter))); + document.setCreateTime(simpleDateFormat.format(date)); + document.setUpdateTime(simpleDateFormat.format(date)); if (StrUtil.isBlank(document.getId())) { document.setId(snowflake.nextIdStr()); } @@ -73,12 +72,12 @@ public class ESDocumentServiceImpl implements ESDocumentService { @Override public IndexResponse createByBuilderPattern(String idxName, String idxId, ESDocument document) throws Exception { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); - LocalDateTime now = LocalDateTime.now(); + Date date = new Date(); document.setCreator(loginUser.getId()); document.setUpdater(loginUser.getId()); document.setOrganId(loginUser.getOrganId()); - document.setCreateTime((now.atZone(utc).format(dateTimeFormatter))); - document.setUpdateTime((now.atZone(utc).format(dateTimeFormatter))); + document.setCreateTime(simpleDateFormat.format(date)); + document.setUpdateTime(simpleDateFormat.format(date)); IndexRequest.Builder indexReqBuilder = new IndexRequest.Builder<>(); indexReqBuilder.index(idxName); if (StrUtil.isBlank(idxId)) { @@ -144,9 +143,10 @@ public class ESDocumentServiceImpl implements ESDocumentService { esDocument.setId(snowflake.nextIdStr()); } esDocument.setCreator(loginUser.getId()); - esDocument.setCreateTime(now.atZone(utc).format(dateTimeFormatter)); + esDocument.setCreateTime(simpleDateFormat.format(date)); esDocument.setUpdater(loginUser.getId()); - esDocument.setUpdateTime(now.atZone(utc).format(dateTimeFormatter)); + + esDocument.setUpdateTime(simpleDateFormat.format(date)); br.operations(op -> op.index(idx -> idx .index(idxName) .id(esDocument.getId().toString()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index a5d82da50..331b100fd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java @@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.Operation; import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; +import java.math.BigDecimal; import java.util.*; import java.io.IOException; @@ -163,6 +164,24 @@ public class PlanController { iBoardProdInfo.setBrand("xxx"); iBoardProdInfo.setSpec("xxxx"); iBoardProdInfo.setGoodType(1); + iBoardProdInfo.setWidth((float) 0.0); + iBoardProdInfo.setHeight((float) 0.0); + iBoardProdInfo.setThickness(5.0); + iBoardProdInfo.setSplitWidth(1); + iBoardProdInfo.setSplitHeight(1); + iBoardProdInfo.setSplitThickness(2); + iBoardProdInfo.setSealUp((float) 0.0); + iBoardProdInfo.setSealLeft((float) 0.0); + iBoardProdInfo.setSealRight((float) 0.0); + iBoardProdInfo.setSealDown((float) 0.0); + iBoardProdInfo.setTexture(1); + iBoardProdInfo.setOpenDoorType(1); + iBoardProdInfo.setTypographicFace(1); + detail.setMultiNum(23); + detail.setDepth(10.0); + detail.setHeight(9.0); + detail.getContourDetail().forEach(e->e.setTypographicFace(1)); + detail.getSideModelDetail().forEach(e->e.setTypographicFace(1)); details.add(detail); } orderInputProcessor.input(details, 999L); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java index 9a0c9f4ff..ea6c2c14f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java @@ -1,7 +1,9 @@ package com.cf.imes.module.executor.service.order; import cn.hutool.core.collection.CollectionUtil; +import co.elastic.clients.elasticsearch.core.BulkResponse; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; +import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.util.json.JsonUtils; import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.generator.SnowFlakeGenerator; @@ -199,20 +201,20 @@ public class OrderInputProcessor { .plateNo(e.getIBoardProdInfo().getPlateNo()) //.type(e.getIBoardProdInfo().) .goodsId(rawGoodsDO.getRawGoodsId()) - .height(e.getIBoardProdInfo().getHeight()) - .width(e.getIBoardProdInfo().getWidth()) + .height(new BigDecimal(e.getIBoardProdInfo().getHeight())) + .width(new BigDecimal(e.getIBoardProdInfo().getWidth())) .thickness(new BigDecimal(e.getIBoardProdInfo().getThickness().toString())) - .splitHeight(new BigDecimal(e.getIBoardProdInfo().getSplitHeight().toString())) - .splitWidth(new BigDecimal(e.getIBoardProdInfo().getSplitWidth().toString())) + .splitHeight(new BigDecimal(e.getIBoardProdInfo().getSplitHeight())) + .splitWidth(new BigDecimal(e.getIBoardProdInfo().getSplitWidth())) .splitThickness(new BigDecimal(e.getIBoardProdInfo().getThickness().toString())) - .sealLeft(e.getIBoardProdInfo().getSealLeft()) - .sealRight(e.getIBoardProdInfo().getSealRight()) - .sealUp(e.getIBoardProdInfo().getSealUp()) - .sealDown(e.getIBoardProdInfo().getSealDown()) - .area(e.getIBoardProdInfo().getWidth().multiply(e.getIBoardProdInfo().getHeight())) + .sealLeft(new BigDecimal(e.getIBoardProdInfo().getSealLeft())) + .sealRight(new BigDecimal(e.getIBoardProdInfo().getSealRight())) + .sealUp(new BigDecimal(e.getIBoardProdInfo().getSealUp())) + .sealDown(new BigDecimal(e.getIBoardProdInfo().getSealDown())) + .area(new BigDecimal( String.valueOf(e.getIBoardProdInfo().getWidth())).multiply( new BigDecimal(e.getIBoardProdInfo().getHeight()))) .texture(e.getIBoardProdInfo().getTexture()) .type(0) - .holeFace(e.getHoleDetail().getFaceType()) + .holeFace(0) .holeArrange(0) .unregularPointCount(0) .frontHoleCount(0) @@ -309,7 +311,12 @@ public class OrderInputProcessor { */ public void batchSaveModel(List orderModelDOs) { try { - esDocumentService.bulkCreate(ORDER_PLATE_MODEL, orderModelDOs); + BulkResponse bulkResponse = esDocumentService.bulkCreate(ORDER_PLATE_MODEL, orderModelDOs); + boolean errors = bulkResponse.errors(); + if(errors) { + log.error(bulkResponse.items().toString()); + throw new ServiceException(500,"未知异常"); + } } catch (Exception e) { e.printStackTrace(); log.error(e.getMessage()); diff --git a/script/es/imes-order-plate-model.index b/script/es/imes-order-plate-model.index index b84ac8e31..3557b88f7 100644 --- a/script/es/imes-order-plate-model.index +++ b/script/es/imes-order-plate-model.index @@ -5,7 +5,7 @@ "contourDetail": { "properties": { "depth": { - "type": "short" + "type": "integer" }, "knifeName": { "type": "keyword" @@ -28,7 +28,7 @@ "type": "float" }, "faceType": { - "type": "short" + "type": "integer" }, "name": { "type": "keyword" @@ -53,7 +53,7 @@ "type": "float" }, "dir": { - "type": "short" + "type": "integer" }, "holes": { "properties": { @@ -73,7 +73,7 @@ } }, "knifeRadius": { - "type": "short" + "type": "integer" }, "outline": { "properties": { @@ -93,7 +93,7 @@ } }, "thickness": { - "type": "short" + "type": "integer" } } }, @@ -123,12 +123,13 @@ } }, "typographicFace": { - "type": "short" + "type": "integer" } } }, "createTime": { - "type": "date" + "type": "date", + "format": "strict_date_optional_time||yyyy-MM-dd HH:mm:ss||epoch_millis" }, "creator": { "type": "long" @@ -145,13 +146,13 @@ "type": "float" }, "faceType": { - "type": "short" + "type": "integer" }, "holeId": { "type": "long" }, "holeType": { - "type": "short" + "type": "integer" }, "pointX": { "type": "float" @@ -226,13 +227,13 @@ "type": "float" }, "faceType": { - "type": "short" + "type": "integer" }, "holeId": { "type": "long" }, "holeType": { - "type": "short" + "type": "integer" }, "pointX": { "type": "float" @@ -280,7 +281,7 @@ "type": "float" }, "faceType": { - "type": "short" + "type": "integer" }, "name": { "type": "keyword" @@ -380,7 +381,8 @@ } }, "updateTime": { - "type": "date" + "type": "date", + "format": "strict_date_optional_time||yyyy-MM-dd HH:mm:ss||epoch_millis" }, "updater": { "type": "long"