1、OSS更换

2、新增/修改地址接口实现修改

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})

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})

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);
 

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<TravelArticle> page = new Page<TravelArticle>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<TravelArticle> 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<TravelAddress> 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<TravelAddress> 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) {

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