Changes

jinlin

2023-11-17 815cf005152ca73ca08aabd44021d5f6ac72b06a

Changes

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

New file
@@ -0,0 +1,96 @@
package com.zt.life.modules.project.controller;


import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
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.model.EnvironAnalysis;
import com.zt.life.modules.project.service.EnvironAnalysisService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


/**
 * environ_analysis
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@RestController
@RequestMapping("/project/EnvironAnalysis/")
@Api(tags="environ_analysis")
public class EnvironAnalysisController {
    @Autowired
    private EnvironAnalysisService environAnalysisService;

    @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),
    })
    public PageResult<EnvironAnalysis> page(@ApiIgnore @QueryParam QueryFilter queryFilter){

        return PageResult.ok(environAnalysisService.page(queryFilter));
    }

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<EnvironAnalysis> get(@PathVariable("id") Long id){
        EnvironAnalysis data = environAnalysisService.get(id);

        return Result.ok(data);
    }

    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody EnvironAnalysis environAnalysis){
        //效验数据
        ValidatorUtils.validateEntity(environAnalysis, AddGroup.class, DefaultGroup.class);
        environAnalysisService.insert(environAnalysis);

        return Result.ok();
    }

    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody EnvironAnalysis environAnalysis){
        //效验数据
        ValidatorUtils.validateEntity(environAnalysis, UpdateGroup.class, DefaultGroup.class);
        environAnalysisService.update(environAnalysis);

        return Result.ok();
    }

    @DeleteMapping
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids){
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        environAnalysisService.delete(ids);

        return Result.ok();
    }

}

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

@@ -12,8 +12,11 @@
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.model.Environ;
import com.zt.life.modules.project.service.EnvironService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -29,41 +32,50 @@
/**
 * environ
 *
 * @author zt generator 
 * @author zt generator
 * @since 1.0.0 2023-11-17
 */
@RestController
@RequestMapping("/project/Environ/")
@Api(tags="environ")
@Api(tags = "environ")
public class EnvironController {
    @Autowired
    private EnvironService environService;

    @Autowired
    private SysOssConfigService sysOssConfigService;


