1.设备状添加

tangzy

2021-03-20 ae6c8efd88419a9b9bb980aa67085a922013adb8

1.设备状添加

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java

@@ -351,4 +351,15 @@
        return R.success("修改成功");
    }

    /**
     * 设备故障修改
     */
    @PostMapping("/updateExstate")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "修改", notes = "传入equipment")
    public R updateExstate(String state,String reason, String deviceNumber) {
        equipmentService.updateExstate(state,reason,deviceNumber);
        return R.success("修改成功");
    }

}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/entity/Equipment.java

@@ -112,6 +112,8 @@
    private String province;
    private String city;
    private String district;
    private String state;
    private String reason;


}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java

@@ -67,4 +67,5 @@
    List<Map<String, Object>> selectInfos(String deviceNumber);
    void updateChannel(String heartbeat, String deviceNumber);
    void updateexpireTime(String expireTime, String deviceNumber);
    void updateExstate(String state,String reason, String deviceNumber);
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -27,6 +27,8 @@
        <result column="province" property="province"/>
        <result column="city" property="city"/>
        <result column="district" property="district"/>
        <result column="state" property="state"/>
        <result column="reason" property="reason"/>
    </resultMap>

    <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -258,4 +260,8 @@
        update sys_equipment SET expireTime=#{expireTime} where deviceNumber=#{deviceNumber}
    </update>

    <update id="updateExstate">
        update sys_equipment SET state=#{state},reason=#{reason}  where deviceNumber=#{deviceNumber}
    </update>

</mapper>

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/IEquipmentService.java

@@ -81,4 +81,5 @@
     */
    Integer selectEquipmentCount(Integer status);
    void updateexpireTime(String expireTime, String deviceNumber);
    void updateExstate(String state,String reason, String deviceNumber);
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java

@@ -157,4 +157,9 @@
    public void updateexpireTime(String expireTime, String deviceNumber) {
        baseMapper.updateexpireTime(expireTime,deviceNumber);
    }

    @Override
    public void updateExstate(String state, String reason, String deviceNumber) {
        baseMapper.updateExstate(state, reason, deviceNumber);
    }
}

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java

@@ -107,6 +107,8 @@
        String body = new String(req, "UTF-8");
        String content = body;
        System.out.println("接收客户端数据:" + body);
        String state="系统故障"; //设备故障状态
        String reason=null; //故障原因
        //获取字符串的长度
        int length = content.length();
        //当字符串长度大于200时，采集体温数据，小于则采集报警数据
@@ -361,36 +363,56 @@
                            } else if (fqbm.equals("1")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("交流电故障");
                                reason="交流电故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("2")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("备电偏低");
                                reason="备电偏低";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("3")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("RAM校验错误");
                                reason="RAM校验错误";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("4")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("ROM校验错误");
                                reason="ROM校验错误";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("5")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("远程编程");
                                reason="远程编程";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("6")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("主机设置更改");
                                reason="主机设置更改";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("7")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("自检失败");
                                reason="自检失败";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("8")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("系统关闭");
                                reason="系统关闭";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("9")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("备电故障");
                                reason="备电故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            }
                            break;
                        case "31":
                            if (fqbm.equals("0")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("接地故障");
                                reason="接地故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            }
                            break;
                        case "32":
@@ -418,51 +440,79 @@
                            if (fqbm.equals("0")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("系统周边");
                                reason="系统周边";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("1")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("回路断开");
                                reason="回路断开";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("2")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("回路短路");
                                reason="回路短路";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("3")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("扩展模块故障");
                                reason="扩展模块故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("4")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("中继器故障");
                                reason="中继器故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("5")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("打印机缺纸");
                                reason="打印机缺纸";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("6")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("打印机故障");
                                reason="打印机故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("7")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("扩展模块无直流");
                                reason="扩展模块无直流";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("8")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("扩展模块低电压");
                                reason="扩展模块低电压";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("9")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("扩展模块复位");
                                reason="扩展模块复位";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            }
                            break;
                        case "34":
                            if (fqbm.equals("1")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("扩展模块防拆触发");
                                reason="扩展模块防拆触发";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            }
                            break;
                        case "35":
                            if (fqbm.equals("0")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("通讯故障");
                                reason="通讯故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("1")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("电话线故障");
                                reason="电话线故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("2")) {
                                alarm.setWaringType("系统故障");
                                alarm.setContent("电话接口2故障");
                                reason="电话接口2故障";
                                serverHandler.equipmentService.updateExstate(state,reason,devId);
                            } else if (fqbm.equals("3")) {
                                alarm.setWaringType("通讯故障");
                                alarm.setContent("远距离无线通讯");