Labels Milestones

稳定运行版本1.0 #161

Merged

p95fco63j merged 231 commits from develop into main 2 weeks ago

Conversation 0 Commits 231 Files Changed 164

p95fco63j commented 2 weeks ago

Owner

There is no content yet.

p95fco63j added 231 commits 2 weeks ago

90e71ef98a 修改按状态和类型查询设备方法代码

7cf1e641a2 Merge remote-tracking branch 'origin/develop' into wanglei_branch

503d8bf20b Merge pull request '修改按状态和类型查询设备方法代码' (#90) from wanglei_branch into develop

28da52ce2a Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

dced4bc3f0 app1设备查看功能补充

3d9425cda1 13周计划和12周总结

fe3076fb48 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

52c3860571 罗月航第十二周周总结及第十三周周计划

acf2c84bd1 制水机与供水机的页面加载

c81a404e9f Merge pull request '设备加载' (#91) from zhanghongwei_branch into develop

6b7c807ec1 更正

187d9bddbe 最新告警加载

ed926d2aab Merge pull request '最新告警加载' (#92) from zhanghongwei_branch into develop

7b49c9d6a4 Merge remote-tracking branch 'origin/develop' into wanglei_branch

de3004649e 王磊第十二周周总结，第十三周周计划

b950c85a2a Merge pull request '王磊第十二周周总结，第十三周周计划' (#93) from wanglei_branch into develop

634754381f 修改查看设备数据代码

f4283f3d11 Merge pull request '修改查看设备数据代码' (#94) from wanglei_branch into develop

290a430cf0 app1设备详细信息添加

0e5125b94c 第十三周会议纪要、张红卫第十二周总结与第十三周计划

d11d251b35 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

8a49c3837b 第十三周会议纪要、张红卫第十二周总结与第十三周计划

69cda63e9c 设备详情

d2b7b1f8a6 Merge pull request '设备数据详情' (#95) from zhanghongwei_branch into develop

0d13583dde Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

a5dad89b61 供水机设备的添加

38b9146728 Merge pull request '供水机的增删功能' (#96) from zhanghongwei_branch into develop

435ec98324 app2相关后端修改

931b4e11ab Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

9d74080fc2 app2相关后端修改

06ce8983e3 app2扫码用水和水质信息查看功能实现

eb99adae42 Merge pull request 'app2扫码用水和水质信息查看功能' (#97) from luoyuehang_branch into develop

7913d13a36 app2扫码用水和水质信息查看功能的相关后端修改

4c63b2a63a 增加根据时间范围查询工单代码代码

55c85cfe3c Merge pull request '增加根据时间范围查询工单代码代码' (#98) from wanglei_branch into develop

d516a9bcdb 日期筛选

1467860e88 周竞由的12周周总结和13周周计划

2b61e2aaef 增加管理员管理地区代码

bd652a401d Merge pull request '增加管理员管理地区代码' (#99) from wanglei_branch into develop

340f4ede3b 需求规格说明书最终稿

3de8a8b20e Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

111966098b 14周计划及13周总结

253b4048b0 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

c5af113b28 罗月航第十三周周总结及第十四周周计划

b177a81979 王磊-第十三周周总结，第十四周周计划

8bff03bde9 Merge pull request '王磊-第十三周周总结，第十四周周计划' (#100) from wanglei_branch into develop

eaf39c2aca Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

fe5e742212 日期筛选

347581aae0 第十四周会议纪要、第十三周总结与第十四周计划

07596bddba 第十四周会议纪要、第十三周总结与第十四周计划

e1bc8b3d62 第十四周会议纪要、第十三周总结与第十四周计划

87eaaf8526 Merge remote-tracking branch 'origin/zhanghongwei_branch' into zhanghongwei_branch ...

# Conflicts:
#	doc/process/weekly/week-14/group/meeting-mintues-14.md
#	doc/process/weekly/week-14/members/zhanghongwei-weekly-plan-14.md
#	doc/process/weekly/week-14/members/zhanghongwei-weekly-summary-13.md

df5cd4215f Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ...

# Conflicts:
#	doc/process/weekly/week-14/group/meeting-mintues-14.md
#	doc/process/weekly/week-14/members/zhanghongwei-weekly-plan-14.md
#	doc/process/weekly/week-14/members/zhanghongwei-weekly-summary-13.md

dd7ba6c712 第十四周会议纪要、第十三周总结与第十四周计划

fef039a26b 完善工单状态转换功能代码

b12f38f431 Merge pull request '完善工单状态转换功能代码' (#101) from wanglei_branch into develop

e8a07fa31d 修改增加地区功能代码

3f1745885b Merge pull request '修改增加地区功能代码' (#102) from wanglei_branch into develop

2f11026c2b 实时数据查询接口实现

477faa4740 Merge pull request '实时数据查询接口' (#103) from junmao_branch into develop

688d78ca2f 学生饮水量统计实现

98032749b8 修改代码

e2232a1818 Merge remote-tracking branch 'origin/develop' into wanglei_branch

34b499d17b 修改代码

53c3bb5ada Merge pull request '饮水量统计接口' (#105) from junmao_branch into develop

dbcb4755f9 片区

407ccea15b app2的学生饮水量统计功能

779ae4214c Merge pull request 'app2学生饮水量统计功能' (#106) from luoyuehang_branch into develop

d8659df174 app2的学生查询实时数据功能

719c4c8692 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

d9db6143fe Merge pull request 'app2查询实时数据功能' (#107) from luoyuehang_branch into develop

e18ae611fd 维修人员被派单通知接口实现

f765bf89c4 Merge pull request '被派单通知接口' (#108) from junmao_branch into develop

7def7464cc Merge remote-tracking branch 'origin/develop' into wanglei_branch

c5ac5a3645 修改人工派单代码

916937b876 Merge pull request '修改人工派单代码' (#109) from wanglei_branch into develop

66c23806b0 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ...

# Conflicts:
#	src/main/java/com/campus/water/service/WorkOrderServiceImpl.java

ba1db94c55 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

24a27ed36d 设备地图查看功能接口

2277ec7d19 Merge pull request '地图查看功能接口' (#110) from junmao_branch into develop

739e31a9b1 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

4e8d050f83 修改设备地图查看功能接口

66cb45b556 Merge pull request '修改' (#111) from junmao_branch into develop

4400a2a936 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

870e43ba33 待审核与人工派单

1820e1c3cc Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

60ff18a220 Merge pull request '待审核与人工派单' (#112) from zhanghongwei_branch into develop

aa72787505 修改地区代码

dad6dce04f Merge remote-tracking branch 'origin/develop' into wanglei_branch ...

# Conflicts:
#	src/main/java/com/campus/water/controller/web/AreaController.java

e5482eafd3 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

e4aded018e 修改地区代码

c4d595c455 修改地区代码

32115669e2 去掉重派

68bb84036f Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

d8a2a4bb67 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

794d282385 修改地区代码

e285ecb00b Merge remote-tracking branch 'origin/develop' into wanglei_branch

05cd760b34 Merge pull request '修改地区代码' (#114) from wanglei_branch into develop

b1405d4ab1 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

81976603d8 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

43df68a5c6 修改地区代码

462df55d0d Merge pull request '修改地区代码' (#115) from wanglei_branch into develop

2ba2546194 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

2d48c90d9d Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

be73e1bf1a 修改地区代码

3a849aa13e Merge pull request '修改地区代码' (#116) from wanglei_branch into develop

3330b5c061 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

08ab1f457f app2的被派单通知功能

c896a5c735 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

0902dbc29a 新增编辑管理员功能代码

d38d636b86 Merge pull request '新增编辑管理员功能代码' (#117) from wanglei_branch into develop

fb4f1d2cb1 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

84d590684f 部分优化

2dd02cb666 新增获取个人信息代码

eb285202a3 Merge pull request '新增获取个人信息代码' (#118) from wanglei_branch into zhanghongwei_branch

da2c309169 Merge pull request '新增获取个人信息代码' (#119) from wanglei_branch into develop

b89a544f6d 修改终端位置表参数

b48a0039ef Merge pull request '终端位置表参数修改' (#120) from junmao_branch into develop

4d2a7e66a0 Merge remote-tracking branch 'origin/develop' into luoyuehang_branch

40950edd4a app2的地图查看功能

81b298fd59 Merge pull request 'app2的地图查看功能及app1的被派单通知功能' (#121) from luoyuehang_branch into develop

92021ee392 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

e92d7a63ce 新增终端管理代码

c5f346827d Merge pull request '新增终端管理代码' (#122) from wanglei_branch into develop

686e175b68 新增终端管理代码

0124ad1e31 Merge pull request '新增终端管理代码' (#123) from wanglei_branch into develop

a217f0ac6c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

429a1df076 模拟发送任务修改

cbdedef19b Merge pull request '模拟发送任务修改' (#124) from junmao_branch into develop

2e512362e7 新增密码修改代码

b5dc24783e Merge pull request '新增密码修改代码' (#125) from wanglei_branch into develop

6fd4ff8471 删除设备主要是关联设备的删除

2f25bb31ea 新增解除设备关联代码

817d6638d6 Merge pull request '新增解除设备关联代码' (#126) from wanglei_branch into develop

df9c518878 Merge remote-tracking branch 'origin/zhanghongwei_branch' into zhanghongwei_branch

30484bbecf Merge pull request '部分优化' (#127) from zhanghongwei_branch into develop

9fc06f1d05 删除解除设备关联代码

c2af3b4955 Merge pull request '删除解除设备关联代码' (#128) from wanglei_branch into develop

75e2b9a394 优化

4dd70b9a43 app1的信息查看功能补充

91f510db6a Merge pull request 'app1消息功能修改' (#129) from luoyuehang_branch into develop

a6e464df78 修改迭代开发计划分工

68f486c85d app1的信息查看功能补充

1361a59887 Merge pull request 'app1消息功能补充' (#130) from luoyuehang_branch into develop

dbdc9d204c 工具类修改

c419a996ad Merge pull request '工具类修改' (#131) from junmao_branch into develop

51ff362540 app1界面样式修改

92563a3449 Merge pull request 'app1的样式修改' (#132) from luoyuehang_branch into develop

4c2d11e44c 新增根据片区增加终端机代码

03404e671f 修改

78d2d25a5d app1\2界面样式修改

ccfd2f5f19 Merge pull request 'app1\2的样式修改' (#133) from luoyuehang_branch into develop

9b023434b8 Merge remote-tracking branch 'origin/develop' into junmao_branch

ea6b15908f Merge remote-tracking branch 'origin/develop' into wanglei_branch

d6b098463e Merge pull request '修改终端机代码' (#134) from wanglei_branch into develop

a57010f6f2 Merge remote-tracking branch 'origin/develop' into wanglei_branch

f52daac91b 修改devicecontroller代码

29ce6f3921 Merge pull request '修改devicecontroller代码' (#135) from wanglei_branch into develop

d1bbf7ce31 校区的添加

14b779ee5e 设备的片区关联

59c48fe855 修改parent_maker_id长度代码

1c4c2e1ba9 Merge pull request '修改parent_maker_id长度代码' (#136) from wanglei_branch into develop

01638fe6f2 修改parent_area_id长度代码

c96d9e3045 Merge pull request '修改parent_area_id长度代码' (#137) from wanglei_branch into develop

a20c1b6725 新增管理员修改设备信息的代码

5e811a6ed6 Merge pull request '新增管理员修改设备信息的代码' (#138) from wanglei_branch into develop

8638bfcacf 图表添加

38c49ca3e7 Merge pull request '图表和片区' (#139) from zhanghongwei_branch into develop

955b1d0445 修改维修人员工单相关的代码

41ded4ebd5 Merge pull request '修改维修人员工单相关的代码' (#140) from wanglei_branch into develop

268f33036c 优化修改设备信息相关的代码

85fc39f1af Merge remote-tracking branch 'origin/develop' into wanglei_branch

b3e1665d8d Merge pull request '优化修改设备信息相关的代码' (#141) from wanglei_branch into develop

32d0cc59cc app1界面样式修改

cadd88994c Merge pull request 'app1样式修改' (#142) from luoyuehang_branch into develop

1fbe62d4ab Merge remote-tracking branch 'origin/develop' into junmao_branch

4aaad471e6 告警表格化

a2e854cf51 15周计划，14周总结

2d9e38e6f5 Merge pull request '15周周计划，14周总结' (#143) from junmao_branch into develop

c6e4c7dd23 周竞由的13周周总结和14周周计划

96d5e2a826 周竞由的13周周总结和14周周计划

a0f571331b 罗月航第十四周周总结及第十五周周计划

74605b6de6 告警表格化

df853489a5 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

e3103473ba 第十五周会议纪要、张红卫第十四周个人周总结和十五周个人周计划

7e33faefb1 Merge remote-tracking branch 'origin/develop' into wanglei_branch

22e5989be8 王磊-第十四周周总结和第十五周周计划

4ad79d7ba4 Merge pull request '王磊-第十四周周总结和第十五周周计划' (#144) from wanglei_branch into develop

bbf5db01bc 修改area_id长度

02f1abea2f Merge pull request '修改area_id长度' (#145) from wanglei_branch into develop

379f6ed295 修改area_id长度

31ba877c7b Merge pull request '修改area_id长度' (#146) from wanglei_branch into develop

6cf13115e8 增加区域和区域管理员关联

ce066db1ce Merge pull request '增加区域和区域管理员关联' (#147) from wanglei_branch into develop

36462f6927 增加区域设备统计功能

1f80591d5a Merge pull request '增加区域设备统计功能' (#148) from wanglei_branch into develop

c630470aa1 片区部分优化

97264670fe 优化添加区域管理员功能

e25b6c9c8c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ...

# Conflicts:
#	src/main/java/com/campus/water/service/AreaService.java

21c0738816 Merge pull request '优化添加区域管理员功能' (#149) from wanglei_branch into develop

1d3c70776f Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

86dfe0da93 优化功能

60a44f421f Merge pull request '优化功能' (#151) from wanglei_branch into develop

a84f365c1a Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch ...

# Conflicts:
#	src/main/java/com/campus/water/service/AreaService.java

e2e8eb99ea 优化功能

17968e1458 Merge remote-tracking branch 'origin/develop' into wanglei_branch

4ed6f75f54 Merge pull request '更改' (#152) from wanglei_branch into develop

30a85dde9c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

e6f086843c Merge remote-tracking branch 'origin/develop' into wanglei_branch

41fda45644 增加查询无负责人的区域功能

94b93593d9 Merge pull request '增加查询无负责人的区域功能' (#153) from wanglei_branch into develop

8697dc552c Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

6b17bc1721 修改告警地区id关联以及数据发送定时

0e0e9671ba 解决格式警告

a409324058 Merge pull request '修改告警地区id关联以及数据发送定时' (#154) from junmao_branch into develop

7412949355 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

7dbe437c59 修改管理员区域功能

2831880f06 Merge pull request '修改管理员区域功能' (#155) from wanglei_branch into develop

caaf265c92 Merge remote-tracking branch 'origin/develop' into zhanghongwei_branch

5c63baeeb8 去除设备统计功能

e1ac587346 Merge pull request '去除设备统计功能' (#156) from wanglei_branch into develop

0a7428bd16 创建工单时添加alert_id

e2d67429ac Merge pull request '创建工单时添加alert_id' (#157) from junmao_branch into develop

673b22b310 片区部分优化

7928fb6edb Merge pull request '校区添加' (#150) from zhanghongwei_branch into develop

af3f2ba219 工具类修改

c138bc6baf Merge pull request '工具类修改' (#158) from junmao_branch into develop

8e1ce478a5 全局异常处理完善

af8120601b Merge pull request '全局异常处理完善' (#159) from jingyou_branch into develop

a855ba3995 数据库设计文档

78432de553 Merge pull request '数据库设计文档' (#160) from wanglei_branch into develop

p95fco63j merged commit d3605bef69 into main 2 weeks ago

p95fco63j referenced this issue from a commit 2 weeks ago

Merge pull request '稳定运行版本1.0' (#161) from develop into main

The pull request has been merged as d3605bef69.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: p95fco63j/Water_Machine_Management_System#161

Write Preview

Loading…

Cancel

Save

There is no content yet.