From e22a86ba7cf514fff9a7f3f124fdb2b1f5a9b23e Mon Sep 17 00:00:00 2001 From: ASUS <1621302159@qq.com> Date: Sun, 17 Dec 2023 11:07:56 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Elist=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 6 + .idea/misc.xml | 1 - .idea/uiDesigner.xml | 124 ++++++++++++++++++ bwie-models/bwie-shopList/pom.xml | 66 ++++++++++ .../main/java/com/bwie/ListApplication.java | 11 ++ .../src/main/resources/bootstrap.yml | 29 ++++ .../main/resources/mapper/SysUserMapper.xml | 6 + bwie-models/pom.xml | 4 + 8 files changed, 246 insertions(+), 1 deletion(-) create mode 100644 .idea/uiDesigner.xml create mode 100644 bwie-models/bwie-shopList/pom.xml create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/ListApplication.java create mode 100644 bwie-models/bwie-shopList/src/main/resources/bootstrap.yml create mode 100644 bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index bb4e79a..c9ec766 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,10 +2,16 @@ + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 132404b..6f5230a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bwie-models/bwie-shopList/pom.xml b/bwie-models/bwie-shopList/pom.xml new file mode 100644 index 0000000..5074c1c --- /dev/null +++ b/bwie-models/bwie-shopList/pom.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + com.bwie + bwie-models + 1.0-SNAPSHOT + + + bwie-shopList + + + 8 + 8 + UTF-8 + + + + + + com.bwie + bwie-common + + + + org.springframework.boot + spring-boot-starter-web + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + \ No newline at end of file diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/ListApplication.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/ListApplication.java new file mode 100644 index 0000000..578c300 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/ListApplication.java @@ -0,0 +1,11 @@ +package com.bwie; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ListApplication { + public static void main(String[] args) { + SpringApplication.run(ListApplication.class); + } +} \ No newline at end of file diff --git a/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml b/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..178924b --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +# Tomcat +server: + port: 9002 +# Spring +spring: + main: + allow-circular-references: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: bwie-list + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 82.157.236.130:8848 + config: + # 配置中心地址 + server-addr: 82.157.236.130:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml b/bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml new file mode 100644 index 0000000..d089973 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/bwie-models/pom.xml b/bwie-models/pom.xml index 773a9c7..acf644b 100644 --- a/bwie-models/pom.xml +++ b/bwie-models/pom.xml @@ -10,6 +10,10 @@ bwie-models + pom + + bwie-shopList + 8 From 6d4c584e41f236b2032d027e8eac0435bd19b1dc Mon Sep 17 00:00:00 2001 From: ASUS <1621302159@qq.com> Date: Sun, 17 Dec 2023 14:05:13 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bwie/common/pojo/DTO/DTOShop.java | 25 ++++++++++++++++++ .../main/java/com/bwie/common/pojo/Goods.java | 26 +++++++++++++++++++ .../java/com/bwie/common/pojo/Picture.java | 23 ++++++++++++++++ .../main/java/com/bwie/common/pojo/Shop.java | 25 ++++++++++++++++++ .../main/java/com/bwie/common/pojo/Type.java | 21 +++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/Goods.java create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/Picture.java create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/Shop.java create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/Type.java diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java new file mode 100644 index 0000000..00d9c09 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java @@ -0,0 +1,25 @@ +package com.bwie.common.pojo.DTO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class DTOShop { + + //商品id + private Integer shopId; + //商品名称 + private String shopName; + //商品价格 + private double shopPrice; + //商品类型id + private Integer typeId; + //商品类型名称 + private String typeName; + +} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Goods.java b/bwie-common/src/main/java/com/bwie/common/pojo/Goods.java new file mode 100644 index 0000000..4410277 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Goods.java @@ -0,0 +1,26 @@ +package com.bwie.common.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Goods { + + //商品设备中间id + private Integer goodsId; + //商品id + private Integer shopId; + //设备id + private Integer facilityId; + //库存 + private Integer goodsNum; + //上下架(逻辑字段: 0上架, 1下架) + private Integer goodsIsDelete; + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Picture.java b/bwie-common/src/main/java/com/bwie/common/pojo/Picture.java new file mode 100644 index 0000000..dd90f82 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Picture.java @@ -0,0 +1,23 @@ +package com.bwie.common.pojo; + +import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Picture { + + //图片id + private Integer pictureId; + //图片路径 + private String pictureUrl; + //商品id + private Integer shopId; + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java new file mode 100644 index 0000000..4fec77d --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java @@ -0,0 +1,25 @@ +package com.bwie.common.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Shop { + + //商品id + private Integer shopId; + //商品名称 + private Integer shopName; + //商品价格 + private Integer shopPrice; + //商品类型id + private Integer typeId; + + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Type.java b/bwie-common/src/main/java/com/bwie/common/pojo/Type.java new file mode 100644 index 0000000..2280e7d --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Type.java @@ -0,0 +1,21 @@ +package com.bwie.common.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Type { + + + //类型id + private Integer typeId; + //类型名称 + private String typeName; + + +} From b1cc202f066c77dfaa123d5221076623febf14cb Mon Sep 17 00:00:00 2001 From: ASUS <1621302159@qq.com> Date: Mon, 18 Dec 2023 09:45:50 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87(?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=90=9C=E7=B4=A2,=20=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8,=20=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81,=20?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 8 + bwie-common/pom.xml | 13 +- .../com/bwie/common/pojo/DTO/DTOShop.java | 8 + .../java/com/bwie/common/pojo/VO/VOShop.java | 35 ++++ .../java/com/bwie/common/utils/FastUtil.java | 55 +++++++ .../com/bwie/common/utils/GenCodeUtils.java | 87 ++++++++++ .../java/com/bwie/common/utils/OssUtil.java | 153 ++++++++++++++++++ .../bwie/list/controller/ShopController.java | 34 ++++ .../bwie/list/controller/TypeController.java | 20 +++ .../java/com/bwie/list/mapper/ShopMapper.java | 16 ++ .../java/com/bwie/list/mapper/TypeMapper.java | 12 ++ .../com/bwie/list/service/ShopService.java | 14 ++ .../com/bwie/list/service/TypeService.java | 8 + .../list/service/impl/ShopServiceImpl.java | 66 ++++++++ .../list/service/impl/TypeServiceImpl.java | 23 +++ .../src/main/resources/bootstrap.yml | 12 ++ .../src/main/resources/mapper/ShopMapper.xml | 42 +++++ .../main/resources/mapper/SysUserMapper.xml | 6 - .../src/main/resources/mapper/TypeMapper.xml | 8 + 19 files changed, 613 insertions(+), 7 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/VO/VOShop.java create mode 100644 bwie-common/src/main/java/com/bwie/common/utils/FastUtil.java create mode 100644 bwie-common/src/main/java/com/bwie/common/utils/GenCodeUtils.java create mode 100644 bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/ShopMapper.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/TypeMapper.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/ShopService.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/TypeService.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/ShopServiceImpl.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/TypeServiceImpl.java create mode 100644 bwie-models/bwie-shopList/src/main/resources/mapper/ShopMapper.xml delete mode 100644 bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml create mode 100644 bwie-models/bwie-shopList/src/main/resources/mapper/TypeMapper.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..9394f4d --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/bwie-common/pom.xml b/bwie-common/pom.xml index 0e5576b..112e473 100644 --- a/bwie-common/pom.xml +++ b/bwie-common/pom.xml @@ -98,12 +98,23 @@ dysmsapi20170525 2.0.1 + + + com.aliyun.oss + aliyun-sdk-oss + 3.12.0 + org.springframework.boot spring-boot-starter-amqp - + + + com.github.tobato + fastdfs-client + 1.26.5 + diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java index 00d9c09..4a6541d 100644 --- a/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java +++ b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOShop.java @@ -1,10 +1,13 @@ package com.bwie.common.pojo.DTO; +import com.bwie.common.pojo.Picture; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor @@ -22,4 +25,9 @@ public class DTOShop { //商品类型名称 private String typeName; + //图片 + private List pictureUrl; + + + } diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOShop.java b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOShop.java new file mode 100644 index 0000000..b129737 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOShop.java @@ -0,0 +1,35 @@ +package com.bwie.common.pojo.VO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class VOShop { + + //类型id + private Integer typeId; + //商品id + private Integer shopId; + //商品名称 + private String shopName; + //商品价格 + private double shopPrice; + //商品类型名称 + private String typeName; + + //图片 + private List pictureUrl; + + //分页 + private Integer pageNum=1; + private Integer pageSize=3; + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/FastUtil.java b/bwie-common/src/main/java/com/bwie/common/utils/FastUtil.java new file mode 100644 index 0000000..3dbda5b --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/FastUtil.java @@ -0,0 +1,55 @@ +package com.bwie.common.utils; + +import org.springframework.stereotype.Component; +import com.github.tobato.fastdfs.domain.fdfs.StorePath; +import com.github.tobato.fastdfs.service.FastFileStorageClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; + +/** + * @BelongsProject: 0107day02 + * @BelongsPackage: com.bw.config + * @Author: zhupengfei + * @CreateTime: 2023-02-01 08:52 + */ +@Component +public class FastUtil { + private static final Logger log = LoggerFactory.getLogger(FastUtil.class); + + @Resource + private FastFileStorageClient storageClient ; + + /** + * 上传文件 + */ + public String upload(MultipartFile multipartFile) throws Exception{ + String originalFilename = multipartFile.getOriginalFilename(). + substring(multipartFile.getOriginalFilename(). + lastIndexOf(".") + 1); + StorePath storePath = this.storageClient.uploadImageAndCrtThumbImage( + multipartFile.getInputStream(), + multipartFile.getSize(),originalFilename , null); + return storePath.getFullPath(); + } + /** + * 删除文件 + */ + public String deleteFile(String fileUrl) { + if (StringUtils.isEmpty(fileUrl)) { + log.info("fileUrl == >>文件路径为空..."); + return "文件路径不能为空"; + } + try { + StorePath storePath = StorePath.parseFromUrl(fileUrl); + storageClient.deleteFile(storePath.getGroup(), storePath.getPath()); + } catch (Exception e) { + log.error(e.getMessage()); + } + return "删除成功"; + } + +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/GenCodeUtils.java b/bwie-common/src/main/java/com/bwie/common/utils/GenCodeUtils.java new file mode 100644 index 0000000..24a9722 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/GenCodeUtils.java @@ -0,0 +1,87 @@ +package com.bwie.common.utils; + +import java.util.Random; + +/** + * @author DongZl + * @description: 生成验证码工具类 + * @Date 2023-5-11 上午 10:09 + */ +public class GenCodeUtils { + + /** + * 数字类型 + */ + private static final String NUMBER_STR = "0123456789"; + /** + * 字母类型 + */ + private static final String LETTERS_STR = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + /** + * 短信验证码长度 + */ + private static final Integer SMS_CODE_LENGTH = 4; + + /** + * 生成短信四位验证码 + * @return 验证码 + */ + public static String genLetterStrSms(){ + return genCode(LETTERS_STR, SMS_CODE_LENGTH); + } + + /** + * 生成短信四位验证码 + * @return 验证码 + */ + public static String genNumberCodeSms(){ + return genCode(NUMBER_STR, SMS_CODE_LENGTH); + } + + /** + * 生成验证码 + * @param codeLength 验证码长度 + * @return 验证码 + */ + public static String genLetterStr(int codeLength){ + return genCode(LETTERS_STR, codeLength); + } + + /** + * 生成验证码 + * @param codeLength 验证码长度 + * @return 验证码 + */ + public static String genNumberCode( int codeLength){ + return genCode(NUMBER_STR, codeLength); + } + + /** + * 生成验证码 + * @param str 验证码字符串 + * @param codeLength 验证码长度 + * @return 验证码 + */ + public static String genCode (String str, int codeLength){ + //将字符串转换为一个新的字符数组。 + char[] verificationCodeArray = str.toCharArray(); + Random random = new Random(); + //计数器 + int count = 0; + StringBuilder stringBuilder = new StringBuilder(); + do { + //随机生成一个随机数 + int index = random.nextInt(verificationCodeArray.length); + char c = verificationCodeArray[index]; + //限制四位不重复数字 + if (stringBuilder.indexOf(String.valueOf(c)) == -1) { + stringBuilder.append(c); + //计数器加1 + count++; + } + //当count等于4时结束，随机生成四位数的验证码 + } while (count != codeLength); + return stringBuilder.toString(); + } +} diff --git a/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java b/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java new file mode 100644 index 0000000..9c1383f --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/utils/OssUtil.java @@ -0,0 +1,153 @@ +package com.bwie.common.utils; + +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.aliyun.oss.model.GetObjectRequest; +import com.aliyun.oss.model.PutObjectRequest; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.multipart.MultipartFile; + +import java.io.*; +import java.time.LocalDateTime; +import java.util.UUID; + +/** + * Oss服务调用 + */ +@Log4j2 +public class OssUtil { + + /** + * Endpoint 存储对象概述 阿里云主账号AccessKey，accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述 + */ + private static String endPoint = "oss-cn-shanghai.aliyuncs.com"; + private static String accessKeyId = "LTAI5tD2tppzLQ4Rb6yKYyph"; + private static String accessKeySecret = "KEKNKwVvDq7PZLjE63NPBouqHXox4Q"; + private static String accessPre = "https://dzlmuyu.oss-cn-shanghai.aliyuncs.com/"; + + /** + * bucket名称 + * @return + */ + private static String bucketName = "dzlmuyu"; + + private static OSS ossClient ; + + static { + ossClient = new OSSClientBuilder().build( + endPoint, + accessKeyId, + accessKeySecret); + log.info("oss服务连接成功！"); + } + + /** + * 默认路径上传本地文件 + * @param filePath + */ + public static String uploadFile(String filePath){ + return uploadFileForBucket(bucketName,getOssFilePath(filePath) ,filePath); + } + + /** + * 默认路径上传multipartFile文件 + * @param multipartFile + */ + public static String uploadMultipartFile(MultipartFile multipartFile) { + return uploadMultipartFile(bucketName,getOssFilePath(multipartFile.getOriginalFilename()),multipartFile); + } + /** + * 上传 multipartFile 类型文件 + * @param bucketName + * @param ossPath + * @param multipartFile + */ + public static String uploadMultipartFile(String bucketName , String ossPath , MultipartFile multipartFile){ + InputStream inputStream = null; + try { + inputStream = multipartFile.getInputStream(); + } catch (IOException e) { + e.printStackTrace(); + } + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre+ossPath; + } + + /** + * 使用File上传PutObject上传文件 ** 程序默认使用次方法上传 + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileForBucket(String bucketName , String ossPath , String filePath) { + // 创建PutObjectRequest对象。 + PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath)); + + // 上传 + ossClient.putObject(putObjectRequest); + return accessPre+ossPath; + } + + /** + * 使用文件流上传到指定的bucket实例 + * @param bucketName 实例名称 + * @param ossPath oss存储路径 + * @param filePath 本地文件路径 + */ + public static String uploadFileInputStreamForBucket(String bucketName , String ossPath , String filePath){ + + // 填写本地文件的完整路径。如果未指定本地路径，则默认从示例程序所属项目对应本地路径中上传文件流。 + InputStream inputStream = null; + try { + inputStream = new FileInputStream(filePath); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + // 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。 + uploadFileInputStreamForBucket(bucketName, ossPath, inputStream); + return accessPre+ossPath; + } + + public static void uploadFileInputStreamForBucket(String bucketName , String ossPath , InputStream inputStream ){ + ossClient.putObject(bucketName, ossPath, inputStream); + } + + /** + * 下载 + * @param ossFilePath + * @param filePath + */ + public static void downloadFile(String ossFilePath , String filePath ){ + downloadFileForBucket(bucketName , ossFilePath , filePath); + } + /** + * 下载 + * @param bucketName 实例名称 + * @param ossFilePath oss存储路径 + * @param filePath 本地文件路径 + */ + public static void downloadFileForBucket(String bucketName , String ossFilePath , String filePath ){ + ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath)); + } + + /** + * + * @return + */ + public static String getOssDefaultPath(){ + LocalDateTime now = LocalDateTime.now(); + String url = + now.getYear()+"/"+ + now.getMonth()+"/"+ + now.getDayOfMonth()+"/"+ + now.getHour()+"/"+ + now.getMinute()+"/"; + return url; + } + + public static String getOssFilePath(String filePath){ + String fileSuf = filePath.substring(filePath.indexOf(".") + 1); + return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf; + } + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java new file mode 100644 index 0000000..0434881 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java @@ -0,0 +1,34 @@ +package com.bwie.list.controller; + +import com.bwie.common.pojo.VO.VOShop; +import com.bwie.common.result.Result; +import com.bwie.list.service.ShopService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@Log4j2 +public class ShopController { + @Autowired + private ShopService shopService; + + //展示商品列表 + @PostMapping("/shopList") + public Result shopList(@RequestBody VOShop voShop){ + return shopService.shopList(voShop); + } + + //上传图片 + @PostMapping("/upImg") + public Result upImg(@RequestParam("file")MultipartFile myFile){ + return shopService.upImg(myFile); + } + //添加商品 + @PostMapping("/addShop") + public Result addShop(@RequestBody VOShop shop){ + return shopService.addShop(shop); + } + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java new file mode 100644 index 0000000..4359e53 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java @@ -0,0 +1,20 @@ +package com.bwie.list.controller; + +import com.bwie.common.result.Result; +import com.bwie.list.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TypeController { + @Autowired + private TypeService typeService; + + // 根据商品类型查询商品的商品类型菜单栏 + @GetMapping("/findType") + public Result findType(){ + return typeService.findType(); + } + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/ShopMapper.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/ShopMapper.java new file mode 100644 index 0000000..d154b98 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/ShopMapper.java @@ -0,0 +1,16 @@ +package com.bwie.list.mapper; + +import com.bwie.common.pojo.DTO.DTOShop; +import com.bwie.common.pojo.VO.VOShop; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ShopMapper { + List shopList(VOShop voShop); + + Integer addShop(VOShop shop); + + void addImg(VOShop shop); +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/TypeMapper.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/TypeMapper.java new file mode 100644 index 0000000..c0a27fe --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/TypeMapper.java @@ -0,0 +1,12 @@ +package com.bwie.list.mapper; + +import com.bwie.common.pojo.Type; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TypeMapper { + + List findType(); +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/ShopService.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/ShopService.java new file mode 100644 index 0000000..e7617a4 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/ShopService.java @@ -0,0 +1,14 @@ +package com.bwie.list.service; + +import com.bwie.common.pojo.VO.VOShop; +import com.bwie.common.result.Result; +import org.springframework.web.multipart.MultipartFile; + +public interface ShopService { + Result shopList(VOShop voShop); + + Result addShop(VOShop shop); + + Result upImg(MultipartFile myFile); + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/TypeService.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/TypeService.java new file mode 100644 index 0000000..c3eef42 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/TypeService.java @@ -0,0 +1,8 @@ +package com.bwie.list.service; + +import com.bwie.common.result.Result; + +public interface TypeService { + Result findType(); + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/ShopServiceImpl.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/ShopServiceImpl.java new file mode 100644 index 0000000..29349b6 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/ShopServiceImpl.java @@ -0,0 +1,66 @@ +package com.bwie.list.service.impl; + +import com.bwie.common.pojo.DTO.DTOShop; +import com.bwie.common.pojo.VO.VOShop; +import com.bwie.common.result.Result; +import com.bwie.common.utils.FastUtil; +import com.bwie.list.mapper.ShopMapper; +import com.bwie.list.service.ShopService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +@Service +public class ShopServiceImpl implements ShopService { + @Autowired + private ShopMapper shopMapper; + @Autowired + private FastUtil fastUtil; + + @Override + public Result shopList(VOShop voShop) { + + PageHelper.startPage(voShop.getPageNum(),voShop.getPageSize()); + + List dtoShops = shopMapper.shopList(voShop); + + PageInfo info = new PageInfo<>(dtoShops); + + return Result.success(info,"商品列表展示"); + } + + @Override + public Result addShop(VOShop shop) { + + Integer i = shopMapper.addShop(shop); + if (i>0){ + shopMapper.addImg(shop); + return Result.success(shop,"成功"); + } + return Result.error("失败"); + } + + @Override + public Result upImg(MultipartFile myFile) { + + String url = null; + + try { + url = fastUtil.upload(myFile); + + if (url==null || url.equals("")){ + return Result.error("图片上传失败"); + } + + } catch (Exception e) { + throw new RuntimeException(e); + } + + + return Result.success("http://82.157.236.130:8888/"+url,"上传成功"); + } +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/TypeServiceImpl.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/TypeServiceImpl.java new file mode 100644 index 0000000..4c572f6 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/TypeServiceImpl.java @@ -0,0 +1,23 @@ +package com.bwie.list.service.impl; + +import com.bwie.common.pojo.Type; +import com.bwie.common.result.Result; +import com.bwie.list.mapper.TypeMapper; +import com.bwie.list.service.TypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TypeServiceImpl implements TypeService { + @Autowired + private TypeMapper typeMapper; + + @Override + public Result findType() { + List typeList = typeMapper.findType(); + return Result.success(typeList,"类型展示"); + } +} + diff --git a/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml b/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml index 178924b..f67aa2a 100644 --- a/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml +++ b/bwie-models/bwie-shopList/src/main/resources/bootstrap.yml @@ -27,3 +27,15 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +fdfs: + so-timeout: 1500 # socket 连接时长 + connect-timeout: 600 # 连接 tracker 服务器超时时长 + # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流 + tracker-list: 82.157.236.130:22122 + web-server-url: 82.157.236.130:8888 + pool: + jmx-enabled: false + # 生成缩略图 + thumb-image: + height: 500 + width: 500 \ No newline at end of file diff --git a/bwie-models/bwie-shopList/src/main/resources/mapper/ShopMapper.xml b/bwie-models/bwie-shopList/src/main/resources/mapper/ShopMapper.xml new file mode 100644 index 0000000..b20e457 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/resources/mapper/ShopMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + INSERT INTO `shop_manage`.`t_shop` (`shop_name`, `shop_price`, `type_id`) + VALUES ( #{shopName}, #{shopPrice}, #{typeId}); + + + INSERT INTO `shop_manage`.`t_picture`(`picture_url`,`shop_id`) + VALUES + + (#{url},#{shopId}) + + + + + + + diff --git a/bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml b/bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml deleted file mode 100644 index d089973..0000000 --- a/bwie-models/bwie-shopList/src/main/resources/mapper/SysUserMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/bwie-models/bwie-shopList/src/main/resources/mapper/TypeMapper.xml b/bwie-models/bwie-shopList/src/main/resources/mapper/TypeMapper.xml new file mode 100644 index 0000000..b3279c5 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/resources/mapper/TypeMapper.xml @@ -0,0 +1,8 @@ + + + + + + From b7e8563b1066c5ad1e10212f43f5546dbd3acac6 Mon Sep 17 00:00:00 2001 From: ASUS <1621302159@qq.com> Date: Mon, 18 Dec 2023 21:28:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bwie/common/pojo/DTO/DTOGoods.java | 49 +++++++++++++++++++ .../java/com/bwie/common/pojo/Facility.java | 33 +++++++++++++ .../java/com/bwie/common/pojo/VO/VOGoods.java | 28 +++++++++++ .../bwie/list/controller/GoodsController.java | 39 +++++++++++++++ .../bwie/list/controller/ShopController.java | 36 ++++++++++++-- .../bwie/list/controller/TypeController.java | 18 ++++++- .../com/bwie/list/mapper/GoodsMapper.java | 12 +++++ .../com/bwie/list/service/GoodsService.java | 8 +++ .../list/service/impl/GoodsServiceImpl.java | 31 ++++++++++++ .../src/main/resources/mapper/GoodsMapper.xml | 42 ++++++++++++++++ 10 files changed, 292 insertions(+), 4 deletions(-) create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/Facility.java create mode 100644 bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java create mode 100644 bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java create mode 100644 bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java new file mode 100644 index 0000000..2603115 --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java @@ -0,0 +1,49 @@ +package com.bwie.common.pojo.DTO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class DTOGoods { + + //商品设备中间id + private Integer goodsId; + + //商品id + private Integer shopId; + //商品名称 + private String shopName; + //商品价格 + private double shopPrice; + + //商品类型id + private Integer typeId; + //商品类型名称 + private String typeName; + + //图片 + private List pictureUrl; + + //设备id + private Integer facilityId; + //设备类型 + private String facilityType; + //设备地址 + private String facilitySite; + + //库存 + private Integer goodsNum; + //上下架(逻辑字段: 0上架, 1下架) + private Integer goodsIsDelete; + + + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Facility.java b/bwie-common/src/main/java/com/bwie/common/pojo/Facility.java new file mode 100644 index 0000000..4d9fa8e --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Facility.java @@ -0,0 +1,33 @@ +package com.bwie.common.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class Facility { + + //设备编号 + private Integer facilityId; + //设备类型 + private String facilityType; + //设备地址 + private String facilitySite; + //补货员工 + private Integer replenishmentUserId; + //维修员工 + private Integer maintainUserId; + //设备状态 + private Integer facilityStatic; + //删除状态 + private Integer delId; + + + + + +} diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java new file mode 100644 index 0000000..78e130b --- /dev/null +++ b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java @@ -0,0 +1,28 @@ +package com.bwie.common.pojo.VO; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ToString +public class VOGoods { + + //商品id + private Integer shopId; + //设备id + private Integer facilityId; + //库存 + private Integer goodsNum; + //上下架(逻辑字段: 0上架, 1下架) + private Integer goodsIsDelete; + + //分页 + private Integer pageNum=1; + private Integer pageSize=3; + + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java new file mode 100644 index 0000000..873f29b --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java @@ -0,0 +1,39 @@ +package com.bwie.list.controller; + +import com.alibaba.fastjson.JSONObject; +import com.bwie.common.pojo.VO.VOGoods; +import com.bwie.common.result.Result; +import com.bwie.list.service.GoodsService; +import lombok.extern.log4j.Log4j2; +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.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +@Log4j2 +public class GoodsController { + @Autowired + private GoodsService goodsService; + @Autowired + private HttpServletRequest request; + + @PostMapping("/goodsList") + public Result goodsList(@RequestBody VOGoods voGoods){ + log.info("功能名称:[查询商品设备表],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),voGoods); + + Result result = goodsService.goodsList(voGoods); + + log.info("功能名称:[查询商品设备表],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + + return result; + } + + + + +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java index 0434881..1cbf17d 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java @@ -1,5 +1,6 @@ package com.bwie.list.controller; +import com.alibaba.fastjson.JSONObject; import com.bwie.common.pojo.VO.VOShop; import com.bwie.common.result.Result; import com.bwie.list.service.ShopService; @@ -8,27 +9,56 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; + @RestController @Log4j2 public class ShopController { @Autowired private ShopService shopService; + @Autowired + private HttpServletRequest request; //展示商品列表 @PostMapping("/shopList") public Result shopList(@RequestBody VOShop voShop){ - return shopService.shopList(voShop); + + log.info("功能名称:[展示商品列表],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),voShop); + + Result result = shopService.shopList(voShop); + + log.info("功能名称:[展示商品列表],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + + return result; } //上传图片 @PostMapping("/upImg") public Result upImg(@RequestParam("file")MultipartFile myFile){ - return shopService.upImg(myFile); + + log.info("功能名称:[上传图片],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),myFile); + + Result result = shopService.upImg(myFile); + + log.info("功能名称:[上传图片],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + return result; } //添加商品 @PostMapping("/addShop") public Result addShop(@RequestBody VOShop shop){ - return shopService.addShop(shop); + + log.info("功能名称:[新增商品],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),shop); + + Result result = shopService.addShop(shop); + + log.info("功能名称:[新增商品],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + return result; } } diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java index 4359e53..703398b 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/TypeController.java @@ -1,20 +1,36 @@ package com.bwie.list.controller; +import com.alibaba.fastjson.JSONObject; import com.bwie.common.result.Result; import com.bwie.list.service.TypeService; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; + @RestController +@Log4j2 public class TypeController { @Autowired private TypeService typeService; + @Autowired + private HttpServletRequest request; // 根据商品类型查询商品的商品类型菜单栏 @GetMapping("/findType") public Result findType(){ - return typeService.findType(); + + log.info("功能名称:[类型菜单栏],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),""); + + Result result = typeService.findType(); + + log.info("功能名称:[类型菜单栏],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + + return result; } } diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java new file mode 100644 index 0000000..573ab59 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java @@ -0,0 +1,12 @@ +package com.bwie.list.mapper; + +import com.bwie.common.pojo.DTO.DTOGoods; +import com.bwie.common.pojo.VO.VOGoods; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface GoodsMapper { + List goodsList(VOGoods voGoods); +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java new file mode 100644 index 0000000..0c2a40b --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java @@ -0,0 +1,8 @@ +package com.bwie.list.service; + +import com.bwie.common.pojo.VO.VOGoods; +import com.bwie.common.result.Result; + +public interface GoodsService { + Result goodsList(VOGoods voGoods); +} diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java new file mode 100644 index 0000000..6c79eba --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java @@ -0,0 +1,31 @@ +package com.bwie.list.service.impl; + +import com.bwie.common.pojo.DTO.DTOGoods; +import com.bwie.common.pojo.VO.VOGoods; +import com.bwie.common.result.Result; +import com.bwie.list.mapper.GoodsMapper; +import com.bwie.list.service.GoodsService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class GoodsServiceImpl implements GoodsService { + @Autowired + private GoodsMapper goodsMapper; + + @Override + public Result goodsList(VOGoods voGoods) { + + PageHelper.startPage(voGoods.getPageNum(), voGoods.getPageSize()); + + List dtoGoodsList = goodsMapper.goodsList(voGoods); + + PageInfo info = new PageInfo<>(dtoGoodsList); + + return Result.success(info,"商品设备中间表"); + } +} diff --git a/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml b/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml new file mode 100644 index 0000000..b7210b4 --- /dev/null +++ b/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 0ef66c37fecaefae0455b3d74a29ed5442854c73 Mon Sep 17 00:00:00 2001 From: rxh <1344502479@qq.com> Date: Tue, 19 Dec 2023 14:18:13 +0800 Subject: [PATCH 5/8] Merge pull request 'blue' (#1) from blue into master Reviewed-on: https://gitea.qinmian.online/FiveTeam/ShopManage/pulls/1 --- .../src/main/java/com/bwie/list/controller/ShopController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java index 0434881..39a65db 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/ShopController.java @@ -23,6 +23,7 @@ public class ShopController { //上传图片 @PostMapping("/upImg") public Result upImg(@RequestParam("file")MultipartFile myFile){ + System.out.println(); return shopService.upImg(myFile); } //添加商品 From 6894770e6f0b8c9c0813d9ab140badab651acb33 Mon Sep 17 00:00:00 2001 From: ASUS <1621302159@qq.com> Date: Tue, 19 Dec 2023 16:20:42 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9shop=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bwie-common/src/main/java/com/bwie/common/pojo/Shop.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java index 4fec77d..a0b3de2 100644 --- a/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java @@ -14,9 +14,9 @@ public class Shop { //商品id private Integer shopId; //商品名称 - private Integer shopName; + private String shopName; //商品价格 - private Integer shopPrice; + private double shopPrice; //商品类型id private Integer typeId; From 7757177af632824fa6b2a515d6af27f94e49b20c Mon Sep 17 00:00:00 2001 From: ASUS <1621302159@qq.com> Date: Tue, 19 Dec 2023 16:25:05 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=9E=B6+=E8=BF=9B?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 9 ++++ .../java/com/bwie/common/pojo/VO/VOGoods.java | 2 + .../bwie/list/controller/GoodsController.java | 23 ++++++++ .../com/bwie/list/mapper/GoodsMapper.java | 14 +++++ .../com/bwie/list/service/GoodsService.java | 6 +++ .../list/service/impl/GoodsServiceImpl.java | 54 +++++++++++++++++++ .../src/main/resources/mapper/GoodsMapper.xml | 26 ++++++++- 7 files changed, 132 insertions(+), 2 deletions(-) diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 9394f4d..68f72b5 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,8 +1,17 @@ \ No newline at end of file diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java index 78e130b..341af18 100644 --- a/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java +++ b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java @@ -11,6 +11,8 @@ import lombok.ToString; @ToString public class VOGoods { + //商品设备中间id + private Integer goodsId; //商品id private Integer shopId; //设备id diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java index 873f29b..5c84611 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/controller/GoodsController.java @@ -33,7 +33,30 @@ public class GoodsController { return result; } + @PostMapping("/topShop") + public Result topShop(@RequestBody VOGoods voGoods){ + log.info("功能名称:[上架],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),voGoods); + Result result = goodsService.topShop(voGoods); + log.info("功能名称:[上架],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + return result; + } + @PostMapping("/bottomShop") + public Result bottomShop(@RequestBody VOGoods voGoods){ + log.info("功能名称:[下架],请求URI:{},请求方式:{},请求参数:{}", + request.getRequestURI(),request.getMethod(),voGoods); + Result result = goodsService.bottomShop(voGoods); + log.info("功能名称:[下架],请求URI:{},请求方式:{},响应结果:{}", + request.getRequestURI(),request.getMethod(), JSONObject.toJSONString(result)); + return result; + } + + @PostMapping("/addGoodsNum") + public Result addGoodsNum(@RequestBody VOGoods voGoods){ + return goodsService.addGoodsNum(voGoods); + } } diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java index 573ab59..829da46 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/mapper/GoodsMapper.java @@ -1,12 +1,26 @@ package com.bwie.list.mapper; import com.bwie.common.pojo.DTO.DTOGoods; +import com.bwie.common.pojo.Goods; import com.bwie.common.pojo.VO.VOGoods; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface GoodsMapper { List goodsList(VOGoods voGoods); + + Goods findShopId(Integer shopId, Integer facilityId); + + Integer addGoods(VOGoods voGoods); + + Integer changeGoodsState(@Param("goodsId") Integer goodsId); + + Integer updateGoodsState(@Param("goodsId") Integer goodsId); + + + Integer changeGoodsNum(VOGoods voGoods); + } diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java index 0c2a40b..a3953e7 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/GoodsService.java @@ -5,4 +5,10 @@ import com.bwie.common.result.Result; public interface GoodsService { Result goodsList(VOGoods voGoods); + + Result topShop(VOGoods voGoods); + + Result bottomShop(VOGoods voGoods); + + Result addGoodsNum(VOGoods voGoods); } diff --git a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java index 6c79eba..dc24afa 100644 --- a/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java +++ b/bwie-models/bwie-shopList/src/main/java/com/bwie/list/service/impl/GoodsServiceImpl.java @@ -1,6 +1,7 @@ package com.bwie.list.service.impl; import com.bwie.common.pojo.DTO.DTOGoods; +import com.bwie.common.pojo.Goods; import com.bwie.common.pojo.VO.VOGoods; import com.bwie.common.result.Result; import com.bwie.list.mapper.GoodsMapper; @@ -28,4 +29,57 @@ public class GoodsServiceImpl implements GoodsService { return Result.success(info,"商品设备中间表"); } + + @Override + public Result topShop(VOGoods voGoods) { + + Goods goods = goodsMapper.findShopId(voGoods.getShopId(),voGoods.getFacilityId()); + if (goods==null){ + Integer i = goodsMapper.addGoods(voGoods); + if (i>0){ + return Result.success(voGoods,"上架成功"); + } + } else { + if (goods.getGoodsIsDelete() == 0){ + Integer i = goodsMapper.changeGoodsState(goods.getGoodsId()); + if (i>0){ + return Result.success(voGoods,"上架成功"); + } + } + } + + return Result.error("商品已上架不能重复上架哦~~"); + } + + @Override + public Result bottomShop(VOGoods voGoods) { + Goods goods = goodsMapper.findShopId(voGoods.getShopId(),voGoods.getFacilityId()); + if (goods==null){ + + return Result.error("商品还未上架"); + + }else { + + if (goods.getGoodsIsDelete()==1){ + Integer i = goodsMapper.updateGoodsState(goods.getGoodsId()); + if (i>0){ + return Result.success(voGoods,"下架成功"); + }else { + return Result.error("下架失败"); + } + } + + } + + return Result.error("商品已经下架"); + } + + @Override + public Result addGoodsNum(VOGoods voGoods) { + Integer i = goodsMapper.changeGoodsNum(voGoods); + if (i>0){ + return Result.success(voGoods,"进货成功"); + } + return Result.error("进货失败"); + } } diff --git a/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml b/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml index b7210b4..f3d0712 100644 --- a/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml +++ b/bwie-models/bwie-shopList/src/main/resources/mapper/GoodsMapper.xml @@ -5,7 +5,7 @@ 通过namespace可以简历mapper.xml和接口之间的关系(名字不重要，位置不重要) --> - + @@ -23,6 +23,23 @@ + + + INSERT INTO `shop_manage`.`t_goods` (`shop_id`, `facility_id`, `goods_num`, `goods_isdelete`) + VALUES (#{shopId}, #{facilityId}, NULL, 1) + + + + UPDATE `shop_manage`.`t_goods` SET `goods_isdelete` = 1 WHERE `goods_id` = #{goodsId} + + + + UPDATE `shop_manage`.`t_goods` SET `goods_isdelete` = 0 WHERE `goods_id` = #{goodsId} + + + + UPDATE `shop_manage`.`t_goods` SET `goods_num` = (`goods_num` + #{goodsNum}) WHERE `goods_id` = #{goodsId} + + + \ No newline at end of file From f6b4b2842f909323606b739fceb21200d602f2bb Mon Sep 17 00:00:00 2001 From: syl <1621302159@qq.com> Date: Tue, 19 Dec 2023 16:28:25 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20bwie-common/src/main/j?= =?UTF-8?q?ava/com/bwie/common/pojo/Shop.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bwie-common/src/main/java/com/bwie/common/pojo/Shop.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java index 4fec77d..a0b3de2 100644 --- a/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java +++ b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java @@ -14,9 +14,9 @@ public class Shop { //商品id private Integer shopId; //商品名称 - private Integer shopName; + private String shopName; //商品价格 - private Integer shopPrice; + private double shopPrice; //商品类型id private Integer typeId;