Commit 7662ed8d authored by suhuiguang's avatar suhuiguang Committed by tianbo

feat(jyjc):操作日志

1.报检申请、开通申请、接收接收增加操作日志
parent 354b1e26
...@@ -31,6 +31,7 @@ import org.springframework.validation.BindingResult; ...@@ -31,6 +31,7 @@ import org.springframework.validation.BindingResult;
import org.springframework.validation.FieldError; import org.springframework.validation.FieldError;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
...@@ -82,7 +83,8 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -82,7 +83,8 @@ public class JyjcInspectionApplicationController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "暂存、提交", notes = "新增") @ApiOperation(httpMethod = "POST", value = "报检申请-暂存、提交", notes = "新增")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<List<JyjcInspectionApplicationModel>> save(@RequestBody JSONObject model) { public ResponseModel<List<JyjcInspectionApplicationModel>> save(@RequestBody JSONObject model) {
if (model.containsKey(BASIC)) { if (model.containsKey(BASIC)) {
JSONObject finallyJson = new JSONObject(); JSONObject finallyJson = new JSONObject();
...@@ -188,8 +190,9 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -188,8 +190,9 @@ public class JyjcInspectionApplicationController extends BaseController {
* @date 2023/12/15 11:25 * @date 2023/12/15 11:25
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "接收", notes = "接收") @ApiOperation(httpMethod = "POST", value = "报检申请-接收", notes = "接收")
@PostMapping(value = "/flow/{type}/receive") @PostMapping(value = "/flow/{type}/receive")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<?> executeFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) { public ResponseModel<?> executeFlow(@PathVariable(value = "type") String type, @RequestBody Map<String, Object> params) {
params.put("type", type); params.put("type", type);
jyjcInspectionApplicationServiceImpl.doReceive(params); jyjcInspectionApplicationServiceImpl.doReceive(params);
...@@ -208,8 +211,9 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -208,8 +211,9 @@ public class JyjcInspectionApplicationController extends BaseController {
* @date 2023/12/15 13:44 * @date 2023/12/15 13:44
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "退回", notes = "退回") @ApiOperation(httpMethod = "GET", value = "报检申请-退回", notes = "退回")
@PostMapping(value = "/flow/reject") @PostMapping(value = "/flow/reject")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String, Object> params) { public ResponseModel<Boolean> doRejectFlow(@RequestBody Map<String, Object> params) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doReject(params));
} }
...@@ -223,8 +227,9 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -223,8 +227,9 @@ public class JyjcInspectionApplicationController extends BaseController {
* @date 2023/12/15 13:44 * @date 2023/12/15 13:44
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "不予受理", notes = "不予受理") @ApiOperation(httpMethod = "GET", value = "报检申请-不予受理", notes = "不予受理")
@PostMapping(value = "/flow/noAccept") @PostMapping(value = "/flow/noAccept")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Boolean> doNoAcceptFlow(@RequestBody Map<String, Object> params) { public ResponseModel<Boolean> doNoAcceptFlow(@RequestBody Map<String, Object> params) {
return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doNoAccept(params)); return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.doNoAccept(params));
} }
...@@ -239,8 +244,9 @@ public class JyjcInspectionApplicationController extends BaseController { ...@@ -239,8 +244,9 @@ public class JyjcInspectionApplicationController extends BaseController {
* @date 2023/12/15 13:39 * @date 2023/12/15 13:39
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "撤回", notes = "撤回") @ApiOperation(httpMethod = "GET", value = "报检申请-撤回", notes = "撤回")
@GetMapping(value = "/flow/rollback") @GetMapping(value = "/flow/rollback")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr, public ResponseModel<Boolean> doRollbackFlow(@RequestParam("sequenceNbr") String sequenceNbr,
@RequestParam("instanceId") String instanceId, @RequestParam("instanceId") String instanceId,
@RequestParam("nextTaskId") String nextTaskId) { @RequestParam("nextTaskId") String nextTaskId) {
......
...@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
...@@ -198,6 +199,7 @@ public class JyjcInspectionResultController extends BaseController { ...@@ -198,6 +199,7 @@ public class JyjcInspectionResultController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "非压力管道-报检结果接收", notes = "非压力管道-对外对接使用,支持单条及批量") @ApiOperation(httpMethod = "POST", value = "非压力管道-报检结果接收", notes = "非压力管道-对外对接使用,支持单条及批量")
@PostMapping(value = "/receive") @PostMapping(value = "/receive")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<List<JyjcInspectionResultDataModel>> saveResultDataBatch(@RequestBody List<JyjcInspectionResultDataModel> resultDataModels){ public ResponseModel<List<JyjcInspectionResultDataModel>> saveResultDataBatch(@RequestBody List<JyjcInspectionResultDataModel> resultDataModels){
return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.receivePushResultData(resultDataModels)); return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.receivePushResultData(resultDataModels));
} }
...@@ -253,6 +255,7 @@ public class JyjcInspectionResultController extends BaseController { ...@@ -253,6 +255,7 @@ public class JyjcInspectionResultController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "压力管道-报检结果接收", notes = "压力管道-对外对接使用,支持单条及批量") @ApiOperation(httpMethod = "POST", value = "压力管道-报检结果接收", notes = "压力管道-对外对接使用,支持单条及批量")
@PostMapping(value = "/pipeline/receive") @PostMapping(value = "/pipeline/receive")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<List<PipelineInspectionResultDto>> savePipelineResultDataBatch(@RequestBody List<PipelineInspectionResultDto> resultData){ public ResponseModel<List<PipelineInspectionResultDto>> savePipelineResultDataBatch(@RequestBody List<PipelineInspectionResultDto> resultData){
return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.receivePipelineResultData(resultData)); return ResponseHelper.buildResponse(jyjcInspectionResultServiceImpl.receivePipelineResultData(resultData));
} }
......
...@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiParam; ...@@ -24,6 +24,7 @@ import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
...@@ -55,7 +56,8 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -55,7 +56,8 @@ public class JyjcOpeningApplicationController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增、编辑的保存", notes = "新增、编辑的保存") @ApiOperation(httpMethod = "POST", value = "开通申请-新增、编辑的保存", notes = "新增、编辑的保存")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JSONObject jsonObject) { public ResponseModel<JyjcOpeningApplicationModel> save(@RequestBody JSONObject jsonObject) {
JyjcOpeningApplicationModel jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel(); JyjcOpeningApplicationModel jyjcOpeningApplicationModel = new JyjcOpeningApplicationModel();
// 兼容工作台暂存逻辑、编辑时报错逻辑 // 兼容工作台暂存逻辑、编辑时报错逻辑
...@@ -80,7 +82,8 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -80,7 +82,8 @@ public class JyjcOpeningApplicationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/submit") @PutMapping(value = "/submit")
@ApiOperation(httpMethod = "PUT", value = "保存并提交、提交", notes = "保存并提交") @ApiOperation(httpMethod = "PUT", value = "开通申请-保存并提交、提交", notes = "保存并提交")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<List<JyjcOpeningApplicationModel>> updateBySequenceNbrAndStartFlow(@RequestBody JSONObject jsonObject, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) { public ResponseModel<List<JyjcOpeningApplicationModel>> updateBySequenceNbrAndStartFlow(@RequestBody JSONObject jsonObject, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
JyjcOpeningApplicationModel model = new JyjcOpeningApplicationModel(); JyjcOpeningApplicationModel model = new JyjcOpeningApplicationModel();
if (jsonObject.containsKey("applyInfo")) { if (jsonObject.containsKey("applyInfo")) {
...@@ -181,8 +184,9 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -181,8 +184,9 @@ public class JyjcOpeningApplicationController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "流程节点执行", notes = "流程节点执行") @ApiOperation(httpMethod = "POST", value = "开通申请-流程节点执行", notes = "流程节点执行")
@PostMapping(value = "/execueFlow") @PostMapping(value = "/execueFlow")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Map<String, String>> executeFlow(@RequestBody Map<String, Object> params) { public ResponseModel<Map<String, String>> executeFlow(@RequestBody Map<String, Object> params) {
jyjcOpeningApplicationServiceImpl.executedFlow(params); jyjcOpeningApplicationServiceImpl.executedFlow(params);
HashMap<String, String> result = new HashMap<>(); HashMap<String, String> result = new HashMap<>();
...@@ -196,8 +200,9 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -196,8 +200,9 @@ public class JyjcOpeningApplicationController extends BaseController {
* @return * @return
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "撤回业务开通申请", notes = "撤回业务开通申请") @ApiOperation(httpMethod = "GET", value = "开通申请-撤回业务开通申请", notes = "撤回业务开通申请")
@GetMapping(value = "/rollBackFlow") @GetMapping(value = "/rollBackFlow")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> overflow(@RequestParam("sequenceNbr") String sequenceNbr, public ResponseModel<Object> overflow(@RequestParam("sequenceNbr") String sequenceNbr,
@RequestParam("instanceId") String instanceId, @RequestParam("instanceId") String instanceId,
@RequestParam("nextTaskId") String nextTaskId) { @RequestParam("nextTaskId") String nextTaskId) {
...@@ -257,7 +262,8 @@ public class JyjcOpeningApplicationController extends BaseController { ...@@ -257,7 +262,8 @@ public class JyjcOpeningApplicationController extends BaseController {
*/ */
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/discard") @PutMapping(value = "/discard")
@ApiOperation(httpMethod = "PUT", value = "作废", notes = "作废") @ApiOperation(httpMethod = "PUT", value = "开通申请-作废", notes = "作废")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Boolean> doDiscard(@RequestBody Map<String, Object> params) { public ResponseModel<Boolean> doDiscard(@RequestBody Map<String, Object> params) {
String sequenceNbr = (String) params.get("sequenceNbr"); String sequenceNbr = (String) params.get("sequenceNbr");
String remark = (String) params.get("remark"); String remark = (String) params.get("remark");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment