客户列表接口修改

zengh

2021-01-14 9042d334589612bb089fa1df3621b304be690a6c

客户列表接口修改

 src/main/java/org/springblade/modules/Netty/controller/nettyController.java

@@ -168,11 +168,11 @@
                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){
                        if (channel == null) {
                            break;
                        }
                        channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
@@ -182,7 +182,7 @@
            }
        }

        if (!arr.equals("")){
        if (!arr.equals("")) {
            String substring = arr.substring(0, arr.length() - 1);
            equipmentService.updataType(substring);
        }
@@ -224,11 +224,11 @@
                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){
                        if (channel == null) {
                            break;
                        }
                        channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
@@ -238,7 +238,7 @@
            }
        }

        if (!arr.equals("")){
        if (!arr.equals("")) {
            String substring = arr.substring(0, arr.length() - 1);
            equipmentService.updataTypeC(substring);
        }
@@ -283,7 +283,7 @@
        List<String> outData = new ArrayList<>();
        outData.add("LC8109085B#@");
        Channel channel = channelHashMap.get(deviceNumber);
        if(channel == null){
        if (channel == null) {
            return R.success("未查询到设备");
        }
        channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));
@@ -304,7 +304,7 @@
        List<String> outData = new ArrayList<>();
        outData.add("LC8109085C#@");
        Channel channel = channelHashMap.get(deviceNumber);
        if(channel == null){
        if (channel == null) {
            return R.success("未查询到设备");
        }
        channel.writeAndFlush(Unpooled.copiedBuffer(outData.get(0), CharsetUtil.UTF_8));

 src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml

@@ -137,11 +137,11 @@
    </update>

    <update id="updataType">
        update sys_equipment SET devicestate = 1 where id in (#{arr})
        update sys_equipment SET devicestate = 1 where id in (${arr})
    </update>

    <update id="updataTypeC">
        update sys_equipment SET devicestate = 0 where id in (#{arr})
        update sys_equipment SET devicestate = 0 where id in (${arr})
    </update>

    <update id="updateOnes" parameterType="org.springblade.modules.equipment.entity.Equipment">