From 4a8eafb3abe0b818ff002a2be3d3bde1452517d4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 15 七月 2024 14:43:00 +0800
Subject: [PATCH] 代码提交
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 9 ++-
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java | 9 ++-
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 20 ++++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCatalogListRequest.java | 3 +
server/web/src/main/java/com/doumee/api/web/PublicController.java | 18 ++++++
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 78 ++++++++++++++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 5 +
7 files changed, 134 insertions(+), 8 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCatalogListRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCatalogListRequest.java
index 37e7fcb..635baa1 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCatalogListRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCatalogListRequest.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,7 +11,9 @@
public class ZTCatalogListRequest extends ZTBaseRequst{
/**
* 鐩綍鍞竴缂栫爜,缂栫爜涓虹┖锛屽垯杩斿洖鍏ㄩ儴涓�绾х洰褰�
+ *
*/
+ @ApiModelProperty(value = "蹇楄瑁呬慨 zb_deco 浜у搧 product_intro 璧勮product_info 鍏ㄥ眿妗堜緥 whole_case",notes = "http://api.dev.zbom.7zcloud.com/content/api/catalog")
private String catalogCode;
}
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 c362b62..9e4c50f 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
@@ -1,18 +1,17 @@
package com.doumee.biz.zbom.model.zhongtai;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
-/**
- * 鐢ㄦ埛閫�鍑�
- */
@Data
public class ZTContentListRequest extends ZTBaseRequst {
/**
* 鐩綍鍞竴缂栫爜锛岀洰褰曞敮涓�缂栫爜
*/
+ @ApiModelProperty(value = "鍒嗙被缂栫爜")
private String catalogCode;
/**
* 鏄惁缃《锛岄粯璁alse
@@ -21,20 +20,24 @@
/**
* 褰撳墠椤�
*/
+ @ApiModelProperty(value = "褰撳墠椤�")
private String pageNum;
/**
* 姣忛〉鏉℃暟
*/
+ @ApiModelProperty(value = "姣忛〉鏉℃暟")
private String pageSize;
/**
* 鎼滅储鍏抽敭瀛楋紝鏍规嵁鏍囬鎼滅储鍏抽敭瀛�
*/
+ @ApiModelProperty(value = "鎼滅储鍏抽敭瀛�")
private String search;
/**
* 鎺掑簭鏂瑰紡锛孨ORMAL - 榛樿
* HOT - 鏈�鐑�
* LATEST - 鏈�鏂�
*/
+ @ApiModelProperty(value = "鎺掑簭鏂瑰紡 NORMAL - 榛樿锛汬OT - 鏈�鐑紱LATEST - 鏈�鏂帮紱")
private String sortType;
/**
* 澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛紝澶氫釜鏍囩鍞竴缂栫爜鐨勫垪琛�
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
new file mode 100644
index 0000000..1ed837e
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -0,0 +1,20 @@
+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 java.util.List;
+
+/**
+ * 鐢ㄦ埛琛屼负鏁版嵁淇℃伅琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2024/07/04 14:40
+ */
+public interface GetZhongTaiDataService {
+
+ List<ZTCatalogInfoResponse> getCatalogList(ZTCatalogListRequest param);
+
+ List<ZTTagInfoResponse> getCataLogTagList(ZTCatalogListRequest param);
+
+}
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
new file mode 100644
index 0000000..f466c22
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -0,0 +1,78 @@
+package com.doumee.service.business.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.biz.system.SystemDictDataBiz;
+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.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.service.business.GetZhongTaiDataService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/15 14:12
+ */
+@Service
+public class GetZhongTaiDataServiceImpl implements GetZhongTaiDataService {
+
+ @Autowired
+ private ZbomZhongTaiService zbomZhongTaiService;
+
+ @Autowired
+ private MemberMapper memberMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
+
+ @Override
+ public List<ZTCatalogInfoResponse> getCatalogList(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(),"鍒嗙被淇℃伅閿欒");
+ }
+ return zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
+ }
+
+
+ @Override
+ public List<ZTTagInfoResponse> getCataLogTagList(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(),"鍒嗙被淇℃伅閿欒");
+ }
+ return zbomZhongTaiService.getTagList(ztCatalogListRequest);
+ }
+
+
+
+
+
+
+}
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 f6e2164..481bbaf 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
@@ -364,11 +364,12 @@
}
+
/**
* 鏇存柊涓彴token淇℃伅
* @param member
*/
- public void updUserZTToken(Member 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();
@@ -400,7 +401,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�");
}
//鏍￠獙鐢ㄦ埛token淇℃伅
- this.updUserZTToken(member);
+ MemberServiceImpl.updUserZTToken(zbomZhongTaiService,memberMapper,systemDictDataBiz,member);
//璋冭捣涓彴娉ㄩ攢鎺ュ彛
ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
ztBaseRequst.setUserType(Constants.CUSTOMER);
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index ac281c0..0eb842c 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -156,7 +156,7 @@
}
@LoginRequired
- @ApiOperation("闂ㄥ簵鍒楄〃")
+ @ApiOperation(value = "闂ㄥ簵鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/shopPage") @ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
@@ -166,7 +166,7 @@
@LoginRequired
- @ApiOperation("闂ㄥ簵璇︽儏")
+ @ApiOperation(value = "闂ㄥ簵璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/shopDetail")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@@ -178,7 +178,7 @@
}
@LoginRequired
- @ApiOperation("瀵艰喘璇︽儏")
+ @ApiOperation(value = "瀵艰喘璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/usersDetail")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@@ -188,4 +188,7 @@
return ApiResponse.success(usersService.usersDetail(userId));
}
+
+
+
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PublicController.java b/server/web/src/main/java/com/doumee/api/web/PublicController.java
index 03b0570..459aea0 100644
--- a/server/web/src/main/java/com/doumee/api/web/PublicController.java
+++ b/server/web/src/main/java/com/doumee/api/web/PublicController.java
@@ -3,12 +3,16 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
+import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.FtpUtil;
import com.doumee.core.utils.aliyun.ALiYunUtil;
import com.doumee.core.utils.tyyun.TyyZosUtil;
+import com.doumee.dao.business.model.Users;
+import com.doumee.dao.system.model.SystemDictData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -46,6 +50,20 @@
private SystemDictDataBiz systemDictDataBiz;
+
+ @LoginRequired
+ @ApiOperation(value = "瀛楀吀鍊兼煡璇�")
+ @GetMapping("/getDictData")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "澶х被缂栫爜", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "瀛愮被缂栫爜", required = true)
+ })
+ public ApiResponse<SystemDictData> getDictData (@RequestParam String code,@RequestParam String label) {
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(code,label);
+ return ApiResponse.success(systemDictData);
+ }
+
+
@ApiOperation(value = "涓婁紶", notes = "涓婁紶", httpMethod = "POST", position = 6)
@ApiImplicitParams({
@ApiImplicitParam(name = "folder", value = "鏂囦欢澶�", required = true, paramType = "query", dataType = "String", dataTypeClass = String.class),
--
Gitblit v1.9.3