pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改企业微信登录

lwx_dev
erdanergou 3 years ago
parent
822c05c82b
commit
a34e51d0db
1 changed files with 16 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java

35
src/main/java/com/dreamchaser/depository_manage/controller/QyWxOperationController.java
View File

@ -209,8 +209,7 @@ public class QyWxOperationController {
}).start(); }).start();
} }
} } else if (templateCardType.contains("out")) {
else if (templateCardType.contains("out")) {
// 如果点击的是出库审核 // 如果点击的是出库审核
// 开启线程处理审批 // 开启线程处理审批
new Thread(new Runnable() { new Thread(new Runnable() {
@ -291,10 +290,12 @@ public class QyWxOperationController {
userByPort.setInstant(Instant.now()); userByPort.setInstant(Instant.now());
AuthenticationTokenPool.addUserToken(token, userByPort); AuthenticationTokenPool.addUserToken(token, userByPort);
HttpSession session = request.getSession(); HttpSession session = request.getSession();
session.setAttribute("token" + userByPort.getId(), token); session.setAttribute("userToken", token);
session.setAttribute("userToken", userByPort); session.setAttribute("userKey", key);
session.setMaxInactiveInterval(1800); session.setMaxInactiveInterval(60 * 60 * 3);
mv.addObject("user", userByPort); mv.addObject("user", userByPort);
redisTemplate.opsForValue().set(key, token);
redisTemplate.expire(key, 3 * 60 * 60, TimeUnit.SECONDS);
try { try {
response.sendRedirect("https://jy.hxgk.group/"); response.sendRedirect("https://jy.hxgk.group/");
} catch (IOException e) { } catch (IOException e) {
@ -338,7 +339,7 @@ public class QyWxOperationController {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -503,8 +504,7 @@ public class QyWxOperationController {
PrintWriter writer = response.getWriter(); PrintWriter writer = response.getWriter();
writer.println(sEchoStr); writer.println(sEchoStr);
writer.close(); writer.close();
} } else {
else {
String ToUserName = (String) map.get("ToUserName"); String ToUserName = (String) map.get("ToUserName");
String Encrypt = (String) map.get("Encrypt"); String Encrypt = (String) map.get("Encrypt");
String AgentID = (String) map.get("AgentID"); String AgentID = (String) map.get("AgentID");
@ -620,8 +620,7 @@ public class QyWxOperationController {
// 获取第二个节点数据 // 获取第二个节点数据
ApprovalInfo_SpRecord approvalInfo_spRecord = spRecord_list.get(1); ApprovalInfo_SpRecord approvalInfo_spRecord = spRecord_list.get(1);
if(approvalInfo_spRecord != null) if (approvalInfo_spRecord != null) {
{
// 获取第二个节点中审批人信息 // 获取第二个节点中审批人信息
List<ApprovalInfo_Details> details = approvalInfo_spRecord.getDetails(); List<ApprovalInfo_Details> details = approvalInfo_spRecord.getDetails();
// 获取仓储中心负责人标签下的成员 // 获取仓储中心负责人标签下的成员
@ -641,25 +640,25 @@ public class QyWxOperationController {
} }
if (!flagForLabel) { if (!flagForLabel) {
// 如果第二个节点不是标签节点 // 如果第二个节点不是标签节点
if(approval_count > 1){ if (approval_count > 1) {
// 如果完成审批的节点数大于1 // 如果完成审批的节点数大于1
flagForDepository = 3; flagForDepository = 3;
// 如果已经完成该审批记录，则进行删除 // 如果已经完成该审批记录，则进行删除
redisTemplate.delete(spNo); redisTemplate.delete(spNo);
}else{ } else {
// 如果当前是第一个节点 // 如果当前是第一个节点
flagForFirst = false; flagForFirst = false;
} }
} else { } else {
// 如果第二个节点是标签节点 // 如果第二个节点是标签节点
if(approval_count > 2){ if (approval_count > 2) {
// 如果完成审批的节点数大于2 // 如果完成审批的节点数大于2
flagForDepository = 3; flagForDepository = 3;
// 如果已经完成该审批记录，则进行删除 // 如果已经完成该审批记录，则进行删除
redisTemplate.delete(spNo); redisTemplate.delete(spNo);
}else{ } else {
// 如果当前并不是标签节点后 // 如果当前并不是标签节点后
flagForDepository = 2; flagForDepository = 2;
} }
@ -678,8 +677,7 @@ public class QyWxOperationController {
} }
}).start(); }).start();
} } else if (QyWxConfig.stockTaking_approval_template_id.equals(approvalInfo.getTemplateId())) {
else if (QyWxConfig.stockTaking_approval_template_id.equals(approvalInfo.getTemplateId())) {
// 如果是库存盘点审批 // 如果是库存盘点审批
// 开启一个线程用于进行处理 // 开启一个线程用于进行处理
ApprovalInfo_Details finalApprovalInfo_details = approvalInfo_details; ApprovalInfo_Details finalApprovalInfo_details = approvalInfo_details;
@ -689,8 +687,7 @@ public class QyWxOperationController {
stockTakingService.reviewByQyWxApproval(mainId, finalApprovalInfo_details, crypt, spStatus, approvalInfo.getSpNo()); stockTakingService.reviewByQyWxApproval(mainId, finalApprovalInfo_details, crypt, spStatus, approvalInfo.getSpNo());
} }
}).start(); }).start();
} } else if (QyWxConfig.in_approval_template_id.equals(approvalInfo.getTemplateId())) {
else if(QyWxConfig.in_approval_template_id.equals(approvalInfo.getTemplateId())){
// 如果是入库审批 // 如果是入库审批
// 开启一个线程用于进行处理 // 开启一个线程用于进行处理
ApprovalInfo_Details finalApprovalInfo_details = approvalInfo_details; ApprovalInfo_Details finalApprovalInfo_details = approvalInfo_details;
@ -698,7 +695,7 @@ public class QyWxOperationController {
@Override @Override
public void run() { public void run() {
depositoryRecordService.reviewByQyWxApprovalIn(mainId, finalApprovalInfo_details,crypt,spStatus,spNo); depositoryRecordService.reviewByQyWxApprovalIn(mainId, finalApprovalInfo_details, crypt, spStatus, spNo);
} }
}).start(); }).start();

Write Preview
Loading…
Cancel
Save