    @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 = "CODE^LK")    })
    public PageResult<Environ> 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 = "CODE^LK")})
    public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return PageResult.ok(environService.page(queryFilter));
    }

    @GetMapping("{id}")
    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<Environ> get(@PathVariable("id") Long id){
        Environ data = environService.get(id);

    public Result<SoftwareTestOrderDto> getDto(Long orderId, Long environId) {
        SoftwareTestOrderDto data = environService.getDto(environId, orderId);
        if (orderId != null) {
            OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "environ");
            if (ossDto != null) {
                data.setFiles(ossDto);
            }
        }
        return Result.ok(data);
    }

    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody Environ environ){
    public Result insert(@RequestBody Environ environ) {
        //效验数据
        ValidatorUtils.validateEntity(environ, AddGroup.class, DefaultGroup.class);
        environService.insert(environ);
@@ -74,7 +86,7 @@
    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody Environ environ){
    public Result update(@RequestBody Environ environ) {
        //效验数据
        ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
        environService.update(environ);
@@ -85,7 +97,7 @@
    @DeleteMapping
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids){
    public Result delete(@RequestBody Long[] ids) {
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        environService.delete(ids);

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

New file
@@ -0,0 +1,96 @@
package com.zt.life.modules.project.controller;


import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
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.model.EnvironHardwareResources;
import com.zt.life.modules.project.service.EnvironHardwareResourcesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


/**
 * environ_hardware_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@RestController
@RequestMapping("/project/EnvironHardwareResources/")
@Api(tags="environ_hardware_resources")
public class EnvironHardwareResourcesController {
    @Autowired
    private EnvironHardwareResourcesService environHardwareResourcesService;

    @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),
    })
    public PageResult<EnvironHardwareResources> page(@ApiIgnore @QueryParam QueryFilter queryFilter){

        return PageResult.ok(environHardwareResourcesService.page(queryFilter));
    }

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<EnvironHardwareResources> get(@PathVariable("id") Long id){
        EnvironHardwareResources data = environHardwareResourcesService.get(id);

        return Result.ok(data);
    }

    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody EnvironHardwareResources environHardwareResources){
        //效验数据
        ValidatorUtils.validateEntity(environHardwareResources, AddGroup.class, DefaultGroup.class);
        environHardwareResourcesService.insert(environHardwareResources);

        return Result.ok();
    }

    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody EnvironHardwareResources environHardwareResources){
        //效验数据
        ValidatorUtils.validateEntity(environHardwareResources, UpdateGroup.class, DefaultGroup.class);
        environHardwareResourcesService.update(environHardwareResources);

        return Result.ok();
    }

    @DeleteMapping
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids){
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        environHardwareResourcesService.delete(ids);

        return Result.ok();
    }

}

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

New file
@@ -0,0 +1,96 @@
package com.zt.life.modules.project.controller;


import com.zt.common.annotation.LogOperation;
import com.zt.common.constant.Constant;
import com.zt.common.annotation.QueryParam;
import com.zt.common.db.query.QueryFilter;
import com.zt.common.servlet.Result;
import com.zt.common.servlet.PageResult;
import com.zt.common.validator.AssertUtils;
import com.zt.common.validator.ValidatorUtils;
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.model.EnvironSoftwareResources;
import com.zt.life.modules.project.service.EnvironSoftwareResourcesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;

import javax.servlet.http.HttpServletResponse;
import java.util.List;


/**
 * environ_software_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@RestController
@RequestMapping("/project/EnvironSoftwareResources/")
@Api(tags="environ_software_resources")
public class EnvironSoftwareResourcesController {
    @Autowired
    private EnvironSoftwareResourcesService environSoftwareResourcesService;

    @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),
    })
    public PageResult<EnvironSoftwareResources> page(@ApiIgnore @QueryParam QueryFilter queryFilter){

        return PageResult.ok(environSoftwareResourcesService.page(queryFilter));
    }

    @GetMapping("{id}")
    @ApiOperation("信息")
    public Result<EnvironSoftwareResources> get(@PathVariable("id") Long id){
        EnvironSoftwareResources data = environSoftwareResourcesService.get(id);

        return Result.ok(data);
    }

    @PostMapping
    @ApiOperation("新增")
    @LogOperation("新增")
    public Result insert(@RequestBody EnvironSoftwareResources environSoftwareResources){
        //效验数据
        ValidatorUtils.validateEntity(environSoftwareResources, AddGroup.class, DefaultGroup.class);
        environSoftwareResourcesService.insert(environSoftwareResources);

        return Result.ok();
    }

    @PutMapping
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody EnvironSoftwareResources environSoftwareResources){
        //效验数据
        ValidatorUtils.validateEntity(environSoftwareResources, UpdateGroup.class, DefaultGroup.class);
        environSoftwareResourcesService.update(environSoftwareResources);

        return Result.ok();
    }

    @DeleteMapping
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(@RequestBody Long[] ids){
        //效验数据
        AssertUtils.isArrayEmpty(ids, "id");
        environSoftwareResourcesService.delete(ids);

        return Result.ok();
    }

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironAnalysisDao.java

New file
@@ -0,0 +1,23 @@
package com.zt.life.modules.project.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.project.model.EnvironAnalysis;
import org.apache.ibatis.annotations.Mapper;


import java.util.List;
import java.util.Map;


/**
 * environ_analysis
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Mapper
public interface EnvironAnalysisDao extends BaseDao<EnvironAnalysis> {

    List<EnvironAnalysis> getList(Map<String, Object> params);

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironHardwareResourcesDao.java

New file
@@ -0,0 +1,23 @@
package com.zt.life.modules.project.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.project.model.EnvironHardwareResources;
import org.apache.ibatis.annotations.Mapper;


import java.util.List;
import java.util.Map;


/**
 * environ_hardware_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Mapper
public interface EnvironHardwareResourcesDao extends BaseDao<EnvironHardwareResources> {

    List<EnvironHardwareResources> getList(Map<String, Object> params);

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironSoftwareResourcesDao.java

New file
@@ -0,0 +1,23 @@
package com.zt.life.modules.project.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.project.model.EnvironSoftwareResources;
import org.apache.ibatis.annotations.Mapper;


import java.util.List;
import java.util.Map;


/**
 * environ_software_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Mapper
public interface EnvironSoftwareResourcesDao extends BaseDao<EnvironSoftwareResources> {

    List<EnvironSoftwareResources> getList(Map<String, Object> params);

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java

@@ -1,9 +1,6 @@
package com.zt.life.modules.project.dto;

import com.zt.life.modules.project.model.Project;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import com.zt.life.modules.project.model.*;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.sys.dto.OssDto;
import io.swagger.annotations.ApiModelProperty;
@@ -16,11 +13,14 @@
public class SoftwareTestOrderDto {
    private Long id;
    private Long projectId;
    private Long orderId;

    @ApiModelProperty(value = "测试委托单记录")
    private SoftwareTestOrder softwareTestOrder;
    @ApiModelProperty(value = "测试项目基本信息")
    private Project project;
    @ApiModelProperty(value = "测试环境建立确认")
    private Environ environ;
    @ApiModelProperty(value = "测试机构信息")
    private TestAgencyInfo TestAgencyInfo;
    @ApiModelProperty(value = "测试委托单附件")
@@ -30,5 +30,12 @@
    private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
    @ApiModelProperty(value = "交付件")
    private List<SoftwareTestOrderDeliverable> deliverableList = new ArrayList<>();
    @ApiModelProperty(value = "软件资源")
    private List<EnvironSoftwareResources> softwareResourcesList = new ArrayList<>();
    @ApiModelProperty(value = "硬件资源")
    private List<EnvironHardwareResources> hardwareResourcesList = new ArrayList<>();
    @ApiModelProperty(value = "环境差异性分析")
    private List<EnvironAnalysis> environAnalysisList = new ArrayList<>();

}


 modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java

@@ -25,6 +25,9 @@
    @ApiModelProperty(value = "编号")
    private String code;

    @ApiModelProperty(value = "委托单ID")
    private String orderId;

    @ApiModelProperty(value = "硬软件资源")
    private String hardSoftwareRes;


 modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironAnalysis.java

New file
@@ -0,0 +1,45 @@
package com.zt.life.modules.project.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * environ_analysis
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("environ_analysis")
public class EnvironAnalysis extends BusiEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "环境测试单ID")
    private Long environId;

    @ApiModelProperty(value = "序号")
    private Integer no;

    @ApiModelProperty(value = "真实环境")
    private String realEnviron;

    @ApiModelProperty(value = "测试环境")
    private String testEnviron;

    @ApiModelProperty(value = "环境差异")
    private String environDifference;

    @ApiModelProperty(value = "对测试结果影响")
    private String resultImpact;

    @ApiModelProperty(value = "措施")
    private String measure;

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java

New file
@@ -0,0 +1,45 @@
package com.zt.life.modules.project.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * environ_hardware_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("environ_hardware_resources")
public class EnvironHardwareResources extends BusiEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "环境测试单ID")
    private Long environId;

    @ApiModelProperty(value = "序号")
    private Integer no;

    @ApiModelProperty(value = "硬件和固体项名称")
    private String itemName;

    @ApiModelProperty(value = "用途")
    private String usage;

    @ApiModelProperty(value = "状态")
    private String state;

    @ApiModelProperty(value = "数量")
    private Integer number;

    @ApiModelProperty(value = "提供单位")
    private String provideUnit;

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java

New file
@@ -0,0 +1,42 @@
package com.zt.life.modules.project.model;

import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.util.Date;

/**
 * environ_software_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("environ_software_resources")
public class EnvironSoftwareResources extends BusiEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "环境测试单ID")
    private Long environId;

    @ApiModelProperty(value = "序号")
    private Integer no;

    @ApiModelProperty(value = "软件项名称")
    private String itemName;

    @ApiModelProperty(value = "版本")
    private String version;

    @ApiModelProperty(value = "用途")
    private String usage;

    @ApiModelProperty(value = "提供单位")
    private String provideUnit;

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java

New file
@@ -0,0 +1,40 @@
package com.zt.life.modules.project.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironAnalysisDao;
import com.zt.life.modules.project.model.EnvironAnalysis;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
import java.util.List;


/**
 * environ_analysis
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Service
public class EnvironAnalysisService  extends BaseService<EnvironAnalysisDao, EnvironAnalysis> {

    /**
     * 分页查询
     *
     * @param queryFilter
     * @return
     */
    public List<EnvironAnalysis> page(QueryFilter queryFilter) {
        return baseDao.getList(queryFilter.getQueryParams());
    }

    /**
     * 删除
     *
     * @param ids
     */
    public void delete(Long[] ids) {
        super.deleteLogic(ids);
    }

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java

New file
@@ -0,0 +1,48 @@
package com.zt.life.modules.project.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironHardwareResourcesDao;
import com.zt.life.modules.project.model.EnvironHardwareResources;
import com.zt.life.modules.project.model.EnvironSoftwareResources;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
 * environ_hardware_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Service
public class EnvironHardwareResourcesService  extends BaseService<EnvironHardwareResourcesDao, EnvironHardwareResources> {

    /**
     * 分页查询
     *
     * @param queryFilter
     * @return
     */
    public List<EnvironHardwareResources> page(QueryFilter queryFilter) {
        return baseDao.getList(queryFilter.getQueryParams());
    }

    /**
     * 删除
     *
     * @param ids
     */
    public void delete(Long[] ids) {
        super.deleteLogic(ids);
    }

    public List<EnvironHardwareResources> getList(Long environId) {
        Map<String, Object> params = new HashMap<>();
        params.put("orderId",environId);
        return baseDao.getList(params);
    }
}

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java

@@ -2,7 +2,9 @@

import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironDao;
import com.zt.life.modules.project.model.Environ;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
@@ -17,6 +19,43 @@
 */
@Service
public class EnvironService  extends BaseService<EnvironDao, Environ> {
    @Autowired
    private SoftwareTestOrder softwareTestOrder;

    @Autowired
    private EnvironSoftwareResourcesService environSoftwareResourcesService;

    @Autowired
    private EnvironHardwareResourcesService environHardwareResourcesService;

    @Autowired
    private SoftwareTestOrderService softwareTestOrderService;

    public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();
        if (environId != null) {
            data.setId(environId);
            Environ environ = this.get(environId);
            data.setEnviron(environ);

            orderId = softwareTestOrder.getId();

            List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
            data.setSoftwareResourcesList(softwareResourcesList);

            List<EnvironHardwareResources> hardwareResourcesList = environHardwareResourcesService.getList(environId);
            data.setHardwareResourcesList(hardwareResourcesList);
        } else {
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
        }

        if (orderId != null) {
            data.setOrderId(orderId);
            data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
        }

        return data;
    }

    /**
     * 分页查询

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java

New file
@@ -0,0 +1,48 @@
package com.zt.life.modules.project.service;

import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironSoftwareResourcesDao;
import com.zt.life.modules.project.model.EnvironSoftwareResources;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;


/**
 * environ_software_resources
 *
 * @author zt generator 
 * @since 1.0.0 2023-11-17
 */
@Service
public class EnvironSoftwareResourcesService  extends BaseService<EnvironSoftwareResourcesDao, EnvironSoftwareResources> {

    /**
     * 分页查询
     *
     * @param queryFilter
     * @return
     */
    public List<EnvironSoftwareResources> page(QueryFilter queryFilter) {
        return baseDao.getList(queryFilter.getQueryParams());
    }

    /**
     * 删除
     *
     * @param ids
     */
    public void delete(Long[] ids) {
        super.deleteLogic(ids);
    }

    public List<EnvironSoftwareResources> getList(Long environId) {
        Map<String, Object> params = new HashMap<>();
        params.put("orderId",environId);
        return baseDao.getList(params);
    }
}

 modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.project.dao.EnvironAnalysisDao">

    <select id="getList" resultType="com.zt.life.modules.project.model.EnvironAnalysis">
        select a.*
        from environ_analysis a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
    </select>

</mapper>

 modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.project.dao.EnvironHardwareResourcesDao">

    <select id="getList" resultType="com.zt.life.modules.project.model.EnvironHardwareResources">
        select a.*
        from environ_hardware_resources a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
    </select>

</mapper>

 modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml

New file
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zt.life.modules.project.dao.EnvironSoftwareResourcesDao">

    <select id="getList" resultType="com.zt.life.modules.project.model.EnvironSoftwareResources">
        select a.*
        from environ_software_resources a
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
    </select>

</mapper>