diff --git a/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml b/nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml similarity index 78% rename from nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml rename to nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml index 1f4ba09..cd4f20b 100644 --- a/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nu-service-directive-api + nu-services-api 2.0.0 4.0.0 - nu-service-directive-local-api + nu-services-local-api diff --git a/nursing-unit-service-directive/nu-service-directive-api/pom.xml b/nursing-unit-services/nu-services-api/pom.xml similarity index 79% rename from nursing-unit-service-directive/nu-service-directive-api/pom.xml rename to nursing-unit-services/nu-services-api/pom.xml index 98bed17..6260c6c 100644 --- a/nursing-unit-service-directive/nu-service-directive-api/pom.xml +++ b/nursing-unit-services/nu-services-api/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nursing-unit-service-directive + nursing-unit-services 2.0.0 4.0.0 - nu-service-directive-api + nu-services-api pom - nu-service-directive-local-api + nu-services-local-api diff --git a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml b/nursing-unit-services/nu-services-biz/pom.xml similarity index 86% rename from nursing-unit-service-directive/nu-service-directive-biz/pom.xml rename to nursing-unit-services/nu-services-biz/pom.xml index 809337a..eb55e93 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml +++ b/nursing-unit-services/nu-services-biz/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nursing-unit-service-directive + nursing-unit-services 2.0.0 4.0.0 - nu-service-directive-biz + nu-services-biz com.nursingunit.boot - nu-service-directive-local-api + nu-services-local-api ${nursingunit.version} diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java similarity index 97% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java index 2b46077..31f1499 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java @@ -1,10 +1,10 @@ -package com.nu.modules.directivePackage.controller; +package com.nu.modules.directivepackage.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directivePackage.entity.DirectivePackage; -import com.nu.modules.directivePackage.service.IDirectivePackageService; +import com.nu.modules.directivepackage.entity.DirectivePackage; +import com.nu.modules.directivepackage.service.IDirectivePackageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java similarity index 89% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/entity/DirectivePackage.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java index f667dc3..8d9b606 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/entity/DirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java @@ -1,15 +1,10 @@ -package com.nu.modules.directivePackage.entity; +package com.nu.modules.directivepackage.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.*; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/DirectivePackageMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/DirectivePackageMapper.java similarity index 80% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/DirectivePackageMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/DirectivePackageMapper.java index fd076f3..7f0b6bc 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/DirectivePackageMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/DirectivePackageMapper.java @@ -1,10 +1,9 @@ -package com.nu.modules.directivePackage.mapper; +package com.nu.modules.directivepackage.mapper; import java.util.List; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; -import com.nu.modules.directivePackage.entity.DirectivePackage; +import com.nu.modules.directivepackage.entity.DirectivePackage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml similarity index 95% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml index 25cf720..702590f 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -15,7 +15,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -133,10 +133,6 @@ AND iz_enabled = #{directivePackage.izEnabled} - - diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/IDirectivePackageService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/IDirectivePackageService.java similarity index 74% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/IDirectivePackageService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/IDirectivePackageService.java index 67f531f..262809a 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/IDirectivePackageService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/IDirectivePackageService.java @@ -1,12 +1,9 @@ -package com.nu.modules.directivePackage.service; +package com.nu.modules.directivepackage.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directivePackage.entity.DirectivePackage; +import com.nu.modules.directivepackage.entity.DirectivePackage; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.List; - /** * @Description: 服务指令包 * @Author: 张明远 diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/impl/DirectivePackageServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java similarity index 79% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/impl/DirectivePackageServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java index ba1680a..df2997b 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/impl/DirectivePackageServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java @@ -1,16 +1,14 @@ -package com.nu.modules.directivePackage.service.impl; +package com.nu.modules.directivepackage.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.nu.modules.directivePackage.entity.DirectivePackage; -import com.nu.modules.directivePackage.mapper.DirectivePackageMapper; -import com.nu.modules.directivePackage.service.IDirectivePackageService; +import com.nu.modules.directivepackage.entity.DirectivePackage; +import com.nu.modules.directivepackage.mapper.DirectivePackageMapper; +import com.nu.modules.directivepackage.service.IDirectivePackageService; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** * @Description: 服务指令包 diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java similarity index 96% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java index 6d9540e..a2ffdf6 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java @@ -1,10 +1,10 @@ -package com.nu.modules.directiveTag.controller; +package com.nu.modules.directivetag.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directiveTag.entity.DirectiveTag; -import com.nu.modules.directiveTag.service.IDirectiveTagService; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.service.IDirectiveTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java similarity index 91% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java index 0fea656..0a14365 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java @@ -1,15 +1,11 @@ -package com.nu.modules.directiveTag.entity; +package com.nu.modules.directivetag.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java similarity index 58% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java index 3355bcf..b7096a9 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.directiveTag.mapper; +package com.nu.modules.directivetag.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directivetag.entity.DirectiveTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml similarity index 68% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml index a992d83..684ac3f 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java similarity index 77% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java index 9cff657..3d39dc8 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java @@ -1,6 +1,6 @@ -package com.nu.modules.directiveTag.service; +package com.nu.modules.directivetag.service; -import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directivetag.entity.DirectiveTag; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java similarity index 67% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java index c681106..75d292c 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java @@ -1,11 +1,9 @@ -package com.nu.modules.directiveTag.service.impl; +package com.nu.modules.directivetag.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.directiveTag.entity.DirectiveTag; -import com.nu.modules.directiveTag.mapper.DirectiveTagMapper; -import com.nu.modules.directiveTag.service.IDirectiveTagService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.mapper.DirectiveTagMapper; +import com.nu.modules.directivetag.service.IDirectiveTagService; +import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,7 +11,6 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.Arrays; -import java.util.List; /** * @Description: 指令标签 diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java similarity index 96% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java index 520b32a..5e0a28b 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java @@ -1,10 +1,10 @@ -package com.nu.modules.serviceCategory.controller; +package com.nu.modules.servicecategory.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; -import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java similarity index 91% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java index ffc5fec..75fb8f0 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java @@ -1,15 +1,11 @@ -package com.nu.modules.serviceCategory.entity; +package com.nu.modules.servicecategory.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java similarity index 58% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java index a7b64dc..a87a5d5 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.serviceCategory.mapper; +package com.nu.modules.servicecategory.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 69% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml index e7c0247..7b4963d 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java similarity index 77% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java index 95de7ac..53af546 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java @@ -1,6 +1,6 @@ -package com.nu.modules.serviceCategory.service; +package com.nu.modules.servicecategory.service; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 82% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java index 1fc9f44..99538bd 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -1,13 +1,13 @@ -package com.nu.modules.serviceCategory.service.impl; +package com.nu.modules.servicecategory.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.ServiceType.entity.ConfigServiceType; -import com.nu.modules.ServiceType.service.IConfigServiceTypeService; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; -import com.nu.modules.serviceCategory.mapper.ConfigServiceCategoryMapper; -import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.mapper.ConfigServiceCategoryMapper; +import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java similarity index 97% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index 5ca6bee..eb15633 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -1,12 +1,10 @@ -package com.nu.modules.serviceDirective.controller; +package com.nu.modules.servicedirective.controller; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java similarity index 98% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index 40c0a8a..71dd794 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -1,8 +1,8 @@ -package com.nu.modules.serviceDirective.entity; +package com.nu.modules.servicedirective.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directivetag.entity.DirectiveTag; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java similarity index 85% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java index 20db783..d9131c9 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java @@ -1,11 +1,9 @@ -package com.nu.modules.serviceDirective.mapper; +package com.nu.modules.servicedirective.mapper; import java.util.List; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 94% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index aec6e7b..c8987fd 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -1,10 +1,10 @@ - + + type="com.nu.modules.servicedirective.entity.ConfigServiceDirective"> @@ -29,7 +29,7 @@ - + @@ -75,7 +75,7 @@ ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc - SELECT distinct directive_id as id FROM nu_directive_tag WHERE tag_id IN #{tagId} diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java similarity index 79% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java index 2cf1760..bf7c54e 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java @@ -1,13 +1,10 @@ -package com.nu.modules.serviceDirective.service; +package com.nu.modules.servicedirective.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.system.query.QueryRuleEnum; -import javax.servlet.http.HttpServletRequest; import java.util.List; -import java.util.Map; /** * @Description: 服务指令 diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java similarity index 90% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 465833f..44e7e72 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -1,22 +1,14 @@ -package com.nu.modules.serviceDirective.service.impl; +package com.nu.modules.servicedirective.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directiveTag.entity.DirectiveTag; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; -import org.apache.commons.compress.utils.Lists; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java new file mode 100644 index 0000000..ebc6e3f --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java @@ -0,0 +1,178 @@ +package com.nu.modules.servicetag.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nu.modules.servicetag.entity.ServiceTag; +import com.nu.modules.servicetag.service.IServiceTagService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.query.QueryRuleEnum; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description: 服务标签 + * @Author: 张明远 + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Api(tags = "服务标签") +@RestController +@RequestMapping("/serviceTag/serviceTag") +@Slf4j +public class ServiceTagController extends JeecgController { + @Autowired + private IServiceTagService serviceTagService; + + /** + * 分页列表查询 + * + * @param serviceTag + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "服务标签-分页列表查询") + @ApiOperation(value = "服务标签-分页列表查询", notes = "服务标签-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(ServiceTag serviceTag, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("tagName", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap); + Page page = new Page(pageNo, pageSize); + queryWrapper.select("id"); + IPage pageList = serviceTagService.page(page, queryWrapper); + if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) { + serviceTagService.queryList(serviceTag, pageList); + } + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param serviceTag + * @return + */ + @AutoLog(value = "服务标签-添加") + @ApiOperation(value = "服务标签-添加", notes = "服务标签-添加") + @RequiresPermissions("serviceTag:servtag_directive:add") + @PostMapping(value = "/add") + public Result add(@RequestBody ServiceTag serviceTag) { + serviceTagService.save(serviceTag); + if (serviceTag.getDirectives() != null && !serviceTag.getDirectives().isEmpty()) { + serviceTagService.saveDirectives(serviceTag); + } + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param serviceTag + * @return + */ + @AutoLog(value = "服务标签-编辑") + @ApiOperation(value = "服务标签-编辑", notes = "服务标签-编辑") + @RequiresPermissions("serviceTag:servtag_directive:edit") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) + public Result edit(@RequestBody ServiceTag serviceTag) { + serviceTagService.updateById(serviceTag); + if (serviceTag.getDirectives() != null && !serviceTag.getDirectives().isEmpty()) { + serviceTagService.saveDirectives(serviceTag); + } + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "服务标签-通过id删除") + @ApiOperation(value = "服务标签-通过id删除", notes = "服务标签-通过id删除") + @RequiresPermissions("serviceTag:servtag_directive:delete") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name = "id", required = true) String id) { + serviceTagService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "服务标签-批量删除") + @ApiOperation(value = "服务标签-批量删除", notes = "服务标签-批量删除") + @RequiresPermissions("serviceTag:servtag_directive:deleteBatch") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + this.serviceTagService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "服务标签-通过id查询") + @ApiOperation(value = "服务标签-通过id查询", notes = "服务标签-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + ServiceTag serviceTag = serviceTagService.queryById(id); + if (serviceTag == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(serviceTag); + } + + /** + * 导出excel + * + * @param request + * @param serviceTag + */ + @RequiresPermissions("serviceTag:servtag_directive:exportXls") + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ServiceTag serviceTag) { + return super.exportXls(request, serviceTag, ServiceTag.class, "服务标签"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequiresPermissions("serviceTag:servtag_directive:importExcel") + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ServiceTag.class); + } + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java new file mode 100644 index 0000000..d75b511 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java @@ -0,0 +1,77 @@ +package com.nu.modules.servicetag.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: 服务标签 + * @Author: 张明远 + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Data +@TableName("nu_service_tag") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="nu_service_tag对象", description="服务标签") +public class ServiceTag implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**服务标签名称*/ + @Excel(name = "服务标签名称", width = 15) + @ApiModelProperty(value = "服务标签名称") + private String tagName; + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String description; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private Integer sort; + /**是否启用 0启用 1未启用*/ + @Excel(name = "是否启用", width = 15, dicCode = "iz_enabled") + @Dict(dicCode = "iz_enabled") + @ApiModelProperty(value = "是否启用") + private String izEnabled; + /**是否删除 0未删除 1删除*/ + @Excel(name = "是否删除", width = 15) + @ApiModelProperty(value = "是否删除") + @TableLogic + private String delFlag; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + @TableField(exist = false) + private List directives; +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java new file mode 100644 index 0000000..8415419 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java @@ -0,0 +1,24 @@ +package com.nu.modules.servicetag.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.servicetag.entity.ServiceTag; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 服务标签 + * @Author: 张明远 + * @Date: 2025-03-31 + * @Version: V1.0 + */ +public interface ServiceTagMapper extends BaseMapper { + + int deleteDirectives(@Param("tag") ServiceTag serviceTag); + + int saveDirectives(@Param("tag") ServiceTag serviceTag); + + List queryList( @Param("serviceTag") ServiceTag serviceTag,@Param("ids") List ids); + + Long queryTotal(@Param("serviceTag") ServiceTag serviceTag); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml new file mode 100644 index 0000000..4bd58cd --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from nu_servtag_directive where tag_id = #{tag.id} + + + + INSERT INTO nu_servtag_directive (tag_id, directive_id, sort) + VALUES + + (#{tag.id}, #{directive.id}, #{directive.sort}) + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java new file mode 100644 index 0000000..111dd80 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java @@ -0,0 +1,24 @@ +package com.nu.modules.servicetag.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.servicetag.entity.ServiceTag; + +/** + * @Description: 服务标签 + * @Author: 张明远 + * @Date: 2025-03-31 + * @Version: V1.0 + */ +public interface IServiceTagService extends IService { + + /** + * 存储服务标签对应的服务指令 + * @param serviceTag + */ + void saveDirectives(ServiceTag serviceTag); + + void queryList(ServiceTag serviceTag, IPage pageList); + + ServiceTag queryById(String id); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java new file mode 100644 index 0000000..f681b61 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java @@ -0,0 +1,43 @@ +package com.nu.modules.servicetag.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; +import com.nu.modules.servicetag.entity.ServiceTag; +import com.nu.modules.servicetag.mapper.ServiceTagMapper; +import com.nu.modules.servicetag.service.IServiceTagService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 服务标签 + * @Author: 张明远 + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Service +public class ServiceTagServiceImpl extends ServiceImpl implements IServiceTagService { + + @Override + public void saveDirectives(ServiceTag serviceTag) { + baseMapper.deleteDirectives(serviceTag); + baseMapper.saveDirectives(serviceTag); + } + + @Override + public void queryList(ServiceTag serviceTag, IPage pageList) { + List record = baseMapper.queryList(serviceTag,pageList.getRecords()); + pageList.setRecords(record); + } + + @Override + public ServiceTag queryById(String id) { + List query = Lists.newArrayList(); + ServiceTag queryDto = new ServiceTag().setId(id); + query.add(queryDto); + List serviceTags = baseMapper.queryList(null, query); + return serviceTags.stream().findFirst().orElse(null); + } + +} diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java similarity index 97% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java index 39ee490..28c9618 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java @@ -1,10 +1,10 @@ -package com.nu.modules.ServiceType.controller; +package com.nu.modules.servicetype.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.ServiceType.entity.ConfigServiceType; -import com.nu.modules.ServiceType.service.IConfigServiceTypeService; +import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.servicetype.service.IConfigServiceTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java similarity index 92% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java index 3178b74..a4b863f 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java @@ -1,15 +1,11 @@ -package com.nu.modules.ServiceType.entity; +package com.nu.modules.servicetype.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java similarity index 58% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java index 3b44d01..c62a8ee 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.ServiceType.mapper; +package com.nu.modules.servicetype.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.ServiceType.entity.ConfigServiceType; +import com.nu.modules.servicetype.entity.ConfigServiceType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml similarity index 68% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml index 374d143..f2dcf95 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java similarity index 77% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java index 4f4e594..43c9f61 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java @@ -1,6 +1,6 @@ -package com.nu.modules.ServiceType.service; +package com.nu.modules.servicetype.service; -import com.nu.modules.ServiceType.entity.ConfigServiceType; +import com.nu.modules.servicetype.entity.ConfigServiceType; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java similarity index 80% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java index 4d3adc7..8190345 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java @@ -1,11 +1,11 @@ -package com.nu.modules.ServiceType.service.impl; +package com.nu.modules.servicetype.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.ServiceType.entity.ConfigServiceType; -import com.nu.modules.ServiceType.mapper.ConfigServiceTypeMapper; -import com.nu.modules.ServiceType.service.IConfigServiceTypeService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.servicetype.mapper.ConfigServiceTypeMapper; +import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-service-directive/pom.xml b/nursing-unit-services/pom.xml similarity index 78% rename from nursing-unit-service-directive/pom.xml rename to nursing-unit-services/pom.xml index b8fd028..8d75622 100644 --- a/nursing-unit-service-directive/pom.xml +++ b/nursing-unit-services/pom.xml @@ -9,12 +9,12 @@ 服务指令 4.0.0 - nursing-unit-service-directive + nursing-unit-services pom - nu-service-directive-api - nu-service-directive-biz + nu-services-api + nu-services-biz diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index 458fcda..7cdec20 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -45,7 +45,7 @@ com.nursingunit.boot - nu-service-directive-biz + nu-services-biz ${nursingunit.version} diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index 55b6d33..9054bfc 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -80,9 +80,10 @@ spring: class: org.springframework.scheduling.quartz.LocalDataSourceJobStore driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate tablePrefix: QRTZ_ - isClustered: true + isClustered: false misfireThreshold: 12000 - clusterCheckinInterval: 15000 + clusterCheckinInterval: 0 #心跳检查 之前是15000 + acquireTriggersWithinLock: false # 减少锁竞争 threadPool: class: org.quartz.simpl.SimpleThreadPool threadCount: 10 diff --git a/pom.xml b/pom.xml index aceb15d..49eff70 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ nursing-unit-admin - nursing-unit-service-directive + nursing-unit-services nursing-unit-api