修改bug：传给仿真算法包的modelId重复。（将工况ID改为阶段模型ID）

xyc

2024-12-04 19beea5d5dc165efb0feca7c4c0a296819010178

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java

@@ -15,20 +15,26 @@
import com.zt.life.modules.mainPart.baseReliability.service.ParamDataBasicService;
import com.zt.life.modules.mainPart.basicInfo.model.ParamData;
import com.zt.life.modules.mainPart.taskReliability.dao.AssessItemDao;
import com.zt.life.modules.mainPart.taskReliability.dto.TaskModelCheckResultDto;
import com.zt.life.modules.mainPart.taskReliability.model.AssessItem;
import com.zt.life.modules.mainPart.taskReliability.model.AssessResult;
import com.zt.life.modules.mainPart.taskReliability.model.OperatCondit;
import com.zt.life.modules.mainPart.taskReliability.model.ReliabilityAssess;
import com.zt.life.modules.mainPart.taskReliability.service.ReliabilityAssessService;
import com.zt.life.modules.mainPart.taskReliability.service.TaskService;
import com.zt.life.util.ImportUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;

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

@@ -41,16 +47,14 @@

    @Autowired
    AssessItemDao assessItemDao;
    @Autowired
    TaskService taskService;

    @GetMapping("page")
    @PostMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
            @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 Result<List<ReliabilityAssess>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return Result.ok(null);
    public Result<List<ReliabilityAssess>> page(@RequestBody AssessResult assessResult) {
        List<ReliabilityAssess> list = reliabilityAssessService.page(assessResult);
        return Result.ok(list);
    }

    @PostMapping("importProductExcel")
@@ -61,11 +65,15 @@
            StringBuilder str = new StringBuilder();
            ImportUtil.importResult(result, importResults, str);
            ImportUtil.ImportErrResult(result, importResults, str);

        } catch (Exception e) {
            e.printStackTrace();
        }
        return result;
    }

    @GetMapping("downloadXml")
    public void downloadXml(HttpServletRequest request, HttpServletResponse response, Long productId, Long taskId, Long itemId,Integer xml) {
        reliabilityAssessService.downloadXml(request,response,productId,taskId,itemId,xml);
    }

    @PostMapping("add")
@@ -78,6 +86,35 @@

        return Result.ok();
    }
    @PostMapping("update")
    @ApiOperation("修改")
    @LogOperation("修改")
    public Result update(@RequestBody AssessItem assessItem){
        //效验数据
        ValidatorUtils.validateEntity(assessItem, AddGroup.class, DefaultGroup.class);
        assessItemDao.updateById(assessItem);
        return Result.ok();
    }

    @PostMapping("assessCheck")
    @ApiOperation("评定模型检查")
    @LogOperation("评定模型检查")
    public Result<List<TaskModelCheckResultDto>> assessCheck(@RequestBody AssessResult assessResult){
        List<TaskModelCheckResultDto> list = taskService.checkTaskModelAssess(assessResult.getProductId(),
                assessResult.getTaskId(),
                assessResult.getItemId());

        return Result.ok(list);
    }

    @PostMapping("assess")
    @ApiOperation("评定")
    @LogOperation("评定")
    public Result<List<ReliabilityAssess>> assess(@RequestBody AssessResult assessResult){
        List<ReliabilityAssess> list = reliabilityAssessService.assess(assessResult);

        return Result.ok(list);
    }

    @GetMapping("getAssessDataList")
    public Result<List<AssessItem>> getAssessDataList(Long productId){
@@ -86,5 +123,15 @@
        return Result.ok(dataList);
    }

    @GetMapping("delete")
    @ApiOperation("删除")
    @LogOperation("删除")
    public Result delete(Long id){
        //效验数据
        assessItemDao.deleteById(id);

        return Result.ok();
    }


}