From cf5fe83a9476f19b692e1939c1ad745d3a3bd129 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Mon, 30 Dec 2024 12:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 7 ++++--- .idea/encodings.xml | 3 --- .idea/inspectionProfiles/Project_Default.xml | 6 ++++++ .idea/popularize-admin.iml | 2 ++ .../main/java/org/jeecg/config/shiro/ShiroConfig.java | 1 - .../org/jeecg/api/controller/ApiOrderController.java | 8 ++++++++ .../org/jeecg/api/controller/AppletMyInfoController.java | 2 +- .../main/java/org/jeecg/api/service/ApiIndexService.java | 4 ++++ .../org/jeecg/api/service/impl/ApiIndexServiceImpl.java | 16 +++++++++++++--- 9 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/popularize-admin.iml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 7abf5fd..6cf7c9e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + @@ -18,16 +19,16 @@ \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 59e2d01..91fbf10 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,13 +3,10 @@ - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..03d9549 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/popularize-admin.iml b/.idea/popularize-admin.iml new file mode 100644 index 0000000..78b2cc5 --- /dev/null +++ b/.idea/popularize-admin.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index c180eb2..86eb3e2 100644 --- a/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -90,7 +90,6 @@ public class ShiroConfig { - filterChainDefinitionMap.put("/sys/oss/file/upload", "anon"); //图片上传验证放开 filterChainDefinitionMap.put("/sys/common/upload", "anon"); //图片上传验证放开 filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录 diff --git a/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java index efba79e..4fa95c6 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/ApiOrderController.java @@ -70,6 +70,14 @@ public class ApiOrderController { } + //收藏 + @ApiOperation(value="收藏", notes="收藏") + @PostMapping(value = "/collect") + public Result collect(@RequestHeader("X-Access-Token") String token, String id) { + return apiIndexService.collect(token,id); + } + + } diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java index b3eefe8..885a555 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletMyInfoController.java @@ -28,7 +28,7 @@ public class AppletMyInfoController { @ApiOperation(value="修改个人信息", notes="修改个人信息") public Result updateInfo(@RequestHeader("X-Access-Token") String token,HanHaiMember member){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - + member.setId(hanHaiMember.getId()); hanHaiMemberService.updateById(member); return Result.ok("修改成功"); } diff --git a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java index 4fc71de..2491914 100644 --- a/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java +++ b/module-common/src/main/java/org/jeecg/api/service/ApiIndexService.java @@ -56,6 +56,10 @@ public interface ApiIndexService { Result invoice(String token, PopularizeInvoicing popularizeInvoicing); + //收藏 + Result collect(String token,String activityId); + + //获取招募列表数据带分页 Result getRecruitPageList(String title, PageBean pageBean); diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java index 806de7e..a6773ab 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/ApiIndexServiceImpl.java @@ -182,13 +182,12 @@ public class ApiIndexServiceImpl implements ApiIndexService { //获取订单列表数据带分页 @Override - public Result getOrderPageList(String token, PageBean pageBean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + public Result getOrderPageList(String token, PageBean pageBean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page page1 = popularizeOrderService .lambdaQuery() .eq(PopularizeOrder::getUserId,hanHaiMember.getId()) - .orderByDesc(PopularizeOrder::getCreateTime) +// .orderByDesc(PopularizeOrder::getCreateTime) .page(page); return Result.OK(page1); } @@ -260,6 +259,17 @@ public class ApiIndexServiceImpl implements ApiIndexService { } + //收藏 + @Override + public Result collect(String token,String activityId){ + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + PopularizeCollect byId = popularizeCollectService.getById(activityId); + byId.setUserId(hanHaiMember.getId()); + byId.setCreateTime(new Date()); + popularizeCollectService.save(byId); + return Result.OK("收藏成功"); + } + //获取招募列表数据带分页 @Override