From 66c49d8b173c5937a2721f8e9b3ae849844f4b72 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 10 九月 2024 18:36:13 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 4 ++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 38 +++++++++++++++++++++++---------------
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 6 +++---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java | 3 +++
4 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
index e3b57d9..3d751ba 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java
@@ -30,6 +30,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index c2292a7..f26fc55 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -1,13 +1,9 @@
package com.doumee.cloud.openapi;
-import cn.emay.sdk.util.AES;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.config.jwt.JwtTokenUtil;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
@@ -61,25 +57,32 @@
@LoginNoRequired
@ApiOperation("token瑙ｆ瀽")
@GetMapping("/water/decodeToken")
- public ApiResponse<Map<String,Object>> decodeToken(@RequestParam String token) {
+ public Map<String,Object> decodeToken(@RequestParam String token) {
HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
hkBaseTokenRequest.setToken(token);
- return ApiResponse.success(this.decodeTokenForHk(hkBaseTokenRequest));
+ return this.decodeTokenForHk(hkBaseTokenRequest);
}
-
public Map<String,Object> decodeTokenForHk(HkBaseTokenRequest hkBaseTokenRequest){
+ Map<String,Object> result = new HashMap<>();
+ result.put("code","0");
+ result.put("msg","success");
if(Objects.isNull(hkBaseTokenRequest)||StringUtils.isBlank(hkBaseTokenRequest.getToken())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"token鍙傛暟涓虹┖");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
String redisToken = (String) redisTemplate.opsForValue().get(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(redisToken)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
-
String userName = DESUtil.verifyHkToken(hkBaseTokenRequest.getToken());
if(StringUtils.isBlank(userName)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
//鏌ヨ鐢ㄦ埛淇℃伅鏄惁瀛樺湪
SystemUser systemUser = new SystemUser();
@@ -87,14 +90,19 @@
systemUser.setDeleted(Boolean.FALSE);
SystemUser queryBean = systemUserService.findOne(systemUser);
if(Objects.isNull(queryBean)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"token瑙ｆ瀽澶辫触");
+ result.put("code","-1");
+ result.put("msg","token鍙傛暟涓虹┖");
+ return result;
}
if(Constants.equalsInteger(queryBean.getStatus(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鐢ㄦ埛宸茬鐢�");
+ result.put("code","-2");
+ result.put("msg","鐢ㄦ埛宸茬鐢�");
+ return result;
}
redisTemplate.delete(Constants.REDIS_HK_TOKEN_KEY+hkBaseTokenRequest.getToken());
- Map<String,Object> result = new HashMap<>();
- result.put("userId",userName);
+ Map<String,Object> data = new HashMap<>();
+ data.put("userId",userName);
+ result.put("data",data);
return result;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 45f38c0..68ecacd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -939,11 +939,11 @@
public static String getMenuUrl(Integer type,String token){
String menuId = HKConstants.MenuPageId.zhaf;
if(Constants.equalsInteger(type,Constants.ONE)){
-
+ menuId = HKConstants.MenuPageId.wyhq;
}else if(Constants.equalsInteger(type,Constants.TWO)){
-
+ menuId = HKConstants.MenuPageId.xzbg;
}else if(Constants.equalsInteger(type,Constants.THREE)){
-
+ menuId = HKConstants.MenuPageId.yyzx;
}
log.info("銆愭捣搴疯幏鍙栧伐浣滃彴鑿滃崟鍏嶅瘑鐧婚檰璋冩暣鍦板潃銆�================寮�濮�====menuId:"+menuId+"==token:"+token);
try {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 2d860ad..a3d460f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -540,7 +540,7 @@
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
- approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鎵�");
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"澶勭悊涓�");
approve.setTitle("瀹℃壒浜�");
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
@@ -848,7 +848,7 @@
}else {
if((waitList.size()> 0 || otherPassList.size()>0)){
Approve waitModel = new Approve();
- waitModel.setApproveType(Constants.ONE);
+ waitModel.setApproveType(Constants.ZERO);
if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
waitModel.setStatus(Constants.approveStatus.pass);
waitModel.setType(Constants.ONE);
--
Gitblit v1.9.3