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
98e50a68
Commit
98e50a68
authored
May 15, 2026
by
DESKTOP-VKRD9QF\Administration
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
时间格式修改
parent
f3e148e7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
4 deletions
+20
-4
MachineCalculator.java
...ain/java/com/aps/service/Algorithm/MachineCalculator.java
+0
-1
PlanResultService.java
src/main/java/com/aps/service/plan/PlanResultService.java
+20
-3
No files found.
src/main/java/com/aps/service/Algorithm/MachineCalculator.java
View file @
98e50a68
...
@@ -8,7 +8,6 @@ import com.aps.entity.basic.*;
...
@@ -8,7 +8,6 @@ import com.aps.entity.basic.*;
import
com.aps.service.plan.MachineSchedulerService
;
import
com.aps.service.plan.MachineSchedulerService
;
import
com.baomidou.mybatisplus.core.toolkit.StringUtils
;
import
com.baomidou.mybatisplus.core.toolkit.StringUtils
;
import
com.sun.org.apache.xpath.internal.objects.XBoolean
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.math.RoundingMode
;
...
...
src/main/java/com/aps/service/plan/PlanResultService.java
View file @
98e50a68
...
@@ -51,6 +51,8 @@ import java.util.stream.IntStream;
...
@@ -51,6 +51,8 @@ import java.util.stream.IntStream;
@Service
@Service
public
class
PlanResultService
{
public
class
PlanResultService
{
private
static
final
int
PREVIEW_DATA_CACHE_SIZE
=
32
;
private
static
final
int
PREVIEW_DATA_CACHE_SIZE
=
32
;
private
static
final
DateTimeFormatter
API_TIMESTAMP_FORMATTER
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
);
private
final
JsonFactory
previewJsonFactory
=
new
JsonFactory
();
private
final
JsonFactory
previewJsonFactory
=
new
JsonFactory
();
private
final
Map
<
String
,
SceneVersionPreviewData
>
previewDataCache
=
Collections
.
synchronizedMap
(
private
final
Map
<
String
,
SceneVersionPreviewData
>
previewDataCache
=
Collections
.
synchronizedMap
(
new
LinkedHashMap
<
String
,
SceneVersionPreviewData
>(
16
,
0.75
F
,
true
)
{
new
LinkedHashMap
<
String
,
SceneVersionPreviewData
>(
16
,
0.75
F
,
true
)
{
...
@@ -3752,7 +3754,7 @@ if(job.getGeneDetails()!=null)
...
@@ -3752,7 +3754,7 @@ if(job.getGeneDetails()!=null)
Map
<
String
,
Object
>
versionData
=
getSceneVersion
(
sceneId
);
Map
<
String
,
Object
>
versionData
=
getSceneVersion
(
sceneId
);
SceneVersionPreviewData
previewData
=
collectSceneVersionPreviewData
(
sceneId
);
SceneVersionPreviewData
previewData
=
collectSceneVersionPreviewData
(
sceneId
);
if
(
previewData
==
null
)
{
if
(
previewData
==
null
)
{
throw
new
RuntimeException
(
"未找到对应的场景文件
"
);
throw
new
RuntimeException
(
"未找到对应的场景文件
: "
+
getCurrentChromosomeFileName
(
sceneId
)
);
}
}
int
previewWidth
=
getPositiveIntegerParam
(
params
,
"previewWidth"
,
100
);
int
previewWidth
=
getPositiveIntegerParam
(
params
,
"previewWidth"
,
100
);
...
@@ -3766,8 +3768,8 @@ if(job.getGeneDetails()!=null)
...
@@ -3766,8 +3768,8 @@ if(job.getGeneDetails()!=null)
int
previewHeight
)
{
int
previewHeight
)
{
Map
<
String
,
Object
>
result
=
new
LinkedHashMap
<>();
Map
<
String
,
Object
>
result
=
new
LinkedHashMap
<>();
result
.
put
(
"index"
,
versionData
==
null
?
-
1
:
versionData
.
get
(
"index"
));
result
.
put
(
"index"
,
versionData
==
null
?
-
1
:
versionData
.
get
(
"index"
));
result
.
put
(
"start"
,
previewData
.
minStart
==
null
?
null
:
previewData
.
minStart
.
toLocalDate
().
toString
(
));
result
.
put
(
"start"
,
formatApiTimestamp
(
previewData
.
minStart
));
result
.
put
(
"end"
,
previewData
.
maxEnd
==
null
?
null
:
previewData
.
maxEnd
.
toLocalDate
().
toString
(
));
result
.
put
(
"end"
,
formatApiTimestamp
(
previewData
.
maxEnd
));
result
.
put
(
"taskCount"
,
previewData
.
taskCount
);
result
.
put
(
"taskCount"
,
previewData
.
taskCount
);
result
.
put
(
"planCount"
,
previewData
.
planCount
);
result
.
put
(
"planCount"
,
previewData
.
planCount
);
result
.
put
(
"equipCount"
,
previewData
.
equipCount
);
result
.
put
(
"equipCount"
,
previewData
.
equipCount
);
...
@@ -3781,9 +3783,24 @@ if(job.getGeneDetails()!=null)
...
@@ -3781,9 +3783,24 @@ if(job.getGeneDetails()!=null)
return
result
;
return
result
;
}
}
private
String
formatApiTimestamp
(
LocalDateTime
time
)
{
return
time
==
null
?
null
:
time
.
format
(
API_TIMESTAMP_FORMATTER
);
}
private
String
getCurrentChromosomeFileName
(
String
sceneId
)
{
try
{
File
file
=
_sceneService
.
getCurrentChromosomeFile
(
sceneId
);
return
file
==
null
?
sceneId
:
file
.
getName
();
}
catch
(
RuntimeException
ex
)
{
log
.
warn
(
"获取场景文件名失败,sceneId={}"
,
sceneId
,
ex
);
return
sceneId
;
}
}
private
SceneVersionPreviewData
collectSceneVersionPreviewData
(
String
sceneId
)
{
private
SceneVersionPreviewData
collectSceneVersionPreviewData
(
String
sceneId
)
{
File
file
=
_sceneService
.
getCurrentChromosomeFile
(
sceneId
);
File
file
=
_sceneService
.
getCurrentChromosomeFile
(
sceneId
);
if
(
file
==
null
||
!
file
.
exists
()
||
file
.
length
()
==
0L
)
{
if
(
file
==
null
||
!
file
.
exists
()
||
file
.
length
()
==
0L
)
{
log
.
warn
(
"场景缩略图文件不存在或为空: {}"
,
file
==
null
?
sceneId
:
file
.
getAbsolutePath
());
return
null
;
return
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