From 2b3bfda7e33b48e109e8386a3ee421fab05acb31 Mon Sep 17 00:00:00 2001 From: xinsin <2890826955@qq.com> Date: Thu, 8 Jun 2023 20:20:06 +0800 Subject: [PATCH] 123 --- src/main/java/top/xinsin/pojo/Order.java | 188 +++++++++++++++++- .../java/top/xinsin/service/OrderService.java | 2 +- .../top/xinsin/service/WebSocketService.java | 2 +- .../java/top/xinsin/util/ExcelParserUtil.java | 2 +- src/main/resources/application.yml | 11 +- src/test/java/top/xinsin/MainTest.java | 2 +- 6 files changed, 197 insertions(+), 10 deletions(-) diff --git a/src/main/java/top/xinsin/pojo/Order.java b/src/main/java/top/xinsin/pojo/Order.java index 90b1e72..c958d39 100644 --- a/src/main/java/top/xinsin/pojo/Order.java +++ b/src/main/java/top/xinsin/pojo/Order.java @@ -1,6 +1,7 @@ package top.xinsin.pojo; import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -19,8 +20,8 @@ import java.util.Date; * Created On 2023/4/24 21:10 * @version 1.0 */ -@Data @TableName("shop_order") +@ExcelIgnoreUnannotated public class Order implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -94,6 +95,191 @@ public class Order implements Serializable { @ExcelProperty({"sku"}) @TableField("sku") private String sku; + @ExcelIgnore @TableField(exist = false) private String storeName; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Date getOrderTime() { + return orderTime; + } + + public void setOrderTime(Date orderTime) { + this.orderTime = orderTime; + } + + public String getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + + public String getWangNo() { + return wangNo; + } + + public void setWangNo(String wangNo) { + this.wangNo = wangNo; + } + + public String getWechatNo() { + return wechatNo; + } + + public void setWechatNo(String wechatNo) { + this.wechatNo = wechatNo; + } + + public String getAlipayNo() { + return alipayNo; + } + + public void setAlipayNo(String alipayNo) { + this.alipayNo = alipayNo; + } + + public Double getPayAmt() { + return payAmt; + } + + public void setPayAmt(Double payAmt) { + this.payAmt = payAmt; + } + + public Integer getStoreId() { + return storeId; + } + + public void setStoreId(Integer storeId) { + this.storeId = storeId; + } + + public Double getCommission() { + return commission; + } + + public void setCommission(Double commission) { + this.commission = commission; + } + + public String getAlipayName() { + return alipayName; + } + + public void setAlipayName(String alipayName) { + this.alipayName = alipayName; + } + + public String getRpName() { + return rpName; + } + + public void setRpName(String rpName) { + this.rpName = rpName; + } + + public String getRpWechatName() { + return rpWechatName; + } + + public void setRpWechatName(String rpWechatName) { + this.rpWechatName = rpWechatName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Integer getFlag() { + return flag; + } + + public void setFlag(Integer flag) { + this.flag = flag; + } + + public String getFlagRemark() { + return flagRemark; + } + + public void setFlagRemark(String flagRemark) { + this.flagRemark = flagRemark; + } + + public Date getPayTime() { + return payTime; + } + + public void setPayTime(Date payTime) { + this.payTime = payTime; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Integer getShopId() { + return shopId; + } + + public void setShopId(Integer shopId) { + this.shopId = shopId; + } + + public String getSku() { + return sku; + } + + public void setSku(String sku) { + this.sku = sku; + } + + public String getStoreName() { + return storeName; + } + + public void setStoreName(String storeName) { + this.storeName = storeName; + } } diff --git a/src/main/java/top/xinsin/service/OrderService.java b/src/main/java/top/xinsin/service/OrderService.java index bc1156e..c9d7488 100644 --- a/src/main/java/top/xinsin/service/OrderService.java +++ b/src/main/java/top/xinsin/service/OrderService.java @@ -171,7 +171,7 @@ public class OrderService extends ServiceImpl implements Orde @SneakyThrows public void uploadBatch(MultipartFile file) { try { - EasyExcel.read(file.getInputStream(), Order.class, new ExcelParserUtil(this)).sheet().doRead(); + EasyExcel.read(file.getInputStream(), Order.class, new ExcelParserUtil(this)).headRowNumber(2).sheet().doRead(); } catch (Throwable var3) { throw var3; } diff --git a/src/main/java/top/xinsin/service/WebSocketService.java b/src/main/java/top/xinsin/service/WebSocketService.java index 12d19d2..55f6c45 100644 --- a/src/main/java/top/xinsin/service/WebSocketService.java +++ b/src/main/java/top/xinsin/service/WebSocketService.java @@ -155,7 +155,7 @@ public class WebSocketService { redisTemplate.delete(e); } }); - log.info("{}",keys); +// log.info("{}",keys); return expireUser; } } diff --git a/src/main/java/top/xinsin/util/ExcelParserUtil.java b/src/main/java/top/xinsin/util/ExcelParserUtil.java index 961814c..d5a5480 100644 --- a/src/main/java/top/xinsin/util/ExcelParserUtil.java +++ b/src/main/java/top/xinsin/util/ExcelParserUtil.java @@ -49,7 +49,7 @@ public class ExcelParserUtil extends AnalysisEventListener { @Override public void invoke(Order data, AnalysisContext analysisContext) { - log.info(" ==> 解析一条数据: {}", JSONObject.toJSONString(data)); + log.info(" ==> 解析一条数据: {}", data); list.add(data); if (list.size() > MAX_BATCH_COUNT) { // 保存数据 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 84d30f6..2e1da3b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,11 +2,12 @@ server: port: 8001 spring: datasource: -# username: commerce -# password: Jix656dzD6St4YCn_ - username: commerce_system - password: Jix656dzD6St4YCn - url: jdbc:mysql://wzpmc.cn:3306/commerce_system?serverTimezone=UTC-8 + username: commerce + password: Jix656dzD6St4YCn_ +# username: commerce_system +# password: Jix656dzD6St4YCn + url: jdbc:mysql://localhost:3306/commerce_system?serverTimezone=UTC-8 +# url: jdbc:mysql://wzpmc.cn:3306/commerce_system?serverTimezone=UTC-8 driver-class-name: com.mysql.cj.jdbc.Driver # druid配置 type: com.alibaba.druid.pool.DruidDataSource diff --git a/src/test/java/top/xinsin/MainTest.java b/src/test/java/top/xinsin/MainTest.java index 8e5dd41..82dd4c2 100644 --- a/src/test/java/top/xinsin/MainTest.java +++ b/src/test/java/top/xinsin/MainTest.java @@ -31,7 +31,7 @@ public class MainTest { @Test @SneakyThrows public void test01(){ - System.out.println(new BCryptPasswordEncoder().encode(DigestUtils.md5Hex("12345678"))); + System.out.println(new BCryptPasswordEncoder().encode(DigestUtils.md5Hex("xinsinxinsin"))); System.out.println(DigestUtils.md5Hex("12345678")); System.out.println(DigestUtils.md5Hex("xinsin")); System.out.println(new BCryptPasswordEncoder().encode("996c24dbd061aeacb928fe4892d7a70b"));