wangfukang
2 years ago
60 changed files with 765 additions and 231 deletions
@ -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 |
|||
@ -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; |
|||
@ -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<LogisticsAddressBook> { |
|||
@ -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; |
|||
|
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
|
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
|
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
|
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
|
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
|
|||
@ -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; |
|||
@ -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; |
|||
@ -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; |
|||
@ -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")); |
|||
|
|||
/** |
|||
* 常用日期格式，yyyy-MM-dd |
|||
*/ |
|||
public static final DateUtil COMMON = new DateUtil(new SimpleDateFormat("yyyy-MM-dd")); |
|||
/** |
|||
* 常用日期格式，yyyy |
|||
*/ |
|||
public static final DateUtil COMMONYEAR = new DateUtil(new SimpleDateFormat("yyyy")); |
|||
|
|||
/** |
|||
* 常用日期格式，yyyy-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")); |
|||
|
|||
/** |
|||
* 中文日期格式常用，yyyy年MM月dd日 |
|||
*/ |
|||
public static final DateUtil CHINESE = new DateUtil(new SimpleDateFormat("yyyy年MM月dd日")); |
|||
|
|||
/** |
|||
* 中文日期格式常用，yyyy年MM月dd日 HH时mm分ss秒 |
|||
*/ |
|||
public static final DateUtil CHINESE_FULL = new DateUtil(new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒")); |
|||
|
|||
/** |
|||
* 日期获取字符串 |
|||
*/ |
|||
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<String> getAllDate(String startTime, String endTime) { |
|||
final List<String> list = new ArrayList<String>(); |
|||
// 判断开始时间是周几
|
|||
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); |
|||
} |
|||
} |
|||
|
|||
/** |
|||
* 判断当前时间在时间范围内，格式yyyy-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; |
|||
} |
|||
} |
|||
|
|||
Loading…
Reference in new issue