Changes

jinlin

2023-11-22 906df84cc340d514b8890527e52ac23170a022ca

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

@@ -12,7 +12,7 @@
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.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.dto.EnvironDto;
import com.zt.life.modules.project.model.Environ;
import com.zt.life.modules.project.service.EnvironService;
import com.zt.life.sys.dto.OssDto;
@@ -69,10 +69,10 @@

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> getDto(Long environId, Long  projectId) {
        SoftwareTestOrderDto data = environService.getDto(environId, projectId);
        if (projectId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ");
    public Result<EnvironDto> getDto(Long environId, Long  projectId) {
        EnvironDto data = environService.getDto(environId, projectId);
        if (environId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }
@@ -83,17 +83,14 @@
    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
    public Result insert(@RequestBody EnvironDto environDto) {
        //效验数据
        ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class);
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        String year = sdf.format(new Date());
        ValidatorUtils.validateEntity(environDto, AddGroup.class, DefaultGroup.class);
        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);
        map.put("projectId",environDto.getProjectId().toString());
        environDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
        Boolean result = environService.save(environDto);

        return Result.ok();
    }
@@ -102,15 +99,15 @@
    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody Environ environ) {
    public Result update(@RequestBody EnvironDto environDto) {
        //效验数据
        ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
        environService.update(environ);
        ValidatorUtils.validateEntity(environDto, UpdateGroup.class, DefaultGroup.class);
        Boolean result = environService.save(environDto);

        return Result.ok();
    }

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

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

        return Result.ok();
    }
}