Skip to content

H
HYH.APSJ
Commit bdfee182 authored by Tong Li's avatar Tong Li
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/com/aps/service/Algorithm/GeneticDecoder.java
parents 539b80b3 e931afa6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 68 deletions
logs/aps.log 0 → 100644
View file @ bdfee182
2026-03-25 23:38:18.378 | main | INFO | com.aps.ApsApplication | Starting ApsApplication using Java 17.0.18 on GJS-20250302HBH with PID 36188 (E:\ai\hyh.apsj\target\classes started by Administrator in E:\ai\hyh.apsj)
2026-03-25 23:38:18.382 | main | INFO | com.aps.ApsApplication | No active profile set, falling back to 1 default profile: "default"
2026-03-25 23:38:19.601 | main | INFO | org.apache.coyote.http11.Http11NioProtocol | Initializing ProtocolHandler ["http-nio-8181"]
2026-03-25 23:38:19.602 | main | INFO | org.apache.catalina.core.StandardService | Starting service [Tomcat]
2026-03-25 23:38:19.602 | main | INFO | org.apache.catalina.core.StandardEngine | Starting Servlet engine: [Apache Tomcat/9.0.83]
2026-03-25 23:38:19.686 | main | INFO | o.a.c.core.ContainerBase.[Tomcat].[localhost].[/] | Initializing Spring embedded WebApplicationContext
2026-03-25 23:38:20.545 | main | INFO | c.b.dynamic.datasource.DynamicRoutingDataSource | dynamic-datasource - add a datasource named [oracle] success
2026-03-25 23:38:20.546 | main | INFO | c.b.dynamic.datasource.DynamicRoutingDataSource | dynamic-datasource initial loaded [1] datasource,primary datasource named [oracle]
2026-03-25 23:38:20.941 | main | WARN | c.b.mybatisplus.core.injector.DefaultSqlInjector | class com.aps.entity.ApsTimeConfig ,Not found @TableId annotation, Cannot use Mybatis-Plus 'xxById' Method.
2026-03-25 23:38:21.654 | main | WARN | c.b.mybatisplus.core.injector.DefaultSqlInjector | class com.aps.entity.Algorithm.OrderMaterialRequirement ,Not found @TableId annotation, Cannot use Mybatis-Plus 'xxById' Method.
2026-03-25 23:38:21.717 | main | INFO | com.aps.controller.gantt.FileUploadController | 创建上传目录: E:\ai\hyh.apsj\uploads
2026-03-25 23:38:21.717 | main | INFO | com.aps.controller.gantt.FileUploadController | 创建上传目录: E:\ai\hyh.apsj\uploads
2026-03-25 23:38:22.388 | main | INFO | org.apache.coyote.http11.Http11NioProtocol | Starting ProtocolHandler ["http-nio-8181"]
2026-03-25 23:38:22.404 | main | INFO | com.aps.ApsApplication | Started ApsApplication in 4.45 seconds (JVM running for 5.14)
src/main/java/com/aps/service/Algorithm/MachineCalculator.java
View file @ bdfee182
......@@ -41,6 +41,7 @@ public class MachineCalculator {
/**
* 获取机器下一个可用时间窗口（考虑班次约束）
*/
// 从 proposedStartTime 开始查找机台下一段可排窗口；必要时会把命中的 availability 临时标记为已占用。
public CopyOnWriteArrayList<ScheduleResultDetail> getNextAvailableTime(Machine machine, int proposedStartTime,
int prevtime, int processingTime,
CopyOnWriteArrayList<GAScheduleResult> existingTasks,
......@@ -70,6 +71,7 @@ public class MachineCalculator {
return findAvailableSegments(machine, startTime, existingTasks, processingTime, isInterrupt);
}
// 基于已选可用时段组装排程结果，并把换型段/加工段对应的 availability 临时占用。
public Map<Integer,Object> CreateScheduleResult(
Machine machine, int processingTime, int proposedStartTime,CopyOnWriteArrayList<TimeSegment> timeSegments,
double oneTime,double quantity
......@@ -1289,6 +1291,7 @@ public class MachineCalculator {
return times;
}
// 把目标 availability 按本次排程切成“剩余可用段”和“本次已占用段”，并把占用段 key 回写到 geneDetails。
private CopyOnWriteArrayList<TimeSegment> RemoveMachineAvailable(Machine machine, ScheduleResultDetail geneDetails,TimeSegment targetSegment) {
......
src/main/java/com/aps/service/Algorithm/MaterialRequirementService.java
View file @ bdfee182
......@@ -75,6 +75,7 @@ public class MaterialRequirementService {
private static final int cachetimeout = 60;
private static final int ORACLE_IN_BATCH_SIZE = 1000;
private String cacheKey="_MR_";
private String routingHeaderCacheKey=cacheKey+ "RoutingHeader";
private String routingsupportingCacheKey=cacheKey+ "Routingsupporting";
......@@ -100,22 +101,13 @@ public class MaterialRequirementService {
.map(Order::getRoutingId)
.distinct()
.collect(Collectors.toList());
List<RoutingHeader> routingHeaders=null;
LambdaQueryWrapper<RoutingHeader> wrapper = new LambdaQueryWrapper<>();
wrapper.in(RoutingHeader::getId, routingIds);
// .eq(RoutingHeader::getIsDeleted, 0)
// .eq(RoutingHeader::getApprovalStatus, 1);
routingHeaders = routingHeaderMapper.selectList(wrapper);
List<RoutingHeader> routingHeaders = getRoutingHeadersByIds(routingIds);
List<Routingsupporting> routingsupportings=null;
// 查询并缓存Routingsupporting
LambdaQueryWrapper<Routingsupporting> routingsupportingwrapper = new LambdaQueryWrapper<>();
routingsupportingwrapper.in(Routingsupporting::getRoutingHeaderId, routingIds)
.eq(Routingsupporting::getIsdeleted, 0);
routingsupportings = routingsupportingMapper.selectList(routingsupportingwrapper);
routingsupportings = getRoutingsupportingsByRoutingHeaderIds(routingIds);
// 查询并缓存RoutingSupportingReplace
......@@ -126,10 +118,7 @@ public class MaterialRequirementService {
.distinct()
.collect(Collectors.toList());
LambdaQueryWrapper<RoutingSupportingReplace> routingsupportingreplacewrapper = new LambdaQueryWrapper<>();
routingsupportingreplacewrapper.in(RoutingSupportingReplace::getStrsupid, routingsupportingids)
.eq(RoutingSupportingReplace::getIsdeleted, 0);
replaces = routingSupportingReplaceMapper.selectList(routingsupportingreplacewrapper);
replaces = getRoutingSupportingReplacesByStrsupids(routingsupportingids);
}
List<Material> useMaterials=new ArrayList<>();
......@@ -279,11 +268,7 @@ if(Operations==null)
LambdaQueryWrapper<Routingsupporting> routingsupportingwrapper = new LambdaQueryWrapper<>();
routingsupportingwrapper.in(Routingsupporting::getRoutingHeaderId, routingIds)
.eq(Routingsupporting::getIsdeleted, 0);
routingsupportings1 = routingsupportingMapper.selectList(routingsupportingwrapper);
routingsupportings1 = getRoutingsupportingsByRoutingHeaderIds(routingIds);
if(routingsupportings1!=null&&routingsupportings1.size()>0)
{
routingsupportings.addAll(routingsupportings1);
......@@ -293,11 +278,7 @@ if(Operations==null)
.distinct()
.collect(Collectors.toList());
LambdaQueryWrapper<RoutingSupportingReplace> routingsupportingreplacewrapper = new LambdaQueryWrapper<>();
routingsupportingreplacewrapper.in(RoutingSupportingReplace::getStrsupid, routingsupportingids)
.eq(RoutingSupportingReplace::getIsdeleted, 0);
routingsupportingreplaces1 = routingSupportingReplaceMapper.selectList(routingsupportingreplacewrapper);
routingsupportingreplaces1 = getRoutingSupportingReplacesByStrsupids(routingsupportingids);
routingsupportingreplaces.addAll(routingsupportingreplaces1);
......@@ -1543,6 +1524,62 @@ if(demand==null)
return RoutingSupportingReplaces;
}
private List<RoutingHeader> getRoutingHeadersByIds(List<Integer> routingIds) {
if (CollectionUtils.isEmpty(routingIds)) {
return new ArrayList<>();
}
List<RoutingHeader> routingHeaders = new ArrayList<>();
for (List<Integer> batchIds : partitionList(routingIds, ORACLE_IN_BATCH_SIZE)) {
LambdaQueryWrapper<RoutingHeader> wrapper = new LambdaQueryWrapper<>();
wrapper.in(RoutingHeader::getId, batchIds);
routingHeaders.addAll(routingHeaderMapper.selectList(wrapper));
}
return routingHeaders;
}
private List<Routingsupporting> getRoutingsupportingsByRoutingHeaderIds(List<? extends Number> routingIds) {
if (CollectionUtils.isEmpty(routingIds)) {
return new ArrayList<>();
}
List<Routingsupporting> routingsupportings = new ArrayList<>();
for (List<? extends Number> batchIds : partitionList(routingIds, ORACLE_IN_BATCH_SIZE)) {
LambdaQueryWrapper<Routingsupporting> routingsupportingwrapper = new LambdaQueryWrapper<>();
routingsupportingwrapper.in(Routingsupporting::getRoutingHeaderId, batchIds)
.eq(Routingsupporting::getIsdeleted, 0);
routingsupportings.addAll(routingsupportingMapper.selectList(routingsupportingwrapper));
}
return routingsupportings;
}
private List<RoutingSupportingReplace> getRoutingSupportingReplacesByStrsupids(List<String> routingSupportingIds) {
if (CollectionUtils.isEmpty(routingSupportingIds)) {
return new ArrayList<>();
}
List<RoutingSupportingReplace> replaces = new ArrayList<>();
for (List<String> batchIds : partitionList(routingSupportingIds, ORACLE_IN_BATCH_SIZE)) {
LambdaQueryWrapper<RoutingSupportingReplace> routingsupportingreplacewrapper = new LambdaQueryWrapper<>();
routingsupportingreplacewrapper.in(RoutingSupportingReplace::getStrsupid, batchIds)
.eq(RoutingSupportingReplace::getIsdeleted, 0);
replaces.addAll(routingSupportingReplaceMapper.selectList(routingsupportingreplacewrapper));
}
return replaces;
}
private <T> List<List<T>> partitionList(List<T> source, int batchSize) {
List<List<T>> partitions = new ArrayList<>();
if (CollectionUtils.isEmpty(source) || batchSize <= 0) {
return partitions;
}
for (int i = 0; i < source.size(); i += batchSize) {
partitions.add(source.subList(i, Math.min(i + batchSize, source.size())));
}
return partitions;
}
private List<RoutingDetail> GetRoutingDetails(String sceneId) {
List<RoutingDetail> RoutingDetails=(List<RoutingDetail>)GlobalCacheUtil.get(sceneId+routingDetailCacheKey);
if(RoutingDetails==null)
......
src/main/resources/logback-spring.xml
View file @ bdfee182
......@@ -61,7 +61,7 @@
<!-- 针对你的包结构进行配置 -->
<!-- 1. 算法包（你最关心的） -->
<logger name="com.aps.service.Algorithm" level="DEBUG">
<logger name="com.aps.service.Algorithm" level="INFO">
<appender-ref ref="FILE"/>
</logger>
......@@ -81,7 +81,7 @@
</logger>
<!-- 5. Mapper层（SQL日志） -->
<logger name="com.aps.mapper" level="DEBUG">
<logger name="com.aps.mapper" level="INFO">
<appender-ref ref="FILE"/>
</logger>
......@@ -91,26 +91,26 @@
</logger>
<!-- 第三方框架日志控制 -->
<logger name="org.springframework" level="WARN"/>
<logger name="org.mybatis" level="WARN"/>
<logger name="com.zaxxer.hikari" level="WARN"/>
<logger name="org.springframework" level="INFO"/>
<logger name="org.mybatis" level="INFO"/>
<logger name="com.zaxxer.hikari" level="INFO"/>
<!-- 根据不同环境调整 -->
<springProfile name="dev">
<root level="DEBUG">
<root level="INFO">
<appender-ref ref="CONSOLE"/>
</root>
<logger name="com.aps" level="DEBUG"/>
<logger name="com.aps" level="INFO"/>
</springProfile>
<springProfile name="prod">
<root level="WARN">
<root level="INFO">
<appender-ref ref="FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
<!-- 生产环境关闭DEBUG日志 -->
<logger name="com.aps.mapper" level="WARN"/>
<logger name="com.aps.mapper" level="INFO"/>
<logger name="com.aps.service.Algorithm" level="INFO"/>
</springProfile>
</configuration>
\ No newline at end of file
</configuration>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment