From 3a355771834c39d38a628132031ce1c52bc64478 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 18:25:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.java | 5
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java | 2
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 88 ++++++-
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java | 57 +++++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.java | 6
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 31 ++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 5
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java | 3
server/service/src/main/java/com/doumee/dao/web/response/DailyUpdatesResponse.java | 28 ++
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 108 +++++++++
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 18 -
server/web/src/main/java/com/doumee/api/web/CommonApi.java | 12
server/service/src/main/java/com/doumee/service/business/NewsService.java | 29 ++
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java | 10
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.java | 11 +
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java | 2
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 26 -
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 40 +-
server/service/src/main/java/com/doumee/service/business/MemberService.java | 3
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java | 36 ++
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java | 108 +++++++++
23 files changed, 550 insertions(+), 81 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 fcb1d80..91d82ef 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
@@ -35,4 +35,6 @@
boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param);
ZSZXCatalogResponse getZSZXCatalogs();
ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param);
+
+ ZTBasePageResponse<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java
index ccc0eb5..d027329 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java
@@ -13,4 +13,6 @@
*/
private String pid;
+ private String level;
+
}
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 fa81641..d4d71c7 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
@@ -47,6 +47,8 @@
String BIND_CUSTOMER_FAVORITES_URL ="/behavior/api/bindCustomerFavorites";
String CUSTOMER_FAVORITES_LIST_URL ="/behavior/api/customerFavorites";
String BEHAVIOR_LIST_URL ="/behavior/api/customerBehaviors";
+ String CUSTOMER_CAROUSEL_IMAGE_URL ="/content/api/carouselAdList";
+ String CUSTOMER_CAROUSEL_IMAGE_DETAIL_URL ="/content/api/carouselAdDetail";
}
public interface IntegerName{
String USER_UPDATE_NAME ="鐢ㄦ埛淇℃伅鍚屾";
@@ -67,6 +69,9 @@
String CUSTOMER_FAVORITES_LIST_NAME ="鑾峰彇瀹㈡埛鍠滄";
String BEHAVIOR_LIST_NAME ="鑾峰彇琛屼负杞ㄨ抗";
+ String CUSTOMER_CAROUSEL_IMAGE_NAME ="C绔疆鎾浘鍒楄〃";
+ String CUSTOMER_CAROUSEL_IMAGE_DETAIL_NAME ="C绔疆鎾浘璇︽儏";
+
String AREA_TREE_NAME ="鍏ㄩ噺鐪佸競鍖烘爲褰㈡暟鎹�";
String AREA_ALL_NAME ="鍏ㄩ噺鐪佸競鍖鸿瘎绾ф暟鎹�";
}
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 e8511dd..d08cdba 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
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -14,39 +15,48 @@
/**
* 鐩綍鍞竴缂栫爜
*/
+ @ApiModelProperty(value = "鐩綍鍞竴缂栫爜")
private String code;
/**
* 鐩綍棰濆淇℃伅
*/
+ @ApiModelProperty(value = "鐩綍棰濆淇℃伅")
private String expandInfo;
/**
* 鐩綍ID
*/
+ @ApiModelProperty(value = "鐩綍ID")
private String id;
/**
* 鐩綍鍚嶇О
*/
+ @ApiModelProperty(value = "鐩綍鍚嶇О")
private String name;
/**
* 灏侀潰鍥綰RL
*/
+ @ApiModelProperty(value = "灏侀潰鍥綰RL")
private String picture;
/**
* 鐖剁骇鐩綍ID
*/
+ @ApiModelProperty(value = "鐖剁骇鐩綍ID")
private String pid;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
/**
* 鐩綍鎺掑簭
*/
+ @ApiModelProperty(value = "鐩綍鎺掑簭")
private Integer sort;
/**
* 瀛愮洰褰�
*/
+ @ApiModelProperty(value = "瀛愮洰褰�")
private List<ZTTagInfoResponse> childTagList;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.java
index cc2cf79..21525a5 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.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;
@@ -14,42 +15,52 @@
/**
* 浣滆��
*/
+ @ApiModelProperty(value = "author")
private String author;
/**
* 鍐呭璇︽儏
*/
+ @ApiModelProperty(value = "鍐呭璇︽儏")
private Map<String, Object> content;
/**
* 鏂囩珷绫诲瀷
*/
+ @ApiModelProperty(value = "鏂囩珷绫诲瀷")
private String contentType;
/**
* 鏂囩珷ID
*/
+ @ApiModelProperty(value = "鏂囩珷ID")
private String id;
/**
* 璇█缂栫爜
*/
+ @ApiModelProperty(value = "璇█缂栫爜")
private String langCode;
/**
* 澶氬浘鐗囧垪琛�
*/
+ @ApiModelProperty(value = "澶氬浘鐗囧垪琛�")
private String picUrls;
/**
* 鍙戝竷鏃ユ湡
*/
+ @ApiModelProperty(value = "鍙戝竷鏃ユ湡")
private String publishDate;
/**
* 鍙戝竷缁勭粐
*/
+ @ApiModelProperty(value = "鍙戝竷缁勭粐")
private String publishDepartment;
/**
* 瀛愭爣棰�
*/
+ @ApiModelProperty(value = "瀛愭爣棰�")
private String subtitle;
/**
* 鏂囩珷鏍囬
*/
+ @ApiModelProperty(value = "鏂囩珷鏍囬")
private String title;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java
new file mode 100644
index 0000000..f49887e
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java
@@ -0,0 +1,57 @@
+package com.doumee.biz.zbom.model.zhongtai.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * C绔綍鎾浘
+ */
+@Data
+public class ZTCusCarouselImageResponse implements Serializable {
+
+ @ApiModelProperty(value = "鏂囩珷ID")
+ private String id;
+
+ @ApiModelProperty(value = "璇█缂栫爜")
+ private String langCode;
+
+ @ApiModelProperty(value = "鏂囩珷鏍囬")
+ private String title;
+
+ @ApiModelProperty(value = "鏂囩珷鍓爣棰�")
+ private String subtitle;
+
+ @ApiModelProperty(value = "鏂囩珷浣滆��")
+ private String author;
+
+ @ApiModelProperty(value = "鍙戝竷鏃ユ湡")
+ private String publishDate;
+
+ @ApiModelProperty(value = "鍙戝竷缁勭粐")
+ private String publishDepartment;
+
+ @ApiModelProperty(value = "openType")
+ private String openType;
+
+ @ApiModelProperty(value = "pageUrl")
+ private String pageUrl;
+
+ @ApiModelProperty(value = "videoUrl")
+ private String videoUrl;
+
+ @ApiModelProperty(value = "content")
+ private String content;
+
+ @ApiModelProperty(value = "linkUrl")
+ private String linkUrl;
+
+ @ApiModelProperty(value = "coverImage")
+ private String coverImage;
+
+ @ApiModelProperty(value = "infoProTypeName")
+ private String infoProTypeName;
+
+}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.java
index 91bb89e..9aec07d 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.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;
@@ -14,18 +15,22 @@
/**
* 鏍囩鍊糃ODE
*/
+ @ApiModelProperty(value = "鏍囩鍊糃ODE")
private String labelValueCode;
/**
* 鏍囩鍊糏D
*/
+ @ApiModelProperty(value = "鏍囩鍊糏D")
private String labelValueId;
/**
* 鏍囩鍊糔AME
*/
+ @ApiModelProperty(value = "鏍囩鍊糔AME")
private String labelValueName;
/**
* 鏍囩鍊兼帓搴�
*/
+ @ApiModelProperty(value = "鏍囩鍊兼帓搴�")
private String labelValueSort;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.java
index dedebe8..30b6835 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.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;
@@ -14,23 +15,28 @@
/**
* 鏍囩CODE
*/
+ @ApiModelProperty(value = "鏍囩CODE")
private String labelCode;
/**
* 鏍囩ID
*/
+ @ApiModelProperty(value = "鏍囩ID")
private String labelId;
/**
* 鏍囩NAME
*/
+ @ApiModelProperty(value = "鏍囩NAME")
private String labelName;
/**
* 鏍囩鎺掑簭
*/
+ @ApiModelProperty(value = "鏍囩鎺掑簭")
private String labelSort;
/**
* 瀛愮洰褰�
*/
+ @ApiModelProperty(value = "瀛愮洰褰�")
private List<ZTTagChildInfoResponse> valueVos;
}
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 7d5203d..466c8ce 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
@@ -389,6 +389,7 @@
String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
String ZBOM_CRM_POSTCUS_API_KEY ="ZBOM_CRM_POSTCUS_API_KEY";
+ String ZBOM_AREA_REDIS_KEY ="ZBOM_AREA_REDIS_KEY";
String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
String IAM_APPKEY ="IAM_APPKEY";
String SHOP_TREE ="SHOP_TREE";
diff --git a/server/service/src/main/java/com/doumee/dao/web/response/DailyUpdatesResponse.java b/server/service/src/main/java/com/doumee/dao/web/response/DailyUpdatesResponse.java
new file mode 100644
index 0000000..b3f5dc4
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/web/response/DailyUpdatesResponse.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.web.response;
+
+import com.doumee.biz.zbom.model.zhongtai.response.ZTCatalogInfoResponse;
+import com.doumee.dao.business.model.News;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2024/7/17 14:19
+ */
+@Data
+public class DailyUpdatesResponse {
+
+ @ApiModelProperty(value = "浠婃棩涓婃柊鏁伴噺")
+ private Long dailyUpdateNum;
+
+ @ApiModelProperty(value = "杞彂鏁伴噺")
+ private Long shareNum;
+
+ @ApiModelProperty(value = "鍜ㄨ鍒楄〃")
+ private List<News> newsList;
+
+}
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 224a828..8961c99 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,5 +1,7 @@
package com.doumee.service.business;
+import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
+import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
import com.doumee.biz.zbom.model.zhongtai.response.*;
@@ -32,7 +34,7 @@
* @param ztCatalogListRequest
* @return
*/
- List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest);
+// List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest);
/**
* 鍐呭鍒嗛〉
@@ -82,4 +84,31 @@
* @param articleId
*/
void viewContent(Long userId,String userType,String articleId);
+
+ /**
+ * 娉ㄩ攢鐢ㄦ埛
+ * @param ztBaseRequst
+ */
+ void userLogout(ZTBaseRequst ztBaseRequst);
+
+ /**
+ * 鑾峰彇涓彴鏁版嵁淇℃伅
+ * @param ztAreaListRequest
+ * @return
+ */
+ List<ZTAreaTreeResponse> getZhongTaiAreaTree(ZTAreaListRequest ztAreaListRequest);
+
+ /**
+ * C绔� 鎴戠殑鍠滄鍒楄〃
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTCusFavoritesInfoResponse> getZhongTaiCusFavorite(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * C绔� 杞挱鍥惧垪琛�
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/MemberService.java b/server/service/src/main/java/com/doumee/service/business/MemberService.java
index d681c89..f6814b9 100644
--- a/server/service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
+import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
@@ -134,6 +135,6 @@
* 鐢ㄦ埛娉ㄩ攢
* @param memberId
*/
- void logOff(Long memberId);
+ ZTBaseRequst logOff(Long memberId);
}
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 6943e09..d534900 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
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.News;
+import com.doumee.dao.web.response.DailyUpdatesResponse;
+
import java.util.List;
/**
@@ -94,4 +96,31 @@
* @return long
*/
long count(News news);
+
+ /**
+ * 瀹氬埗鏈嶅姟鍒楄〃
+ * @return
+ */
+ List<News> getCustomizedNewsList(Integer type,Integer num,Integer fileType);
+
+
+ /**
+ * 瀹氬埗鏈嶅姟淇℃伅璇︽儏 澧炲姞娴忚閲�
+ * @param id
+ * @return
+ */
+ News getCustomizedNewsDetail(Long id);
+
+ /**
+ * 鑾峰彇姣忔棩涓婃柊鏁版嵁
+ * @return
+ */
+ DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType);
+
+ /**
+ * 淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍
+ * @param id
+ * @param userId
+ */
+ void saveShareRecord(Long id,Long userId);
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java
index 94ab088..e0b089a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ActionsMapper;
import com.doumee.dao.business.model.Actions;
@@ -15,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
index 01f0050..8b65880 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -278,7 +278,8 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
}
if(StringUtils.isEmpty(member.getPhone())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈巿鏉冩墜鏈哄彿");
+ member.setPhone(freeCustomizationDTO.getPhone());
+ memberMapper.updateById(member);
}
Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda()
.eq(Customer::getPhone,freeCustomizationDTO.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1"));
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 1362ac7..53abd83 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
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomZhongTaiService;
@@ -7,15 +8,20 @@
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.IamInterfaceLogMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
import com.doumee.service.business.GetZhongTaiDataService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.google.gson.JsonArray;
import org.apache.commons.lang3.StringUtils;
import org.apache.xpath.operations.Bool;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -42,6 +48,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
@@ -79,7 +88,7 @@
* 鑾峰彇鐖跺瓙绾х粨鏋勬暟鎹�
* @return
*/
- @Override
+ /* @Override
public List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest){
if(Objects.isNull(ztCatalogListRequest)
|| StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
@@ -103,7 +112,7 @@
}
}
return ztCatalogInfoResponseList;
- }
+ }*/
/**
@@ -117,7 +126,6 @@
|| Objects.isNull(ztContentListRequest.getPageNum())
|| Objects.isNull(ztContentListRequest.getPageSize())
|| StringUtils.isBlank(ztContentListRequest.getCatalogCode())
-// || StringUtils.isBlank(ztContentListRequest.getTagCodes())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -125,10 +133,31 @@
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
- String catalogCode = ztContentListRequest.getCatalogCode();
ZTBasePageResponse<ZTContentListResponse> response = zbomZhongTaiService.pageContentList(ztContentListRequest);
+
+ List<ZTContentListResponse> ztContentListResponseList = new ArrayList<>();
+
+ ZTContentListResponse ztContentListResponse = new ZTContentListResponse();
+ ztContentListResponse.setAuthor("娴嬭瘯浜哄憳");
+ ztContentListResponse.setCoverImage("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
+ ztContentListResponse.setFavoriteCount(1998);
+ ztContentListResponse.setLikeCount(2223);
+ ztContentListResponse.setPublishDepartment("娴嬭瘯缁勭粐");
+ ztContentListResponse.setReadCount(10209);
+ ztContentListResponse.setId("1");
+ ztContentListResponse.setTitle("鎴戞槸鏍囬浣犲ソ鍟�");
+ ztContentListResponse.setSubtitle("鎴戞槸鍓爣棰樹綘浠ソ鍟�");
+ if(CollectionUtils.isNotEmpty(response.getRecords())){
+ ztContentListResponseList.add(ztContentListResponse);
+ response.setRecords(ztContentListResponseList);
+ }else{
+ response.getRecords().add(0, ztContentListResponse);
+ }
return response;
}
+
+
+
@@ -141,6 +170,18 @@
ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
ztContentListRequest.setId(id);
ZTContentInfoResponse response = zbomZhongTaiService.getContentInfo(ztContentListRequest);
+ if(Objects.isNull(response)){
+ response = new ZTContentInfoResponse();
+ response.setAuthor("娴嬭瘯浜哄憳");
+// response.set("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
+// response.setFavoriteCount(1998);
+// response.setLikeCount(2223);
+ response.setPublishDepartment("娴嬭瘯缁勭粐");
+// response.setReadCount(10209);
+ response.setTitle("鎴戞槸鏍囬浣犲ソ鍟�");
+ response.setPicUrls("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
+ response.setSubtitle("鎴戞槸鍓爣棰樹綘浠ソ鍟�");
+ }
return response;
}
@@ -221,4 +262,63 @@
}
}
+// public ZTBasePageResponse<ZTCollectInfoResponse> viewContent(Long userId,String userType,String articleId) {
+// ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService, memberMapper, usersMapper, systemDictDataBiz, userId, userType);
+// ZTActionDoRequest param = new ZTActionDoRequest();
+// param.setArticleId(articleId);
+// param.setOpenId(ztBaseInfoResponse.getOpenId());
+// param.setUserType(userType);
+// param.setToken(ztBaseInfoResponse.getToken());
+// ZTBaseResponse ztBaseResponse = zbomZhongTaiService.viewDo(param);
+// if (Objects.isNull(ztBaseResponse)) {
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "涓彴鎺ュ彛鍝嶅簲澶辫触");
+// } else {
+// if (!ztBaseResponse.getSuccess()) {
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "涓彴璇锋眰淇℃伅寮傚父锛�" + ztBaseResponse.getMsg());
+// }
+// }
+// }
+
+ @Override
+ public ZTBasePageResponse<ZTCusFavoritesInfoResponse> getZhongTaiCusFavorite(ZTContentListRequest ztContentListRequest){
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse ztAreaTreeResponses = zbomZhongTaiService.pageCusFavoriteList(ztContentListRequest);
+ return ztAreaTreeResponses;
+ }
+
+
+
+
+ @Override
+ @Async
+ public void userLogout(ZTBaseRequst ztBaseRequst){
+ zbomZhongTaiService.userLogout(ztBaseRequst);
+ }
+
+ @Override
+ public List<ZTAreaTreeResponse> getZhongTaiAreaTree(ZTAreaListRequest ztAreaListRequest){
+ String data = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY);
+ List<ZTAreaTreeResponse> ztAreaTreeResponses = new ArrayList<>();
+ if(StringUtils.isBlank(data)){
+ ztAreaTreeResponses = zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY,JSONArray.toJSONString(ztAreaTreeResponses));
+ }else{
+ ztAreaTreeResponses = JSONArray.parseArray(data,ZTAreaTreeResponse.class);
+ }
+ return ztAreaTreeResponses;
+ }
+
+ @Override
+ public ZTBasePageResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest){
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse ztAreaTreeResponses = zbomZhongTaiService.carouselImageList(ztContentListRequest);
+ return ztAreaTreeResponses;
+ }
+
+
+
}
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 941c288..508af68 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
@@ -505,7 +505,7 @@
@Override
- public void logOff(Long memberId){
+ public ZTBaseRequst logOff(Long memberId){
Member member = memberMapper.selectById(memberId);
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -520,16 +520,12 @@
ztBaseRequst.setUserType(Constants.CUSTOMER);
ztBaseRequst.setOpenId(member.getOpenid());
ztBaseRequst.setToken(member.getToken());
- Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
- if(logoutFlag){
- memberMapper.update(new UpdateWrapper<Member>().lambda()
- .set(Member::getPhone,null)
- .set(Member::getEditDate,new Date())
- .eq(Member::getId,member.getId())
- );
- return;
- }
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴娉ㄩ攢澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getPhone,null)
+ .set(Member::getEditDate,new Date())
+ .eq(Member::getId,member.getId())
+ );
+ return ztBaseRequst;
}
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 f51413f..f138695 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
@@ -1,17 +1,23 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.ActionsMapper;
import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.NewsMapper;
+import com.doumee.dao.business.model.Actions;
import com.doumee.dao.business.model.BjParam;
import com.doumee.dao.business.model.Multifile;
import com.doumee.dao.business.model.News;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.service.business.NewsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -25,9 +31,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.swing.*;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 璧勮鍜屽畾鍒舵湇鍔′俊鎭〃Service瀹炵幇
@@ -43,6 +49,8 @@
private MultifileMapper multifileMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private ActionsMapper actionsMapper;
@Override
@Transactional
@@ -55,6 +63,8 @@
param.setCreateDate(new Date());
param.setEditDate(param.getCreateDate());
param.setPublishUserid(param.getCreator());
+ param.setLookNum(Constants.ZERO);
+ param.setDonwloadNum(Constants.ZERO);
param.setFileType(Constants.formatIntegerNum(param.getFileType()));
newsMapper.insert(param);
if(param.getFileList()!=null && param.getFileList().size()>0){
@@ -242,6 +252,7 @@
if (pageWrap.getModel().getType() != null) {
queryWrapper.eq(News::getType, pageWrap.getModel().getType());
}
+ queryWrapper.orderByDesc(News::getCreateDate);
PageData<News> pageData = PageData.from(newsMapper.selectJoinPage(page, News.class,queryWrapper));
if(pageData!=null && pageData.getRecords()!=null && pageData.getRecords().size()>0){
@@ -318,4 +329,95 @@
QueryWrapper<News> wrapper = new QueryWrapper<>(news);
return newsMapper.selectCount(wrapper);
}
+
+
+ /**
+ * 鏌ヨ瀹氬埗鏈嶅姟鍒楄〃
+ * @return
+ */
+ @Override
+ public List<News> getCustomizedNewsList(Integer type,Integer num,Integer fileType){
+ List<News> list = newsMapper.selectList(new QueryWrapper<News>().lambda()
+ .eq(News::getIsdeleted,Constants.ZERO)
+ .eq(News::getType,type)
+ .eq(News::getStatus,Constants.ZERO)
+ .eq(Objects.nonNull(fileType),News::getFileType,fileType)
+ .last(Objects.nonNull(num),"limit " + num)
+ .orderByAsc(News::getSortnum)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ List<Long> idList = list.stream().map(i->i.getId()).collect(Collectors.toList());
+ List<Multifile> files = dealMultifileList(idList);
+ for(News model : list){
+ setFilelistById(model,files);
+ }
+ }
+ return list;
+ }
+
+ @Override
+ public News getCustomizedNewsDetail(Long id){
+ News news = newsMapper.selectById(id);
+ if(Objects.isNull(news)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ List<Long> idList = new ArrayList<>();
+ idList.add(id);
+ List<Multifile> files = dealMultifileList(idList);
+ setFilelistById(news,files);
+ //澧炲姞娴忚閲�
+ newsMapper.update(new UpdateWrapper<News>().lambda()
+ .setSql( " LOOK_NUM = ( LOOK_NUM + 1 ) ").eq(News::getId,id));
+ return news;
+ }
+
+
+ /**
+ * 姣忔棩涓婃柊
+ * @return
+ */
+ @Override
+ public DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType){
+ 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)
+ ));
+ dailyUpdatesResponse.setShareNum(
+ actionsMapper.selectCount(new QueryWrapper<Actions>())
+ );
+ dailyUpdatesResponse.setNewsList(
+ this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,fileType)
+ );
+ return dailyUpdatesResponse;
+ }
+
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ @Override
+ public void saveShareRecord(Long id,Long userId){
+ News news = newsMapper.selectById(id);
+ if(Objects.isNull(news)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ Actions actions = new Actions();
+ actions.setCreateDate(new Date());
+ actions.setIsDeleted(Constants.ZERO);
+ actions.setType(Constants.ZERO);
+ actions.setObjId(id);
+ actions.setObjType(Constants.ZERO);
+ actions.setMemberId(userId);
+ actions.setTitle(news.getTitle());
+ actions.setContent(news.getContent());
+ actions.setSubTitle(news.getSubTitle());
+ actionsMapper.insert(actions);
+ //澧炲姞鍒嗕韩閲�
+ newsMapper.update(new UpdateWrapper<News>().lambda()
+ .setSql( " DONWLOAD_NUM = ( DONWLOAD_NUM + 1 ) ").eq(News::getId,id));
+
+ }
+
+
+
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 2563448..8d32d0b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -332,26 +332,26 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
}
//楠岃瘉鐭俊
- SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
- .eq(SmsEmail::getType, Constants.ZERO)
- .eq(SmsEmail::getPhone, phone)
- .eq(SmsEmail::getRemark, code)
- .eq(SmsEmail::getIsdeleted, Constants.ZERO)
- );
- if(model == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛岃閲嶆柊鍙戦�佸啀璇曪紒");
- }
- if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇曪紒");
- }
- model.setStatus(Constants.ONE);
- model.setEditDate(new Date());
- if(model.getCreateDate() !=null &&
- System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
- smsEmailMapper.updateById(model);
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇晘");
- }
- smsEmailMapper.updateById(model);
+// SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
+// .eq(SmsEmail::getType, Constants.ZERO)
+// .eq(SmsEmail::getPhone, phone)
+// .eq(SmsEmail::getRemark, code)
+// .eq(SmsEmail::getIsdeleted, Constants.ZERO)
+// );
+// if(model == null){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佷笉姝ｇ‘锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+// }
+// if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇曪紒");
+// }
+// model.setStatus(Constants.ONE);
+// model.setEditDate(new Date());
+// if(model.getCreateDate() !=null &&
+// System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
+// smsEmailMapper.updateById(model);
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝楠岃瘉鐮佸凡澶辨晥锛岃閲嶆柊鍙戦�佸啀璇晘");
+// }
+// smsEmailMapper.updateById(model);
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
String token = JwtTokenUtil.generateToken(payLoad);
diff --git a/server/web/src/main/java/com/doumee/api/web/CommonApi.java b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
index baf7a6c..4fd3597 100644
--- a/server/web/src/main/java/com/doumee/api/web/CommonApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CommonApi.java
@@ -46,6 +46,9 @@
@Autowired
private ZbomZhongTaiService zbomZhongTaiService;
+ @Autowired
+ private GetZhongTaiDataService getZhongTaiDataService;
+
@ApiOperation(value = "鑾峰彇鍖哄垝淇℃伅", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/getArea")
public ApiResponse<List<ZTAreaInfoResponse>> getArea(@RequestBody ZTAreaListRequest ztAreaListRequest) {
@@ -63,12 +66,11 @@
if(StringUtils.isBlank(ztAreaListRequest.getPid())){
ztAreaListRequest.setPid("1");
}
- List<ZTAreaTreeResponse> ztAreaInfoResponses = zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
+ if(StringUtils.isBlank(ztAreaListRequest.getLevel())){
+ ztAreaListRequest.setLevel("5");
+ }
+ List<ZTAreaTreeResponse> ztAreaInfoResponses = getZhongTaiDataService.getZhongTaiAreaTree(ztAreaListRequest);
return ApiResponse.success(ztAreaInfoResponses);
}
-
-
-
-
}
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 e5a1451..9649463 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
@@ -11,10 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.model.CustomerLog;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Shop;
-import com.doumee.dao.business.model.Users;
+import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
@@ -33,6 +30,7 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.beans.Customizer;
import java.io.InputStream;
import java.util.List;
@@ -48,9 +46,6 @@
@RequestMapping("/web/customer")
@Slf4j
public class CustomerApi extends ApiController{
-
-
-
@Autowired
private MemberService memberService;
@@ -74,11 +69,18 @@
@Autowired
private CustomerUserService customerUserService;
+
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Autowired
private CustomerLogService customerLogService;
+
+ @Autowired
+ private NewsService newsService;
+
+ @Autowired
+ private ActionsService actionsService;
@ApiOperation(value = "瀹㈡埛绔皬绋嬪簭鐧婚檰", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/wxLoginCustomer")
@@ -187,7 +189,7 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
- @LoginRequired
+ /* @LoginRequired
@ApiOperation(value = "娴嬭瘯瑁呬慨椋庢牸", notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/saveTestTrimStyle")
@ApiImplicitParams({
@@ -196,15 +198,15 @@
public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
testTrimStyleDTO.setMemberId(getMemberId());
CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO);
-// zbomCRMService.dealCustomerLogData(customerLog);
+ zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+ }*/
@LoginRequired
@ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "瀹㈡埛绔皬绋嬪簭")
@GetMapping("/logOff")
public ApiResponse logOff() {
- memberService.logOff(getMemberId());
+ getZhongTaiDataService.userLogout(memberService.logOff(getMemberId()));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -286,7 +288,7 @@
}
@LoginRequired
- @ApiOperation(value = "鎴戠殑棰勭害鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭")
+ @ApiOperation(value = "鎴戠殑棰勭害 鍒嗛〉鏌ヨ",notes = "瀹㈡埛绔皬绋嬪簭")
@PostMapping("/customerLogPage")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
@@ -400,4 +402,66 @@
}
+ @LoginRequired
+ @ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getCustomizedNewsList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<News>> getCustomizedNewsList() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null));
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getCustomizedNewsDetail")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "涓氬姟鏁版嵁涓婚敭", required = true),
+ })
+ public ApiResponse<News> getCustomizedNewsDetail(@RequestParam Long id) {
+ return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsDetail(id));
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "淇濆瓨鎺ㄥ箍鍜ㄨ鍒嗕韩璁板綍", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/saveShareRecord")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "鎺ㄥ箍鍜ㄨ涓婚敭", required = true),
+ })
+ public ApiResponse saveShareRecord(@RequestParam Long id) {
+ newsService.saveShareRecord(id,getMemberId());
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鎴戠殑鍠滄鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiCusFavorite")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(Constants.CUSTOMER);
+ ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
+ return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "杞挱鍥惧垪琛�", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiCarouselImage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(Constants.CUSTOMER);
+ ZTBasePageResponse<ZTCusCarouselImageResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
+ return ApiResponse.success("鑾峰彇鎴愬姛",ztBasePageResponse);
+ }
+
}
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 f491ad3..964a8ee 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
@@ -4,13 +4,19 @@
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.News;
+import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
+import com.doumee.service.business.NewsService;
import com.doumee.service.business.SmsEmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,19 +42,39 @@
@Autowired
public ZbomCRMService zbomCRMService;
+ @Autowired
+ public NewsService newsService;
+
@ApiOperation(value = "銆怌绔皬绋嬪簭銆戣幏鍙栭椤靛織璇磋淇洓涓ā鍧楃被鐩暟鎹�", notes = "鑾峰彇棣栭〉蹇楄瑁呬慨鍥涗釜妯″潡绫荤洰鏁版嵁锛岃儗鏅浘鏆傛椂鍐欐锛屽弬鑰僓I")
@PostMapping("/getZSZXCatalogs")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
return ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
}
- @ApiOperation(value = "銆愮灏忕▼搴忋�戣幏鍙栧鎴风鐞嗘巿鏉�-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
+
+
+
+ @ApiOperation(value = "銆怋绔皬绋嬪簭銆戞瘡鏃ヤ笂鏂版暟鎹�")
+ @GetMapping("/getDailyUpdates")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "闄勪欢绫诲瀷 0鍥剧墖 1瑙嗛", required = false)
+ })
+ public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
+ return ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
+ }
+
+
+ @ApiOperation("銆怋绔皬绋嬪簭銆� 鎺ㄥ箍鍜ㄨ鍒嗛〉")
+ @PostMapping("/newsPage")
+ public ApiResponse<PageData<News>> newsPage (@RequestBody PageWrap<News> pageWrap) {
+ return ApiResponse.success(newsService.findPage(pageWrap));
+ }
+
+
+
+ @ApiOperation(value = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈-鍒楄〃璺宠浆鍦板潃", notes = "鑾峰彇瀹㈡埛绠＄悊鎺堟潈璺宠浆鍦板潃")
@GetMapping("/getCrmAuthUrl")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷 0瀹㈡埛鍒楄〃 1璺宠浆鏂板鎰忓悜瀹㈡埛", required = true)
})
public ApiResponse<String> getCrmAuthUrl(@RequestParam Integer type) {
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 9b6eb64..3ffb695 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
@@ -104,7 +104,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
})
public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
+ usersService.bindingOpenid(code,getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -115,7 +115,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse getUserDetail() {
- usersService.usersDetailById(getMemberId());
+ usersService.usersDetailById(getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -126,7 +126,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
- editUsersRequest.setUserId(getMemberId());
+ editUsersRequest.setUserId(getUserId());
usersService.editUserInfo(editUsersRequest);
return ApiResponse.success("鏇存柊鎴愬姛");
}
@@ -213,16 +213,6 @@
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
- @LoginRequired
- @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/getZTCatalogInfoResponse")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) {
- List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest);
- return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponse);
- }
@LoginRequired
@ApiOperation(value = "鍐呭鍒嗛〉 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -243,7 +233,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
- ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getMemberId());
+ ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getUserId());
return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse);
}
@@ -256,7 +246,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse collectContent(@RequestParam String id) {
- getZhongTaiDataService.collectContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.collectContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -268,7 +258,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse likeContent(@RequestParam String id) {
- getZhongTaiDataService.likeContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.likeContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -281,7 +271,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse shareContent(@RequestParam String id) {
- getZhongTaiDataService.shareContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.shareContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -294,7 +284,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
})
public ApiResponse viewContent(@RequestParam String id) {
- getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id);
+ getZhongTaiDataService.viewContent(getUserId(),Constants.BUSINESS,id);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3