From a40f7610261817f7d984e02a7636b5325c29c532 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 24 七月 2024 15:03:29 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/service/business/NewsService.java | 2
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 51 ++++++++++++-----
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 1
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 21 +++++++
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 22 ++++++-
server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java | 4 +
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 7 ++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java | 23 +++++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 3 +
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 7 +-
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 6 +-
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 20 ++++++
12 files changed, 140 insertions(+), 27 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
index 23cf7fa..8ad9fc8 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -49,4 +49,5 @@
List<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param);
+ ZTBaseResponse batchAddLike(ZTBatchAddListRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index c00a5f4..dc18be7 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -751,4 +751,25 @@
}
return null;
}
+
+ /**
+ * 鑾峰彇鍒嗙被鍜屽垎绫讳笅鐨勬爣绛�
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBaseResponse batchAddLike(ZTBatchAddListRequest param){
+ ZTBaseResponse result = sendHttpRequest(
+ ZTConstants.IntegerUrl.BATCH_ADD_LIKE_URL,
+ ZTConstants.IntegerName.BATCH_ADD_LIKE_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+ if(result!=null){
+ return result;
+ }
+ return null;
+ }
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
index 9214dc7..19cbcb6 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java
@@ -20,5 +20,9 @@
private String customerPhone;// 瀹㈡埛濮撳悕
private String customerName;// 瀹㈡埛鎵嬫満鍙�
private String address ;//鍦板潃璇︽儏
+ private String creationDate ;//鍒涘缓鏃堕棿
+ private String customerId ;//瀹㈡埛 id
+ private String platSourceId ;//浼犻�掑钩鍙� id
+ private String platSource ;//骞冲彴绫诲瀷 1 pad 绔� 2 灏忕▼搴忕
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java
new file mode 100644
index 0000000..28b8b90
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java
@@ -0,0 +1,23 @@
+package com.doumee.biz.zbom.model.zhongtai;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@Data
+public class ZTBatchAddListRequest extends ZTBaseRequst{
+
+ @ApiModelProperty(value = "鍐呭IDS锛岃嫳鏂囬�楀彿闅斿紑")
+ private String articleIds;
+
+ @ApiModelProperty(value = "瀹㈡埛 id")
+ private String customerId ;
+
+ @ApiModelProperty(value = "浼犻�掑钩鍙� id")
+ private String platSourceId ;
+
+ @ApiModelProperty(value = "骞冲彴绫诲瀷 1 pad 绔� 2 灏忕▼搴忕")
+ private String platSource ;
+
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
index 1422de9..e9df120 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -78,6 +78,7 @@
String REALCASE_PAGE_LIST_URL ="/content/api/realCasePageList";
String REALCASE_INFO_URL ="/content/api/realCaseDetail";
String FAVORITES_PAGE_URL ="/behavior/api/favoritesPageList";
+ String BATCH_ADD_LIKE_URL ="/content/api/batchAddLike";
}
@@ -119,5 +120,7 @@
String REALCASE_INFO_NAME ="鑾峰彇瀹炴櫙妗堜緥璇︽儏";
String FAVORITES_NAME ="鑾峰彇鎴戠殑鍠滄/鏀惰棌鍒楄〃";
+
+ String BATCH_ADD_LIKE_NAME ="鎵归噺缁戝畾鍠滄缁欏鎴�";
}
}
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 27a41e1..e208654 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
@@ -157,4 +157,11 @@
* @return
*/
ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest ztCollectLikeRequest);
+
+ /**
+ * 涓彴 - 鎵归噺娣诲姞鍠滄缁欏鎴�
+ * @param param
+ * @return
+ */
+ void batchAddLike(ZTBatchAddListRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/NewsService.java b/server/service/src/main/java/com/doumee/service/business/NewsService.java
index 9046351..f104a18 100644
--- a/server/service/src/main/java/com/doumee/service/business/NewsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/NewsService.java
@@ -115,7 +115,7 @@
* 鑾峰彇姣忔棩涓婃柊鏁版嵁
* @return
*/
- DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType);
+ DailyUpdatesResponse getDailyUpdatesResponse();
/**
* 淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍
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 881cf57..85495af 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
@@ -341,4 +341,24 @@
ZTBasePageResponse<ZTCollectLikeInfoResponse> response = zbomZhongTaiService.collectLikePage(ztCollectLikeRequest);
return response;
}
+
+ @Override
+ public void batchAddLike(ZTBatchAddListRequest ztBatchAddListRequest){
+ if(Objects.isNull(ztBatchAddListRequest)
+ || StringUtils.isBlank(ztBatchAddListRequest.getArticleIds())
+ || StringUtils.isBlank(ztBatchAddListRequest.getCustomerId())
+ || StringUtils.isBlank(ztBatchAddListRequest.getPlatSourceId())
+ || StringUtils.isBlank(ztBatchAddListRequest.getPlatSource())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztBatchAddListRequest.getUserId()),ztBatchAddListRequest.getUserType());
+ ztBatchAddListRequest.setToken(ztBaseInfoResponse.getToken());
+ zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
+ }
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
index 48e7f1e..22a4e05 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -380,19 +380,19 @@
* @return
*/
@Override
- public DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType){
+ public DailyUpdatesResponse getDailyUpdatesResponse(){
DailyUpdatesResponse dailyUpdatesResponse = new DailyUpdatesResponse();
dailyUpdatesResponse.setDailyUpdateNum(
newsMapper.selectCount(new QueryWrapper<News>().lambda()
.eq(News::getIsdeleted,Constants.ZERO)
.like(News::getCreateDate, DateUtil.getDateLong(new Date()))
- .eq(News::getType,Constants.ONE)
+ .eq(News::getType,Constants.ZERO)
));
dailyUpdatesResponse.setShareNum(
actionsMapper.selectCount(new QueryWrapper<Actions>())
);
dailyUpdatesResponse.setNewsList(
- this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,fileType)
+ this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,Constants.ZERO)
);
return dailyUpdatesResponse;
}
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 d356e41..55e3fc4 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
@@ -296,6 +296,7 @@
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getCatalogList")
@@ -304,13 +305,14 @@
})
public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
ztCatalogListRequest.setUserId(getMemberId()+"");
- ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCatalogListRequest.setUserType(getUserType());
List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getCataLogTagList")
@@ -319,7 +321,7 @@
})
public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
ztCatalogListRequest.setUserId(getMemberId()+"");
- ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCatalogListRequest.setUserType(getUserType());
List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
@@ -335,7 +337,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "琛屼负绫诲瀷锛氭敹钘忥細collect;鍙栨秷鏀惰棌锛歝ollect_cancel;鍠滄锛歭ike;鍙栨秷鍠滄锛歭ike_cancel锛涙祻瑙堬細view;鍒嗕韩锛歴hare;涓嬭浇锛歞ownload", required = true),
})
public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
- getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
+ getZhongTaiDataService.actionDo(getMemberId(),getUserType(),id,actionType);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -381,7 +383,7 @@
})
public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
}
@@ -396,13 +398,14 @@
})
public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponseList);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "杞挱鍥捐鎯�", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiCarouselImageDetail")
@@ -411,12 +414,13 @@
})
public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
ztDataDetailRequest.setUserId(getMemberId()+"");
- ztDataDetailRequest.setUserType(ZTConstants.CUSTOMER);
+ ztDataDetailRequest.setUserType(getUserType());
ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
return ApiResponse.success("鑾峰彇鎴愬姛",ztCusCarouselImageResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍜ㄨ鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiProductNewsPage")
@@ -425,12 +429,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTProductNewsInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiProductPage")
@@ -439,11 +444,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTProductInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹炴櫙鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiRealcasePage")
@@ -452,11 +459,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTRealcaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiVideoPage")
@@ -465,11 +474,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTVideoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiWholecasePage")
@@ -478,11 +489,13 @@
})
public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTCaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "蹇楄瑁呬慨鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getZhongTaiZbDecoPage")
@@ -491,12 +504,14 @@
})
public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ztContentListRequest.setUserType(getUserType());
ZTBasePageResponse<ZTZbDecoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "鍏ㄥ眿妗堜緥璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getWholecaseInfo")
@@ -505,11 +520,13 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id) {
- ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@GetMapping("/getProductNewsInfo")
@ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -518,12 +535,14 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id) {
- ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "瀹炴櫙妗堜緥 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getRealcaseInfo")
@@ -532,12 +551,14 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id) {
- ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,getUserType(),getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse);
}
+
+ @UserLoginRequired
@LoginRequired
@ApiOperation(value = "浜у搧璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/getProductInfo")
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
index d367c4a..3ca5386 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -69,11 +69,10 @@
@ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�")
@GetMapping("/getDailyUpdates")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", required = false)
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
- return ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
+ public ApiResponse<DailyUpdatesResponse> getDailyUpdates() {
+ return ApiResponse.success(newsService.getDailyUpdatesResponse());
}
diff --git a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
index 03ecf4d..203d880 100644
--- a/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -4,10 +4,7 @@
import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
-import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
-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.*;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
@@ -200,6 +197,23 @@
return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
}
+
+ @UserLoginRequired
+ @LoginRequired
+ @ApiOperation(value = "鎵归噺娣诲姞鍠滄缁欏鎴�", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/batchAddLike")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse batchAddLike(@RequestBody ZTBatchAddListRequest ztBatchAddListRequest) {
+ ztBatchAddListRequest.setUserType(getUserType());
+ ztBatchAddListRequest.setUserId(getUserId().toString());
+ getZhongTaiDataService.batchAddLike(ztBatchAddListRequest);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+
@UserLoginRequired
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/logOff")
--
Gitblit v1.9.3