Skip to content

A
amos-boot-biz
Commit 143d7e3e authored by 曹盼盼's avatar 曹盼盼
Browse files
Options

ugp多数据源配置

parent 1bf82271
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 38 deletions
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/EquipmentCategoryController.java
View file @ 143d7e3e
...@@ -122,8 +122,7 @@ public class EquipmentCategoryController extends BaseController { ...@@ -122,8 +122,7 @@ public class EquipmentCategoryController extends BaseController {
@ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询") @ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
@GetMapping(value = "/tree") @GetMapping(value = "/tree")
public ResponseModel<Object> tree(@RequestParam Long code) throws Exception { public ResponseModel<Object> tree(@RequestParam Long code) throws Exception {
EquipmentCategory root = equipmentCategoryServiceImpl EquipmentCategory root = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code.toString()));
.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code));
QueryWrapper<EquipmentCategory> queryWrapper = new QueryWrapper<>(); QueryWrapper<EquipmentCategory> queryWrapper = new QueryWrapper<>();
queryWrapper.likeRight("code", code.toString().replaceAll("0+$", "")); queryWrapper.likeRight("code", code.toString().replaceAll("0+$", ""));
Collection<EquipmentCategory> list = equipmentCategoryServiceImpl.list(queryWrapper); Collection<EquipmentCategory> list = equipmentCategoryServiceImpl.list(queryWrapper);
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/InspectionServiceImpl.java
View file @ 143d7e3e
...@@ -139,7 +139,7 @@ public class InspectionServiceImpl implements InspectionService { ...@@ -139,7 +139,7 @@ public class InspectionServiceImpl implements InspectionService {
item.put("value", queryResult.get("count")); item.put("value", queryResult.get("count"));
return item; return item;
} }
/**cpp修改处*/
@Override @Override
public JSONObject getSafetySupervisionCode(String bizTable,String taskId) { public JSONObject getSafetySupervisionCode(String bizTable,String taskId) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
...@@ -182,7 +182,7 @@ public class InspectionServiceImpl implements InspectionService { ...@@ -182,7 +182,7 @@ public class InspectionServiceImpl implements InspectionService {
@Override @Override
public JSONObject getSafetySupervisionCodeMap(String bizTable, String mapKey, String mapValue) { public JSONObject getSafetySupervisionCodeMap(String bizTable, String mapKey, String mapValue) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
String sql = String.format("SELECT %s, %s FROM %s", mapKey, mapValue, bizTable); String sql = String.format("SELECT %s, %s FROM %s", mapKey, mapValue, bizTable);
List<Map<String, Object>> list = bizJdbcTemplate.queryForList(sql); List<Map<String, Object>> list = bizJdbcTemplate.queryForList(sql);
list.forEach(x -> { list.forEach(x -> {
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties
View file @ 143d7e3e
spring.application.name=TZS spring.application.name=TZS-Cpp
server.servlet.context-path=/tzs server.servlet.context-path=/tzs
server.port=11000 server.port=11002
spring.profiles.active=dev2 spring.profiles.active=dev3
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
...@@ -12,17 +12,8 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl ...@@ -12,17 +12,8 @@ mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
spring.liquibase.enabled= true spring.liquibase.enabled= true
## DB properties:
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=10
spring.datasource.hikari.maximum-pool-size=25
spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=30000
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=120000
spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query=SELECT 1
## eureka properties: ## eureka properties:
eureka.client.registry-fetch-interval-seconds=5 eureka.client.registry-fetch-interval-seconds=5
eureka.instance.prefer-ip-address=true eureka.instance.prefer-ip-address=true
...@@ -34,7 +25,17 @@ eureka.instance.lease-renewal-interval-in-seconds=5 ...@@ -34,7 +25,17 @@ eureka.instance.lease-renewal-interval-in-seconds=5
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url-path=/actuator/info eureka.instance.status-page-url-path=/actuator/info
eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
#DB properties:
spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=10
spring.datasource.hikari.maximum-pool-size=25
spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=30000
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=120000
spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query=SELECT 1
## redis properties: ## redis properties:
spring.redis.lettuce.pool.max-active=200 spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1 spring.redis.lettuce.pool.max-wait=-1
......
amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/VerifyMapper.xml
View file @ 143d7e3e
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</select> </select>
<select id="selectByWelder" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify"> <select id="selectByWelder" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify" databaseId="mysql">
SELECT * FROM tz_ugp_verify SELECT * FROM tz_ugp_verify
<where> <where>
...@@ -101,7 +101,33 @@ ...@@ -101,7 +101,33 @@
</select> </select>
<select id="selectByCode" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify"> <select id="selectByWelder" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify" databaseId="postgresql">
SELECT * FROM tz_ugp_verify
<where>
<if test="projectId !=null and projectId !=''">
project_id =#{projectId}
</if>
<if test="welderId !=null and welderId !=''">
and
target_info::json->'welderId' = #{welderId}
</if>
<if test="code !=null and code !=''">
and
target_info::json->'code'=#{code}
</if>
<if test="stage !=null and stage !=''">
and stage =#{stage}
</if>
<if test="random !=null and random !=''">
and
target_info::json->'random' =#{random}
</if>
</where>
</select>
<select id="selectByCode" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify" databaseId="mysql">
SELECT * FROM tz_ugp_verify where SELECT * FROM tz_ugp_verify where
code =#{code} code =#{code}
and project_id =#{projectId} and project_id =#{projectId}
...@@ -112,48 +138,59 @@ ...@@ -112,48 +138,59 @@
</if> </if>
</select> </select>
<select id="getCode" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.CodeWeldDto"> <select id="selectByCode" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify" databaseId="postgresql">
SELECT * FROM tz_ugp_verify where
code =#{code}
and project_id =#{projectId}
and stage =#{stage}
<if test="random !=null and random !=''">
and
target_info::json->'random' =#{random}
</if>
</select>
<select id="getCode" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.CodeWeldDto" >
select select
`code`, v.code,
MAX(verify_time) AS `date` MAX(verify_time) AS date
from from
tz_ugp_verify tz_ugp_verify v
where where
`status`='0' v.status='0'
AND AND
stage ='CRAFT' or stage ='VOLTAGE' or stage ='LAY' or stage ='LOTCATION' or stage ='BACKFILL' stage ='CRAFT' or stage ='VOLTAGE' or stage ='LAY' or stage ='LOTCATION' or stage ='BACKFILL'
GROUP BY `code` GROUP BY v.code
</select> </select>
<select id="getVerity" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify"> <select id="getVerity" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify">
select select
sequence_nbr, sequence_nbr,
project_id, project_id,
`code`, v.code,
stage, stage,
target_info, target_info,
`status`, status,
`type`, v.type,
submit_time, submit_time,
verify_time, verify_time,
verify_unit_id, verify_unit_id,
charger_person_id, charger_person_id,
inspector_id inspector_id
from tz_ugp_verify where stage='CRAFT' from tz_ugp_verify v where stage='CRAFT'
AND AND
`code`=#{code} v.code=#{code}
</select> </select>
<select id="getOnes" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify"> <select id="getOnes" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify" databaseId="mysql">
select select
sequence_nbr, sequence_nbr,
project_id, project_id,
code, v.code,
stage, stage,
target_info, target_info,
status, status,
`type`, v.type,
submit_time, submit_time,
verify_time, verify_time,
verify_unit_id, verify_unit_id,
...@@ -165,7 +202,7 @@ ...@@ -165,7 +202,7 @@
is_delete, is_delete,
task_id task_id
from from
tz_ugp_verify tz_ugp_verify v
where where
project_id =#{projectId} project_id =#{projectId}
and verify_time =#{time} and verify_time =#{time}
...@@ -180,5 +217,40 @@ ...@@ -180,5 +217,40 @@
</select> </select>
<select id="getOnes" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Verify" databaseId="mysql">
select
sequence_nbr,
project_id,
v.code,
stage,
target_info,
status,
v.type,
submit_time,
verify_time,
verify_unit_id,
charger_person_id,
inspector_id,
rec_date,
rec_user_id,
rec_user_name,
is_delete,
task_id
from
tz_ugp_verify v
where
project_id =#{projectId}
and verify_time =#{time}
<if test="code != null and code !=''">
and target_info::json->'code' =#{code}
</if>
<if test="manyCode != null and manyCode !=''">
and target_info::json->'manyCode' =#{manyCode}
</if>
</select>
</mapper> </mapper>
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/config/MybatisPlusConfig.java 0 → 100644
View file @ 143d7e3e
package com.yeejoin.amos.boot.module.ugp.biz.config;
import org.apache.ibatis.mapping.DatabaseIdProvider;
import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
/**
* @Author cpp
* @Description
* @Date 2023/2/21
**/
@Configuration("MybatisPlusConfig")
public class MybatisPlusConfig {
/**
* 数据源切换
* @return
**/
@Bean
public DatabaseIdProvider getDatabaseIdProvider() {
VendorDatabaseIdProvider databaseIdProvider = new VendorDatabaseIdProvider();
Properties properties = new Properties();
properties.setProperty("MySQL", "mysql");
properties.setProperty("PostgreSQL", "postgresql");
databaseIdProvider.setProperties(properties);
return databaseIdProvider;
}
}
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application-dev2.properties 0 → 100644
View file @ 143d7e3e
#DB properties:
spring.datasource.driver-class-name=org.postgresql.Driver
spring.datasource.url=jdbc:postgresql://36.46.137.116:5432/per_tzs_amos_tzs_biz?currentSchema=amos_ugp_biz
spring.datasource.username=admin
spring.datasource.password=Yeejoin@2023
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
spring.datasource.hikari.minimum-idle=10
spring.datasource.hikari.maximum-pool-size=25
spring.datasource.hikari.auto-commit=true
spring.datasource.hikari.idle-timeout=30000
spring.datasource.hikari.pool-name=DatebookHikariCP
spring.datasource.hikari.max-lifetime=120000
spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query=SELECT 1
##eureka properties:
eureka.client.registry-fetch-interval-seconds=5
eureka.instance.lease-expiration-duration-in-seconds=10
eureka.instance.lease-renewal-interval-in-seconds=5
eureka.client.service-url.defaultZone =http://admin:a1234560@172.16.10.220:10001/eureka/
eureka.instance.health-check-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
eureka.instance.status-page-url=http://172.16.3.34:${server.port}${server.servlet.context-path}/actuator/info
eureka.instance.metadata-map.management.api-docs=http://172.16.3.34:${server.port}${server.servlet.context-path}/doc.html
eureka.instance.prefer-ip-address=true
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=*
eureka.instance.ip-address=172.16.3.34
eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port}
#eureka.client.registry-fetch-interval-seconds=5
#eureka.instance.lease-expiration-duration-in-seconds=10
#eureka.instance.lease-renewal-interval-in-seconds=5
#eureka.client.service-url.defaultZone =http://39.98.45.134:10001/eureka/
#eureka.instance.health-check-url=http://39.98.45.134:${server.port}${server.servlet.context-path}/actuator/health
#eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
#eureka.instance.status-page-url=http://39.98.45.134:${server.port}${server.servlet.context-path}/actuator/info
#eureka.instance.metadata-map.management.api-docs=http://39.98.45.134:${server.port}${server.servlet.context-path}/doc.html
#eureka.instance.prefer-ip-address=true
#management.endpoint.health.show-details=always
#management.endpoints.web.exposure.include=*
#redis properties:
spring.redis.database=1
#spring.redis.host=39.98.45.134
#spring.redis.host=172.16.10.90
spring.redis.host=172.16.10.220
spring.redis.port=6379
spring.redis.password=yeejoin@2020
spring.redis.lettuce.pool.max-active=200
spring.redis.lettuce.pool.max-wait=-1
spring.redis.lettuce.pool.max-idle=10
spring.redis.lettuce.pool.min-idle=0
spring.redis.expire.time=300
## emqx properties:
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.10.220:1883
emqx.user-name=admin
emqx.password=public
## ͼƬʶӿڷid
maas.service.ocr.id=0a456d67-5e12-48af-8923-ccc447d4cb2b
\ No newline at end of file
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties
View file @ 143d7e3e
spring.application.name=UGP spring.application.name=UGP
server.servlet.context-path=/ugp server.servlet.context-path=/ugp
server.port=12000 server.port=12000
spring.profiles.active=dev spring.profiles.active=dev2
##mybatis-plus
mybatis-plus.configuration.database-id=postgresql
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
......
amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/logback-dev2.xml 0 → 100644
View file @ 143d7e3e
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
<property name="LOG_HOME" value="log" />
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
<!-- 按照每天生成日志文件 -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
<FileNamePattern>${LOG_HOME}/tzs.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
<!--日志文件大小-->
<MaxFileSize>30mb</MaxFileSize>
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- 控制台输出 -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- show parameters for hibernate sql 专为 Hibernate 定制
<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />
<logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="DEBUG" />
<logger name="org.hibernate.SQL" level="DEBUG" />
<logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
-->
<!--myibatis log configure-->
<logger name="com.apache.ibatis" level="INFO"/>
<logger name="org.mybatis" level="INFO" />
<logger name="java.sql.Connection" level="INFO"/>
<logger name="java.sql.Statement" level="INFO"/>
<logger name="java.sql.PreparedStatement" level="INFO"/>
<logger name="org.springframework" level="INFO"/>
<logger name="com.baomidou.mybatisplus" level="INFO"/>
<logger name="org.apache.activemq" level="INFO"/>
<logger name="org.typroject" level="INFO"/>
<logger name="com.yeejoin" level="INFO"/>
<!-- 日志输出级别 -->
<root level="DEBUG">
<!-- <appender-ref ref="FILE" /> -->
<appender-ref ref="STDOUT" />
</root>
</configuration>
\ No newline at end of file
amos-boot-system-ugp/pom.xml
View file @ 143d7e3e
...@@ -31,6 +31,14 @@ ...@@ -31,6 +31,14 @@
<version>1.2.0</version> <version>1.2.0</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<!-- Vastbase G100 -->
<dependency>
<groupId>cn.com.vastdata</groupId>
<artifactId>vastbase</artifactId>
<version>1.0.0.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment