Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b6a32579 由 LN
选项

5O也增加出料口设置

1 个父辈 b83261ff
内嵌 并排
正在显示 4 个修改的文件 包含 18 行增加 和 15 行删除
src/main/java/com/neotel/smfcore/core/equipment/handler/impl/BaseEquipHandler.java
...@@ -100,12 +100,13 @@ public class BaseEquipHandler implements IEquipmentHandler { ...@@ -100,12 +100,13 @@ public class BaseEquipHandler implements IEquipmentHandler {
Map<String,String> addOP=EquipStatusUtil.getAndRemoveOp(statusBean.getCid()); Map<String,String> addOP=EquipStatusUtil.getAndRemoveOp(statusBean.getCid());
statusBean.addOp(addOP); statusBean.addOp(addOP);
if(statusBean.getType().equals(EquipmentType.ML5S.name())){ if(statusBean.getType().equals(EquipmentType.ML5S.name())||statusBean.getType().equals(EquipmentType.ML5O.name())){
List<String> LP1TP=micron1551DataCache.getLPTargetPos("LP1"); List<String> LP1TP=micron1551DataCache.getLPTargetPos(statusBean.getCid(),"LP1");
List<String> LP2TP=micron1551DataCache.getLPTargetPos("LP2"); List<String> LP2TP=micron1551DataCache.getLPTargetPos(statusBean.getCid(),"LP2");
statusBean.getData().put("LP1TP",LP1TP); statusBean.getData().put("LP1TP",LP1TP);
statusBean.getData().put("LP2TP",LP2TP); statusBean.getData().put("LP2TP",LP2TP);
} }
DeviceStateDurationUtil.onEquipStatusUpdate(statusBean); DeviceStateDurationUtil.onEquipStatusUpdate(statusBean);
} catch (Exception e) { } catch (Exception e) {
log.error("客户端故障消息处理出错", e); log.error("客户端故障消息处理出错", e);
......
src/main/java/com/neotel/smfcore/custom/micron1551/controller/ML5ODeviceController.java
...@@ -80,8 +80,8 @@ private TaskService taskService; ...@@ -80,8 +80,8 @@ private TaskService taskService;
} }
} }
dto.getData().put(Micron1551DataCache.NgType_ML5S1,micron1551DataCache.getNgDetials(Micron1551DataCache.NgType_ML5S1)); dto.getData().put(Micron1551DataCache.NgType_ML5O1,micron1551DataCache.getNgDetials(Micron1551DataCache.NgType_ML5O1));
dto.getData().put(Micron1551DataCache.NgType_ML5S2,micron1551DataCache.getNgDetials(Micron1551DataCache.NgType_ML5S2)); dto.getData().put(Micron1551DataCache.NgType_ML5O2,micron1551DataCache.getNgDetials(Micron1551DataCache.NgType_ML5O2));
return dto; return dto;
} }
......
src/main/java/com/neotel/smfcore/custom/micron1551/controller/ML5SDeviceController.java
...@@ -138,13 +138,13 @@ public class ML5SDeviceController { ...@@ -138,13 +138,13 @@ public class ML5SDeviceController {
@ApiOperation("更改LP出料口信息") @ApiOperation("更改LP出料口信息")
@GetMapping("updateLPTarget") @GetMapping("updateLPTarget")
@PreAuthorize("@el.check('equipmentView:info')") @PreAuthorize("@el.check('equipmentView:info')")
public ResultBean updateLPTarget(String lpName, String targetName, HttpServletRequest servletRequest){ public ResultBean updateLPTarget(String cid, String lpName, String targetName, HttpServletRequest servletRequest){
if(ObjectUtil.isEmpty(lpName)||ObjectUtil.isEmpty(targetName)){ if(ObjectUtil.isEmpty(lpName)||ObjectUtil.isEmpty(targetName)){
return ResultBean.newOkResult("smfcore.micron.operationFailure","操作失败"); return ResultBean.newOkResult("smfcore.micron.operationFailure","操作失败");
} }
List<String> list = new ArrayList<>(Arrays.asList(targetName.split(","))); List<String> list = new ArrayList<>(Arrays.asList(targetName.split(",")));
micron1551DataCache.updateTargetPos(lpName,list); micron1551DataCache.updateTargetPos(cid,lpName,list);
return ResultBean.newOkResult("ok"); return ResultBean.newOkResult("ok");
} }
...@@ -152,12 +152,12 @@ public class ML5SDeviceController { ...@@ -152,12 +152,12 @@ public class ML5SDeviceController {
@ApiOperation("获取LP出料口信息") @ApiOperation("获取LP出料口信息")
@GetMapping("getLPTarget") @GetMapping("getLPTarget")
@PreAuthorize("@el.check('equipmentView:info')") @PreAuthorize("@el.check('equipmentView:info')")
public ResultBean updateLPTarget(String lpName,HttpServletRequest servletRequest){ public ResultBean updateLPTarget(String cid, String lpName,HttpServletRequest servletRequest){
if(ObjectUtil.isEmpty(lpName) ){ if(ObjectUtil.isEmpty(lpName) ){
return ResultBean.newOkResult("smfcore.micron.operationFailure","操作失败"); return ResultBean.newOkResult("smfcore.micron.operationFailure","操作失败");
} }
List<String> list = micron1551DataCache.getLPTargetPos(lpName); List<String> list = micron1551DataCache.getLPTargetPos(cid,lpName);
return ResultBean.newOkResult(list); return ResultBean.newOkResult(list);
} }
} }
src/main/java/com/neotel/smfcore/custom/micron1551/util/Micron1551DataCache.java
...@@ -75,9 +75,10 @@ public class Micron1551DataCache { ...@@ -75,9 +75,10 @@ public class Micron1551DataCache {
//key=CID_LPName
public Map<String,List<String>> targetPosMap=null; public Map<String,List<String>> targetPosMap=null;
public void updateTargetPos(String LPName,List<String> targetPosList) { public void updateTargetPos(String cid,String LPName,List<String> targetPosList) {
if (targetPosMap == null) { if (targetPosMap == null) {
//第一次获取，从数据库加载 //第一次获取，从数据库加载
...@@ -86,18 +87,18 @@ public class Micron1551DataCache { ...@@ -86,18 +87,18 @@ public class Micron1551DataCache {
targetPosMap = new HashMap<>(); targetPosMap = new HashMap<>();
} }
} }
String key=cid+"_"+LPName;
targetPosMap.put(LPName, targetPosList); targetPosMap.put(key, targetPosList);
//更新到数据库 //更新到数据库
dataCache.updateCache(Constants.CACHE_ML_LPTTARGETUP, targetPosMap); dataCache.updateCache(Constants.CACHE_ML_LPTTARGETUP, targetPosMap);
log.info("updateTargetPos ，lp=" + LPName + ", targetPos=" + String.join(",", targetPosList)); log.info("updateTargetPos ,cid="+cid+",lp=" + LPName + ", targetPos=" + String.join(",", targetPosList));
} }
public List<String> getLPTargetPos(String LPName){ public List<String> getLPTargetPos(String cid,String LPName){
if (targetPosMap == null) { if (targetPosMap == null) {
//第一次获取，从数据库加载 //第一次获取，从数据库加载
targetPosMap = dataCache.getCache(Constants.CACHE_ML_LPTTARGETUP); targetPosMap = dataCache.getCache(Constants.CACHE_ML_LPTTARGETUP);
...@@ -105,7 +106,8 @@ public class Micron1551DataCache { ...@@ -105,7 +106,8 @@ public class Micron1551DataCache {
targetPosMap = new HashMap<>(); targetPosMap = new HashMap<>();
} }
} }
List<String> list= targetPosMap.getOrDefault(LPName,new ArrayList<>()); String key=cid+"_"+LPName;
List<String> list= targetPosMap.getOrDefault(key,new ArrayList<>());
return list; return list;
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!