From 5ff9c08cde80c002631709020d2dccd6090b2053 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 21 十月 2022 18:16:27 +0800
Subject: [PATCH] 日志名称乱码 处置案件图片添加 店铺管理添查询
---
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java | 13 ++
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 13 ++
ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java | 3
ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java | 11 +
ycl-generator/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java | 20 +++
ycl-generator/src/main/java/com/ycl/mapper/caseHandler/ImageResourcesMapper.java | 16 ++
ycl-generator/src/main/java/com/ycl/controller/caseHandler/ImageResourcesController.java | 21 +++
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 15 +-
ycl-generator/src/main/resources/mapper/caseHandler/ImageResourcesMapper.xml | 20 +++
ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java | 3
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java | 82 +++++++++++++
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 14 +
ycl-generator/src/main/java/com/ycl/entity/caseHandler/ImageResources.java | 65 ++++++++++
ycl-generator/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java | 16 ++
14 files changed, 298 insertions(+), 14 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java b/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java
index c59103d..bf0d555 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsStoreInfoParam.java
+++ b/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;
}
diff --git a/ycl-generator/src/main/java/com/ycl/controller/caseHandler/ImageResourcesController.java b/ycl-generator/src/main/java/com/ycl/controller/caseHandler/ImageResourcesController.java
new file mode 100644
index 0000000..d3fce90
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/controller/caseHandler/ImageResourcesController.java
@@ -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 {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/entity/caseHandler/ImageResources.java b/ycl-generator/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
new file mode 100644
index 0000000..aa0bd16
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
@@ -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;
+
+ /**
+ * 鎵�灞濱d
+ */
+ @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;
+
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/mapper/caseHandler/ImageResourcesMapper.java b/ycl-generator/src/main/java/com/ycl/mapper/caseHandler/ImageResourcesMapper.java
new file mode 100644
index 0000000..bcec23e
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/mapper/caseHandler/ImageResourcesMapper.java
@@ -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> {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java b/ycl-generator/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
new file mode 100644
index 0000000..11f1d0d
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
@@ -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> {
+
+}
diff --git a/ycl-generator/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java b/ycl-generator/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
new file mode 100644
index 0000000..98cdcba
--- /dev/null
+++ b/ycl-generator/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
@@ -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 {
+
+}
diff --git a/ycl-generator/src/main/resources/mapper/caseHandler/ImageResourcesMapper.xml b/ycl-generator/src/main/resources/mapper/caseHandler/ImageResourcesMapper.xml
new file mode 100644
index 0000000..286fd9b
--- /dev/null
+++ b/ycl-generator/src/main/resources/mapper/caseHandler/ImageResourcesMapper.xml
@@ -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>
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index c56bec7..4af016d 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/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);
diff --git a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java b/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
index 84474ea..aa42d2d 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
+++ b/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;
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
index 829546c..9cc6c93 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/store/StoreInfoMapper.java
+++ b/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);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java b/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
index 59dca5d..93bea65 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/StoreInfoService.java
+++ b/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鏂囦欢鍔ㄦ�佸姞杞芥枃浠�
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index bd15859..24e84a3 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/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
diff --git a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
new file mode 100644
index 0000000..8245c27
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
@@ -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;
+}
diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index e4d975d..074510f 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/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>
--
Gitblit v1.8.0