wl
2022-10-21 5ff9c08cde80c002631709020d2dccd6090b2053
日志名称乱码 处置案件图片添加 店铺管理添查询
7个文件已修改
7个文件已添加
312 ■■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/java/com/ycl/controller/caseHandler/ImageResourcesController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/java/com/ycl/entity/caseHandler/ImageResources.java 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/java/com/ycl/mapper/caseHandler/ImageResourcesMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-generator/src/main/resources/mapper/caseHandler/ImageResourcesMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java
@@ -1,5 +1,6 @@
package com.ycl.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -7,7 +8,6 @@
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.Pattern;
import java.math.BigDecimal;
@@ -42,4 +42,13 @@
    @ApiModelProperty("门店积分")
    private BigDecimal storescore;
    @ApiModelProperty("门店类型")
    @TableField("type")
    private Integer type;
    @ApiModelProperty("描述")
    @TableField("description")
    private String description;
}
ycl-generator/src/main/java/com/ycl/controller/caseHandler/ImageResourcesController.java
New file
@@ -0,0 +1,21 @@
package com.ycl.controller.caseHandler;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ycl.base.BaseController;
/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
@RestController
@RequestMapping("/image-resources")
public class ImageResourcesController extends BaseController {
}
ycl-generator/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
New file
@@ -0,0 +1,65 @@
package com.ycl.entity.caseHandler;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * <p>
 *
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_image_resources")
public class ImageResources implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键Id
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 所属Id
     */
    @TableField("belong_to_id")
    private Integer belongToId;
    /**
     * 图片资源类型 01-上报  02-处置
     */
    @TableField("type")
    private String type;
    /**
     * 图片路径
     */
    @TableField("url")
    private String url;
    /**
     * 创建人
     */
    @TableField("create_user")
    private Integer createUser;
    /**
     * 创建时间
     */
    @TableField("create_time")
    private LocalDateTime createTime;
}
ycl-generator/src/main/java/com/ycl/mapper/caseHandler/ImageResourcesMapper.java
New file
@@ -0,0 +1,16 @@
package com.ycl.mapper.caseHandler;
import com.ycl.entity.caseHandler.ImageResources;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
public interface ImageResourcesMapper extends BaseMapper<ImageResources> {
}
ycl-generator/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
New file
@@ -0,0 +1,16 @@
package com.ycl.service.caseHandler;
import com.ycl.entity.caseHandler.ImageResources;
import com.baomidou.mybatisplus.extension.service.IService;
/**
 * <p>
 *  服务类
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
public interface IImageResourcesService extends IService<ImageResources> {
}
ycl-generator/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.ycl.service.caseHandler.impl;
import com.ycl.entity.caseHandler.ImageResources;
import com.ycl.mapper.caseHandler.ImageResourcesMapper;
import com.ycl.service.caseHandler.IImageResourcesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author zhanghua
 * @since 2022-10-21
 */
@Service
public class ImageResourcesServiceImpl extends ServiceImpl<ImageResourcesMapper, ImageResources> implements IImageResourcesService {
}
ycl-generator/src/main/resources/mapper/caseHandler/ImageResourcesMapper.xml
New file
@@ -0,0 +1,20 @@
<?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.ycl.mapper.caseHandler.ImageResourcesMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.ImageResources">
        <id column="id" property="id" />
        <result column="belong_to_id" property="belongToId" />
        <result column="type" property="type" />
        <result column="url" property="url" />
        <result column="create_user" property="createUser" />
        <result column="create_time" property="createTime" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, belong_to_id, type, url, create_user, create_time
    </sql>
