From 4b70938da81dd3f1014b3b82e4aef512c860cb8a Mon Sep 17 00:00:00 2001 From: yangsb Date: Tue, 2 Apr 2024 14:59:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C2.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=A0=87=E7=AD=BE=E3=80=81=E6=A0=87=E7=AD=BE=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E9=85=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/DataSourceController.java | 9 ++- .../admin/label/vo/LabelElementRespVO.java | 11 ++- .../admin/label/vo/LabelElementSaveReqVO.java | 5 +- .../vo/LabelElementTemplateRespVO.java | 15 +++- .../vo/LabelElementTemplateSaveReqVO.java | 10 ++- .../admin/machine/MachineAuthController.java | 10 ++- .../admin/machine/vo/TemplateAutoResp.java | 8 +- .../admin/organ/OrganController.java | 11 +++ .../system/convert/label/LabelConvert.java | 16 ++++ .../convert/label/LabelConvertImpl.java | 52 +++++++++++++ .../labletemplate/LabelTemplateConvert.java | 16 ++++ .../LabelTemplateConvertImpl.java | 77 +++++++++++++++++++ .../labeltemplate/LabelElementTemplateDO.java | 6 ++ .../dal/dataobject/lable/LabelElementDO.java | 4 + .../mysql/datasource/DataSourceMapper.java | 1 + .../service/datasource/DataSourceService.java | 2 + .../datasource/DataSourceServiceImpl.java | 5 ++ .../LabelTemplateServiceImpl.java | 61 +++++++++------ .../service/lable/LabelServiceImpl.java | 60 +++++++++------ .../system/service/organ/OrganService.java | 3 + .../service/organ/OrganServiceImpl.java | 11 +++ .../mapper/process/DataSourceMapper.xml | 23 ++++++ .../mapper/process/MachineTemplateMapper.xml | 2 +- 23 files changed, 358 insertions(+), 60 deletions(-) create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java create mode 100644 cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java index b9678d428..1eb6a5633 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java @@ -82,11 +82,12 @@ public class DataSourceController { @GetMapping("/list") @Operation(summary = "获得系统数据源列表") - @Parameter(name = "type", description = "类型", required = false) @PreAuthorize("@ss.hasPermission('system:data-source:query')") - public CommonResult> list( @RequestParam(value = "type", required = false) Integer type) { - List list = dataSourceService.list(type); - return success(BeanUtils.toBean(list, DataSourceRespVO.class)); + public CommonResult> list( ) { + return success(dataSourceService.list()); + + /*List list = + return success(BeanUtils.toBean(list, DataSourceRespVO.class));*/ } @GetMapping("/export-excel") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java index 2a06f2a56..341693176 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementRespVO.java @@ -1,10 +1,17 @@ package com.cf.imes.module.system.controller.admin.label.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class LabelElementRespVO { @Schema(description = "主键") @@ -17,6 +24,8 @@ public class LabelElementRespVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java index 7e8c5be07..0b71ea7ed 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/label/vo/LabelElementSaveReqVO.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.label.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -19,6 +20,8 @@ public class LabelElementSaveReqVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java index 7ad8da3aa..b2ef20a14 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateRespVO.java @@ -1,10 +1,19 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class LabelElementTemplateRespVO { @Schema(description = "主键") @@ -17,6 +26,10 @@ public class LabelElementTemplateRespVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ + /*@Schema(description = "标签元素属性") + private Map propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java index 4a851c3c2..d0b53d881 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/labeltemplate/vo/LabelElementTemplateSaveReqVO.java @@ -1,9 +1,12 @@ package com.cf.imes.module.system.controller.admin.labeltemplate.vo; +import com.alibaba.fastjson.JSONObject; import com.cf.imes.module.system.dal.dataobject.labelelementproperty.LabelElementPropertyDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.Map; + /** * @author there */ @@ -19,6 +22,11 @@ public class LabelElementTemplateSaveReqVO { private String type; @Schema(description = "数据源id") private Long sourceId; + /*@Schema(description = "标签元素属性") + private LabelElementPropertyDO propertyDO;*/ + /*@Schema(description = "标签元素属性") + + private Map propertyDO;*/ @Schema(description = "标签元素属性") - private LabelElementPropertyDO propertyDO; + private JSONObject propertyDO; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java index 7ac1d82a5..0b4242bf2 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; import static com.cf.imes.framework.common.pojo.CommonResult.success; @@ -55,7 +56,14 @@ public class MachineAuthController { @PreAuthorize("@ss.hasPermission('machine-template::query')") public CommonResult> pageTemplateAuth(MachinePageReqVO pageParam) { PageResult page = machineTemplateService.page(pageParam); - List list = BeanUtils.toBean(page.getList(), TemplateAutoResp.class); + List list = page.getList().stream().map(e->TemplateAutoResp.builder() + .id(e.getId()) + .machineType(e.getMachineType()) + .templateName(e.getName()) + .isDefault(e.getIsDefault()) + .build() + ).collect(Collectors.toList()); + return success(new PageResult(list, page.getTotal())); } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java index 3a01e3bab..fc355bf43 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/TemplateAutoResp.java @@ -2,12 +2,18 @@ package com.cf.imes.module.system.controller.admin.machine.vo; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * @author Beal */ @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor public class TemplateAutoResp { @Schema(description = "机台模板id") private Long id; @@ -15,7 +21,7 @@ public class TemplateAutoResp { * 名称 */ @Schema(description = "机台模板名称") - private String name; + private String templateName; /** * 1机台设备 2CNC设备 */ diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java index 02fc4c207..d4140754d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/organ/OrganController.java @@ -1,5 +1,6 @@ package com.cf.imes.module.system.controller.admin.organ; +import com.cf.imes.framework.common.enums.CommonStatusEnum; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.pojo.PageResult; @@ -25,8 +26,10 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.util.List; +import java.util.Map; import static com.cf.imes.framework.common.pojo.CommonResult.success; +import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertList; import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @Tag(name = "管理后台 - 组织") @@ -109,4 +112,12 @@ public class OrganController { BeanUtils.toBean(list, OrganRespVO.class)); } + + @GetMapping({"/list-all-simple", "/simple-list"}) + @Operation(summary = "获取组织精简信息列表", description = "主要用于前端的下拉选项") + @Parameter(name = "name", description = "组织名称", required = false, example = "xxx") + public CommonResult> getSimpleOrganList(@RequestParam(required = false, value = "name") String name) { + return success(organService.getSimpleOrganList(name)); + } + } 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 new file mode 100644 index 000000000..df9095219 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvert.java @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000..cb4cbb784 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/label/LabelConvertImpl.java @@ -0,0 +1,52 @@ +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 new file mode 100644 index 000000000..d92884514 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvert.java @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000..423ff1c8a --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/convert/labletemplate/LabelTemplateConvertImpl.java @@ -0,0 +1,77 @@ +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)) + //{extra=, x=100, y=100, width=100, height=100, value=, html=, isRepeat=false, borderWidth=1, fontSize=1, divHeight=1, colNum=1, enableSourceExpress=false, sourceExpress=, visible=true, isScrapBlock=false, visibleExpression=, isVertical=false, dataText=, dataExpression=, displayType=1, barcodeType=, fontWeight=1, fontFamily=, textAlign=, textBaseline=, qrcodeErrorRate=, showSideHole=false} + .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 index e588d8b5b..26ee407b8 100644 --- 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 @@ -1,11 +1,13 @@ 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 @@ -43,5 +45,9 @@ public class LabelElementTemplateDO extends BaseDO { * 数据源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/lable/LabelElementDO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/dataobject/lable/LabelElementDO.java index ce660f568..48faa2bb8 100644 --- 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 @@ -43,5 +43,9 @@ public class LabelElementDO extends OrganBaseDO { * 数据源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/datasource/DataSourceMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java index dbc007c5c..098e7dc7a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/datasource/DataSourceMapper.java @@ -26,4 +26,5 @@ public interface DataSourceMapper extends BaseMapperX { .orderByDesc(DataSourceDO::getId)); } + List selectListVO(); } \ 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/datasource/DataSourceService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java index 357191da4..ef479826c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceService.java @@ -54,4 +54,6 @@ public interface DataSourceService { PageResult getDataSourcePage(DataSourcePageReqVO pageReqVO); List list(Integer type); + + List list(); } \ 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/datasource/DataSourceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java index 71b84518d..1cb9c58cf 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/datasource/DataSourceServiceImpl.java @@ -75,4 +75,9 @@ public class DataSourceServiceImpl implements DataSourceService { return dataSourceMapper.selectList(new LambdaQueryWrapperX().eqIfPresent(DataSourceDO::getType, type)); } + @Override + public List list() { + return dataSourceMapper.selectListVO(); + } + } \ 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/LabelTemplateServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/labeltemplate/LabelTemplateServiceImpl.java index 9e189d2cb..7f9d729ae 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 @@ -3,15 +3,19 @@ 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; @@ -55,6 +59,8 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { private ESDocumentService esDocumentService; @Resource private ElasticsearchClient elasticsearchClient; + @Resource + private LabelTemplateConvert labelTemplateConvert; private static final String LABEL_TEMPLATE_ELEMENT_PROPERTY_INX = "label_template_element_property"; @@ -71,19 +77,19 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelTemplateId(labelTemplate.getId()); - LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); + LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); labelElementTemplateMapper.insert(elementTemplateDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /* try { esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ } // 返回 return labelTemplate.getId(); @@ -97,12 +103,13 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { // 更新 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() + /* List labelElementTemplateDOS = labelElementTemplateMapper.selectList(new LambdaQueryWrapperX() .select(LabelElementTemplateDO::getId) - .eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId())); + .eq(LabelElementTemplateDO::getLabelTemplateId, updateReqVO.getId()));*/ //删除旧的元素 - DeleteByQueryRequest.Builder builder = null; + /*DeleteByQueryRequest.Builder builder = null; if(CollectionUtil.isNotEmpty(labelElementTemplateDOS)) { List templateIds = labelElementTemplateDOS.stream() .map(LabelElementTemplateDO::getId) @@ -112,7 +119,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { builder = new DeleteByQueryRequest.Builder() .index(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX) .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery()); - } + }*/ //新增新的元素 @@ -120,14 +127,15 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelTemplateId(updateObj.getId()); - LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); + LabelElementTemplateDO elementTemplateDO = labelTemplateConvert.convert(e); + //LabelElementTemplateDO elementTemplateDO = Convert.convert(LabelElementTemplateDO.class, e); labelElementTemplateMapper.insert(elementTemplateDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /*LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(elementTemplateDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /*try { if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { esDocumentService.bulkCreate(LABEL_TEMPLATE_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } @@ -137,7 +145,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ /*updateLabelElementTemplateList(updateReqVO.getId(), Convert.convert(new TypeReference>() { @@ -163,7 +171,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { throw exception(LABEL_TEMPLATE_NOT_EXISTS); } List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(id); - List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + /*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) @@ -173,7 +181,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ // 删除标签模板表 labelTemplateMapper.deleteById(id); // 删除标签元素模板表 @@ -192,8 +200,10 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { LabelTemplateDO labelTemplateDO = labelTemplateMapper.selectById(id); List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateDO.getId()); LabelTemplateRespVO labelTemplateRespVO = BeanUtils.toBean(labelTemplateDO, LabelTemplateRespVO.class); - List labelElementTemplateRespVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + 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) @@ -212,7 +222,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ labelTemplateRespVO.setLabelElementTemplates(labelElementTemplateRespVOS); return labelTemplateRespVO; @@ -229,7 +239,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { public List getLabelElementTemplateListByLabelTemplateId(Long labelTemplateId) { List labelElementTemplateDOS = labelElementTemplateMapper.selectListByLabelTemplateId(labelTemplateId); List respVOS = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - List fieldValues = labelElementTemplateDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + /* 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) @@ -246,7 +256,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ return respVOS; } @@ -256,8 +266,10 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { 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 = BeanUtils.toBean(labelElementTemplateDOS, LabelElementTemplateRespVO.class); - List fieldValues = labelElementTemplateRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + 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") @@ -276,7 +288,7 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { } 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()); } @@ -298,4 +310,5 @@ public class LabelTemplateServiceImpl implements LabelTemplateService { 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/LabelServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/lable/LabelServiceImpl.java index b7cc29423..07b5e380c 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 @@ -16,6 +16,7 @@ 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; @@ -55,6 +56,8 @@ public class LabelServiceImpl implements LabelService { private ESDocumentService esDocumentService; @Resource private ElasticsearchClient elasticsearchClient; + @Resource + private LabelConvert labelConvert; private static final String LABEL_ELEMENT_PROPERTY_INX = "label_element_property"; @@ -71,19 +74,20 @@ public class LabelServiceImpl implements LabelService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelId(Label.getId()); - LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); + //LabelElementDO elementDO = Convert.convert(LabelElementDO.class, e); + LabelElementDO elementDO = labelConvert.convert(e); labelElementMapper.insert(elementDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(elementDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /* try { esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ } // 返回 return Label.getId(); @@ -98,21 +102,23 @@ public class LabelServiceImpl implements LabelService { LabelDO updateObj = BeanUtils.toBean(updateReqVO, LabelDO.class); LabelMapper.updateById(updateObj); - List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX() + labelElementMapper.delete(new LambdaQueryWrapperX().eq(LabelElementDO::getLabelId, updateReqVO.getId())); + + /*List labelElementDOS = labelElementMapper.selectList(new LambdaQueryWrapperX() .select(LabelElementDO::getId) - .eq(LabelElementDO::getLabelId, updateReqVO.getId())); + .eq(LabelElementDO::getLabelId, updateReqVO.getId()));*/ //删除旧的元素 - DeleteByQueryRequest.Builder builder = null; + /*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()); + *//*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()); - } + .query(TermsQuery.of(e -> e.field("elementId").terms(b -> b.value(fieldValues)))._toQuery());*//* + }*/ //新增新的元素 @@ -120,14 +126,15 @@ public class LabelServiceImpl implements LabelService { List labelElementPropertyDOS = new ArrayList<>(); createReqVOElements.forEach(e -> { e.setLabelId(updateObj.getId()); - LabelElementDO labelElementDO = Convert.convert(LabelElementDO.class, e); + LabelElementDO labelElementDO = labelConvert.convert(e); + //LabelElementDO labelElementDO = Convert.convert(LabelElementDO.class, e); labelElementMapper.insert(labelElementDO); - LabelElementPropertyDO propertyDO = e.getPropertyDO(); + /* LabelElementPropertyDO propertyDO = e.getPropertyDO(); propertyDO.setElementId(labelElementDO.getId()); - labelElementPropertyDOS.add(propertyDO); + labelElementPropertyDOS.add(propertyDO);*/ }); //插入索引 - try { + /* try { if(CollectionUtil.isNotEmpty(labelElementPropertyDOS)) { esDocumentService.bulkCreate(LABEL_ELEMENT_PROPERTY_INX, labelElementPropertyDOS); } @@ -137,7 +144,7 @@ public class LabelServiceImpl implements LabelService { } catch (Exception e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ /* List elements = updateReqVO.getElements(); *//*updateLabelElementList(updateReqVO.getId(), Convert.convert(new TypeReference>() { @@ -192,8 +199,9 @@ public class LabelServiceImpl implements LabelService { LabelDO LabelDO = LabelMapper.selectById(id); List labelElementDOS = labelElementMapper.selectListByLabelId(LabelDO.getId()); LabelRespVO LabelRespVO = BeanUtils.toBean(LabelDO, LabelRespVO.class); - List labelElementRespVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + 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) @@ -212,7 +220,7 @@ public class LabelServiceImpl implements LabelService { } catch (IOException e) { log.error(e.getMessage()); throw new ServiceException(INTERNAL_SERVER_ERROR); - } + }*/ LabelRespVO.setLabelElements(labelElementRespVOS); return LabelRespVO; @@ -228,8 +236,9 @@ public class LabelServiceImpl implements LabelService { @Override public List getLabelElementListByLabelId(Long LabelId) { List labelElementDOS = labelElementMapper.selectListByLabelId(LabelId); - List respVOS = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - List fieldValues = labelElementDOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + 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) @@ -246,7 +255,7 @@ public class LabelServiceImpl implements LabelService { } catch (IOException e) { log.error(e.getMessage()); throw exception(INTERNAL_SERVER_ERROR); - } + }*/ return respVOS; } @@ -256,8 +265,9 @@ public class LabelServiceImpl implements LabelService { 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 = BeanUtils.toBean(labelElementDOS, LabelElementRespVO.class); - List fieldValues = labelElementRespVOS.stream().map(e -> FieldValue.of(e.getId())).collect(Collectors.toList()); + 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") @@ -276,7 +286,7 @@ public class LabelServiceImpl implements LabelService { } 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()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java index bfd3080e9..5d4190d55 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java @@ -4,6 +4,8 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSaveReqVO; +import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO; +import com.cf.imes.module.system.controller.admin.user.vo.user.UserSimpleRespVO; import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO; import com.cf.imes.module.system.service.organ.handler.OrganInfoHandler; import com.cf.imes.module.system.service.organ.handler.OrganMenuHandler; @@ -127,4 +129,5 @@ public interface OrganService { */ void validOrgan(Long id); + List getSimpleOrganList(String name); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index b81752091..292889911 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -10,13 +10,16 @@ import com.cf.imes.framework.common.util.collection.CollectionUtils; import com.cf.imes.framework.common.util.date.DateUtils; import com.cf.imes.framework.common.util.object.BeanUtils; import com.cf.imes.framework.common.util.pinyin.PinYinUtils; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.organ.config.OrganProperties; import com.cf.imes.framework.organ.core.context.OrganContextHolder; import com.cf.imes.framework.organ.core.util.OrganUtils; +import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSimpleRespVO; import com.cf.imes.module.system.controller.admin.permission.vo.role.RoleSaveReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganSaveReqVO; import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO; +import com.cf.imes.module.system.controller.admin.user.vo.user.UserSimpleRespVO; import com.cf.imes.module.system.convert.organ.OrganConvert; import com.cf.imes.module.system.dal.dataobject.permission.MenuDO; import com.cf.imes.module.system.dal.dataobject.permission.RoleDO; @@ -96,6 +99,14 @@ public class OrganServiceImpl implements OrganService { } } + @Override + public List getSimpleOrganList(String name) { + List organizationDOS = organMapper.selectList(new LambdaQueryWrapperX() + .likeIfPresent(OrganizationDO::getName, name) + .select(OrganizationDO::getId, OrganizationDO::getName)); + return BeanUtils.toBean(organizationDOS, OrganSimpleRespVO.class); + } + @Override @DSTransactional // 多数据源，使用 @DSTransactional 保证本地事务，以及数据源的切换 public Long createOrgan(OrganSaveReqVO createReqVO) { diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml new file mode 100644 index 000000000..cb81e1ca9 --- /dev/null +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/DataSourceMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml index e0c8d77aa..40ef4e568 100644 --- a/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml +++ b/cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/MachineTemplateMapper.xml @@ -95,7 +95,7 @@ - select * from ( select a.id as organId, a.name as organName, max(b.create_time) as updateTime, case when ('${vo.templateName}' != '') then '${vo.templateName}' else '' end as templateName