fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/mall/TopStoreCategoryController.java

@@ -1,92 +0,0 @@
-package com.zhongzheng.controller.mall;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryAddBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryEditBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryQueryBo;
-import com.zhongzheng.modules.top.mall.service.ITopStoreCategoryService;
-import com.zhongzheng.modules.top.mall.vo.TopStoreCategoryVo;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 店铺类目IDController
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Api(value = "店铺类目ID控制器", tags = {"店铺类目ID管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/mall/category")
-public class TopStoreCategoryController extends BaseController {
-
-    private final ITopStoreCategoryService iTopStoreCategoryService;
-
-    /**
-     * 查询店铺类目ID列表
-     */
-    @ApiOperation("查询店铺类目ID列表")
-    @PreAuthorize("@ss.hasPermi('system:category:list')")
-    @GetMapping("/list")
-    public TableDataInfo<TopStoreCategoryVo> list(TopStoreCategoryQueryBo bo) {
-        startPage();
-        List<TopStoreCategoryVo> list = iTopStoreCategoryService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 获取店铺类目ID详细信息
-     */
-    @ApiOperation("获取店铺类目ID详细信息")
-    @PreAuthorize("@ss.hasPermi('system:category:query')")
-    @GetMapping("/{catId}")
-    public AjaxResult<TopStoreCategoryVo> getInfo(@PathVariable("catId" ) Long catId) {
-        return AjaxResult.success(iTopStoreCategoryService.queryById(catId));
-    }
-
-    /**
-     * 新增店铺类目ID
-     */
-    @ApiOperation("新增店铺类目ID")
-    @PreAuthorize("@ss.hasPermi('system:category:add')")
-    @Log(title = "店铺类目ID", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody TopStoreCategoryAddBo bo) {
-        return toAjax(iTopStoreCategoryService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改店铺类目ID
-     */
-    @ApiOperation("修改店铺类目ID")
-    @PreAuthorize("@ss.hasPermi('system:category:edit')")
-    @Log(title = "店铺类目ID", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody TopStoreCategoryEditBo bo) {
-        return toAjax(iTopStoreCategoryService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreCategoryAddBo.java

@@ -1,42 +0,0 @@
-package com.zhongzheng.modules.top.mall.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 店铺类目ID添加对象 top_store_category
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Data
-@ApiModel("店铺类目ID添加对象")
-public class TopStoreCategoryAddBo {
-
-    /** 类目名称 */
-    @ApiModelProperty("类目名称")
-    private String catName;
-    /** 店铺ID */
-    @ApiModelProperty("店铺ID")
-    private Long storeId;
-    /** 合作商户ID */
-    @ApiModelProperty("合作商户ID")
-    private Long merId;
-    /** 父ID */
-    @ApiModelProperty("父ID")
-    private Long parentId;
-    /** 0 未启用 1启用 -1删除 */
-    @ApiModelProperty("0 未启用 1启用 -1删除")
-    private Integer status;
-    /** 创建时间 */
-    @ApiModelProperty("创建时间")
-    private Long createTime;
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long updateTime;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreCategoryEditBo.java

@@ -1,49 +0,0 @@
-package com.zhongzheng.modules.top.mall.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import java.util.Date;
-
-
-/**
- * 店铺类目ID编辑对象 top_store_category
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Data
-@ApiModel("店铺类目ID编辑对象")
-public class TopStoreCategoryEditBo {
-
-    /** 类目ID */
-    @ApiModelProperty("类目ID")
-    private Long catId;
-
-    /** 类目名称 */
-    @ApiModelProperty("类目名称")
-    private String catName;
-
-    /** 店铺ID */
-    @ApiModelProperty("店铺ID")
-    private Long storeId;
-
-    /** 合作商户ID */
-    @ApiModelProperty("合作商户ID")
-    private Long merId;
-
-    /** 父ID */
-    @ApiModelProperty("父ID")
-    private Long parentId;
-
-    /** 0 未启用 1启用 -1删除 */
-    @ApiModelProperty("0 未启用 1启用 -1删除")
-    private Integer status;
-
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
-    private Long updateTime;
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/bo/TopStoreCategoryQueryBo.java

@@ -1,54 +0,0 @@
-package com.zhongzheng.modules.top.mall.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
-
-import com.zhongzheng.common.core.domain.BaseEntity;
-
-/**
- * 店铺类目ID分页查询对象 top_store_category
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ApiModel("店铺类目ID分页查询对象")
-public class TopStoreCategoryQueryBo extends BaseEntity {
-
-	/** 分页大小 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/** 当前页数 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/** 排序列 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/** 排序的方向desc或者asc */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
-
-
-	/** 类目名称 */
-	@ApiModelProperty("类目名称")
-	private String catName;
-	/** 店铺ID */
-	@ApiModelProperty("店铺ID")
-	private Long storeId;
-	/** 合作商户ID */
-	@ApiModelProperty("合作商户ID")
-	private Long merId;
-	/** 父ID */
-	@ApiModelProperty("父ID")
-	private Long parentId;
-	/** 0 未启用 1启用 -1删除 */
-	@ApiModelProperty("0 未启用 1启用 -1删除")
-	private Integer status;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/domain/TopStoreCategory.java

@@ -1,45 +0,0 @@
-package com.zhongzheng.modules.top.mall.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
-
-/**
- * 店铺类目ID对象 top_store_category
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@TableName("top_store_category")
-public class TopStoreCategory implements Serializable {
-
-private static final long serialVersionUID=1L;
-
-    /** 类目ID */
-    @TableId(value = "cat_id")
-    private Long catId;
-    /** 类目名称 */
-    private String catName;
-    /** 店铺ID */
-    private Long storeId;
-    /** 合作商户ID */
-    private Long merId;
-    /** 父ID */
-    private Long parentId;
-    /** 0 未启用 1启用 -1删除 */
-    private Integer status;
-    /** 创建时间 */
-    @TableField(fill = FieldFill.INSERT)
-    private Long createTime;
-    /** $column.columnComment */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Long updateTime;
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/mapper/TopStoreCategoryMapper.java

@@ -1,15 +0,0 @@
-package com.zhongzheng.modules.top.mall.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zhongzheng.modules.top.mall.domain.TopStoreCategory;
-
-/**
- * 店铺类目IDMapper接口
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-public interface TopStoreCategoryMapper extends BaseMapper<TopStoreCategory> {
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/ITopStoreCategoryService.java

@@ -1,53 +0,0 @@
-package com.zhongzheng.modules.top.mall.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryAddBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryEditBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryQueryBo;
-import com.zhongzheng.modules.top.mall.domain.TopStoreCategory;
-import com.zhongzheng.modules.top.mall.vo.TopStoreCategoryVo;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 店铺类目IDService接口
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-public interface ITopStoreCategoryService extends IService<TopStoreCategory> {
-	/**
-	 * 查询单个
-	 * @return
-	 */
-	TopStoreCategoryVo queryById(Long catId);
-
-	/**
-	 * 查询列表
-	 */
-	List<TopStoreCategoryVo> queryList(TopStoreCategoryQueryBo bo);
-
-	/**
-	 * 根据新增业务对象插入店铺类目ID
-	 * @param bo 店铺类目ID新增业务对象
-	 * @return
-	 */
-	Boolean insertByAddBo(TopStoreCategoryAddBo bo);
-
-	/**
-	 * 根据编辑业务对象修改店铺类目ID
-	 * @param bo 店铺类目ID编辑业务对象
-	 * @return
-	 */
-	Boolean updateByEditBo(TopStoreCategoryEditBo bo);
-
-	/**
-	 * 校验并删除数据
-	 * @param ids 主键集合
-	 * @param isValid 是否校验,true-删除前校验,false-不校验
-	 * @return
-	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/service/impl/TopStoreCategoryServiceImpl.java

@@ -1,104 +0,0 @@
-package com.zhongzheng.modules.top.mall.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryAddBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryEditBo;
-import com.zhongzheng.modules.top.mall.bo.TopStoreCategoryQueryBo;
-import com.zhongzheng.modules.top.mall.domain.TopStoreCategory;
-import com.zhongzheng.modules.top.mall.mapper.TopStoreCategoryMapper;
-import com.zhongzheng.modules.top.mall.service.ITopStoreCategoryService;
-import com.zhongzheng.modules.top.mall.vo.TopStoreCategoryVo;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 店铺类目IDService业务层处理
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Service
-public class TopStoreCategoryServiceImpl extends ServiceImpl<TopStoreCategoryMapper, TopStoreCategory> implements ITopStoreCategoryService {
-
-    @Override
-    public TopStoreCategoryVo queryById(Long catId){
-        TopStoreCategory db = this.baseMapper.selectById(catId);
-        return BeanUtil.toBean(db, TopStoreCategoryVo.class);
-    }
-
-    @Override
-    public List<TopStoreCategoryVo> queryList(TopStoreCategoryQueryBo bo) {
-        LambdaQueryWrapper<TopStoreCategory> lqw = Wrappers.lambdaQuery();
-        lqw.like(StrUtil.isNotBlank(bo.getCatName()), TopStoreCategory::getCatName, bo.getCatName());
-        lqw.eq(bo.getStoreId() != null, TopStoreCategory::getStoreId, bo.getStoreId());
-        lqw.eq(bo.getMerId() != null, TopStoreCategory::getMerId, bo.getMerId());
-        lqw.eq(bo.getParentId() != null, TopStoreCategory::getParentId, bo.getParentId());
-        lqw.eq(bo.getStatus() != null, TopStoreCategory::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<TopStoreCategoryVo> entity2Vo(Collection<TopStoreCategory> collection) {
-        List<TopStoreCategoryVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, TopStoreCategoryVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<TopStoreCategory> page = (Page<TopStoreCategory>)collection;
-            Page<TopStoreCategoryVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(TopStoreCategoryAddBo bo) {
-        TopStoreCategory add = BeanUtil.toBean(bo, TopStoreCategory.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(TopStoreCategoryEditBo bo) {
-        TopStoreCategory update = BeanUtil.toBean(bo, TopStoreCategory.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(TopStoreCategory entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mall/vo/TopStoreCategoryVo.java

@@ -1,47 +0,0 @@
-package com.zhongzheng.modules.top.mall.vo;
-
-import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import java.util.Date;
-
-
-
-/**
- * 店铺类目ID视图对象 mall_package
- *
- * @author ruoyi
- * @date 2023-05-26
- */
-@Data
-@ApiModel("店铺类目ID视图对象")
-public class TopStoreCategoryVo {
-	private static final long serialVersionUID = 1L;
-
-	/** 类目ID */
-	@ApiModelProperty("类目ID")
-	private Long catId;
-
-	/** 类目名称 */
-	@Excel(name = "类目名称")
-	@ApiModelProperty("类目名称")
-	private String catName;
-	/** 店铺ID */
-	@Excel(name = "店铺ID")
-	@ApiModelProperty("店铺ID")
-	private Long storeId;
-	/** 合作商户ID */
-	@Excel(name = "合作商户ID")
-	@ApiModelProperty("合作商户ID")
-	private Long merId;
-	/** 父ID */
-	@Excel(name = "父ID")
-	@ApiModelProperty("父ID")
-	private Long parentId;
-	/** 0 未启用 1启用 -1删除 */
-	@Excel(name = "0 未启用 1启用 -1删除")
-	@ApiModelProperty("0 未启用 1启用 -1删除")
-	private Integer status;
-}

zhongzheng-system/src/main/resources/mapper/modules/top/TopStoreCategoryMapper.xml

@@ -1,19 +0,0 @@
-<?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.zhongzheng.modules.top.mall.mapper.TopStoreCategoryMapper">
-
-    <resultMap type="com.zhongzheng.modules.top.mall.domain.TopStoreCategory" id="TopStoreCategoryResult">
-        <result property="catId" column="cat_id"/>
-        <result property="catName" column="cat_name"/>
-        <result property="storeId" column="store_id"/>
-        <result property="merId" column="mer_id"/>
-        <result property="parentId" column="parent_id"/>
-        <result property="status" column="status"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-    </resultMap>
-
-
-</mapper>