From 0805eb4ef9b0342e11d3a938b879df1b93de5520 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 06 九月 2024 15:14:41 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 21 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 8 -
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java | 21 ++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/BarcodeReadThread.java | 82 ++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 160 ++++++++++++++-----
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java | 31 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 104 +++++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 25 +++
11 files changed, 402 insertions(+), 56 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 6ef464d..f7feafb 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -144,7 +144,7 @@
/**
* 鏄惁鍚堝苟
*/
- private Integer merge;
+ private Integer combine;
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index dd2be16..93b0c13 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -73,7 +73,7 @@
glassInfo.setYCoordinate(map.getYAxis());
glassInfo.setAngle(map.getRotateAngle());
glassInfo.setGlassId(map.getGlassId());
- glassInfo.setMerge(map.getMerge());
+ glassInfo.setCombine(map.getMerge());
// 灏嗘槧灏勫悗鐨勫璞℃坊鍔犲埌缁撴灉鍒楄〃涓�
resultList.add(glassInfo);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
new file mode 100644
index 0000000..60a62f6
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -0,0 +1,104 @@
+package com.mes.bigstorage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.mes.base.entity.BigStorageCageBaseInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-03-27
+ */
+@Api(description = "澶х悊鐗囩璇︽儏")
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BigStorageCageDetails extends BigStorageCageBaseInfo implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 澶х悊鐗囩璇︽儏琛╥d
+ */
+ @ApiModelProperty(value = "澶х悊鐗囩璇︽儏琛╥d", position = 2)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁惧id
+ */
+ @ApiModelProperty(value = "璁惧id", position = 3)
+ private Integer deviceId;
+
+
+ /**
+ * 灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
+ */
+ @ApiModelProperty(value = "灏忕墖鍦ㄦ牸鍐呯殑椤哄簭", position = 6)
+ private Integer sequence;
+
+ /**
+ * 娴佺▼鍗″彿
+ */
+ @ApiModelProperty(value = "娴佺▼鍗″彿", position = 7)
+ private String flowCardId;
+
+ /**
+ * 鐜荤拑绫诲瀷
+ */
+ @ApiModelProperty(value = "鐜荤拑绫诲瀷", position = 8)
+ private Integer glassType;
+
+
+ /**
+ * 鍘氬害
+ */
+ @ApiModelProperty(value = "鍘氬害", position = 11)
+ private double thickness;
+
+ /**
+ * 閽㈠寲鐗堝浘id
+ */
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘id", position = 12)
+ private Integer temperingLayoutId;
+
+ /**
+ * 閽㈠寲鐗堝浘鐗囧簭
+ */
+ @ApiModelProperty(value = "閽㈠寲鐗堝浘鐗囧簭", position = 13)
+ private Integer temperingFeedSequence;
+
+ /**
+ * 鐘舵��
+ */
+ @ApiModelProperty(value = "鐘舵��", position = 14)
+ private Integer state;
+
+ /**
+ * 鐜荤拑闂撮殭
+ */
+ @ApiModelProperty(value = "鐜荤拑闂撮殭", position = 15)
+ private Integer gap;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "宸ョ▼鍙�", position = 16)
+ private String engineerId;
+
+ /**
+ * 宸ョ▼鍙�
+ */
+ @ApiModelProperty(value = "灞�", position = 17)
+ private int layer;
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
new file mode 100644
index 0000000..ba90beb
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -0,0 +1,21 @@
+package com.mes.bigstorage.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-03-27
+ */
+public interface BigStorageCageDetailsMapper extends MPJBaseMapper<BigStorageCageDetails> {
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
new file mode 100644
index 0000000..d5641b1
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/BigStorageCageDetailsService.java
@@ -0,0 +1,21 @@
+package com.mes.bigstorage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.glassinfo.entity.GlassInfo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-03-27
+ */
+public interface BigStorageCageDetailsService extends IService<BigStorageCageDetails> {
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
new file mode 100644
index 0000000..6d8f195
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -0,0 +1,25 @@
+package com.mes.bigstorage.service.impl;
+
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-03-27
+ */
+@Slf4j
+@Service
+public class BigStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
+
+
+}
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 4e7ef5c..c1f69a7 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
@@ -17,6 +17,8 @@
*/
public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
+// boolean identWorn(Map<String, Object> arguments);
+
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
* @return
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 e214749..049e341 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,8 +8,11 @@
import com.github.yulichang.query.MPJLambdaQueryWrapper;
import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.common.config.Const;
import com.mes.damage.entity.Damage;
+import com.mes.damage.mapper.DamageMapper;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.entity.request.IdentWornRequest;
@@ -19,6 +22,8 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeDetail;
import com.mes.pp.entity.OptimizeLayout;
@@ -65,11 +70,51 @@
TaskCacheService taskCacheService;
@Autowired
+ DamageMapper damageMapper;
+
+ @Autowired
DamageService damageService;
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
+ @Autowired
+ BigStorageCageDetailsService bigStorageCageDetailsService;
+//
+// @Override
+// public boolean identWorn(Map<String, Object> arguments) {
+// String glassId=arguments.get("glassId").toString();
+// int state=arguments.get("state").toString().isEmpty()?0:Integer.parseInt(arguments.get("state").toString());
+// int line=arguments.get("line").toString().isEmpty()?0:Integer.parseInt(arguments.get("line").toString());
+// String workingProcedure=arguments.get("workingProcedure").toString();
+// if(state==0||line==0||workingProcedure==null||glassId==null||glassId.isEmpty()){
+// log.info("鍓嶇浼犻�掓暟鎹笉鍏�:{}",arguments);
+// return false;
+// }
+// List<GlassInfo> GlassInfos = glassInfoMapper.selectList(new MPJLambdaQueryWrapper<GlassInfo>()
+// .selectAll(GlassInfo.class)
+// .eq(GlassInfo::getGlassId, glassId));
+// if (GlassInfos.size() == 1) {
+// Damage damage =new Damage();
+// damage.setGlassId(glassId);
+// damage.setLine(line);
+// damage.setWorkingProcedure(workingProcedure);
+// damage.setRemark("");
+// damage.setStatus(state);//8鐮存崯锛�9鎷胯蛋
+// damageService.insertDamage(damage);
+// }else{
+// return false;
+// }
+// List<EdgStorageCageDetails> edgStorageCageDetails = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+// .selectAll(EdgStorageCageDetails.class)
+// .eq(EdgStorageCageDetails::getGlassId, glassId));
+// if (edgStorageCageDetails.size() == 1) {
+// EdgStorageCageDetails item = edgStorageCageDetails.get(0);
+// item.setState(state);
+// baseMapper.update(item, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class).eq(EdgStorageCageDetails::getGlassId, glassId));
+// }
+// return true;
+// }
/**
* 鑾峰彇 鍒囧壊褰撳墠鐗堝浘
*
@@ -77,13 +122,17 @@
*/
@Override
public List<Map<String, Object>> selectCutTerritory() {
- List<UpPattenUsage> upPattenUsage = upPattenUsageMapper.selectList(new MPJLambdaWrapper<UpPattenUsage>()
+ List<UpPattenUsage> upPattenUsage=upPattenUsageMapper.selectJoinList(UpPattenUsage.class, new MPJLambdaWrapper<UpPattenUsage>()
.selectAll(UpPattenUsage.class)
+ .innerJoin(Engineering.class, on -> on
+ .eq(Engineering::getEngineerId, UpPattenUsage::getEngineeringId))
+ .eq(Engineering::getState,1)
.orderByDesc(UpPattenUsage::getState)
- .orderByDesc(UpPattenUsage::getId));
+ .orderByDesc(UpPattenUsage::getId)
+ );
if (!upPattenUsage.isEmpty()) {
UpPattenUsage upPattenUsage1 = upPattenUsage.get(0);
- List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritorys=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -93,29 +142,34 @@
.eq(OptimizeDetail::getProjectNo, upPattenUsage1.getEngineeringId())
.eq(OptimizeDetail::getStockId, upPattenUsage1.getLayoutSequence())
);
- List<Map<String, Object>> ResultcutTerritorys = new ArrayList<>();
- for (Map<String, Object> cutTerritory : cutTerritorys) {
- EdgStorageCageDetails edgStorageCageDetails = baseMapper.selectOne(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
- .selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getGlassId, cutTerritory.get("glass_id"))
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if (edgStorageCageDetails != null) {
- cutTerritory.put("glass_state", edgStorageCageDetails.getState());
- } else {
- cutTerritory.put("glass_state", 0);
- }
- ResultcutTerritorys.add(cutTerritory);
- }
- return ResultcutTerritorys;
+ Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ .selectAll(EdgStorageCageDetails.class)
+ .eq(EdgStorageCageDetails::getEngineerId,upPattenUsage1.getEngineeringId())
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails));
-// Sql鐗堟湰
-// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
-// .select("ol.width as olwidth","ol.height as olheight")
-// .leftJoin("optimize_layout ol on t.project_no=ol.project_no and t.stock_id=ol.stock_id")
-// .eq("t.project_no", upPattenUsage1.getEngineeringId())
-// .eq("t.stock_id",upPattenUsage1.getLayoutSequence())
-// );
+ Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ .selectAll(Damage.class)
+ .eq(Damage::getEngineerId,upPattenUsage1.getEngineeringId())
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
+ for (Map<String, Object> cutTerritory : cutTerritorys) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(cutTerritory.get("glass_id")==null||"".equals(cutTerritory.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritorys);
+ return new ArrayList<>();
+ }else if(edgMaps.get(cutTerritory.get("glass_id"))!=null){
+ cutTerritory.put("glass_state",edgMaps.get(cutTerritory.get("glass_id")).getState());
+ }else if(damageMaps.get(cutTerritory.get("glass_id"))!=null){
+ //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
+ cutTerritory.put("glass_state",damageMaps.get(cutTerritory.get("glass_id")).getStatus());
+ }else{
+ cutTerritory.put("glass_state",0);
+ }
+ resultCutTerritory.add(cutTerritory);
+ }
+ return resultCutTerritory;
}
return null;
}
@@ -128,10 +182,17 @@
*/
@Override
public List<List<Map<String, Object>>> selectCurrentCutTerritory(String current) {
+ //澶х悊鐗囩杩涜繃鐨勭幓鐠�
+ Map<String, BigStorageCageDetails> mapBigCage=bigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getEngineerId,current)
+ .gt(BigStorageCageDetails::getState,Const.GLASS_STATE_NEW)
+ ).stream().collect(Collectors.toMap(BigStorageCageDetails::getGlassId,BigStorageCageDetails->BigStorageCageDetails,(V1,V2)->V2));;
+
//缁撴灉
- List<Map<String, Object>> ResultcutTerritorys = new ArrayList<>();
+ List<Map<String, Object>> resultCutTerritory=new ArrayList<>();
//姝ゅ伐绋嬬殑鎵�鏈変紭鍖栨暟鎹�
- List<Map<String, Object>> cutTerritorys = optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
+ List<Map<String, Object>> cutTerritory=optimizeDetailMapper.selectJoinMaps(JoinWrappers.lambda(OptimizeDetail.class)
.selectAll(OptimizeDetail.class)
.selectAs(OptimizeLayout::getWidth, "olWidth")
.selectAs(OptimizeLayout::getHeight, "olHeight")
@@ -141,32 +202,39 @@
.eq(OptimizeDetail::getProjectNo, current)
);
- Map<String, EdgStorageCageDetails> edgMaps = baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
+ Map<String, EdgStorageCageDetails> edgMaps=baseMapper.selectList(new MPJLambdaQueryWrapper<EdgStorageCageDetails>()
.selectAll(EdgStorageCageDetails.class)
- .eq(EdgStorageCageDetails::getEngineerId, current)
+ .eq(EdgStorageCageDetails::getEngineerId,current)
.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
- ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails -> EdgStorageCageDetails));
- for (Map<String, Object> cutTerritory : cutTerritorys) {
-// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
- if (cutTerritory.get("glass_id") == null || "".equals(cutTerritory.get("glass_id"))) {
- log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}", cutTerritorys);
+ ).stream().collect(Collectors.toMap(EdgStorageCageDetails::getGlassId,EdgStorageCageDetails->EdgStorageCageDetails,(V1,V2)->V2));
+
+ Map<String, Damage> damageMaps=damageMapper.selectList(new MPJLambdaQueryWrapper<Damage>()
+ .selectAll(Damage.class)
+ .eq(Damage::getEngineerId,current)
+ ).stream().collect(Collectors.toMap(Damage::getGlassId,Damage->Damage,(V1,V2)->V2));
+
+ for (Map<String, Object> item : cutTerritory) {
+// log.info("鍐呭锛歿}-------{}",cutTerritory,edgStorageCageDetails);
+ if(item.get("glass_id")==null||"".equals(item.get("glass_id"))){
+ log.info("浼樺寲鏁版嵁涓璯lassId瀛樺湪绌哄��-----鍐呭锛歿}",cutTerritory);
return new ArrayList<>();
- } else if (edgMaps.get(cutTerritory.get("glass_id")) != null) {
- cutTerritory.put("glass_state", edgMaps.get(cutTerritory.get("glass_id")).getState());
- } else {
- cutTerritory.put("glass_state", 0);
}
- ResultcutTerritorys.add(cutTerritory);
+ if(damageMaps.get(item.get("glass_id"))!=null){
+ //log.info("鐜荤拑宸茬牬鎹�/鎷胯蛋-----鍐呭锛歿}",damageMaps.get(item.get("glass_id")));
+ item.put("glass_state",damageMaps.get(item.get("glass_id")).getStatus());
+ }else if(mapBigCage.get(item.get("glass_id"))!=null){
+ //杩涜繃澶х悊鐗囩
+ item.put("glass_state",98);
+ }else if(edgMaps.get(item.get("glass_id"))!=null){
+ item.put("glass_state",edgMaps.get(item.get("glass_id")).getState());
+ }else{
+ item.put("glass_state",0);
+ }
+ resultCutTerritory.add(item);
}
- Map<String, List<Map<String, Object>>> groupBy = ResultcutTerritorys.stream().collect(Collectors.groupingBy(item -> item.get("stock_id").toString()));
+ Map<String, List<Map<String, Object>>> groupBy=resultCutTerritory.stream().collect(Collectors.groupingBy(item->item.get("stock_id").toString()));
// List<List<Map<String, Object>>> Result=groupBy.values().stream().collect(Collectors.toList());
return new ArrayList<>(groupBy.values());
-//Sql鐗堟湰
-// return optimizeDetailMapper.selectJoinMaps(new MPJQueryWrapper<OptimizeDetail>().selectAll(OptimizeDetail.class)
-// .select("ol.width as olwidth","ol.height as olheight")
-// .leftJoin("optimize_layout ol on t.project_no=ol.project_no and t.stock_id=ol.stock_id")
-// .eq("t.project_no",current)
-// );
}
/**
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 9d0c330..946882a 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
@@ -726,14 +726,6 @@
public void CacheGlassTasks() {
JSONObject jsonObject = new JSONObject();
List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
-// List<Map<String, Object>> currentCutTerritorys=new ArrayList<>();
-// if(engineerId==null||engineerId.isEmpty()){
-// //璇嗗埆鎽嗙墖 褰撳墠鐗堝浘鏁版嵁
-// currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
-// }else{
-// //璇嗗埆鎽嗙墖 姝ngineerId 宸ョ▼鐗堝浘鏁版嵁
-// currentCutTerritorys = edgStorageCageDetailsService.selectCurrentCutTerritory(engineerId);
-// }
jsonObject.append("currentCutTerritory", currentCutTerritorys);
//log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
//纾ㄨ竟淇℃伅
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/BarcodeReadThread.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/BarcodeReadThread.java
new file mode 100644
index 0000000..cc6dabc
--- /dev/null
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/BarcodeReadThread.java
@@ -0,0 +1,82 @@
+package com.mes.job;
+
+
+import com.mes.glassinfo.service.GlassInfoService;
+import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+
+public class BarcodeReadThread extends Thread{
+
+ public BarcodeReadThread(String ip,Integer port,Downpush downpush)
+ {
+ this.ip=ip;
+ this.port=port;
+ this.downpush=downpush;
+ }
+ private Socket socket;
+ private String ip;
+ private Integer port;
+ private Downpush downpush;
+ private BufferedReader in;
+
+ @SneakyThrows
+ @Override
+ public void run()
+ {
+ connectCheckin();//鍒濇 寰幆灏濊瘯杩炴帴锛岀洿鍒拌繛鎺ユ垚鍔�
+ while (this!=null)
+ {
+ try
+ {
+ in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+ String response = in.readLine();
+ if(response!=null)
+ {
+ downpush.barcodeCheckin(response);
+ }
+ }
+ catch (Exception exception)
+ {
+ //寮傚父锛岄噸杩�
+ connectCheckin();
+ }
+ finally {
+ if(in!=null)
+ {
+ in.close();
+ }
+ }
+
+ Thread.sleep(100);
+ }
+ }
+
+ @SneakyThrows
+ private void connectCheckin()
+ {
+ while (this!=null)
+ {
+ try
+ {
+ socket=new Socket();
+ socket.setSoTimeout(10000);
+ socket.connect(new InetSocketAddress(ip,port));
+ if(socket.isConnected())
+ {
+ return;
+ }
+ }
+ catch (Exception exception)
+ {
+
+ }
+
+ Thread.sleep(1000);
+ }
+ }
+}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
index b210c53..0bc5c30 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java
@@ -29,6 +29,7 @@
import java.io.BufferedReader;
import java.io.InputStreamReader;
+import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
@@ -246,4 +247,34 @@
}
}
}
+
+ @Scheduled(fixedDelay = Long.MAX_VALUE)
+ public void scanCodeTaskCopy()
+ {
+ log.info("鎵弿浠诲姟宸插惎鍔�");
+ try {
+ BarcodeReadThread brt=new BarcodeReadThread(scanIp,scanPort,this);
+ brt.start();
+
+ }catch (Exception exception) {
+ log.info("鎵弿浠诲姟鍚姩寮傚父锛屽師鍥犱负{}", exception.getMessage());
+ }
+
+ }
+ //socket璇诲彇鍒版秷鎭悗浼氳皟鐢ㄨ繖涓嚱鏁�
+ public void barcodeCheckin(String response)
+ {
+ log.info("鎵弿鍒扮殑鐜荤拑id锛歿}", response);
+ List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("scanCode");
+ if (CollectionUtils.isNotEmpty(sendwServer)) {
+ //鎸夌収鐜荤拑id鑾峰彇鐜荤拑淇℃伅杩斿洖缁欏墠绔晫闈紝鍏蜂綋闇�瑕佸摢浜涙暟鎹緟纭
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, response).last("limit 1"));
+ if (null == glassInfo) {
+ log.info("鎸夌収鐜荤拑id锛歿}锛屾棤娉曟壘鍒扮幓鐠冧俊鎭�", response);
+ } else {
+ sendwServer.get(0).sendMessage(glassInfo.toString());
+ }
+ }
+ }
}
--
Gitblit v1.8.0