 chenxudong
|
e41ef76803
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-06 18:04:59 +08:00 |
|
chenxudong
|
53f61ba8f8
|
调通了层级树查询。
|
2025-03-06 18:04:56 +08:00 |
s2042968
|
f05803432f
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-06 13:50:17 +08:00 |
|
s2042968
|
8e3f27eeaf
|
fix:修改标签批量发布的入参
|
2025-03-06 13:50:06 +08:00 |
|
chenxudong
|
f51f76fa6d
|
解决发现的问题。
|
2025-03-06 13:49:14 +08:00 |
|
s2042968
|
2924849d2f
|
fix:增加标签排序入参
|
2025-03-06 10:03:38 +08:00 |
|
chenxudong
|
0c5aab655a
|
改bug
|
2025-03-05 17:48:55 +08:00 |
|
chenxudong
|
1d3f0e267e
|
改bug
|
2025-03-05 17:21:59 +08:00 |
|
chenxudong
|
314c93efb9
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-05 17:07:40 +08:00 |
|
chenxudong
|
fd4ea6c77f
|
修改bug
|
2025-03-05 17:07:36 +08:00 |
|
s2042968
|
964011b8d9
|
fix:修改标签查看接口出参
|
2025-03-05 16:47:57 +08:00 |
|
s2042968
|
6110687938
|
fix:查看收藏数据接口，增加view权限
|
2025-03-05 16:39:10 +08:00 |
|
s2042968
|
d48a592e85
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-05 16:26:16 +08:00 |
|
s2042968
|
2549ca5db4
|
fix:标签库接口连调修改
|
2025-03-05 16:25:33 +08:00 |
|
chenxudong
|
8f5486df67
|
解决已知问题。
|
2025-03-05 16:12:35 +08:00 |
|
s2042968
|
a148bc463a
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-05 15:42:22 +08:00 |
|
s2042968
|
d549cc6b73
|
feat:收藏页数据接口设置权限
|
2025-03-05 15:42:13 +08:00 |
|
chenxudong
|
a55bb0eb18
|
解决删除文件格式的bug
|
2025-03-05 15:26:26 +08:00 |
|
chenxudong
|
82acc597e6
|
适配更新自动填充
|
2025-03-05 15:20:45 +08:00 |
|
chenxudong
|
3bfbebf460
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-05 13:42:31 +08:00 |
|
chenxudong
|
b2063c6219
|
解决已知问题。
|
2025-03-05 13:42:24 +08:00 |
|
s2042968
|
52e58019fc
|
feat:个人数据增添标签接口
|
2025-03-05 12:15:13 +08:00 |
|
s2042968
|
7a76d94581
|
fix:处理空标签查询
|
2025-03-05 12:14:51 +08:00 |
|
s2042968
|
a1fa5a9225
|
fix:文件格式补充创建人
|
2025-03-05 12:14:06 +08:00 |
|
s2042968
|
63c2e3c250
|
fix:收藏查询SQL
|
2025-03-05 12:13:39 +08:00 |
|
s2042968
|
5a3874a748
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-05 10:48:23 +08:00 |
|
s2042968
|
3e6471079d
|
feat: 标签筛选功能
|
2025-03-05 10:48:16 +08:00 |
|
chenxudong
|
5f0c7ce861
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-05 10:38:10 +08:00 |
|
chenxudong
|
5d8fca9ee1
|
新增了查询备份信息的接口
|
2025-03-05 10:37:45 +08:00 |
|
s2042968
|
080d369e42
|
合并，解决冲突
|
2025-03-05 10:27:37 +08:00 |
|
s2042968
|
a750c3cb62
|
feat: 修改文件数据接口的返回结果，增添收藏标识，个人文件标识和标签列表
|
2025-03-05 10:26:32 +08:00 |
|
chenxudong
|
77fdd99e69
|
新增备份日志查询
|
2025-03-05 10:25:24 +08:00 |
|
s2042968
|
3d908e23b6
|
fix：角色权限关系主键id改为字符串类型
|
2025-03-05 09:49:23 +08:00 |
|
chenxudong
|
4d201505dc
|
实现文件控制白名单
|
2025-03-05 09:10:23 +08:00 |
|
chenxudong
|
dc7d061be2
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-04 17:23:11 +08:00 |
|
chenxudong
|
543d253ac4
|
完善文件格式上传功能
|
2025-03-04 17:22:58 +08:00 |
 lizhanhao
