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

部分bug修改

Browse Source
This commit is contained in:
hzj
2024-05-15 13:34:51 +08:00
parent 4ed7b399b3
commit a99c915235
8 changed files with 85 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java
View File

@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequestMapping("/quitRunningDevice")
@Api(tags = "干扰源用户管理")
@Api(tags = "设备退运管理")
@AllArgsConstructor
public class QuitRunningDeviceController extends BaseController {

11
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java
View File

@@ -1,6 +1,7 @@
package com.njcn.supervision.controller.survey;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.enums.common.LogEnum;
@@ -111,5 +112,15 @@ public class GeneralSurveyController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
@PostMapping("/cancel")
@ApiOperation("取消普测计划")
@ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true)
public HttpResult<String> cancelGeneralSurvey(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) {
String methodDescribe = getMethodDescribe("cancelGeneralSurvey");
String id = supervisionGeneralSurveyPlanPOService.cancelGeneralSurvey(cancelReqVO);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe);
}
}