nnnjjj123
2021-01-28 71b6b716361c52af290493d365a328fc1a3467e2
src/main/java/org/springblade/modules/Netty/controller/nettyController.java
@@ -168,10 +168,13 @@
            if (childList.get(i).get("eqid") != null) {
               if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
                  zT = 1;
                  arr += pages.get(j).getId() + ",";
                  arr += "'" + pages.get(j).getId() + "',";
                  List<String> outData = new ArrayList<>();
                  outData.add("LC8109085B#@");
                  Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
                  if (channel == null) {
                     break;
                  }
                  channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
                  break;
               }
@@ -179,7 +182,7 @@
         }
      }
      if (!arr.equals("")){
      if (!arr.equals("")) {
         String substring = arr.substring(0, arr.length() - 1);
         equipmentService.updataType(substring);
      }
@@ -221,17 +224,21 @@
            if (childList.get(i).get("eqid") != null) {
               if (childList.get(i).get("eqid").equals(pages.get(j).getDeviceNumber())) {
                  zT = 1;
                  arr += pages.get(j).getId() + ",";
                  arr += "'" + pages.get(j).getId() + "',";
                  List<String> outData = new ArrayList<>();
                  outData.add("LC8109085C#@");
                  Channel channel = channelHashMap.get(pages.get(j).getDeviceNumber());
                  if (channel == null) {
                     break;
                  }
                  channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
                  break;
               }
            }
         }
      }
      if (!arr.equals("")){
      if (!arr.equals("")) {
         String substring = arr.substring(0, arr.length() - 1);
         equipmentService.updataTypeC(substring);
      }
@@ -268,7 +275,7 @@
    */
   @PostMapping("/selectNettyChannelOb")
   @ApiOperationSupport(order = 10)
   public R selectNettyChannelOb(String deviceNumber, HttpServletResponse response) {
   public R selectNettyChannelOb(String deviceNumber,String ID, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");
@@ -276,7 +283,11 @@
      List<String> outData = new ArrayList<>();
      outData.add("LC8109085B#@");
      Channel channel = channelHashMap.get(deviceNumber);
      if (channel == null) {
         return R.success("未查询到设备");
      }
      channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
      equipmentService.updataType(ID);
      return R.success("设备布防");
   }
@@ -286,7 +297,7 @@
    */
   @PostMapping("/selectNettyChannelOc")
   @ApiOperationSupport(order = 11)
   public R selectNettyChannelOc(String deviceNumber, HttpServletResponse response) {
   public R selectNettyChannelOc(String deviceNumber,String ID, HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");
@@ -294,7 +305,11 @@
      List<String> outData = new ArrayList<>();
      outData.add("LC8109085C#@");
      Channel channel = channelHashMap.get(deviceNumber);
      if (channel == null) {
         return R.success("未查询到设备");
      }
      channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
      equipmentService.updataTypeC(ID);
      return R.success("设备撤防");
   }