|
4bd12e3761
|
新增批量添加标签到文件功能
|
2025-03-04 17:19:08 +08:00 |
|
s2042968
|
12e45cf7d1
|
fix：文件格式主键id改为字符串类型
|
2025-03-04 15:36:43 +08:00 |
|
s2042968
|
2ea2a156ca
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-04 15:19:37 +08:00 |
|
s2042968
|
b578b91b0d
|
feat：文件格式管理功能
|
2025-03-04 15:19:27 +08:00 |
|
chenxudong
|
e91fb07dff
|
删除无用代码。
|
2025-03-04 14:55:17 +08:00 |
|
chenxudong
|
4052d9b0ea
|
优化代码
|
2025-03-04 14:50:03 +08:00 |
|
chenxudong
|
34fdf667ec
|
添加tag和属性预览相关。
|
2025-03-04 14:33:42 +08:00 |
|
s2042968
|
d44de8d924
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-04 13:20:11 +08:00 |
|
chenxudong
|
bd59d91776
|
优化代码。
|
2025-03-04 10:57:36 +08:00 |
|
chenxudong
|
69fa79bf59
|
解决发现的问题
|
2025-03-04 10:51:05 +08:00 |
|
chenxudong
|
b911212ef2
|
解决导出的问题
|
2025-03-03 17:27:13 +08:00 |
|
chenxudong
|
68724883a7
|
解决已知问题。
|
2025-03-03 15:42:20 +08:00 |
|
s2042968
|
b8142c5ff2
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-03 14:24:28 +08:00 |
|
s2042968
|
965831ae6b
|
feat：添加筛选页面展示所有标签功能
|
2025-03-03 14:08:12 +08:00 |
|
chenxudong
|
5cb52e3252
|
调通用户工程查询。
|
2025-03-03 13:40:06 +08:00 |
|
chenxudong
|
e506ef262a
|
暂时存放
|
2025-03-03 11:55:52 +08:00 |
|
chenxudong
|
60269d0409
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-03-03 09:10:49 +08:00 |
|
chenxudong
|
f468e0f680
|
新增用户上传的文件或创建文件夹的标识。
|
2025-03-03 09:09:14 +08:00 |
|
s2042968
|
96edc80df9
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-02-28 17:09:51 +08:00 |
|
chenxudong
|
833a0877b7
|
修改已知问题
|
2025-02-28 15:29:30 +08:00 |
|
chenxudong
|
8ba1de209b
|
重构文件收藏相关功能。
|
2025-02-28 15:08:21 +08:00 |
|
chenxudong
|
4f51521354
|
完成文件备份相关的功能
|
2025-02-28 14:13:13 +08:00 |
|
s2042968
|
9c6ababd34
|
feat：添加标签树结构的展示功能
|
2025-02-28 13:16:35 +08:00 |
|
chenxudong
|
dd85e18e76
|
优化备份相关
|
2025-02-28 09:56:47 +08:00 |
|
s2042968
|
2bd7795002
|
fix: 防止文件夹建立关系
|
2025-02-27 16:52:43 +08:00 |
|
chenxudong
|
347ae33c71
|
补充文件备份相关功能
|
2025-02-27 16:25:13 +08:00 |
|
chenxudong
|
5eb98d6f78
|
文件物理删除与恢复
|
2025-02-27 15:35:42 +08:00 |
|
s2042968
|
38fcdcb859
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-02-26 16:53:27 +08:00 |
|
s2042968
|
cbec04ba89
|
增加了接口的操作记录
|
2025-02-26 16:53:16 +08:00 |
|
chenxudong
|
e685dbff5b
|
操作记录和审计搜索功能。
|
2025-02-26 16:25:31 +08:00 |
|
chenxudong
|
ef19d92abf
|
修改已知问题
|
2025-02-26 15:54:19 +08:00 |
|
chenxudong
|
9b6b837840
|
优化日志提示
|
2025-02-26 15:12:48 +08:00 |
|
chenxudong
|
545188be69
|
优化相关功能
|
2025-02-26 15:07:24 +08:00 |
|
chenxudong
|
58e4c4397d
|
添加parentId
|
2025-02-26 14:36:17 +08:00 |
|
chenxudong
|
cbcc133c2f
|
补充操作记录相关的代码。
|
2025-02-26 13:52:26 +08:00 |
|
chenxudong
|
26954302de
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-02-26 11:39:18 +08:00 |
|
chenxudong
|
2eb38794c4
|
增加审计相关功能
|
2025-02-26 11:39:11 +08:00 |
|
lizhanhao
|
c389f40848
|
修改“修改密码”功能
|
2025-02-25 15:24:11 +08:00 |
|
s2042968
|
456db7f1ef
|
修改bug
|
2025-02-25 13:54:28 +08:00 |
|
chenxudong
|
0e4e320b94
|
操作记录和审计相关功能
|
2025-02-25 12:07:33 +08:00 |
|
lizhanhao
|
384c54a842
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-02-24 19:34:27 +08:00 |
|
lizhanhao
|
25ca8ba06c
|
新增修改密码功能
|
2025-02-24 19:33:31 +08:00 |
|
s2042968
|
ebf09cfe1f
|
解决冲突
|
2025-02-24 17:23:18 +08:00 |
|
s2042968
|
a6fa3f0d59
|
Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop
|
2025-02-24 17:17:25 +08:00 |
|
s2042968
|
5af549321b
|
增加类型id
|
2025-02-24 17:17:14 +08:00 |
|
chenxudong
|
bb6058be9c
|
Merge branch 'test' into develop
# Conflicts:
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
# electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
# electrmangnetic/src/main/resources/application.properties
解决部分冲突。
|
2025-02-24 17:07:32 +08:00 |
|
chenxudong
|
4819e534eb
|
新增用户查询自己数据接口功能
|
2025-02-24 16:09:52 +08:00 |
|
chenxudong
|
3057b9cf7c
|
实现了数据库和工程操作相关的操作记录功能。
|
2025-02-24 16:00:10 +08:00 |
|
chenxudong
|
e47e4bd3e8
|
上传相关demo
|
2025-02-24 13:35:28 +08:00 |
|
chenxudong
|
55bc397f9e
|
优化代码
|
2025-02-21 17:26:22 +08:00 |
|
chenxudong
|
46d798a019
|
调了上传文件记录的一个demo
|
2025-02-21 17:08:34 +08:00 |
|
s2042968
|
5e9caede22
|
修改收藏数据查询排序字段
|
2025-02-20 17:01:42 +08:00 |
|
s2042968
|
74445e99c2
|
添加UserOperation标签
|
2025-02-20 17:01:18 +08:00 |
|
s2042968
|
b099734668
|
合并冲突
|
2025-02-20 15:37:09 +08:00 |
|
s2042968
|
5e118c9d10
|
收藏页面数据查询接口
|
2025-02-20 15:22:35 +08:00 |
|
chenxudong
|
3639983d59
|
更改已知问题。
|
2025-02-20 15:17:34 +08:00 |
|
chenxudong
|
cd07bb989c
|
发现已知问题
|
2025-02-20 15:16:52 +08:00 |
|
chenxudong
|
ac415f13b4
|
增加自定义层级相关功能
|
2025-02-20 15:13:22 +08:00 |
|
s2042968
|
1f1266bbee
|
优化：增加文件后缀名显示
|
2025-02-19 17:57:28 +08:00 |
|
s2042968
|
086ec057a0
|
修复：重名文件建立关系
|
2025-02-19 17:50:08 +08:00 |
|
s2042968
|
3755ce201a
|
修复2：检验文件名唯一性接口
|
2025-02-19 17:28:06 +08:00 |
|
s2042968
|
7a55a351cb
|
Merge branch 'test' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into test
|
2025-02-19 17:21:57 +08:00 |
|
s2042968
|
4a80dc3753
|
修复：检验文件名唯一性接口
|
2025-02-19 17:21:47 +08:00 |
|
chenxudong
|
1d323e9081
|
优化代码
|
2025-02-19 17:18:11 +08:00 |