Skip to content

孙克 / smf-core

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

1.常亮绿灯 

2.agv上抛状态,带key
1 个父辈 455f7db5
内嵌 并排
正在显示 5 个修改的文件 包含 56 行增加 和 6 行删除
src/main/java/com/neotel/smfcore/common/utils/Constants.java
...@@ -195,4 +195,6 @@ public class Constants { ...@@ -195,4 +195,6 @@ public class Constants {
* 工单剩余数量 * 工单剩余数量
*/ */
public static final String CACHE_ordrRemainingQty = "ordrRemainingQty"; public static final String CACHE_ordrRemainingQty = "ordrRemainingQty";
public static final String CACHE_LightGreen = "LightGreen";
} }
src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java
...@@ -91,6 +91,10 @@ public class SettingsController { ...@@ -91,6 +91,10 @@ public class SettingsController {
dataCache.updateCache(Constants.CACHE_ordrRemainingQty,ordrRemainingQty); dataCache.updateCache(Constants.CACHE_ordrRemainingQty,ordrRemainingQty);
} }
//dataCache.updateCache(Constants.CACHE_LightGreen,sysSettingsDto.isLightGreen());
Boolean lightGreen = dataCache.getCache(Constants.CACHE_LightGreen);
if (lightGreen == null) lightGreen = false;
SysSettingsDto dto = new SysSettingsDto(); SysSettingsDto dto = new SysSettingsDto();
dto.setStartJob(startJob); dto.setStartJob(startJob);
dto.setStopOut(stopOut); dto.setStopOut(stopOut);
...@@ -103,6 +107,7 @@ public class SettingsController { ...@@ -103,6 +107,7 @@ public class SettingsController {
dto.setMaiZhengMinute(maiZhengMinute); dto.setMaiZhengMinute(maiZhengMinute);
dto.setIgnoreLineCheck(ignoreLineCheck); dto.setIgnoreLineCheck(ignoreLineCheck);
dto.setOrdrRemainingQty(ordrRemainingQty); dto.setOrdrRemainingQty(ordrRemainingQty);
dto.setLightGreen(lightGreen);
return dto; return dto;
} }
...@@ -117,6 +122,7 @@ public class SettingsController { ...@@ -117,6 +122,7 @@ public class SettingsController {
dataCache.updateCache(Constants.CACHE_permissionPassword,sysSettingsDto.getPermissionPassword()); dataCache.updateCache(Constants.CACHE_permissionPassword,sysSettingsDto.getPermissionPassword());
dataCache.updateCache(Constants.CACHE_floor,sysSettingsDto.getFloor()); dataCache.updateCache(Constants.CACHE_floor,sysSettingsDto.getFloor());
dataCache.updateCache(Constants.CACHE_preGenerateTask_Times,sysSettingsDto.getPreGenerateTaskTimes()); dataCache.updateCache(Constants.CACHE_preGenerateTask_Times,sysSettingsDto.getPreGenerateTaskTimes());
dataCache.updateCache(Constants.CACHE_LightGreen,sysSettingsDto.isLightGreen());
List<LineConfig> lineConfigList = sysSettingsDto.getLineConfigList(); List<LineConfig> lineConfigList = sysSettingsDto.getLineConfigList();
if (lineConfigList == null){ if (lineConfigList == null){
...@@ -144,6 +150,7 @@ public class SettingsController { ...@@ -144,6 +150,7 @@ public class SettingsController {
+",maiZhengMinute="+sysSettingsDto.getMaiZhengMinute() +",maiZhengMinute="+sysSettingsDto.getMaiZhengMinute()
+",ignoreLineCheck="+sysSettingsDto.isIgnoreLineCheck() +",ignoreLineCheck="+sysSettingsDto.isIgnoreLineCheck()
+",ordrRemainingQty="+sysSettingsDto.getOrdrRemainingQty() +",ordrRemainingQty="+sysSettingsDto.getOrdrRemainingQty()
+",lightGreen="+sysSettingsDto.isLightGreen()
); );
return ResultBean.newOkResult("保存成功"); return ResultBean.newOkResult("保存成功");
} }
......
src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/SysSettingsDto.java
...@@ -47,6 +47,9 @@ public class SysSettingsDto implements Serializable { ...@@ -47,6 +47,9 @@ public class SysSettingsDto implements Serializable {
@ApiModelProperty("工单剩余数量") @ApiModelProperty("工单剩余数量")
private int ordrRemainingQty = -1; private int ordrRemainingQty = -1;
@ApiModelProperty("是否长时间亮绿灯")
private boolean isLightGreen = false;
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/kafka/service/KafkaService.java
...@@ -20,6 +20,7 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.*; ...@@ -20,6 +20,7 @@ import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.bean.*;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.config.KafkaConfig; import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.config.KafkaConfig;
import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.config.StorageNameConfig; import com.neotel.smfcore.custom.luxsan.factory_c.rawstor.kafka.config.StorageNameConfig;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -250,6 +251,8 @@ public class KafkaService { ...@@ -250,6 +251,8 @@ public class KafkaService {
Map<String,Object> paramMap = new HashMap<>(); Map<String,Object> paramMap = new HashMap<>();
paramMap.put("MachineID",StorageNameConfig.rawMaterialTower); paramMap.put("MachineID",StorageNameConfig.rawMaterialTower);
paramMap.put("data",dataList); paramMap.put("data",dataList);
String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS");
paramMap.put("OccurrenceTime",dateStr);
String statusStr = JSON.toJSONString(paramMap); String statusStr = JSON.toJSONString(paramMap);
log.info("原材料仓抛送货架使用情况:" + KafkaConfig.SMARTWH_TOPIC + "内容为:" + statusStr); log.info("原材料仓抛送货架使用情况:" + KafkaConfig.SMARTWH_TOPIC + "内容为:" + statusStr);
ListenableFuture future = kafkaTemplate.send(KafkaConfig.SMARTWH_TOPIC, statusStr); ListenableFuture future = kafkaTemplate.send(KafkaConfig.SMARTWH_TOPIC, statusStr);
...@@ -275,8 +278,11 @@ public class KafkaService { ...@@ -275,8 +278,11 @@ public class KafkaService {
heartbeat.setMachineID(agvMachineId); heartbeat.setMachineID(agvMachineId);
heartbeat.setTopicType(KafkaConfig.HEARTBEAT_TOPIC); heartbeat.setTopicType(KafkaConfig.HEARTBEAT_TOPIC);
String statusStr = JSON.toJSONString(heartbeat); String statusStr = JSON.toJSONString(heartbeat);
log.info("半成品仓抛送AGV小车心跳信息:" + KafkaConfig.HEARTBEAT_TOPIC + "内容为:" + statusStr); log.info("原成品仓抛送AGV小车心跳信息:" + KafkaConfig.HEARTBEAT_TOPIC + "内容为:" + statusStr);
ListenableFuture future = kafkaTemplate.send(KafkaConfig.HEARTBEAT_TOPIC, statusStr); ProducerRecord record = new ProducerRecord(KafkaConfig.HEARTBEAT_TOPIC,agvMachineId,statusStr);
kafkaTemplate.send(record);
//ListenableFuture future = kafkaTemplate.send(KafkaConfig.HEARTBEAT_TOPIC, statusStr);
//log.info("半成品仓抛送AGV小车信息结束为:" + JSON.toJSONString(future)); //log.info("半成品仓抛送AGV小车信息结束为:" + JSON.toJSONString(future));
} }
} }
...@@ -326,7 +332,8 @@ public class KafkaService { ...@@ -326,7 +332,8 @@ public class KafkaService {
machineStatus.setClientIP(""); machineStatus.setClientIP("");
String statusStr = JSON.toJSONString(machineStatus); String statusStr = JSON.toJSONString(machineStatus);
log.info(agvMachineId+"抛送Agv状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr); log.info(agvMachineId+"抛送Agv状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr);
ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINESTATUS_TOPIC, statusStr); ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINESTATUS_TOPIC,agvMachineId,statusStr);
ListenableFuture future = kafkaTemplate.send(record);
log.info(agvMachineId+"抛送Agv状态返回结果为:" + JSON.toJSONString(future)); log.info(agvMachineId+"抛送Agv状态返回结果为:" + JSON.toJSONString(future));
} }
} else { } else {
...@@ -341,14 +348,15 @@ public class KafkaService { ...@@ -341,14 +348,15 @@ public class KafkaService {
machineStatus.setClientIP(""); machineStatus.setClientIP("");
String statusStr = JSON.toJSONString(machineStatus); String statusStr = JSON.toJSONString(machineStatus);
log.info(agvMachineId+"抛送设备状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr); log.info(agvMachineId+"抛送设备状态主题为:" + KafkaConfig.MACHINESTATUS_TOPIC + "内容为:" + statusStr);
ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINESTATUS_TOPIC, statusStr); ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINESTATUS_TOPIC,agvMachineId,statusStr);
ListenableFuture future = kafkaTemplate.send(record);
log.info(agvMachineId+"抛送设备状态返回结果为:" + JSON.toJSONString(future)); log.info(agvMachineId+"抛送设备状态返回结果为:" + JSON.toJSONString(future));
} }
} }
} }
@Scheduled(fixedRate = 1000 * 10) @Scheduled(fixedRate = 1000 * 30)
public void sendAgvMachineStatus() { public void sendAgvMachineStatus() {
List<String> agvMachineIdList = StorageNameConfig.getAgvMachineIdList(); List<String> agvMachineIdList = StorageNameConfig.getAgvMachineIdList();
for (String agvMachineId : agvMachineIdList) { for (String agvMachineId : agvMachineIdList) {
...@@ -375,7 +383,8 @@ public class KafkaService { ...@@ -375,7 +383,8 @@ public class KafkaService {
machineParameter.setData(dataList); machineParameter.setData(dataList);
String machineParameterStr = JSON.toJSONString(machineParameter); String machineParameterStr = JSON.toJSONString(machineParameter);
log.info("推送小车电量和位置信息,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr); log.info("推送小车电量和位置信息,MachineParameter主题为:" + KafkaConfig.MACHINEPARAMETER_TOPIC + "内容为:" + machineParameterStr);
ListenableFuture future = kafkaTemplate.send(KafkaConfig.MACHINEPARAMETER_TOPIC, machineParameterStr); ProducerRecord record = new ProducerRecord(KafkaConfig.MACHINEPARAMETER_TOPIC,agvMachineId,machineParameterStr);
ListenableFuture future = kafkaTemplate.send(record);
log.info("推送小车电量和位置信息,MachineParameter返回结果为:" + JSON.toJSONString(future)); log.info("推送小车电量和位置信息,MachineParameter返回结果为:" + JSON.toJSONString(future));
} }
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/third/SettingController.java 0 → 100644
package com.neotel.smfcore.custom.luxsan.factory_c.third;
import com.neotel.smfcore.common.bean.ResultBean;
import com.neotel.smfcore.common.utils.Constants;
import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.security.annotation.AnonymousAccess;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/thirdSetting")
public class SettingController {
@Autowired
private DataCache dataCache;
@RequestMapping("/lightGreen")
@AnonymousAccess
public ResultBean lightGreen(){
Boolean lightGreen = dataCache.getCache(Constants.CACHE_LightGreen);
if (lightGreen == null){
lightGreen =false;
}
return ResultBean.newOkResult(lightGreen);
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!