1、国贸订单修复循环发送消息的问题

src/main/java/com/steerinfo/ems/emsgmpcjh/controller/EmsGmPcJhController.java

@@ -355,27 +355,27 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             emsGmPcJhService.updateState(model);
             result = true;
             soketMessage+=emsGmPcJh.getId()+",";
-            if(result){
-                soketMessage += "下发,请注意接收";
-                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
-                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
-                websocketLog.setMessage(soketMessage);
-                websocketLog.setTitle("生产处");
-                websocketLog.setState("0");
-                websocketLog.setTips("国贸订单下发");
-                websocketLog.setRole("您好，有新的国贸计划已经下发,请注意接收。");
-                websocketLogs.add(websocketLog);
-                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
-                //soketMessage += "下发,请注意接收";
-                //String[] roles = {"生产部-生产处"};
-                //Map <String, Object> map = new HashMap<String,Object>();
-                //map.put("role",roles);
-                //map.put("title","国贸订单下发");
-                //map.put("message",soketMessage);
-                //map.put("tips","您好，有新的国贸计划已经下发,请注意接收。");
-                //soketMessage= JSON.toJSONString(map);
-                //webSocket.sendAllMessage(soketMessage);
-            }
+        }
+        if(result){
+            soketMessage += "下发,请注意接收";
+            List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+            EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+            websocketLog.setMessage(soketMessage);
+            websocketLog.setTitle("生产处");
+            websocketLog.setState("0");
+            websocketLog.setTips("国贸订单下发");
+            websocketLog.setRole("您好，有新的国贸计划已经下发,请注意接收。");
+            websocketLogs.add(websocketLog);
+            emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+            //soketMessage += "下发,请注意接收";
+            //String[] roles = {"生产部-生产处"};
+            //Map <String, Object> map = new HashMap<String,Object>();
+            //map.put("role",roles);
+            //map.put("title","国贸订单下发");
+            //map.put("message",soketMessage);
+            //map.put("tips","您好，有新的国贸计划已经下发,请注意接收。");
+            //soketMessage= JSON.toJSONString(map);
+            //webSocket.sendAllMessage(soketMessage);
         }
         return success();
     }
@@ -396,27 +396,27 @@ public class EmsGmPcJhController extends BaseRESTfulController {
             emsGmPcJhService.updateState(model);
             result = true;
             soketMessage+=emsGmPcJh.getId()+",";
-            if(result){
-                soketMessage += "已被撤回,请注意查看";
-                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
-                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
-                websocketLog.setMessage(soketMessage);
-                websocketLog.setTitle("国贸-业务人员");
-                websocketLog.setState("0");
-                websocketLog.setTips("国贸订单审核");
-                websocketLog.setRole("您好，您提交的订单已被撤回,请注意查看。");
-                websocketLogs.add(websocketLog);
-                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
-                //soketMessage += "已被撤回,请注意查看";
-                //String[] roles = {"国贸-业务人员"};
-                //Map <String, Object> map = new HashMap<String,Object>();
-                //map.put("role",roles);
-                //map.put("title","国贸订单审核");
-                //map.put("message",soketMessage);
-                //map.put("tips","您好，您提交的订单已被撤回,请注意查看。");
-                //soketMessage= JSON.toJSONString(map);
-                //webSocket.sendAllMessage(soketMessage);
-            }
+        }
+        if(result){
+            soketMessage += "已被撤回,请注意查看";
+            List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+            EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+            websocketLog.setMessage(soketMessage);
+            websocketLog.setTitle("国贸-业务人员");
+            websocketLog.setState("0");
+            websocketLog.setTips("国贸订单审核");
+            websocketLog.setRole("您好，您提交的订单已被撤回,请注意查看。");
+            websocketLogs.add(websocketLog);
+            emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+            //soketMessage += "已被撤回,请注意查看";
+            //String[] roles = {"国贸-业务人员"};
+            //Map <String, Object> map = new HashMap<String,Object>();
+            //map.put("role",roles);
+            //map.put("title","国贸订单审核");
+            //map.put("message",soketMessage);
+            //map.put("tips","您好，您提交的订单已被撤回,请注意查看。");
+            //soketMessage= JSON.toJSONString(map);
+            //webSocket.sendAllMessage(soketMessage);
         }
         return success();
     }

src/main/java/com/steerinfo/ems/emsprodplanweightadjustment/controller/EmsProdplanWeightAdjustmentController.java

@@ -220,27 +220,27 @@ public class EmsProdplanWeightAdjustmentController extends BaseRESTfulController
                 result = true;
             }
             soketMessage+=model.getId()+",";
-            if(result){
-                soketMessage += "不通过,请注意查看";
-                List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
-                EmsWebsocketLog websocketLog = new EmsWebsocketLog();
-                websocketLog.setMessage(soketMessage);
-                websocketLog.setTitle("国贸-业务人员");
-                websocketLog.setState("0");
-                websocketLog.setTips("销售订单重量调整");
-                websocketLog.setRole("您好，有提交的订单不通过，请注意查看。");
-                websocketLogs.add(websocketLog);
-                emsWebsocketLogService.pushMessageByDataException(websocketLogs);
-                //soketMessage += "不通过,请注意查看";
-                //String[] roles = {"国贸-业务人员"};
-                //Map <String, Object> map = new HashMap<String,Object>();
-                //map.put("role",roles);
-                //map.put("title","销售订单重量调整");
-                //map.put("message",soketMessage);
-                //map.put("tips","您好，有提交的订单不通过，请注意查看。");
-                //soketMessage= JSON.toJSONString(map);
-                //webSocket.sendAllMessage(soketMessage);
-            }
+        }
+        if(result){
+            soketMessage += "不通过,请注意查看";
+            List<EmsWebsocketLog> websocketLogs = new ArrayList<>();
+            EmsWebsocketLog websocketLog = new EmsWebsocketLog();
+            websocketLog.setMessage(soketMessage);
+            websocketLog.setTitle("国贸-业务人员");
+            websocketLog.setState("0");
+            websocketLog.setTips("销售订单重量调整");
+            websocketLog.setRole("您好，有提交的订单不通过，请注意查看。");
+            websocketLogs.add(websocketLog);
+            emsWebsocketLogService.pushMessageByDataException(websocketLogs);
+            //soketMessage += "不通过,请注意查看";
+            //String[] roles = {"国贸-业务人员"};
+            //Map <String, Object> map = new HashMap<String,Object>();
+            //map.put("role",roles);
+            //map.put("title","销售订单重量调整");
+            //map.put("message",soketMessage);
+            //map.put("tips","您好，有提交的订单不通过，请注意查看。");
+            //soketMessage= JSON.toJSONString(map);
+            //webSocket.sendAllMessage(soketMessage);
         }
                  return success();
     }