修改文件名路径

imcs-admin-boot/imcs-authority-server/src/main/java/com/github/zuihou/job/DashboardJob.java

@@ -14,11 +14,14 @@ import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.operationManagementCenter.service.OrderService;
 import com.github.zuihou.business.operationManagementCenter.service.PlanService;
 import com.github.zuihou.business.operationManagementCenter.service.TaskService;
+import com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog;
+import com.github.zuihou.business.productionReadyCenter.service.AAutoNodeLogService;
 import com.github.zuihou.business.productionResourceCenter.entity.Repair;
 import com.github.zuihou.business.productionResourceCenter.entity.ZZone;
 import com.github.zuihou.business.productionResourceCenter.service.RepairService;
 import com.github.zuihou.business.productionResourceCenter.service.ZZoneService;
 import com.github.zuihou.business.websocket.WebSocketServer;
+import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
@@ -39,10 +42,7 @@ import org.springframework.web.client.RestTemplate;
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Component
 public class DashboardJob {
@@ -71,6 +71,9 @@ public class DashboardJob {
     @Autowired
     private RepairService repairService;
 
+    @Autowired
+    private AAutoNodeLogService autoNodeLogService;
+
     @Value("${zuihou.database.tenantDatabasePrefix}")
     private String database;
 
@@ -137,6 +140,18 @@ public class DashboardJob {
             repairMap.put("repairData", repairData);
             dataScreenMap.put("repairMap", repairMap);
 
+            QueryWrap<AAutoNodeLog> warnWrap = this.handlerWrapper(null, params);
+            LbqWrapper<AAutoNodeLog> warnWrapper = warnWrap.lambda();
+            Date start = new Date();
+            Date end = DateUtil.stringToDate7(DateUtil.dateToString(new Date()) + " 23:59:59");
+            warnWrapper.between(AAutoNodeLog::getCreateTime,start, end);
+            warnWrapper.and(condition -> condition.isNull(AAutoNodeLog::getExeResult).or().eq(AAutoNodeLog::getExeResult,"0")).orderByDesc(AAutoNodeLog::getCreateTime);
+            IPage<AAutoNodeLog> warnData = autoNodeLogService.pageList(new Page<AAutoNodeLog>(), warnWrapper);
+
+            Map warnMap = Maps.newHashMap();
+            warnMap.put("warnData", warnData);
+            dataScreenMap.put("warnMap", warnMap);
+
             Map<String, Object> pushMap = new HashMap<>();
             pushMap.put("type", WebSocketServer.PUSH_TYPE_DATA_SCREEN);
             pushMap.put("data", dataScreenMap);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/HandModeWorkNode.java

@@ -1,27 +1,9 @@
 package com.github.zuihou.business.mq;
 
 import com.alibaba.fastjson.JSONObject;
-import com.github.zuihou.business.DemoLine.DemoCacheKey;
-import com.github.zuihou.business.edgeLibrary.service.StorgeService;
-import com.github.zuihou.business.operationManagementCenter.dao.OrderMapper;
-import com.github.zuihou.business.operationManagementCenter.dao.PlanMapper;
-import com.github.zuihou.business.operationManagementCenter.dao.TTaskMapper;
-import com.github.zuihou.business.operationManagementCenter.dao.TaskNodeMapper;
-import com.github.zuihou.business.operationManagementCenter.service.TaskNodeService;
-import com.github.zuihou.business.productionReadyCenter.dao.AutoNodeLogMapper;
-import com.github.zuihou.business.productionResourceCenter.service.NodeOperationService;
-import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
-import com.github.zuihou.business.productionResourceCenter.service.impl.AGVNodeServiceImpl;
-import com.github.zuihou.business.productionResourceCenter.service.impl.MachineNodeServiceImpl;
-import com.github.zuihou.business.util.MsgUtil;
 import com.github.zuihou.common.constant.DictionaryKey;
 import com.github.zuihou.common.enums.HandModeTypeEnum;
 import com.github.zuihou.common.util.StringUtil;
-import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
-import com.github.zuihou.tenant.entity.Module;
-import com.github.zuihou.tenant.entity.Productionresource;
-import com.github.zuihou.tenant.service.ModuleService;
-import com.github.zuihou.tenant.service.ProductionresourceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -13,7 +13,7 @@ import com.github.zuihou.business.operationManagementCenter.dao.TaskNodeMapper;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.entity.TaskNode;
 import com.github.zuihou.business.operationManagementCenter.service.TaskNodeService;
-import com.github.zuihou.business.productionReadyCenter.dao.AutoNodeLogMapper;
+import com.github.zuihou.business.productionReadyCenter.dao.AAutoNodeLogMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.AAutoNodeLog;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.service.NodeOperationService;
@@ -62,7 +62,7 @@ public class TaskWorkNode {
     @Autowired
     private TTaskMapper taskMapper;
     @Autowired
-    private AutoNodeLogMapper autoNodeLogMapper;
+    private AAutoNodeLogMapper autoNodeLogMapper;
     @Autowired
     private RestTemplate restTemplate;
     @Autowired

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -19,7 +19,7 @@ import com.github.zuihou.business.operationManagementCenter.dao.*;
 import com.github.zuihou.business.operationManagementCenter.dto.TaskNodeCallBackDTO;
 import com.github.zuihou.business.operationManagementCenter.entity.*;
 import com.github.zuihou.business.operationManagementCenter.service.*;
-import com.github.zuihou.business.productionReadyCenter.dao.AutoNodeLogMapper;
+import com.github.zuihou.business.productionReadyCenter.dao.AAutoNodeLogMapper;
 import com.github.zuihou.business.productionReadyCenter.dao.AutoNodeMapper;
 import com.github.zuihou.business.productionReadyCenter.dao.BBomMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.*;
@@ -27,7 +27,6 @@ import com.github.zuihou.business.productionReadyCenter.service.*;
 import com.github.zuihou.business.productionResourceCenter.dao.ProductionresourcePositionMapper;
 import com.github.zuihou.business.productionResourceCenter.entity.ProductionresourcePosition;
 import com.github.zuihou.business.productionResourceCenter.entity.ResourceAutoCode;
-import com.github.zuihou.business.productionResourceCenter.entity.ResourceBusiness;
 import com.github.zuihou.business.productionResourceCenter.service.ProductionresourcePositionService;
 import com.github.zuihou.business.productionResourceCenter.service.ResourceAutoCodeService;
 import com.github.zuihou.business.productionResourceCenter.service.ResourceBusinessService;
@@ -145,7 +144,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
     private TTaskMapper taskMapper;
 
     @Autowired
-    private AutoNodeLogMapper autoNodeLogMapper;
+    private AAutoNodeLogMapper autoNodeLogMapper;
 
     @Autowired
     private OrderMapper orderMapper;