From 5d8c028ff37838e0628d5852e41b19efc80e4be1 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 27 十一月 2023 15:09:41 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/controller/ConfigItemWarehouseController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 4ceee48..ba35e36 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
@@ -18,6 +18,8 @@
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
import com.zt.life.sys.dto.OssDto;
+import com.zt.life.sys.service.SysOssConfigService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,7 +29,9 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -43,6 +47,11 @@
@Autowired
private ConfigItemWarehouseService configItemWarehouseService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -63,27 +72,36 @@
@ApiOperation("淇℃伅")
public Result<ConfigItemWarehouseDto> getDto(Long projectId, Long warehouseId) {
ConfigItemWarehouseDto data =configItemWarehouseService.getDto(projectId, warehouseId);
+ if (warehouseId!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(warehouseId, "config_item_warehouse");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ConfigItemWarehouse configItemWarehouse){
+ public Result insert(@RequestBody ConfigItemWarehouseDto configItemDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(configItemWarehouse, AddGroup.class, DefaultGroup.class);
- configItemWarehouseService.insert(configItemWarehouse);
-
+ 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());
+ configItemDto.getConfigItemWarehouse().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = configItemWarehouseService.save(configItemDto);
return Result.ok();
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ConfigItemWarehouse configItemWarehouse){
+ public Result update(@RequestBody ConfigItemWarehouseDto configItemDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(configItemWarehouse, UpdateGroup.class, DefaultGroup.class);
- configItemWarehouseService.update(configItemWarehouse);
+ ValidatorUtils.validateEntity(configItemDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = configItemWarehouseService.save(configItemDto);
return Result.ok();
}
--
Gitblit v1.9.1