店铺分类

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.cdf</groupId>
     <artifactId>cdf-gm</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <parent>

src/main/java/com/cdf/CdfApplication.java

@@ -24,14 +24,6 @@ public class CdfApplication implements ApplicationContextAware {
 
     public static void main(String[] args) {
         SpringApplication.run(CdfApplication.class, args);
-        FdkkClient bean = applicationContext.getBean(FdkkClient.class);
-        FdkkResponse fdkkLogin = bean.fdkkLogin(new FdkkLoginRequest("18819272208", "75tJeDmsExMjM0NTY=WvimRBSdQWXmuYpdG6"));
-        Object data = fdkkLogin.getData();
-        JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(data));
-        System.out.println(jsonObject.get("token"));
-
-        FdkkResponse token = bean.checkToken(jsonObject.getString("token"));
-        System.out.println(token);
     }
 
     @Override

src/main/java/com/cdf/business/LoginService.java

@@ -70,7 +70,7 @@ public class LoginService {
         HashMap<String,Object> jwtMap = new HashMap<>();
         jwtMap.put("id",user.getId());
         jwtMap.put("phone",user.getPhone());
-        String token = JwtUtil.createJWT(-1, jwtMap);
+        String token = JwtUtil.createJWT(30 * 60 * 1000, jwtMap);
         loginResponse.setToken(token);
         if(fdkkuser.getToken() != null){
             FdkkResponse fdkkResponse = fdkkClient.checkToken(fdkkuser.getToken());

src/main/java/com/cdf/config/WebAppConfig.java

@@ -29,7 +29,7 @@ public class WebAppConfig implements WebMvcConfigurer {
 		registry.addInterceptor(backUserInterceptor).addPathPatterns("/back/**").excludePathPatterns("/**/login/**");
 		registry.addInterceptor(sceneInterceptor).addPathPatterns("/service/**")
 				.excludePathPatterns("/service/scene/edit/tag/save","/service/scene/edit/tag/delete"
-						,"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJs",
+						,"/service/scene/edit/tag/list","/service/scene/edit/tag/getHotJson",
 						"/service/scene/edit/publicScene","/service/scene/edit/upload/files");
 		WebMvcConfigurer.super.addInterceptors(registry);
 	}

src/main/java/com/cdf/controller/api/ShopApiController.java

@@ -0,0 +1,37 @@
+package com.cdf.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.cdf.common.ResultData;
+import com.cdf.entity.Shop;
+import com.cdf.entity.Video;
+import com.cdf.service.IShopCategoryService;
+import com.cdf.service.IShopService;
+import com.cdf.service.IVideoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class ShopApiController {
+
+    @Autowired
+    private IShopCategoryService shopCategoryService;
+    @Autowired
+    private IShopService shopService;
+
+    @GetMapping("/getShopCategory")
+    public ResultData getShopCategory(){
+        return ResultData.ok(shopCategoryService.list());
+    }
+    @GetMapping("/getShopByCategory")
+    public ResultData getShopByCategory(@RequestParam(required = false) Integer categoryId){
+        LambdaQueryWrapper<Shop> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Shop::getCategoryId,categoryId);
+        return ResultData.ok(shopService.list(wrapper));
+    }
+}

src/main/java/com/cdf/controller/api/VideoApiController.java

@@ -0,0 +1,33 @@
+package com.cdf.controller.api;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
+import com.cdf.common.ResultData;
+import com.cdf.entity.Video;
+import com.cdf.service.IVideoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class VideoApiController {
+
+    @Autowired
+    private IVideoService videoService;
+
+    @GetMapping("/getVideo")
+    public ResultData getVideo(){
+        LambdaQueryWrapper<Video> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Video::getShowStatus,0);
+        wrapper.orderByDesc(Video::getCreateTime);
+        List<Video> list = videoService.list();
+        if(list.size()<=0){
+            return ResultData.ok();
+        }
+        return ResultData.ok(list.get(0));
+    }
+}

src/main/java/com/cdf/controller/CdfProductController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.cdf.common.PageInfo;
 import com.cdf.common.ResultData;

src/main/java/com/cdf/controller/HotController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.ResultCode;

src/main/java/com/cdf/controller/LoginController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.cdf.aop.SysLog;
 import com.cdf.business.LoginService;

src/main/java/com/cdf/controller/SceneBackController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.common.PageInfo;

src/main/java/com/cdf/controller/ShopBackController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -8,10 +8,12 @@ import com.cdf.common.PageInfo;
 import com.cdf.common.ResultData;
 import com.cdf.entity.Dept;
 import com.cdf.entity.Shop;
+import com.cdf.entity.ShopCategory;
 import com.cdf.request.ShopRequest;
 import com.cdf.request.UserRequest;
 import com.cdf.response.ShopVo;
 import com.cdf.service.IDeptService;
+import com.cdf.service.IShopCategoryService;
 import com.cdf.service.IShopService;
 import com.dtflys.forest.annotation.Post;
 import org.apache.commons.lang3.StringUtils;
