diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 0c0325b9..f375e336 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • -八月 31, 2024 22:16:34 +九月 08, 2024 22:36:27
    • @@ -84,7 +84,7 @@

    passTest

    -

    22:16:34 下午 / 0.016 secs

    +

    22:36:27 下午 / 0.015 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -08.31.2024 22:16:34 -08.31.2024 22:16:35 -0.016 secs +09.08.2024 22:36:27 +09.08.2024 22:36:27 +0.015 secs
    @@ -104,7 +104,7 @@ Pass - 22:16:35 + 22:36:27 Test passed @@ -128,13 +128,13 @@

    Started

    -

    八月 31, 2024 22:16:34

    +

    九月 08, 2024 22:36:27

    Ended

    -

    八月 31, 2024 22:16:35

    +

    九月 08, 2024 22:36:27

    diff --git a/hiver-core/src/main/java/cc/hiver/core/common/utils/PinYinUtils.java b/hiver-core/src/main/java/cc/hiver/core/common/utils/PinYinUtils.java index ff6a2fea..2a84cd16 100644 --- a/hiver-core/src/main/java/cc/hiver/core/common/utils/PinYinUtils.java +++ b/hiver-core/src/main/java/cc/hiver/core/common/utils/PinYinUtils.java @@ -4,7 +4,6 @@ import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; -import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; public class PinYinUtils { /** @@ -13,27 +12,27 @@ public class PinYinUtils { * @return 姹夎鎷奸煶棣栧瓧姣 */ public static String getFirstSpell(String chinese) { - if(chinese == null || "".equals(chinese)) { + if(chinese == null || chinese.isEmpty()) { return ""; } - StringBuffer pybf = new StringBuffer(); - char[] arr = chinese.toCharArray(); - HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); + final StringBuffer pybf = new StringBuffer(); + final char[] arr = chinese.toCharArray(); + final HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat(); defaultFormat.setCaseType(HanyuPinyinCaseType.UPPERCASE); defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE); - for (int i = 0; i < arr.length; i++) { - if (arr[i] > 128) { - try { - String[] temp = PinyinHelper.toHanyuPinyinStringArray(arr[i]); - if (temp != null) { - pybf.append(temp[0].charAt(0)); - } + for (char c : arr) { + if (c > 128) { + try { + final String[] temp = PinyinHelper.toHanyuPinyinStringArray(c); + if (temp != null) { + pybf.append(temp[0].charAt(0)); + } } catch (Exception e) { - e.printStackTrace(); - } - } else { - pybf.append(arr[i]); - } + e.printStackTrace(); + } + } else { + pybf.append(c); + } } return pybf.toString().replaceAll("\\W", "").trim(); } diff --git a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java index bc91b199..76119521 100644 --- a/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java +++ b/hiver-core/src/main/java/cc/hiver/core/common/utils/SecurityUtil.java @@ -16,6 +16,8 @@ import cc.hiver.core.dao.*; import cc.hiver.core.dao.mapper.PermissionMapper; import cc.hiver.core.dao.mapper.UserRoleMapper; import cc.hiver.core.entity.*; +import cc.hiver.core.logisticsuser.entity.LogisticsUser; +import cc.hiver.core.logisticsuser.service.LogisticsUserService; import cc.hiver.core.service.mybatis.IUserRoleService; import cc.hiver.core.vo.PermissionDTO; import cc.hiver.core.vo.RoleDTO; @@ -83,6 +85,9 @@ public class SecurityUtil { @Autowired private LogiticsCompanyDao logiticsCompanyDao; + @Autowired + private LogisticsUserService logisticsUserService; + /** * -------------------ToB------------------------- */ @@ -124,7 +129,7 @@ public class SecurityUtil { } final LogiticsCompany logiticsCompany = logiticsCompanyDao.findByUsername(username); // 缂撳瓨 - redisTemplate.set(key, new Gson().toJson(logiticsCompany), 15L, TimeUnit.DAYS); + redisTemplate.set(key, new Gson().toJson(logiticsCompany), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); return logiticsCompany; } @@ -210,7 +215,18 @@ public class SecurityUtil { logiticsCompanyList = findCompanyByMobile(username); } if (logiticsCompanyList.isEmpty()) { - return null; + // 鐗╂祦鍏徃涓昏〃涓病鏈夋煡璇㈠埌淇℃伅锛屾煡璇㈢墿娴佸叕鍙稿憳宸ヤ俊鎭 + final LogisticsUser logisticsUser = logisticsUserService.findByMobile(username); + if(logisticsUser == null){ + return null; + }else{ + final Boolean isValid = new BCryptPasswordEncoder().matches(password, logisticsUser.getPassword()); + if (isValid) { + final LogiticsCompany logiticsCompany = logiticsCompanyDao.getById(logisticsUser.getCompanyId()); + logiticsCompanyList.add(logiticsCompany); + return logiticsCompanyList; + } + } } // // 鏍￠獙瀵嗙爜锛屼竴涓佹澘鏈夊涓簵閾虹殑鏃跺欙紝瀵嗙爜涓瀹氭槸涓鏍风殑锛屾墍浠ヨ繖閲屾牎楠屽叾涓竴涓氨琛 @@ -286,7 +302,7 @@ public class SecurityUtil { // 鏇存柊褰撳墠鐧诲綍浜虹殑瑙掕壊 final String key = "username::" + user.getUsername(); final Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd hh:mm:ss").create(); - redisTemplate.set(key, gson.toJson(user), 15L, TimeUnit.DAYS); + redisTemplate.set(key, gson.toJson(user), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); } else { // JWT 涓嶇紦瀛樻潈闄 閬垮厤JWT闀垮害杩囬暱 tokenUser = new TokenUser(user, false, null); @@ -336,10 +352,10 @@ public class SecurityUtil { public LogiticsCompany getCurrCompany() { final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - boolean authenticated = authentication.isAuthenticated(); - boolean aa = authentication instanceof AnonymousAuthenticationToken; - String name = authentication.getName(); - boolean bb = authentication == null; + final boolean authenticated = authentication.isAuthenticated(); + final boolean aa = authentication instanceof AnonymousAuthenticationToken; + final String name = authentication.getName(); + final boolean bb = authentication == null; if (authentication == null || !authentication.isAuthenticated() || authentication.getName() == null || authentication instanceof AnonymousAuthenticationToken) { throw new HiverException("鏈娴嬪埌鐧诲綍鐢ㄦ埛"); @@ -447,7 +463,7 @@ public class SecurityUtil { deparmentIds.clear(); deparmentIds.addAll(set); // 缂撳瓨 - redisTemplate.set(key, new Gson().toJson(deparmentIds), 15L, TimeUnit.DAYS); + redisTemplate.set(key, new Gson().toJson(deparmentIds), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); return deparmentIds; } @@ -498,7 +514,7 @@ public class SecurityUtil { } final Member member = memberDao.findByMobile(mobile); // 缂撳瓨 - redisTemplate.set(key, new Gson().toJson(member), 15L, TimeUnit.DAYS); + redisTemplate.set(key, new Gson().toJson(member), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); return member; } @@ -702,7 +718,7 @@ public class SecurityUtil { } final User user = userToDTO(userDao.findByUserNameAndType(username, type)); // 缂撳瓨 - redisTemplate.set(key, new Gson().toJson(user), 15L, TimeUnit.DAYS); + redisTemplate.set(key, new Gson().toJson(user), tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); return user; } @@ -710,8 +726,8 @@ public class SecurityUtil { final String shopIdKey = SecurityConstant.TOKEN_SHOP_ID + token + "shopId:"; final String regionKey = SecurityConstant.TOKEN_REGION + token + "region:"; // 缂撳瓨 - redisTemplate.set(shopIdKey, shopId, 15L, TimeUnit.DAYS); - redisTemplate.set(regionKey, region, 15L, TimeUnit.DAYS); + redisTemplate.set(shopIdKey, shopId, tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); + redisTemplate.set(regionKey, region, tokenProperties.getSaveLoginTime(), TimeUnit.DAYS); } public String getShopId() { diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/controller/LogisticsAddressBookController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/controller/LogisticsAddressBookController.java similarity index 72% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/controller/LogisticsAddressBookController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/controller/LogisticsAddressBookController.java index dab7001d..a161e7c1 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/controller/LogisticsAddressBookController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/controller/LogisticsAddressBookController.java @@ -1,21 +1,20 @@ -package cc.hiver.mall.logisticsaddressbook.controller; +package cc.hiver.core.logisticsaddressbook.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticsaddressbook.entity.LogisticsAddressBook; -import cc.hiver.mall.logisticsaddressbook.service.LogisticsAddressBookService; -import cc.hiver.mall.logisticsaddressbook.vo.LogisticsAddressBookQueryVo; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; -import cc.hiver.mall.logisticsorder.service.LogisticsOrderService; -import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.core.logisticsaddressbook.entity.LogisticsAddressBook; +import cc.hiver.core.logisticsaddressbook.service.LogisticsAddressBookService; +import cc.hiver.core.logisticsaddressbook.vo.LogisticsAddressBookQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; @Slf4j diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/entity/LogisticsAddressBook.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/entity/LogisticsAddressBook.java similarity index 95% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/entity/LogisticsAddressBook.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/entity/LogisticsAddressBook.java index 7ff3f760..8a298f42 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/entity/LogisticsAddressBook.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/entity/LogisticsAddressBook.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsaddressbook.entity; +package cc.hiver.core.logisticsaddressbook.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/mapper/LogisticsAddressBookMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/mapper/LogisticsAddressBookMapper.java similarity index 57% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/mapper/LogisticsAddressBookMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/mapper/LogisticsAddressBookMapper.java index ec24bd94..42e0fa02 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/mapper/LogisticsAddressBookMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/mapper/LogisticsAddressBookMapper.java @@ -1,6 +1,6 @@ -package cc.hiver.mall.logisticsaddressbook.mapper; +package cc.hiver.core.logisticsaddressbook.mapper; -import cc.hiver.mall.logisticsaddressbook.entity.LogisticsAddressBook; +import cc.hiver.core.logisticsaddressbook.entity.LogisticsAddressBook; import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface LogisticsAddressBookMapper extends BaseMapper { diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/service/LogisticsAddressBookService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/LogisticsAddressBookService.java similarity index 57% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/service/LogisticsAddressBookService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/LogisticsAddressBookService.java index c82c7be4..e7dbc353 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/service/LogisticsAddressBookService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/LogisticsAddressBookService.java @@ -1,9 +1,8 @@ -package cc.hiver.mall.logisticsaddressbook.service; +package cc.hiver.core.logisticsaddressbook.service; -import cc.hiver.mall.logisticsaddressbook.entity.LogisticsAddressBook; -import cc.hiver.mall.logisticsaddressbook.vo.LogisticsAddressBookQueryVo; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; -import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.core.logisticsaddressbook.entity.LogisticsAddressBook; +import cc.hiver.core.logisticsaddressbook.vo.LogisticsAddressBookQueryVo; +import cc.hiver.core.logisticsorder.entity.LogisticsOrder; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java similarity index 94% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java index dc5118ad..5df819b2 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java @@ -1,10 +1,10 @@ -package cc.hiver.mall.logisticsaddressbook.service.impl; +package cc.hiver.core.logisticsaddressbook.service.impl; -import cc.hiver.mall.logisticsaddressbook.entity.LogisticsAddressBook; -import cc.hiver.mall.logisticsaddressbook.mapper.LogisticsAddressBookMapper; -import cc.hiver.mall.logisticsaddressbook.service.LogisticsAddressBookService; -import cc.hiver.mall.logisticsaddressbook.vo.LogisticsAddressBookQueryVo; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; +import cc.hiver.core.logisticsaddressbook.entity.LogisticsAddressBook; +import cc.hiver.core.logisticsaddressbook.mapper.LogisticsAddressBookMapper; +import cc.hiver.core.logisticsaddressbook.service.LogisticsAddressBookService; +import cc.hiver.core.logisticsaddressbook.vo.LogisticsAddressBookQueryVo; +import cc.hiver.core.logisticsorder.entity.LogisticsOrder; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java similarity index 91% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java index f4aca3cd..e63ae0f2 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/vo/LogisticsAddressBookQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsaddressbook.vo; +package cc.hiver.core.logisticsaddressbook.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/controller/LogisticsCompanyRouteController.java b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/controller/LogisticsCompanyRouteController.java similarity index 94% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/controller/LogisticsCompanyRouteController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/controller/LogisticsCompanyRouteController.java index 21e364ae..8c4d49ab 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/controller/LogisticsCompanyRouteController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/controller/LogisticsCompanyRouteController.java @@ -1,10 +1,10 @@ -package cc.hiver.mall.logisticscompanyroute.controller; +package cc.hiver.core.logisticscompanyroute.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; -import cc.hiver.mall.logisticscompanyroute.service.LogisticsCompanyRouteService; -import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import cc.hiver.core.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.core.logisticscompanyroute.service.LogisticsCompanyRouteService; +import cc.hiver.core.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/entity/LogisticsCompanyRoute.java b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/entity/LogisticsCompanyRoute.java similarity index 94% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/entity/LogisticsCompanyRoute.java rename to hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/entity/LogisticsCompanyRoute.java index eeaa3f4b..06865a96 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/entity/LogisticsCompanyRoute.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/entity/LogisticsCompanyRoute.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticscompanyroute.entity; +package cc.hiver.core.logisticscompanyroute.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java similarity index 83% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java index a56bbb04..7380a7cb 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/mapper/LogisticsCompanyRouteMapper.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticscompanyroute.mapper; +package cc.hiver.core.logisticscompanyroute.mapper; -import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; -import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import cc.hiver.core.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.core.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/LogisticsCompanyRouteService.java b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/service/LogisticsCompanyRouteService.java similarity index 79% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/LogisticsCompanyRouteService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/service/LogisticsCompanyRouteService.java index 26756fc9..cfc6d4ca 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/LogisticsCompanyRouteService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/service/LogisticsCompanyRouteService.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticscompanyroute.service; +package cc.hiver.core.logisticscompanyroute.service; -import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; -import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import cc.hiver.core.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.core.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java similarity index 82% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java index 87fcba19..23fdcf06 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/service/impl/LogisticsCompanyRouteServiceImpl.java @@ -1,9 +1,9 @@ -package cc.hiver.mall.logisticscompanyroute.service.impl; +package cc.hiver.core.logisticscompanyroute.service.impl; -import cc.hiver.mall.logisticscompanyroute.entity.LogisticsCompanyRoute; -import cc.hiver.mall.logisticscompanyroute.mapper.LogisticsCompanyRouteMapper; -import cc.hiver.mall.logisticscompanyroute.service.LogisticsCompanyRouteService; -import cc.hiver.mall.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; +import cc.hiver.core.logisticscompanyroute.entity.LogisticsCompanyRoute; +import cc.hiver.core.logisticscompanyroute.mapper.LogisticsCompanyRouteMapper; +import cc.hiver.core.logisticscompanyroute.service.LogisticsCompanyRouteService; +import cc.hiver.core.logisticscompanyroute.vo.LogisticsCompanyRouteQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java similarity index 93% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java index 287e2da2..b0ca69b9 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticscompanyroute/vo/LogisticsCompanyRouteQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticscompanyroute.vo; +package cc.hiver.core.logisticscompanyroute.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/controller/LogisticsEntruckingLogController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/controller/LogisticsEntruckingLogController.java similarity index 75% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/controller/LogisticsEntruckingLogController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/controller/LogisticsEntruckingLogController.java index c4c63f95..748f0330 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/controller/LogisticsEntruckingLogController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/controller/LogisticsEntruckingLogController.java @@ -1,10 +1,10 @@ -package cc.hiver.mall.logisticsentruckinglog.controller; +package cc.hiver.core.logisticsentruckinglog.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticsentruckinglog.entity.LogisticsEntruckingLog; -import cc.hiver.mall.logisticsentruckinglog.service.LogisticsEntruckingLogService; -import cc.hiver.mall.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; +import cc.hiver.core.logisticsentruckinglog.entity.LogisticsEntruckingLog; +import cc.hiver.core.logisticsentruckinglog.service.LogisticsEntruckingLogService; +import cc.hiver.core.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 鐗╂祦瑁呰溅璁板綍鎺у埗鍣 * @@ -100,4 +102,26 @@ public class LogisticsEntruckingLogController { final IPage result = logisticsEntruckingLogService.getLogisticsEntruckingLogPageList(logisticsEntruckingLogQueryVo); return new ResultUtil>().setData(result); } + + + /** + * 鎵归噺鏂板瑁呰溅璁板綍 + * @author 鐜嬪瘜搴 + * @date 2024/9/8 + * @param logisticsEntruckingLogs + * @return Result + */ + @PostMapping(value = "/batchAddLogisticsEntruckingLog") + @ApiOperation("鎵归噺鏂板鐗╂祦瑁呰溅璁板綍") + public Result batchAddLogisticsEntruckingLog(@RequestBody List logisticsEntruckingLogs) { + // 涓涓溅涓澶╁彧鑳藉湪涓涓墿娴佸叕鍙歌涓娆¤溅锛岃繖閲屾牴鎹墿娴佸叕鍙竔d鍙婅溅鐗屽彿銆佹棩鏈熻繘琛屽垹闄わ紝鐒跺悗鎵归噺鏂板 + logisticsEntruckingLogService.deleteByCarNumberAndCompanyId(logisticsEntruckingLogs); + // 鎵归噺鏂板 + final boolean b = logisticsEntruckingLogService.saveBatch(logisticsEntruckingLogs); + if (b) { + return ResultUtil.success("淇濆瓨鎴愬姛锛"); + } else { + return ResultUtil.error("淇濆瓨澶辫触锛"); + } + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/entity/LogisticsEntruckingLog.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/entity/LogisticsEntruckingLog.java similarity index 96% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/entity/LogisticsEntruckingLog.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/entity/LogisticsEntruckingLog.java index 34d26de5..684fbe2f 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/entity/LogisticsEntruckingLog.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/entity/LogisticsEntruckingLog.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsentruckinglog.entity; +package cc.hiver.core.logisticsentruckinglog.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/mapper/LogisticsEntruckingLogMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/mapper/LogisticsEntruckingLogMapper.java similarity index 65% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/mapper/LogisticsEntruckingLogMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/mapper/LogisticsEntruckingLogMapper.java index 10e912b3..a907c7fe 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/mapper/LogisticsEntruckingLogMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/mapper/LogisticsEntruckingLogMapper.java @@ -1,12 +1,14 @@ -package cc.hiver.mall.logisticsentruckinglog.mapper; +package cc.hiver.core.logisticsentruckinglog.mapper; -import cc.hiver.mall.logisticsentruckinglog.entity.LogisticsEntruckingLog; -import cc.hiver.mall.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; +import cc.hiver.core.logisticsentruckinglog.entity.LogisticsEntruckingLog; +import cc.hiver.core.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface LogisticsEntruckingLogMapper extends BaseMapper { /** @@ -19,4 +21,6 @@ public interface LogisticsEntruckingLogMapper extends BaseMapper getLogisticsEntruckingLogPageList(Page page, @Param("queryParams") LogisticsEntruckingLogQueryVo logisticsEntruckingLogQueryVo); + + void deleteByCarNumberAndCompanyId(@Param("logisticsEntruckingLogs")List logisticsEntruckingLogs,@Param("nowDate") String nowDate,@Param("afterDay") String afterDay); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/service/LogisticsEntruckingLogService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/LogisticsEntruckingLogService.java similarity index 65% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/service/LogisticsEntruckingLogService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/LogisticsEntruckingLogService.java index 16d1bef1..01ba4d13 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/service/LogisticsEntruckingLogService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/LogisticsEntruckingLogService.java @@ -1,10 +1,12 @@ -package cc.hiver.mall.logisticsentruckinglog.service; +package cc.hiver.core.logisticsentruckinglog.service; -import cc.hiver.mall.logisticsentruckinglog.entity.LogisticsEntruckingLog; -import cc.hiver.mall.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; +import cc.hiver.core.logisticsentruckinglog.entity.LogisticsEntruckingLog; +import cc.hiver.core.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + public interface LogisticsEntruckingLogService extends IService { /** @@ -16,4 +18,6 @@ public interface LogisticsEntruckingLogService extends IService getLogisticsEntruckingLogPageList(LogisticsEntruckingLogQueryVo logisticsEntruckingLogQueryVo); + + void deleteByCarNumberAndCompanyId(List logisticsEntruckingLogs); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java similarity index 56% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java index 62eed4a0..367f5f20 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/service/impl/LogisticsEntruckingLogServiceImpl.java @@ -1,15 +1,19 @@ -package cc.hiver.mall.logisticsentruckinglog.service.impl; +package cc.hiver.core.logisticsentruckinglog.service.impl; -import cc.hiver.mall.logisticsentruckinglog.entity.LogisticsEntruckingLog; -import cc.hiver.mall.logisticsentruckinglog.mapper.LogisticsEntruckingLogMapper; -import cc.hiver.mall.logisticsentruckinglog.service.LogisticsEntruckingLogService; -import cc.hiver.mall.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; +import cc.hiver.core.logisticsentruckinglog.entity.LogisticsEntruckingLog; +import cc.hiver.core.logisticsentruckinglog.mapper.LogisticsEntruckingLogMapper; +import cc.hiver.core.logisticsentruckinglog.service.LogisticsEntruckingLogService; +import cc.hiver.core.logisticsentruckinglog.vo.LogisticsEntruckingLogQueryVo; +import cc.hiver.core.utils.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + @Service public class LogisticsEntruckingLogServiceImpl extends ServiceImpl implements LogisticsEntruckingLogService { @@ -28,4 +32,19 @@ public class LogisticsEntruckingLogServiceImpl extends ServiceImpl page = new Page<>(logisticsEntruckingLogQueryVo.getPageNum(), logisticsEntruckingLogQueryVo.getPageSize()); return logisticsEntruckingLogMapper.getLogisticsEntruckingLogPageList(page, logisticsEntruckingLogQueryVo); } + + /** + * 鎵归噺鍒犻櫎鐗╂祦瑁呰溅璁板綍 + * @author 鐜嬪瘜搴 + * @date 2024/9/8 + * @param logisticsEntruckingLogs + */ + @Override + public void deleteByCarNumberAndCompanyId(List logisticsEntruckingLogs) { + // 鑾峰彇褰撳墠鏃ユ湡 + final String nowDate = DateUtil.COMMON.getDateText(new Date()); + // 鏄庡ぉ + final String afterDay = DateUtil.addDay(nowDate, 1); + logisticsEntruckingLogMapper.deleteByCarNumberAndCompanyId(logisticsEntruckingLogs,nowDate, afterDay); + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/vo/LogisticsEntruckingLogQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/vo/LogisticsEntruckingLogQueryVo.java similarity index 78% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/vo/LogisticsEntruckingLogQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/vo/LogisticsEntruckingLogQueryVo.java index 77bf1e17..45ae4e97 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsentruckinglog/vo/LogisticsEntruckingLogQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsentruckinglog/vo/LogisticsEntruckingLogQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsentruckinglog.vo; +package cc.hiver.core.logisticsentruckinglog.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; @@ -29,4 +29,10 @@ public class LogisticsEntruckingLogQueryVo extends HiverBasePageQuery { @ApiModelProperty(value = "杞︾墝鍙") private String carNumber; + + @ApiModelProperty(value = "寮濮嬫椂闂") + private String startDate; + + @ApiModelProperty(value = "缁撴潫鏃堕棿") + private String endDate; } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/controller/LogisticsOrderController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java similarity index 92% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/controller/LogisticsOrderController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java index cfa5bf0a..90e86bdd 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/controller/LogisticsOrderController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/controller/LogisticsOrderController.java @@ -1,13 +1,13 @@ -package cc.hiver.mall.logisticsorder.controller; +package cc.hiver.core.logisticsorder.controller; import cc.hiver.core.common.utils.PinYinUtils; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticsaddressbook.service.LogisticsAddressBookService; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; -import cc.hiver.mall.logisticsorder.service.LogisticsOrderService; -import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; -import cc.hiver.mall.utils.DateUtil; +import cc.hiver.core.logisticsaddressbook.service.LogisticsAddressBookService; +import cc.hiver.core.logisticsorder.entity.LogisticsOrder; +import cc.hiver.core.logisticsorder.service.LogisticsOrderService; +import cc.hiver.core.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.core.utils.DateUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java similarity index 98% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java index b80ad045..7cc0be7f 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/entity/LogisticsOrder.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsorder.entity; +package cc.hiver.core.logisticsorder.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/mapper/LogisticsOrderMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/mapper/LogisticsOrderMapper.java similarity index 79% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/mapper/LogisticsOrderMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsorder/mapper/LogisticsOrderMapper.java index f529476d..385c7ca9 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/mapper/LogisticsOrderMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/mapper/LogisticsOrderMapper.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsorder.mapper; +package cc.hiver.core.logisticsorder.mapper; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; -import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.core.logisticsorder.entity.LogisticsOrder; +import cc.hiver.core.logisticsorder.vo.LogisticsOrderQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/LogisticsOrderService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java similarity index 78% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/LogisticsOrderService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java index e05b9a88..a36ee315 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/LogisticsOrderService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsorder.service; +package cc.hiver.core.logisticsorder.service; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; -import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.core.logisticsorder.entity.LogisticsOrder; +import cc.hiver.core.logisticsorder.vo.LogisticsOrderQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java similarity index 83% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java index a08094f6..99b2d450 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/service/impl/LogisticsOrderServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java @@ -1,11 +1,10 @@ -package cc.hiver.mall.logisticsorder.service.impl; - -import cc.hiver.mall.logisticsaddressbook.entity.LogisticsAddressBook; -import cc.hiver.mall.logisticsorder.entity.LogisticsOrder; -import cc.hiver.mall.logisticsorder.mapper.LogisticsOrderMapper; -import cc.hiver.mall.logisticsorder.service.LogisticsOrderService; -import cc.hiver.mall.logisticsorder.vo.LogisticsOrderQueryVo; -import cc.hiver.mall.utils.DateUtil; +package cc.hiver.core.logisticsorder.service.impl; + +import cc.hiver.core.logisticsorder.entity.LogisticsOrder; +import cc.hiver.core.logisticsorder.mapper.LogisticsOrderMapper; +import cc.hiver.core.logisticsorder.service.LogisticsOrderService; +import cc.hiver.core.logisticsorder.vo.LogisticsOrderQueryVo; +import cc.hiver.core.utils.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java similarity index 97% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java index 720ff492..754731f2 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsorder/vo/LogisticsOrderQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsorder.vo; +package cc.hiver.core.logisticsorder.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/controller/LogisticsRouteController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/controller/LogisticsRouteController.java similarity index 93% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/controller/LogisticsRouteController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsroute/controller/LogisticsRouteController.java index 84d563c7..353e3023 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/controller/LogisticsRouteController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/controller/LogisticsRouteController.java @@ -1,10 +1,10 @@ -package cc.hiver.mall.logisticsroute.controller; +package cc.hiver.core.logisticsroute.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticsroute.entity.LogisticsRoute; -import cc.hiver.mall.logisticsroute.service.LogisticsRouteService; -import cc.hiver.mall.logisticsroute.vo.LogisticsRouteQueryVo; +import cc.hiver.core.logisticsroute.entity.LogisticsRoute; +import cc.hiver.core.logisticsroute.service.LogisticsRouteService; +import cc.hiver.core.logisticsroute.vo.LogisticsRouteQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/entity/LogisticsRoute.java b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/entity/LogisticsRoute.java similarity index 95% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/entity/LogisticsRoute.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsroute/entity/LogisticsRoute.java index 5eeae6e5..63f6ff63 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/entity/LogisticsRoute.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/entity/LogisticsRoute.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsroute.entity; +package cc.hiver.core.logisticsroute.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/mapper/LogisticsRouteMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/mapper/LogisticsRouteMapper.java similarity index 79% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/mapper/LogisticsRouteMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsroute/mapper/LogisticsRouteMapper.java index aaf13bcd..e57c88d3 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/mapper/LogisticsRouteMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/mapper/LogisticsRouteMapper.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsroute.mapper; +package cc.hiver.core.logisticsroute.mapper; -import cc.hiver.mall.logisticsroute.entity.LogisticsRoute; -import cc.hiver.mall.logisticsroute.vo.LogisticsRouteQueryVo; +import cc.hiver.core.logisticsroute.entity.LogisticsRoute; +import cc.hiver.core.logisticsroute.vo.LogisticsRouteQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/service/LogisticsRouteService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/service/LogisticsRouteService.java similarity index 73% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/service/LogisticsRouteService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsroute/service/LogisticsRouteService.java index be298064..fd48ef0e 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/service/LogisticsRouteService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/service/LogisticsRouteService.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsroute.service; +package cc.hiver.core.logisticsroute.service; -import cc.hiver.mall.logisticsroute.entity.LogisticsRoute; -import cc.hiver.mall.logisticsroute.vo.LogisticsRouteQueryVo; +import cc.hiver.core.logisticsroute.entity.LogisticsRoute; +import cc.hiver.core.logisticsroute.vo.LogisticsRouteQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/service/impl/LogisticsRouteServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/service/impl/LogisticsRouteServiceImpl.java similarity index 77% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/service/impl/LogisticsRouteServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsroute/service/impl/LogisticsRouteServiceImpl.java index 0cc595bb..c98469b0 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/service/impl/LogisticsRouteServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/service/impl/LogisticsRouteServiceImpl.java @@ -1,9 +1,9 @@ -package cc.hiver.mall.logisticsroute.service.impl; +package cc.hiver.core.logisticsroute.service.impl; -import cc.hiver.mall.logisticsroute.entity.LogisticsRoute; -import cc.hiver.mall.logisticsroute.mapper.LogisticsRouteMapper; -import cc.hiver.mall.logisticsroute.service.LogisticsRouteService; -import cc.hiver.mall.logisticsroute.vo.LogisticsRouteQueryVo; +import cc.hiver.core.logisticsroute.entity.LogisticsRoute; +import cc.hiver.core.logisticsroute.mapper.LogisticsRouteMapper; +import cc.hiver.core.logisticsroute.service.LogisticsRouteService; +import cc.hiver.core.logisticsroute.vo.LogisticsRouteQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/vo/LogisticsRouteQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/vo/LogisticsRouteQueryVo.java similarity index 93% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/vo/LogisticsRouteQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsroute/vo/LogisticsRouteQueryVo.java index 94973876..db01a621 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsroute/vo/LogisticsRouteQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsroute/vo/LogisticsRouteQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsroute.vo; +package cc.hiver.core.logisticsroute.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/controller/LogisticsStationController.java similarity index 94% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsstation/controller/LogisticsStationController.java index f0a81b98..b2161344 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/controller/LogisticsStationController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/controller/LogisticsStationController.java @@ -1,10 +1,10 @@ -package cc.hiver.mall.logisticsstation.controller; +package cc.hiver.core.logisticsstation.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticsstation.entity.LogisticsStation; -import cc.hiver.mall.logisticsstation.service.LogisticsStationService; -import cc.hiver.mall.logisticsstation.vo.LogisticsStationQueryVo; +import cc.hiver.core.logisticsstation.entity.LogisticsStation; +import cc.hiver.core.logisticsstation.service.LogisticsStationService; +import cc.hiver.core.logisticsstation.vo.LogisticsStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/entity/LogisticsStation.java b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/entity/LogisticsStation.java similarity index 95% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/entity/LogisticsStation.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsstation/entity/LogisticsStation.java index 0cc0741e..da834535 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/entity/LogisticsStation.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/entity/LogisticsStation.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsstation.entity; +package cc.hiver.core.logisticsstation.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/mapper/LogisticsStationMapper.java similarity index 85% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsstation/mapper/LogisticsStationMapper.java index c977b41e..c6315057 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/mapper/LogisticsStationMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/mapper/LogisticsStationMapper.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsstation.mapper; +package cc.hiver.core.logisticsstation.mapper; -import cc.hiver.mall.logisticsstation.entity.LogisticsStation; -import cc.hiver.mall.logisticsstation.vo.LogisticsStationQueryVo; +import cc.hiver.core.logisticsstation.entity.LogisticsStation; +import cc.hiver.core.logisticsstation.vo.LogisticsStationQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/service/LogisticsStationService.java similarity index 82% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsstation/service/LogisticsStationService.java index df0d380e..a021cd44 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/LogisticsStationService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/service/LogisticsStationService.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsstation.service; +package cc.hiver.core.logisticsstation.service; -import cc.hiver.mall.logisticsstation.entity.LogisticsStation; -import cc.hiver.mall.logisticsstation.vo.LogisticsStationQueryVo; +import cc.hiver.core.logisticsstation.entity.LogisticsStation; +import cc.hiver.core.logisticsstation.vo.LogisticsStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/service/impl/LogisticsStationServiceImpl.java similarity index 83% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsstation/service/impl/LogisticsStationServiceImpl.java index 4aacb33f..c2464f57 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/service/impl/LogisticsStationServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/service/impl/LogisticsStationServiceImpl.java @@ -1,9 +1,9 @@ -package cc.hiver.mall.logisticsstation.service.impl; +package cc.hiver.core.logisticsstation.service.impl; -import cc.hiver.mall.logisticsstation.entity.LogisticsStation; -import cc.hiver.mall.logisticsstation.mapper.LogisticsStationMapper; -import cc.hiver.mall.logisticsstation.service.LogisticsStationService; -import cc.hiver.mall.logisticsstation.vo.LogisticsStationQueryVo; +import cc.hiver.core.logisticsstation.entity.LogisticsStation; +import cc.hiver.core.logisticsstation.mapper.LogisticsStationMapper; +import cc.hiver.core.logisticsstation.service.LogisticsStationService; +import cc.hiver.core.logisticsstation.vo.LogisticsStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/vo/LogisticsStationQueryVo.java similarity index 92% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsstation/vo/LogisticsStationQueryVo.java index 413f15a0..0fcaff15 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsstation/vo/LogisticsStationQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsstation/vo/LogisticsStationQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsstation.vo; +package cc.hiver.core.logisticsstation.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/controller/LogisticsTransferStationController.java b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/controller/LogisticsTransferStationController.java similarity index 93% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/controller/LogisticsTransferStationController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/controller/LogisticsTransferStationController.java index 5acb3048..4cfc7e84 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/controller/LogisticsTransferStationController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/controller/LogisticsTransferStationController.java @@ -1,10 +1,10 @@ -package cc.hiver.mall.logisticstransferstation.controller; +package cc.hiver.core.logisticstransferstation.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticstransferstation.entity.LogisticsTransferStation; -import cc.hiver.mall.logisticstransferstation.service.LogisticsTransferStationService; -import cc.hiver.mall.logisticstransferstation.vo.LogisticsTransferStationQueryVo; +import cc.hiver.core.logisticstransferstation.entity.LogisticsTransferStation; +import cc.hiver.core.logisticstransferstation.service.LogisticsTransferStationService; +import cc.hiver.core.logisticstransferstation.vo.LogisticsTransferStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/entity/LogisticsTransferStation.java b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/entity/LogisticsTransferStation.java similarity index 94% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/entity/LogisticsTransferStation.java rename to hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/entity/LogisticsTransferStation.java index e19ecbf4..94da9f8b 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/entity/LogisticsTransferStation.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/entity/LogisticsTransferStation.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticstransferstation.entity; +package cc.hiver.core.logisticstransferstation.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/mapper/LogisticsTransferStationMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/mapper/LogisticsTransferStationMapper.java similarity index 80% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/mapper/LogisticsTransferStationMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/mapper/LogisticsTransferStationMapper.java index 2221a56f..928bb1fd 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/mapper/LogisticsTransferStationMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/mapper/LogisticsTransferStationMapper.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticstransferstation.mapper; +package cc.hiver.core.logisticstransferstation.mapper; -import cc.hiver.mall.logisticstransferstation.entity.LogisticsTransferStation; -import cc.hiver.mall.logisticstransferstation.vo.LogisticsTransferStationQueryVo; +import cc.hiver.core.logisticstransferstation.entity.LogisticsTransferStation; +import cc.hiver.core.logisticstransferstation.vo.LogisticsTransferStationQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/service/LogisticsTransferStationService.java b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/service/LogisticsTransferStationService.java similarity index 75% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/service/LogisticsTransferStationService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/service/LogisticsTransferStationService.java index 2a7c35b8..dd96cedc 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/service/LogisticsTransferStationService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/service/LogisticsTransferStationService.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticstransferstation.service; +package cc.hiver.core.logisticstransferstation.service; -import cc.hiver.mall.logisticstransferstation.entity.LogisticsTransferStation; -import cc.hiver.mall.logisticstransferstation.vo.LogisticsTransferStationQueryVo; +import cc.hiver.core.logisticstransferstation.entity.LogisticsTransferStation; +import cc.hiver.core.logisticstransferstation.vo.LogisticsTransferStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/service/impl/LogisticsTransferStationServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/service/impl/LogisticsTransferStationServiceImpl.java similarity index 80% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/service/impl/LogisticsTransferStationServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/service/impl/LogisticsTransferStationServiceImpl.java index aee20d5f..4d3e0c5c 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/service/impl/LogisticsTransferStationServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/service/impl/LogisticsTransferStationServiceImpl.java @@ -1,9 +1,9 @@ -package cc.hiver.mall.logisticstransferstation.service.impl; +package cc.hiver.core.logisticstransferstation.service.impl; -import cc.hiver.mall.logisticstransferstation.entity.LogisticsTransferStation; -import cc.hiver.mall.logisticstransferstation.mapper.LogisticsTransferStationMapper; -import cc.hiver.mall.logisticstransferstation.service.LogisticsTransferStationService; -import cc.hiver.mall.logisticstransferstation.vo.LogisticsTransferStationQueryVo; +import cc.hiver.core.logisticstransferstation.entity.LogisticsTransferStation; +import cc.hiver.core.logisticstransferstation.mapper.LogisticsTransferStationMapper; +import cc.hiver.core.logisticstransferstation.service.LogisticsTransferStationService; +import cc.hiver.core.logisticstransferstation.vo.LogisticsTransferStationQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/vo/LogisticsTransferStationQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/vo/LogisticsTransferStationQueryVo.java similarity index 91% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/vo/LogisticsTransferStationQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/vo/LogisticsTransferStationQueryVo.java index c5043ef3..fc06a0d6 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticstransferstation/vo/LogisticsTransferStationQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticstransferstation/vo/LogisticsTransferStationQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticstransferstation.vo; +package cc.hiver.core.logisticstransferstation.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/controller/LogisticsUserController.java b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/controller/LogisticsUserController.java similarity index 80% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/controller/LogisticsUserController.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsuser/controller/LogisticsUserController.java index a59e9be3..f847820c 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/controller/LogisticsUserController.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/controller/LogisticsUserController.java @@ -1,16 +1,17 @@ -package cc.hiver.mall.logisticsuser.controller; +package cc.hiver.core.logisticsuser.controller; import cc.hiver.core.common.utils.ResultUtil; import cc.hiver.core.common.vo.Result; -import cc.hiver.mall.logisticsuser.entity.LogisticsUser; -import cc.hiver.mall.logisticsuser.service.LogisticsUserService; -import cc.hiver.mall.logisticsuser.vo.LogisticsUserQueryVo; +import cc.hiver.core.logisticsuser.entity.LogisticsUser; +import cc.hiver.core.logisticsuser.service.LogisticsUserService; +import cc.hiver.core.logisticsuser.vo.LogisticsUserQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -33,7 +34,9 @@ public class LogisticsUserController { @PostMapping(value = "/addLogisticsUser") @ApiOperation("鏂板鐗╂祦鍏徃浜哄憳") public Result addLogisticsUser(@RequestBody LogisticsUser logisticsUser) { - + // 璁剧疆鍒濆瀵嗙爜涓123456 + final String encryptPass = new BCryptPasswordEncoder().encode("123456"); + logisticsUser.setPassword(encryptPass); final boolean b = logisticsUserService.saveOrUpdate(logisticsUser); if (b) { return ResultUtil.success("淇濆瓨鎴愬姛锛"); @@ -56,6 +59,11 @@ public class LogisticsUserController { if (StringUtils.isEmpty(logisticsUser.getId())) { return ResultUtil.error("鍏徃浜哄憳id涓嶈兘涓虹┖锛"); } + if(!StringUtils.isEmpty(logisticsUser.getPassword())){ + // 鍔犲瘑瀵嗙爜 + final String encryptPass = new BCryptPasswordEncoder().encode(logisticsUser.getPassword()); + logisticsUser.setPassword(encryptPass); + } final boolean b = logisticsUserService.saveOrUpdate(logisticsUser); if (b) { return ResultUtil.success("淇濆瓨鎴愬姛锛"); @@ -100,4 +108,6 @@ public class LogisticsUserController { final IPage result = logisticsUserService.getLogisticsUserPageList(logisticsUserQueryVo); return new ResultUtil>().setData(result); } + + // 鏍规嵁鎵嬫満鍙锋煡璇㈢墿娴佸叕鍙镐俊鎭 } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/entity/LogisticsUser.java similarity index 88% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsuser/entity/LogisticsUser.java index b9d4b67b..9c35dc1a 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/entity/LogisticsUser.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/entity/LogisticsUser.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsuser.entity; +package cc.hiver.core.logisticsuser.entity; import cc.hiver.core.base.HiverBaseEntity; import com.baomidou.mybatisplus.annotation.TableName; @@ -27,6 +27,9 @@ public class LogisticsUser extends HiverBaseEntity { @ApiModelProperty(value = "鐢佃瘽锛堢櫥褰曡处鍙凤級") private String mobile; + @ApiModelProperty(value = "瀵嗙爜") + private String password; + @ApiModelProperty(value = "鐗╂祦鍏徃id") private String companyId; diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/mapper/LogisticsUserMapper.java b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/mapper/LogisticsUserMapper.java similarity index 73% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/mapper/LogisticsUserMapper.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsuser/mapper/LogisticsUserMapper.java index bc56f1ad..918f963a 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/mapper/LogisticsUserMapper.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/mapper/LogisticsUserMapper.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsuser.mapper; +package cc.hiver.core.logisticsuser.mapper; -import cc.hiver.mall.logisticsuser.entity.LogisticsUser; -import cc.hiver.mall.logisticsuser.vo.LogisticsUserQueryVo; +import cc.hiver.core.logisticsuser.entity.LogisticsUser; +import cc.hiver.core.logisticsuser.vo.LogisticsUserQueryVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,4 +19,6 @@ public interface LogisticsUserMapper extends BaseMapper { * @date 2024/8/24 */ IPage getLogisticsUserPageList(Page page, @Param("queryParams") LogisticsUserQueryVo logisticsUserQueryVo); + + LogisticsUser findByMobile(@Param("mobile")String mobile); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/service/LogisticsUserService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/service/LogisticsUserService.java similarity index 68% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/service/LogisticsUserService.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsuser/service/LogisticsUserService.java index 1e56b0eb..7394d56b 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/service/LogisticsUserService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/service/LogisticsUserService.java @@ -1,7 +1,7 @@ -package cc.hiver.mall.logisticsuser.service; +package cc.hiver.core.logisticsuser.service; -import cc.hiver.mall.logisticsuser.entity.LogisticsUser; -import cc.hiver.mall.logisticsuser.vo.LogisticsUserQueryVo; +import cc.hiver.core.logisticsuser.entity.LogisticsUser; +import cc.hiver.core.logisticsuser.vo.LogisticsUserQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -16,4 +16,6 @@ public interface LogisticsUserService extends IService { * @date 2024/8/24 */ IPage getLogisticsUserPageList(LogisticsUserQueryVo logisticsUserQueryVo); + + LogisticsUser findByMobile(String username); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/service/impl/LogisticsUserServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/service/impl/LogisticsUserServiceImpl.java similarity index 70% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/service/impl/LogisticsUserServiceImpl.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsuser/service/impl/LogisticsUserServiceImpl.java index 27312102..643931fa 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/service/impl/LogisticsUserServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/service/impl/LogisticsUserServiceImpl.java @@ -1,9 +1,9 @@ -package cc.hiver.mall.logisticsuser.service.impl; +package cc.hiver.core.logisticsuser.service.impl; -import cc.hiver.mall.logisticsuser.entity.LogisticsUser; -import cc.hiver.mall.logisticsuser.mapper.LogisticsUserMapper; -import cc.hiver.mall.logisticsuser.service.LogisticsUserService; -import cc.hiver.mall.logisticsuser.vo.LogisticsUserQueryVo; +import cc.hiver.core.logisticsuser.entity.LogisticsUser; +import cc.hiver.core.logisticsuser.mapper.LogisticsUserMapper; +import cc.hiver.core.logisticsuser.service.LogisticsUserService; +import cc.hiver.core.logisticsuser.vo.LogisticsUserQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,4 +29,9 @@ public class LogisticsUserServiceImpl extends ServiceImpl page = new Page<>(logisticsUserQueryVo.getPageNum(), logisticsUserQueryVo.getPageSize()); return logisticsUserMapper.getLogisticsUserPageList(page, logisticsUserQueryVo); } + + @Override + public LogisticsUser findByMobile(String mobile) { + return logisticsUserMapper.findByMobile(mobile); + } } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/vo/LogisticsUserQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/vo/LogisticsUserQueryVo.java similarity index 92% rename from hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/vo/LogisticsUserQueryVo.java rename to hiver-core/src/main/java/cc/hiver/core/logisticsuser/vo/LogisticsUserQueryVo.java index ff8b7222..ff46ddc4 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/logisticsuser/vo/LogisticsUserQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsuser/vo/LogisticsUserQueryVo.java @@ -1,4 +1,4 @@ -package cc.hiver.mall.logisticsuser.vo; +package cc.hiver.core.logisticsuser.vo; import cc.hiver.core.base.HiverBasePageQuery; import io.swagger.annotations.ApiModelProperty; diff --git a/hiver-core/src/main/java/cc/hiver/core/utils/DateUtil.java b/hiver-core/src/main/java/cc/hiver/core/utils/DateUtil.java new file mode 100644 index 00000000..a0bbf3a8 --- /dev/null +++ b/hiver-core/src/main/java/cc/hiver/core/utils/DateUtil.java @@ -0,0 +1,422 @@ +package cc.hiver.core.utils; + + +import cn.hutool.json.JSONObject; +import lombok.extern.slf4j.Slf4j; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * 鏃ユ湡宸ュ叿绫 + */ + +@Slf4j +public class DateUtil { + + private final SimpleDateFormat format; + + public DateUtil(SimpleDateFormat format) { + this.format = format; + } + + public SimpleDateFormat getFormat() { + return format; + } + + /** + * 绱у噾鍨嬫棩鏈熸牸寮忥紝涔熷氨鏄函鏁板瓧绫诲瀷yyyyMMdd + */ + public static final DateUtil COMPAT = new DateUtil(new SimpleDateFormat("yyyyMMdd")); + + /** + * 甯哥敤鏃ユ湡鏍煎紡锛寉yyy-MM-dd + */ + public static final DateUtil COMMON = new DateUtil(new SimpleDateFormat("yyyy-MM-dd")); + /** + * 甯哥敤鏃ユ湡鏍煎紡锛寉yyy + */ + public static final DateUtil COMMONYEAR = new DateUtil(new SimpleDateFormat("yyyy")); + + /** + * 甯哥敤鏃ユ湡鏍煎紡锛寉yyy-MM-dd HH:mm:ss + */ + public static final DateUtil COMMON_FULL = new DateUtil(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")); + + /** + * 浣跨敤鏂滅嚎鍒嗛殧鐨勶紝瑗挎柟澶氶噰鐢紝yyyy/MM/dd + */ + public static final DateUtil SLASH = new DateUtil(new SimpleDateFormat("yyyy/MM/dd")); + + /** + * 涓枃鏃ユ湡鏍煎紡甯哥敤锛寉yyy骞碝M鏈坉d鏃 + */ + public static final DateUtil CHINESE = new DateUtil(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃")); + + /** + * 涓枃鏃ユ湡鏍煎紡甯哥敤锛寉yyy骞碝M鏈坉d鏃 HH鏃秏m鍒唖s绉 + */ + public static final DateUtil CHINESE_FULL = new DateUtil(new SimpleDateFormat("yyyy骞碝M鏈坉d鏃 HH鏃秏m鍒唖s绉")); + + /** + * 鏃ユ湡鑾峰彇瀛楃涓 + */ + public String getDateText(Date date) { + return getFormat().format(date); + } + + /** + * 瀛楃涓茶幏鍙栨棩鏈 + * + * @throws ParseException + */ + public Date getTextDate(String text) throws ParseException { + return getFormat().parse(text); + } + + /** + * 鏃ユ湡鑾峰彇瀛楃涓 + */ + public static String getDateText(Date date, String format) { + return new SimpleDateFormat(format).format(date); + } + + /** + * 瀛楃涓茶幏鍙栨棩鏈 + * + * @throws ParseException + */ + public static Date getTextDate(String dateText, String format) throws ParseException { + return new SimpleDateFormat(format).parse(dateText); + } + + /** + * 鏍规嵁鏃ユ湡锛岃繑鍥炲叾鏄熸湡鏁帮紝鍛ㄤ竴涓1锛屽懆鏃ヤ负7 + * + * @param date + * @return + */ + public static int getWeekDay(Date date) { + final Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + final int w = calendar.get(Calendar.DAY_OF_WEEK); + final int ret; + if (w == Calendar.SUNDAY) { + ret = 7; + } else { + ret = w - 1; + } + return ret; + } + + /** + * 鏍规嵁鏌愬ぉ鑾峰彇璇ュぉ鎵鍦ㄥ懆鐨勫紑濮嬫椂闂村拰缁撴潫鏃堕棿锛屾瘮濡2018-08-02锛屽紑濮嬫椂闂翠负2018-07-29缁撴潫鏃堕棿2018-08-04 + * + * @param date + * @return JSONObject + * @author 鐜嬪瘜搴 + * @date 2023/11/11 + */ + public static JSONObject getByDate(String date) throws ParseException { + final JSONObject jsonObj = new JSONObject(); + final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + final Date tempDate = sdf.parse(date); + final Calendar calendar = Calendar.getInstance(); + calendar.setTime(tempDate); + final int week = getWeekDay(tempDate); + if (week == 1) { + jsonObj.set("startDate", date); + calendar.add(Calendar.DAY_OF_MONTH, 7 - 1); + jsonObj.set("endDate", sdf.format(calendar.getTime())); + } else if (week == 7) { + jsonObj.set("endDate", date); + calendar.add(Calendar.DAY_OF_MONTH, -6); + jsonObj.set("startDate", sdf.format(calendar.getTime())); + } else { + calendar.add(Calendar.DAY_OF_MONTH, -week + 1); + jsonObj.set("startDate", sdf.format(calendar.getTime())); + calendar.add(Calendar.DAY_OF_MONTH, 6); + jsonObj.set("endDate", sdf.format(calendar.getTime())); + } + return jsonObj; + } + + /** + * 鏃ユ湡鏍煎紡鍔犱笂澶╂暟yyyy-MM-dd + * + * @param date + * @param num + * @return + */ + public static String getAfterDayTime(String date, int num) { + final Calendar cal = Calendar.getInstance(); + try { + cal.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(date)); + } catch (ParseException e) { + e.printStackTrace(); + } + cal.roll(Calendar.DAY_OF_YEAR, num); + final String afterTime = new SimpleDateFormat("yyyy-MM-dd").format(cal.getTime()); + return afterTime; + } + + /** + * 褰撴湀鏈鍚庝竴澶 + * fxx + * + * @return + */ + public static Date getLastDayOfMonth() { + final Calendar calendar = Calendar.getInstance(); + final int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH); + //鎸変綘鐨勮姹傝缃椂闂 + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), maxDay, 23, 59, 59); + return calendar.getTime(); + } + + /** + * 杩斿洖涓娈垫椂闂村唴鐨勬墍鏈夋棩鏈(鍖呭惈寮濮嬨佺粨鏉熸椂闂) + * + * @param startTime yyyy-MM-dd + * @param endTime yyyy-MM-dd + * @return + */ + public static List getAllDate(String startTime, String endTime) { + final List list = new ArrayList(); + // 鍒ゆ柇寮濮嬫椂闂存槸鍛ㄥ嚑 + Calendar cale = Calendar.getInstance(); + final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + try { + cale.setTime(format.parse(startTime)); + } catch (ParseException e) { + e.printStackTrace(); + } + int day = 0; + try { + boolean boo = true; + while (boo) { + cale = Calendar.getInstance(); + cale.setTime(format.parse(startTime)); + cale.set(Calendar.HOUR_OF_DAY, 24 * day); + if (cale.getTime().getTime() > format.parse(endTime).getTime()) { + boo = false; + } else { + list.add(format.format(cale.getTime())); + day++; + } + } + } catch (ParseException e) { + e.printStackTrace(); + } + return list; + } + + /** + * 鑾峰彇鏄湰骞寸殑绗嚑鍛 + * + * @param today + * @return + * @throws ParseException + */ + public static int getWeekOfTheYear(String today) { + final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + Date date = null; + try { + date = format.parse(today); + } catch (ParseException e) { + e.printStackTrace(); + } + final Calendar calendar = Calendar.getInstance(); + calendar.setFirstDayOfWeek(Calendar.MONDAY); + calendar.setTime(date); + return calendar.get(Calendar.WEEK_OF_YEAR); + } + + /** + * 鑾峰彇褰撳墠骞存煇鍛ㄥ緱绗竴澶 + * + * @param week 鍛 + * @return + */ + public static String getFirstDayOfWeek(int week) { + final Calendar c = new GregorianCalendar(); + c.set(Calendar.YEAR, getSysYear()); + c.set(Calendar.WEEK_OF_YEAR, week); + c.setFirstDayOfWeek(Calendar.MONDAY); + c.set(Calendar.DAY_OF_WEEK, c.getFirstDayOfWeek()); + c.set(Calendar.HOUR, 0); + c.set(Calendar.MINUTE, 0); + c.set(Calendar.SECOND, 0); + + return COMMON.getDateText(c.getTime()); + } + + /** + * 鑾峰彇褰撳墠骞存煇鍛ㄥ緱鏈鍚庝竴澶 + * + * @param week 鍛 + * @return + */ + public static String getLastDayOfWeek(int week) { + final Calendar c = new GregorianCalendar(); + c.set(Calendar.YEAR, getSysYear()); + c.set(Calendar.WEEK_OF_YEAR, week); + c.setFirstDayOfWeek(Calendar.MONDAY); + c.set(Calendar.DAY_OF_WEEK, c.getFirstDayOfWeek() + 5); + c.set(Calendar.HOUR, 23); + c.set(Calendar.MINUTE, 59); + c.set(Calendar.SECOND, 59); + return COMMON.getDateText(c.getTime()); + } + + + /** + * 鑾峰彇褰撳墠绯荤粺鐨勫勾浠 + * + * @return + */ + public static int getSysYear() { + final Calendar date = Calendar.getInstance(); + return date.get(Calendar.YEAR); + } + + + /** + * 鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勬棩鏈熷樊 endTime-startTime + * + * @param startTime + * @param endTime + * @return + */ + public static int getDateDiff(String startTime, String endTime) { + try { + final long nd = 1000 * 24 * 60 * 60; + final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + final Date begin = sdf.parse(startTime); + final Date end = sdf.parse(endTime); + final long diff = end.getTime() - begin.getTime(); + final Long day = diff / nd; + return day.intValue() + 1; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 鍒ゆ柇寮濮嬫椂闂翠笌缁撴潫鏃堕棿鏄惁鍦ㄦ椂闂存鍐 + * + * @param nowStartTime 褰撳墠寮濮嬫椂闂 + * @param nowEndTime 褰撳墠缁撴潫鏃堕棿 + * @param startTime 鏃堕棿娈靛紑濮嬫椂闂 + * @param endTime 鏃堕棿娈电粨鏉熸椂闂 + * @return + * @author sunran 鍒ゆ柇褰撳墠鏃堕棿娈垫槸鍚﹀湪鏃堕棿鍖洪棿鍐呮湁浜ら泦 + */ + public static boolean isEffectiveDate(Date nowStartTime, Date nowEndTime, Date startTime, Date endTime) { + if (nowStartTime.getTime() == startTime.getTime() || nowStartTime.getTime() == endTime.getTime() + || nowEndTime.getTime() == endTime.getTime() || nowEndTime.getTime() == endTime.getTime()) { + return true; + } + + final Calendar date1 = Calendar.getInstance(); + date1.setTime(nowStartTime); + + final Calendar date2 = Calendar.getInstance(); + date2.setTime(nowEndTime); + + final Calendar begin = Calendar.getInstance(); + begin.setTime(startTime); + + final Calendar end = Calendar.getInstance(); + end.setTime(endTime); + + //寮濮嬫椂闂村皬浜庢椂闂存寮濮嬫椂闂村苟涓旂粨鏉熸椂闂村ぇ浜庢椂闂存缁撴潫鏃堕棿 + if ((date1.after(begin) && date1.before(end)) || (date2.after(begin) && date2.before(end))) {//寮濮嬫椂闂存垨缁撴潫鏃堕棿鍦ㄦ椂闂存鍐咃紝璇磋兘鍦ㄦ椂闂磋寖鍥村唴 + return true; + } else { + return date1.before(begin) && date2.after(end); + } + } + + /** + * 鍒ゆ柇褰撳墠鏃堕棿鍦ㄦ椂闂磋寖鍥村唴锛屾牸寮弝yyy-MM-dd HH:mm:ss + * + * @param startTime + * @param endTime + * @return + */ + public static boolean isEffectiveDate(String nowStartTime, String nowEndTime, String startTime, String endTime) { + try { + final Date nowStartDate = COMMON_FULL.getTextDate(nowStartTime); + final Date nowEndDate = COMMON_FULL.getTextDate(nowEndTime); + final Date startDate = COMMON_FULL.getTextDate(startTime); + final Date endDate = COMMON_FULL.getTextDate(endTime); + return isEffectiveDate(nowStartDate, nowEndDate, startDate, endDate); + } catch (ParseException e) { + e.printStackTrace(); + } + + return false; + } + + /** + * 缁欐寚瀹氭棩鏈熸坊鍔犳寚瀹氬ぉ鏁 + * + * @param dateStr + * @param day + * @return String + * @author 鐜嬪瘜搴 + * @date 2024/3/1 + */ + public static String addDay(String dateStr, Integer day) { + try { + final SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); + final Date timeNow = sf.parse(dateStr); + final Calendar c = Calendar.getInstance(); + c.setTime(timeNow); + log.info("褰撳墠鏃ユ湡:" + sf.format(timeNow)); + c.add(Calendar.DAY_OF_MONTH, day); + log.info("澧炲姞鍚庢棩鏈:" + sf.format(c.getTime())); + return sf.format(c.getTime()); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + return ""; + } + + /** + * 鏄惁鏄悓涓澶 + * @author 鐜嬪瘜搴 + * @date 2024/7/27 + * @param date1 + * @param date2 + * @return boolean + */ + public static boolean isSameDay(Date date1, Date date2) { + Calendar cal1 = Calendar.getInstance(); + Calendar cal2 = Calendar.getInstance(); + + cal1.setTime(date1); + cal2.setTime(date2); + + // 姣旇緝骞翠唤 + if (cal1.get(Calendar.YEAR) != cal2.get(Calendar.YEAR)) { + return false; + } + + // 姣旇緝鏈堜唤 + if (cal1.get(Calendar.MONTH) != cal2.get(Calendar.MONTH)) { + return false; + } + + // 姣旇緝澶╂暟 + if (cal1.get(Calendar.DAY_OF_MONTH) != cal2.get(Calendar.DAY_OF_MONTH)) { + return false; + } + + return true; + } +} + diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml similarity index 94% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml index 598621dc..adeeb93c 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsCompanyRouteMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -30,7 +30,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_company_route (id, create_by, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name) values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -88,7 +88,7 @@ circuit_name = #{record.circuitName,jdbcType=VARCHAR} - + update t_logistics_company_route @@ -122,7 +122,7 @@ where id = #{id,jdbcType=VARCHAR} - + update t_logistics_company_route set create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -137,7 +137,7 @@ - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.company_id,t.company_name,t.circuit_id,t.circuit_name from t_logistics_company_route t @@ -161,7 +161,7 @@ t.create_time desc - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.company_id,t.company_name,t.circuit_id,t.circuit_name from t_logistics_company_route t diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml similarity index 83% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml index 9d229ace..d25bc6c5 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsEntruckingLogMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -37,7 +37,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_entrucking_log (id, create_by, create_time, del_flag, update_by, update_time, company_id, company_name, circuit_id, circuit_name, car_number, car_phone, car_user_name, car_fee, car_freight) @@ -47,7 +47,7 @@ #{carNumber,jdbcType=VARCHAR}, #{carPhone,jdbcType=VARCHAR}, #{carUserName,jdbcType=VARCHAR}, #{carFee,jdbcType=DECIMAL}, #{carFreight,jdbcType=DECIMAL}) - + update t_logistics_entrucking_log set create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -67,7 +67,7 @@ - select from t_logistics_entrucking_log @@ -92,8 +92,21 @@ AND car_number like concat('%',#{queryParams.carNumber},'%') + + and create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate} + ORDER BY create_time desc + + + update t_logistics_entrucking_log + set del_flag = '1' + where del_flag = '0' + + and car_number = #{listItem.carNumber} and company_id = #{listItem.companyId} + + and create_time BETWEEN #{nowDate} AND #{afterDay} + \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml similarity index 97% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml index 984ca1d9..fd3a83b8 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsOrderMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -58,7 +58,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_order (id, create_by, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name, shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, @@ -77,7 +77,7 @@ - select from t_logistics_order diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsRouteMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsRouteMapper.xml similarity index 94% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsRouteMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsRouteMapper.xml index 26d03a50..9df65c49 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsRouteMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsRouteMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -30,7 +30,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_route (id, create_by, create_time, del_flag, update_by, update_time,go_station, arrival_station, circuit_name, premium_rules) values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -88,7 +88,7 @@ premium_rules = #{record.premiumRules,jdbcType=VARCHAR} - + update t_logistics_route @@ -122,7 +122,7 @@ where id = #{id,jdbcType=VARCHAR} - + update t_logistics_route set create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -137,7 +137,7 @@ - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.go_station,t.arrival_station,t.circuit_name,t.premium_rules from t_logistics_route t diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsStationMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsStationMapper.xml similarity index 94% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsStationMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsStationMapper.xml index da65f0d2..2c6a4580 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsStationMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsStationMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -31,7 +31,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_station (id, create_by, create_time, del_flag, update_by, update_time, circuit_id, station_name, freight_rules, landing_fee_rules, delivery_fee_rules) values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -93,7 +93,7 @@ delivery_fee_rules = #{record.deliveryFeeRules,jdbcType=VARCHAR} - + update t_logistics_station @@ -130,7 +130,7 @@ where id = #{id,jdbcType=VARCHAR} - + update t_logistics_station set create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -146,7 +146,7 @@ - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.circuit_id,t.station_name,t.freight_rules,t.landing_fee_rules,t.delivery_fee_rules from t_logistics_station t @@ -165,7 +165,7 @@ t.create_time desc - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.circuit_id,t.station_name,t.freight_rules,t.landing_fee_rules,t.delivery_fee_rules from t_logistics_station t diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsTransferStationMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsTransferStationMapper.xml similarity index 94% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsTransferStationMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsTransferStationMapper.xml index 6547dfe5..9cc44918 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsTransferStationMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsTransferStationMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -30,7 +30,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_transfer_station (id, create_by, create_time, del_flag, update_by, update_time,station_id, go_station, arrival_station, transit_fee) values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -88,7 +88,7 @@ transit_fee = #{record.transitFee,jdbcType=VARCHAR} - + update t_logistics_transfer_station @@ -122,7 +122,7 @@ where id = #{id,jdbcType=VARCHAR} - + update t_logistics_transfer_station set create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -137,7 +137,7 @@ - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.station_id,t.go_station,t.arrival_station,t.transit_fee from t_logistics_transfer_station t diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsUserMapper.xml similarity index 90% rename from hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml rename to hiver-core/src/main/resources/mapper/LogisticsUserMapper.xml index 46ffeb90..26e6c6a2 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/LogisticsUserMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsUserMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -30,7 +30,7 @@ where id = #{id,jdbcType=VARCHAR} - + insert into t_logistics_user (id, create_by, create_time, del_flag, update_by, update_time, nick_name, mobile, company_id, user_role) values (#{id,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, @@ -88,7 +88,7 @@ user_role = #{record.userRole,jdbcType=VARCHAR} - + update t_logistics_user @@ -122,7 +122,7 @@ where id = #{id,jdbcType=VARCHAR} - + update t_logistics_user set create_by = #{createBy,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, @@ -137,7 +137,7 @@ - select t.id, t.create_by,t.create_time,t.del_flag,t.update_by,t.update_time,t.nick_name,t.mobile,t.company_id,t.user_role from t_logistics_user t @@ -152,4 +152,12 @@ ORDER BY t.create_time desc + + \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java index 016b9d5a..1e0669bd 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java @@ -837,7 +837,7 @@ public class AliOcrUtil { final Message systemMsg = Message.builder().role(Role.SYSTEM.getValue()).content("You are a helpful assistant.").build(); //questionMsg += "璇峰府鎴戞妸鎵鏈夊唴瀹瑰皝瑁呬负JSON锛宩son鏍煎紡涓猴細[{ \"productSn\": \"璐у彿\", \"attributeList\": [{\"color\":\"棰滆壊\",\"size\":\"灏虹爜\",\"productCount\": \"鏁伴噺\"}] }]銆備互涓嬫槸鍑犵偣瑕佹眰锛 1.鈥滆揣鍙封濅袱涓瓧鍜岄鑹蹭腑闂寸殑鍐呭浠ｈ〃productSn锛宲roductSn鍙兘鍖呭惈\"鏂癨"銆乗"閫\"銆乗"鏃"銆乗"鎹"銆乗"琛"銆 2.\"SYYS鑹瞈"浠ｈ〃鈥滄墍鏈夐鑹测濓紝\"color\"瀛楁杩斿洖鈥淪YYS鑹测濄 3.\"SYCM鐮乗"浠ｈ〃鈥滄墍鏈夊昂鐮佲濓紝\"size\"瀛楁杩斿洖鈥淪YCM鐮佲濄 4.鍙緭鍑篔SON鏁版嵁鍗冲彲锛屼笉鐢ㄨ繑鍥炲瓧娈垫弿杩板拰瑙ｆ瀽杩囩▼銆"; - questionMsg += "浣犳槸涓涓湇瑁呰涓氬簱绠′笓瀹讹紝璇峰府鎴戞妸鎵鏈夊唴瀹瑰皝瑁呬负JSON锛宩son鏍煎紡涓猴細[{ \"productSn\": \"璐у彿\", \"attributeList\": [{\"color\":\"棰滆壊\",\"size\":\"灏虹爜\",\"productCount\": \"鏁伴噺\"}] }, \"wholesalePrice\":\"浠锋牸\"]锛孿n" + + questionMsg += "浣犳槸涓涓湇瑁呰涓氬簱绠′笓瀹讹紝璇峰府鎴戞妸鎵鏈夊唴瀹瑰皝瑁呬负JSON锛宩son鏍煎紡涓猴細[{ \"productSn\": \"璐у彿\", \"attributeList\": [{\"color\":\"棰滆壊\",\"size\":\"灏虹爜\",\"productCount\": \"鏁伴噺\"}] , \"wholesalePrice\":\"浠锋牸\"}]锛孿n" + "1.productSn鐨勮繑鍥炲间腑鍘绘帀棰滆壊锛屽昂鐮佺瓑淇℃伅锛孿n" + "2.濡傛灉娌℃湁璇嗗埆鍒癨"color\"鐨勫唴瀹癸紝鍒橽"color\"璧嬪尖滃潎鑹测濄傚鏋滄病鏈夎瘑鍒埌\"size\"鐨勫唴瀹癸紝鍒橽"size\"璧嬪尖滃潎鐮佲濓紝杩斿洖1鏉SON鏁版嵁鍗冲彲銆俓n" + "3.濡傛灉鎸囦护鍐呭涓湁\"SYYS鑹瞈"鍒橽"color\"瀛楁杩斿洖鈥淪YYS鑹测濆嵆鍙紝濡傛灉鎸囦护鍐呭涓湁\"SYCM鐮乗"鍒橽"size\"瀛楁杩斿洖鈥淪YCM鐮佲濆嵆鍙紝娌℃湁鍒欏拷鐣ャ俓n" + @@ -851,7 +851,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("寮濮嬪洖绛"); final QwenParam param = - QwenParam.builder().model("qwen-max").messages(msgManager.get()) + QwenParam.builder().model("qwen2-72b-instruct").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F) @@ -903,7 +903,7 @@ public class AliOcrUtil { msgManager.add(systemMsg); msgManager.add(userMsg); final QwenParam param = - QwenParam.builder().model("qwen-max").messages(msgManager.get()) + QwenParam.builder().model("qwen2-72b-instruct").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F) @@ -945,7 +945,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("寮濮嬪洖绛"); final QwenParam param = - QwenParam.builder().model("qwen-max").messages(msgManager.get()) + QwenParam.builder().model("qwen2-72b-instruct").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F)