Changes

jinlin

2023-11-20 d99b897011b3d0c2e96b7fa8d21255effe4317f7

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java

@@ -17,6 +17,7 @@
import com.zt.life.modules.project.service.EnvironService;
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;
@@ -26,7 +27,11 @@
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
@@ -45,6 +50,9 @@
    @Autowired
    private SysOssConfigService sysOssConfigService;

    @Autowired
    private SysCodeRuleService sysCodeRuleService;


    @GetMapping("page")
    @ApiOperation("分页")
@@ -61,10 +69,10 @@

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> getDto(Long orderId, Long environId) {
        SoftwareTestOrderDto data = environService.getDto(environId, orderId);
        if (orderId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "environ");
    public Result<SoftwareTestOrderDto> getDto(Long environId, Long  projectId) {
        SoftwareTestOrderDto data = environService.getDto(environId, projectId);
        if (environId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }
@@ -75,26 +83,34 @@
    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody Environ environ) {
    public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
        //效验数据
        ValidatorUtils.validateEntity(environ, AddGroup.class, DefaultGroup.class);
        environService.insert(environ);
        ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class);
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        String year = sdf.format(new Date());
        Map<String, String> map = new HashMap<>();
        map.put("funCode", "environ");
        map.put("year",year);
        softwareTestOrderDto.getEnviron().setYear(year);
        softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
        Boolean result = environService.save(softwareTestOrderDto);

        return Result.ok();
    }


    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody Environ environ) {
    public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
        //效验数据
        ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
        environService.update(environ);
        ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class);
        Boolean result = environService.save(softwareTestOrderDto);

        return Result.ok();
    }

    @DeleteMapping
    @DeleteMapping("deleteEnviron")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids) {
@@ -105,4 +121,14 @@
        return Result.ok();
    }

    @PostMapping("uploadDiagram")
    @ApiOperation("上传测试环境图片")
    @LogOperation("上传测试环境图片")
    public Result uploadDiagram(@RequestBody Long[] ids) {
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        environService.delete(ids);

        return Result.ok();
    }
}