From 8f00a10fa10eff8ded7374a87a582f2c2b42569b Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 15 七月 2024 16:33:04 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentListResponse.java | 16 +++
server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 2
server/web/src/main/java/com/doumee/api/web/ApiController.java | 6 +
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java | 37 ++----
server/service/src/main/java/com/doumee/dao/business/model/Users.java | 8 +
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java | 6 +
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 36 ++++++
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 89 +++++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 84 ++++++++++++----
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentInfoRequest.java | 4
server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java | 2
13 files changed, 243 insertions(+), 51 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
index 18a7efb..6b05d39 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,8 +12,13 @@
/**
* 鐖剁骇缂栫爜
*/
+
+ @ApiModelProperty(value = "C绔紶鈥淐USTOMER鈥�, B绔紶'BUSINESS")
private String userType;
+ @ApiModelProperty(value = "token" , hidden = true)
private String token;
private String openid;
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭" , hidden = true)
+ private Long userId;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentInfoRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentInfoRequest.java
index 85a8669..003c8f6 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentInfoRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentInfoRequest.java
@@ -9,8 +9,8 @@
@Data
public class ZTContentInfoRequest extends ZTBaseRequst{
/**
- * 涓存椂绁ㄦ嵁
+ * 鍐呭涓婚敭
*/
- private String articleId;
+ private String id;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
index 9e4c50f..f161c97 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
@@ -8,40 +8,31 @@
@Data
public class ZTContentListRequest extends ZTBaseRequst {
- /**
- * 鐩綍鍞竴缂栫爜锛岀洰褰曞敮涓�缂栫爜
- */
@ApiModelProperty(value = "鍒嗙被缂栫爜")
private String catalogCode;
- /**
- * 鏄惁缃《锛岄粯璁alse
- */
+
+ @ApiModelProperty(value = " 鏄惁缃《锛岄粯璁alse" , hidden = true)
private Boolean isTop;
- /**
- * 褰撳墠椤�
- */
+
@ApiModelProperty(value = "褰撳墠椤�")
private String pageNum;
- /**
- * 姣忛〉鏉℃暟
- */
+
@ApiModelProperty(value = "姣忛〉鏉℃暟")
private String pageSize;
- /**
- * 鎼滅储鍏抽敭瀛楋紝鏍规嵁鏍囬鎼滅储鍏抽敭瀛�
- */
+
@ApiModelProperty(value = "鎼滅储鍏抽敭瀛�")
private String search;
- /**
- * 鎺掑簭鏂瑰紡锛孨ORMAL - 榛樿
- * HOT - 鏈�鐑�
- * LATEST - 鏈�鏂�
- */
+
+ @ApiModelProperty(value = "鍐呭鏌ヨ鏉′欢")
+ private String query;
+
+ @ApiModelProperty(value = "鏍囩")
+ private String tagCodes;
+
@ApiModelProperty(value = "鎺掑簭鏂瑰紡 NORMAL - 榛樿锛汬OT - 鏈�鐑紱LATEST - 鏈�鏂帮紱")
private String sortType;
- /**
- * 澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛紝澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛�
- */
+
+ @ApiModelProperty(value = "澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛紝澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛�",hidden = true)
private List<String> tagCode;
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java
index e7b9d60..e8511dd 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java
@@ -47,6 +47,6 @@
/**
* 瀛愮洰褰�
*/
-// private List<ZTCatalogInfoResponse> childCatalog;
+ private List<ZTTagInfoResponse> childTagList;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentListResponse.java
index 611d162..9bc6d41 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentListResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentListResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -13,62 +14,77 @@
/**
* 浣滆��
*/
+ @ApiModelProperty(value = "浣滆��")
private String author;
/**
* 灏侀潰鍥�
*/
+ @ApiModelProperty(value = "灏侀潰鍥�")
private String coverImage;
/**
* 鏀惰棌閲�
*/
+ @ApiModelProperty(value = "鏀惰棌閲�")
private double favoriteCount;
/**
* 鏂囩珷ID
*/
+ @ApiModelProperty(value = "鏂囩珷ID")
private String id;
/**
* 鏄惁缃《
*/
+ @ApiModelProperty(value = "鏄惁缃《")
private String isTop;
/**
* 璇█缂栫爜
*/
+ @ApiModelProperty(value = "璇█缂栫爜")
private String langCode;
/**
* 鐐硅禐閲�
*/
+ @ApiModelProperty(value = "鐐硅禐閲�")
private double likeCount;
/**
* 鍙戝竷鏃ユ湡
*/
+ @ApiModelProperty(value = "鍙戝竷鏃ユ湡")
private String publishDate;
/**
* 鍙戝竷缁勭粐
*/
+ @ApiModelProperty(value = "鍙戝竷缁勭粐")
private String publishDepartment;
/**
* 闃呰閲�
*/
+ @ApiModelProperty(value = "闃呰閲�")
private double readCount;
/**
* 鎺掑簭
*/
+ @ApiModelProperty(value = "鎺掑簭")
private String sort;
/**
* 瀛愭爣棰�
*/
+ @ApiModelProperty(value = "瀛愭爣棰�")
private String subtitle;
/**
* 鏍囬
*/
+ @ApiModelProperty(value = "鏍囬")
private String title;
/**
* 鏂囩珷绫诲瀷
*/
+ @ApiModelProperty(value = "鏂囩珷绫诲瀷")
private String type;
/**
* 鏂囩珷澶栭摼URL锛岃棰戝拰鍏朵粬璺宠浆閾炬帴绫诲瀷
*/
+ @ApiModelProperty(value = "鏂囩珷澶栭摼URL锛岃棰戝拰鍏朵粬璺宠浆閾炬帴绫诲瀷")
private String url;
}
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
index e427737..132bfa8 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/JwtTokenUtil.java
@@ -49,6 +49,8 @@
public static final String HEADER_KEY = "token";
//鍙栧�煎悕绉�
public static final String UserId_Name = "AppUserId";
+ //鍙栧�煎悕绉�
+ public static final String UserType = "UserType";
//鍔犲瘑瀵嗛挜
private final static String jwtSecret = "MhAjU9poLf8ko54K25XBDtonaL33vtt1";
//杩囨湡鏃堕棿(s) 86400L=1澶� 604800L=7澶�
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index a5b106c..00d3a0d 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -111,6 +111,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
+ request.setAttribute(JwtTokenUtil.UserType, Constants.CUSTOMER);
return true;
} catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
@@ -142,6 +143,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
request.setAttribute(JwtTokenUtil.UserId_Name, userId);
+ request.setAttribute(JwtTokenUtil.UserType, Constants.BUSINESS);
return true;
} catch (IllegalArgumentException | JwtException e) {
throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 0db86a1..8b19260 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -38,7 +38,7 @@
public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
public static final String REDIS_TOKEN_KEY = "token_";
- public static final String CUSTOMER = "CUSTOMER";
+ public static final String CUSTOMER = "CUSTOMER";
public static final String BUSINESS = "BUSINESS";
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Users.java b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
index 13c869f..962847e 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Users.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Users.java
@@ -150,6 +150,14 @@
@ExcelColumn(name="浼佷笟浜岀淮鐮佸浘鐗囧湴鍧�")
private String companyQrcodeImg;
+ @ApiModelProperty(value = "涓彴涓存椂绁ㄦ嵁杩囨湡鏃堕棿")
+ @ExcelColumn(name="涓彴涓存椂绁ㄦ嵁杩囨湡鏃堕棿")
+ private Date tokenDate;
+
+ @ApiModelProperty(value = "涓彴涓存椂绁ㄦ嵁")
+ @ExcelColumn(name="涓彴涓存椂绁ㄦ嵁")
+ private String token;
+
@ApiModelProperty(value = "閭")
@ExcelColumn(name="閭")
private String email;
diff --git a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
index 1ed837e..dd08ae9 100644
--- a/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -1,8 +1,8 @@
package com.doumee.service.business;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
-import com.doumee.biz.zbom.model.zhongtai.response.ZTCatalogInfoResponse;
-import com.doumee.biz.zbom.model.zhongtai.response.ZTTagInfoResponse;
+import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.response.*;
import java.util.List;
@@ -13,8 +13,40 @@
*/
public interface GetZhongTaiDataService {
+ /**
+ * 鍒嗙被鏁版嵁
+ * @param param
+ * @return
+ */
List<ZTCatalogInfoResponse> getCatalogList(ZTCatalogListRequest param);
+ /**
+ * 鏍囩鏁版嵁
+ * @param param
+ * @return
+ */
List<ZTTagInfoResponse> getCataLogTagList(ZTCatalogListRequest param);
+ /**
+ * 鐖跺瓙绾у垎绫绘暟鎹� 鍒嗙被+鏍囩
+ * @param ztCatalogListRequest
+ * @return
+ */
+ List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest);
+
+ /**
+ * 鍐呭鍒嗛〉
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTContentListResponse> pageContentList(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * 鍐呭璇︽儏
+ * @param id 涓氬姟涓婚敭
+ * @param userType 鐢ㄦ埛绫诲瀷
+ * @param userId 鐢ㄦ埛涓婚敭
+ * @return
+ */
+ ZTContentInfoResponse getContentInfo(String id, String userType, Long userId);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index f466c22..dc58bee 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -5,13 +5,16 @@
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
+import com.doumee.biz.zbom.model.zhongtai.ZTContentInfoRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.IamInterfaceLogMapper;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.UsersMapper;
import com.doumee.service.business.GetZhongTaiDataService;
+import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,6 +36,9 @@
@Autowired
private MemberMapper memberMapper;
+
+ @Autowired
+ private UsersMapper usersMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -71,6 +77,89 @@
}
+ /**
+ * 鑾峰彇鐖跺瓙绾х粨鏋勬暟鎹垪琛�
+ * 蹇楄瑁呬慨 zb_deco 浜у搧 product_intro 璧勮product_info 鍏ㄥ眿妗堜緥 whole_case
+ * 鑾峰彇鐖跺瓙绾х粨鏋勬暟鎹�
+ * @return
+ */
+ @Override
+ public List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest){
+ if(Objects.isNull(ztCatalogListRequest)
+ || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU)
+ ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING)
+ ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN)
+ ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍒嗙被淇℃伅閿欒");
+ }
+ List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
+ if(CollectionUtils.isNotEmpty(ztCatalogInfoResponseList)){
+ for (ZTCatalogInfoResponse ztCatalogInfoResponse:ztCatalogInfoResponseList) {
+ ZTCatalogListRequest ztCatalogTagListRequest = new ZTCatalogListRequest();
+ ztCatalogTagListRequest.setCatalogCode(ztCatalogInfoResponse.getCode());
+ List<ZTTagInfoResponse> ztTagInfoResponseList = zbomZhongTaiService.getTagList(ztCatalogTagListRequest);
+ if(CollectionUtils.isNotEmpty(ztCatalogInfoResponseList)){
+ ztCatalogInfoResponse.setChildTagList(ztTagInfoResponseList);
+ }
+ }
+ }
+ return ztCatalogInfoResponseList;
+ }
+
+
+ /**
+ * 鍐呭 鍒嗛〉鏁版嵁
+ * @param ztContentListRequest
+ * @return
+ */
+ @Override
+ public ZTBasePageResponse<ZTContentListResponse> pageContentList(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ || StringUtils.isBlank(ztContentListRequest.getCatalogCode())
+ || StringUtils.isBlank(ztContentListRequest.getTagCodes())
+ || StringUtils.isBlank(ztContentListRequest.getQuery())
+ || StringUtils.isBlank(ztContentListRequest.getSortType())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,ztContentListRequest.getUserId(),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(token);
+ String catalogCode = ztContentListRequest.getCatalogCode();
+ if(catalogCode.equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU)
+ ||catalogCode.equals(ZTConstants.CatalogCode.CHANPING)
+ ||catalogCode.equals(ZTConstants.CatalogCode.ZIXUN)
+ ||catalogCode.equals(ZTConstants.CatalogCode.QW_CASE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍒嗙被淇℃伅閿欒");
+ }
+ ZTBasePageResponse<ZTContentListResponse> response = zbomZhongTaiService.pageContentList(ztContentListRequest);
+ return response;
+ }
+
+
+
+ @Override
+ public ZTContentInfoResponse getContentInfo(String id,String userType,Long userId){
+ //鏌ヨ 涓彴 TOKEN
+ String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
+ ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
+ ztContentListRequest.setToken(token);
+ ztContentListRequest.setUserType(userType);
+ ztContentListRequest.setId(id);
+ ZTContentInfoResponse response = zbomZhongTaiService.getContentInfo(ztContentListRequest);
+ return response;
+ }
+
+
+
+
+
+
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 481bbaf..0c3bae8 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -18,11 +18,14 @@
import com.doumee.core.oss.FileModel;
import com.doumee.core.utils.CodeVerifyUtils;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.InterfaceLog;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.Users;
import com.doumee.dao.web.reqeust.EditMemberRequest;
import com.doumee.dao.web.reqeust.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
@@ -35,6 +38,7 @@
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
+import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -56,6 +60,9 @@
@Autowired
private MemberMapper memberMapper;
+
+ @Autowired
+ private UsersMapper usersMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -365,29 +372,60 @@
- /**
- * 鏇存柊涓彴token淇℃伅
- * @param member
- */
- private static void updUserZTToken(ZbomZhongTaiService zbomZhongTaiService,MemberMapper memberMapper,SystemDictDataBiz systemDictDataBiz,Member member){
- //濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
- if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
- ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
- //鏌ヨAPPID
- String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
- param.setAppId(appId);
- param.setOpenId(member.getOpenid());
- ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
- if(Objects.nonNull(ztUserGetTokenResponse)){
- member.setToken(ztUserGetTokenResponse.getToken());
- //TODO 鏆傛棤杩囨湡鏃ユ湡
- memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
- .eq(Member::getId,member.getId()));
- }else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+
+ public static String getZTToken(ZbomZhongTaiService zbomZhongTaiService, MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
+ if(userType.equals(Constants.CUSTOMER)){
+ Member member = memberMapper.selectById(id);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- };
+ //濡傛灉鏃犳湁鏁堟湡/宸茶繃鏈� 閲嶆柊鑾峰彇
+ if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
+ ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
+ //鏌ヨAPPID
+ String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
+ param.setAppId(appId);
+ param.setOpenId(member.getOpenid());
+ ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ if(Objects.nonNull(ztUserGetTokenResponse)){
+ member.setToken(ztUserGetTokenResponse.getToken());
+ //TODO 鏆傛棤杩囨湡鏃ユ湡
+ memberMapper.update(new UpdateWrapper<Member>().lambda().set(Member::getToken,ztUserGetTokenResponse.getToken())
+ .eq(Member::getId,member.getId()));
+ return ztUserGetTokenResponse.getToken();
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return member.getToken();
+ }else if(userType.equals(Constants.BUSINESS)){
+ Users users = usersMapper.selectById(id);
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
+ ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
+ //鏌ヨAPPID
+ String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
+ param.setAppId(appId);
+ param.setOpenId(users.getOpenid());
+ ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
+ if(Objects.nonNull(ztUserGetTokenResponse)){
+ users.setToken(ztUserGetTokenResponse.getToken());
+ //TODO 鏆傛棤杩囨湡鏃ユ湡
+ usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getToken,ztUserGetTokenResponse.getToken())
+ .eq(Users::getId,users.getId()));
+ return ztUserGetTokenResponse.getToken();
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴TOKEN鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return users.getToken();
+ }else{
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍙傛暟閿欒");
+ }
}
+
@@ -401,7 +439,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
}
//鏍￠獙鐢ㄦ埛token淇℃伅
- MemberServiceImpl.updUserZTToken(zbomZhongTaiService,memberMapper,systemDictDataBiz,member);
+ MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),Constants.CUSTOMER);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
ztBaseRequst.setUserType(Constants.CUSTOMER);
@@ -420,4 +458,6 @@
}
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/ApiController.java b/server/web/src/main/java/com/doumee/api/web/ApiController.java
index 7a5bf06..f52186c 100644
--- a/server/web/src/main/java/com/doumee/api/web/ApiController.java
+++ b/server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -39,4 +39,10 @@
return obj != null ? (Long) obj : null;
}
+
+ protected Long getUserType() {
+ Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserType);
+ return obj != null ? (Long) obj : null;
+ }
+
}
--
Gitblit v1.9.3