From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
index 8f02d55..a6cf7b3 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java
@@ -12,10 +12,12 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.baselineRelease.model.BaselineReleaseRemark;
import com.zt.life.modules.configItemChange.dto.ConfigItemChangeDto;
import com.zt.life.modules.configItemChange.model.ConfigItemChange;
import com.zt.life.modules.configItemChange.service.ConfigItemChangeService;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
+import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
@@ -27,6 +29,8 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,12 +39,12 @@
/**
* config_item_Change
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-27
*/
@RestController
@RequestMapping("/configItemChange/ConfigItemChange/")
-@Api(tags="config_item_Change")
+@Api(tags = "config_item_change")
public class ConfigItemChangeController {
@Autowired
private ConfigItemChangeService configItemChangeService;
@@ -50,28 +54,32 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private WarehouseConfigItemService configItemService;
+
@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<ConfigItemChange> page(@ApiIgnore @QueryParam QueryFilter 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<ConfigItemChange> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
List<ConfigItemChange> configItemChange = configItemChangeService.page(queryFilter);
return PageResult.ok(configItemChange);
}
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ConfigItemChangeDto> getDto(Long projectId, Long ChangeId) {
- ConfigItemChangeDto data = configItemChangeService.getDto(projectId, ChangeId);
- if (ChangeId!=null) {
- for (WarehouseConfigItem configItem : data.getConfigItemList()) {
+ public Result<ConfigItemChangeDto> getDto(Long projectId, Long changeId) {
+ ConfigItemChangeDto data = configItemChangeService.getDto(projectId, changeId);
+ if (changeId != null) {
+ for (WarehouseConfigItem configItem : data.getConfigChangeList()) {
Long configItemId = configItem.getId();
OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
if (ossDto != null) {
@@ -85,12 +93,12 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ConfigItemChangeDto configItemDto){
+ public Result insert(@RequestBody ConfigItemChangeDto configItemDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configItemDto, AddGroup.class, DefaultGroup.class);
Map<String, String> map = new HashMap<>();
map.put("funCode", "config_item_Change");
- map.put("projectId",configItemDto.getProjectId().toString());
+ map.put("projectId", configItemDto.getProjectId().toString());
configItemDto.getConfigItemChange().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = configItemChangeService.save(configItemDto);
return Result.ok();
@@ -99,7 +107,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ConfigItemChangeDto configItemDto){
+ public Result update(@RequestBody ConfigItemChangeDto configItemDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configItemDto, UpdateGroup.class, DefaultGroup.class);
Boolean result = configItemChangeService.save(configItemDto);
@@ -110,12 +118,39 @@
@DeleteMapping("deleteConfigChange")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
configItemChangeService.delete(ids);
-
return Result.ok();
}
+ @GetMapping("getItemList")
+ @ApiOperation("鑾峰彇鍏ュ簱閰嶇疆椤瑰垪琛�")
+ public PageResult<WarehouseConfigItem> getItemList(Long projectId, String ids, String pageCode) {
+ String type = "";
+ if ("demand".equals(pageCode)) {
+ type = "1";
+ } else if ("product".equals(pageCode)) {
+ type = "2";
+ }
+ List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId, ids, type);
+ for (WarehouseConfigItem result : resultList) {
+ if (result.getSelectId() != null) {
+ Long configItemId = result.getSelectId();
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
+ if (ossDto != null) {
+ result.setFiles(ossDto);
+ }
+ }
+ }
+ return PageResult.ok(resultList);
+ }
+
+ @GetMapping("exportConfigChange")
+ @ApiOperation("鎵撳嵃鍙樻洿鐢宠鍗�")
+ @LogOperation("鎵撳嵃鍙樻洿鐢宠鍗�")
+ public void exportConfigChange(Long id, HttpServletRequest request, HttpServletResponse response) {
+ configItemChangeService.exportConfigChange(id, request, response);
+ }
}
--
Gitblit v1.9.1