diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java index d90d84df..8bad75e7 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/mybatis/MybatisPlusConfig.java @@ -26,7 +26,7 @@ import java.util.List; * */ @Configuration -@MapperScan(value={"com.jero.**.mapper*"}) +@MapperScan(value={"com.jero.member.mapper"}) public class MybatisPlusConfig { /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java index 8a527789..45e1bd50 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectController.java @@ -1,4 +1,4 @@ -package com.jero.controller; +package com.jero.member.controller; import java.util.Arrays; import java.util.List; @@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; -import com.jero.entity.MemberProject; -import com.jero.service.IMemberProjectService; +import com.jero.member.entity.MemberProject; +import com.jero.member.service.IMemberProjectService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java similarity index 96% rename from jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectSubitemController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java index c441a26f..636e1c88 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/controller/MemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/MemberProjectSubitemController.java @@ -1,4 +1,4 @@ -package com.jero.controller; +package com.jero.member.controller; import java.util.Arrays; import java.util.List; @@ -7,14 +7,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; -import com.jero.entity.MemberProjectSubitem; -import com.jero.service.IMemberProjectSubitemService; +import com.jero.member.entity.MemberProjectSubitem; +import com.jero.member.service.IMemberProjectSubitemService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java similarity index 93% rename from jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProject.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java index 651ce25b..dba3c9e5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProject.java @@ -1,8 +1,6 @@ -package com.jero.entity; +package com.jero.member.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,12 +9,10 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java similarity index 95% rename from jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProjectSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java index e1ce82c9..9bccc32a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/entity/MemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/MemberProjectSubitem.java @@ -1,8 +1,6 @@ -package com.jero.entity; +package com.jero.member.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,12 +9,10 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java similarity index 64% rename from jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java index 3a27656c..0a5a8ad7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectMapper.java @@ -1,9 +1,6 @@ -package com.jero.mapper; +package com.jero.member.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.entity.MemberProject; +import com.jero.member.entity.MemberProject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java similarity index 65% rename from jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectSubitemMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java index 414ed79f..00bfa0b9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/MemberProjectSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/MemberProjectSubitemMapper.java @@ -1,9 +1,6 @@ -package com.jero.mapper; +package com.jero.member.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.entity.MemberProjectSubitem; +import com.jero.member.entity.MemberProjectSubitem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml similarity index 86% rename from jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml index 5e23a5ab..526d0fdd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml similarity index 94% rename from jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml index 32d54024..984faccc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mapper/xml/MemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/MemberProjectSubitemMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java similarity index 91% rename from jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java index c8e0946c..3b2990c9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectService.java @@ -1,6 +1,6 @@ -package com.jero.service; +package com.jero.member.service; -import com.jero.entity.MemberProject; +import com.jero.member.entity.MemberProject; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java similarity index 91% rename from jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectSubitemService.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java index 5b6d6721..f6e39778 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/service/IMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IMemberProjectSubitemService.java @@ -1,6 +1,6 @@ -package com.jero.service; +package com.jero.member.service; -import com.jero.entity.MemberProjectSubitem; +import com.jero.member.entity.MemberProjectSubitem; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java similarity index 87% rename from jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java index 954c7b4a..5b477804 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectServiceImpl.java @@ -1,11 +1,11 @@ -package com.jero.service.impl; +package com.jero.member.service.impl; -import com.jero.entity.MemberProject; -import com.jero.mapper.MemberProjectMapper; -import com.jero.service.IMemberProjectService; +import com.jero.member.entity.MemberProject; +import com.jero.member.mapper.MemberProjectMapper; +import com.jero.member.service.IMemberProjectService; import org.springframework.stereotype.Service; import java.util.List; -import java.time.LocalDateTime; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java similarity index 85% rename from jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectSubitemServiceImpl.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java index e8628d87..59c9f7f6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/service/impl/MemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/MemberProjectSubitemServiceImpl.java @@ -1,8 +1,8 @@ -package com.jero.service.impl; +package com.jero.member.service.impl; -import com.jero.entity.MemberProjectSubitem; -import com.jero.mapper.MemberProjectSubitemMapper; -import com.jero.service.IMemberProjectSubitemService; +import com.jero.member.entity.MemberProjectSubitem; +import com.jero.member.mapper.MemberProjectSubitemMapper; +import com.jero.member.service.IMemberProjectSubitemService; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/vo/AVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AVO.java similarity index 73% rename from jero-boot-incoming-payment/src/main/java/com/jero/vo/AVO.java rename to jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AVO.java index 9e3e8e52..44b8c8f2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/vo/AVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/vo/AVO.java @@ -1,4 +1,4 @@ -package com.jero.vo; +package com.jero.member.vo; /** * @author liJiaRao