ljf
|
fc0bb459ec
|
同步
|
4 months ago |
hxh
|
6d33e18ef4
|
Merge branch 'refs/heads/master' into release-sy-v1.0.0-tmp
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
|
4 months ago |
|
hxh
|
67a4f66a62
|
Merge branch 'master' of http://175.178.86.109:3000/ljf/shuili
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java
# shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java
|
4 months ago |
|
hxh
|
5696fc1430
|
feat: 添加部分检测表
|
4 months ago |
|
ljf
|
0eef93d798
|
同步
|
4 months ago |
|
hxh
|
7b3269d9ea
|
feat: 优化代码
|
4 months ago |
|
hxh
|
738e20599d
|
feat: 修改新增区划查询逻辑
|
4 months ago |
|
hxh
|
40791591ce
|
Merge branch 'refs/heads/feature-sk' into release-sy-v1.0.0
# Conflicts:
# shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java
|
4 months ago |
|
hxh
|
25ed6218ab
|
feat: 修改新增区划查询逻辑
|
4 months ago |
|
hxh
|
b36852c5cb
|
feat: 优化mock
|
4 months ago |
|
hxh
|
4ceb6edd52
|
feat: 修改字段名称
|
4 months ago |
|
hxh
|
f5b58b9a11
|
feat: 修改字段类型
|
4 months ago |
|
hxh
|
da342abd5e
|
feat: 修改默认mock数据
|
4 months ago |
|
hxh
|
e5e3fba5eb
|
feat: 修改字段名
|
4 months ago |
|
hxh
|
c1b6e9aac0
|
feat: 修改字段类型
|
4 months ago |
|
hxh
|
2e4fd76900
|
feat: 调整大数据接口数据解析逻辑
|
4 months ago |
|
hxh
|
280bc3431a
|
feat: 添加mock数据
|
4 months ago |
|
hxh
|
8932cdd280
|
feat: 检测数据查询接口
|
4 months ago |
|
ljf
|
9e14b10037
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java
|
4 months ago |
|
hxh
|
a2d3351414
|
feat: 同步行政区划数据
|
4 months ago |
|
hxh
|
cb7bda5c58
|
feat: 同步监测要素数据
|
4 months ago |
|
hxh
|
1c17f271a2
|
fix: 修复消息发送逻辑
|
4 months ago |
|
hxh
|
6952b016a2
|
fix: 修复大数据平台接口配置
|
6 months ago |
|
hxh
|
e0e7fc2ac9
|
fix: 配置化大数据平台接口
|
6 months ago |
|
hxh
|
c0402dc481
|
fix: 修复同步bug
|
6 months ago |
|
hxh
|
35ebee8c6e
|
feat: 更新sql
|
6 months ago |
|
hxh
|
f39c70bcb0
|
Merge branch 'refs/heads/release-sy-v1.0.0' into feature-sk
|
6 months ago |
|
hxh
|
62d86fe571
|
feat: 改造数据同步逻辑
|
6 months ago |
|
hxh
|
f58d861011
|
feat: 添加登出接口
|
6 months ago |
|
hxh
|
1ef975f409
|
feat: 添加水库水位、面积和库容关系
|
6 months ago |
|
hxh
|
18fdee44f1
|
feat: attresrspp表调整字段
|
6 months ago |
|
hxh
|
f06106ae93
|
feat: attresrspp表调整字段
|
6 months ago |
|
hxh
|
ba89d469d4
|
feat: attresrspp表调整字段
|
6 months ago |
|
hxh
|
a941ee28b0
|
feat: 添加测站、测点信息接口
|
6 months ago |
|
hxh
|
781fcfa061
|
feat: 修改调整水库基础信息与特征信息接口
|
6 months ago |
|
hxh
|
7ed12da3f6
|
feat: 修改token使用方式
|
6 months ago |
|
hxh
|
ce12816f56
|
feat: 修改access_token调用方式
|
6 months ago |
|
hxh
|
5f7fed7edf
|
feat: 门户登陆参数改为非必填
|
6 months ago |
|
hxh
|
e77a51be99
|
feat: 添加debug信息
|
7 months ago |
|
hxh
|
d16091297c
|
feat: 签名使用时间戳需要除以1000
|
7 months ago |
|
hxh
|
e844fecff1
|
feat: 定时发送信息到信息中心
|
7 months ago |
|
hxh
|
638f63d73a
|
Merge branch 'refs/heads/release-sy-v1.0.0' into feature-v1.4.0-task
|
7 months ago |
|
hxh
|
fce759f449
|
feat: 调整网关接口
|
7 months ago |
|
黄星淮
|
d087b94c71
|
Merge branch 'release-sy-v1.0.0' into 'master'
Release sy v1.0.0
See merge request project/water/shuili!364
|
7 months ago |
|
hxh
|
0501a585e9
|
feat: 修改登出接口
|
7 months ago |
|
hxh
|
1cf0c83e23
|
feat: 调整登录逻辑
|
7 months ago |
|
hxh
|
c921bb5e6e
|
fix: 修复sql脚本
|
9 months ago |
|
hxh
|
6acf7c78d4
|
Merge remote-tracking branch 'refs/remotes/origin/feature-v1.3.0' into release-sy-v1.0.0
|
9 months ago |
|
hxh
|
e180f6fb7b
|
Merge branch 'refs/heads/feature-v1.5.0' into release-sy-v1.0.0
|
9 months ago |
|
hxh
|
0ea00c1bea
|
Merge branch 'refs/heads/feature-v1.4.0' into release-sy-v1.0.0
# Conflicts:
# shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java
# shuili-framework/src/main/java/com/shuili/common/core/domain/entity/SysMenu.java
# shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java
# shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhRecordSearchDto.java
# shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java
|
9 months ago |
