From d739559b045aa471cea17b5faf768017c8e9108f Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Thu, 11 Jul 2024 10:54:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91):=20=E6=A0=B9=E6=8D=AE=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=90=8D=E7=A7=B0=E8=8E=B7=E5=8F=96=E5=88=B6?= =?UTF-8?q?=E5=93=81=E5=BA=93=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将制品库详情的JSON字符串转换为JSON对象 --- ...sProductLibraryRepositoriesController.java | 12 +++++ .../domain/PmsProductLibraryRepositories.java | 8 +++ .../PmsProductLibraryRepositoriesDataVo.java | 50 +++++++++++++++++++ ...IPmsProductLibraryRepositoriesService.java | 9 ++++ ...ProductLibraryRepositoriesServiceImpl.java | 7 +++ 5 files changed, 86 insertions(+) create mode 100644 microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java index 9b0edb95b..7802a2741 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryRepositoriesController.java @@ -2,6 +2,7 @@ package com.microservices.pms.productLibrary.controller; import com.microservices.common.core.web.controller.BaseController; import com.microservices.common.core.web.domain.AjaxResult; +import com.microservices.common.core.web.domain.GenericsAjaxResult; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.common.log.annotation.Log; import com.microservices.common.log.enums.BusinessType; @@ -33,6 +34,17 @@ public class PmsProductLibraryRepositoriesController extends BaseController { /** * 查询制品库-仓库列表 */ +// @RequiresPermissions("pms:pmsProductLibraryRepositories:list") + @GetMapping("/byRepoName/{repoName}") + @ApiOperation(value = "获取制品库详情") + public GenericsAjaxResult getByRepoName(@PathVariable String enterpriseIdentifier, + @ApiParam(value = "制品库名称", required = true) @PathVariable String repoName) { + return GenericsAjaxResult.success(pmsProductLibraryRepositoriesService.selectPmsProductLibraryRepositoriesByRepoName(enterpriseIdentifier, repoName)); + } + + /** + * 查询制品库 + */ // @RequiresPermissions("pms:pmsProductLibraryRepositories:list") @GetMapping("/list") @ApiOperation(value = "查询制品库列表") diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java index 8f312e1b2..618484496 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson2.JSONValidator; import com.fasterxml.jackson.annotation.JsonInclude; import com.microservices.common.core.utils.bean.BeanUtils; import com.microservices.common.core.web.domain.BaseEntity; +import com.microservices.pms.productLibrary.domain.vo.PmsProductLibraryRepositoriesDataVo; import com.microservices.pms.productLibrary.domain.vo.PmsProductLibraryRepositoriesSimpleVo; import com.microservices.pms.productLibrary.domain.vo.PmsProductLibrarySimpleVo; import io.swagger.annotations.ApiModel; @@ -93,6 +94,13 @@ public class PmsProductLibraryRepositories extends BaseEntity { @JsonInclude(JsonInclude.Include.NON_EMPTY) private String reservedField2; + public PmsProductLibraryRepositoriesDataVo toPmsProductLibraryRepositoriesDataVo() { + PmsProductLibraryRepositoriesDataVo target = new PmsProductLibraryRepositoriesDataVo(); + BeanUtils.copyProperties(this, target); + target.setAttributes(JSONObject.parseObject(attributes)); + return target; + } + public PmsProductLibraryRepositoriesSimpleVo toPmsProductLibraryRepositoriesSimpleVo() { PmsProductLibraryRepositoriesSimpleVo target = new PmsProductLibraryRepositoriesSimpleVo(); BeanUtils.copyProperties(this, target); diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java new file mode 100644 index 000000000..f3a298863 --- /dev/null +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryRepositoriesDataVo.java @@ -0,0 +1,50 @@ +package com.microservices.pms.productLibrary.domain.vo; + +import com.alibaba.fastjson2.JSONObject; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 制品库数据对象 + * + * @author otto + * @date 2024-07-11 + */ +@Data +@ApiModel("制品库数据对象") +public class PmsProductLibraryRepositoriesDataVo { + + /** + * 制品仓库ID + */ + private Long id; + + /** + * 制品仓库名称 + */ + @ApiModelProperty(value = "制品仓库名称") + private String name; + + /** + * 制品仓库名称类型 + */ + @ApiModelProperty(value = "制品库类型") + private String type; + + @ApiModelProperty(value = "制品库格式") + private String format; + + /** + * 制品仓库访问路径 + */ + @ApiModelProperty(value = "制品仓库访问路径") + private String url; + + + /** + * 其他属性 + */ + @ApiModelProperty(value = "其他属性") + private JSONObject attributes; +} diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java index 277b59c34..86435aa0c 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java @@ -143,4 +143,13 @@ public interface IPmsProductLibraryRepositoriesService { * @return 产品库 */ int deletePmsProductLibraryByName(String enterpriseIdentifier, String name); + + /** + * 根据制品库名称获取制品库详情 + * + * @param enterpriseIdentifier 组织标识 + * @param repoName 制品库名称 + * @return 制品库详情 + */ + PmsProductLibraryRepositoriesDataVo selectPmsProductLibraryRepositoriesByRepoName(String enterpriseIdentifier, String repoName); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java index fa556b577..2cace8052 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java @@ -353,6 +353,13 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr return pmsProductLibraryRepositoriesMapper.deletePmsProductLibraryRepositoriesById(oldRepo.getId()); } + @Override + public PmsProductLibraryRepositoriesDataVo selectPmsProductLibraryRepositoriesByRepoName(String enterpriseIdentifier, String repoName) { + PmsProductLibraryRepositories pmsProductLibraryRepositories = + selectPmsProductLibraryRepositoriesByName(enterpriseIdentifier, repoName); + return pmsProductLibraryRepositories.toPmsProductLibraryRepositoriesDataVo(); + } + @Override public int deletePmsProductLibraryRepositoriesByName(String enterpriseIdentifier, String name) { PmsProductLibraryRepositories oldRepo = selectPmsProductLibraryRepositoriesByName(enterpriseIdentifier, name); From f04cae3d0fffe8f15e3268fbba03706ea0dfb88e Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Thu, 11 Jul 2024 10:55:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E5=88=B6=E5=93=81=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91):=20=E6=A0=B9=E6=8D=AE=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=90=8D=E7=A7=B0=E8=8E=B7=E5=8F=96=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BA=93=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将产品库详情的JSON字符串转换为JSON对象 --- .../controller/PmsProductLibraryController.java | 12 ++++++++++++ .../IPmsProductLibraryRepositoriesService.java | 2 ++ .../PmsProductLibraryRepositoriesServiceImpl.java | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java index 404f1fe2d..a690952a3 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/controller/PmsProductLibraryController.java @@ -2,6 +2,7 @@ package com.microservices.pms.productLibrary.controller; import com.microservices.common.core.web.controller.BaseController; import com.microservices.common.core.web.domain.AjaxResult; +import com.microservices.common.core.web.domain.GenericsAjaxResult; import com.microservices.common.core.web.page.GenericsTableDataInfo; import com.microservices.common.log.annotation.Log; import com.microservices.common.log.enums.BusinessType; @@ -34,6 +35,17 @@ public class PmsProductLibraryController extends BaseController { @Autowired private IPmsProductLibraryComponentService pmsProductLibraryComponentService; + /** + * 查询制品库-仓库列表 + */ +// @RequiresPermissions("pms:pmsProductLibraryRepositories:list") + @GetMapping("/byRepoName/{repoName}") + @ApiOperation(value = "获取产品库详情") + public GenericsAjaxResult getByRepoName(@PathVariable String enterpriseIdentifier, + @ApiParam(value = "产品库名称", required = true) @PathVariable String repoName) { + return GenericsAjaxResult.success(pmsProductLibraryRepositoriesService.selectPmsProductLibraryByRepoName(enterpriseIdentifier, repoName)); + } + /** * 查询产品库列表 */ diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java index 86435aa0c..7c1352e68 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/IPmsProductLibraryRepositoriesService.java @@ -152,4 +152,6 @@ public interface IPmsProductLibraryRepositoriesService { * @return 制品库详情 */ PmsProductLibraryRepositoriesDataVo selectPmsProductLibraryRepositoriesByRepoName(String enterpriseIdentifier, String repoName); + + PmsProductLibraryRepositoriesDataVo selectPmsProductLibraryByRepoName(String enterpriseIdentifier, String repoName); } diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java index 2cace8052..7ee5ef919 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/service/impl/PmsProductLibraryRepositoriesServiceImpl.java @@ -360,6 +360,13 @@ public class PmsProductLibraryRepositoriesServiceImpl implements IPmsProductLibr return pmsProductLibraryRepositories.toPmsProductLibraryRepositoriesDataVo(); } + @Override + public PmsProductLibraryRepositoriesDataVo selectPmsProductLibraryByRepoName(String enterpriseIdentifier, String repoName) { + PmsProductLibraryRepositories pmsProductLibraryRepositories = + selectPmsProductLibraryByName(enterpriseIdentifier, repoName); + return pmsProductLibraryRepositories.toPmsProductLibraryRepositoriesDataVo(); + } + @Override public int deletePmsProductLibraryRepositoriesByName(String enterpriseIdentifier, String name) { PmsProductLibraryRepositories oldRepo = selectPmsProductLibraryRepositoriesByName(enterpriseIdentifier, name);