emergency/emergency-service/pom.xml
@@ -9,10 +9,13 @@ </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <artifactId>emergency-service</artifactId> <properties> <maven.compiler.source>8</maven.compiler.source> <maven.compiler.target>8</maven.compiler.target> </properties> <dependencies> <dependency> <groupId>com.gkhy.safePlatfrom</groupId> emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillEvaluationUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillPlanUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanAreaInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanDepartmentInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanLogInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyPlanTeamInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
文件名从 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml 修改 @@ -23,7 +23,9 @@ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id WHERE a.del_flag = 0 <if test="query.suppliesId != null and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if> <if test="query.suppliesId != null and query.suppliesId != ''"> and a.supplies_id = #{query.suppliesId} </if> </select> <insert id="addEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo" emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInspectUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesMaintainUserInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamFileInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyTeamMemberInfoMapper.xml
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyWorkApproveInfoMapper.xml
pom.xml
@@ -257,6 +257,11 @@ <build> <plugins> <!-- 修改打包插件 修改打包方式jar为pom后 默认打包方式为spring-boot-maven-plugin 等到后期打包的时候他会一直提示你，你引入的依赖不存在 --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -266,6 +271,13 @@ <target>1.8</target> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>true</skipTests> <!--默认关掉单元测试 --> </configuration> </plugin> </plugins> </build>
@@ -38,7 +38,7 @@ @Bean(name = "dsGoalManage") @Primary @Autowired public DataSource dsAccount(Environment env) { public DataSource dsGoalManage(Environment env) { AtomikosDataSourceBean ds = new AtomikosDataSourceBean(); Properties prop = build(env, "spring.datasource.goalmanage."); // ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource"); @@ -54,7 +54,7 @@ @Autowired @Primary @Bean(name = "dsEmergency") public AtomikosDataSourceBean dsDoublePrevent(Environment env) { public AtomikosDataSourceBean dsEmergency(Environment env) { AtomikosDataSourceBean ds = new AtomikosDataSourceBean(); Properties prop = build(env, "spring.datasource.emergency."); // ds.setXaDataSourceClassName("com.alibaba.druid.pool.xa.DruidXADataSource"); @@ -68,7 +68,7 @@ @Autowired @Primary @Bean(name = "dsIncidentManage") public AtomikosDataSourceBean dsSafeCheck(Environment env) { public AtomikosDataSourceBean dsIncidentManage(Environment env) { AtomikosDataSourceBean ds = new AtomikosDataSourceBean(); Properties prop = build(env, "spring.datasource.incidentmanage."); ds.setXaDataSourceClassName(datasourceClass); safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -19,12 +19,14 @@ import org.springframework.stereotype.Repository; import javax.sql.DataSource; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @Configuration @MapperScan(basePackages = {"com.gkhy.safePlatform.emergency"}, sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass = sqlSessionTemplateRef = "sqlSessionTemplateEmergency",annotationClass = Repository.class) public class MyBatisConfigEmergency { @@ -35,41 +37,26 @@ @Autowired private MybatisPlusInterceptor mybatisPlusInterceptor; @Bean(name = "datasourceEmergency") @Bean(name = "dataSourceEmergency") @ConfigurationProperties(prefix = "spring.datasource.emergency") public DruidDataSource druidDataSourceA(){ public DruidDataSource dataSourceDoublePrevent(){ return DruidDataSourceBuilder.create().build(); } @Bean(name = "sqlFactoryEmergency") public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource) throws Exception { @Bean(name = "sqlSessionFactoryEmergency") public SqlSessionFactory sqlSessionFactoryEmergency(@Qualifier("dataSourceEmergency") DruidDataSource dataSource) throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); factoryBean.setDataSource(dataSource); factoryBean.setDataSource(dsEmergency); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); //------------------- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**Mapper.xml"); // Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml"); ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1)); // resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2))); Resource[] resourceArray = new Resource[resourceArrayList.size()]; resourceArrayList.toArray(resourceArray); factoryBean.setMapperLocations(resourceArray); //------------------- // factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml")); factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml")); //设置分页插件 Interceptor[] plugins = {mybatisPlusInterceptor}; factoryBean.setPlugins(plugins); return factoryBean.getObject(); } @Bean(name = "sqlTemplateEmergency") public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory) { @Bean public SqlSessionTemplate sqlSessionTemplateEmergency(@Qualifier("sqlSessionFactoryEmergency") SqlSessionFactory sqlSessionFactory){ return new SqlSessionTemplate(sqlSessionFactory); } } safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEquipment.java
@@ -46,7 +46,7 @@ throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); factoryBean.setDataSource(dataSource); factoryBean.setDataSource(dsEquipment); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); //------------------- safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
@@ -46,7 +46,7 @@ throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); factoryBean.setDataSource(dataSource); factoryBean.setDataSource(dsGoalManage); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); //------------------- safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigIncidentManage.java
@@ -46,7 +46,7 @@ throws Exception { MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean(); factoryBean.setDataSource(dataSource); factoryBean.setDataSource(dsIncidentManage); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); //------------------- safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -50,8 +50,6 @@ cloud: nacos: discovery: # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin server-addr: http://192.168.0.52:8848 namespace: e07a2454-136b-4498-99eb-09dae3336ebe username: gkhy_safeplatform_out safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -14,32 +14,31 @@ type: com.alibaba.druid.pool.xa.DruidXADataSource emergency: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai &allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:3306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_out_team password: sas@sASDa28 password: GeeJ@j98.ew9 type: com.alibaba.druid.pool.DruidDataSource goalmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:3306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_out_team password: sas@sASDa28 password: GeeJ@j98.ew9 type: com.alibaba.druid.pool.DruidDataSource incidentmanage: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:3306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_out_team password: sas@sASDa28 password: GeeJ@j98.ew9 type: com.alibaba.druid.pool.DruidDataSource equipment: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.30.107:3306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: gkhy_out_team password: sas@sASDa28 password: GeeJ@j98.ew9 type: com.alibaba.druid.pool.DruidDataSource redis: host: 192.168.0.52 port: 6377 host: 192.168.30.107 port: 6376 password: SEF98uvs98dUAUEF90Udssa database: 0 # Redis 数据库号，默认为 0 timeout: 15000 # Redis 连接超时时间，单位：毫秒。 @@ -57,19 +56,22 @@ cloud: nacos: discovery: # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin server-addr: http://192.168.0.52:8848 namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f username: gkhy_safeplatform_out server-addr: http://192.168.30.107:8848 namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e username: gkhy_dev_out_team password: 9485uyJHISes09t enabled: true register-enabled: true config: server-addr: http://192.168.0.52:8848 namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f username: gkhy_safeplatform_out server-addr: http://192.168.30.107:8848 namespace: 8e59b946-36d6-4d29-81f1-27a55951b86e username: gkhy_dev_out_team password: 9485uyJHISes09t inetutils: ignored-interfaces: - VirtualBox Host-Only Network preferred-networks: - 192.168 #是否允许跨域 true：允许；false：不允许 enableCors: false @@ -81,16 +83,17 @@ dubbo: registry: protocol: nacos address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t address: nacos://192.168.30.107:8848?namespace=8e59b946-36d6-4d29-81f1-27a55951b86e&username=gkhy_dev_out_team&password=9485uyJHISes09t application: name: gkhy-safeplatform-out-test name: gkhy-safeplatform-out scan: # 扫描rpc接口定义包 base-packages: com.gkhy.safePlatform protocol: name: dubbo port: 18082 port: 18083 serialization: kryo host: ${spring.cloud.client.ip-address} consumer: # 服务连接超时时间 timeout: 3000 @@ -98,7 +101,7 @@ check: false rocketmq: name-server: 192.168.0.52:9876 name-server: 192.168.30.107:9876 producer: group: gkhy-safeplatform-guotai sendMessageTimeout: 300000 @@ -108,13 +111,13 @@ demoTopic: gkhy-safeplatform-topic-demo minio: endPoint: 192.168.0.52 endPoint: 121.239.169.27 port: 9000 accessKey: oddER8eSv211WVG3 secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M accessKey: QR0J7S55SZO8QI1TC2AD secretKey: X0oSBT7vRqYWU41Ut21B+FU7G5A87BzPIRdObGjK secure: false bucketName: safeplatform-dev urlPrefix: http://192.168.0.52/file urlPrefix: http://121.239.169.27/file #用户名 gkhy_team_out_dev #密码 12345678
@@ -56,8 +56,6 @@ cloud: nacos: discovery: # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin server-addr: http://192.168.0.52:8848 namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f username: gkhy_safeplatform_out @@ -69,6 +67,11 @@ namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f username: gkhy_safeplatform_out password: 9485uyJHISes09t inetutils: ignored-interfaces: - VirtualBox Host-Only Network preferred-networks: - 192.168 #是否允许跨域 true：允许；false：不允许 @@ -91,6 +94,7 @@ name: dubbo port: 18082 serialization: kryo host: ${spring.cloud.client.ip-address} consumer: # 服务连接超时时间 timeout: 3000 safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -5,9 +5,6 @@ # active: test active: guotai-demo #mybatis-plus: # mapper-locations: classpath:config/mapper/**/*.xml logging: config: classpath:config/log/log4j2.xml level:
