From 2e01d928925f89bcf6d5ad83c46753330a242e79 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Mon, 30 Sep 2024 17:24:47 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81OSS=E6=9B=B4=E6=8D=A2=202=E3=80=81?= =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/travelController/IndexApiController.java | 7 +++ .../travelController/UserInfoApiController.java | 7 +++ .../jeecg/modules/apiService/IndexApiService.java | 6 ++ .../apiService/impl/IndexApiServiceImpl.java | 68 +++++++++++++++++++++- .../src/main/resources/application-dev.yml | 10 ++-- 5 files changed, 92 insertions(+), 6 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java index 40e8779..5b9c014 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java @@ -45,6 +45,13 @@ public class IndexApiController { return indexApiService.queryVedioById(roleInfoId, pageBean); } + //根据分类获取文章列表 + @ApiOperation(value="小程序-根据标题模糊查询文章", notes="小程序-根据标题模糊查询文章") + @RequestMapping(value = "/queryArticleListByTitle", method = {RequestMethod.GET}) + public Result queryArticleListByTitle(String articleTitle, PageBean pageBean){ + return indexApiService.queryArticleListByTitle(articleTitle, pageBean); + } + //根据分类获取文章列表 @ApiOperation(value="小程序-根据分类获取文章列表", notes="0-申遗历程 1-申遗缘由 2-遗产价值") @RequestMapping(value = "/queryArticleListByType", method = {RequestMethod.GET}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java index cc8c542..4554416 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java @@ -68,6 +68,13 @@ public class UserInfoApiController { return indexApiService.updateAddress(token, travelAddress); } + //修改默认地址 + @ApiOperation(value="小程序-修改默认地址", notes="小程序-修改默认地址") + @RequestMapping(value = "/updateDefaultAddress", method = {RequestMethod.POST}) + public Result updateDefaultAddress(@RequestHeader("X-Access-Token") String token, String addressId){ + return indexApiService.updateDefaultAddress(token, addressId); + } + //我的收藏 @ApiOperation(value="小程序-获取我的收藏列表", notes="collectionType：0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物") @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java index 2262aea..2eceabb 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java @@ -26,6 +26,9 @@ public interface IndexApiService { //根据分类获取文章列表 public Result queryArticleListByType(String articleType, PageBean pageBean); + //根据标题模糊查询文章 + public Result queryArticleListByTitle(String articleTitile, PageBean pageBean); + //根据id获取文章详情 public Result queryArticleById(String articleId); @@ -80,6 +83,9 @@ public interface IndexApiService { //修改地址 public Result updateAddress(String token, TravelAddress travelAddress); + //修改默认地址 + public Result updateDefaultAddress(String token, String addressId); + //预约时段表 public Result queryOrderTime(String timeType); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java index d5ac225..f801c78 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java @@ -182,6 +182,32 @@ public class IndexApiServiceImpl implements IndexApiService { return Result.OK("文章列表", pageList); } + //根据标题模糊查询文章 + @Override + public Result queryArticleListByTitle(String articleTitle, PageBean pageBean) { + + //0-申遗历程 1-申遗缘由 2-遗产价值 + + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList =null; + + if(null != articleTitle){ + + pageList = travelArticleService + .lambdaQuery() + .like(TravelArticle::getArticleTitle, articleTitle) + .orderByDesc(TravelArticle::getCreateTime) + .page(page); + }else { + pageList = travelArticleService + .lambdaQuery() + .orderByDesc(TravelArticle::getCreateTime) + .page(page); + } + + return Result.OK("文章列表", pageList); + } + //根据文章类型获取文章列表带分页 @Override public Result queryArticleListByType(String articleType, PageBean pageBean) { @@ -617,12 +643,18 @@ public class IndexApiServiceImpl implements IndexApiService { public Result addAddress(String token, TravelAddress travelAddress) { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + //查询地址是否已经存在 + TravelAddress one = travelAddressService.lambdaQuery().setEntity(travelAddress).one(); + if(null != one){ + return Result.OK("该地址已存在！"); + } + if("1".equals(travelAddress.getAddressDefault())){ //将原默认地址改为不默认 List list = travelAddressService .lambdaQuery() .eq(TravelAddress::getAddressDefault,"1") - .eq(TravelAddress::getUserId,travelAddress.getUserId()) + .eq(TravelAddress::getUserId,hanHaiMember.getId()) .list(); if(null != list){ @@ -631,8 +663,11 @@ public class IndexApiServiceImpl implements IndexApiService { boolean flag = travelAddressService.updateById(address); } } + }else if(null == travelAddress.getAddressDefault()){ + travelAddress.setAddressDefault("0"); } + travelAddress.setUserId(hanHaiMember.getId()); boolean flag = travelAddressService.save(travelAddress); if(flag){ return Result.OK("新增地址成功！"); @@ -683,6 +718,37 @@ public class IndexApiServiceImpl implements IndexApiService { } } + //修改默认地址 + @Override + public Result updateDefaultAddress(String token, String addressId) { + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //将原默认地址改为不默认 + List list = travelAddressService + .lambdaQuery() + .eq(TravelAddress::getAddressDefault,"1") + .eq(TravelAddress::getUserId,hanHaiMember.getId()) + .list(); + + if(null != list){ + for (TravelAddress address : list) { + address.setAddressDefault("0"); + boolean flag = travelAddressService.updateById(address); + } + } + //boolean flag = travelAddressService.updateById(travelAddress); + boolean flag = travelAddressService + .lambdaUpdate() + .set(TravelAddress::getAddressDefault, "1") + .eq(TravelAddress::getId, addressId) + .update(); + if(flag){ + return Result.OK("修改地址成功！"); + }else { + return Result.OK("修改地址失败！"); + } + } + //查询预约时间段 @Override public Result queryOrderTime(String timeType) { diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 09b64d8..f167c83 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -192,11 +192,11 @@ jeecg : excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/** #阿里云oss存储和大鱼短信秘钥配置 oss: - accessKey: LTAI5tMan18fjJPUtr3Aim2W - secretKey: lhALqqgYijc115wY8c1KfTYkbSnq5I - endpoint: oss-cn-shenzhen.aliyuncs.com - bucketName: mangoimageapplet - staticDomain: https://dianpin-img.xzaiyp.top + accessKey: LTAI5tPfZo39q2r9Sr5mW84u + secretKey: XxExGallsV4O9nERHpVsQg2XtPCU7r + endpoint: oss-cn-guangzhou.aliyuncs.com + bucketName: augcl + staticDomain: https://img.augcl.com # ElasticSearch 6设置 elasticsearch: cluster-name: jeecg-ES