zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java
@@ -4,13 +4,18 @@ import com.zy.acs.framework.common.Cools; import com.zy.acs.framework.common.R; import com.zy.acs.manager.common.annotation.IntegrationAuth; import com.zy.acs.manager.core.domain.TaskPosDto; import com.zy.acs.manager.core.domain.type.NamespaceType; import com.zy.acs.manager.core.integrate.dto.ConveyorQueryParam; import com.zy.acs.manager.core.integrate.dto.ConveyorQueryResult; import com.zy.acs.manager.manager.entity.Segment; import com.zy.acs.manager.manager.entity.Sta; import com.zy.acs.manager.manager.entity.Task; import com.zy.acs.manager.manager.enums.SegmentStateType; import com.zy.acs.manager.manager.enums.StatusType; import com.zy.acs.manager.manager.service.SegmentService; import com.zy.acs.manager.manager.service.StaService; import com.zy.acs.manager.manager.service.TaskService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -28,6 +33,13 @@ @Autowired private StaService staService; @Autowired private TaskService taskService; @Autowired private SegmentService segmentService; @PostMapping("/station/convey") @IntegrationAuth(name = NamespaceType.RCS_STA_QUERY) @@ -76,5 +88,20 @@ } @PostMapping("/station/checkTakeComplete") @IntegrationAuth(name = NamespaceType.RCS_STA_QUERY) public R checkTakeComplete(@RequestBody ConveyorQueryParam param) { String seqNum = param.getSeqNum(); Task task = taskService.selectBySeqNum(null, seqNum); if (null == task) { return R.error("task not found"); } List<Segment> list = segmentService.list(new LambdaQueryWrapper<Segment>().eq(Segment::getTaskId, task.getId()).eq(Segment::getPosType, TaskPosDto.PosType.ORI_STA.toString())); for (Segment segment : list){ if (segment.getState().equals(SegmentStateType.FINISH.toString())){ return R.ok().add(true); } } return R.ok().add(false); } } zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/ConveyorQueryParam.java
@@ -8,6 +8,10 @@ @Data public class ConveyorQueryParam { private String staNo; private String seqNum; private List<String> staNos = new ArrayList<>(); } zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/dto/FaultUplinkParam.java
@@ -17,7 +17,9 @@ * 故障名 */ private String faultName; /** * 发生时间，时间戳 */ private Long timestamp; } zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
@@ -184,7 +184,7 @@ } @Scheduled(cron = "0/3 * * * * ? ") private void reportTaskToUplink() { private synchronized void reportTaskToUplink() { if (!uplinkProperties.getEnabled()) { return; } @@ -226,12 +226,12 @@ @Scheduled(cron = "0/3 * * * * ? ") private void reportFault() { private synchronized void reportFault() { String reportFaultUrl = configService.getVal("reportFaultUrl", String.class); if (Cools.isEmpty(reportFaultUrl)) { return; } List<VehFaultRec> vehFaultRecList = vehFaultRecService.list((new LambdaQueryWrapper<VehFaultRec>().eq(VehFaultRec::getState, VehFaultRecStateType.PENDING).ge(VehFaultRec::getHappenTime, Instant.now().minusSeconds(3).atZone(ZoneId.systemDefault()).toLocalDateTime()))); List<VehFaultRec> vehFaultRecList = vehFaultRecService.list((new LambdaQueryWrapper<VehFaultRec>().eq(VehFaultRec::getState, VehFaultRecStateType.PENDING).ge(VehFaultRec::getHappenTime, Instant.now().minusSeconds(180).atZone(ZoneId.systemDefault()).toLocalDateTime()))); if (Cools.isEmpty(vehFaultRecList)) { return; } zy-acs-manager/src/main/resources/application.yml
@@ -52,7 +52,7 @@ convey-plc: host: 10.10.10.222 port: 9090 port: 8877 timeout: 15000 url: /cv/station/query
