diff --git a/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java b/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java index e283ad3..d0ea2a0 100644 --- a/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java +++ b/qms-server/src/main/java/com/zt/plat/qms/QmsServerApplication.java @@ -2,6 +2,9 @@ package com.zt.plat.qms; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; +import tech.zzjc.tio.starter.TioServerAutoConfiguration; +import tech.zzjc.tio.starter.annotation.EnableTioServerServer; /** * Qms 服务器的启动类 @@ -11,6 +14,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${zt.info.base-package} @SpringBootApplication(scanBasePackages = {"${zt.info.base-package}.qms", "${zt.info.base-package}.module"}, excludeName = {}) +@EnableTioServerServer +@Import(TioServerAutoConfiguration.class) public class QmsServerApplication { public static void main(String[] args) { diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayParameterDataMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayProjectDataMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml new file mode 100644 index 0000000..9c0eeba --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayReportDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml new file mode 100644 index 0000000..2bd2314 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskDataMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessAssayTaskMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessAssayTaskMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessBaseSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessBaseSampleMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessBaseSampleMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessBaseSampleMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml new file mode 100644 index 0000000..bd79160 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentDataMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml new file mode 100644 index 0000000..bb8a1f8 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessDocumentMainMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml new file mode 100644 index 0000000..77eca10 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessQualityControlSampleProjectMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustDetailMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleEntrustProjectMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverDetailMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSampleHandoverMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml new file mode 100644 index 0000000..b1ab992 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml new file mode 100644 index 0000000..d11cf77 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessStandardSampleProjectMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml new file mode 100644 index 0000000..f99c39a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAnalysisGroupMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleAssessmentMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml similarity index 100% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/bus/dal/mapper/BusinessSubSampleMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubSampleMapper.xml diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml new file mode 100644 index 0000000..ffab495 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessTeamAssessmentMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml similarity index 93% rename from zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml rename to zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml index 669888b..4e290a0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms1/business/config/dal/mapper/BaseSampleMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/config/dal/mapper/BaseSampleMapper.xml @@ -10,7 +10,7 @@ --> - SELECT - tbatd.CFG_ASY_MTHD_ID AS configAssayMethodId, - tcam.NAME AS configAssayMethodName, - COUNT(tbatd.ID) AS sampleTaskCount - FROM - T_BSN_ASY_TSK_DAT tbatd - LEFT JOIN T_CFG_ASY_MTHD tcam ON - tbatd.CFG_ASY_MTHD_ID = tcam.ID - WHERE - tbatd.IS_TSKD = 0 - AND tbatd.IS_RPOD = 0 - AND tbatd.DELETED = 0 - GROUP BY - tbatd.CFG_ASY_MTHD_ID, - tcam.NAME - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/application-dev.yml b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-dev.yml similarity index 99% rename from zt-module-qms/zt-module-qms-server/src/main/resources/application-dev.yml rename to zt-module-qms/zt-module-qms-server/src/main/resources/删/application-dev.yml index 499327f..86eef9b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/application-dev.yml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-dev.yml @@ -49,7 +49,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 data: redis: - host: 172.16.46.63 # 地址 + host: 172.16.46.163 # 地址 port: 30379 # 端口 database: 0 # 数据库索引 # password: 123456 # 密码,建议生产环境开启 diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/application-local.yml b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-local1.yml similarity index 99% rename from zt-module-qms/zt-module-qms-server/src/main/resources/application-local.yml rename to zt-module-qms/zt-module-qms-server/src/main/resources/删/application-local1.yml index 033b8fb..8a402b1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/application-local.yml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application-local1.yml @@ -51,7 +51,7 @@ spring: # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 data: redis: - host: 172.16.46.63 # 地址 + host: 172.16.46.163 # 地址 port: 30379 # 端口 database: 0 # 数据库索引 # password: 123456 # 密码,建议生产环境开启 diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/application.yml b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application.yml similarity index 98% rename from zt-module-qms/zt-module-qms-server/src/main/resources/application.yml rename to zt-module-qms/zt-module-qms-server/src/main/resources/删/application.yml index 455139c..1fbd64b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/application.yml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/删/application.yml @@ -24,7 +24,7 @@ spring: config: import: - - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 +# - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 # Servlet 配置