新增：新增多数据源以及数据校验代码

amos-boot-data/amos-boot-data-openapi/pom.xml

@@ -28,8 +28,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
-		<!-- Vastbase G100 -->
 		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+			<version>3.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<!-- Vastbase G100 -->
+		<dependency>@
 			<groupId>cn.com.vastdata</groupId>
 			<artifactId>vastbase</artifactId>
 			<version>1.0.0.2</version>
@@ -156,6 +165,27 @@
             <artifactId>jettison</artifactId>
             <version>1.3.7</version>
         </dependency>
+
+		<dependency>
+			<groupId>tech.tablesaw</groupId>
+			<artifactId>tablesaw-core</artifactId>
+			<version>0.43.1</version>
+		</dependency>
+		<dependency>
+			<groupId>tech.tablesaw</groupId>
+			<artifactId>tablesaw-json</artifactId>
+			<version>0.43.1</version>
+		</dependency>
+		<dependency>
+			<groupId>tech.tablesaw</groupId>
+			<artifactId>tablesaw-jsplot</artifactId>
+			<version>0.43.1</version>
+		</dependency>
+		<dependency>
+			<groupId>tech.tablesaw</groupId>
+			<artifactId>tablesaw-excel</artifactId>
+			<version>0.43.1</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/config/DataSourceConfig.java

