From 27c0ce50b4d42792090712805a595188231aec5a Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 31 May 2023 18:10:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B9=E7=94=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataCostCorrelationEntity.java | 87 ++++ .../IBasicdataCostCorrelationClient.java | 49 ++ .../vo/BasicdataCostCorrelationVO.java | 35 ++ .../BasicdataCostCorrelationController.java | 150 ++++++ .../BasicdataZonePriceController.java | 2 +- .../dto/BasicdataCostCorrelationDTO.java | 34 ++ .../basicdata/dto/BasicdataZonePriceDTO.java | 5 +- .../excel/BasicdataCostCorrelationExcel.java | 112 +++++ .../feign/BasicdataCostCorrelationClient.java | 53 ++ .../BasicdataCostCorrelationMapper.java | 54 ++ .../mapper/BasicdataCostCorrelationMapper.xml | 37 ++ .../IBasicdataCostCorrelationService.java | 52 ++ .../service/IBasicdataZonePriceService.java | 2 + .../BasicdataCostCorrelationServiceImpl.java | 54 ++ .../impl/BasicdataZonePriceServiceImpl.java | 46 +- doc/dpm/物流租户系统.pdma.json | 463 +++++++++++++++++- 16 files changed, 1228 insertions(+), 7 deletions(-) create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCostCorrelationEntity.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java create mode 100644 blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCostCorrelationVO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCostCorrelationController.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCostCorrelationDTO.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCostCorrelationExcel.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCostCorrelationClient.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.xml create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCostCorrelationService.java create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCostCorrelationServiceImpl.java diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCostCorrelationEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCostCorrelationEntity.java new file mode 100644 index 000000000..59d74ff0c --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCostCorrelationEntity.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.entity; + +import cn.hutool.log.Log; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +/** + * 区域价格费用关联 实体类 + * + * @author cyz + * @since 2023-05-31 + */ +@Data +@TableName("logpm_basicdata_cost_correlation") +@ApiModel(value = "BasicdataCostCorrelation对象", description = "区域价格费用关联") +@EqualsAndHashCode(callSuper = true) +public class BasicdataCostCorrelationEntity extends TenantEntity { + + /** + * 预留1 + */ + @ApiModelProperty(value = "预留1") + private String reserve1; + /** + * 预留2 + */ + @ApiModelProperty(value = "预留2") + private String reserve2; + /** + * 预留3 + */ + @ApiModelProperty(value = "预留3") + private String reserve3; + /** + * 预留4 + */ + @ApiModelProperty(value = "预留4") + private String reserve4; + /** + * 预留5 + */ + @ApiModelProperty(value = "预留5") + private String reserve5; + /** + * 区域价格ID + */ + @ApiModelProperty(value = "区域价格ID") + private Long zonePriceId; + /** + * 编码 + */ + @ApiModelProperty(value = "编码") + private String coding; + /** + * 费用 + */ + @ApiModelProperty(value = "费用") + private BigDecimal ensue; + /** + * 标识 + */ + @ApiModelProperty(value = "标识") + private Integer identification; + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java new file mode 100644 index 000000000..7fcf0d853 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataCostCorrelationClient.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import org.springblade.core.mp.support.BladePage; +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 区域价格费用关联 Feign接口类 + * + * @author cyz + * @since 2023-05-31 + */ +@FeignClient( + value = "blade-basicdataCostCorrelation" +) +public interface IBasicdataCostCorrelationClient { + + String API_PREFIX = "/client"; + String TOP = API_PREFIX + "/top112"; + + /** + * 获取区域价格费用关联列表 + * + * @param current 页号 + * @param size 页数 + * @return BladePage + */ + @GetMapping(TOP) + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); + +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCostCorrelationVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCostCorrelationVO.java new file mode 100644 index 000000000..65a8377b0 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataCostCorrelationVO.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.vo; + +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import org.springblade.core.tool.node.INode; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 区域价格费用关联 视图实体类 + * + * @author cyz + * @since 2023-05-31 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataCostCorrelationVO extends BasicdataCostCorrelationEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCostCorrelationController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCostCorrelationController.java new file mode 100644 index 000000000..b25d01553 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataCostCorrelationController.java @@ -0,0 +1,150 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import javax.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import com.logpm.basicdata.vo.BasicdataCostCorrelationVO; +import com.logpm.basicdata.excel.BasicdataCostCorrelationExcel; +import com.logpm.basicdata.service.IBasicdataCostCorrelationService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import springfox.documentation.annotations.ApiIgnore; +import java.util.Map; +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +/** + * 区域价格费用关联 控制器 + * + * @author cyz + * @since 2023-05-31 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/basicdataCostCorrelation") +@Api(value = "区域价格费用关联", tags = "区域价格费用关联接口") +public class BasicdataCostCorrelationController extends BladeController { + + private final IBasicdataCostCorrelationService basicdataCostCorrelationService; + + /** + * 区域价格费用关联 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入basicdataCostCorrelation") + public R detail(BasicdataCostCorrelationEntity basicdataCostCorrelation) { + BasicdataCostCorrelationEntity detail = basicdataCostCorrelationService.getOne(Condition.getQueryWrapper(basicdataCostCorrelation)); + return R.data(detail); + } + /** + * 区域价格费用关联 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页", notes = "传入basicdataCostCorrelation") + public R> list(@ApiIgnore @RequestParam Map basicdataCostCorrelation, Query query) { + IPage pages = basicdataCostCorrelationService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataCostCorrelation, BasicdataCostCorrelationEntity.class)); + return R.data(pages); + } + + /** + * 区域价格费用关联 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataCostCorrelation") + public R> page(BasicdataCostCorrelationVO basicdataCostCorrelation, Query query) { + IPage pages = basicdataCostCorrelationService.selectBasicdataCostCorrelationPage(Condition.getPage(query), basicdataCostCorrelation); + return R.data(pages); + } + + /** + * 区域价格费用关联 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入basicdataCostCorrelation") + public R save(@Valid @RequestBody BasicdataCostCorrelationEntity basicdataCostCorrelation) { + return R.status(basicdataCostCorrelationService.save(basicdataCostCorrelation)); + } + + /** + * 区域价格费用关联 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入basicdataCostCorrelation") + public R update(@Valid @RequestBody BasicdataCostCorrelationEntity basicdataCostCorrelation) { + return R.status(basicdataCostCorrelationService.updateById(basicdataCostCorrelation)); + } + + /** + * 区域价格费用关联 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "新增或修改", notes = "传入basicdataCostCorrelation") + public R submit(@Valid @RequestBody BasicdataCostCorrelationEntity basicdataCostCorrelation) { + return R.status(basicdataCostCorrelationService.saveOrUpdate(basicdataCostCorrelation)); + } + + /** + * 区域价格费用关联 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(basicdataCostCorrelationService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @GetMapping("/export-basicdataCostCorrelation") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出数据", notes = "传入basicdataCostCorrelation") + public void exportBasicdataCostCorrelation(@ApiIgnore @RequestParam Map basicdataCostCorrelation, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(basicdataCostCorrelation, BasicdataCostCorrelationEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicdataCostCorrelation::getTenantId, bladeUser.getTenantId()); + //} + queryWrapper.lambda().eq(BasicdataCostCorrelationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = basicdataCostCorrelationService.exportBasicdataCostCorrelation(queryWrapper); + ExcelUtil.export(response, "区域价格费用关联数据" + DateUtil.time(), "区域价格费用关联数据表", list, BasicdataCostCorrelationExcel.class); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java index a8d302578..ea423c142 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java @@ -152,7 +152,7 @@ public class BasicdataZonePriceController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(basicdataZonePriceService.deleteLogic(Func.toLongList(ids))); + return R.status(basicdataZonePriceService.deleteLogicList(Func.toLongList(ids))); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCostCorrelationDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCostCorrelationDTO.java new file mode 100644 index 000000000..c72ec8d72 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataCostCorrelationDTO.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.dto; + +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 区域价格费用关联 数据传输对象实体类 + * + * @author cyz + * @since 2023-05-31 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicdataCostCorrelationDTO extends BasicdataCostCorrelationEntity { + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java index a24952b33..3dc5948a1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataZonePriceDTO.java @@ -33,6 +33,7 @@ import java.util.Map; public class BasicdataZonePriceDTO extends BasicdataZonePriceEntity { private static final long serialVersionUID = 1L; - private Map fei; - private Map feishi; + private Map fei; + + private Map feishi; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCostCorrelationExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCostCorrelationExcel.java new file mode 100644 index 000000000..08cdd5509 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataCostCorrelationExcel.java @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serializable; + + +/** + * 区域价格费用关联 Excel实体类 + * + * @author cyz + * @since 2023-05-31 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataCostCorrelationExcel implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("租户号") + private String tenantId; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Integer isDeleted; + /** + * 预留1 + */ + @ColumnWidth(20) + @ExcelProperty("预留1") + private String reserve1; + /** + * 预留2 + */ + @ColumnWidth(20) + @ExcelProperty("预留2") + private String reserve2; + /** + * 预留3 + */ + @ColumnWidth(20) + @ExcelProperty("预留3") + private String reserve3; + /** + * 预留4 + */ + @ColumnWidth(20) + @ExcelProperty("预留4") + private String reserve4; + /** + * 预留5 + */ + @ColumnWidth(20) + @ExcelProperty("预留5") + private String reserve5; + /** + * 区域价格ID + */ + @ColumnWidth(20) + @ExcelProperty("区域价格ID") + private String zonePriceId; + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String coding; + /** + * 费用 + */ + @ColumnWidth(20) + @ExcelProperty("费用") + private BigDecimal ensue; + /** + * 标识 + */ + @ColumnWidth(20) + @ExcelProperty("标识") + private Integer identification; + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCostCorrelationClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCostCorrelationClient.java new file mode 100644 index 000000000..d2d18df37 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataCostCorrelationClient.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.feign; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import com.logpm.basicdata.service.IBasicdataCostCorrelationService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +/** + * 区域价格费用关联 Feign实现类 + * + * @author cyz + * @since 2023-05-31 + */ +@ApiIgnore() +@RestController +@AllArgsConstructor +public class BasicdataCostCorrelationClient implements IBasicdataCostCorrelationClient { + + private final IBasicdataCostCorrelationService basicdataCostCorrelationService; + + @Override + @GetMapping(TOP) + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = basicdataCostCorrelationService.page(Condition.getPage(query)); + return BladePage.of(page); + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.java new file mode 100644 index 000000000..b3fa84782 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.mapper; + +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import com.logpm.basicdata.vo.BasicdataCostCorrelationVO; +import com.logpm.basicdata.excel.BasicdataCostCorrelationExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * 区域价格费用关联 Mapper 接口 + * + * @author cyz + * @since 2023-05-31 + */ +public interface BasicdataCostCorrelationMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page + * @param basicdataCostCorrelation + * @return + */ + List selectBasicdataCostCorrelationPage(IPage page, BasicdataCostCorrelationVO basicdataCostCorrelation); + + + /** + * 获取导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataCostCorrelation(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.xml new file mode 100644 index 000000000..53756431a --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataCostCorrelationMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCostCorrelationService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCostCorrelationService.java new file mode 100644 index 000000000..d5f1a76bc --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataCostCorrelationService.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import com.logpm.basicdata.vo.BasicdataCostCorrelationVO; +import com.logpm.basicdata.excel.BasicdataCostCorrelationExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * 区域价格费用关联 服务类 + * + * @author cyz + * @since 2023-05-31 + */ +public interface IBasicdataCostCorrelationService extends BaseService { + /** + * 自定义分页 + * + * @param page + * @param basicdataCostCorrelation + * @return + */ + IPage selectBasicdataCostCorrelationPage(IPage page, BasicdataCostCorrelationVO basicdataCostCorrelation); + + + /** + * 导出数据 + * + * @param queryWrapper + * @return + */ + List exportBasicdataCostCorrelation(Wrapper queryWrapper); + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java index 7cd47a323..000759d45 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java @@ -58,4 +58,6 @@ public interface IBasicdataZonePriceService extends BaseService pageListName(String name); Boolean ownSaveOrUpdate(BasicdataZonePriceDTO basicdataZonePrice); + + boolean deleteLogicList(List toLongList); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCostCorrelationServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCostCorrelationServiceImpl.java new file mode 100644 index 000000000..da927e74d --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataCostCorrelationServiceImpl.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.basicdata.service.impl; + +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; +import com.logpm.basicdata.vo.BasicdataCostCorrelationVO; +import com.logpm.basicdata.excel.BasicdataCostCorrelationExcel; +import com.logpm.basicdata.mapper.BasicdataCostCorrelationMapper; +import com.logpm.basicdata.service.IBasicdataCostCorrelationService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * 区域价格费用关联 服务实现类 + * + * @author cyz + * @since 2023-05-31 + */ +@Service +public class BasicdataCostCorrelationServiceImpl extends BaseServiceImpl implements IBasicdataCostCorrelationService { + + @Override + public IPage selectBasicdataCostCorrelationPage(IPage page, BasicdataCostCorrelationVO basicdataCostCorrelation) { + return page.setRecords(baseMapper.selectBasicdataCostCorrelationPage(page, basicdataCostCorrelation)); + } + + + @Override + public List exportBasicdataCostCorrelation(Wrapper queryWrapper) { + List basicdataCostCorrelationList = baseMapper.exportBasicdataCostCorrelation(queryWrapper); + //basicdataCostCorrelationList.forEach(basicdataCostCorrelation -> { + // basicdataCostCorrelation.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataCostCorrelation.getType())); + //}); + return basicdataCostCorrelationList; + } + +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java index 25a93ffec..097011218 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java @@ -17,16 +17,26 @@ package com.logpm.basicdata.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.basicdata.dto.BasicdataZonePriceDTO; +import com.logpm.basicdata.entity.BasicdataCostCorrelationEntity; import com.logpm.basicdata.entity.BasicdataZonePriceEntity; +import com.logpm.basicdata.mapper.BasicdataCostCorrelationMapper; +import com.logpm.basicdata.service.IBasicdataCostCorrelationService; +import com.logpm.basicdata.vo.BasicdataCostCorrelationVO; import com.logpm.basicdata.vo.BasicdataZonePriceVO; import com.logpm.basicdata.excel.BasicdataZonePriceExcel; import com.logpm.basicdata.mapper.BasicdataZonePriceMapper; import com.logpm.basicdata.service.IBasicdataZonePriceService; +import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; + +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -37,8 +47,13 @@ import java.util.Map; * @since 2023-05-16 */ @Service +@AllArgsConstructor public class BasicdataZonePriceServiceImpl extends BaseServiceImpl implements IBasicdataZonePriceService { + IBasicdataCostCorrelationService basicdataCostCorrelationService; + BasicdataCostCorrelationMapper basicdataCostCorrelationMapper; + + @Override public IPage selectBasicdataZonePricePage(IPage page, BasicdataZonePriceVO basicdataZonePrice) { return page.setRecords(baseMapper.selectBasicdataZonePricePage(page, basicdataZonePrice)); @@ -73,10 +88,37 @@ public class BasicdataZonePriceServiceImpl extends BaseServiceImpl{ + BasicdataCostCorrelationEntity basicdataCostCorrelationEntity = new BasicdataCostCorrelationEntity(); + basicdataCostCorrelationEntity.setZonePriceId(basicdataZonePrice.getId()); + basicdataCostCorrelationEntity.setCoding(k); + BigDecimal b = new BigDecimal((String)v); + basicdataCostCorrelationEntity.setEnsue(b); + basicdataCostCorrelationService.save(basicdataCostCorrelationEntity); + }); + return true; + }else{ + throw new RuntimeException("ID 不存在"); - - return false; + } // return this.saveOrUpdate(basicdataZonePrice); } + @Override + public boolean deleteLogicList(List toLongList) { + + this.deleteLogic(toLongList); + toLongList.forEach(i ->{ + BasicdataCostCorrelationEntity basicdataCostCorrelationEntity = new BasicdataCostCorrelationVO(); + basicdataCostCorrelationEntity.setIsDeleted(1); + basicdataCostCorrelationMapper.update(basicdataCostCorrelationEntity,Wrappers.query().lambda() + .eq(BasicdataCostCorrelationEntity::getZonePriceId,i) + ); + + }); + return true; + } + } diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 714ba7bf3..539f2f51f 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-3-27 13:32:56", - "updatedTime": "2023-5-29 18:12:52", + "updatedTime": "2023-5-31 14:18:54", "dbConns": [], "profile": { "default": { @@ -32086,6 +32086,464 @@ ], "correlations": [], "indexes": [] + }, + { + "id": "DBCE0044-D0A8-4A92-9E12-5B8BA67EBB92", + "env": { + "base": { + "nameSpace": "", + "codeRoot": "" + } + }, + "defKey": "logpm_basicdata_cost_correlation", + "defName": "区域价格费用关联", + "comment": "", + "properties": { + "partitioned by": "(date string)", + "row format delimited": "", + "fields terminated by ','": "", + "collection items terminated by '-'": "", + "map keys terminated by ':'": "", + "store as textfile;": "" + }, + "nameTemplate": "{defKey}[{defName}]", + "notes": {}, + "headers": [ + { + "refKey": "hideInGraph", + "hideInGraph": true + }, + { + "refKey": "defKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "defName", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "primaryKey", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "notNull", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "autoIncrement", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "domain", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "type", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "len", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "scale", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "comment", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "refDict", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "defaultValue", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "isStandard", + "freeze": false, + "hideInGraph": false + }, + { + "refKey": "uiHint", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "extProps", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr1", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr2", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr3", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr4", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr5", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr6", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr7", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr8", + "freeze": false, + "hideInGraph": true + }, + { + "refKey": "attr9", + "freeze": false, + "hideInGraph": true + } + ], + "fields": [ + { + "defKey": "id", + "defName": "主键", + "comment": "", + "type": "INT", + "len": 20, + "scale": "", + "primaryKey": true, + "notNull": true, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "A584698E-8449-4D6E-82B9-45FD39FE5846" + }, + { + "defKey": "tenant_id", + "defName": "租户号", + "comment": "", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "refDict": "", + "uiHint": "", + "id": "02EDE096-754A-4132-B60C-DBF3C5DFC7D6" + }, + { + "defKey": "create_user", + "defName": "创建人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "0E4C5682-8AB7-453C-886E-AD50E86A4E84" + }, + { + "defKey": "create_time", + "defName": "创建时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "FC075907-2E7F-4848-8DBC-7F61CCD6A218" + }, + { + "defKey": "update_user", + "defName": "更新人", + "comment": "", + "domain": "16120F75-6AA7-4483-868D-F07F511BB081", + "type": "", + "len": 32, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "8054816E-0278-49E3-B01B-61A134BBD721" + }, + { + "defKey": "update_time", + "defName": "更新时间", + "comment": "", + "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "uiHint": "", + "id": "4ADB3040-96EF-48DF-951A-D99B1B4AD5A9" + }, + { + "defKey": "status", + "defName": "状态", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "EAACE593-FBDF-4C21-8089-E9CE0033050A" + }, + { + "defKey": "is_deleted", + "defName": "是否已删除", + "comment": "", + "type": "INT", + "len": 2, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "6E0FE568-BCE2-4767-AB05-12726901E9A8" + }, + { + "defKey": "create_dept", + "defName": "创建部门", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "FD2E81FE-43C4-4DA7-A786-AF4FAF19890C" + }, + { + "defKey": "reserve1", + "defName": "预留1", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "3189AD44-FA38-4D57-92BD-6F90EB1A5336" + }, + { + "defKey": "reserve2", + "defName": "预留2", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "B39E4D96-6E6A-472B-A19C-9A403285D067" + }, + { + "defKey": "reserve3", + "defName": "预留3", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "3479A7E5-9FD0-4EFF-ABA2-9E8017D18ABA" + }, + { + "defKey": "reserve4", + "defName": "预留4", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "91790FCF-0222-4293-89A7-AB4C728F44FA" + }, + { + "defKey": "reserve5", + "defName": "预留5", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": true, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "00B84EC7-53E8-48B0-A6A0-AF8220FE0928" + }, + { + "defKey": "zone_price_id", + "defName": "区域价格ID", + "comment": "", + "type": "VARCHAR", + "len": 50, + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "", + "id": "05226ED3-10B7-456D-B386-EDD5B746A546" + }, + { + "defKey": "coding", + "defName": "编码", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "D6E03EA7-20B1-46D4-8FDD-210519CBB388" + }, + { + "defKey": "ensue", + "defName": "费用", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "C3B1681B-99F9-4818-9E80-DE1652A51D85", + "id": "F8E08857-1E7B-499D-B222-4400ACFBA779" + }, + { + "defKey": "identification", + "defName": "标识", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "240A88FE-0725-4163-AE4B-F6E4EB136D8B" + } + ], + "correlations": [], + "indexes": [] } ], "views": [], @@ -32160,7 +32618,8 @@ "09A85A10-1F9B-4007-8651-BECDA1C3591F", "10ABA95C-6FF2-4FC9-B30A-8A36274E2913", "04EDCF40-2CD5-4B1C-A5DF-404AEE0BECB1", - "93F070B7-CD5F-477C-872E-D4F156C9D25D" + "93F070B7-CD5F-477C-872E-D4F156C9D25D", + "DBCE0044-D0A8-4A92-9E12-5B8BA67EBB92" ], "refViews": [], "refDiagrams": [],