From 05709d6c78e27507192bc41cb10dcdf20dc98514 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 九月 2024 15:05:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 41 ++++++++++++--------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java | 3 +
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 +
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 8 ++--
7 files changed, 61 insertions(+), 40 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/admin/VisitsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
index 35c331f..1178e83 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/VisitsCloudController.java
@@ -98,7 +98,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:visits:query")
public ApiResponse<PageData<Visits>> findPage (@RequestBody PageWrap<Visits> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId());
+// pageWrap.getModel().setReceptMemberId(getLoginUser(token).getMemberId());
return ApiResponse.success(visitsService.findPage(pageWrap));
}
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..d687420 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);
@@ -802,7 +802,7 @@
private List<Approve> getLevelInfoFromList(Approve level,List<Approve> approveGroupList) {
List<Approve> list = new ArrayList<>();
if(Constants.equalsInteger(level.getApproveType(),Constants.TWO)){
- level.setApproveType(Constants.ZERO);
+ level.setApproveType(Constants.TWO);
//濡傛灉鏄崟浜哄鎵�
list.add(level);
return list;
@@ -829,11 +829,17 @@
waitModel.setType(Constants.ZERO);
waitModel.setTitle(StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"));
waitModel.setStatus(Constants.equalsInteger(waitList.get(Constants.ZERO).getStatus(),Constants.ONE)?Constants.ONE:Constants.ZERO);
- waitModel.setStatusInfo("澶勭悊涓�");
- if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)
- ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
- waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+ if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
+ waitModel.setStatusInfo("寰呭鐞�");
+ }else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.auditIng)){
+ waitModel.setStatusInfo("澶勭悊涓�");
}
+
+ waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+// if(Constants.equalsInteger(level.getStatus(),Constants.approveStatus.auditIng)
+// ||Constants.equalsInteger(level.getStatus(),Constants.approveStatus.pass)){
+// waitModel.setMemberName(waitList.size() +"浜轰細绛�");
+// }
if(CollectionUtils.isNotEmpty(waitList)){
waitModel.setCreateDate(waitList.get(Constants.ZERO).getCreateDate());
}
@@ -848,15 +854,17 @@
}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);
waitModel.setTitle("瀹℃壒浜猴紙鎶勯�佹垨绛惧鎵逛汉锛�");
}else{
- waitModel.setType(Constants.ZERO);
- waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
waitModel.setStatus(passList.size()>0?Constants.ONE:Constants.ZERO);
+ waitModel.setType(Constants.ZERO);
+ //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
+ waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
+
}
List<Approve> approveList = new ArrayList<>();
approveList.addAll(waitList);
@@ -870,7 +878,10 @@
if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.pass)){
waitModel.setMemberName("宸叉妱閫�"+ approveList.size() +"浜�");
}else if(Constants.equalsInteger(waitModel.getStatus(),Constants.approveStatus.wait)){
- waitModel.setMemberName("澶勭悊涓�");
+ waitModel.setMemberName(waitList.size() +"浜烘垨绛�");
+ waitModel.setStatusInfo("寰呭鐞�");
+ }else{
+ waitModel.setStatusInfo("澶勭悊涓�");
}
waitModel.setApproveList(approveList);
list.add(waitModel);
@@ -1225,8 +1236,6 @@
if(Objects.nonNull(visits)){
if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
- }else{
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁瀵硅薄!璇峰埛鏂伴噸璇�");
}
}
@@ -1329,9 +1338,9 @@
String info = "";
List<String> memberNameList = Arrays.asList(memberNames.split(","));
if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
- info = "寰� "+memberNameList.get(0)+" 澶勭悊涓�";
+ info = "寰�"+memberNameList.get(0)+"澶勭悊涓�";
}else{
- info = "寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑";
+ info = "寰�"+memberNameList.get(0)+"绛�"+memberNameList.size()+"浜哄鐞嗕腑";
}
//鏇存柊璇ヤ笟鍔℃暟鎹殑鎵�鏈夎褰曚俊鎭�
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
@@ -1395,9 +1404,9 @@
notices.setParam5(memberNames);
notices.setRemark(nextDealApprove.getMemberName());
if(Constants.equalsInteger(memberNameList.size(),Constants.ONE)){
- notices.setInfo("寰� "+memberNameList.get(0)+" 澶勭悊涓�");
+ notices.setInfo("寰�"+memberNameList.get(0)+"澶勭悊涓�");
}else{
- notices.setInfo("寰� "+memberNameList.get(0)+" 绛�"+memberNameList.size()+"浜哄鐞嗕腑");
+ notices.setInfo("寰�"+memberNameList.get(0)+"绛�"+memberNameList.size()+"浜哄鐞嗕腑");
}
noticesJoinMapper.insert(newNotices);
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
index 9150d38..b3b0653 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -27,6 +27,7 @@
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 瀹℃壒妯＄増淇℃伅琛⊿ervice瀹炵幇
@@ -99,7 +100,7 @@
param.setType(Constants.formatIntegerNum(param.getType()));
param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam()));
param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam()));
- param.setApproveType(Constants.formatIntegerNum(param.getApproveType()));
+ param.setApproveType(Objects.isNull(param.getApproveType())?Constants.TWO:param.getApproveType());
level ++ ;
}
//鍏堟竻闄ゅ師鏉ユ墍鏈夌殑灏遍櫔閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 3d3bcbe..32c7945 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -144,7 +144,7 @@
createNotices.setSendacopy(Constants.ZERO);
createNotices.setParam2("0");
createNotices.setParam3(hiddenDanger.getLoginUserInfo().getMemberId().toString());
- createNotices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ createNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(createNotices);
//瀛樺偍澶勭悊浜虹殑閫氱煡娑堟伅
@@ -163,7 +163,7 @@
notices.setStatus(Constants.ZERO);
notices.setSendacopy(Constants.ZERO);
notices.setReaded(Constants.ZERO);
- notices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(notices);
@@ -514,13 +514,13 @@
newNotices.setCreateDate(new Date());
newNotices.setParam2("0");
newNotices.setUserId(hiddenDanger.getCheckUserId());
- newNotices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ newNotices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.insert(newNotices);
notices.setStatus(Constants.ONE);
notices.setParam2("3");
notices.setEditDate(new Date());
notices.setReaded(Constants.ONE);
- notices.setInfo("寰� "+member.getName()+" 澶勭悊");
+ notices.setInfo("寰�"+member.getName()+"澶勭悊");
noticesJoinMapper.updateById(notices);
}
}
--
Gitblit v1.9.3