guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1、bug修复-系统异常后事务未回滚 

2、指定人员打回
liujun0703-新项目开发^2^2
liujun 2024-06-11 17:42:13 +08:00
parent 813fd36a88
commit 4d59fba200
13 changed files with 501 additions and 414 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/zcloud/controller/xgf/XgfUserController.java
View File

@ -65,13 +65,14 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/approvePlus")
@ResponseBody
public Object approvePlus(@RequestParam(value="chengNuoShu",required=false) MultipartFile[] chengNuoShu) throws Exception {
PageData request = this.getPageData();
xgfUserService.approvePlus(request,chengNuoShu);
public Object approvePlus(@RequestParam(value = "chengNuoShu", required = false) MultipartFile[] chengNuoShu) throws Exception {
PageData response = new PageData();
response.put("result", "success");
PageData request = this.getPageData();
xgfUserService.approvePlus(request, chengNuoShu);
response.put("data", request);
return response;
}
/**
@ -79,18 +80,26 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/approveMax")
@ResponseBody
public Object approveMax(@RequestParam(value="chengNuoShu",required=false) MultipartFile[] chengNuoShu) throws Exception {
public Object approveMax(@RequestParam(value = "chengNuoShu", required = false) MultipartFile[] chengNuoShu) throws Exception {
PageData request = this.getPageData();
xgfUserService.approveMax(request,chengNuoShu);
PageData response = new PageData();
response.put("result", "success");
response.put("code","0");
response.put("data", request);
try {
xgfUserService.approveMax(request, chengNuoShu);
} catch (Exception e) {
e.printStackTrace();
response.put("code", "9999");
response.put("errorMessage", e.getMessage());
return response;
}
return response;
}
@RequestMapping(value = "/regulatoryUserList")
@ResponseBody
public Object regulatoryUserList() throws Exception{
public Object regulatoryUserList() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
@ -132,7 +141,7 @@ public class XgfUserController extends BaseController {
@RequestMapping(value = "/getAppointApproveList")
@ResponseBody
public Object getAppointApproveList(Page page) throws Exception{
public Object getAppointApproveList(Page page) throws Exception {
PageData request = this.getPageData();
request.put("USER_ID", Jurisdiction.getUSER_ID());
page.setPd(request);
@ -145,11 +154,11 @@ public class XgfUserController extends BaseController {
@RequestMapping(value = "/getWorkTask")
@ResponseBody
public Object getWorkTask() throws Exception{
public Object getWorkTask() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
response.put("list",xgfUserService.getWorkTask(request));
response.put("list", xgfUserService.getWorkTask(request));
return response;
}
@ -159,7 +168,7 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/appointApprove")
@ResponseBody
public Object appointApprove() throws Exception{
public Object appointApprove() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("result", "success");
@ -172,7 +181,7 @@ public class XgfUserController extends BaseController {
*/
@RequestMapping(value = "/getApproveInfo")
@ResponseBody
public Object getApproveInfo() throws Exception{
public Object getApproveInfo() throws Exception {
PageData request = this.getPageData();
PageData response = new PageData();
response.put("list", xgfUserService.getApproveInfo(request));

11
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenCharge.java
View File

@ -54,6 +54,7 @@ public class GuFenCharge extends NodeSwitchComponent {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -108,16 +109,24 @@ public class GuFenCharge extends NodeSwitchComponent {
if (StringUtils.isNotBlank(info.getATTORNEY())) {
xgfUserService.saveLog(info, "1", "0");
return "GuFenWeiTuo";
}else {
} else {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
return "GuFenSupervise";
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
return "";
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
return true;
}

14
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java
View File

@ -50,9 +50,8 @@ public class GuFenSupervise extends NodeComponent {
@Override
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -67,10 +66,10 @@ public class GuFenSupervise extends NodeComponent {
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
@ -88,11 +87,18 @@ public class GuFenSupervise extends NodeComponent {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
info.setErrorMsg(e.getMessage());
e.printStackTrace();
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS())) {
return true;
}

15
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoCharge.java
View File

@ -53,11 +53,9 @@ public class GuFenWeiTuoCharge extends NodeComponent {
@Override
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -93,7 +91,7 @@ public class GuFenWeiTuoCharge extends NodeComponent {
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
@ -107,15 +105,20 @@ public class GuFenWeiTuoCharge extends NodeComponent {
// 清空指针
info.setIterator("");
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
return true;
}

10
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java
View File

@ -56,6 +56,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -73,7 +74,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
@ -91,11 +92,18 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
xgfUserService.saveLog(info, info.getSTATUS(), "1");
info.setIterator("");
}
} catch (Exception e) {
info.setErrorMsg(e.getMessage());
e.printStackTrace();
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
return true;
}

23
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanCharge.java
View File

@ -52,9 +52,10 @@ public class JiTuanCharge extends NodeSwitchComponent {
@Override
@SuppressWarnings("all")
public String processSwitch() throws Exception {
System.out.println(getName()+ "节点");
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -65,12 +66,12 @@ public class JiTuanCharge extends NodeSwitchComponent {
PageData entity = xgfUserMapper.findById(condition);
condition.clear();
condition.put("XGF_USER_DETAILS_ID",flows.getString("FLOWS_ID"));
condition.put("XGF_USER_DETAILS_ID", flows.getString("FLOWS_ID"));
PageData userInfo = xgfUserDetailsMapper.findById(condition);
// 如果不是当前流程，进入下一流程判断
if (!"1".equals(info.getIterator())) {
if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))){
if (userInfo.get("ATTORNEY") != null && StringUtils.isNotBlank(userInfo.getString("ATTORNEY"))) {
return "WeiTuo";
}
return "JiTuanSupervise";
@ -81,10 +82,10 @@ public class JiTuanCharge extends NodeSwitchComponent {
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
return "";
} else {
xgfFlowsMapper.edit(flows);
@ -106,18 +107,26 @@ public class JiTuanCharge extends NodeSwitchComponent {
}
// 保存操作记录
if (StringUtils.isNotBlank(info.getATTORNEY())){
if (StringUtils.isNotBlank(info.getATTORNEY())) {
xgfUserService.saveLog(info, "1", "0");
return "WeiTuo";
}else {
} else {
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}
return "JiTuanSupervise";
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
return "";
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "1".equals(info.getIterator())) {
return true;
}

10
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java
View File

@ -54,6 +54,7 @@ public class JiTuanSupervise extends NodeComponent {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -70,7 +71,7 @@ public class JiTuanSupervise extends NodeComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
@ -88,11 +89,18 @@ public class JiTuanSupervise extends NodeComponent {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS())) {
return true;
}

12
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoCharge.java
View File

@ -55,8 +55,8 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
@Override
public void process() throws Exception {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -75,7 +75,7 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
} else {
xgfFlowsMapper.edit(flows);
condition.clear();
@ -92,12 +92,18 @@ public class JiTuanWeiTuoCharge extends NodeComponent {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "2".equals(info.getIterator())) {
return true;
}

10
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java
View File

@ -55,6 +55,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
System.out.println(getName() + "节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -72,7 +73,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
@ -89,12 +90,19 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())) {
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "3".equals(info.getIterator())) {
return true;
}

8
src/main/java/com/zcloud/flow/xgf/YiBan/YiBanCharge.java
View File

@ -57,6 +57,7 @@ public class YiBanCharge extends NodeComponent {
public void process() throws Exception {
System.out.println("YiBanCharge节点");
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
PageData flows = xgfFlowsMapper.findById(condition);
@ -93,11 +94,18 @@ public class YiBanCharge extends NodeComponent {
}
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
}catch (Exception e){
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())){
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS()) && "0".equals(info.getIterator())) {
return true;
}

13
src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java
View File

@ -57,7 +57,7 @@ public class YiBanSupervise extends NodeComponent {
public void process() throws Exception {
System.out.println(getName());
XgfFlowDto info = this.getRequestData();
try {
PageData condition = new PageData();
condition.put("FLOWS_ID", info.getFLOWS_ID());
@ -102,10 +102,10 @@ public class YiBanSupervise extends NodeComponent {
flows.put("APPOINT_ONE_TIME", DateUtil.getTime());
flows.put("APPOINT_ONE_STATUS", info.getSTATUS());
flows.put("APPOINT_ONE_OPINION", info.getOPINION());
flows.put("OPINION",info.getOPINION());
flows.put("OPINION", info.getOPINION());
if ("0".equals(info.getSTATUS())) {
// 打回至相关方端
xgfUserService.repulse(flows,info);
xgfUserService.repulse(flows, info);
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "0");
} else {
@ -122,11 +122,18 @@ public class YiBanSupervise extends NodeComponent {
// 保存操作记录
xgfUserService.saveLog(info, info.getSTATUS(), "1");
}
} catch (Exception e) {
e.printStackTrace();
info.setErrorMsg(e.getMessage());
}
}
@Override
public boolean isEnd() {
XgfFlowDto info = this.getRequestData();
if (StringUtils.isNotBlank(info.getErrorMsg())){
throw new RuntimeException(info.getErrorMsg());
}
if ("0".equals(info.getSTATUS())) {
return true;
}

2
src/main/java/com/zcloud/flow/xgf/util/XgfFlowDto.java
View File

@ -49,4 +49,6 @@ public class XgfFlowDto {
// 打回节点游标
private String BACK_STEP;
private String errorMsg;
private String code;
}

20
src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
View File

@ -1007,7 +1007,7 @@ public class XgfUserServiceImpl implements XgfUserService {
key.put("OPINION", flows.get("OPINION"));
Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key);
if (result == null || !"succeed".equals(result.get("result"))) {
throw new RuntimeException("请求失败");
info.setErrorMsg("请求失败");
}
xgfUserMapper.edit(entity);
this.clearInfo(flows);
@ -1017,15 +1017,19 @@ public class XgfUserServiceImpl implements XgfUserService {
PageData condition = new PageData();
condition.put("FLOWS_ID",flows.getString("FLOWS_ID"));
PageData flowEntity = xgfFlowsMapper.findById(condition);
if (flowEntity != null && flowEntity.size() > 0 && flowEntity.getString("FLOWS_STEP").equals(info.getBACK_STEP())){
throw new RuntimeException("不能自己打回到自己");
if (flowEntity != null && flowEntity.size() > 0 && (flowEntity.get("FLOWS_STEP").toString()).equals(info.getBACK_STEP())){
info.setErrorMsg("不能自己打回到自己");
}
flowEntity.put("FLOWS_STEP", info.getBACK_STEP());
xgfFlowsMapper.edit(flowEntity);
// 2、保存审批记录
this.saveLog(info, "0", "0");
}
}
@Override
@Transactional
public void approveMax(PageData request, MultipartFile[] chengNuoShu) throws Exception {
if (chengNuoShu != null && chengNuoShu.length > 0) {
request.put("APPOINT_ANNEX", Warden.saveFile(Warden.createZip(chengNuoShu), Jurisdiction.getCORPINFO_ID()));
@ -1070,16 +1074,16 @@ public class XgfUserServiceImpl implements XgfUserService {
if (request.get("APPOINT_ANNEX") != null) {
info.setAPPOINT_ANNEX(request.getString("APPOINT_ANNEX"));
}
info.setBACK_STEP(request.getString("BACK_STEP"));
// 进行数据审核
LiteflowResponse response = flowExecutor.execute2Resp("chain1", info);
if (!response.isSuccess()) {
if (response.isSuccess()) {
System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
} else {
Exception e = response.getCause();
e.printStackTrace();
System.out.println(response.getMessage());
throw new RuntimeException("系统异常");
} else {
System.out.println("流程信息:" + response.getExecuteStepStrWithTime());
throw new RuntimeException(e.getMessage());
}
}