From 20cc9b22e1cdb93d081c6596ec762e9f928e208a Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 05 七月 2023 11:28:25 +0800
Subject: [PATCH] 修复模块中的地址
---
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java | 22 +-
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java | 4
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java | 12
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 24 +-
cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java | 12
cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java | 2
cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java | 2
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 4
cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseHoursType.java | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java | 8
cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java | 4
cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml | 3
cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java | 4
cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java | 25 ++-
cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java | 10
cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java | 7
cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java | 8
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java | 6
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java | 4
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java | 11
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java | 2
cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java | 4
cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java | 4
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java | 4
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 2
cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java | 6
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java | 2
cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java | 4
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 18 +-
cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml | 0
cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java | 4
cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java | 4
cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java | 14 +-
/dev/null | 21 ---
cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml | 2
cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java | 7
cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java | 22 +-
cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 2
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java | 6
cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java | 7
cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java | 23 +--
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java | 12 +
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 10
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 4
46 files changed, 163 insertions(+), 199 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
index aee00e1..819bd7d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ExploreWPController.java
@@ -28,7 +28,7 @@
private TStudentService tsService;
@ResponseBody
- @PostMapping("/api/exploreWP/noticeList")
+ @PostMapping("/api/exploreWP/indexOfEx")
@ApiOperation(value = "联系客服-探索首页", tags = {"APP-探索玩湃"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -56,7 +56,7 @@
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/noticeDetail")
@ApiOperation(value = "联系客服-公告详情", tags = {"APP-探索玩湃"})
public ResultUtil<SysNotice> queryNotice(@RequestBody Integer noId){
try {
@@ -68,7 +68,7 @@
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/exceptionList")
@ApiOperation(value = "联系客服-常见问题列表", tags = {"APP-探索玩湃"})
public ResultUtil<QuestionDetailsVo> queryFrequentlyAskedQuestionDetails(){
try {
@@ -80,7 +80,7 @@
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/exceptionDetail")
@ApiOperation(value = "联系客服-常见问题详情", tags = {"APP-探索玩湃"})
public ResultUtil<QuestionIns> queryQuestionData(@RequestBody Integer quesId){
try {
@@ -91,7 +91,7 @@
}
@ResponseBody
- @PostMapping("/base/exploreWP/noticeList")
+ @PostMapping("/base/exploreWP/customerList")
@ApiOperation(value = "联系客服-客服电话列表", tags = {"APP-探索玩湃"})
public ResultUtil<List<String>> queryCustomerData(){
try {
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java
index d9e3390..a12ecfd 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/IntroduceRewardsClient.java
@@ -4,7 +4,7 @@
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -13,9 +13,11 @@
public interface IntroduceRewardsClient {
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody List<Integer> userIds);
+ @PostMapping("/base/introduce/useOfRewards")
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("userIds") List<Integer> userIds);
+
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
index d77e5e2..bdcab0b 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-activity")
public interface MerChandiseClient {
- @PostMapping("/pointMerchars/convertGoods")
+ @PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods();
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
index f1192fb..f336961 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
@@ -3,7 +3,7 @@
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -11,7 +11,7 @@
public interface UserConponClient {
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId);
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
index 66a66b2..829d85d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
@@ -4,16 +4,16 @@
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {
- @PostMapping("/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java
index 59cf6ea..49c613f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CancelListClient.java
@@ -3,7 +3,7 @@
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -11,10 +11,10 @@
@FeignClient(value = "mb-cloud-course")
public interface CancelListClient {
- @PostMapping("/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/cancelSource/cancelList")
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
index 7b0264c..2109607 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
@@ -6,7 +6,7 @@
import com.dsh.account.feignclient.course.model.StudentOfCourseVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -14,19 +14,19 @@
public interface CoursePaymentClient {
- @PostMapping("/coursePack/queryPayment")
+ @PostMapping("/base/coursePack/queryPayment")
List<StuCourseResp> getStuCoursePayment();
- @PostMapping("/coursePack/storeOfCourse")
+ @PostMapping("/base/coursePack/storeOfCourse")
List<CourseOfStoreVo> getStoreOfCourses();
- @PostMapping("/coursePack/stuOfCourses")
- StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/stuOfCourses")
+ StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
@PostMapping("/coursePack/continuingCourse")
- StudentOfCourseVo getStudentCourse(@RequestBody Integer courseId,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java
index 20a19b2..03d286d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseRecordClient.java
@@ -2,12 +2,14 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(value = "mb-cloud-course")
public interface CourseRecordClient {
- @PostMapping("/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody Integer courseId, @RequestBody Integer stuId, @RequestBody Integer appUserId);
+ @PostMapping("/base/courseRecord/queryDeduClassHours")
+ public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
index ef01dd4..173b742 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CourseSessionNameClient.java
@@ -5,7 +5,7 @@
import com.dsh.account.feignclient.course.model.StuSessionDetailsVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -14,16 +14,16 @@
public interface CourseSessionNameClient {
- @PostMapping("/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/sessionNames")
+ List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
- @PostMapping("/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/paymentCourse")
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java
index 4bbd241..8e53cc5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/HonorDeClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-other")
public interface HonorDeClient {
- @PostMapping("/honor/stuHonors")
+ @PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
index 1a400a0..029e614 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/ImgConfigClient.java
@@ -10,10 +10,10 @@
@FeignClient(value = "mb-cloud-other")
public interface ImgConfigClient {
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
List<TImgConfig> getNoneStuImgs();
- @PostMapping("/imgConfig/getBenefitImage")
+ @PostMapping("/base/imgConfig/getBenefitImage")
public UserBenefitImage getImageConfig();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java
index 159b15a..62dfe18 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/NoticeClient.java
@@ -3,7 +3,7 @@
import com.dsh.account.feignclient.other.model.SysNotice;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -16,7 +16,7 @@
List<SysNotice> getSysNoticeDetails();
@PostMapping("/base/notice/queryNotice")
- SysNotice getSysNoticeBuId(@RequestBody Integer noticeId);
+ SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId);
@PostMapping("/base/notice/sysTell")
List<String> queryCustomerTel();
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java
index 9380603..2d86e0e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/QuestionClient.java
@@ -4,7 +4,7 @@
import com.dsh.account.model.vo.exploreDetails.QuestionIns;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(value = "mb-cloud-other")
@@ -14,6 +14,6 @@
QuestionDetailsVo getSysQuestionDetails();
@PostMapping("/base/notice/queryQuestion")
- QuestionIns getSysQuestionBuId(@RequestBody Integer quesId);
+ QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java
index 0b60f71..37115ba 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/other/StoreClient.java
@@ -2,21 +2,12 @@
import com.dsh.account.feignclient.course.model.QueryStoreList;
import com.dsh.account.feignclient.other.model.Store;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
-
-/**
- * @author zhibing.pu
- * @date 2023/6/24 15:54
- */
import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.account.feignclient.other.model.StoreInfo;
import com.dsh.account.feignclient.other.model.StoreLonLatList;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -39,14 +30,14 @@
- @PostMapping("/storeDetail/courseOfSto")
- public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId);
+ @PostMapping("/base/protocol/storeDetail/courseOfSto")
+ StoreDetailOfCourse getCourseOfStore(@RequestParam("storeId") Integer storeId);
- @PostMapping("/storeDetail/nearbyStore")
- List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude, @RequestBody String latitude);
+ @PostMapping("/base/protocol/storeDetail/nearbyStore")
+ List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
- @PostMapping("/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude);
+ @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
+ List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java
index 8b75198..68e35b1 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/sourceDetail/CourseHoursType.java
@@ -8,7 +8,7 @@
public class CourseHoursType {
@ApiModelProperty(value = "课时id")
- private Integer courseConfigId;
+ private Long courseConfigId;
@ApiModelProperty(value = "课时数")
private Integer courseHourNums;
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
index beaf70d..0493559 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/IntroduceRewardsController.java
@@ -27,8 +27,8 @@
private final SimpleDateFormat mat = new SimpleDateFormat("MM-dd HH:mm");
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime, @RequestBody Date endTime, @RequestBody List<Integer> userIds){
+ @PostMapping("/base/introduce/useOfRewards")
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,@RequestParam("endTime") Date endTime,@RequestParam("userIds") List<Integer> userIds){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
List<IntroduceRewards> list = idrService.list(new QueryWrapper<IntroduceRewards>()
.ge("startTime",startTime)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index b3a73c4..9e61d1e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -24,7 +24,7 @@
- @PostMapping("/pointMerchars/convertGoods")
+ @PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods(){
List<IntegralCommodity> commodity = new ArrayList<>();
List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java
index 2978d06..38c13d2 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserConponController.java
@@ -30,8 +30,8 @@
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM");
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId){
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId){
List<CouponStuAvailableVo> availableVos = new ArrayList<>();
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java
index 7839017..d51c91a 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/IntroduceRewardsClient.java
@@ -4,7 +4,7 @@
import com.dsh.activity.feignclient.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -12,9 +12,8 @@
@FeignClient(value = "mb-cloud-activity")
public interface IntroduceRewardsClient {
- @PostMapping("/introduce/useOfRewards")
- public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody List<Integer> userIds);
-
+ @PostMapping("/base/introduce/useOfRewards")
+ public List<PurchaseRecordVo> queryAppUsersofIntroduce(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("userIds") List<Integer> userIds);
}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
index 75b0415..41d7f40 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-activity")
public interface MerChandiseClient {
- @PostMapping("/pointMerchars/convertGoods")
+ @PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods();
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java
index d200c9d..c13d4af 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java
@@ -3,7 +3,7 @@
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -11,7 +11,7 @@
public interface UserConponClient {
- @PostMapping("/userConpon/getStuOfConpons")
- public List<CouponStuAvailableVo> queryUserWithConponList(@RequestBody Integer appUserId);
+ @PostMapping("/base/userConpon/getStuOfConpons")
+ public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml b/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml
index ebf8e17..c165790 100644
--- a/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/IntroduceRewardsMapper.xml
@@ -2,7 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.IntroduceRewardsMapper">
- <!-- 开启二级缓存 -->
- <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
</mapper>
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/xml/PointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
similarity index 100%
rename from cloud-server-activity/src/main/java/com/dsh/activity/mapper/xml/PointsMerchandiseMapper.xml
rename to cloud-server-activity/src/main/resources/mapper/PointsMerchandiseMapper.xml
diff --git a/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
index 9a81eac..4fe2e27 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserCouponMapper.xml
@@ -2,7 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.UserCouponMapper">
- <!-- 开启二级缓存 -->
- <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
</mapper>
diff --git a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
index c42864e..4601dee 100644
--- a/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/UserPointsMerchandiseMapper.xml
@@ -2,7 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsh.activity.mapper.UserPointsMerchandiseMapper">
- <!-- 开启二级缓存 -->
- <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
</mapper>
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index b08c9ec..8a43523 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -37,8 +37,8 @@
private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
- @PostMapping("/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime, @RequestBody Date endTime,@RequestParam("appUserId") Integer appUserId){
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("appUserId") Integer appUserId){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
index 3a92b86..98d9b2a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/DeductionCompetitionsClient.java
@@ -4,7 +4,6 @@
import com.dsh.competition.feignclient.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
@@ -13,9 +12,9 @@
@FeignClient(value = "mb-cloud-competition")
public interface DeductionCompetitionsClient {
- @PostMapping("/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
+ @PostMapping("/base/competition/getCompetitionsDetails")
+ public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
@RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
index de4fec9..7f02e63 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelSourceController.java
@@ -40,12 +40,12 @@
* @param appUserId 用户id
* @return
*/
- @PostMapping("/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody Date startTime,@RequestBody Date endTime,@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/cancelSource/cancelList")
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
List<TCoursePackagePayment> tCoursePackagePayments = tcppService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId);
- List<Integer> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
+ List<Long> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList());
List<CancelledClasses> list = caceService.list(new QueryWrapper<CancelledClasses>()
.in("coursePackageId", coursePackageIds)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index ab7af9d..e07e2be 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -44,8 +44,8 @@
* @param stuId 学员id
* @return 课包列表
*/
- @PostMapping("/coursePack/queryPayment")
- public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/queryPayment")
+ public List<StuCourseResp> getStuCoursePackagePayment(@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
List<StuCourseResp> resps = new ArrayList<>();
List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(null,null,null,stuId,appUserId);
if (byUserId.size() > 0 ){
@@ -67,7 +67,7 @@
*
* 获取发布的 课包列表
*/
- @PostMapping("/coursePack/storeOfCourse")
+ @PostMapping("/base/coursePack/storeOfCourse")
public List<CourseOfStoreVo> getStuCourseWithStores(){
List<CourseOfStoreVo> courseOfStoreVos = tcpService.queryStoreOfCourse();
if (courseOfStoreVos.size() > 0){
@@ -89,8 +89,8 @@
*
* 课程名称列表
*/
- @PostMapping("/coursePack/sessionNames")
- public List<StuSessionDetailsVo> getStuSessionList(@RequestBody Date startTime, @RequestBody Date endTime, @RequestBody Integer stuId, @RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/sessionNames")
+ public List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
List<StuSessionDetailsVo> detailsVos = new ArrayList<>();
List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(startTime,endTime,null,stuId,appUserId);
if (byUserId.size() > 0){
@@ -109,8 +109,8 @@
return detailsVos;
}
- @PostMapping("/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(@RequestBody Date startTime, @RequestBody Date endTime,@RequestBody Integer stuId, @RequestBody Integer appUserId) {
+ @PostMapping("/base/coursePack/paymentCourse")
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime,@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId) {
List<PurchaseRecordVo> purchaseRecordVos = new ArrayList<>();
List<TCoursePackagePayment> coursePackage = packagePaymentService.queryAllCoursePackage(startTime,endTime,null,stuId, appUserId);
if (coursePackage.size() > 0 ){
@@ -127,8 +127,8 @@
- @PostMapping("/coursePack/stuOfCourses")
- public StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody Integer stuId, @RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/stuOfCourses")
+ public StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId, @RequestParam("appUserId") Integer appUserId){
StuWithCoursesListVo lisco = new StuWithCoursesListVo();
Integer totalNu = 0;
Integer dedutNu = 0;
@@ -149,8 +149,8 @@
- @PostMapping("/coursePack/continuingCourse")
- public StudentOfCourseVo getStudentCourse(@RequestBody Integer courseId,@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/coursePack/continuingCourse")
+ public StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
StudentOfCourseVo courseVo = new StudentOfCourseVo();
List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,courseId,stuId,appUserId);
if (tCoursePackagePayments.size() > 0 ){
@@ -159,7 +159,7 @@
tCoursePackagePayments.forEach(cou -> {
CourseHoursType hoursType = new CourseHoursType();
hoursType.setCourseConfigId(cou.getId());
- hoursType.setCourseConfigId(cou.getClassHours());
+ hoursType.setCourseHourNums(cou.getClassHours());
typeList.add(hoursType);
});
TCoursePackagePayment tCoursePackagePayment = tCoursePackagePayments.get(0);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
index 5416653..4f0f11f 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
@@ -32,8 +32,8 @@
- @PostMapping("/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody Integer courseId,@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ @PostMapping("/base/courseRecord/queryDeduClassHours")
+ public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
Integer sult = 0;
TCoursePackage coursePackage = tcpService.getById(courseId);
if (null != coursePackage && coursePackage.getStatus() == 3){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java
index cb7ef3e..4dbd7cb 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CancelListClient.java
@@ -3,7 +3,7 @@
import com.dsh.course.feignclient.model.PurchaseRecordVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -11,10 +11,10 @@
@FeignClient(value = "mb-cloud-course")
public interface CancelListClient {
- @PostMapping("/cancelSource/cancelList")
- public List<PurchaseRecordVo> getCancelCourseList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/cancelSource/cancelList")
+ public List<PurchaseRecordVo> getCancelCourseList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
index cc51aa7..82e4ddc 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CoursePaymentClient.java
@@ -1,11 +1,13 @@
package com.dsh.course.feignclient;
-
-import com.dsh.course.feignclient.model.*;
+import com.dsh.course.feignclient.model.CourseOfStoreVo;
+import com.dsh.course.feignclient.model.StuCourseResp;
+import com.dsh.course.feignclient.model.StuWithCoursesListVo;
+import com.dsh.course.feignclient.model.StudentOfCourseVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -13,18 +15,19 @@
public interface CoursePaymentClient {
- @PostMapping("/coursePack/queryPayment")
+ @PostMapping("/base/coursePack/queryPayment")
List<StuCourseResp> getStuCoursePayment();
- @PostMapping("/coursePack/storeOfCourse")
+ @PostMapping("/base/coursePack/storeOfCourse")
List<CourseOfStoreVo> getStoreOfCourses();
- @PostMapping("/coursePack/stuOfCourses")
- StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody Integer stuId,@RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/stuOfCourses")
+ StuWithCoursesListVo getStuOfCoursesDetails(@RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
- @PostMapping("/coursePack/continuingCourse")
- StudentOfCourseVo getStudentCourse(@RequestBody Integer courseId,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/continuingCourse")
+ StudentOfCourseVo getStudentCourse(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java
index ef52a27..4a634f7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseRecordClient.java
@@ -2,12 +2,14 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(value = "mb-cloud-course")
public interface CourseRecordClient {
- @PostMapping("/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody Integer courseId, @RequestBody Integer stuId, @RequestBody Integer appUserId);
+ @PostMapping("/base/courseRecord/queryDeduClassHours")
+ public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
index 8f71d73..97cd94c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/CourseSessionNameClient.java
@@ -5,7 +5,7 @@
import com.dsh.course.feignclient.model.StuSessionDetailsVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -14,17 +14,17 @@
public interface CourseSessionNameClient {
- @PostMapping("/coursePack/sessionNames")
- List<StuSessionDetailsVo> getStuSessionList(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/sessionNames")
+ List<StuSessionDetailsVo> getStuSessionList(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
- @PostMapping("/coursePack/paymentCourse")
- public List<PurchaseRecordVo> queryCourseDetails(@RequestBody Date startTime,
- @RequestBody Date endTime,
- @RequestBody Integer stuId,
- @RequestBody Integer appUserId);
+ @PostMapping("/base/coursePack/paymentCourse")
+ public List<PurchaseRecordVo> queryCourseDetails(@RequestParam("startTime") Date startTime,
+ @RequestParam("endTime") Date endTime,
+ @RequestParam("stuId") Integer stuId,
+ @RequestParam("appUserId") Integer appUserId);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseHoursType.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseHoursType.java
index 3877b72..6042f1d 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseHoursType.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/CourseHoursType.java
@@ -8,7 +8,7 @@
public class CourseHoursType {
@ApiModelProperty(value = "课时id")
- private Integer courseConfigId;
+ private Long courseConfigId;
@ApiModelProperty(value = "课时数")
private Integer courseHourNums;
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
index ae9072a..0f7bd74 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/AskedQuestionsController.java
@@ -7,10 +7,7 @@
import com.dsh.other.model.vo.questionVo.QuestionIns;
import com.dsh.other.service.FrequentlyAskedQuestionsService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -50,7 +47,7 @@
@PostMapping("/base/notice/queryQuestion")
- public QuestionIns getSysQuestionBuId(@RequestBody Integer quesId){
+ public QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId){
QuestionIns sysNotice = new QuestionIns();
FrequentlyAskedQuestions notice = faqService.getById(quesId);
if (null != notice){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
index f7b218a..0ee00b1 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java
@@ -22,7 +22,7 @@
private HonorRulesService hrService;
- @PostMapping("/honor/stuHonors")
+ @PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds){
List<StuMedalVo> stuMedalVos = new ArrayList<>();
List<HonorRules> honorRules = hrService.list(new QueryWrapper<HonorRules>()
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
index f7c9582..2df2b0f 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
@@ -35,7 +35,7 @@
/**
* 获取 没有学员信息的图片配置
*/
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
public List<TImgConfig> getDriver(){
return imgConfigService.list(new QueryWrapper<TImgConfig>()
.eq("position", 1));
@@ -59,7 +59,7 @@
}
- @PostMapping("/imgConfig/getBenefitImage")
+ @PostMapping("/base/imgConfig/getBenefitImage")
public UserBenefitImage getImageConfig(){
UserBenefitImage image = new UserBenefitImage();
ArrayList<Integer> integers = new ArrayList<>();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 3ab7122..96e7621 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -45,7 +45,7 @@
}
@PostMapping("/base/protocol/storeDetail/nearbyStore")
- public List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude,@RequestBody String latitude){
+ public List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude){
String current = longitude+","+latitude;
List<StoreInfo> storeInfos = new ArrayList<>();
String cityCode = "";
@@ -85,7 +85,7 @@
@PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude){
+ public List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude){
List<StoreLonLatList> storeInfos = new ArrayList<>();
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
index 04c441b..e6da020 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SystemNoticeController.java
@@ -8,10 +8,7 @@
import com.dsh.other.service.NoticeService;
import com.dsh.other.service.PhoneService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -53,7 +50,7 @@
@PostMapping("/base/notice/queryNotice")
- public SysNotice getSysNoticeBuId(@RequestBody Integer noticeId){
+ public SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId){
SysNotice sysNotice = new SysNotice();
Notice notice = noticeSers.getById(noticeId);
if (null != notice){
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java
index 05f5d00..9164a00 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/HonorDeClient.java
@@ -10,7 +10,7 @@
@FeignClient(value = "mb-cloud-other")
public interface HonorDeClient {
- @PostMapping("/honor/stuHonors")
+ @PostMapping("/base/honor/stuHonors")
public List<StuMedalVo> getStuHonors(@RequestBody List<Integer> honorIds);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
index 5ab9163..4d552bb 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/ImgConfigClient.java
@@ -10,11 +10,11 @@
@FeignClient(value = "mb-cloud-other")
public interface ImgConfigClient {
- @PostMapping("/imgConfig/getNoneStu")
+ @PostMapping("/base/imgConfig/getNoneStu")
List<TImgConfig> getNoneStuImgs();
- @PostMapping("/imgConfig/getBenefitImage")
+ @PostMapping("/base/imgConfig/getBenefitImage")
public UserBenefitImage getImageConfig();
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java
index f42577e..f6d08bb 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/NoticeClient.java
@@ -3,7 +3,7 @@
import com.dsh.other.feignclient.model.SysNotice;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -16,7 +16,7 @@
List<SysNotice> getSysNoticeDetails();
@PostMapping("/base/notice/queryNotice")
- SysNotice getSysNoticeBuId(@RequestBody Integer noticeId);
+ SysNotice getSysNoticeBuId(@RequestParam("noticeId") Integer noticeId);
@PostMapping("/base/notice/sysTell")
List<String> queryCustomerTel();
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java
index a37da84..afdde84 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/QuestionClient.java
@@ -4,7 +4,7 @@
import com.dsh.other.model.vo.questionVo.QuestionIns;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(value = "mb-cloud-other")
@@ -14,6 +14,6 @@
QuestionDetailsVo getSysQuestionDetails();
@PostMapping("/base/notice/queryQuestion")
- QuestionIns getSysQuestionBuId(@RequestBody Integer quesId);
+ QuestionIns getSysQuestionBuId(@RequestParam("quesId") Integer quesId);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java
index 67097be..65f4ae7 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/StoreClient.java
@@ -5,7 +5,7 @@
import com.dsh.other.feignclient.model.StoreLonLatList;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -13,14 +13,14 @@
public interface StoreClient {
- @PostMapping("/storeDetail/courseOfSto")
- public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId);
+ @PostMapping("/base/protocol/storeDetail/courseOfSto")
+ StoreDetailOfCourse getCourseOfStore(@RequestParam("storeId") Integer storeId);
- @PostMapping("/storeDetail/nearbyStore")
- List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude, @RequestBody String latitude);
+ @PostMapping("/base/protocol/storeDetail/nearbyStore")
+ List<StoreInfo> getAllNearbyStoreList(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
- @PostMapping("/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude);
+ @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
+ List<StoreLonLatList> getAllStoreLonLats(@RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java b/cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java
deleted file mode 100644
index 93874b3..0000000
--- a/cloud-server-other/src/main/java/com/dsh/other/web/HonorRulesController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.dsh.other.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 荣誉规则 前端控制器
- * </p>
- *
- * @author jqs
- * @since 2023-07-04
- */
-@RestController
-@RequestMapping("/honor-rules")
-public class HonorRulesController {
-
-}
-
--
Gitblit v1.7.1