diff --git a/production/src/main/java/com/foreverwin/mesnac/production/controller/ToolController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ToolController.java similarity index 93% rename from production/src/main/java/com/foreverwin/mesnac/production/controller/ToolController.java rename to common/src/main/java/com/foreverwin/mesnac/common/controller/ToolController.java index f6e1fd84..e6166cce 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/controller/ToolController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ToolController.java @@ -1,18 +1,15 @@ -package com.foreverwin.mesnac.production.controller; +package com.foreverwin.mesnac.common.controller; -import com.foreverwin.mesnac.common.enums.HandleEnum; -import com.foreverwin.modular.core.util.R; -import com.foreverwin.modular.core.util.FrontPage; -import com.foreverwin.modular.core.util.CommonMethods; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import oracle.jdbc.proxy.annotation.Post; -import org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.common.model.Tool; +import com.foreverwin.mesnac.common.service.ToolService; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.production.service.ToolService; -import com.foreverwin.mesnac.production.model.Tool; import java.util.List; /** diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/ToolMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ToolMapper.java similarity index 72% rename from production/src/main/java/com/foreverwin/mesnac/production/mapper/ToolMapper.java rename to common/src/main/java/com/foreverwin/mesnac/common/mapper/ToolMapper.java index 420f192a..9f81d5e0 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/mapper/ToolMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ToolMapper.java @@ -1,7 +1,7 @@ -package com.foreverwin.mesnac.production.mapper; +package com.foreverwin.mesnac.common.mapper; -import com.foreverwin.mesnac.production.model.Tool; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.common.model.Tool; import org.springframework.stereotype.Repository; /** diff --git a/production/src/main/java/com/foreverwin/mesnac/production/model/Tool.java b/common/src/main/java/com/foreverwin/mesnac/common/model/Tool.java similarity index 98% rename from production/src/main/java/com/foreverwin/mesnac/production/model/Tool.java rename to common/src/main/java/com/foreverwin/mesnac/common/model/Tool.java index 811fa806..5f170704 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/model/Tool.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/model/Tool.java @@ -1,14 +1,13 @@ -package com.foreverwin.mesnac.production.model; - -import java.io.Serializable; +package com.foreverwin.mesnac.common.model; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; + import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; +import java.time.LocalDateTime; /** *

diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/ToolService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ToolService.java similarity index 89% rename from production/src/main/java/com/foreverwin/mesnac/production/service/ToolService.java rename to common/src/main/java/com/foreverwin/mesnac/common/service/ToolService.java index 944ce12b..a49fe251 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/ToolService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ToolService.java @@ -1,8 +1,8 @@ -package com.foreverwin.mesnac.production.service; +package com.foreverwin.mesnac.common.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.production.model.Tool; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.common.model.Tool; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/ToolServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ToolServiceImpl.java similarity index 92% rename from production/src/main/java/com/foreverwin/mesnac/production/service/impl/ToolServiceImpl.java rename to common/src/main/java/com/foreverwin/mesnac/common/service/impl/ToolServiceImpl.java index 04b03f38..bf8ff9cc 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/ToolServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ToolServiceImpl.java @@ -1,21 +1,22 @@ -package com.foreverwin.mesnac.production.service.impl; +package com.foreverwin.mesnac.common.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.mapper.ToolMapper; +import com.foreverwin.mesnac.common.model.Tool; +import com.foreverwin.mesnac.common.service.ToolService; import com.foreverwin.modular.core.exception.BusinessException; import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.foreverwin.mesnac.production.model.Tool; -import com.foreverwin.mesnac.production.mapper.ToolMapper; -import com.foreverwin.mesnac.production.service.ToolService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.List; + /** *

* 工具表 服务实现类 diff --git a/production/src/main/resources/mapper/ToolMapper.xml b/common/src/main/resources/mapper/ToolMapper.xml similarity index 98% rename from production/src/main/resources/mapper/ToolMapper.xml rename to common/src/main/resources/mapper/ToolMapper.xml index 67462821..e34b8617 100644 --- a/production/src/main/resources/mapper/ToolMapper.xml +++ b/common/src/main/resources/mapper/ToolMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -257,7 +257,7 @@ - + INSERT INTO Z_TOOL HANDLE, @@ -291,7 +291,7 @@ - + INSERT INTO Z_TOOL