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/configItemOutbound/controller/ConfigItemOutboundController.java | 71 +++++++++++++++++------------------
1 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java
index 7b898d6..fdc6b4a 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java
@@ -14,9 +14,11 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.configItemOutbound.dto.ConfigItemOutboundDto;
import com.zt.life.modules.configItemOutbound.model.ConfigItemOutbound;
+import com.zt.life.modules.configItemOutbound.model.OutboundConfigItem;
import com.zt.life.modules.configItemOutbound.service.ConfigItemOutboundService;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
+import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
@@ -38,15 +40,18 @@
/**
* config_item_Change
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-27
*/
@RestController
@RequestMapping("/configItemOutbound/ConfigItemOutbound/")
-@Api(tags="config_item_outbound")
+@Api(tags = "config_item_outbound")
public class ConfigItemOutboundController {
@Autowired
private ConfigItemOutboundService configItemOutboundService;
+
+ @Autowired
+ private ProjectService projectService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
@@ -56,47 +61,39 @@
@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<ConfigItemOutbound> 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<ConfigItemOutbound> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
List<ConfigItemOutbound> ConfigItemOutbound = configItemOutboundService.page(queryFilter);
return PageResult.ok(ConfigItemOutbound);
}
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ConfigItemOutboundDto> getDto(Long projectId, Long changeId) {
- ConfigItemOutboundDto data = configItemOutboundService.getDto(projectId, changeId);
- if (changeId!=null) {
- for (WarehouseConfigItem configItem : data.getConfigOutboundList()) {
- Long configItemId = configItem.getId();
- OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
- if (ossDto != null) {
- configItem.setFiles(ossDto);
- }
- }
- }
+ public Result<ConfigItemOutboundDto> getDto(Long projectId, Long outboundId) {
+ ConfigItemOutboundDto data = configItemOutboundService.getDto(projectId, outboundId);
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ConfigItemOutboundDto configItemDto){
+ public Result insert(@RequestBody ConfigItemOutboundDto configItemDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configItemDto, AddGroup.class, DefaultGroup.class);
Map<String, String> map = new HashMap<>();
map.put("funCode", "config_item_Outbound");
- map.put("projectId",configItemDto.getProjectId().toString());
+ map.put("projectId", configItemDto.getProjectId().toString());
configItemDto.getConfigItemOutbound().setCode(sysCodeRuleService.getNewCode(map));
Boolean result = configItemOutboundService.save(configItemDto);
return Result.ok();
@@ -105,7 +102,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ConfigItemOutboundDto configItemDto){
+ public Result update(@RequestBody ConfigItemOutboundDto configItemDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(configItemDto, UpdateGroup.class, DefaultGroup.class);
Boolean result = configItemOutboundService.save(configItemDto);
@@ -116,25 +113,25 @@
@DeleteMapping("deleteConfigOutbound")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
configItemOutboundService.delete(ids);
-
+ projectService.deleteItem(ids,"config_item_outbound_detail","outbound_id");
return Result.ok();
}
- @GetMapping("getItemList")
- @ApiOperation("鑾峰彇鍏ュ簱閰嶇疆椤瑰垪琛�")
- public PageResult<WarehouseConfigItem> getItemList(Long projectId,String ids) {
- String type ="outbound";
- List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId,ids,type);
- return PageResult.ok(resultList);
- }
@GetMapping("exportConfigOutbound")
- @ApiOperation("鎵撳嵃鍙樻洿鐢宠鍗�")
- @LogOperation("鎵撳嵃鍙樻洿鐢宠鍗�")
+ @ApiOperation("鎵撳嵃鍑哄簱鐢宠鍗�")
+ @LogOperation("鎵撳嵃鍑哄簱鐢宠鍗�")
public void exportConfigOutbound(Long id, HttpServletRequest request, HttpServletResponse response) {
- configItemOutboundService.exportConfigOutbound(id,request, response);
+ configItemOutboundService.exportConfigOutbound(id, request, response);
+ }
+
+ @GetMapping("outbound")
+ @ApiOperation("鍑哄簱")
+ @LogOperation("鍑哄簱")
+ public void downloadFiles(HttpServletResponse response, HttpServletRequest request, Long id) {
+ configItemOutboundService.downloadFiles(response, request, id);
}
}
--
Gitblit v1.9.1