Commit ce929bfd authored by Administrator's avatar Administrator

2024-7.30 交接提交

parent 41f30511
......@@ -5,10 +5,10 @@ spring:
connectionProperties: druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.3.35}:${DB_PORT:3306}/${DB_NAME:mdm_1_db}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3310}/${DB_NAME:zhonghe}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true&requireSSL=true
username: ${DB_USER:root}
#password: ${DB_PWD:jinghe2021//}
password: ${DB_PWD:jinghe2021//}
password: ${DB_PWD:jinghe2023}
# 初始连接数
initial-size: 5
# 最小连接数
......
server:
port: 9001
port: 9003
spring:
freemarker:
......@@ -29,8 +29,8 @@ spring:
#数据库索引
database: ${REDIS_DB:0}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6379}
password: ${REDIS_PWD:}
port: ${REDIS_PORT:6399}
password: ${REDIS_PWD:R#9Xz&2Lp$Wq8v!u}
#连接超时时间
timeout: 5000
......@@ -76,3 +76,6 @@ netty:
filepath: d:/file/
backPath: d:/file/
environment:
path: H:\zy\mysql-5.7.43-winx64\bin\
\ No newline at end of file
{
"dbdata": [
{
"key": "lenth",
"name": "长度"
},
{
"key": "angle",
"name": "角度"
},
{
"key": "safeheight",
"name": "高程"
}
],
"dmdata": [
{
"key": "dispA",
"name": "a轴变化量"
},
{
"key": "dispB",
"name": "b轴变化量"
}
],
"dmdata1": [
{
"key": "dispB",
"name": "沉降值"
}
],
"wtdata": [
{
"key": "stage",
"name": "水位值"
}
],
"wpbdata": [
{
"key": "value",
"name": "监测值"
}
],
"mpdata": [
{
"key": "disp_x",
"name": "x方向偏移"
},
{
"key": "disp_y",
"name": "y方向偏移"
},
{
"key": "disp_h",
"name": "沉降值"
}
],
"mpdata1": [
{
"key": "dispx",
"name": "x方向偏移"
},
{
"key": "dispy",
"name": "y方向偏移"
},
{
"key": "disph",
"name": "沉降值"
}
],
"stdata": [
{
"key": "stage",
"name": "水位1222"
},
{
"key": "depth",
"name": "浸润线埋深"
}
],
"rgdata": [
{
"key": "rainfall",
"name": "降雨量"
}
],
"psldata": [
{
"key": "value",
"name": "测量值"
}
],
"psldata1": [
{
"key": "pslvalue",
"name": "测量值"
}
],
"sldata": [
{
"key": "value",
"name": "测量值"
}
],
"sldata1": [
{
"key": "sllvalue",
"name": "测量值"
}
],
"zhidian": [
{
"key": "speedx",
"name": "x方向速度"
},
{
"key": "speedy",
"name": "y方向速度"
},
{
"key": "speedz",
"name": "z方向速度"
},
{
"key": "speed",
"name": "合成速度"
},
{
"key": "addspeedx",
"name": "x轴加速度"
},
{
"key": "addspeedy",
"name": "y轴加速度"
},
{
"key": "addspeedz",
"name": "z轴加速度"
},
{
"key": "addspeed",
"name": "加速度"
},
{
"key": "pinlvx",
"name": "x轴频率"
},
{
"key": "pinlvy",
"name": "y轴频率"
},
{
"key": "pinlvz",
"name": "z轴频率"
}
]
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="me.zhengjie.gemho.mapper.data.ZhidianMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="me.zhengjie.gemho.entity.data.Zhidian">
<id column="id" property="id" />
<result column="sensorid" property="sensorid" />
<result column="jctime" property="jctime" />
<result column="ifbj" property="ifbj" />
<result column="jcbjtime" property="jcbjtime" />
<result column="speedx" property="speedx" />
<result column="speedy" property="speedy" />
<result column="speedz" property="speedz" />
<result column="speed" property="speed" />
<result column="addspeedx" property="addspeedx" />
<result column="addspeedy" property="addspeedy" />
<result column="addspeedz" property="addspeedz" />
<result column="addspeed" property="addspeed" />
<result column="pinlvx" property="pinlvx" />
<result column="pinlvy" property="pinlvy" />
<result column="pinlvz" property="pinlvz" />
<result column="state" property="state" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, sensorid, jctime, ifbj, jcbjtime, speedx, speedy, speedz, speed, addspeedx, addspeedy, addspeedz, addspeed, pinlvx, pinlvy, pinlvz, state
</sql>
</mapper>
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