</mapper>
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -8,6 +8,7 @@
import com.ycl.dto.UmsStoreInfoParam;
import com.ycl.entity.store.StoreInfo;
import com.ycl.service.store.StoreInfoService;
import com.ycl.vo.store.StoreInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,10 +41,10 @@
    @ApiOperation("根据门店名称分页获取门店列表列表")
    @RequestMapping(value = "/list", method = RequestMethod.GET)
    @ResponseBody
    public CommonResult<CommonPage<StoreInfo>> list(@RequestParam(value = "keyword", required = false) String keyword,
                                                    @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
                                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
        Page<StoreInfo> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
    public CommonResult<CommonPage<StoreInfoVO>> list(@RequestParam(value = "keyword", required = false) String keyword,
                                                      @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
                                                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
        Page<StoreInfoVO> storeInfoPage = storeInfoService.list(keyword, pageSize, pageNum);
        return CommonResult.success(CommonPage.restPage(storeInfoPage));
    }
@@ -67,7 +68,10 @@
                .storePhoto(umsStoreInfoParam.getStorephoto())
                .idCardInfo(umsStoreInfoParam.getIdcardinfo())
                .storeNumber(utilNumber.createShopCode())
                .storeScore(umsStoreInfoParam.getStorescore()).build();
                .storeScore(umsStoreInfoParam.getStorescore())
                .type(umsStoreInfoParam.getType())
                .description(umsStoreInfoParam.getDescription())
                .build();
        boolean success = storeInfoService.save(storeInfo);
        if (success) {
            return CommonResult.success(null);
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
@@ -67,4 +67,17 @@
    @ApiModelProperty("门店积分")
    @TableField("store_score")
    private BigDecimal storeScore;
    @ApiModelProperty("门店积分")
    @TableField(" relation_video")
    private BigDecimal relationVideo;
    @ApiModelProperty("门店类型")
    @TableField("type")
    private Integer type;
    @ApiModelProperty("描述")
    @TableField("description")
    private String description;
}
ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
@@ -1,7 +1,9 @@
package com.ycl.mapper.store;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.store.StoreInfo;
import com.ycl.vo.store.StoreInfoVO;
/**
 * <p>
@@ -13,4 +15,5 @@
 */
public interface StoreInfoMapper extends BaseMapper<StoreInfo> {
    Page<StoreInfoVO> selectStorePage(Page<StoreInfo> storeInfoPage, String keyword);
}
ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.store.StoreInfo;
import com.ycl.vo.store.StoreInfoVO;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -21,7 +22,7 @@
     * @param pageNum 页码
     * @return 分页实体
     */
    Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum);
    Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum);
    /**
     * 读取excel文件动态加载文件
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -12,6 +12,7 @@
import com.ycl.service.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
import com.ycl.vo.store.StoreInfoExcelVo;
import com.ycl.vo.store.StoreInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -34,16 +35,16 @@
@Slf4j
public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo> implements StoreInfoService {
    @Resource
    StoreInfoMapper storeInfoMapper;
    @Override
    public Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum) {
        Page<StoreInfo> page = new Page<>(pageSize, pageNum);
        Page<StoreInfo> storeInfoPage = page(page, new LambdaQueryWrapper<StoreInfo>()
                .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword));
        storeInfoPage.setRecords(list(new LambdaQueryWrapper<StoreInfo>()
                .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword)));
        return storeInfoPage;
    public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum) {
        Page<StoreInfo> storeInfoPage = new Page<>();
        storeInfoPage.setSize(pageSize);
        storeInfoPage.setCurrent(pageNum);
        return storeInfoMapper.selectStorePage(storeInfoPage,keyword);
    }
    @Override
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
New file
@@ -0,0 +1,82 @@
package com.ycl.vo.store;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serializable;
import java.math.BigDecimal;
/**
 * <p>
 *
 * </p>
 *
 * @author lyq
 * @since 2022-09-08
 */
@Getter
@Setter
@TableName("ums_store_store_info")
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(value = "StoreInfo对象", description = "")
@Builder
public class StoreInfoVO implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @ApiModelProperty("姓名")
    @TableField("owner")
    private String owner;
    @ApiModelProperty("门店名称")
    @TableField("store_name")
    private String storeName;
    @ApiModelProperty("门店编码")
    @TableField("store_number")
    private String storeNumber;
    @ApiModelProperty("联系方式")
    @TableField("contact")
    private String contact;
    @ApiModelProperty("地址")
    @TableField("store_address")
    private String storeAddress;
    @ApiModelProperty("照片")
    @TableField("store_photo")
    private String storePhoto;
    @ApiModelProperty("身份证信息")
    @TableField("id_card")
    private String idCardInfo;
    @ApiModelProperty("门店积分")
    @TableField("store_score")
    private BigDecimal storeScore;
    @ApiModelProperty("门店积分")
    @TableField(" relation_video")
    private BigDecimal relationVideo;
    @ApiModelProperty("门店类型")
    @TableField("type")
    private String type;
    @ApiModelProperty("描述")
    @TableField("description")
    private String description;
}
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -14,4 +14,17 @@
        <result column="storescore" property="storescore"/>
    </resultMap>
    <select id="selectStorePage" resultType="com.ycl.vo.store.StoreInfoVO">
        SELECT
            t1.*,
            t2.`name`
        FROM
            ums_store_store_info t1
                JOIN ums_data_dictionary t2 ON t1.type = t2.id
        <where>
            <if test="keyword!=null and keyword!=''">
                t1.store_name LIKE  CONCAT('%', #{keyword}, '%')
            </if>
        </where>
    </select>
</mapper>