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

二级评估接口开发

Browse Source
This commit is contained in:
chendaofei
2025-06-16 16:59:30 +08:00
parent 2694564444
commit 42db01446d
25 changed files with 553 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessCapacitorParamController.java
View File

@@ -94,8 +94,8 @@ public class AssessCapacitorParamController extends BaseController {
@ApiOperation("删除评估电容器参数")
@ApiImplicitParam(name = "capacitorId", value = "电容器组ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("capacitorId") String capacitorId) {
boolean result = assessCapacitorParamService.removeById(capacitorId);
public HttpResult<Boolean> delete(@RequestBody List<String> capacitorId) {
boolean result = assessCapacitorParamService.removeByIds(capacitorId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

9
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicCableTypeController.java
View File

@@ -1,5 +1,6 @@
package com.njcn.advance.controller.assess;
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;
@@ -57,8 +58,8 @@ public class AssessDicCableTypeController extends BaseController {
PageFactory.getPageSize(query)
);
LambdaQueryWrapper<AssessDicCableType> wrapper = Wrappers.<AssessDicCableType>lambdaQuery()
.like(query.getLinetypeName() != null, AssessDicCableType::getLinetypeName, query.getLinetypeName())
.eq(query.getLinetypeType() != null, AssessDicCableType::getLinetypeType, query.getLinetypeType());
.like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicCableType::getLinetypeName, query.getSearchValue())
.eq(StrUtil.isNotBlank(query.getLinetypeType()), AssessDicCableType::getLinetypeType, query.getLinetypeType());
Page<AssessDicCableType> pageData = assessDicCableTypeService.page(pageParam, wrapper);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
CommonResponseEnum.SUCCESS.getMessage());
@@ -92,8 +93,8 @@ public class AssessDicCableTypeController extends BaseController {
@ApiOperation("删除线缆类型字典")
@ApiImplicitParam(name = "linetypeId", value = "线路线缆类型ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("linetypeId") String linetypeId) {
boolean result = assessDicCableTypeService.removeById(linetypeId);
public HttpResult<Boolean> delete(@RequestBody List<String> linetypeId) {
boolean result = assessDicCableTypeService.removeByIds(linetypeId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

7
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicHarmonicCharacterController.java
View File

@@ -1,5 +1,6 @@
package com.njcn.advance.controller.assess;
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;
@@ -56,7 +57,7 @@ public class AssessDicHarmonicCharacterController extends BaseController {
PageFactory.getPageSize(query)
);
LambdaQueryWrapper<AssessDicHarmonicCharacter> wrapper = Wrappers.<AssessDicHarmonicCharacter>lambdaQuery()
.like(query.getHarmName() != null, AssessDicHarmonicCharacter::getHarmName, query.getHarmName());
.like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicHarmonicCharacter::getHarmName, query.getSearchValue());
Page<AssessDicHarmonicCharacter> pageData = assessDicHarmonicCharacterService.page(pageParam, wrapper);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
CommonResponseEnum.SUCCESS.getMessage());
@@ -90,8 +91,8 @@ public class AssessDicHarmonicCharacterController extends BaseController {
@ApiOperation("删除谐波源特性字典")
@ApiImplicitParam(name = "harmId", value = "谐波源特性字典ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("harmId") String harmId) {
boolean result = assessDicHarmonicCharacterService.removeById(harmId);
public HttpResult<Boolean> delete(@RequestBody List<String> harmId) {
boolean result = assessDicHarmonicCharacterService.removeByIds(harmId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

9
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicShockLoadController.java
View File

@@ -1,5 +1,6 @@
package com.njcn.advance.controller.assess;
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;
@@ -57,8 +58,8 @@ public class AssessDicShockLoadController extends BaseController {
PageFactory.getPageSize(query)
);
LambdaQueryWrapper<AssessDicShockLoad> wrapper = Wrappers.<AssessDicShockLoad>lambdaQuery()
.like(query.getInpactloadtypeName() != null, AssessDicShockLoad::getInpactloadtypeName, query.getInpactloadtypeName())
.eq(query.getInpactloadStartup() != null, AssessDicShockLoad::getInpactloadStartup, query.getInpactloadStartup());
.like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicShockLoad::getInpactloadtypeName, query.getSearchValue())
.eq(StrUtil.isNotBlank(query.getInpactloadStartup()), AssessDicShockLoad::getInpactloadStartup, query.getInpactloadStartup());
Page<AssessDicShockLoad> pageData = assessDicShockLoadService.page(pageParam, wrapper);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
CommonResponseEnum.SUCCESS.getMessage());
@@ -92,8 +93,8 @@ public class AssessDicShockLoadController extends BaseController {
@ApiOperation("删除冲击负荷字典")
@ApiImplicitParam(name = "inpactloadtypeId", value = "冲击负荷类型ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("inpactloadtypeId") String inpactloadtypeId) {
boolean result = assessDicShockLoadService.removeById(inpactloadtypeId);
public HttpResult<Boolean> delete(@RequestBody List<String> inpactloadtypeId) {
boolean result = assessDicShockLoadService.removeByIds(inpactloadtypeId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

10
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessDicTransformerController.java
View File

@@ -1,5 +1,6 @@
package com.njcn.advance.controller.assess;
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;
@@ -58,9 +59,8 @@ public class AssessDicTransformerController extends BaseController {
PageFactory.getPageSize(query)
);
LambdaQueryWrapper<AssessDicTransformer> wrapper = Wrappers.<AssessDicTransformer>lambdaQuery()
.like(query.getTranstypeName() != null, AssessDicTransformer::getTranstypeName, query.getTranstypeName())
.eq(query.getTranshighScale() != null, AssessDicTransformer::getTranshighScale, query.getTranshighScale())
.eq(query.getTranslowScale() != null, AssessDicTransformer::getTranslowScale, query.getTranslowScale());
.like(StrUtil.isNotBlank(query.getSearchValue()), AssessDicTransformer::getTranstypeName, query.getSearchValue())
.orderByDesc(AssessDicTransformer::getCreateTime);
Page<AssessDicTransformer> pageData = assessDicTransformerService.page(pageParam, wrapper);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,
CommonResponseEnum.SUCCESS.getMessage());
@@ -94,8 +94,8 @@ public class AssessDicTransformerController extends BaseController {
@ApiOperation("删除变压器参数字典")
@ApiImplicitParam(name = "transtypeId", value = "变压器类型ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("transtypeId") String transtypeId) {
boolean result = assessDicTransformerService.removeById(transtypeId);
public HttpResult<Boolean> delete(@RequestBody List<String> transtypeId) {
boolean result = assessDicTransformerService.removeByIds(transtypeId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

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

@@ -92,8 +92,8 @@ public class AssessLoadParamController extends BaseController {
@ApiOperation("删除评估用户负荷参数")
@ApiImplicitParam(name = "loadId", value = "用户负荷ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("loadId") String loadId) {
boolean result = assessLoadParamService.removeById(loadId);
public HttpResult<Boolean> delete(@RequestBody List<String> loadId) {
boolean result = assessLoadParamService.removeByIds(loadId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

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

@@ -94,8 +94,8 @@ public class AssessShockLoadParamController extends BaseController {
@ApiOperation("删除评估用户冲击负荷参数")
@ApiImplicitParam(name = "inpactloadId", value = "冲击负荷ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("inpactloadId") String inpactloadId) {
boolean result = assessShockLoadParamService.removeById(inpactloadId);
public HttpResult<Boolean> delete(@RequestBody List<String> inpactloadId) {
boolean result = assessShockLoadParamService.removeByIds(inpactloadId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessTransformerParamController.java
View File

@@ -94,8 +94,8 @@ public class AssessTransformerParamController extends BaseController {
@ApiOperation("删除评估变压器参数")
@ApiImplicitParam(name = "transId", value = "变压器ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("transId") String transId) {
boolean result = assessTransformerParamService.removeById(transId);
public HttpResult<Boolean> delete(@RequestBody List<String> transId) {
boolean result = assessTransformerParamService.removeByIds(transId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

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

@@ -1,6 +1,7 @@
package com.njcn.advance.controller.assess;
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;
@@ -52,11 +53,7 @@ public class AssessUserController extends BaseController {
@ApiOperation("分页查询评估用户")
@PostMapping("/page")
public HttpResult<Page<AssessUser>> page(@RequestBody AssessUserQuery assessUserQuery) {
Page<AssessUser> pageParam = new Page<>(PageFactory.getPageNum(assessUserQuery), PageFactory.getPageSize(assessUserQuery));
LambdaQueryWrapper<AssessUser> wrapper = Wrappers.<AssessUser>lambdaQuery()
.like(assessUserQuery.getDeptName() != null, AssessUser::getDeptName, assessUserQuery.getDeptName())
.like(assessUserQuery.getUserScale() != null, AssessUser::getUserScale, assessUserQuery.getUserScale());
Page<AssessUser> pageData = assessUserService.page(pageParam, wrapper);
Page<AssessUser> pageData = assessUserService.page(assessUserQuery);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), pageData,CommonResponseEnum.SUCCESS.getMessage());
}
@@ -70,9 +67,13 @@ public class AssessUserController extends BaseController {
@ApiOperation("新增评估用户")
@PostMapping("add")
public HttpResult<Boolean> add(@RequestBody @Validated AssessUserQuery assessUser) {
boolean result = assessUserService.add(assessUser);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,CommonResponseEnum.SUCCESS.getMessage());
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());
}
}
@ApiOperation("修改评估用户")

4
pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/assess/AssessWindLoadParamController.java
View File

@@ -92,8 +92,8 @@ public class AssessWindLoadParamController extends BaseController {
@ApiOperation("删除风电场类负荷参数")
@ApiImplicitParam(name = "windgeneratorId", value = "风力发电机ID", required = true, type = "String")
@PostMapping("/delete")
public HttpResult<Boolean> delete(@RequestParam("windgeneratorId") String windgeneratorId) {
boolean result = assessWindLoadParamService.removeById(windgeneratorId);
public HttpResult<Boolean> delete(@RequestBody List<String> windgeneratorId) {
boolean result = assessWindLoadParamService.removeByIds(windgeneratorId);
return HttpResultUtil.assembleResult(CommonResponseEnum.SUCCESS.getCode(), result,
CommonResponseEnum.SUCCESS.getMessage());
}

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

@@ -2,6 +2,7 @@ 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.service.assess.SecondaryEvaluationService;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -17,6 +18,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
* Description:
* Date: 2025/06/06 下午 2:43【需求编号】
@@ -39,4 +42,15 @@ public class SecondaryEvaluationController extends BaseController {
secondaryEvaluationService.evaluation(assessId,file);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,true , methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/evaluationTree")
@ApiOperation("评估-树")
public HttpResult<Boolean> evaluationTree(@RequestParam("deptId")String deptId) {
String methodDescribe = getMethodDescribe("evaluationTree");
List<AssessTreeDTO> tree = secondaryEvaluationService.evaluationTree(deptId);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,true , methodDescribe);
}
}