Merge remote-tracking branch 'origin/master'

ch-dao/src/main/java/com/wwdz/ch/db/dao/CategoryDao.java

@@ -35,6 +35,14 @@ public interface CategoryDao {
      */
     List<Category> queryByName(String name);
 
+    /**
+     * 判断是否存在子类目
+     *
+     * @param id
+     * @return
+     */
+    boolean isExistedChild(Integer id);
+
     List<Category> querySelective(String id, String name, Integer page, Integer size, String sort, String order);
 
     int updateById(Category category);

ch-dao/src/main/java/com/wwdz/ch/db/dao/FootPrintDao.java

 package com.wwdz.ch.db.dao;
 
+import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.db.domain.Footprint;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public interface FootPrintDao {
      * @param size
      * @return
      */
-    List<Footprint> pageByUserId(Long userId, Integer page, Integer size);
+    PageInfo<Footprint> pageByUserId(Long userId, Integer page, Integer size);
 
     /**
      * 通过用户id统计记录数

ch-dao/src/main/java/com/wwdz/ch/db/impl/CategoryDaoImpl.java

@@ -64,6 +64,13 @@ public class CategoryDaoImpl implements CategoryDao {
 		return categoryMapper.selectByExample(example);
 	}
 
+	@Override
+	public boolean isExistedChild (Integer id) {
+		CategoryExample example = new CategoryExample();
+		example.or().andPidEqualTo(id).andIsDeletedEqualTo(false);
+		return categoryMapper.countByExample(example) > 0;
+	}
+
 	public List<Category> querySelective(String id, String name, Integer page, Integer size, String sort,
 			String order) {
 		CategoryExample example = new CategoryExample();

ch-dao/src/main/java/com/wwdz/ch/db/impl/FootPrintDaoImpl.java

 package com.wwdz.ch.db.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.db.dao.FootPrintDao;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.FootprintExample;
@@ -27,14 +28,15 @@ public class FootPrintDaoImpl implements FootPrintDao {
     }
 
     @Override
-    public List<Footprint> pageByUserId(Long userId, Integer page, Integer size) {
+    public PageInfo<Footprint> pageByUserId(Long userId, Integer page, Integer size) {
         FootprintExample example = new FootprintExample();
         FootprintExample.Criteria criteria = example.createCriteria();
         criteria.andUserIdEqualTo(userId);
         criteria.andDeletedEqualTo(false);
         example.orderBy("update_time desc");
         PageHelper.startPage(page, size);
-        return footprintMapper.selectByExample(example);
+        List<Footprint> list = footprintMapper.selectByExample(example);
+        return new PageInfo<>(list);
     }
 
     @Override

ch-wx-api/src/main/java/com/wwdz/ch/wx/constant/CacheCodeConstants.java

@@ -21,6 +21,12 @@ public class CacheCodeConstants {
      */
     public static final String USER_UPDATE_SMS_KEY = "cjxc:wx:user:sms:update:{0}";
 
+    /**
+     * 缓存用户信息
+     * <p>{0}:用户id</p>
+     */
+    public static final String USER_INFO_KEY = "cjxc:wx:user:info:{0}";
+
     /**
      * 短信验证码类型枚举
      */

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ItemRequestDto.java

@@ -34,4 +34,5 @@ public class ItemRequestDto implements Entity {
     private Integer page;
     private Integer size;
     private String path;
+    private Integer type;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/ItemResponseVo.java

@@ -23,6 +23,7 @@ public class ItemResponseVo implements Entity {
     private String createTime;
     private String videos;
     private Map<String, Object> homePageImage;
-    private Integer isDeleted;
+    private Boolean isDeleted;
     private String itemNickname;
+    private Integer timeType;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/CategoryServiceImpl.java

@@ -82,7 +82,17 @@ public class CategoryServiceImpl implements CategoryService {
             return Result.success(new ArrayList<>());
         }
         try {
-            return Result.success(categoryDao.queryByName(dto.getName()));
+            List<Category> result = new ArrayList<>();
+            List<Category> list = categoryDao.queryByName(dto.getName());
+            // 筛选叶子节点
+            if (CollectionUtils.isNotEmpty(list)) {
+                for (Category category : list) {
+                    if (!categoryDao.isExistedChild(category.getId())) {
+                        result.add(category);
+                    }
+                }
+            }
+            return Result.success(result);
         } catch (Exception e) {
             logger.error("搜索分类失败", e);
             return Result.failed("搜索分类失败");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

@@ -241,27 +241,19 @@ public class FavoritesServiceImpl implements FavoritesService {
 
                 ItemResponseVo vo = new ItemResponseVo();
                 Item item = itemDao.findDetails(relation.getItemId());
-                if (item.getIsDeleted()) {
-                    vo.setId(relation.getItemId());
-                    vo.setHomePageImage(getImage(item));
-                    vo.setIsDeleted(1);
-                    agentTranceResponseVo.setDetail(vo);
-                    list.add(agentTranceResponseVo);
-                    continue;
-                }
-                vo.setIsDeleted(0);
                 // 设置基本信息
                 vo.setId(relation.getItemId());
                 vo.setName(item.getName());
                 vo.setImages(item.getImages());
                 vo.setDetail(item.getDetail());
                 vo.setFavoritesId(dto.getId());
+                vo.setIsDeleted(item.getIsDeleted());
                 // 设置价格
                 vo.setPrice(getPrice(item.getPrice()));
                 // 设置是否收藏或是否是自己发布的
                 vo.setIsCollected(0);
                 vo.setIsMine(0);
-                if (dto.getUserId() != 0L) {
+                if (Objects.nonNull(dto.getUserId()) && dto.getUserId() != 0L) {
                     vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), relation.getItemId()) ? 1 : 0);
                     vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
                 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -37,7 +37,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.System;
 import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -70,27 +69,25 @@ public class ItemServiceImpl implements ItemService {
     public Result nameList(ItemRequestDto dto) {
         try {
             List<String> names = new ArrayList<>();
-            if (StringUtils.isNotBlank(dto.getName())) {
-                EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();
-                esSearchRequestDto.setContent(dto.getName());
-                esSearchRequestDto.setSize(16);
-                List<ItemOfEs> list = itemEsDao.getCuewords(esSearchRequestDto);
-                if (CollectionUtils.isNotEmpty(list)) {
-                    names = list.stream()
-                            .map(ItemOfEs::getName).collect(Collectors.toList());
-                    for (String name : names) {
-                        // 处理特殊字符
-                        name = name.replaceAll("\\s*|\r|\n|\t", "");
-                        name = name.replaceAll("/P", "");
-                        name = name.replaceAll("，", "");
-                        // 超过15个字的15个字符
-                        if (name.length() > 15) {
-                            int index = name.indexOf(dto.getName());
-                            if (index + dto.getName().length() > 15) {
-                                name = name.substring(index + dto.getName().length() - 15, index + dto.getName().length());
-                            } else {
-                                name = name.substring(0, 15);
-                            }
+            EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();
+            esSearchRequestDto.setContent(dto.getName());
+            esSearchRequestDto.setSize(16);
+            List<ItemOfEs> list = itemEsDao.getCuewords(esSearchRequestDto);
+            if (CollectionUtils.isNotEmpty(list)) {
+                names = list.stream()
+                        .map(ItemOfEs::getName).collect(Collectors.toList());
+                for (String name : names) {
+                    // 处理特殊字符
+                    name = name.replaceAll("\\s*|\r|\n|\t", "");
+                    name = name.replaceAll("/P", "");
+                    name = name.replaceAll("，", "");
+                    // 超过15个字的15个字符
+                    if (name.length() > 15) {
+                        int index = name.indexOf(dto.getName());
+                        if (index + dto.getName().length() > 15) {
+                            name = name.substring(index + dto.getName().length() - 15, index + dto.getName().length());
+                        } else {
+                            name = name.substring(0, 15);
                         }
                     }
                 }
@@ -141,7 +138,7 @@ public class ItemServiceImpl implements ItemService {
                 // 设置是否收藏和是否是自己发布的
                 vo.setIsCollected(0);
                 vo.setIsMine(0);
-                if (!dto.getUserId().equals(0L)) {
+                if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
                     vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId()) ? 1 : 0);
                     vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0);
                 }
@@ -223,9 +220,11 @@ public class ItemServiceImpl implements ItemService {
         try {
             Item item = itemDao.findById(dto.getId());
             if (Objects.isNull(item)) {
-                if (!dto.getUserId().equals(0L)) {
-                    // 如果当前用户已收藏该藏品，则删除收藏关联
-                    favoritesItemsRelationDao.deleteByUserIdItemId(dto.getUserId(), dto.getId());
+                if (Objects.nonNull(dto.getType()) && dto.getType().equals(1)) {
+                    if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
+                        // 如果当前用户已收藏该藏品，则删除收藏关联
+                        favoritesItemsRelationDao.deleteByUserIdItemId(dto.getUserId(), dto.getId());
+                    }
                 }
                 return Result.failed(ResultCode.INVALID_DATA.getCode(), "该藏品已经被移除");
             }
@@ -263,7 +262,7 @@ public class ItemServiceImpl implements ItemService {
             // 设置是否收藏或是否是自己发布的
             itemResponseVo.setIsCollected(0);
             itemResponseVo.setIsMine(0);
-            if (!dto.getUserId().equals(0L)) {
+            if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
                 FavoritesItemsRelation favoritesItemsRelation = favoritesItemsRelationDao.selectByUserIdItemId(dto.getUserId(), item.getId());
                 if (Objects.nonNull(favoritesItemsRelation)) {
                     itemResponseVo.setIsCollected(1);
@@ -311,7 +310,7 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result collect(ItemRequestDto dto) {
         try {
-            if (dto.getUserId().equals(0L)) {
+            if (Objects.isNull(dto.getUserId()) || dto.getUserId().equals(0L)) {
                 return Result.failed("您尚未登录，请先登录");
             }
             Item item = itemDao.findById(dto.getId());
@@ -353,7 +352,7 @@ public class ItemServiceImpl implements ItemService {
     @Override
     public Result cancel(ItemRequestDto dto) {
         try {
-            if (dto.getUserId().equals(0L)) {
+            if (Objects.isNull(dto.getUserId()) || dto.getUserId().equals(0L)) {
                 return Result.failed("您尚未登录，请先登录");
             }
             Item item = itemDao.findById(dto.getId());

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -426,4 +426,32 @@ public class UserServiceImpl implements UserService {
             return Result.failed("修改手机号失败");
         }
     }
+
+    @Override
+    public Result userInfo(HttpServletRequest request) {
+        try {
+            String token = request.getHeader("Authorization");
+            if (StringUtils.isBlank(token)) {
+                logger.info("获取登录用户的token失败");
+                return Result.failed("查询不到当前登录用户信息");
+            }
+            Long userId = userTokenManager.getUserId(token);
+            if (Objects.isNull(userId)) {
+                logger.info("获取登录用户的userId失败");
+                return Result.failed("查询不到当前登录用户信息");
+            }
+            User user = null;
+//            String key = MessageFormat.format(CacheCodeConstants.USER_INFO_KEY, dto.getUserId().toString());
+//            if (redisUtil.hasKey(key)) {
+//                user = (User) redisUtil.get(key);
+//            } else {
+                user = userDao.queryById(userId);
+//            }
+            logger.info("【请求结束】查询用户信息成功");
+            return Result.success(user);
+        } catch (Exception e) {
+            logger.error("查询用户信息失败", e);
+            return Result.failed("查询用户信息失败");
+        }
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/FootPrintService.java

@@ -4,14 +4,6 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
 
 public interface FootPrintService {
-    /**
-     * 用户足迹列表查询
-     *
-     * @param dto
-     * @return
-     */
-    Result listAll(FootPrintRequestDto dto);
-
     /**
      * 用户足迹分页查询
      *

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserService.java

@@ -71,4 +71,11 @@ public interface UserService {
      * @return
      */
     Result updateMobile(UserRequestDto dto);
+
+    /**
+     * 查询用户信息
+     *
+     * @return
+     */
+    Result userInfo(HttpServletRequest request);
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxCategoryController.java

 package com.wwdz.ch.wx.web;
 
+import com.alibaba.fastjson.JSON;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.wx.entity.request.CategoryRequestDto;
-import com.wwdz.ch.wx.entity.request.KlDataRequestDto;
 import com.wwdz.ch.wx.service.CategoryService;
-import com.xxdxxs.utils.JsonUtils;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 @RestController
 @RequestMapping("/wx/category")
 public class WxCategoryController {
@@ -25,41 +25,27 @@ public class WxCategoryController {
 
     @ApiOperation(value = "分类分页")
     @PostMapping(value = "/top")
-    public Result top(@RequestBody KlDataRequestDto klDataRequestDto) {
-        String json = klDataRequestDto.getKl_data();
-        logger.info("【请求开始】查询分类列表,请求参数,kl_data:{}", json);
-        String level = JsonUtils.getValueByPath(json, "level");
-        String page = JsonUtils.getValueByPath(json, "page");
-        String size = JsonUtils.getValueByPath(json, "size");
-        if (StringUtils.isBlank(level)) {
+    public Result top(@RequestBody CategoryRequestDto dto) {
+        logger.info("【请求开始】查询分类列表,请求参数:{}", JSON.toJSONString(dto));
+        if (Objects.isNull(dto.getLevel())) {
             return Result.failed("分类级别不能为空");
         }
-        if (StringUtils.isBlank(page)) {
+        if (Objects.isNull(dto.getPage())) {
             return Result.failed("当前页不能为空");
         }
-        if (StringUtils.isBlank(size)) {
+        if (Objects.isNull(dto.getSize())) {
             return Result.failed("页面大小不能为空");
         }
-
-        CategoryRequestDto dto = new CategoryRequestDto();
-        dto.setLevel(Integer.parseInt(level));
-        dto.setPage(Integer.parseInt(page));
-        dto.setSize(Integer.parseInt(size));
         return categoryService.top(dto);
     }
 
     @ApiOperation(value = "子分类")
     @PostMapping(value = "/child")
-    public Result child(@RequestBody KlDataRequestDto klDataRequestDto) {
-        String json = klDataRequestDto.getKl_data();
-        logger.info("【请求开始】查询子分类列表,请求参数,kl_data:{}", json);
-        String id = JsonUtils.getValueByPath(json, "id");
-        if (StringUtils.isBlank(id)) {
+    public Result child(@RequestBody CategoryRequestDto dto) {
+        logger.info("【请求开始】查询子分类列表,请求参数:{}", JSON.toJSONString(dto));
+        if (Objects.isNull(dto.getId())) {
             return Result.failed("分类id不能为空");
         }
-
-        CategoryRequestDto dto = new CategoryRequestDto();
-        dto.setId(Integer.parseInt(id));
         return categoryService.child(dto);
     }
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserController.java

@@ -4,10 +4,8 @@ package com.wwdz.ch.wx.web;
 import com.alibaba.fastjson.JSON;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.wx.constant.CacheCodeConstants;
-import com.wwdz.ch.wx.entity.request.KlDataRequestDto;
 import com.wwdz.ch.wx.entity.request.UserRequestDto;
 import com.wwdz.ch.wx.service.UserService;
-import com.xxdxxs.utils.JsonUtils;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -36,64 +34,43 @@ public class WxUserController {
 
     @ApiOperation(value = "微信登录")
     @PostMapping("/loginByWx")
-    public Result loginByWx(@RequestBody KlDataRequestDto klDataRequestDto, HttpServletRequest request) {
-        String json = klDataRequestDto.getKl_data();
-        logger.info("【请求开始】微信登录,请求参数,kl_data:{}", json);
-        String code = JsonUtils.getValueByPath(json, "code");
-        if (StringUtils.isBlank(code)) {
+    public Result loginByWx(@RequestBody UserRequestDto dto, HttpServletRequest request) {
+        logger.info("【请求开始】微信登录,请求参数:{}", JSON.toJSONString(dto));
+        if (StringUtils.isBlank(dto.getCode())) {
             return Result.failed("授权码不能为空");
         }
-        if (!json.contains("type")) {
+        if (Objects.isNull(dto.getType())) {
             return Result.failed("版本类型不能为空");
         }
-        Integer type = Integer.parseInt(JsonUtils.getValueByPath(json, "type"));
-
-        UserRequestDto dto = new UserRequestDto();
-        dto.setCode(code);
-        dto.setType(type);
-        if (type == 2) {
-            if (!json.contains("encryptedData") || !json.contains("iv")) {
+        if (dto.getType() == 2) {
+            if (StringUtils.isBlank(dto.getEncryptedData()) || StringUtils.isBlank(dto.getIv())) {
                 return Result.failed("encryptedData或iv不能为空");
             }
-            dto.setEncryptedData(JsonUtils.getValueByPath(json, "encryptedData"));
-            dto.setIv(JsonUtils.getValueByPath(json, "iv"));
         }
         return userService.loginByWx(dto, request);
     }
 
     @ApiOperation(value = "登录手机验证码")
     @PostMapping("/loginRegCaptcha")
-    public Object registerCaptcha(@RequestBody KlDataRequestDto klDataRequestDto) {
-        String json = klDataRequestDto.getKl_data();
-        logger.info("【请求开始】请求登录手机验证码,请求参数,kl_data:{}", json);
-        String mobile = JsonUtils.getValueByPath(json, "mobile");
-        if (StringUtils.isBlank(mobile)) {
+    public Object registerCaptcha(@RequestBody UserRequestDto dto) {
+        logger.info("【请求开始】请求登录手机验证码,请求参数:{}", JSON.toJSONString(dto));
+        if (StringUtils.isBlank(dto.getMobile())) {
             return Result.failed("手机号不能为空");
         }
-
-        UserRequestDto dto = new UserRequestDto();
-        dto.setMobile(mobile);
         dto.setSmsType(CacheCodeConstants.SmsTypeEnum.LOGIN.getCode());
         return userService.regCaptcha(dto);
     }
 
     @ApiOperation(value = "手机验证码登录")
     @PostMapping("/loginByMobile")
-    public Result loginByMobile(@RequestBody KlDataRequestDto klDataRequestDto, HttpServletRequest request) {
-        String json = klDataRequestDto.getKl_data();
-        logger.info("【请求开始】手机号登录,请求参数,kl_data:{}", json);
-        String mobile = JsonUtils.getValueByPath(json, "mobile");
-        String smsCode = JsonUtils.getValueByPath(json, "smsCode");
-        if (StringUtils.isBlank(mobile)) {
+    public Result loginByMobile(@RequestBody UserRequestDto dto, HttpServletRequest request) {
+        logger.info("【请求开始】手机号登录,请求参数,kl_data:{}", JSON.toJSONString(dto));
+        if (StringUtils.isBlank(dto.getMobile())) {
             return Result.failed("手机号不能为空");
         }
-        if (StringUtils.isBlank(smsCode)) {
+        if (StringUtils.isBlank(dto.getSmsCode())) {
             return Result.failed("验证码不能为空");
         }
-
-        UserRequestDto dto = new UserRequestDto();
-        dto.setMobile(mobile);
-        dto.setSmsCode(smsCode);
         return userService.loginByMobile(dto, request);
     }
 
@@ -178,4 +155,11 @@ public class WxUserController {
         }
         return userService.updateMobile(dto);
     }
+
+    @ApiOperation(value = "用户信息")
+    @PostMapping("/userInfo")
+    public Result userInfo(HttpServletRequest request) {
+        logger.info("【请求开始】查询用户信息");
+        return userService.userInfo(request);
+    }
 }