From b2d360d9113b6955287108ca9e90d76a1f3c1419 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 15:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java | 198 ++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 116 deletions(-)
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 18368d3..4878c92 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
@@ -1,11 +1,11 @@
package com.doumee.api.web;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomCRMService;
import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest;
import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse;
import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse;
-import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
-import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
+import com.doumee.biz.zbom.model.zhongtai.*;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
@@ -16,12 +16,12 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.SmsEmail;
-import com.doumee.dao.web.reqeust.EditMemberRequest;
-import com.doumee.dao.web.reqeust.EditShopDTO;
-import com.doumee.dao.web.reqeust.EditUsersRequest;
-import com.doumee.dao.web.reqeust.ContentShareImgDto;
+import com.doumee.dao.business.model.Users;
+import com.doumee.dao.system.model.SystemDictData;
+import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.*;
+import com.doumee.service.system.SystemDictDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -32,7 +32,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -62,6 +64,7 @@
@Autowired
private GetZhongTaiDataService getZhongTaiDataService;
+
@ApiOperation(value = "灏忕▼搴忕櫥闄�", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByWx")
@ApiImplicitParams({
@@ -84,15 +87,15 @@
}
-
@ApiOperation(value = "鎵嬫満鍙烽獙璇佺爜鐧婚檰", notes = "鍛樺伐绔皬绋嬪簭")
@GetMapping("/loginByPhone")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "phone", value = "鎵嬫満鍙�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "鐭俊楠岃瘉鐮�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = false),
})
- public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code) {
- return ApiResponse.success(usersService.phoneLogin(phone,code));
+ public ApiResponse<AccountResponse> loginByPhone(@RequestParam String phone,@RequestParam String code,String openid) {
+ return ApiResponse.success(usersService.phoneLogin(phone,code,openid));
}
@@ -101,12 +104,20 @@
@GetMapping("/bindingOpenid")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "寰俊code", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "openid", value = "openid", required = true),
})
- public ApiResponse bindingOpenid(@RequestParam String code) {
- usersService.bindingOpenid(code,getMemberId());
+ public ApiResponse bindingOpenid(@RequestParam String openid) {
+ usersService.bindingOpenid(openid,getUserId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+
+ @ApiOperation(value = "鎵嬫満鍙峰揩鎹风櫥褰�", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/getWxMiniPhoneLogin")
+ public ApiResponse<AccountResponse> getWxMiniPhone(@Valid @RequestBody WxPhoneRequest wxPhoneRequest) {
+ return ApiResponse.success("鑾峰彇鎴愬姛",usersService.getWxMiniPhoneLogin(wxPhoneRequest));
+ }
+
@UserLoginRequired
@ApiOperation(value = "鑾峰彇涓汉淇℃伅璇︽儏", notes = "鍛樺伐绔皬绋嬪簭")
@@ -114,9 +125,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse getUserDetail() {
- usersService.usersDetailById(getMemberId());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ public ApiResponse<Users> getUserDetail() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",usersService.usersDetailById(getUserId()));
}
@UserLoginRequired
@@ -126,10 +136,11 @@
@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("鏇存柊鎴愬姛");
}
+
@UserLoginRequired
@ApiOperation(value = "闂ㄥ簵鍒嗛〉", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/shopPage")
@@ -138,6 +149,16 @@
})
public ApiResponse<PageData<Shop>> shopPage (@RequestBody PageWrap<Shop> pageWrap) {
return ApiResponse.success(shopService.findPage(pageWrap));
+ }
+
+ @UserLoginRequired
+ @ApiOperation(value = "鑾峰彇鍛樺伐绠＄悊闂ㄥ簵鍒楄〃", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/userShopList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse<List<Shop>> userShopList () {
+ return ApiResponse.success(shopService.getUserShopList(getMemberId()));
}
@UserLoginRequired
@@ -153,7 +174,7 @@
@UserLoginRequired
@ApiOperation(value = "淇敼闂ㄥ簵淇℃伅", notes = "鍛樺伐绔皬绋嬪簭")
- @GetMapping("/updShop")
+ @PostMapping("/updShop")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
@@ -162,14 +183,40 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @UserLoginRequired
@ApiOperation(value = "鑾峰彇涓汉鍚嶇墖", notes = "鍛樺伐绔皬绋嬪簭")
@PostMapping("/getUserCard")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<String> getUserCard() {
return ApiResponse.success(usersService.getUserCard(this.getLoginUserInfo()));
}
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+
+ @UserLoginRequired
+ @LoginRequired
+ @ApiOperation(value = "鏇存柊token", notes = "鍛樺伐绔皬绋嬪簭")
+ @GetMapping("/updateToken")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
+ public ApiResponse updateToken () {
+ systemDictDataBiz.updWxMiniToken();
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @UserLoginRequired
@ApiOperation(value = "鑾峰彇鍐呭鍒嗕韩娴锋姤", notes = "鑾峰彇鍐呭鍒嗕韩娴锋姤锛屽姞灏忕▼搴忕爜")
@PostMapping("/getContentShareImg")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
+ })
public ApiResponse<String> getContentShareImg(@RequestBody ContentShareImgDto param) {
return ApiResponse.success(usersService.getContentShareImg(this.getLoginUserInfo(),param));
}
@@ -182,119 +229,38 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
public ApiResponse<CRMBaseResponse<List<CRMCustomerListResponse>>> getCustomerList(@RequestBody CrmCustomerListRequest crmCustomerListRequest) {
- crmCustomerListRequest.setUserId(getMemberId());
+ crmCustomerListRequest.setUserId(getUserId());
return ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
}
-
-
+ @UserLoginRequired
@LoginRequired
- @ApiOperation(value = "鍒嗙被鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/getCatalogList")
+ @ApiOperation(value = "鎵归噺娣诲姞鍠滄缁欏鎴�", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/batchAddLike")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
- List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
- return ApiResponse.success("鏌ヨ鎴愬姛",ztCatalogInfoResponseList);
- }
-
-
-
- @LoginRequired
- @ApiOperation(value = "鏍囩鏁版嵁 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @PostMapping("/getCataLogTagList")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
- List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
- 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 = "瀹㈡埛绔皬绋嬪簭")
- @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,Constants.BUSINESS,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(),Constants.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(getMemberId(),Constants.BUSINESS,id);
+ public ApiResponse batchAddLike(@RequestBody ZTBatchAddListRequest ztBatchAddListRequest) {
+ ztBatchAddListRequest.setUserType(getUserType());
+ ztBatchAddListRequest.setUserId(getUserId().toString());
+ getZhongTaiDataService.batchAddLike(ztBatchAddListRequest);
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(),Constants.BUSINESS,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
- @LoginRequired
- @ApiOperation(value = "鍐呭娴忚 - 涓彴", notes = "瀹㈡埛绔皬绋嬪簭")
- @GetMapping("/viewContent")
+ @UserLoginRequired
+ @ApiOperation(value = "鐢ㄦ埛娉ㄩ攢", notes = "鍛樺伐绔皬绋嬪簭")
+ @PostMapping("/logOff")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "鍐呭涓婚敭", required = true),
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse viewContent(@RequestParam String id) {
- getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ public ApiResponse logOff() {
+ ZTBaseRequst ztBaseRequst = usersService.logOff(getUserId(),getToken());
+ if(Objects.nonNull(ztBaseRequst)){
+ getZhongTaiDataService.userLogout(ztBaseRequst);
+ }
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.9.3