From 7ae23bdf8792b7f19b35e0f67832923746a7c918 Mon Sep 17 00:00:00 2001 From: yangsb Date: Sun, 7 Apr 2024 15:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E3=80=81?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF=E7=9A=84=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/GetSourceDataReq.java | 11 +- .../executor/dal/mysql/order/OrderMapper.java | 2 +- .../optimizeplan/OptimizePlanServiceImpl.java | 9 +- .../admin/label/LabelController.java | 22 +- .../admin/label/vo/LabelRespVO.java | 7 +- .../admin/label/vo/LabelSaveReqVO.java | 8 +- .../LabelTemplateController.java | 23 +- .../labeltemplate/vo/LabelTemplateRespVO.java | 11 +- .../vo/LabelTemplateSaveReqVO.java | 8 +- .../system/convert/label/LabelConvert.java | 16 -- .../convert/label/LabelConvertImpl.java | 52 ---- .../labletemplate/LabelTemplateConvert.java | 16 -- .../LabelTemplateConvertImpl.java | 76 ------ .../labeltemplate/LabelElementTemplateDO.java | 53 ---- .../labeltemplate/LabelTemplateDO.java | 4 + .../system/dal/dataobject/lable/LabelDO.java | 4 + .../dal/dataobject/lable/LabelElementDO.java | 51 ---- .../dal/mysql/label/LabelElementMapper.java | 25 -- .../LabelElementTemplateMapper.java | 28 -- .../labeltemplate/LabelTemplateService.java | 9 - .../LabelTemplateServiceImpl.java | 234 +---------------- .../system/service/lable/LabelService.java | 11 - .../service/lable/LabelServiceImpl.java | 239 +----------------- 23 files changed, 70 insertions(+), 849 deletions(-) delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java delete mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java index 7e9c89785..888014517 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java @@ -15,10 +15,15 @@ public class GetSourceDataReq { @NotNull(message = "生产单id不能空") private Long orderId; - @Schema(description = "排单id") - private Long planId; - @Schema(description = "数据源id") @NotNull(message = "数据源id不能空") private Long dataSourceId; + + @Schema(description = "排单id") + private Long planId; + + @Schema(description = "包裹id") + private Long packageId; + + } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index 381bcd79a..55a32572f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -89,5 +89,5 @@ public interface OrderMapper extends BaseMapperX { return selectList(wrapper); } - Map selectDynamicSqlString(String sql); + Map selectDynamicSqlString(@Param("sqlStr") String sqlStr); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index ce4be8cba..5aac5d760 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -237,7 +237,14 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Override public Map getLabelDataSourceValue(GetSourceDataReq req) { String sqlStr = dataSourceApi.getSqlById(req.getDataSourceId()).getCheckedData(); - return orderMapper.selectDynamicSqlString(String.format(sqlStr, req.getOrderId())); + String sql = sqlStr.replace("#{orderId}", req.getOrderId() + ""); + if(!Objects.isNull(req.getPackageId())) { + sql = sql.replace("#{packageId}", req.getPackageId() + ""); + } + if(!Objects.isNull(req.getPlanId())) { + sql = sql.replace("#{planId}", req.getPlanId() + ""); + } + return orderMapper.selectDynamicSqlString(sql); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java index 1aaaf0086..d2094fab1 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/LabelController.java @@ -6,12 +6,10 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.excel.core.util.ExcelUtils; import com.cf.imes.framework.operatelog.core.annotations.OperateLog; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelPageReqVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelSaveReqVO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; import com.cf.imes.module.system.service.lable.LabelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -40,7 +38,7 @@ public class LabelController { @PostMapping("/create") @Operation(summary = "创建标签") @PreAuthorize("@ss.hasPermission('system:label:create')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult createLabel(@Valid @RequestBody LabelSaveReqVO createReqVO) { return success(labelService.createLabel(createReqVO)); } @@ -48,7 +46,7 @@ public class LabelController { @PutMapping("/update") @Operation(summary = "更新标签") @PreAuthorize("@ss.hasPermission('system:label:update')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult updateLabel(@Valid @RequestBody LabelSaveReqVO updateReqVO) { labelService.updateLabel(updateReqVO); return success(true); @@ -67,6 +65,7 @@ public class LabelController { @Operation(summary = "获得标签") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:label:query')") + @OperateLog(enable = false) public CommonResult getLabel(@RequestParam("id") Long id) { return success(labelService.getLabel(id)); } @@ -74,6 +73,7 @@ public class LabelController { @GetMapping("/page") @Operation(summary = "获得标签分页") @PreAuthorize("@ss.hasPermission('system:label:query')") + @OperateLog(enable = false) public CommonResult> getLabelPage(@Valid LabelPageReqVO pageReqVO) { PageResult pageResult = labelService.getLabelPage(pageReqVO); return success(BeanUtils.toBean(pageResult, LabelRespVO.class)); @@ -83,13 +83,15 @@ public class LabelController { @Operation(summary = "获得标签列表") @Parameter(name = "type", description = "类型", required = false, example = "1024") @PreAuthorize("@ss.hasPermission('system:label:query')") - public CommonResult> getLabel(@RequestParam("type") String type) { + @OperateLog(enable = false) + public CommonResult> getList(@RequestParam("type") String type) { return success(BeanUtils.toBean(labelService.list(type), LabelRespVO.class)); } @GetMapping("/group-list") @Operation(summary = "获得分组标签列表") @PreAuthorize("@ss.hasPermission('system:label:query')") + @OperateLog(enable = false) public CommonResult>> getGroupList() { return success(labelService.getGroupList()); } @@ -107,14 +109,4 @@ public class LabelController { BeanUtils.toBean(list, LabelRespVO.class)); } - // ==================== 子表（标签元素） ==================== - - @GetMapping("/label-element/list-by-label-id") - @Operation(summary = "获得标签元素列表") - @Parameter(name = "labelId", description = "标签id") - @PreAuthorize("@ss.hasPermission('system:label:query')") - public CommonResult> getLabelElementListByLabelId(@RequestParam("labelId") Long labelId) { - return success(labelService.getLabelElementListByLabelId(labelId)); - } - } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java index 31449baf8..ef07d4bf9 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelRespVO.java @@ -46,7 +46,10 @@ public class LabelRespVO { @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private LocalDateTime createTime; - @Schema(description = "标签元素模板列表") - private List labelElements; + /*@Schema(description = "标签元素模板列表") + private List labelElements;*/ + + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java index 13e3d151d..173d1dd08 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.label.vo; +import co.elastic.clients.elasticsearch.watcher.DeactivateWatchRequest; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -34,7 +35,10 @@ public class LabelSaveReqVO { @NotNull(message = "高度不能为空") private Integer height; - @Schema(description = "标签元素模板列表") - private List elements; + /*@Schema(description = "标签元素模板列表") + private List elements;*/ + + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java index 3117bc22e..2b55d7faa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/LabelTemplateController.java @@ -1,27 +1,21 @@ package com.cf.imes.module.system.controller.admin.labeltemplate; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - import java.util.*; import java.io.IOException; - import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.object.BeanUtils; import static com.cf.imes.framework.common.pojo.CommonResult.success; - import com.cf.imes.framework.excel.core.util.ExcelUtils; - import com.cf.imes.framework.operatelog.core.annotations.OperateLog; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*; - import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.module.system.service.labeltemplate.LabelTemplateService; @@ -41,7 +35,7 @@ public class LabelTemplateController { @PostMapping("/create") @Operation(summary = "创建标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:create')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult createLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO createReqVO) { return success(labelTemplateService.createLabelTemplate(createReqVO)); } @@ -49,7 +43,7 @@ public class LabelTemplateController { @PutMapping("/update") @Operation(summary = "更新标签模板") @PreAuthorize("@ss.hasPermission('system:label-template:update')") - @OperateLog(logArgs = false) + @OperateLog(enable = false) public CommonResult updateLabelTemplate(@Valid @RequestBody LabelTemplateSaveReqVO updateReqVO) { labelTemplateService.updateLabelTemplate(updateReqVO); return success(true); @@ -68,6 +62,7 @@ public class LabelTemplateController { @Operation(summary = "获得标签模板") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult getLabelTemplate(@RequestParam("id") Long id) { return success(labelTemplateService.getLabelTemplate(id)); } @@ -75,6 +70,7 @@ public class LabelTemplateController { @GetMapping("/page") @Operation(summary = "获得标签模板分页") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult> getLabelTemplatePage(@Valid LabelTemplatePageReqVO pageReqVO) { PageResult pageResult = labelTemplateService.getLabelTemplatePage(pageReqVO); return success(BeanUtils.toBean(pageResult, LabelTemplateRespVO.class)); @@ -83,6 +79,7 @@ public class LabelTemplateController { @GetMapping("/group-list") @Operation(summary = "获得分组标签模板列表") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult>> getGroupList() { return success(labelTemplateService.getGroupList()); } @@ -91,6 +88,7 @@ public class LabelTemplateController { @Operation(summary = "获得默认标签模板") @Parameter(name = "type", description = "标签类型", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:label-template:query')") + @OperateLog(enable = false) public CommonResult getDefaultLabelTemplate(@RequestParam("type") String type) { return success(labelTemplateService.getDefaultLabelTemplate(type)); } @@ -108,14 +106,5 @@ public class LabelTemplateController { BeanUtils.toBean(list, LabelTemplateRespVO.class)); } - // ==================== 子表（标签元素模板） ==================== - - @GetMapping("/label-element-template/list-by-label-template-id") - @Operation(summary = "获得标签元素模板列表") - @Parameter(name = "labelTemplateId", description = "标签模板id") - @PreAuthorize("@ss.hasPermission('system:label-template:query')") - public CommonResult> getLabelElementTemplateListByLabelTemplateId(@RequestParam("labelTemplateId") Long labelTemplateId) { - return success(labelTemplateService.getLabelElementTemplateListByLabelTemplateId(labelTemplateId)); - } } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java index 6d53045e4..cb583dc56 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateRespVO.java @@ -1,12 +1,9 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; @@ -47,7 +44,9 @@ public class LabelTemplateRespVO { @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT) private LocalDateTime createTime; - @Schema(description = "标签元素模板列表") - private List labelElementTemplates; + /*@Schema(description = "标签元素模板列表") + private List labelElementTemplates;*/ + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java index be096acb7..3f9e08b79 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelTemplateSaveReqVO.java @@ -1,11 +1,9 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.*; @Schema(description = "管理后台 - 标签模板新增/修改 Request VO") @Data @@ -34,7 +32,9 @@ public class LabelTemplateSaveReqVO { @NotNull(message = "高度不能为空") private Integer height; - @Schema(description = "标签元素模板列表") - private List elements; + /*@Schema(description = "标签元素模板列表") + private List elements;*/ + @Schema(description = "配置") + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java deleted file mode 100644 index df9095219..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.system.convert.label; - -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; - -import java.util.List; - -public interface LabelConvert { - - List convert1 (List labelElementDOS); - - List convert2 (List labelElementRespVOS); - - LabelElementDO convert(LabelElementSaveReqVO vo); -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java deleted file mode 100644 index cb4cbb784..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.cf.imes.module.system.convert.label; - -import com.alibaba.fastjson.JSON; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class LabelConvertImpl implements LabelConvert{ - @Override - public List convert1(List labelElementDOS) { - return labelElementDOS.stream().map( - e-> LabelElementRespVO.builder() - .labelId(e.getLabelId()) - .name(e.getName()) - .id(e.getId()) - .type(e.getType()) - .sourceId(e.getSourceId()) - .propertyDO(JSON.parseObject(e.getConfig())) - .build() - ).collect(Collectors.toList()); - } - - @Override - public List convert2(List labelElementRespVOS) { - return labelElementRespVOS.stream().map(e-> LabelElementDO.builder() - .labelId(e.getLabelId()) - .type(e.getType()) - .name(e.getName()) - .sourceId(e.getSourceId()) - .id(e.getId()) - .config(e.getPropertyDO().toJSONString()) - .build() - ).collect(Collectors.toList()); - } - - @Override - public LabelElementDO convert(LabelElementSaveReqVO vo) { - return LabelElementDO.builder() - .config(vo.getPropertyDO().toJSONString()) - .labelId(vo.getLabelId()) - .type(vo.getType()) - .sourceId(vo.getSourceId()) - .id(vo.getId()) - .name(vo.getName()) - .build(); - } -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java deleted file mode 100644 index d92884514..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.cf.imes.module.system.convert.labletemplate; - -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateRespVO; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import java.util.List; - -public interface LabelTemplateConvert { - - List convert1 (List labelElementTemplateDOS); - - List convert2 (List labelElementTemplateRespVOS); - - LabelElementTemplateDO convert(LabelElementTemplateSaveReqVO vo); - -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java deleted file mode 100644 index d108f5479..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cf.imes.module.system.convert.labletemplate; - -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONObject; -import com.alibaba.fastjson.JSON; -import com.cf.imes.framework.common.util.collection.MapUtils; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateRespVO; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import org.springframework.stereotype.Service; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -/** - * @author Beal - */ -@Service -public class LabelTemplateConvertImpl implements LabelTemplateConvert { - - @Override - public List convert1 (List labelElementTemplateDOS) { - return labelElementTemplateDOS.stream().map(e -> { - /*Gson gson = new Gson(); - Type type = new TypeToken>() { - }.getType();*/ - return LabelElementTemplateRespVO.builder() - .labelTemplateId(e.getLabelTemplateId()) - .id(e.getId()) - .type(e.getType()) - .name(e.getName()) - .propertyDO(JSON.parseObject(e.getConfig())) - // .propertyDO(StrUtil.isBlank(e.getPropertyDO()) ? new HashMap(): gson.fromJson(e.getPropertyDO(), type)) - .sourceId(e.getSourceId()) - .build(); - } - - ).collect(Collectors.toList()); - } - - @Override - public List convert2(List labelElementTemplateRespVOS) { - - return labelElementTemplateRespVOS.stream().map(e-> - LabelElementTemplateDO.builder() - .config(e.getPropertyDO().toJSONString()) - .labelTemplateId(e.getLabelTemplateId()) - .type(e.getType()) - .id(e.getId()) - .name(e.getName()) - .sourceId(e.getSourceId()) - .build() - ).collect(Collectors.toList()); - } - - @Override - public LabelElementTemplateDO convert(LabelElementTemplateSaveReqVO vo) { - return LabelElementTemplateDO.builder() - .name(vo.getName()) - .config(vo.getPropertyDO().toJSONString()) - .labelTemplateId(vo.getLabelTemplateId()) - .sourceId(vo.getSourceId()) - .id(vo.getId()) - .type(vo.getType()) - .build() - ; - } -} diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java deleted file mode 100644 index 26ee407b8..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelElementTemplateDO.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.cf.imes.module.system.dal.dataobject.labeltemplate; - -import com.alibaba.fastjson.JSONObject; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import org.apache.ibatis.type.JdbcType; - -/** - * 标签元素模板 DO - * - * @author 晨丰科技 - */ -@TableName("system_label_element_template") -@KeySequence("system_label_element_template_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LabelElementTemplateDO extends BaseDO { - - /** - * 注释 - */ - @TableId - private Long id; - /** - * 标签模板id - */ - private Long labelTemplateId; - /** - * 标签元素名称 - */ - private String name; - /** - * 元素类型 - */ - private String type; - /** - * 数据源id - */ - private Long sourceId; - /** - * 元素配置 - */ - private String config; - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java index bb1d14434..e9a2f4270 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/labeltemplate/LabelTemplateDO.java @@ -51,5 +51,9 @@ public class LabelTemplateDO extends BaseDO { * 是否默认 */ private Boolean isDefault; + /** + * 配置 + */ + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java index a0a4a7897..87ad61358 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelDO.java @@ -47,5 +47,9 @@ public class LabelDO extends OrganBaseDO { * 高度 */ private Integer height; + /** + * 配置 + */ + private String template; } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java deleted file mode 100644 index 48faa2bb8..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cf.imes.module.system.dal.dataobject.lable; - -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cf.imes.framework.mybatis.core.dataobject.BaseDO; -import com.cf.imes.framework.organ.core.db.OrganBaseDO; -import lombok.*; - -/** - * 标签元素模板 DO - * - * @author 晨丰科技 - */ -@TableName("system_label_element") -@KeySequence("system_label_element_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class LabelElementDO extends OrganBaseDO { - - /** - * 注释 - */ - @TableId - private Long id; - /** - * 标签模板id - */ - private Long labelId; - /** - * 标签元素名称 - */ - private String name; - /** - * 元素类型 - */ - private String type; - /** - * 数据源id - */ - private Long sourceId; - /** - * 元素配置 - */ - private String config; - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java deleted file mode 100644 index 14ddc93b5..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/label/LabelElementMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cf.imes.module.system.dal.mysql.label; - -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 标签元素模板 Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface LabelElementMapper extends BaseMapperX { - - default List selectListByLabelId(Long labelTemplateId) { - return selectList(LabelElementDO::getLabelId, labelTemplateId); - } - - default int deleteByLabelId(Long labelTemplateId) { - return delete(LabelElementDO::getLabelId, labelTemplateId); - } - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java deleted file mode 100644 index 6e2011b80..000000000 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/labeltemplate/LabelElementTemplateMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cf.imes.module.system.dal.mysql.labeltemplate; - -import java.util.*; - -import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 标签元素模板 Mapper - * - * @author 晨丰科技 - */ -@Mapper -public interface LabelElementTemplateMapper extends BaseMapperX { - - default List selectListByLabelTemplateId(Long labelTemplateId) { - return selectList(LabelElementTemplateDO::getLabelTemplateId, labelTemplateId); - } - - default int deleteByLabelTemplateId(Long labelTemplateId) { - return delete(LabelElementTemplateDO::getLabelTemplateId, labelTemplateId); - } - -} \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java index 0b7b697d1..1459f6fb2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateService.java @@ -2,10 +2,8 @@ package com.cf.imes.module.system.service.labeltemplate; import java.util.*; import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.framework.common.pojo.PageParam; import javax.validation.Valid; @@ -56,13 +54,6 @@ public interface LabelTemplateService { // ==================== 子表（标签元素模板） ==================== - /** - * 获得标签元素模板列表 - * - * @param labelTemplateId 标签模板id - * @return 标签元素模板列表 - */ - List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId); Map> getGroupList(); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index a0e46f2e0..623ac8be7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java @@ -1,43 +1,18 @@ package com.cf.imes.module.system.service.labeltemplate; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.elasticsearch._types.FieldValue; -import co.elastic.clients.elasticsearch._types.query_dsl.TermsQuery; -import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; -import co.elastic.clients.elasticsearch.core.SearchResponse; -import co.elastic.clients.elasticsearch.core.search.Hit; -import com.alibaba.fastjson.JSON; -import com.cf.imes.framework.common.exception.ServiceException; -import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.cf.imes.module.system.convert.labletemplate.LabelTemplateConvert; -import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; -import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; -import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelElementTemplateMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import org.springframework.transaction.annotation.Transactional; - -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; - import com.cf.imes.module.system.controller.admin.labeltemplate.vo.*; import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelTemplateDO; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.module.system.dal.mysql.labeltemplate.LabelTemplateMapper; - import javax.annotation.Resource; - -import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.*; @@ -53,140 +28,33 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { @Resource private LabelTemplateMapper labelTemplateMapper; - @Resource - private LabelElementTemplateMapper labelElementTemplateMapper; - @Resource - private ESDocumentService esDocumentService; - @Resource - private ElasticsearchClient elasticsearchClient; - @Resource - private LabelTemplateConvert labelTemplateConvert; - - private static final String LABEL_TEMPLATE_ELEMENT_PROPERTY_INX = "label_template_element_property"; @Override - @Transactional(rollbackFor = Exception.class) public Long createLabelTemplate(LabelTemplateSaveReqVO createReqVO) { // 插入 LabelTemplateDO labelTemplate = BeanUtils.toBean(createReqVO, LabelTemplateDO.class); labelTemplateMapper.insert(labelTemplate); - - // 插入子表 - List createReqVOElements = createReqVO.getElements(); - if(CollectionUtil.isNotEmpty(createReqVOElements)) { - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelTemplateId(labelTemplate.getId()); - LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); - labelElementTemplateMapper.insert(elementTemplateDO); - /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /* try { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - } // 返回 return labelTemplate.getId(); } @Override - @Transactional(rollbackFor = Exception.class) public void updateLabelTemplate(LabelTemplateSaveReqVO updateReqVO) { // 校验存在 validateLabelTemplateExists(updateReqVO.getId()); // 更新 LabelTemplateDO updateObj = BeanUtils.toBean(updateReqVO, LabelTemplateDO.class); labelTemplateMapper.updateById(updateObj); - labelElementTemplateMapper.delete(new LambdaQueryWrapperX().eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId())); - - /* List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX() - .select(LabelElementTemplateDO::getId) - .eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId()));*/ - //删除旧的元素 - /*DeleteByQueryRequest.Builder builder = null; - if(CollectionUtil.isNotEmpty(labelElementTemplateDOS)) { - List templateIds = labelElementTemplateDOS.stream() - .map(LabelElementTemplateDO::getId) - .toList(); - labelElementTemplateMapper.deleteBatchIds(templateIds); - List fieldValues = templateIds.stream().map(FieldValue::of).collect(Collectors.toList()); - builder = new DeleteByQueryRequest.Builder() - .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - }*/ - - - //新增新的元素 - List createReqVOElements = updateReqVO.getElements(); - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelTemplateId(updateObj.getId()); - LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); - //LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); - labelElementTemplateMapper.insert(elementTemplateDO); - /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /*try { - if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } - if(!Objects.isNull(builder)) { - elasticsearchClient.deleteByQuery(builder.build()); - } - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - - - /*updateLabelElementTemplateList(updateReqVO.getId(), Convert.convert(new TypeReference>() { - }, elements));*/ - /* labelElementTemplateMapper.updateBatch(Convert.convert(new TypeReference>() { - }, elements)); - List labelElementPropertyDOS = elements.stream().map(e -> e.getPropertyDO()).collect(Collectors.toList()); - try { - esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - } @Override - @Transactional(rollbackFor = Exception.class) public void deleteLabelTemplate(Long id) { // 校验存在 LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); if (labelTemplateDO == null) { throw exception(LABEL_TEMPLATE_NOT_EXISTS); } - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(id); - /*List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - // 删除索引 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - // 删除标签模板表 labelTemplateMapper.deleteById(id); - // 删除标签元素模板表 - labelElementTemplateMapper.delete(new LambdaQueryWrapperX().eq(LabelElementTemplateDO::getLabelTemplateId, id)); - } private void validateLabelTemplateExists(Long id) { @@ -198,33 +66,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { @Override public LabelTemplateRespVO getLabelTemplate(Long id) { LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - //List labelElementTemplateRespVOS = Convert.convert(new TypeReference>() {}, labelElementTemplateDOS); - //List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - /*List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - SearchResponse searchSetting = null; - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementTemplateRespVO respVO : labelElementTemplateRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - - labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); return labelTemplateRespVO; } @@ -233,67 +75,12 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { return labelTemplateMapper.selectPage(pageReqVO); } - // ==================== 子表（标签元素模板） ==================== - - @Override - public List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId) { - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateId); - List respVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - //List respVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - /* List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .from(0) - .size(10000) - .query(TermsQuery.of(e -> e.field("elementId").terms(t -> t.value(fieldValues)))._toQuery()), - LabelElementPropertyDO.class); - List> hits = response.hits().hits(); - if(CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementTemplateRespVO respVO : respVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - return respVOS; - } @Override public Map> getGroupList() { List labelTemplateDOS = labelTemplateMapper.selectList(); List labelTemplateRespVOS = BeanUtils.toBean(labelTemplateDOS, LabelTemplateRespVO.class); - Set ids = labelTemplateRespVOS.stream().map(e -> e.getId()).collect(Collectors.toSet()); - List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX().in(LabelElementTemplateDO::getLabelTemplateId, ids)); - List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - //List labelElementTemplateRespVOS = Convert.convert(new TypeReference>() {}, labelTemplateDOS); - //List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - /*List fieldValues = labelElementTemplateRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementTemplateRespVO respVO : labelElementTemplateRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - for (LabelTemplateRespVO labelTemplateRespVO : labelTemplateRespVOS) { - labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS.stream().filter(e -> Objects.equals(e.getLabelTemplateId(), labelTemplateRespVO.getId())).toList()); - } - return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(e -> e.getType())); + return labelTemplateRespVOS.stream().collect(Collectors.groupingBy(LabelTemplateRespVO::getType)); } @Override @@ -307,29 +94,10 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { throw exception(DEFAULT_TEMPLATE_COUNT); } LabelTemplateDO labelTemplateDO = labelTemplateDOS.get(0); - List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - List labelElementTemplateRespVOS = labelTemplateConvert.convert1(labelElementTemplateDOS); - labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); return labelTemplateRespVO; } throw exception(DEFAULT_LABEL_NOT_EXISTS); } - private void createLabelElementTemplateList(Long labelTemplateId, List list) { - list.forEach(o -> o.setLabelTemplateId(labelTemplateId)); - labelElementTemplateMapper.insertBatch(list); - } - - private void updateLabelElementTemplateList(Long labelTemplateId, List list) { - deleteLabelElementTemplateByLabelTemplateId(labelTemplateId); - list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新 - createLabelElementTemplateList(labelTemplateId, list); - } - - private void deleteLabelElementTemplateByLabelTemplateId(Long labelTemplateId) { - labelElementTemplateMapper.deleteByLabelTemplateId(labelTemplateId); - } - - } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java index 6ce8f32c2..10e47ff13 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelService.java @@ -1,12 +1,10 @@ package com.cf.imes.module.system.service.lable; import com.cf.imes.framework.common.pojo.PageResult; -import com.cf.imes.module.system.controller.admin.label.vo.LabelElementRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelPageReqVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelRespVO; import com.cf.imes.module.system.controller.admin.label.vo.LabelSaveReqVO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; import javax.validation.Valid; import java.util.List; @@ -57,15 +55,6 @@ public interface LabelService { */ PageResult getLabelPage(LabelPageReqVO pageReqVO); - // ==================== 子表（标签元素模板） ==================== - - /** - * 获得标签元素模板列表 - * - * @param LabelId 标签模板id - * @return 标签元素模板列表 - */ - List getLabelElementListByLabelId(Long LabelId); Map> getGroupList(); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index 07b5e380c..2f4368caa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java @@ -1,40 +1,18 @@ package com.cf.imes.module.system.service.lable; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.lang.TypeReference; -import co.elastic.clients.elasticsearch.ElasticsearchClient; -import co.elastic.clients.elasticsearch._types.FieldValue; -import co.elastic.clients.elasticsearch._types.query_dsl.TermsQuery; -import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest; -import co.elastic.clients.elasticsearch.core.SearchResponse; -import co.elastic.clients.elasticsearch.core.search.Hit; -import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.common.util.object.BeanUtils; -import com.cf.imes.framework.es.core.service.ESDocumentService; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.module.system.controller.admin.label.vo.*; -import com.cf.imes.module.system.controller.admin.labeltemplate.vo.LabelElementTemplateSaveReqVO; -import com.cf.imes.module.system.convert.label.LabelConvert; -import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; -import com.cf.imes.module.system.dal.dataobject.labeltemplate.LabelElementTemplateDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; -import com.cf.imes.module.system.dal.dataobject.lable.LabelElementDO; -import com.cf.imes.module.system.dal.dataobject.machine.CuttingSettingDO; -import com.cf.imes.module.system.dal.mysql.label.LabelElementMapper; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; - import javax.annotation.Resource; -import java.io.IOException; import java.util.*; import java.util.stream.Collectors; - -import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXISTS; @@ -49,46 +27,15 @@ import static com.cf.imes.module.system.enums.ErrorCodeConstants.LABEL_NOT_EXIST public class LabelServiceImpl implements LabelService { @Resource - private LabelMapper LabelMapper; - @Resource - private LabelElementMapper labelElementMapper; - @Resource - private ESDocumentService esDocumentService; - @Resource - private ElasticsearchClient elasticsearchClient; - @Resource - private LabelConvert labelConvert; + private LabelMapper labelMapper; - private static final String LABEL_ELEMENT_PROPERTY_INX = "label_element_property"; @Override @Transactional(rollbackFor = Exception.class) public Long createLabel(LabelSaveReqVO createReqVO) { // 插入 LabelDO Label = BeanUtils.toBean(createReqVO, LabelDO.class); - LabelMapper.insert(Label); - - // 插入子表 - List createReqVOElements = createReqVO.getElements(); - if(CollectionUtil.isNotEmpty(createReqVOElements)) { - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelId(Label.getId()); - //LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); - LabelElementDO elementDO = labelConvert.convert(e); - labelElementMapper.insert(elementDO); - /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(elementDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /* try { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - } + labelMapper.insert(Label); // 返回 return Label.getId(); } @@ -100,217 +47,53 @@ public class LabelServiceImpl implements LabelService { validateLabelExists(updateReqVO.getId()); // 更新 LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class); - LabelMapper.updateById(updateObj); - - labelElementMapper.delete(new LambdaQueryWrapperX().eq(LabelElementDO::getLabelId, updateReqVO.getId())); - - /*List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX() - .select(LabelElementDO::getId) - .eq(LabelElementDO::getLabelId, updateReqVO.getId()));*/ - //删除旧的元素 - /*DeleteByQueryRequest.Builder builder = null; - if(CollectionUtil.isNotEmpty(labelElementDOS)) { - List templateIds = labelElementDOS.stream() - .map(LabelElementDO::getId) - .toList(); - labelElementMapper.deleteBatchIds(templateIds); - *//*List fieldValues = templateIds.stream().map(FieldValue::of).collect(Collectors.toList()); - builder = new DeleteByQueryRequest.Builder() - .index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery());*//* - }*/ - - - //新增新的元素 - List createReqVOElements = updateReqVO.getElements(); - List labelElementPropertyDOS = new ArrayList<>(); - createReqVOElements.forEach(e -> { - e.setLabelId(updateObj.getId()); - LabelElementDO labelElementDO = labelConvert.convert(e); - //LabelElementDO labelElementDO = Convert.convert(LabelElementDO.class, e); - labelElementMapper.insert(labelElementDO); - /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); - propertyDO.setElementId(labelElementDO.getId()); - labelElementPropertyDOS.add(propertyDO);*/ - }); - //插入索引 - /* try { - if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } - if(!Objects.isNull(builder)) { - elasticsearchClient.deleteByQuery(builder.build()); - } - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - - /* List elements = updateReqVO.getElements(); - *//*updateLabelElementList(updateReqVO.getId(), Convert.convert(new TypeReference>() { - }, elements));*//* - labelElementMapper.updateBatch(Convert.convert(new TypeReference>() { - }, elements)); - List labelElementPropertyDOS = elements.stream().map(e -> e.getPropertyDO()).collect(Collectors.toList()); - try { - esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); - } catch (Exception e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - + labelMapper.updateById(updateObj); } @Override @Transactional(rollbackFor = Exception.class) public void deleteLabel(Long id) { // 校验存在 - LabelDO LabelDO = LabelMapper.selectById(id); + LabelDO LabelDO = labelMapper.selectById(id); if (LabelDO == null) { throw exception(LABEL_NOT_EXISTS); } - List labelElementDOS = labelElementMapper.selectListByLabelId(id); - List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - // 删除索引 - DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder() - .index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - try { - elasticsearchClient.deleteByQuery(builder.build()); - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - } // 删除标签模板表 - LabelMapper.deleteById(id); - // 删除标签元素模板表 - labelElementMapper.delete(new LambdaQueryWrapperX().eq(LabelElementDO::getLabelId, id)); + labelMapper.deleteById(id); } private void validateLabelExists(Long id) { - if (LabelMapper.selectById(id) == null) { + if (labelMapper.selectById(id) == null) { throw exception(LABEL_NOT_EXISTS); } } @Override public LabelRespVO getLabel(Long id) { - LabelDO LabelDO = LabelMapper.selectById(id); - List labelElementDOS = labelElementMapper.selectListByLabelId(LabelDO.getId()); + LabelDO LabelDO = labelMapper.selectById(id); LabelRespVO LabelRespVO = BeanUtils.toBean(LabelDO, LabelRespVO.class); - List labelElementRespVOS = labelConvert.convert1(labelElementDOS); - //List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - /* List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - SearchResponse searchSetting = null; - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementRespVO respVO : labelElementRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - - LabelRespVO.setLabelElements(labelElementRespVOS); return LabelRespVO; } @Override public PageResult getLabelPage(LabelPageReqVO pageReqVO) { - return LabelMapper.selectPage(pageReqVO); + return labelMapper.selectPage(pageReqVO); } - // ==================== 子表（标签元素模板） ==================== - @Override - public List getLabelElementListByLabelId(Long LabelId) { - List labelElementDOS = labelElementMapper.selectListByLabelId(LabelId); - List respVOS = labelConvert.convert1(labelElementDOS); - //List respVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - /* List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse response = elasticsearchClient.search(b -> b.index(LABEL_ELEMENT_PROPERTY_INX) - .from(0) - .size(10000) - .query(TermsQuery.of(e -> e.field("elementId").terms(t -> t.value(fieldValues)))._toQuery()), - LabelElementPropertyDO.class); - List> hits = response.hits().hits(); - if(CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementRespVO respVO : respVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - } catch (IOException e) { - log.error(e.getMessage()); - throw exception(INTERNAL_SERVER_ERROR); - }*/ - return respVOS; - } @Override public Map> getGroupList() { - List LabelDOS = LabelMapper.selectList(); + List LabelDOS = labelMapper.selectList(); List LabelRespVOS = BeanUtils.toBean(LabelDOS, LabelRespVO.class); - Set ids = LabelRespVOS.stream().map(e -> e.getId()).collect(Collectors.toSet()); - List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX().in(LabelElementDO::getLabelId, ids)); - List labelElementRespVOS = labelConvert.convert1(labelElementDOS); - //List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - /*List fieldValues = labelElementRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); - try { - SearchResponse search = elasticsearchClient.search(builder -> builder.index(LABEL_ELEMENT_PROPERTY_INX) - .query(TermsQuery.of(e -> e.field("elementId") - .terms(b -> b.value(fieldValues)))._toQuery()) - .from(0) - .size(10000), - LabelElementPropertyDO.class); - List> hits = search.hits().hits(); - if (CollectionUtil.isNotEmpty(hits)) { - List propertyDOS = hits.stream().map(e -> e.source()).collect(Collectors.toList()); - for (LabelElementRespVO respVO : labelElementRespVOS) { - respVO.setPropertyDO(propertyDOS.stream().filter(e -> Objects.equals(e.getElementId(), respVO.getId())).findAny().orElse(null)); - } - } - - } catch (IOException e) { - log.error(e.getMessage()); - throw new ServiceException(INTERNAL_SERVER_ERROR); - }*/ - for (LabelRespVO LabelRespVO : LabelRespVOS) { - LabelRespVO.setLabelElements(labelElementRespVOS.stream().filter(e -> Objects.equals(e.getLabelId(), LabelRespVO.getId())).toList()); - } - return LabelRespVOS.stream().collect(Collectors.groupingBy(e -> e.getType())); + return LabelRespVOS.stream().collect(Collectors.groupingBy(LabelRespVO::getType)); } @Override public List list(String type) { - return LabelMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(LabelDO::getType, type)); + return labelMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(LabelDO::getType, type)); } - private void createLabelElementList(Long LabelId, List list) { - list.forEach(o -> o.setLabelId(LabelId)); - labelElementMapper.insertBatch(list); - } - - private void updateLabelElementList(Long LabelId, List list) { - deleteLabelElementByLabelId(LabelId); - list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下：1）id 冲突；2）updateTime 不更新 - createLabelElementList(LabelId, list); - } - - private void deleteLabelElementByLabelId(Long LabelId) { - labelElementMapper.deleteByLabelId(LabelId); - } } \ No newline at end of file