From acb1a535f7df6f943159e13e5199a705f7e98074 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 18 七月 2024 17:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 217 +++++++---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java | 2
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java | 22
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java | 132 ++++--
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTActionDoRequest.java | 10
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java | 14
server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java | 107 +++++
server/web/src/main/java/com/doumee/api/ScheduleTool.java | 25 -
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 340 +++++++---------
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 56 ++
/dev/null | 69 ---
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java | 4
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java | 7
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 93 ----
server/service/src/main/java/com/doumee/dao/business/model/Shop.java | 4
server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 55 +
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/MemberService.java | 2
18 files changed, 623 insertions(+), 538 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTActionDoRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTActionDoRequest.java
index 3f5cf00..03a845a 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTActionDoRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTActionDoRequest.java
@@ -16,6 +16,16 @@
* OpenID
*/
private String openId;
+ /**
+ * collect
+ * collect_cancel
+ * like
+ * like_cancel
+ * view
+ * share
+ * download
+ */
+ private String actionType;
}
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 7cba81b..20f32c2 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
@@ -32,6 +32,17 @@
String VIDEO_REC ="video_rec";
String REAL_CASE ="real_case";
}
+
+ public interface ActionType{
+ String COLLECT ="collect";
+ String COLLECT_CANCEL ="collect_cancel";
+ String LIKE ="like";
+ String LIKE_CANCEL ="like_cancel";
+ String VIEW ="view";
+ String SHARE ="share";
+ String DOWNLOAD ="download";
+ }
+
public interface IntegerUrl{
String USER_UPDATE_URL ="/customer/api/sync";
String USER_GET_TOKEN_URL ="/customer/api/login";
@@ -40,7 +51,8 @@
String TAG_LIST_URL ="/content/api/tag";
String CONTENT_LIST_URL ="/content/api/page";
String CONTENT_INFO_URL ="/content/api/detail/";
- String COLLECT_DO_URL ="/content/api/collect";
+// String COLLECT_DO_URL ="/content/api/collect";
+ String COLLECT_DO_URL ="/content/api/addAction";
String VIEW_DO_URL ="/content/api/view";
String SHARE_DO_URL ="/content/api/share";
String LIKE_DO_URL ="/content/api/like";
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
index aaf5bef..1c56e14 100644
--- 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
@@ -33,25 +33,13 @@
@ApiModelProperty(value = "鍙戝竷缁勭粐")
private String publishDepartment;
- @ApiModelProperty(value = "鍐呭鎵撳紑鏂瑰紡(鍐呴儴椤甸潰page銆佽棰憊ideo銆佸瘜鏂囨湰text銆佸閮ㄩ摼鎺ink)\n")
- private String openType;
-
- @ApiModelProperty(value = "鍐呴儴椤甸潰鍦板潃")
- private String pageUrl;
-
- @ApiModelProperty(value = "瑙嗛閾炬帴")
- private String videoUrl;
-
- @ApiModelProperty(value = "瀵屾枃鏈唴瀹�")
- private String content;
-
- @ApiModelProperty(value = "澶栭儴閾炬帴")
- private String linkUrl;
-
@ApiModelProperty(value = "灏侀潰鍥剧墖")
private String coverImage;
- @ApiModelProperty(value = "鍏宠仈浜у搧绫诲瀷鍚嶇О")
- private String infoProTypeName;
+ @ApiModelProperty(value = "鍐呭鎵撳紑鏂瑰紡(鍐呴儴椤甸潰page銆佽棰憊ideo銆佸瘜鏂囨湰text銆佸閮ㄩ摼鎺ink)")
+ private String openType;
+
+ @ApiModelProperty(value = "璺宠浆鍐呭")
+ private String openContent;
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java
index 71f1401..a966711 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductInfoResponse.java
@@ -23,13 +23,13 @@
private String content;
private String coverImage;
private String id;
- private String isCollection;
+ private Boolean isCollection;
private String langCode;
/**
* 浜у搧鍙傛暟鍒楄〃
*/
private List<ZTProductParamInfoResponse> productParamList;
- private String publishDate;
+ private String publishDt;
private String publishDepartment;
/**
* 瀹炴櫙鍥惧垪琛�
@@ -49,4 +49,7 @@
private String shareCount;
private String sort;
private String type;
+ private String video;
+ private String intro;
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java
index 12f03c3..f20c7cc 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTProductNewsInfoResponse.java
@@ -23,7 +23,7 @@
private String content;
private String coverImage;
private String id;
- private String isCollection;
+ private Boolean isCollection;
private String langCode;
/**
* 浜у搧鍙傛暟鍒楄〃
@@ -49,4 +49,6 @@
private String shareCount;
private String sort;
private String type;
+ private String contentType;
+
}
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
index c3a6b58..42c3e54 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTRealcaseInfoResponse.java
@@ -25,7 +25,7 @@
/**
* 鍙戝竷鏃ユ湡
*/
- private String publishDate;
+ private String publishDt;
/**
* 鏍囬
*/
diff --git a/server/service/src/main/java/com/doumee/core/wx/AccessToken.java b/server/service/src/main/java/com/doumee/core/wx/AccessToken.java
deleted file mode 100644
index ff6a0c4..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/AccessToken.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.doumee.core.wx;
-
-import lombok.Data;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2022/12/7 17:26
- */
-@Data
-public class AccessToken {
-
- private String accessToken;
- //杩囨湡鏃堕棿 褰撳墠绯荤粺鏃堕棿+寰俊浼犳潵鐨勮繃鏈熸椂闂�
- private Long expiresTime;
-
- public AccessToken(String accessToken, String expiresIn) {
- this.accessToken = accessToken;
- this.expiresTime = System.currentTimeMillis()+Integer.parseInt(expiresIn)*1000;
- }
-
- /**
- * 鍒ゆ柇token鏄惁杩囨湡
- * @return
- */
- public boolean isExpired(){
- return System.currentTimeMillis()>expiresTime;
- }
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/TemplateData.java b/server/service/src/main/java/com/doumee/core/wx/TemplateData.java
deleted file mode 100644
index aad9cf6..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/TemplateData.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.doumee.core.wx;
-
-import lombok.Data;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2022/12/7 17:28
- */
-@Data
-public class TemplateData {
- private String value;
-
- public TemplateData(String value) {
- this.value = value;
- }
-
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/WXConstant.java b/server/service/src/main/java/com/doumee/core/wx/WXConstant.java
deleted file mode 100644
index d2e0d23..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/WXConstant.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.doumee.core.wx;
-
-/**
- * 鍏紬鍙锋帴鍙ｅ湴鍧�绫�
- *
- * @Author : Rk
- * @create 2023/12/7 10:42
- */
-public class WXConstant {
-
- //鑾峰彇鍏紬鍙� access_token
- public static final String GET_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET";
-
- //鑾峰彇鐢ㄦ埛淇℃伅
- public static final String GET_USER_INFO_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
-
-
-
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
deleted file mode 100644
index 8dca404..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.doumee.core.wx;
-
-import com.doumee.core.constants.ResponseStatus;
-import com.doumee.core.exception.BusinessException;
-import com.doumee.core.utils.ID;
-//import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
-//import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
-//import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
-//import com.github.binarywang.wxpay.exception.WxPayException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-
-/**
- * 寰俊灏忕▼搴�-鍏叡鏂规硶
- */
-@Service
-@Slf4j
-public class WxMiniUtilService {
-
-//
-// /**
-// * 璁㈠崟寰俊閫�娆�
-// * orderNo:鍟嗘埛璁㈠崟鍙�
-// * totalPrice锛氳鍗曟�婚噾棰�
-// * refundPrice锛涢��娆鹃噾棰�
-// */
-// @Transactional(rollbackFor = Exception.class)
-// public static String wxRefund(String orderNo, BigDecimal totalPrice, BigDecimal refundPrice) {
-// try {
-// // 鍙戦�侀��娆捐姹�
-// String refNum = ID.nextGUID();
-// WxPayRefundRequest request = new WxPayRefundRequest();
-// request.setOutTradeNo(orderNo);
-// request.setOutRefundNo(refNum);
-// // request.setTotalFee(2);
-// // request.setRefundFee(1);
-// request.setTotalFee(BaseWxPayRequest.yuanToFen(totalPrice.toString()));
-// request.setRefundFee(BaseWxPayRequest.yuanToFen(refundPrice.toString()));
-// WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
-// if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
-// return refNum;
-// } else {
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),response.getErrCode() + response.getErrCodeDes());
-// }
-// } catch (WxPayException e) {
-// e.printStackTrace();
-// }
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"閫�娆惧彂鐢熷紓甯歌鑱旂郴绠＄悊鍛�");
-// }
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/WxMsgVO.java b/server/service/src/main/java/com/doumee/core/wx/WxMsgVO.java
deleted file mode 100644
index cee69e6..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/WxMsgVO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.doumee.core.wx;
-
-import lombok.Data;
-
-import java.util.Map;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2022/12/7 17:27
- */
-@Data
-public class WxMsgVO {
- //鐢ㄦ埛openId
- private String touser;
- //妯＄増id
- private String template_id;
- //鎺ㄩ�佹枃瀛�
- private Map<String , TemplateData> data;
- //璺宠浆璺緞 锛岄粯璁よ烦杞埌灏忕▼搴忛椤�
- private String page="pages/index/index";
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/WxPayProperties.java b/server/service/src/main/java/com/doumee/core/wx/WxPayProperties.java
deleted file mode 100644
index efe67cb..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/WxPayProperties.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.doumee.core.wx;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/3/22 18:04
- */
-@Component
-@ConfigurationProperties(prefix = "wx.pay")
-@Data
-public class WxPayProperties {
-
- /**
- * AppID
- */
- private String appId;
-
- /**
- * AppSecret
- */
- private String appSecret;
-
- /**
- * 寰俊鍟嗘埛鍙�
- */
- private String mchId;
-
- /**
- * 鏀粯API瀵嗛挜
- */
- private String mchKey;
-
- /**
- * 鏀粯鍥炶皟鍦板潃
- */
- private String notifyUrl;
-
- /**
- * 鏀粯璇佷功(p12)
- */
- private String keyPath;
-
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java b/server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java
deleted file mode 100644
index f7c080a..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatConfig.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-package com.doumee.core.wx.wxPlat;
-
-import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.utils.Constants;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Created by IntelliJ IDEA.
- *
- * @Author : Rk
- * @create 2023/12/27 9:30
- */
-@Configuration
-@Slf4j
-public class WxPlatConfig {
-
- @Autowired
- private SystemDictDataBiz systemDictDataBiz;
-
-// @Bean
- public WxMpConfigStorage wxMpConfigStorage() {
- WxMpDefaultConfigImpl configStorage = new WxMpDefaultConfigImpl();
-
- return configStorage;
- }
-
-
- /**
- * 澹版槑瀹炰緥
- *
- * @return
- */
- @Bean
- public WxMpService wxMpService() {
- WxMpService wxMpService = new WxMpServiceImpl();
- wxMpService.setWxMpConfigStorage(wxMpConfigStorage());
- return wxMpService;
- }
-
-}
diff --git a/server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
deleted file mode 100644
index 9a82791..0000000
--- a/server/service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.doumee.core.wx.wxPlat;
-
-import com.doumee.dao.business.model.Member;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-/**
- * 寰俊鍏紬鍙烽�氱煡
- *
- * @Author : Rk
- * @create 2023/12/27 9:19
- */
-@Slf4j
-@Component
-public class WxPlatNotice {
-
- /**
- * 寰俊鍏紬鍙稟PI鐨凷ervice
- */
- private final WxMpService wxMpService;
-
- public WxPlatNotice(WxMpService wxMpService) {
- this.wxMpService = wxMpService;
- }
-
- /**
- * 璁垮璁板綍瀹℃壒涓氬姟閫氱煡
- */
- public Boolean sendVisitAuditTemplateNotice(Member visits, String prefix, String tempId){
- if(StringUtils.isBlank(visits.getOpenid())){
- return false;
- }
- WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
- .toUser(visits.getOpenid())
- .templateId(tempId)
- .url(prefix + visits.getId())
- .build();
- String thing1 = "寰呭鎵�";
- if(visits.getStatus()==2){
- thing1 = "瀹℃牳閫氳繃";
- }else if(visits.getStatus()==3){
- thing1 = "瀹℃牳涓嶉�氳繃";
- }else if(visits.getStatus()==5){
- thing1 = "璁惧鎺堟潈鎴愬姛";
- }else if(visits.getStatus()==6){
- thing1 = "璁惧鎺堟潈鏈垚鍔�";
- }
- // 娣诲姞妯℃澘鏁版嵁
- templateMessage.addData(new WxMpTemplateData("thing1", thing1))
- .addData(new WxMpTemplateData("thing2", visits.getName()))
- .addData(new WxMpTemplateData("phone_number6", visits.getPhone()));
- String msgId = null;
- try {
- // 鍙戦�佹ā鏉挎秷鎭�
- msgId = wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
- } catch (WxErrorException e) {
- e.printStackTrace();
- }
- log.warn("路==++--路鎺ㄩ�佸井淇℃ā鏉夸俊鎭細{}路--++==路", msgId != null ? "鎴愬姛" : "澶辫触");
- return msgId != null;
- }
-
-
-}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Shop.java b/server/service/src/main/java/com/doumee/dao/business/model/Shop.java
index d9e6717..b3d4007 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Shop.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Shop.java
@@ -244,6 +244,10 @@
@TableField(exist = false)
private BigDecimal distance;
+ @ApiModelProperty(value = "璺濈鏄剧ず", example = "1")
+ @TableField(exist = false)
+ private String distanceStr;
+
@ApiModelProperty(value = "闂ㄥ簵瀵艰喘鍒楄〃 ", example = "1")
@TableField(exist = false)
private List<Users> usersList;
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 ba71000..b0dba66 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
@@ -27,60 +27,12 @@
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);
-
- /**
- * 鏀惰棌涓氬姟
+ * 琛屼负涓氬姟鎺ュ彛
* @param userId
* @param userType
* @param articleId
*/
- void collectContent(Long userId,String userType,String articleId);
-
- /**
- * 鍠滄涓氬姟
- * @param userId
- * @param userType
- * @param articleId
- */
- void likeContent(Long userId,String userType,String articleId);
-
- /**
- * 鍐呭鍒嗕韩
- * @param userId
- * @param userType
- * @param articleId
- */
- void shareContent(Long userId,String userType,String articleId);
-
-
- /**
- * 鍐呭娴忚
- * @param userId
- * @param userType
- * @param articleId
- */
- void viewContent(Long userId,String userType,String articleId);
+ void actionDo(Long userId,String userType,String articleId,String actionType);
/**
* 娉ㄩ攢鐢ㄦ埛
@@ -115,4 +67,84 @@
* @return
*/
ZTCusCarouselImageResponse getZhongTaiCarouselImageDetail(ZTDataDetailRequest ztDataDetailRequest);
+
+ /**
+ * 涓彴 鍜ㄨ鍒楄〃鎺ュ彛
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTProductNewsInfoResponse> getZhongTaiProductNewsPage(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * 涓彴 浜у搧鍒楄〃鎺ュ彛
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTProductInfoResponse> getZhongTaiProductPage(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * 涓彴 瀹炴櫙妗堜緥鎺ュ彛
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTRealcaseInfoResponse> getZhongTaiRealcasePage(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * 涓彴 瑙嗛鍒楄〃鍒嗛〉
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTVideoInfoResponse> getZhongTaiVideoPage(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * 涓彴 鍏ㄥ眿妗堜緥鍒楄〃鍒嗛〉
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTCaseInfoResponse> getZhongTaiWholecasePage(ZTContentListRequest ztContentListRequest);
+
+ /**
+ * 涓彴 蹇楄瑁呬慨
+ * @param ztContentListRequest
+ * @return
+ */
+ ZTBasePageResponse<ZTZbDecoInfoResponse> getZhongTaiZbDecoPage(ZTContentListRequest ztContentListRequest);
+
+
+ /**
+ * 涓彴 - 浜у搧璇︽儏
+ * @param id
+ * @param userType
+ * @param userId
+ * @return
+ */
+ ZTProductInfoResponse getProductInfo(String id,String userType,Long userId);
+
+ /**
+ * 涓彴 - 鍏ㄥ眿璧勮璇︽儏
+ * @param id
+ * @param userType
+ * @param userId
+ * @return
+ */
+ ZTCaseInfoResponse getWholecaseInfo(String id,String userType,Long userId);
+
+ /**
+ * 涓彴 - 浜у搧璧勮璇︽儏
+ * @param id
+ * @param userType
+ * @param userId
+ * @return
+ */
+ ZTProductNewsInfoResponse getProductNewsInfo(String id,String userType,Long userId);
+
+ /**
+ * 涓彴 - 瀹炴櫙妗堜緥
+ * @param id
+ * @param userType
+ * @param userId
+ * @return
+ */
+ ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId);
+
}
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 f6814b9..5e9279f 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
@@ -105,7 +105,7 @@
* @param code
* @return
*/
- AccountResponse wxLogin(String code);
+ AccountResponse wxLogin(String code,String iamId);
/**
* 鑾峰彇鎵嬫満鍙�
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
index 7e10ee1..0abb8e5 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerLogServiceImpl.java
@@ -122,7 +122,6 @@
QueryWrapper<CustomerLog> wrapper = new QueryWrapper<>(customerLog);
return customerLogMapper.selectList(wrapper);
}
-
@Override
public PageData<CustomerLog> findPage(PageWrap<CustomerLog> pageWrap) {
IPage<CustomerLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -133,12 +132,112 @@
.eq(CustomerLog::getIsdeleted, Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getType()),CustomerLog::getType, pageWrap.getModel().getType())
.eq(Objects.nonNull(pageWrap.getModel().getMemberId()),Customer::getMemberId, pageWrap.getModel().getMemberId());
+
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.eq(CustomerLog::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.eq(CustomerLog::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.eq(CustomerLog::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.ge(CustomerLog::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(CustomerLog::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.eq(CustomerLog::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getRemark() != null) {
+ queryWrapper.eq(CustomerLog::getRemark, pageWrap.getModel().getRemark());
+ }
+ if (pageWrap.getModel().getOrderDate() != null) {
+ queryWrapper.eq(CustomerLog::getOrderDate, pageWrap.getModel().getOrderDate());
+ }
+ if (pageWrap.getModel().getPlaDate() != null) {
+ queryWrapper.eq(CustomerLog::getPlaDate, pageWrap.getModel().getPlaDate());
+ }
+ if (pageWrap.getModel().getDesignType() != null) {
+ queryWrapper.eq(CustomerLog::getDesignType, pageWrap.getModel().getDesignType());
+ }
+ if (pageWrap.getModel().getHouseStatus() != null) {
+ queryWrapper.eq(CustomerLog::getHouseStatus, pageWrap.getModel().getHouseStatus());
+ }
+ if (pageWrap.getModel().getDistrict() != null) {
+ queryWrapper.eq(CustomerLog::getDistrict, pageWrap.getModel().getDistrict());
+ }
+ if (pageWrap.getModel().getArea() != null) {
+ queryWrapper.eq(CustomerLog::getArea, pageWrap.getModel().getArea());
+ }
+ if (pageWrap.getModel().getInfo() != null) {
+ queryWrapper.eq(CustomerLog::getInfo, pageWrap.getModel().getInfo());
+ }
+ if (pageWrap.getModel().getCostomerId() != null) {
+ queryWrapper.eq(CustomerLog::getCostomerId, pageWrap.getModel().getCostomerId());
+ }
+ if (pageWrap.getModel().getHouseType() != null) {
+ queryWrapper.eq(CustomerLog::getHouseType, pageWrap.getModel().getHouseType());
+ }
+ if (pageWrap.getModel().getSex() != null) {
+ queryWrapper.eq(CustomerLog::getSex, pageWrap.getModel().getSex());
+ }
+ if (pageWrap.getModel().getAgeInfo() != null) {
+ queryWrapper.eq(CustomerLog::getAgeInfo, pageWrap.getModel().getAgeInfo());
+ }
+ if (pageWrap.getModel().getStyleInfo() != null) {
+ queryWrapper.eq(CustomerLog::getStyleInfo, pageWrap.getModel().getStyleInfo());
+ }
+ if (pageWrap.getModel().getProvinceName() != null) {
+ queryWrapper.like(CustomerLog::getProvinceName, pageWrap.getModel().getProvinceName());
+ }
+ if (pageWrap.getModel().getCityName() != null) {
+ queryWrapper.like(CustomerLog::getCityName, pageWrap.getModel().getCityName());
+ }
+ if (pageWrap.getModel().getProvicneCode() != null) {
+ queryWrapper.eq(CustomerLog::getProvicneCode, pageWrap.getModel().getProvicneCode());
+ }
+ if (pageWrap.getModel().getCityCode() != null) {
+ queryWrapper.eq(CustomerLog::getCityCode, pageWrap.getModel().getCityCode());
+ }
+ if (pageWrap.getModel().getPhone() != null) {
+ queryWrapper.like(CustomerLog::getPhone, pageWrap.getModel().getPhone());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.eq(CustomerLog::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getBudget() != null) {
+ queryWrapper.eq(CustomerLog::getBudget, pageWrap.getModel().getBudget());
+ }
+ if (pageWrap.getModel().getCrmStatus() != null) {
+ queryWrapper.eq(CustomerLog::getCrmStatus, pageWrap.getModel().getCrmStatus());
+ }
+ if (pageWrap.getModel().getCrmDate() != null) {
+ queryWrapper.ge(CustomerLog::getCrmDate, Utils.Date.getStart(pageWrap.getModel().getCrmDate()));
+ queryWrapper.le(CustomerLog::getCrmDate, Utils.Date.getEnd(pageWrap.getModel().getCrmDate()));
+ }
+ if (pageWrap.getModel().getCrmInfo() != null) {
+ queryWrapper.eq(CustomerLog::getCrmInfo, pageWrap.getModel().getCrmInfo());
+ }
+ if (pageWrap.getModel().getQueryStartDate() != null) {
+ queryWrapper.ge(CustomerLog::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getQueryStartDate()));
+ }
+ if (pageWrap.getModel().getQueryEndDate() != null) {
+ queryWrapper.le(CustomerLog::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getQueryEndDate()));
+ }
+
queryWrapper.orderByDesc(CustomerLog::getCreateDate);
PageData<CustomerLog> pageData = PageData.from(customerLogMapper.selectJoinPage(page,CustomerLog.class, queryWrapper));
for (CustomerLog customerLog:pageData.getRecords()) {
- customerLog.setPhone(
- customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
- );
+ if(Objects.nonNull(pageWrap.getModel().getMemberId())){
+ customerLog.setPhone(
+ customerLog.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")
+ );
+ }
}
return pageData;
}
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 1de097f..47b86ee 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
@@ -60,14 +60,6 @@
|| StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(!(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING)
- ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN)
- ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)
- ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CAROUSEL_AD)
- ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.VIDEO_REC)
- ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.REAL_CASE))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍒嗙被淇℃伅閿欒");
- }
return zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
}
@@ -82,117 +74,15 @@
}
- /**
- * 鑾峰彇鐖跺瓙绾х粨鏋勬暟鎹垪琛�
- * 蹇楄瑁呬慨 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())
- ){
- throw new BusinessException(ResponseStatus.BAD_REQUEST);
- }
- //鏌ヨ 涓彴
- ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
- Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
- ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
- 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;
- }
-
-
-
-
-
-
- @Override
- public ZTContentInfoResponse getContentInfo(String id,String userType,Long userId){
- //鏌ヨ 涓彴 TOKEN
- ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
- ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
- ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
- 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;
- }
-
- @Override
- public void collectContent(Long userId,String userType,String articleId){
+ public void actionDo(Long userId,String userType,String articleId,String actionType){
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
ZTActionDoRequest param = new ZTActionDoRequest();
param.setOpenId(ztBaseInfoResponse.getOpenId());
param.setUserType(userType);
param.setArticleId(articleId);
param.setToken(ztBaseInfoResponse.getToken());
+ param.setActionType(actionType);
ZTBaseResponse ztBaseResponse = zbomZhongTaiService.collectDo(param);
if(Objects.isNull(ztBaseResponse)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"涓彴鎺ュ彛鍝嶅簲澶辫触");
@@ -202,82 +92,6 @@
}
}
}
-
- @Override
- public void likeContent(Long userId,String userType,String articleId){
- ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
- ZTActionBatchDoRequest param = new ZTActionBatchDoRequest();
- param.setOpenId(ztBaseInfoResponse.getOpenId());
- param.setUserType(userType);
- param.setToken(ztBaseInfoResponse.getToken());
- List<ZTActionDoRequest> list = new ArrayList<>();
- ZTActionDoRequest ztActionDoRequest = new ZTActionDoRequest();
- ztActionDoRequest.setArticleId(articleId);
- param.setList(list);
- ZTBaseResponse ztBaseResponse = zbomZhongTaiService.likeDo(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 void shareContent(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.shareDo(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 void 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());
- }
- }
- }
-
-// 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){
@@ -329,4 +143,154 @@
}
+
+ @Override
+ public ZTBasePageResponse<ZTProductNewsInfoResponse> getZhongTaiProductNewsPage(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTProductNewsInfoResponse> response = zbomZhongTaiService.pageProductNewsList(ztContentListRequest);
+ return response;
+ }
+
+
+ @Override
+ public ZTBasePageResponse<ZTProductInfoResponse> getZhongTaiProductPage(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTProductInfoResponse> response = zbomZhongTaiService.pageProductList(ztContentListRequest);
+ return response;
+ }
+
+
+ @Override
+ public ZTBasePageResponse<ZTRealcaseInfoResponse> getZhongTaiRealcasePage(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTRealcaseInfoResponse> response = zbomZhongTaiService.pageRealcaseList(ztContentListRequest);
+ return response;
+ }
+
+
+ @Override
+ public ZTBasePageResponse<ZTVideoInfoResponse> getZhongTaiVideoPage(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTVideoInfoResponse> response = zbomZhongTaiService.pageVideoList(ztContentListRequest);
+ return response;
+ }
+
+ @Override
+ public ZTBasePageResponse<ZTCaseInfoResponse> getZhongTaiWholecasePage(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTCaseInfoResponse> response = zbomZhongTaiService.pageWholecaseList(ztContentListRequest);
+ return response;
+ }
+
+
+ @Override
+ public ZTBasePageResponse<ZTZbDecoInfoResponse> getZhongTaiZbDecoPage(ZTContentListRequest ztContentListRequest){
+ if(Objects.isNull(ztContentListRequest)
+ || Objects.isNull(ztContentListRequest.getPageNum())
+ || Objects.isNull(ztContentListRequest.getPageSize())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTZbDecoInfoResponse> response = zbomZhongTaiService.pageZbDecoList(ztContentListRequest);
+ return response;
+ }
+
+
+ @Override
+ public ZTProductInfoResponse getProductInfo(String id,String userType,Long userId){
+ //鏌ヨ 涓彴 TOKEN
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
+ ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
+ ztContentListRequest.setId(id);
+ ZTProductInfoResponse response = zbomZhongTaiService.getProductInfo(ztContentListRequest);
+ return response;
+ }
+
+ @Override
+ public ZTCaseInfoResponse getWholecaseInfo(String id,String userType,Long userId){
+ //鏌ヨ 涓彴 TOKEN
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
+ ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
+ ztContentListRequest.setId(id);
+ ZTCaseInfoResponse response = zbomZhongTaiService.getWholecaseInfo(ztContentListRequest);
+ return response;
+ }
+
+ @Override
+ public ZTProductNewsInfoResponse getProductNewsInfo(String id,String userType,Long userId){
+ //鏌ヨ 涓彴 TOKEN
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
+ ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
+ ztContentListRequest.setId(id);
+ ZTProductNewsInfoResponse response = zbomZhongTaiService.getProductNewsInfo(ztContentListRequest);
+ return response;
+ }
+
+ @Override
+ public ZTRealcaseInfoResponse getRealcaseInfo(String id,String userType,Long userId){
+ //鏌ヨ 涓彴 TOKEN
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType);
+ ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest();
+ ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
+ ztContentListRequest.setId(id);
+ ZTRealcaseInfoResponse response = zbomZhongTaiService.getRealcaseInfo(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 98c5578..979f5ff 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
@@ -265,7 +265,7 @@
@Override
- public AccountResponse wxLogin(String code){
+ public AccountResponse wxLogin(String code,String iamId){
try {
// 鑾峰彇寰俊鏁忔劅鏁版嵁
WxMaJscode2SessionResult session = WxMiniConfig.wxCustomerService.getUserService().getSessionInfo(code);
@@ -275,6 +275,13 @@
}
// String openId = code;
Member member = memberMapper.selectOne(new QueryWrapper<Member>().eq("OPENID", openId));
+ Users users = new Users();
+ if(StringUtils.isBlank(iamId)){
+ users = usersMapper.selectOne(new QueryWrapper<Users>().lambda()
+ .eq(Users::getIamId,iamId)
+ .last("limit 1")
+ );
+ }
if (member == null) {
member = new Member();
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
@@ -282,7 +289,12 @@
member.setIsdeleted(Constants.ZERO);
member.setOpenid(openId);
member.setType(Constants.ZERO);
- member.setAuthStatus(Constants.ZERO);
+ //濡傛灉缁戝畾浜嗗璐� 鍒欑洿鎺ヤ娇鐢ㄥ凡缁戝畾瀵艰喘淇℃伅 璺宠繃鎵嬫満鍙风粦瀹氱殑鐘舵��
+ if(Objects.nonNull(users)){
+ member.setAuthStatus(Constants.TWO);
+ }else{
+ member.setAuthStatus(Constants.ZERO);
+ }
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(Objects.isNull(ztUserGetTokenResponse)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"涓彴鏈嶅姟璋冭捣澶辫触!");
@@ -290,7 +302,7 @@
member.setToken(ztUserGetTokenResponse.getToken());
}
memberMapper.insert(member);
- member = this.getMemberInfo(member.getId());
+ this.saveCustomerUser(users,member.getId());
}else{
ZTUserGetTokenResponse ztUserGetTokenResponse = this.syncZhongTaiUser(member);
if(Objects.isNull(ztUserGetTokenResponse)){
@@ -298,7 +310,9 @@
}else{
member.setToken(ztUserGetTokenResponse.getToken());
}
+ this.saveCustomerUser(users,member.getId());
member = this.getMemberInfo(member.getId());
+
}
//鍒涘缓token
JwtPayLoad payLoad = new JwtPayLoad(member.getId(),Constants.ZERO);
@@ -313,6 +327,29 @@
}
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
}
+
+ public void saveCustomerUser(Users users,Long memberId){
+ if(!(Objects.nonNull(users)&&Objects.nonNull(memberId))){
+ return;
+ }
+ if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
+ .eq(CustomerUser::getIsdeleted,Constants.ZERO)
+ .eq(CustomerUser::getUserId,users.getId())
+ .eq(CustomerUser::getMemberId,memberId)) <= Constants.ZERO ){
+ CustomerUser customerUser = new CustomerUser();
+ customerUser.setUserId(users.getId());
+ customerUser.setCreateDate(new Date());
+ customerUser.setMemberId(memberId);
+ customerUser.setPhone(users.getPhone());
+ customerUser.setIamUserId(users.getIamId());
+ customerUser.setName(users.getName());
+ customerUser.setUsername(users.getIamUsername());
+ customerUser.setAddr(users.getShopAddress());
+ customerUserMapper.insert(customerUser);
+ //TODO 绛夊緟璋冭捣涓彴鎺ュ彛
+ }
+ }
+
@Override
public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
@@ -418,6 +455,15 @@
String prefix = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER).getCode();
member.setPrefix(prefix);
+ if( customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda().eq(CustomerUser::getIsdeleted,Constants.ZERO).eq(CustomerUser::getMemberId,member.getId()))>0){
+ member.setAuthStatus(Constants.TWO);
+ }else{
+ if(StringUtils.isBlank(member.getPhone())){
+ member.setAuthStatus(Constants.ZERO);
+ }else{
+ member.setAuthStatus(Constants.ONE);
+ }
+ }
return member;
}
@@ -443,11 +489,11 @@
param.setOpenId(member.getOpenid());
ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
if(Objects.nonNull(ztUserGetTokenResponse)){
- Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
+// Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
member.setToken(ztUserGetTokenResponse.getToken());
memberMapper.update(new UpdateWrapper<Member>().lambda()
.set(Member::getToken,ztUserGetTokenResponse.getToken())
- .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
+// .set(Member::getTokenDate,date)//榛樿鏈夋晥鏈熶负涓ゅ皬鏃�
.eq(Member::getId,member.getId()));
ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
}else{
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index 2c79efd..a556d35 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -41,6 +41,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -897,33 +898,32 @@
@Override
public PageData<Shop> queryShopByLL(PageWrap<Shop> pageWrap) {
-// if(Objects.isNull(pageWrap.getModel())
-// || Objects.isNull(pageWrap.getModel().getLatitude())
-// || Objects.isNull(pageWrap.getModel().getLongitude())){
-// return null;
-// }
+ if(Objects.isNull(pageWrap.getModel())
+ || Objects.isNull(pageWrap.getModel().getLatitude())
+ || Objects.isNull(pageWrap.getModel().getLongitude())){
+ return null;
+ }
IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Shop> queryWrapper = new MPJLambdaWrapper<>();
-// queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE" +
-// " ,CONVERT (ST_Distance_Sphere (point ("+pageWrap.getModel().getLongitude()+", "+pageWrap.getModel().getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ")
- queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE ")
+ queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE " +
+ " , (6371 * ACOS(COS(RADIANS("+pageWrap.getModel().getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+pageWrap.getModel().getLongitude()+")) + SIN(RADIANS("+pageWrap.getModel().getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance " )
.eq("isdeleted",Constants.ZERO)
-// .isNotNull("LATITUDE")
-// .isNotNull("LONGITUDE")
+ .isNotNull("LATITUDE")
+ .isNotNull("LONGITUDE")
.eq("TYPE",Constants.TWO)
.eq("SECOND_TYPE",Constants.THREE)
- .eq("STATUS",Constants.ONE);
-// .orderByAsc(" distance ")
+ .eq("STATUS",Constants.ONE)
+ .orderByAsc(" distance ");
Utils.MP.blankToNull(pageWrap.getModel());
PageData<Shop> pageData = PageData.from(shopMapper.selectPage(page, queryWrapper));
String prefix = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH).getCode()) +
StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE).getCode());
for (Shop shop:pageData.getRecords()) {
+ this.dealDistance(shop);
//鏌ヨ闂ㄥ簵涓嬪璐暟鎹�
List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
.eq(Users::getIsdeleted,Constants.ZERO)
.eq(Users::getStatus,Constants.ONE)
- .eq(Users::getType,Constants.ZERO)
);
for (Users users:usersList) {
if(StringUtils.isNotBlank(users.getImgurl())){
@@ -935,6 +935,29 @@
return pageData;
}
+ /**
+ * 澶勭悊闂ㄥ簵璺濈鏄剧ず
+ * @param shop
+ */
+ public void dealDistance(Shop shop){
+ if(Objects.isNull(shop.getDistance())){
+ shop.setDistanceStr("-");
+ }else{
+ //璺濈灏忎簬1鍏噷 鏄剧ず绫�
+ if(shop.getDistance().compareTo(BigDecimal.ONE)<Constants.ZERO){
+ BigDecimal distanceM = shop.getDistance().multiply(new BigDecimal(1000).setScale(0));
+ //100绫充箣鍐�
+ if(distanceM.compareTo(new BigDecimal(100))<0){
+ shop.setDistanceStr("<100绫�");
+ }else{
+ shop.setDistanceStr(distanceM.divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "m");
+ }
+ }else{
+ shop.setDistanceStr(shop.getDistance().divide(BigDecimal.valueOf(1)).setScale(2,BigDecimal.ROUND_HALF_UP) + "km");
+ }
+ }
+ }
+
@Override
public Shop shopDetail(Long id,Long memberId) {
QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>();
@@ -942,8 +965,8 @@
Member member = memberMapper.selectById(memberId);
//濡傛灉浜哄憳娌℃湁缁忕含搴︿俊鎭紝鍒欎笉鏌ヨ璺濈
if(Objects.nonNull(member)&&Objects.nonNull(member.getLatitude())&&Objects.nonNull(member.getLongitude())){
- queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE," +
- " CONVERT (ST_Distance_Sphere (point ("+member.getLongitude()+", "+member.getLatitude()+" ), point ( LONGITUDE, LATITUDE )) /1000,decimal(15,2)) as distance ");
+ queryWrapper.select("ID,NAME,ADDRESS,PROVINCE_NAME,CITY_NAME,AREA_NAME,TOWN,AREA_NAME,LEGAL_PHONE " +
+ " , (6371 * ACOS(COS(RADIANS("+member.getLatitude()+")) * COS(RADIANS(latitude)) * COS(RADIANS(longitude) - RADIANS("+member.getLongitude()+")) + SIN(RADIANS("+member.getLatitude()+")) * SIN(RADIANS(latitude)) ) ) as distance " );
}
}
queryWrapper.eq("id",id);
@@ -956,8 +979,8 @@
List<Users> usersList =usersMapper.selectList(new QueryWrapper<Users>().lambda().eq(Users::getDepartmentId,shop.getId())
.eq(Users::getIsdeleted,Constants.ZERO)
.eq(Users::getStatus,Constants.ONE)
- .eq(Users::getType,Constants.ZERO)
);
+ this.dealDistance(shop);
for (Users users:usersList) {
if(StringUtils.isNotBlank(users.getImgurl())){
users.setImgurlFull(prefix + users.getImgurl());
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 8d32d0b..9f68729 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
@@ -743,7 +743,7 @@
if(Objects.isNull(users)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
+ if(!Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鐢ㄦ埛宸茬鐢�");
}
getUsersDetail(users);
diff --git a/server/web/src/main/java/com/doumee/api/ScheduleTool.java b/server/web/src/main/java/com/doumee/api/ScheduleTool.java
index 363cb0d..7923406 100644
--- a/server/web/src/main/java/com/doumee/api/ScheduleTool.java
+++ b/server/web/src/main/java/com/doumee/api/ScheduleTool.java
@@ -5,7 +5,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.HttpsUtil;
-import com.doumee.core.wx.WXConstant;
import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.system.SystemDictDataService;
import lombok.extern.slf4j.Slf4j;
@@ -51,30 +50,6 @@
@Value("${debug_model}")
private Boolean timing;
- /**
- * 鏇存柊寰俊鍏紬鍙� ACCESS_TOKEN
- * @throws Exception
- */
- @Scheduled(fixedDelay=1000 * 60 * 90)
- public void updAccessToken(){
- DefaultSecurityManager securityManager = new DefaultSecurityManager();
- SecurityUtils.setSecurityManager(securityManager);
-
- String appId = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_APPID).getCode();
- String appSecret = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_SECRET).getCode();
- //鐢熸垚寰俊token
- String url = WXConstant.GET_ACCESS_TOKEN_URL.replace("APPID",appId).replace("APPSECRET",appSecret);
- String response = HttpsUtil.get(url,false);
- JSONObject json = JSONObject.parseObject(response);
- System.out.println(json);
- SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN);
- if(!Objects.isNull(systemDictData)){
- systemDictData.setCode(json.getString("access_token"));
- systemDictData.setUpdateTime(new Date());
- systemDictDataService.updateById(systemDictData);
- log.info(" 鏇存柊寰俊鍏紬鍙� ACCESS_TOKEN =========> " + systemDictData.getCode() );
- }
- }
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 175aed5..0ca27b0 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
@@ -88,9 +88,10 @@
@GetMapping("/wxLoginCustomer")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "iamId", value = "瀵艰喘涓婚敭", required = false),
})
- public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code) {
- return ApiResponse.success(memberService.wxLogin(code));
+ public ApiResponse<AccountResponse> wxLoginCustomer(@RequestParam String code,String iamId) {
+ return ApiResponse.success(memberService.wxLogin(code,iamId));
}
@LoginRequired
@@ -327,82 +328,20 @@
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
- @LoginRequired
- @ApiOperation(value = "鍐呭鍒嗛〉 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/pageContentList")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) {
- ztContentListRequest.setUserId(getMemberId()+"");
- ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
- ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
- return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
- }
+
@LoginRequired
- @ApiOperation(value = "鍐呭璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/getContentInfo")
+ @ApiOperation(value = "琛屼负鍐呭鎺ュ彛 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/actionDo")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "琛屼负绫诲瀷锛氭敹钘忥細collect;鍙栨秷鏀惰棌锛歝ollect_cancel;鍠滄锛歭ike;鍙栨秷鍠滄锛歭ike_cancel锛涙祻瑙堬細view;鍒嗕韩锛歴hare;涓嬭浇锛歞ownload", required = true),
})
- public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
- ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,ZTConstants.CUSTOMER,getMemberId());
- return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse);
- }
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鏀惰棌 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/collectContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse collectContent(@RequestParam String id) {
- getZhongTaiDataService.collectContent(getMemberId(),ZTConstants.CUSTOMER,id);
+ public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
+ getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鍠滄 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/likeContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse likeContent(@RequestParam String id) {
- getZhongTaiDataService.likeContent(getMemberId(),ZTConstants.CUSTOMER,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鍒嗕韩 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/shareContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse shareContent(@RequestParam String id) {
- getZhongTaiDataService.shareContent(getMemberId(),ZTConstants.CUSTOMER,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭娴忚 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/viewContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse viewContent(@RequestParam String id) {
- getZhongTaiDataService.viewContent(getMemberId(),ZTConstants.CUSTOMER,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
@LoginRequired
@ApiOperation(value = "瀹氬埗鏈嶅姟鍒楄〃", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -413,7 +352,6 @@
public ApiResponse<List<News>> getCustomizedNewsList() {
return ApiResponse.success("鏌ヨ鎴愬姛",newsService.getCustomizedNewsList(Constants.ONE,null,null));
}
-
@LoginRequired
@ApiOperation(value = "瀹氬埗鏈嶅姟璇︽儏", notes = "瀹㈡埛绔皬绋嬪簭")
@@ -482,4 +420,141 @@
}
+ @LoginRequired
+ @ApiOperation(value = "鍜ㄨ鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiProductNewsPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTProductNewsInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "浜у搧鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiProductPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTProductInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "瀹炴櫙鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiRealcasePage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTRealcaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "瑙嗛鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiVideoPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTVideoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "鍏ㄥ眿妗堜緥鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiWholecasePage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTCaseInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+ @LoginRequired
+ @ApiOperation(value = "蹇楄瑁呬慨鍒嗛〉鍒楄〃 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @PostMapping("/getZhongTaiZbDecoPage")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
+ ztContentListRequest.setUserId(getMemberId()+"");
+ ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
+ ZTBasePageResponse<ZTZbDecoInfoResponse> ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "鍏ㄥ眿妗堜緥璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getWholecaseInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @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());
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztCaseInfoResponse);
+ }
+
+
+ @LoginRequired
+ @ApiOperation(value = "浜у搧璧勮璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getProductNewsInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @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());
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztProductNewsInfoResponse);
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "瀹炴櫙妗堜緥 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getRealcaseInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @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());
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztRealcaseInfoResponse);
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation(value = "浜у搧璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+ @GetMapping("/getProductInfo")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ })
+ public ApiResponse<ZTProductInfoResponse> getProductInfo(@RequestParam String id) {
+ ZTProductInfoResponse ztProductInfoResponse= getZhongTaiDataService.getProductInfo(id,ZTConstants.CUSTOMER,getMemberId());
+ return ApiResponse.success("鏌ヨ鎴愬姛",ztProductInfoResponse);
+ }
+
+
+
+
+
}
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 722e029..7548ae8 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
@@ -186,12 +186,9 @@
crmCustomerListRequest.setUserId(getUserId());
return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
}
-
-
-
-
- @LoginRequired
- @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+
+ @UserLoginRequired
+ @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/getCatalogList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
@@ -200,11 +197,9 @@
List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
}
-
-
-
- @LoginRequired
- @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
+
+ @UserLoginRequired
+ @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/getCataLogTagList")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
@@ -213,79 +208,5 @@
List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
return ApiResponse.success("鏌ヨ鎴愬姛",ztTagInfoResponseList);
}
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鍒嗛〉 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/pageContentList")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) {
- ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
- return ApiResponse.success("鏌ヨ鎴愬姛",ztBasePageResponse);
- }
-
- @LoginRequired
- @ApiOperation(value = "鍐呭璇︽儏 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/getContentInfo")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
- ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id, ZTConstants.BUSINESS,getUserId());
- return ApiResponse.success("鏌ヨ鎴愬姛",ztContentInfoResponse);
- }
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鏀惰棌 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/collectContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse collectContent(@RequestParam String id) {
- getZhongTaiDataService.collectContent(getUserId(),ZTConstants.BUSINESS,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鍠滄 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/likeContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse likeContent(@RequestParam String id) {
- getZhongTaiDataService.likeContent(getUserId(),ZTConstants.BUSINESS,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭鍒嗕韩 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/shareContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse shareContent(@RequestParam String id) {
- getZhongTaiDataService.shareContent(getUserId(),ZTConstants.BUSINESS,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
- @LoginRequired
- @ApiOperation(value = "鍐呭娴忚 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/viewContent")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
- })
- public ApiResponse viewContent(@RequestParam String id) {
- getZhongTaiDataService.viewContent(getUserId(),ZTConstants.BUSINESS,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
+
}
--
Gitblit v1.9.3