diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemAdditionController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemAdditionController.java similarity index 92% rename from quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemAdditionController.java rename to common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemAdditionController.java index 48ed8f78..ce00b260 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemAdditionController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemAdditionController.java @@ -1,16 +1,14 @@ -package com.foreverwin.mesnac.quality.controller; +package com.foreverwin.mesnac.common.controller; -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 org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.common.model.InspectionItemAddition; +import com.foreverwin.mesnac.common.service.InspectionItemAdditionService; +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.quality.service.InspectionItemAdditionService; -import com.foreverwin.mesnac.quality.model.InspectionItemAddition; import java.util.List; /** diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemController.java similarity index 93% rename from quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemController.java rename to common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemController.java index 39405881..58ed08db 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemController.java @@ -1,27 +1,24 @@ -package com.foreverwin.mesnac.quality.controller; +package com.foreverwin.mesnac.common.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.common.enums.HandleEnum; +import com.foreverwin.mesnac.common.mapper.InspectionItemAdditionMapper; +import com.foreverwin.mesnac.common.mapper.InspectionItemDetailMapper; +import com.foreverwin.mesnac.common.model.InspectionItem; +import com.foreverwin.mesnac.common.model.InspectionItemAddition; +import com.foreverwin.mesnac.common.model.InspectionItemDetail; +import com.foreverwin.mesnac.common.service.InspectionItemService; import com.foreverwin.mesnac.common.util.StringUtil; -import com.foreverwin.mesnac.quality.mapper.InspectionItemAdditionMapper; -import com.foreverwin.mesnac.quality.mapper.InspectionItemDetailMapper; -import com.foreverwin.mesnac.quality.model.*; -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 com.sap.me.sampling.InspectionData; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.R; import com.visiprise.common.exception.BaseException; -import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.foreverwin.mesnac.quality.service.InspectionItemService; - -import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; -import java.util.UUID; /** * diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemDetailController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemDetailController.java similarity index 93% rename from quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemDetailController.java rename to common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemDetailController.java index bcd5f437..5eea7fc6 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionItemDetailController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/InspectionItemDetailController.java @@ -1,16 +1,14 @@ -package com.foreverwin.mesnac.quality.controller; +package com.foreverwin.mesnac.common.controller; -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 org.springframework.web.bind.annotation.RequestMapping; +import com.foreverwin.mesnac.common.model.InspectionItemDetail; +import com.foreverwin.mesnac.common.service.InspectionItemDetailService; +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.quality.service.InspectionItemDetailService; -import com.foreverwin.mesnac.quality.model.InspectionItemDetail; import java.util.List; /** diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemAdditionMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemAdditionMapper.java similarity index 74% rename from quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemAdditionMapper.java rename to common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemAdditionMapper.java index 353fa4b1..b278b572 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemAdditionMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemAdditionMapper.java @@ -1,7 +1,7 @@ -package com.foreverwin.mesnac.quality.mapper; +package com.foreverwin.mesnac.common.mapper; -import com.foreverwin.mesnac.quality.model.InspectionItemAddition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.common.model.InspectionItemAddition; import org.springframework.stereotype.Repository; /** diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemDetailMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemDetailMapper.java similarity index 73% rename from quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemDetailMapper.java rename to common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemDetailMapper.java index 2123def6..ab12a0c3 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemDetailMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemDetailMapper.java @@ -1,7 +1,7 @@ -package com.foreverwin.mesnac.quality.mapper; +package com.foreverwin.mesnac.common.mapper; -import com.foreverwin.mesnac.quality.model.InspectionItemDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.common.model.InspectionItemDetail; import org.springframework.stereotype.Repository; /** diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java similarity index 74% rename from quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemMapper.java rename to common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java index 0975087c..69471e83 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/mapper/InspectionItemMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java @@ -1,7 +1,7 @@ -package com.foreverwin.mesnac.quality.mapper; +package com.foreverwin.mesnac.common.mapper; -import com.foreverwin.mesnac.quality.model.InspectionItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.foreverwin.mesnac.common.model.InspectionItem; import org.springframework.stereotype.Repository; /** diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItem.java b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItem.java similarity index 98% rename from quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItem.java rename to common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItem.java index 2a0d8af6..3f399a24 100644 --- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItem.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItem.java @@ -1,17 +1,15 @@ -package com.foreverwin.mesnac.quality.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 java.time.LocalDateTime; import java.util.List; -import com.baomidou.mybatisplus.annotation.IdType; - /** *
* 检验项目维护主表
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemAddition.java b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemAddition.java
similarity index 98%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemAddition.java
rename to common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemAddition.java
index 5ef8f332..5f9fdd27 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemAddition.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemAddition.java
@@ -1,4 +1,4 @@
-package com.foreverwin.mesnac.quality.model;
+package com.foreverwin.mesnac.common.model;
import java.io.Serializable;
@@ -7,7 +7,6 @@ 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;
/**
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemDetail.java b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemDetail.java
similarity index 99%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemDetail.java
rename to common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemDetail.java
index 27693290..28068e94 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionItemDetail.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemDetail.java
@@ -1,4 +1,4 @@
-package com.foreverwin.mesnac.quality.model;
+package com.foreverwin.mesnac.common.model;
import java.io.Serializable;
@@ -7,7 +7,6 @@ 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;
/**
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemAdditionService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemAdditionService.java
similarity index 85%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemAdditionService.java
rename to common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemAdditionService.java
index a13bf224..635b17ee 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemAdditionService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemAdditionService.java
@@ -1,7 +1,7 @@
-package com.foreverwin.mesnac.quality.service;
+package com.foreverwin.mesnac.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
+import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.modular.core.util.FrontPage;
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemDetailService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemDetailService.java
similarity index 85%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemDetailService.java
rename to common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemDetailService.java
index fa174d45..d35dec7b 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemDetailService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemDetailService.java
@@ -1,7 +1,7 @@
-package com.foreverwin.mesnac.quality.service;
+package com.foreverwin.mesnac.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
+import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.modular.core.util.FrontPage;
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemService.java
similarity index 83%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemService.java
rename to common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemService.java
index 100fe45e..775e54fb 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/InspectionItemService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemService.java
@@ -1,9 +1,8 @@
-package com.foreverwin.mesnac.quality.service;
+package com.foreverwin.mesnac.common.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.foreverwin.mesnac.quality.model.InspectionItem;
+import com.foreverwin.mesnac.common.model.InspectionItem;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.foreverwin.mesnac.quality.model.InspectionProject;
import com.foreverwin.modular.core.util.FrontPage;
import java.util.List;
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemAdditionServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemAdditionServiceImpl.java
similarity index 85%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemAdditionServiceImpl.java
rename to common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemAdditionServiceImpl.java
index a12be98f..37384b21 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemAdditionServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemAdditionServiceImpl.java
@@ -1,11 +1,11 @@
-package com.foreverwin.mesnac.quality.service.impl;
+package com.foreverwin.mesnac.common.service.impl;
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.quality.model.InspectionItemAddition;
-import com.foreverwin.mesnac.quality.mapper.InspectionItemAdditionMapper;
-import com.foreverwin.mesnac.quality.service.InspectionItemAdditionService;
+import com.foreverwin.mesnac.common.model.InspectionItemAddition;
+import com.foreverwin.mesnac.common.mapper.InspectionItemAdditionMapper;
+import com.foreverwin.mesnac.common.service.InspectionItemAdditionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemDetailServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemDetailServiceImpl.java
similarity index 84%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemDetailServiceImpl.java
rename to common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemDetailServiceImpl.java
index 3e276aa2..7d5f45fb 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemDetailServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemDetailServiceImpl.java
@@ -1,14 +1,14 @@
-package com.foreverwin.mesnac.quality.service.impl;
+package com.foreverwin.mesnac.common.service.impl;
-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.quality.model.InspectionItemDetail;
-import com.foreverwin.mesnac.quality.mapper.InspectionItemDetailMapper;
-import com.foreverwin.mesnac.quality.service.InspectionItemDetailService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.foreverwin.mesnac.common.mapper.InspectionItemDetailMapper;
+import com.foreverwin.mesnac.common.model.InspectionItemDetail;
+import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
+import com.foreverwin.modular.core.util.FrontPage;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
diff --git a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
similarity index 91%
rename from quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemServiceImpl.java
rename to common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
index 6c365a95..acb78352 100644
--- a/quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionItemServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
@@ -1,27 +1,24 @@
-package com.foreverwin.mesnac.quality.service.impl;
+package com.foreverwin.mesnac.common.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.injector.methods.SelectOne;
+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.constant.Constants;
import com.foreverwin.mesnac.common.enums.HandleEnum;
+import com.foreverwin.mesnac.common.mapper.InspectionItemMapper;
+import com.foreverwin.mesnac.common.model.InspectionItem;
+import com.foreverwin.mesnac.common.model.InspectionItemAddition;
+import com.foreverwin.mesnac.common.model.InspectionItemDetail;
+import com.foreverwin.mesnac.common.service.InspectionItemAdditionService;
+import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
+import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.common.util.StringUtil;
-import com.foreverwin.mesnac.quality.model.InspectionItemAddition;
-import com.foreverwin.mesnac.quality.model.InspectionItemDetail;
-import com.foreverwin.mesnac.quality.model.InspectionProject;
-import com.foreverwin.mesnac.quality.service.InspectionItemAdditionService;
-import com.foreverwin.mesnac.quality.service.InspectionItemDetailService;
-import com.foreverwin.mesnac.common.constant.Constants;
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.quality.model.InspectionItem;
-import com.foreverwin.mesnac.quality.mapper.InspectionItemMapper;
-import com.foreverwin.mesnac.quality.service.InspectionItemService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.visiprise.common.exception.BaseException;
-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;
diff --git a/quality/src/main/resources/mapper/InspectionItemAdditionMapper.xml b/common/src/main/resources/mapper/InspectionItemAdditionMapper.xml
similarity index 98%
rename from quality/src/main/resources/mapper/InspectionItemAdditionMapper.xml
rename to common/src/main/resources/mapper/InspectionItemAdditionMapper.xml
index a6f54b27..b4981ee3 100644
--- a/quality/src/main/resources/mapper/InspectionItemAdditionMapper.xml
+++ b/common/src/main/resources/mapper/InspectionItemAdditionMapper.xml
@@ -1,9 +1,9 @@
-