@@ -31,6 +33,8 @@ public class ShopBackController {
     IShopService shopService;
     @Autowired
     IDeptService deptService;
+    @Autowired
+    IShopCategoryService categoryService;
 
     @PostMapping("/saveOrUpdate")
     @SysLog("店铺新增或修改")
@@ -56,6 +60,10 @@ public class ShopBackController {
             if(dept !=null){
                 shopVo.setDeptName(dept.getDeptName());
             }
+            ShopCategory category = categoryService.getById(shop.getCategoryId());
+            if(category !=null){
+                shopVo.setCategoryName(category.getCategoryName());
+            }
             pageVo.add(shopVo);
         }
         return ResultData.ok(PageInfo.PageInfo(page.getCurrent(),page.getSize(),page.getTotal(),pageVo));

src/main/java/com/cdf/controller/back/ShopCategoryController.java

@@ -0,0 +1,56 @@
+package com.cdf.controller.back;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cdf.aop.SysLog;
+import com.cdf.common.PageInfo;
+import com.cdf.common.ResultCode;
+import com.cdf.common.ResultData;
+import com.cdf.entity.HotRelation;
+import com.cdf.entity.ShopCategory;
+import com.cdf.exception.BusinessException;
+import com.cdf.request.BaseRequest;
+import com.cdf.request.HotTypeRequest;
+import com.cdf.service.IHotRelationService;
+import com.cdf.service.IShopCategoryService;
+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 java.util.List;
+
+@RestController
+@RequestMapping("/back/category")
+public class ShopCategoryController {
+
+    @Autowired
+    private IShopCategoryService shopCategoryService;
+
+    @PostMapping("/saveOrUpdate")
+    @SysLog("店铺分类新增或修改")
+    public ResultData saveOrUpdate(@RequestBody ShopCategory shopCategory){
+        shopCategoryService.saveOrUpdate(shopCategory);
+        return ResultData.ok();
+    }
+    @PostMapping("/delete")
+    @SysLog("店铺分类删除")
+    public ResultData delete(@RequestBody ShopCategory shopCategory){
+        if(shopCategory.getId() == null){
+            throw new BusinessException(ResultCode.PARAM_MISS);
+        }
+        shopCategoryService.removeById(shopCategory);
+        return ResultData.ok();
+    }
+    @PostMapping("/list")
+    public ResultData list(@RequestBody BaseRequest param){
+        Page<ShopCategory> page = shopCategoryService.page(new Page<>(param.getPageNum(), param.getPageSize()));
+        return ResultData.ok(PageInfo.PageInfo(page));
+    }
+    @PostMapping("/allList")
+    public ResultData allList(){
+        List<ShopCategory> list = shopCategoryService.list();
+        return ResultData.ok(list);
+    }
+
+}

src/main/java/com/cdf/controller/SysDeptController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

src/main/java/com/cdf/controller/SysLogController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

src/main/java/com/cdf/controller/SysMenuController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

src/main/java/com/cdf/controller/SysRoleController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/cdf/controller/SysUserController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

src/main/java/com/cdf/controller/TestController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.cdf.common.ResultData;
 import com.cdf.httpClient.client.CdfClient;

src/main/java/com/cdf/controller/UploadController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;

src/main/java/com/cdf/controller/VideoBackController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.back;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

src/main/java/com/cdf/controller/FdkkSceneEditController.java

@@ -1,4 +1,4 @@
-package com.cdf.controller;
+package com.cdf.controller.service;
 
 import com.cdf.aop.SysLog;
 import com.cdf.common.ResultData;

src/main/java/com/cdf/entity/Shop.java

@@ -40,6 +40,9 @@ public class Shop implements Serializable {
     @TableField("dept_id")
     private Integer deptId;
 
+    @TableField("category_id")
+    private Integer categoryId;
+
     @TableField("tb_status")
     @TableLogic
     private Boolean tbStatus;

src/main/java/com/cdf/entity/ShopCategory.java

@@ -0,0 +1,45 @@
+package com.cdf.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-16
+ */
+@Getter
+@Setter
+@TableName("t_shop_category")
+public class ShopCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("category_name")
+    private String categoryName;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Boolean tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/cdf/generate/AutoGenerate.java

@@ -20,7 +20,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"", getTables(new String[]{
-                "t_role"
+                "t_shop_category"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/cdf/interceptor/BackUserInterceptor.java

@@ -34,10 +34,15 @@ public class BackUserInterceptor implements HandlerInterceptor {
 			return false;
 		}
 		log.info("BackUserInterceptor|preHandle|token=" + token);
-		Integer userId = JwtUtil.getId(token);
-		User user = userService.getById(userId);
-		if(user == null ){
-			this.userNotExist(request, response);
+		try {
+			Integer userId = JwtUtil.getId(token);
+			User user = userService.getById(userId);
+			if(user == null ){
+				this.userNotExist(request, response);
+				return  false;
+			}
+		}catch (Exception e){
+			this.needLogin(request, response);
 			return  false;
 		}
 		return true;

src/main/java/com/cdf/mapper/IShopCategoryMapper.java

@@ -0,0 +1,18 @@
+package com.cdf.mapper;
+
+import com.cdf.entity.ShopCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-16
+ */
+@Mapper
+public interface IShopCategoryMapper extends BaseMapper<ShopCategory> {
+
+}

src/main/java/com/cdf/response/ShopVo.java

@@ -6,4 +6,5 @@ import lombok.Data;
 @Data
 public class ShopVo extends Shop {
     private String deptName;
+    private String categoryName;
 }

src/main/java/com/cdf/service/IShopCategoryService.java

@@ -0,0 +1,16 @@
+package com.cdf.service;
+
+import com.cdf.entity.ShopCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-16
+ */
+public interface IShopCategoryService extends IService<ShopCategory> {
+
+}

src/main/java/com/cdf/service/impl/ShopCategoryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.cdf.service.impl;
+
+import com.cdf.entity.ShopCategory;
+import com.cdf.mapper.IShopCategoryMapper;
+import com.cdf.service.IShopCategoryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-05-16
+ */
+@Service
+public class ShopCategoryServiceImpl extends ServiceImpl<IShopCategoryMapper, ShopCategory> implements IShopCategoryService {
+
+}

src/main/resources/mapper/ShopCategoryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cdf.mapper.IShopCategoryMapper">
+
+</mapper>