From 051613aa73be3e75af5a6dfdb86a722bcb5af094 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 八月 2024 16:46:51 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 36 ------------------------------------
1 files changed, 0 insertions(+), 36 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
index ac92054..8646b79 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -5,8 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.common.S7object;
import com.mes.common.config.Const;
-import com.mes.damage.entity.Damage;
-import com.mes.damage.service.DamageService;
import com.mes.device.PlcParameterObject;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -35,10 +33,6 @@
@Autowired
private TemperingGlassInfoService temporaryGlassInfoService;
-
- @Autowired
- private DamageService damageService;
-
private static final String ALONE_STATE = "0";
@@ -60,10 +54,6 @@
List<Object> temperRecordIdListObj = temporalRecordService.listObjs(new QueryWrapper<TemperingRecord>().select("distinct tempering_layout_id"));
List<String> temperRecordIdList = temperRecordIdListObj.stream().map(String::valueOf).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(temperRecordIdList)) {
- log.info("褰撳墠绯荤粺娌℃湁闇�瑕侀挗鍖栫殑鐜荤拑淇℃伅");
- return;
- }
List<TemperingGlassInfo> list = temporaryGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
.eq(TemperingGlassInfo::getState, Const.TEMPERING_START).notIn(TemperingGlassInfo::getTemperingLayoutId, temperRecordIdList));
if (CollectionUtils.isEmpty(list)) {
@@ -86,31 +76,5 @@
@Scheduled(fixedDelay = 1000)
public void temperingGlassAfter() {
- }
-
- @Scheduled(fixedDelay = 1000)
- public void dealDamageTask() {
- Date startDate = new Date();
- log.info("閽㈠寲鐮存崯鐜荤拑娓呴櫎浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
- List<TemperingGlassInfo> temperingGlassInfoList = temporaryGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getState, Const.GLASS_STATE_DAMAGE_TAKE));
- if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
- //鑾峰彇鐮存崯/鎷胯蛋鐜荤拑id
- List<String> glassList = temperingGlassInfoList.stream().map(TemperingGlassInfo::getGlassId).collect(Collectors.toList());
- //灏嗕换鍔¤〃涓殑鏁版嵁鍒犻櫎
- temporaryGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassList));
- List<Damage> damageList = temperingGlassInfoList.stream().map(e -> {
- Damage damage = new Damage();
- damage.setGlassId(e.getGlassId());
- damage.setLine(Const.TEMPERING_OUT_TARGET_POSITION);
- damage.setWorkingProcedure("閽㈠寲");
- damage.setRemark("閽㈠寲");
- damage.setStatus(0);
- damage.setType(e.getState());
- return damage;
- }).collect(Collectors.toList());
- damageService.batchInsertDamage(damageList);
- }
- Date endDate = new Date();
- log.info("鏈浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms", endDate, endDate.getTime() - startDate.getTime());
}
}
--
Gitblit v1.8.0