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 @@ - + - + @@ -233,7 +233,7 @@ - + INSERT INTO Z_INSPECTION_ITEM_ADDITION HANDLE, @@ -261,7 +261,7 @@ - + INSERT INTO Z_INSPECTION_ITEM_ADDITION diff --git a/quality/src/main/resources/mapper/InspectionItemDetailMapper.xml b/common/src/main/resources/mapper/InspectionItemDetailMapper.xml similarity index 99% rename from quality/src/main/resources/mapper/InspectionItemDetailMapper.xml rename to common/src/main/resources/mapper/InspectionItemDetailMapper.xml index 4ce78d06..726109ca 100644 --- a/quality/src/main/resources/mapper/InspectionItemDetailMapper.xml +++ b/common/src/main/resources/mapper/InspectionItemDetailMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -313,7 +313,7 @@ - + INSERT INTO Z_INSPECTION_ITEM_DETAIL HANDLE, @@ -361,7 +361,7 @@ - + INSERT INTO Z_INSPECTION_ITEM_DETAIL diff --git a/quality/src/main/resources/mapper/InspectionItemMapper.xml b/common/src/main/resources/mapper/InspectionItemMapper.xml similarity index 98% rename from quality/src/main/resources/mapper/InspectionItemMapper.xml rename to common/src/main/resources/mapper/InspectionItemMapper.xml index 555c3b12..5f2ebdda 100644 --- a/quality/src/main/resources/mapper/InspectionItemMapper.xml +++ b/common/src/main/resources/mapper/InspectionItemMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -257,7 +257,7 @@ - + INSERT INTO Z_INSPECTION_ITEM HANDLE, @@ -291,7 +291,7 @@ - + INSERT INTO Z_INSPECTION_ITEM diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java new file mode 100644 index 00000000..262b02d8 --- /dev/null +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java @@ -0,0 +1,136 @@ +package com.foreverwin.mesnac.dispatch.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.dispatch.model.UserResource; +import com.foreverwin.mesnac.dispatch.service.UserResourceService; +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 java.util.HashMap; +import java.util.List; + +/** + * + * @author robert + * @since 2021-06-16 + */ +@RestController +@RequestMapping("/Z-USER-RESOURCE") +public class UserResourceController { + + @Autowired + public UserResourceService userResourceService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getZUserResourceById(@PathVariable String id) { + return R.ok( userResourceService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getZUserResourceList(UserResource userResource){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(userResource); + result = userResourceService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, UserResource zUserResource){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(zUserResource); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(UserResource::getHandle, frontPage.getGlobalQuery()) + .or().like(UserResource::getSite, frontPage.getGlobalQuery()) + .or().like(UserResource::getResourceBo, frontPage.getGlobalQuery()) + .or().like(UserResource::getResrce, frontPage.getGlobalQuery()) + .or().like(UserResource::getUserId, frontPage.getGlobalQuery()) + .or().like(UserResource::getTemporaryUser, frontPage.getGlobalQuery()) + .or().like(UserResource::getStatus, frontPage.getGlobalQuery()) + .or().like(UserResource::getCreateUser, frontPage.getGlobalQuery()) + .or().like(UserResource::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = userResourceService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param zUserResource 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody UserResource zUserResource) { + return R.ok(userResourceService.save(zUserResource)); + } + + /** + * 修改 + * @param zUserResource 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody UserResource zUserResource) { + return R.ok(userResourceService.updateById(zUserResource)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(userResourceService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(userResourceService.removeByIds(ids)); + } + + @GetMapping("/findAll") + public R findAll(String resource,String user){ + return R.ok(userResourceService.findAll(resource,user)); + } + + @PostMapping("saveAll") + public R saveAll(@RequestBody HashMap map){ + userResourceService.saveAll(map); + return R.ok(); + } +} \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java index 8db6c2dc..a52e01f6 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java @@ -19,4 +19,5 @@ import java.util.List; public interface UserResourceMapper extends BaseMapper { List findEnableList(@Param("site") String site, @Param("resource") String resource, @Param("user") String user); + } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java index 2a5d0476..b25be4ba 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java @@ -1,8 +1,9 @@ package com.foreverwin.mesnac.dispatch.service; -import com.foreverwin.mesnac.dispatch.model.UserResource; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.dispatch.model.UserResource; +import java.util.HashMap; import java.util.List; /** @@ -16,4 +17,8 @@ import java.util.List; public interface UserResourceService extends IService { List findEnableList(String site, String resource, String user); + + List findAll(String resource,String user); + + void saveAll(HashMap map); } \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java index d634aaef..14680a30 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java @@ -1,17 +1,20 @@ package com.foreverwin.mesnac.dispatch.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.dispatch.model.UserResource; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.dispatch.mapper.UserResourceMapper; +import com.foreverwin.mesnac.dispatch.model.UserResource; import com.foreverwin.mesnac.dispatch.service.UserResourceService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.foreverwin.modular.core.util.CommonMethods; 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.ArrayList; +import java.util.HashMap; import java.util.List; + /** *

* 员工资源对应表 服务实现类 @@ -34,4 +37,41 @@ public class UserResourceServiceImpl extends ServiceImpl findEnableList(String site, String resource, String user) { return userResourceMapper.findEnableList(site, resource, user); } + + @Override + public List findAll(String resource, String user) { + String site = CommonMethods.getSite(); + return userResourceMapper.findEnableList(site,resource,user); + } + + @Override + public void saveAll(HashMap map) { + List userResourceList = new ArrayList(); + + List> list = (List>)map.get("userResourceList"); +// (List)map.get("userResourceList"); + + String site = CommonMethods.getSite(); + for (int i=0; i < list.size(); i++) { + UserResource userResource = new UserResource(); + userResource.setSite(site); + userResource.setResourceBo(HandleEnum.RESOURCE.getHandle(site, list.get(i).get("resrce").toString())); + userResource.setResrce(list.get(i).get("resrce").toString()); + userResource.setUserId(list.get(i).get("userId").toString()); + userResource.setTemporaryUser(list.get(i).get("temporaryUser").toString()); + userResource.setStatus(list.get(i).get("status").toString()); + userResource.setCreateUser(CommonMethods.getUser()); + userResource.setHandle("UserResourceBo:"+userResource.getSite()+","+ + userResource.getResrce()+","+userResource.getUserId()); + if(userResourceMapper.selectById(userResource.getHandle()) == null){ + userResource.setCreatedDateTime(LocalDateTime.now()); + } + + userResource.setModifyUser(CommonMethods.getUser()); + userResource.setModifiedDateTime(LocalDateTime.now()); + + userResourceList.add(userResource); + } + this.saveOrUpdateBatch(userResourceList); + } } \ No newline at end of file diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml index 526ca1d3..63228337 100644 --- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml +++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml @@ -427,4 +427,5 @@ AND USER_ID = #{user} + diff --git a/equip/equip.iml b/equip/equip.iml deleted file mode 100644 index 29ce8310..00000000 --- a/equip/equip.iml +++ /dev/null @@ -1,216 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java new file mode 100644 index 00000000..4e7286ea --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/NwaUserController.java @@ -0,0 +1,146 @@ +package com.foreverwin.mesnac.meapi.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.NwaUser; +import com.foreverwin.mesnac.meapi.service.NwaUserService; +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 java.time.LocalDateTime; +import java.util.List; + +/** + * + * @author robert + * @since 2021-06-16 + */ +@RestController +@RequestMapping("/Z-NWA-USER") +public class NwaUserController { + + @Autowired + public NwaUserService nwaUserService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getNwaUserById(@PathVariable String id) + { + return R.ok( nwaUserService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getNwaUserList(NwaUser nwaUser){ + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(nwaUser); + result = nwaUserService.list(queryWrapper); + return R.ok(result); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, NwaUser nwaUser){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + String site = CommonMethods.getSite(); + nwaUser.setSite(site); + queryWrapper.setEntity(nwaUser); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(NwaUser::getHandle, frontPage.getGlobalQuery()) + .or().like(NwaUser::getUserName, frontPage.getGlobalQuery()) + .or().like(NwaUser::getFirstName, frontPage.getGlobalQuery()) + .or().like(NwaUser::getLastName, frontPage.getGlobalQuery()) + .or().like(NwaUser::getFullName, frontPage.getGlobalQuery()) + .or().like(NwaUser::getPassword, frontPage.getGlobalQuery()) + .or().like(NwaUser::getSalt, frontPage.getGlobalQuery()) + .or().like(NwaUser::getPhone, frontPage.getGlobalQuery()) + .or().like(NwaUser::getAvatar, frontPage.getGlobalQuery()) + .or().like(NwaUser::getDeptId, frontPage.getGlobalQuery()) + .or().like(NwaUser::getLockFlag, frontPage.getGlobalQuery()) + .or().like(NwaUser::getDelFlag, frontPage.getGlobalQuery()) + .or().like(NwaUser::getSite, frontPage.getGlobalQuery()) + .or().like(NwaUser::getDeptDesc, frontPage.getGlobalQuery()) + .or().like(NwaUser::getJobTitle, frontPage.getGlobalQuery()) + .or().like(NwaUser::getEmail, frontPage.getGlobalQuery()) + ); + } + result = nwaUserService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param nwaUser 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody NwaUser nwaUser) { + LocalDateTime now = LocalDateTime.now(); + nwaUser.setCreateTime(now); + nwaUser.setUpdateTime(now); + return R.ok(nwaUserService.save(nwaUser)); + } + + /** + * 修改 + * @param nwaUser 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody NwaUser nwaUser) { + LocalDateTime now = LocalDateTime.now(); + nwaUser.setUpdateTime(now); + return R.ok(nwaUserService.updateById(nwaUser)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(nwaUserService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(nwaUserService.removeByIds(ids)); + } + + @GetMapping("findUserById") + public R findUserById(String user){ + return R.ok(nwaUserService.findUserByUserName(user)); + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java index c63dcceb..08afa467 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java @@ -131,4 +131,11 @@ public class ResrceController { public R removeByIds(List ids){ return R.ok(resrceService.removeByIds(ids)); } + /** + * + */ + @GetMapping("findByResrce") + public R findByResrce(String resrce){ + return R.ok(resrceService.findByResrce(resrce)); + } } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java new file mode 100644 index 00000000..9ae771bd --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/NwaUserMapper.java @@ -0,0 +1,19 @@ +package com.foreverwin.mesnac.meapi.mapper; + +import com.foreverwin.mesnac.meapi.model.NwaUser; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +/** + *

+ * Mapper 接口 + *

+ * + * @author robert + * @since 2021-06-16 + */ +@Repository +public interface NwaUserMapper extends BaseMapper { + NwaUser findUserByUserName(@Param("site")String site, @Param("user")String user); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java index 8d437689..e6b9b8a8 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java @@ -28,4 +28,6 @@ public interface ResrceMapper extends BaseMapper { * @return */ List> selectResourceTypeResourceList(@Param("site") String site); + + Resrce findByResrce(@Param("site")String site,@Param("resrce")String resrce); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java new file mode 100644 index 00000000..98efd105 --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/model/NwaUser.java @@ -0,0 +1,300 @@ +package com.foreverwin.mesnac.meapi.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 java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author robert + * @since 2021-06-16 + */ + +@TableName("Z_NWA_USER") + +public class NwaUser extends Model { + + private static final long serialVersionUID = 1L; + + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + @TableField("USER_NAME") + private String userName; + @TableField("FIRST_NAME") + private String firstName; + @TableField("LAST_NAME") + private String lastName; + @TableField("FULL_NAME") + private String fullName; + @TableField("PASSWORD") + private String password; + @TableField("SALT") + private String salt; + @TableField("PHONE") + private String phone; + @TableField("AVATAR") + private String avatar; + @TableField("DEPT_ID") + private String deptId; + @TableField("CREATE_TIME") + private LocalDateTime createTime; + @TableField("UPDATE_TIME") + private LocalDateTime updateTime; + @TableField("LOCK_FLAG") + private String lockFlag; + @TableField("DEL_FLAG") + private String delFlag; + @TableField("SITE") + private String site; + @TableField("DEPT_DESC") + private String deptDesc; + @TableField("VALID_FROM") + private LocalDateTime validFrom; + @TableField("VALID_TO") + private LocalDateTime validTo; + @TableField("JOB_TITLE") + private String jobTitle; + @TableField("EMAIL") + private String email; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getSalt() { + return salt; + } + + public void setSalt(String salt) { + this.salt = salt; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public LocalDateTime getCreateTime() { + return createTime; + } + + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; + } + + public LocalDateTime getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(LocalDateTime updateTime) { + this.updateTime = updateTime; + } + + public String getLockFlag() { + return lockFlag; + } + + public void setLockFlag(String lockFlag) { + this.lockFlag = lockFlag; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getDeptDesc() { + return deptDesc; + } + + public void setDeptDesc(String deptDesc) { + this.deptDesc = deptDesc; + } + + public LocalDateTime getValidFrom() { + return validFrom; + } + + public void setValidFrom(LocalDateTime validFrom) { + this.validFrom = validFrom; + } + + public LocalDateTime getValidTo() { + return validTo; + } + + public void setValidTo(LocalDateTime validTo) { + this.validTo = validTo; + } + + public String getJobTitle() { + return jobTitle; + } + + public void setJobTitle(String jobTitle) { + this.jobTitle = jobTitle; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + +public static final String HANDLE = "HANDLE"; + +public static final String USER_NAME = "USER_NAME"; + +public static final String FIRST_NAME = "FIRST_NAME"; + +public static final String LAST_NAME = "LAST_NAME"; + +public static final String FULL_NAME = "FULL_NAME"; + +public static final String PASSWORD = "PASSWORD"; + +public static final String SALT = "SALT"; + +public static final String PHONE = "PHONE"; + +public static final String AVATAR = "AVATAR"; + +public static final String DEPT_ID = "DEPT_ID"; + +public static final String CREATE_TIME = "CREATE_TIME"; + +public static final String UPDATE_TIME = "UPDATE_TIME"; + +public static final String LOCK_FLAG = "LOCK_FLAG"; + +public static final String DEL_FLAG = "DEL_FLAG"; + +public static final String SITE = "SITE"; + +public static final String DEPT_DESC = "DEPT_DESC"; + +public static final String VALID_FROM = "VALID_FROM"; + +public static final String VALID_TO = "VALID_TO"; + +public static final String JOB_TITLE = "JOB_TITLE"; + +public static final String EMAIL = "EMAIL"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "NwaUser{" + + "handle = " + handle + + ", userName = " + userName + + ", firstName = " + firstName + + ", lastName = " + lastName + + ", fullName = " + fullName + + ", password = " + password + + ", salt = " + salt + + ", phone = " + phone + + ", avatar = " + avatar + + ", deptId = " + deptId + + ", createTime = " + createTime + + ", updateTime = " + updateTime + + ", lockFlag = " + lockFlag + + ", delFlag = " + delFlag + + ", site = " + site + + ", deptDesc = " + deptDesc + + ", validFrom = " + validFrom + + ", validTo = " + validTo + + ", jobTitle = " + jobTitle + + ", email = " + email + + "}"; + } +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java new file mode 100644 index 00000000..86722cba --- /dev/null +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/NwaUserService.java @@ -0,0 +1,30 @@ +package com.foreverwin.mesnac.meapi.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.foreverwin.mesnac.meapi.model.NwaUser; +import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.modular.core.util.FrontPage; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author robert + * @since 2021-06-16 + */ +public interface NwaUserService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, NwaUser nwaUser); + + List selectList(NwaUser nwaUser); + + NwaUser findUserByUserName(String id); +} \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java index 42d1e67a..8e12d7e5 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java @@ -43,4 +43,6 @@ public interface ResrceService extends IService { * @return */ List> getResourceTypeResourceList(String site); + + Resrce findByResrce(String resrce); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java index 0c574b16..0d8f23b1 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.meapi.service.impl; +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; @@ -54,5 +55,12 @@ public class ResrceServiceImpl extends ServiceImpl impleme return resrceMapper.selectResourceTypeResourceList(site); } + @Override + public Resrce findByResrce(String resrce) { + String site = CommonMethods.getSite(); + Resrce byResrce = resrceMapper.findByResrce(site, resrce); + return byResrce; + } + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/NwaUserMapper.xml b/meapi/src/main/resources/mapper/NwaUserMapper.xml new file mode 100644 index 00000000..9ebe8892 --- /dev/null +++ b/meapi/src/main/resources/mapper/NwaUserMapper.xml @@ -0,0 +1,570 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, USER_NAME, FIRST_NAME, LAST_NAME, FULL_NAME, PASSWORD, SALT, PHONE, AVATAR, DEPT_ID, CREATE_TIME, UPDATE_TIME, LOCK_FLAG, DEL_FLAG, SITE, DEPT_DESC, VALID_FROM, VALID_TO, JOB_TITLE, EMAIL + + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_NWA_USER + + HANDLE, + USER_NAME, + FIRST_NAME, + LAST_NAME, + FULL_NAME, + PASSWORD, + SALT, + PHONE, + AVATAR, + DEPT_ID, + CREATE_TIME, + UPDATE_TIME, + LOCK_FLAG, + DEL_FLAG, + SITE, + DEPT_DESC, + VALID_FROM, + VALID_TO, + JOB_TITLE, + EMAIL, + VALUES + + #{handle}, + #{userName}, + #{firstName}, + #{lastName}, + #{fullName}, + #{password}, + #{salt}, + #{phone}, + #{avatar}, + #{deptId}, + #{createTime}, + #{updateTime}, + #{lockFlag}, + #{delFlag}, + #{site}, + #{deptDesc}, + #{validFrom}, + #{validTo}, + #{jobTitle}, + #{email}, + + + + + INSERT INTO Z_NWA_USER + + + VALUES + + #{handle}, + #{userName}, + #{firstName}, + #{lastName}, + #{fullName}, + #{password}, + #{salt}, + #{phone}, + #{avatar}, + #{deptId}, + #{createTime}, + #{updateTime}, + #{lockFlag}, + #{delFlag}, + #{site}, + #{deptDesc}, + #{validFrom}, + #{validTo}, + #{jobTitle}, + #{email}, + + + + + + UPDATE Z_NWA_USER + USER_NAME=#{et.userName}, + FIRST_NAME=#{et.firstName}, + LAST_NAME=#{et.lastName}, + FULL_NAME=#{et.fullName}, + PASSWORD=#{et.password}, + SALT=#{et.salt}, + PHONE=#{et.phone}, + AVATAR=#{et.avatar}, + DEPT_ID=#{et.deptId}, + CREATE_TIME=#{et.createTime}, + UPDATE_TIME=#{et.updateTime}, + LOCK_FLAG=#{et.lockFlag}, + DEL_FLAG=#{et.delFlag}, + SITE=#{et.site}, + DEPT_DESC=#{et.deptDesc}, + VALID_FROM=#{et.validFrom}, + VALID_TO=#{et.validTo}, + JOB_TITLE=#{et.jobTitle}, + EMAIL=#{et.email}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_NWA_USER + USER_NAME=#{et.userName}, + FIRST_NAME=#{et.firstName}, + LAST_NAME=#{et.lastName}, + FULL_NAME=#{et.fullName}, + PASSWORD=#{et.password}, + SALT=#{et.salt}, + PHONE=#{et.phone}, + AVATAR=#{et.avatar}, + DEPT_ID=#{et.deptId}, + CREATE_TIME=#{et.createTime}, + UPDATE_TIME=#{et.updateTime}, + LOCK_FLAG=#{et.lockFlag}, + DEL_FLAG=#{et.delFlag}, + SITE=#{et.site}, + DEPT_DESC=#{et.deptDesc}, + VALID_FROM=#{et.validFrom}, + VALID_TO=#{et.validTo}, + JOB_TITLE=#{et.jobTitle}, + EMAIL=#{et.email}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_NWA_USER + USER_NAME=#{et.userName}, + FIRST_NAME=#{et.firstName}, + LAST_NAME=#{et.lastName}, + FULL_NAME=#{et.fullName}, + PASSWORD=#{et.password}, + SALT=#{et.salt}, + PHONE=#{et.phone}, + AVATAR=#{et.avatar}, + DEPT_ID=#{et.deptId}, + CREATE_TIME=#{et.createTime}, + UPDATE_TIME=#{et.updateTime}, + LOCK_FLAG=#{et.lockFlag}, + DEL_FLAG=#{et.delFlag}, + SITE=#{et.site}, + DEPT_DESC=#{et.deptDesc}, + VALID_FROM=#{et.validFrom}, + VALID_TO=#{et.validTo}, + JOB_TITLE=#{et.jobTitle}, + EMAIL=#{et.email}, + + + + + HANDLE=#{ew.entity.handle} + AND USER_NAME=#{ew.entity.userName} + AND FIRST_NAME=#{ew.entity.firstName} + AND LAST_NAME=#{ew.entity.lastName} + AND FULL_NAME=#{ew.entity.fullName} + AND PASSWORD=#{ew.entity.password} + AND SALT=#{ew.entity.salt} + AND PHONE=#{ew.entity.phone} + AND AVATAR=#{ew.entity.avatar} + AND DEPT_ID=#{ew.entity.deptId} + AND CREATE_TIME=#{ew.entity.createTime} + AND UPDATE_TIME=#{ew.entity.updateTime} + AND LOCK_FLAG=#{ew.entity.lockFlag} + AND DEL_FLAG=#{ew.entity.delFlag} + AND SITE=#{ew.entity.site} + AND DEPT_DESC=#{ew.entity.deptDesc} + AND VALID_FROM=#{ew.entity.validFrom} + AND VALID_TO=#{ew.entity.validTo} + AND JOB_TITLE=#{ew.entity.jobTitle} + AND EMAIL=#{ew.entity.email} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_NWA_USER WHERE HANDLE=#{handle} + + + + DELETE FROM Z_NWA_USER + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_NWA_USER + + + + + HANDLE=#{ew.entity.handle} + + AND USER_NAME=#{ew.entity.userName} + AND FIRST_NAME=#{ew.entity.firstName} + AND LAST_NAME=#{ew.entity.lastName} + AND FULL_NAME=#{ew.entity.fullName} + AND PASSWORD=#{ew.entity.password} + AND SALT=#{ew.entity.salt} + AND PHONE=#{ew.entity.phone} + AND AVATAR=#{ew.entity.avatar} + AND DEPT_ID=#{ew.entity.deptId} + AND CREATE_TIME=#{ew.entity.createTime} + AND UPDATE_TIME=#{ew.entity.updateTime} + AND LOCK_FLAG=#{ew.entity.lockFlag} + AND DEL_FLAG=#{ew.entity.delFlag} + AND SITE=#{ew.entity.site} + AND DEPT_DESC=#{ew.entity.deptDesc} + AND VALID_FROM=#{ew.entity.validFrom} + AND VALID_TO=#{ew.entity.validTo} + AND JOB_TITLE=#{ew.entity.jobTitle} + AND EMAIL=#{ew.entity.email} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_NWA_USER WHERE HANDLE IN ( + #{item} + ) + + + + diff --git a/meapi/src/main/resources/mapper/ResrceMapper.xml b/meapi/src/main/resources/mapper/ResrceMapper.xml index 027a15db..b6383fa2 100644 --- a/meapi/src/main/resources/mapper/ResrceMapper.xml +++ b/meapi/src/main/resources/mapper/ResrceMapper.xml @@ -556,4 +556,12 @@ INNER JOIN RESOURCE_TYPE RT ON RT.HANDLE = RTR.RESOURCE_TYPE_BO WHERE RT.SITE = #{site} +