Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

二级评估联调和导出评估结果

Browse Source
This commit is contained in:
wr
2025-08-26 18:15:00 +08:00
parent 9caf1724a6
commit fb0f23e70b
24 changed files with 1070 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessLoadParamController.java
View File

@@ -90,7 +90,6 @@ public class AssessLoadParamController extends BaseController {
}
@ApiOperation("删除评估用户负荷参数")
@ApiImplicitParam(name = "loadId", value = "用户负荷ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestBody List<String> loadId) {
boolean result = assessLoadParamService.removeByIds(loadId);

1
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessResultController.java
View File

@@ -18,5 +18,6 @@ import com.njcn.web.controller.BaseController;
@RequestMapping("/assessResult")
public class AssessResultController extends BaseController {
}

1
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessShockLoadParamController.java
View File

@@ -92,7 +92,6 @@ public class AssessShockLoadParamController extends BaseController {
}
@ApiOperation("删除评估用户冲击负荷参数")
@ApiImplicitParam(name = "inpactloadId", value = "冲击负荷ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestBody List<String> inpactloadId) {
boolean result = assessShockLoadParamService.removeByIds(inpactloadId);

50
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessUserController.java
View File

@@ -1,20 +1,19 @@
package com.njcn.advance.controller.assess;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.advance.pojo.param.assess.AssessUserQuery;
import com.njcn.advance.pojo.po.assess.AssessUser;
import com.njcn.advance.service.assess.IAssessUserService;
import com.njcn.advance.pojo.po.assess.*;
import com.njcn.advance.service.assess.*;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.web.factory.PageFactory;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -26,7 +25,7 @@ import java.util.List;
/**
* <p>
* 前端控制器
* 前端控制器
* </p>
*
* @author cdf
@@ -39,6 +38,12 @@ import java.util.List;
public class AssessUserController extends BaseController {
private final IAssessUserService assessUserService;
private final IAssessTransformerParamService transformerParamService;
private final IAssessCapacitorParamService capacitorParamService;
private final IAssessWindLoadParamService windLoadParamService;
private final IAssessLoadParamService loadParamService;
private final IAssessShockLoadParamService shockLoadParamService;
@ApiOperation("获取评估用户列表")
@PostMapping("/list")
@@ -47,40 +52,40 @@ public class AssessUserController extends BaseController {
.like(assessUserQuery.getDeptName() != null, AssessUser::getDeptName, assessUserQuery.getDeptName())
.like(assessUserQuery.getUserScale() != null, AssessUser::getUserScale, assessUserQuery.getUserScale());
List<AssessUser> list = assessUserService.list(wrapper);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), list,CommonResponseEnum.SUCCESS.getMessage());
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), list, CommonResponseEnum.SUCCESS.getMessage());
}
@ApiOperation("分页查询评估用户")
@PostMapping("/page")
public HttpResult<Page<AssessUser>> page(@RequestBody AssessUserQuery assessUserQuery) {
Page<AssessUser> pageData = assessUserService.page(assessUserQuery);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,CommonResponseEnum.SUCCESS.getMessage());
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData, CommonResponseEnum.SUCCESS.getMessage());
}
@ApiOperation("根据ID获取评估用户详情")
@ApiImplicitParam(name = "assessId", value = "评估用户ID", required = true, type = "String")
@GetMapping("getInfo")
@GetMapping("/getInfo")
public HttpResult<AssessUser> getInfo(@RequestParam("assessId") String assessId) {
AssessUser assessUser = assessUserService.getByAssessId(assessId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), assessUser,CommonResponseEnum.SUCCESS.getMessage());
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), assessUser, CommonResponseEnum.SUCCESS.getMessage());
}
@ApiOperation("新增评估用户")
@PostMapping("add")
@PostMapping("/add")
public HttpResult<String> add(@RequestBody @Validated AssessUserQuery assessUser) {
String result = assessUserService.add(assessUser);
if(StrUtil.isNotBlank(result)){
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,CommonResponseEnum.SUCCESS.getMessage());
}else {
return HttpResultUtil.assembleResult(CommonResponseEnum.FAIL.getCode(), null,CommonResponseEnum.FAIL.getMessage());
if (StrUtil.isNotBlank(result)) {
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result, CommonResponseEnum.SUCCESS.getMessage());
} else {
return HttpResultUtil.assembleResult(CommonResponseEnum.FAIL.getCode(), null, CommonResponseEnum.FAIL.getMessage());
}
}
@ApiOperation("修改评估用户")
@PostMapping("edit")
@PostMapping("/edit")
public HttpResult<Boolean> edit(@RequestBody @Validated AssessUserQuery.UpdateAssessUserQuery updateAssessUserQuery) {
assessUserService.update(updateAssessUserQuery);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), true,CommonResponseEnum.SUCCESS.getMessage());
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), true, CommonResponseEnum.SUCCESS.getMessage());
}
@@ -88,11 +93,18 @@ public class AssessUserController extends BaseController {
@ApiImplicitParam(name = "assessIds", value = "评估用户ID列表，用逗号分隔", required = true, type = "String")
@PostMapping("/batchDel")
public HttpResult<Boolean> batchDelete(@RequestBody List<String> assessIds) {
boolean result = assessUserService.removeByIds(assessIds);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,CommonResponseEnum.SUCCESS.getMessage());
boolean result = false;
if (CollUtil.isNotEmpty(assessIds)) {
transformerParamService.remove(new LambdaQueryWrapper<AssessTransformerParam>().in(AssessTransformerParam::getAssessId, assessIds));
capacitorParamService.remove(new LambdaQueryWrapper<AssessCapacitorParam>().in(AssessCapacitorParam::getAssessId, assessIds));
windLoadParamService.remove(new LambdaQueryWrapper<AssessWindLoadParam>().in(AssessWindLoadParam::getAssessId, assessIds));
loadParamService.remove(new LambdaQueryWrapper<AssessLoadParam>().in(AssessLoadParam::getAssessId, assessIds));
shockLoadParamService.remove(new LambdaQueryWrapper<AssessShockLoadParam>().in(AssessShockLoadParam::getAssessId, assessIds));
result = assessUserService.removeByIds(assessIds);
}
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result, CommonResponseEnum.SUCCESS.getMessage());
}
}

63
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/SecondaryEvaluationController.java
View File

@@ -1,23 +1,25 @@
package com.njcn.advance.controller.assess;
import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityQueryDataParam;
import com.njcn.advance.pojo.carrycapacity.vo.CarryCapacityDataVO;
import com.njcn.advance.pojo.dto.assess.AssessTreeDTO;
import com.njcn.advance.pojo.param.assess.AssessParam;
import com.njcn.advance.pojo.vo.assess.AssessResultVO;
import com.njcn.advance.service.assess.SecondaryEvaluationService;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.param.StatisticsBizBaseParam;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
/**
@@ -33,24 +35,61 @@ import java.util.List;
@Api(tags = "二级评估")
@RequiredArgsConstructor
public class SecondaryEvaluationController extends BaseController {
private final SecondaryEvaluationService secondaryEvaluationService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/evaluation")
@ApiOperation("评估-主页面")
public HttpResult<Boolean> evaluation(@RequestParam String assessId,@RequestParam("file") MultipartFile file) {
@ApiOperation("导入数据计算评估结果")
public HttpResult<Boolean> evaluation(@RequestParam("assessId") String assessId,
@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file) {
String methodDescribe = getMethodDescribe("evaluation");
secondaryEvaluationService.evaluation(assessId,file);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,true , methodDescribe);
AssessParam param=new AssessParam();
param.setAssessId(assessId);
secondaryEvaluationService.evaluation(param, file);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/lineEvaluation")
@ApiOperation("监测点数据计算评估结果")
public HttpResult<Boolean> lineEvaluation(@RequestBody AssessParam param) {
String methodDescribe = getMethodDescribe("lineEvaluation");
secondaryEvaluationService.evaluation(param, null);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/evaluationTree")
@ApiOperation("评估-树")
public HttpResult<Boolean> evaluationTree(@RequestParam("deptId")String deptId) {
@ApiOperation("评估树")
public HttpResult<List<AssessTreeDTO>> evaluationTree(@RequestParam("deptId") String deptId) {
String methodDescribe = getMethodDescribe("evaluationTree");
List<AssessTreeDTO> tree = secondaryEvaluationService.evaluationTree(deptId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,true , methodDescribe);
List<AssessTreeDTO> tree = secondaryEvaluationService.evaluationTree(deptId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/assessResult")
@ApiOperation("评估结果")
public HttpResult<AssessResultVO> assessResult(@RequestParam("assessId") String assessId) {
String methodDescribe = getMethodDescribe("assessResult");
AssessResultVO resultVO = secondaryEvaluationService.assessResult(assessId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, resultVO, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/downAssessResult")
@ApiOperation("导出评估结果")
public void assessResult(HttpServletResponse response, @RequestParam("assessId") String assessId) throws IOException {
secondaryEvaluationService.downAssessResult(response, assessId);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/downTemplateAssessResult")
@ApiOperation("导出评估结果模板")
public void assessResult(HttpServletResponse response) throws IOException {
secondaryEvaluationService.downTemplateAssessResult(response);
}
}