From 84ea4ef19e5a4945f336dfdd788081510477dfc1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 12 十月 2024 14:21:10 +0800
Subject: [PATCH] 1.卧式缓存前的扫码-增加重复ID验证，2.增加钢化版图查询工程功能
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatLayoutServiceImpl.java | 25 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 11
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatDetail.java | 116 ++++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatLayoutService.java | 17 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 14 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatLayout.java | 70 +++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatDetailServiceImpl.java | 25 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatLayoutMapper.java | 19 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 11 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatDetailMapper.java | 19 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatDetailService.java | 17 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opccallback/CacheGlassSubscriptionCallback.java | 33 +--
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java | 22 +-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 67 +++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 8
hangzhoumesParent/moduleService/pom.xml | 10
16 files changed, 441 insertions(+), 43 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatDetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatDetail.java
new file mode 100644
index 0000000..8678d22
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatDetail.java
@@ -0,0 +1,116 @@
+package com.mes.pp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OptimizeHeatDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
+
+ /**
+ * 娴佺▼鍗″彿
+ */
+ private String processId;
+
+ /**
+ * 琛ョ墖鐘舵��:琛ョ墖1锛�0闈炶ˉ鐗�;2024.0409鏂板
+ */
+ private Integer patchState;
+
+ /**
+ * 灞�
+ */
+ private Integer layer;
+
+ /**
+ * 璁㈠崟鍐呮帓搴�
+ */
+ private Integer orderSort;
+
+ /**
+ * 鐗堝浘缂栧彿
+ */
+ private Integer layoutId;
+ /**
+ * 鐗堝浘鍐呮帓搴�
+ */
+ private Integer sort;
+ /**
+ * 灏忕墖缂栧彿
+ */
+ private Integer glassId;
+
+ /**
+ * 灏忕墖瀹�
+ */
+ private double width;
+
+ /**
+ * 灏忕墖楂�
+ */
+ private double height;
+ /**
+ * 閰嶇墖瀹�
+ */
+ private double pairWidth;
+ /**
+ * 閰嶇墖楂�
+ */
+ private double pairHeight;
+ /**
+ * x鍧愭爣
+ */
+ private double xAxis;
+
+ /**
+ * y鍧愭爣
+ */
+ private double yAxis;
+
+ /**
+ * 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
+ */
+ private double rotateAngle;
+ /**
+ * 鍒涘缓浜�
+ */
+ private String creater;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Data createTime;
+ /**
+ * 淇敼鏃堕棿
+ */
+ private Data updateTime;
+
+ @TableField("intRemark")
+ private Integer intRemark;
+
+ @TableField("strRemark")
+ private String strRemark;
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatLayout.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatLayout.java
new file mode 100644
index 0000000..7aa5d3c
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeHeatLayout.java
@@ -0,0 +1,70 @@
+package com.mes.pp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class OptimizeHeatLayout implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
+
+ /**
+ * 鐗堝浘Id
+ */
+ private Integer layoutId;
+
+ /**
+ * 鐜荤拑鏁伴噺
+ */
+ private Integer glassQty;
+
+ /**
+ * 鐗堝浘鐜荤拑闈㈢Н
+ */
+ private double glassArea;
+
+ /**
+ * 瑁呰浇鐜�
+ */
+ private double layoutRate;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ private Integer creater;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+
+ @TableField("intRemark")
+ private Integer intRemark;
+
+ @TableField("strRemark")
+ private String strRemark;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatDetailMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatDetailMapper.java
new file mode 100644
index 0000000..0e7c2ea
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatDetailMapper.java
@@ -0,0 +1,19 @@
+package com.mes.pp.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeHeatDetail;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@DS("pp")
+public interface OptimizeHeatDetailMapper extends MPJBaseMapper<OptimizeHeatDetail> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatLayoutMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatLayoutMapper.java
new file mode 100644
index 0000000..4a607f4
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeHeatLayoutMapper.java
@@ -0,0 +1,19 @@
+package com.mes.pp.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeHeatLayout;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@DS("pp")
+public interface OptimizeHeatLayoutMapper extends MPJBaseMapper<OptimizeHeatLayout> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatDetailService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatDetailService.java
new file mode 100644
index 0000000..838f47b
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatDetailService.java
@@ -0,0 +1,17 @@
+package com.mes.pp.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeHeatDetail;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface OptimizeHeatDetailService extends MPJBaseService<OptimizeHeatDetail> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatLayoutService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatLayoutService.java
new file mode 100644
index 0000000..c28833e
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeHeatLayoutService.java
@@ -0,0 +1,17 @@
+package com.mes.pp.service;
+
+import com.github.yulichang.base.MPJBaseService;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeHeatLayout;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+public interface OptimizeHeatLayoutService extends MPJBaseService<OptimizeHeatLayout> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatDetailServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatDetailServiceImpl.java
new file mode 100644
index 0000000..d25905b
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatDetailServiceImpl.java
@@ -0,0 +1,25 @@
+package com.mes.pp.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeHeatDetail;
+import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.pp.mapper.OptimizeHeatDetailMapper;
+import com.mes.pp.service.OptimizeDetailService;
+import com.mes.pp.service.OptimizeHeatDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Service
+@DS("pp")
+public class OptimizeHeatDetailServiceImpl extends MPJBaseServiceImpl<OptimizeHeatDetailMapper, OptimizeHeatDetail> implements OptimizeHeatDetailService {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatLayoutServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatLayoutServiceImpl.java
new file mode 100644
index 0000000..6764eae
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeHeatLayoutServiceImpl.java
@@ -0,0 +1,25 @@
+package com.mes.pp.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.pp.entity.OptimizeDetail;
+import com.mes.pp.entity.OptimizeHeatLayout;
+import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.pp.mapper.OptimizeHeatLayoutMapper;
+import com.mes.pp.service.OptimizeDetailService;
+import com.mes.pp.service.OptimizeHeatLayoutService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-04-16
+ */
+@Service
+@DS("pp")
+public class OptimizeHeatLayoutServiceImpl extends MPJBaseServiceImpl<OptimizeHeatLayoutMapper, OptimizeHeatLayout> implements OptimizeHeatLayoutService {
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index c1f69a7..3c25501 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -31,6 +31,12 @@
* @return
*/
List<List<Map<String, Object>>> selectCurrentCutTerritory(String current);
+ /**
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ * @param current
+ * @return
+ */
+ List<List<Map<String, Object>>> selectTemperingTerritory(String current);
/**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
@@ -64,4 +70,12 @@
* @return
*/
String edgReportStatus(IdentWornRequest request);
+
+ /**
+ * 杩涚墖 鎵爜ID楠岃瘉閲嶅
+ *
+ * @param glassId
+ * @return
+ */
+ boolean inToVerify(String glassId);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 67232f0..b7ce80b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -8,7 +8,6 @@
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
@@ -24,9 +23,9 @@
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
-import com.mes.pp.entity.OptimizeDetail;
-import com.mes.pp.entity.OptimizeLayout;
+import com.mes.pp.entity.*;
import com.mes.pp.mapper.OptimizeDetailMapper;
+import com.mes.pp.mapper.OptimizeHeatDetailMapper;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -62,6 +61,9 @@
@Autowired
OptimizeDetailMapper optimizeDetailMapper;
+
+ @Autowired
+ OptimizeHeatDetailMapper optimizeHeatDetailMapper;
@Autowired
EdgStorageCageMapper edgStorageCageMapper;
@@ -299,6 +301,39 @@
}
/**
+ * 鑾峰彇 宸ョ▼涓嬬殑閽㈠寲鐗堝浘
+ *
+ * @param current
+ * @return
+ */
+ @Override
+ public List<List<Map<String, Object>>> selectTemperingTerritory(String current) {
+ //姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
+ List<Map<String, Object>> resultCutTerritory=optimizeHeatDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeHeatDetail.class)
+ .selectAll(OptimizeHeatDetail.class)
+ .selectAs(OptimizeProject::getLoadWidth, "olWidth")
+ .selectAs(OptimizeProject::getLoadLength, "olHeight")
+ .leftJoin(OptimizeHeatLayout.class, on -> on
+ .eq(OptimizeHeatLayout::getProjectNo, OptimizeHeatDetail::getProjectNo)
+ .eq(OptimizeHeatLayout::getLayoutId, OptimizeHeatDetail::getLayoutId))
+ .leftJoin(OptimizeProject.class, on -> on
+ .eq(OptimizeProject::getProjectNo, OptimizeHeatLayout::getProjectNo))
+ .eq(OptimizeHeatDetail::getProjectNo, current)
+ );
+
+ Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("layout_id").toString()));
+// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
+ List<List<Map<String, Object>>> result=new ArrayList<>();
+ for (int i=1;i<=groupBy.keySet().size();i++) {
+ String key=i+"";
+ if(key!=null){
+ result.add(groupBy.get(key));
+ }
+ }
+ return result;
+ }
+
+ /**
* 鏌ヨ绗煎唴鐗堝浘宸�艰寖鍥村唴鐨� 姝ゅ昂瀵哥幓鐠� 濡傛棤鍒欐寜鐓� 閽㈠寲鐗堝浘搴忓彿 浠ュ強鐜荤拑搴忓彿
*
* @param glassId
@@ -431,4 +466,30 @@
.set(EdgGlassTaskInfo::getStatus, request.getState()).eq(EdgGlassTaskInfo::getGlassId, request.getGlassId()));
return "success";
}
+
+ /**
+ * 杩涚墖 鎵爜ID楠岃瘉閲嶅
+ *
+ * @param glassId
+ * @return
+ */
+ @Override
+ public boolean inToVerify(String glassId){
+ List<EdgStorageCageDetails> listEdgStorageCageDetails = baseMapper.selectList(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
+ );
+ if (listEdgStorageCageDetails.isEmpty()) {
+ //璇存槑姝ょ幓鐠冩病鏈夎繘杩囩悊鐗�
+ return true;
+ }else{
+ List<Damage> damage=damageMapper.selectList(new LambdaQueryWrapper<Damage>()
+ .eq(Damage::getGlassId, glassId)
+ .and(wrapper->wrapper.eq(Damage::getType, 8).or().eq(Damage::getType, 9))
+ );
+ if(!damage.isEmpty()){
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index e5d34d7..22ac553 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -94,7 +94,7 @@
public static String engineerId = "";
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
Date startDate = new Date();
log.info("鏈浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
@@ -124,8 +124,9 @@
log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛椾笉涓�0锛岀洿鎺ョ粨鏉�");
return;
}
- if ("1".equals(taskRequestTypeValue)) {
- log.info("2銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
+ boolean result = edgStorageCageDetailsService.inToVerify(glassIdeValue);
+ if ("1".equals(taskRequestTypeValue)&&result) {
+ log.info("2銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�,鎵爜閲嶅ID楠岃瘉銆愭湁閲嶅=false,鏃犻噸澶�=true銆戯細{}",result);
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
} else if ("2".equals(taskRequestTypeValue)) {
//09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
@@ -137,8 +138,8 @@
//鍔犵瀛愰噷闈㈡槸鍚︽湁鐜荤拑锛屾湁鍏堝嚭锛屾棤鐜荤拑鍏堣繘
boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
- log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
- if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
+ log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟,鎵爜閲嶅ID楠岃瘉銆愭湁閲嶅=false,鏃犻噸澶�=true銆戯細{}", outFlase, glassIdeValue,result);
+ if (!outFlase && StringUtils.isNotBlank(glassIdeValue)&&result) {
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
index 47b2fd0..165ff7f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -1,7 +1,5 @@
package com.mes.job;
-import com.mes.milo.runner.subscription.SubscriptionCallback;
-import com.mes.milo.service.MiloService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -18,14 +16,14 @@
@Slf4j
public class OpcCacheGlassTask {
- @Autowired
- MiloService miloService;
-
- @Autowired
- SubscriptionCallback cacheGlassSubscriptionCallback;
-
- @Scheduled(fixedDelay = Long.MAX_VALUE)
- public void startOpcTask() throws Exception {
- miloService.subscriptionFromOpcUa(Arrays.asList("my.device.x1", "my.device.x2"), cacheGlassSubscriptionCallback);
- }
+// @Autowired
+// MiloService miloService;
+//
+// @Autowired
+// SubscriptionCallback cacheGlassSubscriptionCallback;
+//
+// @Scheduled(fixedDelay = Long.MAX_VALUE)
+// public void startOpcTask() throws Exception {
+// miloService.subscriptionFromOpcUa(Arrays.asList("my.device.x1", "my.device.x2"), cacheGlassSubscriptionCallback);
+// }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opccallback/CacheGlassSubscriptionCallback.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opccallback/CacheGlassSubscriptionCallback.java
index eaf7695..c736d4b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opccallback/CacheGlassSubscriptionCallback.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opccallback/CacheGlassSubscriptionCallback.java
@@ -1,8 +1,5 @@
package com.mes.opccallback;
-import com.mes.milo.model.ReadWriteEntity;
-import com.mes.milo.runner.subscription.SubscriptionCallback;
-import com.mes.milo.service.MiloService;
import lombok.extern.slf4j.Slf4j;
import org.eclipse.milo.opcua.sdk.client.subscriptions.ManagedDataItem;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
@@ -16,20 +13,20 @@
*/
@Service
@Slf4j
-public class CacheGlassSubscriptionCallback implements SubscriptionCallback {
+public class CacheGlassSubscriptionCallback {
- @Autowired
- MiloService miloService;
-
- @Override
- public void onSubscribe(ManagedDataItem dataItem, DataValue value) {
- try {
- log.info("{}___________{}" + dataItem, value);
- ReadWriteEntity readWriteEntity = miloService.readFromOpcUa("my.device.x1");
- log.info("{}___________{}" + readWriteEntity);
- } catch (Exception e) {
-
- }
-
- }
+// @Autowired
+// MiloService miloService;
+//
+// @Override
+// public void onSubscribe(ManagedDataItem dataItem, DataValue value) {
+// try {
+// log.info("{}___________{}" + dataItem, value);
+// ReadWriteEntity readWriteEntity = miloService.readFromOpcUa("my.device.x1");
+// log.info("{}___________{}" + readWriteEntity);
+// } catch (Exception e) {
+//
+// }
+//
+// }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index 850789e..a5a966a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -32,6 +32,14 @@
@Autowired
private TaskCacheService taskCacheService;
+ @ApiOperation("鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/temperingTerritory")
+ @ResponseBody
+ public Result temperingTerritory(String current) {
+ List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
+ return Result.build(200, "鎴愬姛", h);
+ }
+
@ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
@PostMapping("/cutTerritory")
@ResponseBody
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index ad5430b..93f0fda 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -143,6 +143,12 @@
}
@Test
+ public void testEngineerTerritory() {
+ List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectTemperingTerritory("P24052203");
+ log.info("閽㈠寲宸ョ▼鐗堝浘淇℃伅锛歿}", Arrays.asList(map));
+ }
+
+ @Test
public void testidentWorn() {
Map<String, Object> arguments=new HashMap<>();
arguments.put("glassId","NG24051802A002-1-4-2-4");//鐜荤拑ID
@@ -152,6 +158,11 @@
// edgStorageCageDetailsService.identWorn(arguments);
log.info("璇嗗埆鍙般�愮牬鎹�/鎷胯蛋銆戯細{}", 1);
}
+ @Test
+ public void testInToVerify() {
+ boolean result=edgStorageCageDetailsService.inToVerify("P24060405|30|1");
+ log.info("鏄惁瀛樺湪閲嶅ID 銆嬪厑璁歌繘鐗囷細{}", result);
+ }
@Test
public void testPpOptimizeDetail() {
diff --git a/hangzhoumesParent/moduleService/pom.xml b/hangzhoumesParent/moduleService/pom.xml
index b043adf..f799583 100644
--- a/hangzhoumesParent/moduleService/pom.xml
+++ b/hangzhoumesParent/moduleService/pom.xml
@@ -55,11 +55,11 @@
<groupId>com.mes</groupId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <artifactId>opcuaClient</artifactId>
- <groupId>com.mes</groupId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <artifactId>opcuaClient</artifactId>-->
+<!-- <groupId>com.mes</groupId>-->
+<!-- <version>1.0-SNAPSHOT</version>-->
+<!-- </dependency>-->
<!--寮�鍙戣�呭伐鍏�-->
<!-- <dependency>-->
--
Gitblit v1.8.0