From 63447fec93e8e562833db30bc848884001b808c4 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 28 十二月 2023 12:13:06 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java
index ad643c8..11525c3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java
@@ -39,12 +39,12 @@
/**
* config_item_warehouse
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-27
*/
@RestController
@RequestMapping("/configItemWarehouse/ConfigItemWarehouse/")
-@Api(tags="config_item_warehouse")
+@Api(tags = "config_item_warehouse")
public class ConfigItemWarehouseController {
@Autowired
private ConfigItemWarehouseService configItemWarehouseService;
@@ -54,28 +54,29 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "閰嶇疆椤瑰叆搴撶紪鍙�", dataType = Constant.QT.STRING, format = "a.code^LK"),
- @ApiImplicitParam(name = "projectCode", value = "椤圭洰缂栧彿", dataType = Constant.QT.STRING, format = "p.code^EQ"),
- @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),
- @ApiImplicitParam(name = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "a.library_type^EQ") })
- public PageResult<ConfigItemWarehouse> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
- List<ConfigItemWarehouse> configItemWarehouse=configItemWarehouseService.page(queryFilter);
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "code", value = "閰嶇疆椤瑰叆搴撶紪鍙�", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "projectCode", value = "椤圭洰缂栧彿", dataType = Constant.QT.STRING, format = "p.code^EQ"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),
+ @ApiImplicitParam(name = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "a.library_type^EQ")})
+ public PageResult<ConfigItemWarehouse> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
+ List<ConfigItemWarehouse> configItemWarehouse = configItemWarehouseService.page(queryFilter);
return PageResult.ok(configItemWarehouse);
}
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ConfigItemWarehouseDto> getDto(Long projectId, Long warehouseId) {
- ConfigItemWarehouseDto data =configItemWarehouseService.getDto(projectId, warehouseId);
- if (warehouseId!=null) {
- for (WarehouseConfigItem configItem : data.getConfigItemList()) {
+ public Result<ConfigItemWarehouseDto> getDto(Long projectId, Long warehouseId, String libraryType) {
+ ConfigItemWarehouseDto data = configItemWarehouseService.getDto(projectId, warehouseId, libraryType);
+ if (warehouseId != null) {
+ for (WarehouseConfigItem configItem : data.getConfigItemList()) {
Long configItemId = configItem.getId();
OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
if (ossDto != null) {
@@ -89,12 +90,12 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ConfigItemWarehouseDto configItemDto){
+ public Result insert(@RequestBody ConfigItemWarehouseDto configItemDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configItemDto, AddGroup.class, DefaultGroup.class);
Map<String, String> map = new HashMap<>();
map.put("funCode", "config_item_warehouse");
- map.put("projectId",configItemDto.getProjectId().toString());
+ map.put("projectId", configItemDto.getProjectId().toString());
configItemDto.getConfigItemWarehouse().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = configItemWarehouseService.save(configItemDto);
return Result.ok();
@@ -103,7 +104,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ConfigItemWarehouseDto configItemDto){
+ public Result update(@RequestBody ConfigItemWarehouseDto configItemDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configItemDto, UpdateGroup.class, DefaultGroup.class);
Boolean result = configItemWarehouseService.save(configItemDto);
@@ -114,18 +115,19 @@
@DeleteMapping("deleteConfigItem")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
configItemWarehouseService.delete(ids);
return Result.ok();
}
+
@GetMapping("exportWarehouseOrder")
@ApiOperation("鎵撳嵃鍏ュ簱鐢宠鍗�")
@LogOperation("鎵撳嵃鍏ュ簱鐢宠鍗�")
- public void exportWarehouseOrder(Long id,HttpServletRequest request, HttpServletResponse response) {
- configItemWarehouseService.exportWarehouseOrder(id,request, response);
+ public void exportWarehouseOrder(Long id, HttpServletRequest request, HttpServletResponse response,String libraryType) {
+ configItemWarehouseService.exportWarehouseOrder(id, request, response,libraryType);
}
}
--
Gitblit v1.9.1