Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
HYH.APSJ
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
佟礼
HYH.APSJ
Commits
074de057
Commit
074de057
authored
Apr 29, 2026
by
DESKTOP-VKRD9QF\Administration
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
索引版本返回
parent
87592467
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
336 additions
and
3 deletions
+336
-3
ResourceGanttController.java
...ava/com/aps/controller/gantt/ResourceGanttController.java
+18
-1
Machine.java
src/main/java/com/aps/entity/basic/Machine.java
+4
-1
PlanResultService.java
src/main/java/com/aps/service/plan/PlanResultService.java
+312
-0
SceneService.java
src/main/java/com/aps/service/plan/SceneService.java
+2
-1
No files found.
src/main/java/com/aps/controller/gantt/ResourceGanttController.java
View file @
074de057
...
@@ -973,6 +973,23 @@ public class ResourceGanttController {
...
@@ -973,6 +973,23 @@ public class ResourceGanttController {
return
R
.
ok
(
versionData
);
return
R
.
ok
(
versionData
);
}
}
@PostMapping
(
"/getSceneVersionWithIndexPreview"
)
@Operation
(
summary
=
"获取版本号、当前索引和甘特概览"
,
description
=
"返回版本信息,并按资源甘特数据统计场景时间、工单、订单、设备和预览图"
)
public
R
<
Map
<
String
,
Object
>>
getSceneVersionWithIndexPreview
(
@io
.
swagger
.
v3
.
oas
.
annotations
.
parameters
.
RequestBody
(
description
=
"previewWidth、previewHeight 为可选字段,用于控制返回 preview 图片尺寸。"
,
content
=
@io
.
swagger
.
v3
.
oas
.
annotations
.
media
.
Content
(
mediaType
=
"application/json"
,
examples
=
@io
.
swagger
.
v3
.
oas
.
annotations
.
media
.
ExampleObject
(
name
=
"获取版本和缩略图示例"
,
value
=
"{\n \"sceneId\": \"F397427A76754E33A5655C41A7D0BC4A\",\n \"previewWidth\": 896,\n \"previewHeight\": 20\n}"
)
)
)
@RequestBody
Map
<
String
,
Object
>
params
)
{
String
sceneId
=
ParamValidator
.
getString
(
params
,
"sceneId"
,
"场景ID"
);
return
R
.
ok
(
planResultService
.
getSceneVersionWithIndexPreview
(
sceneId
,
params
));
}
@PostMapping
(
"/revertVersion"
)
@PostMapping
(
"/revertVersion"
)
@Operation
(
summary
=
"撤销操作"
,
description
=
"撤销操作"
,
@Operation
(
summary
=
"撤销操作"
,
description
=
"撤销操作"
,
...
@@ -1092,4 +1109,4 @@ public class ResourceGanttController {
...
@@ -1092,4 +1109,4 @@ public class ResourceGanttController {
}
}
}
}
\ No newline at end of file
src/main/java/com/aps/entity/basic/Machine.java
View file @
074de057
...
@@ -57,7 +57,10 @@ public class Machine {
...
@@ -57,7 +57,10 @@ public class Machine {
* 设备编码
* 设备编码
*/
*/
private
String
code
;
private
String
code
;
/**
* 设备类型
*
*/
private
String
capacityTypeName
;
private
String
capacityTypeName
;
/**
/**
...
...
src/main/java/com/aps/service/plan/PlanResultService.java
View file @
074de057
This diff is collapsed.
Click to expand it.
src/main/java/com/aps/service/plan/SceneService.java
View file @
074de057
...
@@ -28,6 +28,8 @@ public class SceneService {
...
@@ -28,6 +28,8 @@ public class SceneService {
@Autowired
@Autowired
private
RedisUtils
redisUtils
;
private
RedisUtils
redisUtils
;
private
final
ObjectMapper
objectMapper
=
createObjectMapper
();
private
ObjectMapper
createObjectMapper
()
{
private
ObjectMapper
createObjectMapper
()
{
ObjectMapper
objectMapper
=
new
ObjectMapper
();
ObjectMapper
objectMapper
=
new
ObjectMapper
();
objectMapper
.
registerModule
(
new
JavaTimeModule
());
objectMapper
.
registerModule
(
new
JavaTimeModule
());
...
@@ -72,7 +74,6 @@ public class SceneService {
...
@@ -72,7 +74,6 @@ public class SceneService {
try
{
try
{
long
totalStart
=
System
.
nanoTime
();
long
totalStart
=
System
.
nanoTime
();
ObjectMapper
objectMapper
=
createObjectMapper
();
SceneChromsome
sceneChromsome
=
(
SceneChromsome
)
redisUtils
.
get
(
"SceneId."
+
sceneId
);
SceneChromsome
sceneChromsome
=
(
SceneChromsome
)
redisUtils
.
get
(
"SceneId."
+
sceneId
);
File
file
;
File
file
;
if
(
sceneChromsome
==
null
)
{
if
(
sceneChromsome
==
null
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment