fix:"注解添加"

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -103,6 +104,7 @@ public class DashboardJob {
 
     @Scheduled(cron="0 0/1 * * * ?")
     public void updateDashboardJob(){
+        logger.info("定时查询，方法体=broadCastData");
         //taskService.pushTask();
         BaseContextHandler.setTenant("0000");
         this.broadCastData();
@@ -112,6 +114,7 @@ public class DashboardJob {
     private void broadCastData(){
         String pushMsg = null;
         try {
+
             Map<String, Map<String, Object>> dataScreenMap = new HashMap<String, Map<String, Object>>();
 
             Map zoneData = Maps.newHashMap();
@@ -200,6 +203,7 @@ public class DashboardJob {
     @Scheduled(cron="0/10 * * * * ?")
     public void updateExceptionJob(){
         BaseContextHandler.setTenant("0000");
+        // 获取登入人id集合，
         List<String> userIds = webSocketServer.getUserIds();
         if(userIds.size()>0 && CollectionUtil.isNotEmpty(userIds)) {
             userIds.forEach(item -> {
@@ -225,7 +229,9 @@ public class DashboardJob {
                     .orderByDesc(AAutoNodeLog::getCreateTime);
             Page<Repair> warnDataPage = new Page<Repair>(1L, 5);
             warnDataPage.setSearchCount(false);
+            // 查询自动化节点执行记录数据
             IPage<AAutoNodeLog> warnData = aAutoNodeLogMapper.pageList(warnDataPage, warnWrapper, datascope, null);
+            logger.info("定时推送失败的的自动化节点执行记录数据={}", JSON.toJSONString(warnData));
 
             Map warnMap = Maps.newHashMap();
             warnMap.put("warnData", warnData);
@@ -239,6 +245,8 @@ public class DashboardJob {
             objectMapper.findAndRegisterModules();
 
             pushMsg = objectMapper.writeValueAsString(exMap);
+
+            // 发送错误消息
             webSocketServer.BroadCastInfo(pushMsg, sessions);
         } catch (Exception e) {
             logger.error("全局推送异常======"+e.getMessage());

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

@@ -1555,8 +1555,11 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     @Override
     //确认当前工序零件加工状况
     public R confirmProcedure(Map<String, Object> map) {
+        // 根据节点任务主键查询节点任务数据
         TaskNode taskNode = taskNodeService.getById(map.get("taskNodeId").toString());
         Tray tray = null;
+
+        // 查询托盘，如果托盘编号不为空，以托盘编号为主，否则以托盘主键为主
         if(map.containsKey("clampNo")){
             tray = trayService.getOne(new LbqWrapper<Tray>().eq(Tray::getNo, map.get("clampNo").toString()).last("limit 1"));
         }else{
@@ -1567,10 +1570,13 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         boolean xbkValid = true;
         Map paramMap = Maps.newHashMap();
         paramMap.put("no", DictionaryKey.YJ_ZONE_XBK.get("plateAndClamp"));
+
+        // 获取用户权限访问机构
         String orgIdsStr = CommonUtil.getOrgIdsStr();
         if(StringUtil.isNotEmpty(orgIdsStr)) {
             paramMap.put("orgIds", orgIdsStr);
         }
+        // 统计货架里数量
         List<Map> xbkValidList = stockInfoService.getXbkCountByShelves(paramMap);
         xbkValidList = xbkValidList.stream().filter(item->item.containsKey("cnt") && (long)item.get("cnt")<3).collect(Collectors.toList());
         if(xbkValidList.size()>0){

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/MsgUtil.java

@@ -481,7 +481,7 @@ public class MsgUtil implements ApplicationContextAware {
             Plan plan = planMapper.selectById(currWorkpiece.getPlanId());
             //如果是手动模式，执行完当前工序就不往下走了
             if(("2".equals(bomzZone.getRunMode()) || "3".equals(plan.getProduceStatus())) && taskNode.getProcedureId() != nextTaskNode.getProcedureId().longValue()){
-                System.err.println("手动模式下或者订单暂停时执行到工序最后一个工步***************************");
+                logger.info("手动模式下或者订单暂停时执行到工序最后一个工步***************************");
                 return;
             }
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/websocket/WebSocketServer.java

@@ -167,6 +167,7 @@ public class WebSocketServer {
      * @return
      */
     public List<String> getUserIds(){
+        // 登入的时候会调用socker，把新登入的信息添加到此userSessionsMap中
          return userSessionsMap.entrySet().stream().map(x->x.getKey()).collect(Collectors.toList());
     }
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderController.java

@@ -212,7 +212,9 @@ public class OrderController extends SuperController<OrderService, Long, Order,
     @ApiOperation(value = "一键生产", notes = "一键生产")
     @PostMapping("/confirmSchedule")
     public R<Map<String,Object>> confirmSchedule(@RequestBody Map<String,Object> map,@ApiIgnore @LoginUser SysUser sysUser) {
+        log.info("======================一键生产下发开始======================");
         Map<String,Object> returnMap = baseService.confirmSchedule(map,sysUser);
+        log.info("======================一键生产下发结束======================");
         return success(returnMap);
     }
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskController.java

@@ -240,6 +240,7 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
 
     @PostMapping("/confirmProcedure")
     public R confirmProcedure(@RequestBody Map<String,Object> map) {
+        log.info("确认当前工序零件加工状况");
         return baseService.confirmProcedure(map);
     }