+package com.yeejoin.amos.api.openapi.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+
+import javax.sql.DataSource;
+
+
+@Configuration
+public class DataSourceConfig {
+    @Bean
+    public DataSourceTransactionManager transactionManager(DataSource dataSource) {
+        return new DataSourceTransactionManager(dataSource);
+    }
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/constant/CylinderInfoFieldEnum.java

+package com.yeejoin.amos.api.openapi.constant;
+
+public enum CylinderInfoFieldEnum {
+    creditCode,
+    unitName,
+    sequenceCode,
+    cylinderVariety,
+    cylinderVarietyName,
+    factoryNum,
+    fillingMedia,
+    fillingMediaName,
+    manufacturingUnit,
+    manufacturingDate,
+    valveManufacturUnit,
+    nominalWorkPressure,
+    volume,
+    productQualified,
+    proofQuality,
+    supervisionInspec,
+    typeExperiments,
+    cylinderStatus,
+    syncDate,
+    syncState;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/constant/CylinderUnitFieldEnum.java

+package com.yeejoin.amos.api.openapi.constant;
+
+public enum CylinderUnitFieldEnum {
+    unitId,
+    regionCode,
+    regionName,
+    unitName,
+    creditCode,
+    address,
+    unitPerson,
+    personMobilePhone,
+    personTelephone,
+    securityAdm,
+    securityAdmPhone,
+    postalCode,
+    syncDate,
+    syncState;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/constant/FillingAfterFieldEnum.java

+package com.yeejoin.amos.api.openapi.constant;
+
+public enum FillingAfterFieldEnum {
+    sequenceCode,
+    fillingCheckId,
+    withinScope,
+    sealedState,
+    defective,
+    abnormaLTemperature,
+    warningSign,
+    compliance,
+    checkResults,
+    nonconformances,
+    inspector,
+    inspectionDate,
+    syncDate,
+    syncState;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/constant/FillingBeforeFieldEnum.java

+package com.yeejoin.amos.api.openapi.constant;
+
+public enum FillingBeforeFieldEnum {
+    sequenceCode,
+    fillingBeforeId,
+    creditCode,
+    fillingUnitName,
+    inspectorUser,
+    inspectionDate,
+    isValid,
+    same,
+    isRegulations,
+    isComplianceWithGBT,
+    haveStillPressure,
+    isComplete,
+    haveSecurityDocuments,
+    fillBeforeItem,
+    checkResults,
+    nonconformances,
+    syncDate,
+    syncState;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/constant/FillingRecordFieldEnum.java

+package com.yeejoin.amos.api.openapi.constant;
+
+public enum FillingRecordFieldEnum {
+    sequenceCode,
+    fillingRecordId,
+    fillingBeforeId,
+    fillingCheckId,
+    fillingExamineId,
+    fillingStartTime,
+    fillingEndTime,
+    fillingUser,
+    inspectorName,
+    fillingQuantity,
+    dischargeVolume,
+    temperature,
+    abnormal,
+    syncDate,
+    syncState;
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/model/CylinderFillingDataValidationResultModel.java

+package com.yeejoin.amos.api.openapi.face.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CylinderFillingDataValidationResultModel {
+    private List<String> beforeErrorData;
+    private List<String> recordErrorData;
+    private List<String> afterErrorData;
+
+    private String result = "success";
+}

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/RegistrationInfoMapper.java

 package com.yeejoin.amos.api.openapi.face.orm.dao;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * 特种设备基本信息-注册登记信息  Mapper 接口
@@ -11,4 +17,7 @@ import com.yeejoin.amos.api.openapi.face.orm.entity.RegistrationInfo;
  */
 public interface RegistrationInfoMapper extends BaseMapper<RegistrationInfo> {
 
+    @DS("tzs")
+    @Query("SELECT DISTINCT r.*  FROM idx_biz_jg_use_info i, idx_biz_jg_register_info r  WHERE i.data_source = 'jg'  AND i.RECORD = r.RECORD  AND r.EQU_CODE IN :values")
+    List<RegistrationInfo> getUseInfoByEquipCode(@Param("values") Set<String> sequenceCodes);
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/orm/dao/UseInfoMapper.java

@@ -2,6 +2,11 @@ package com.yeejoin.amos.api.openapi.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.api.openapi.face.orm.entity.UseInfo;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Set;
 
 /**
  * 特种设备基本信息-使用信息 Mapper 接口

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/CylinderFillingService.java

@@ -53,5 +53,7 @@ public class CylinderFillingService extends BaseService<CylinderFillingModel,Cyl
 		String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX,RequestContext.getToken());
     	BizTokenModel bizTokenModel = (BizTokenModel) redisTemplate.opsForValue().get(tokenKey);
     	return bizTokenModel.getAppId();
-	}	
+	}
+
+
 }	

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/EnterpriseInfoService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.yeejoin.amos.api.openapi.enums.JgFileAttributeEnum;
 import com.yeejoin.amos.api.openapi.enums.JgFileObjectEnum;
 import com.yeejoin.amos.api.openapi.face.model.EnterpriseInfoModel;
@@ -16,6 +17,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 企业数据信息 服务类
@@ -132,4 +134,9 @@ public class EnterpriseInfoService extends AppBaseService<EnterpriseInfoModel, E
             throw new BadRequest("使用单位标识码为："+models.getUseUnitCode()+"的企业，"+"同步状态不能为空！");
         }
     }
+
+    @DS("tzs")
+    public List<EnterpriseInfoModel> getEnterpriseInfoByCreditCode(Set<String> useCode) {
+        return this.queryForList("", false, useCode);
+    }
 }

amos-boot-data/amos-boot-data-openapi/src/main/resources/application-vb.properties

@@ -2,10 +2,23 @@ spring.application.name=AMOS-API-OPENAPI
 server.servlet.context-path=/openapi
 server.port=11001
 # jdbc_config
-spring.datasource.driver-class-name=cn.com.vastbase.Driver
-spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_openapi_cyl
+
+spring.datasource.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_openapi_cyl&allowMultiQueries=true
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
+spring.datasource.driver-class-name=cn.com.vastbase.Driver
+spring.datasource.dynamic.primary=openapi
+#ds tzs
+spring.datasource.dynamic.datasource.openapi.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_openapi_cyl&allowMultiQueries=true
+spring.datasource.dynamic.datasource.openapi.username=admin
+spring.datasource.dynamic.datasource.openapi.password=Yeejoin@2023
+spring.datasource.dynamic.datasource.openapi.driver-class-name=cn.com.vastbase.Driver
+#ds cyl
+spring.datasource.dynamic.datasource.tzs.url=jdbc:vastbase://172.16.10.243:5432/tzs_amos_tzs_biz_init?currentSchema=amos_openapi_cyl&allowMultiQueries=true
+spring.datasource.dynamic.datasource.tzs.username=admin
+spring.datasource.dynamic.datasource.tzs.password=Yeejoin@2023
+spring.datasource.dynamic.datasource.tzs.driver-class-name=cn.com.vastbase.Driver
+
 
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=5