From 19952e7a68688b25ce29bfbc2ef2e41361621f90 Mon Sep 17 00:00:00 2001 From: ky <592468495@qq.com> Date: Wed, 6 May 2020 11:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gszc/entity/PcUser.java | 3 ++ .../java/com/gszc/service/MiniAppService.java | 4 +-- .../gszc/service/impl/CustomServiceImpl.java | 11 ++++--- .../gszc/service/impl/InvoiceServiceImpl.java | 5 +-- src/main/java/com/gszc/util/Uuid8Utils.java | 31 +++++++++++++++++++ 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/gszc/util/Uuid8Utils.java diff --git a/src/main/java/com/gszc/entity/PcUser.java b/src/main/java/com/gszc/entity/PcUser.java index edbe932..41f1180 100644 --- a/src/main/java/com/gszc/entity/PcUser.java +++ b/src/main/java/com/gszc/entity/PcUser.java @@ -52,5 +52,8 @@ user-业务员 */ private String type; + @ApiModelProperty(value = "工号") + private String workNumber; + } diff --git a/src/main/java/com/gszc/service/MiniAppService.java b/src/main/java/com/gszc/service/MiniAppService.java index f31498e..63e47fc 100644 --- a/src/main/java/com/gszc/service/MiniAppService.java +++ b/src/main/java/com/gszc/service/MiniAppService.java @@ -41,7 +41,7 @@ public class MiniAppService { // Example.Criteria userExampleCriteria = userExample.createCriteria(); // userExampleCriteria.andEqualTo("openId",openId); Map columnMap = new HashMap<>(); - columnMap.put("openId", openId); + columnMap.put("open_id", openId); List miniUsers = miniUserMapper.selectByMap(columnMap); MiniUser miniUser = miniUsers.get(0); miniUser.setSex(userInfo.getGender()); @@ -88,7 +88,7 @@ public class MiniAppService { // // OceanUser oceanUser = oceanUserMapper.selectOneByExample(userExample); Map columnMap = new HashMap<>(); - columnMap.put("openId", openid); + columnMap.put("open_id", openid); List miniUsers = miniUserMapper.selectByMap(columnMap); MiniUser miniUser = miniUsers.get(0); diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java index b0e8f00..6b76c76 100644 --- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.gszc.entity.*; import com.gszc.mapper.*; import com.gszc.service.ICustomService; +import com.gszc.util.Uuid8Utils; import org.apache.ibatis.session.RowBounds; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,19 +56,19 @@ public class CustomServiceImpl extends ServiceImpl impleme InvoiceHeaderMapper invoiceHeaderMapper; public void customRegister(Custom custom,List customSupports){ - String uuid = UUID.randomUUID().toString(); - custom.setId(uuid); + String id = Uuid8Utils.generateShortUUID(); + custom.setId(id); custom.setCreateDate( new Date()); custom.setModifyDate( new Date()); custom.setStatusCode("todo"); customMapper.insert(custom); if(customSupports.size()>0){ for(CustomSupport customSupport:customSupports){ - String id = UUID.randomUUID().toString(); - customSupport.setId(id); + String supportid = UUID.randomUUID().toString(); + customSupport.setId(supportid); customSupport.setCreateDate( new Date()); customSupport.setModifyDate( new Date()); - customSupport.setCustomId(uuid); + customSupport.setCustomId(id); customSupportMapper.insert(customSupport); } } diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java index 78ca018..45af308 100644 --- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java +++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java @@ -11,6 +11,7 @@ import com.gszc.mapper.InvoiceHeaderMapper; import com.gszc.mapper.InvoiceMapper; import com.gszc.service.IInvoiceService; import com.gszc.util.KdniaoTrackQueryAPI; +import com.gszc.util.Uuid8Utils; import org.apache.ibatis.session.RowBounds; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -44,8 +45,8 @@ public class InvoiceServiceImpl extends ServiceImpl impl CustomServiceImpl customService; public void addInvoice(Invoice invoice){ - String uuid = UUID.randomUUID().toString(); - invoice.setId(uuid); + String id = Uuid8Utils.generateShortUUID(); + invoice.setId(id); invoice.setCreateDate(new Date()); invoice.setModifyDate(new Date()); invoiceMapper.insert(invoice); diff --git a/src/main/java/com/gszc/util/Uuid8Utils.java b/src/main/java/com/gszc/util/Uuid8Utils.java new file mode 100644 index 0000000..ab0639a --- /dev/null +++ b/src/main/java/com/gszc/util/Uuid8Utils.java @@ -0,0 +1,31 @@ +package com.gszc.util; + +import java.util.UUID; + +public class Uuid8Utils { + + + public static String[] chars = new String[]{"a", "b", "c", "d", "e", "f", + "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", + "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", + "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", + "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", + "W", "X", "Y", "Z"}; + + public static String generateShortUUID() { + StringBuffer shortBuffer = new StringBuffer(); + String uuid = UUID.randomUUID().toString().replace("-", ""); + for (int i = 0; i < 8; i++) { + String str = uuid.substring(i * 4, i * 4 + 4); + int x = Integer.parseInt(str, 16); + shortBuffer.append(chars[x % 0x3E]); + } + return shortBuffer.toString(); + + } + + public static void main(String[] args) { + System.out.println(generateShortUUID() + ); + } +}