~lgq/IGD5300-package.git

lgq

2025-07-12 478a6e251361cf00ea18c08a453b0c8caaa9ef6f

修改SNMP导出OID表格，增加设备类型列

已修改4个文件

已添加1个文件

	local/bin/export.sh	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/bin/snmp_cfg	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/bin/snmp_val.sh	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/cgi-bin/snmp/query_oid	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	local/www/sys-snmp-conf.html	115 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 local/bin/export.sh

@@ -1,7 +1,7 @@
#!/bin/sh

sqlite3 /work/iot_cfg.db ".headers on " "select d.name as è®¾å¤åç§°,'1.3.6.1.4.1.27116.'||d.id||'.'||a.passcode as OID, d.id as è®¾å¤ID, a.passcode as ééå·, a.name as æ°æ®åç§°,a.note as å¤æ³¨  from device d left join accuracy a on d.id=a.id   where uploadFlag=0" > /tmp/oid_list.csv
sqlite3 /work/iot_cfg.db "SELECT     name as è®¾å¤åç§°, '1.3.6.1.4.1.27116.'||id||'.3' as OID, id as è®¾å¤ID, 3 as ééå· , 'ç¶æ' as æ°æ®åç§°, '0-æ£å¸¸;1-åè¦' as å¤æ³¨   FROM ioDevice ;" >> /tmp/oid_list.csv
sqlite3 /work/iot_cfg.db ".headers on " "select d.name as è®¾å¤åç§°,'1.3.6.1.4.1.27116.'||d.id||'.'||a.passcode as OID, d.id as è®¾å¤ID, d.type as è®¾å¤ç±»å, a.passcode as ééå·, a.name as æ°æ®åç§°,a.note as å¤æ³¨  from device d left join accuracy a on d.id=a.id   where uploadFlag=0" > /tmp/oid_list.csv
sqlite3 /work/iot_cfg.db "SELECT     name as è®¾å¤åç§°, '1.3.6.1.4.1.27116.'||id||'.3' as OID, id as è®¾å¤ID, type as è®¾å¤ç±»å, 3 as ééå· , 'ç¶æ' as æ°æ®åç§°, '0-æ£å¸¸;1-åè¦' as å¤æ³¨  FROM ioDevice ;" >> /tmp/oid_list.csv

sed -i 's/|/,/g' /tmp/oid_list.csv


 local/bin/snmp_cfg

Binary files differ

 local/bin/snmp_val.sh

@@ -5,7 +5,7 @@

# è·åä¼ å¥ç OID
OID="$1"
jsoner=/usr/sbin/jsoner
jsoner=./jsoner

#echo "èæ¬è¢«è°ç¨, OID: $OID"
chn=${OID##*.}
@@ -23,11 +23,11 @@

if [ $ret -eq 0 ]
then 
    RESPONSE="{\"type\": \"OctetString\", \"value\": \"$val\" }"
    RESPONSE="{\"dataType\": \"OctetString\", \"value\": \"$val\" }"
    echo "$RESPONSE"

else 
    # é»è®¤è¿å
    RESPONSE="{\"type\": \"OctetString\", \"value\": \"noData\"}"
    RESPONSE="{\"dataType\": \"OctetString\", \"value\": \"noData\"}"
    echo "$RESPONSE"
fi

 local/www/cgi-bin/snmp/query_oid

¶Ô±ÈÐÂÎÄ¼þ
@@ -0,0 +1,41 @@
#!/bin/sh
#SNMPæ¨¡ç»ç¶ææ¥è¯¢
export PATH=/sbin:/usr/sbin:$PATH
echo -en "Content-type: text/html; charset=utf-8\n\n"
#*****************************************************
source ../bin/env.sh
db="../bin/db"

file="/tmp/oid_list.csv"

/usr/local/bin/export.sh  >> /dev/null

awk -F ',' '
BEGIN {
    print "["
}
NR > 1 && $0 != "" {  # è·³è¿é¦è¡æ é¢ï¼å¦æï¼åç©ºè¡
    printf "  {\n"
    printf "    \"device\": \"%s\",\n", $1
    printf "    \"oid\": \"%s\",\n", $2
    printf "    \"index1\": %d,\n", $3
    printf "    \"type\": %d,\n", $4
    printf "    \"index2\": %d,\n", $5
    printf "    \"param\": \"%s\"", $6
    # å¤çåä½åæ®µï¼ç¬¬6åï¼
    if (NF >= 7 && $7 != "") {
        printf ",\n    \"unit\": \"%s\"\n", $7
    } else {
        printf "\n"
    }
    # å¤ææ¯å¦ä¸ºæåä¸è¡
    if (NR == last_line) {
        printf "  }\n"
    } else {
        printf "  },\n"
    }
}
END {
    print "]"
}
' last_line=$(wc -l < $file) $file

 local/www/sys-snmp-conf.html

@@ -25,12 +25,33 @@
        .btns button{
            width: 120px;
        }

        @media only screen and (max-width:1080px) and (max-height: 1920px){

            .i-container {

                min-width: 750px;

                height: 100%;

                overflow-y: scroll;

            }

            /** éèåè¡¨ä¸ææ»å¨æ¡ **/

            .div-body::-webkit-scrollbar {

                display: none;

            }

            /*IE 10+ ----éèæ»å¨æ¡*/

            .div-body {

                -ms-overflow-style: none;

            }

            /*Firefox ----éèæ»å¨æ¡*/

            .div-body {

                scrollbar-width: none;

            }

            .pdgxq-m1-left{

                height: 1400px;

            }

        }

    </style>
</head>

<body class="pdgxq-body">
    <div class="i-container">
    <div class="i-container div-body">

        <div class="jmkt-main">
            <div class="layui-fluid">
                <div class="pdgxq-m1 layui-row layui-col-space20">
@@ -42,7 +63,7 @@

                                    <div class="layui-col-md4">
                                        <div class="layui-inline" style="margin-left: -16%">
                                            <label class="layui-form-label">SNMPåè½ï¼</label>
                                            <label class="layui-form-label">SNMPæ¨¡ç»ï¼</label>

                                            <div class="layui-input-block">
                                                <input type="checkbox" id="enable" name="enable" lay-skin="switch"
                                                       lay-filter="switch" lay-text="å¯ç¨|åç¨">
@@ -105,6 +126,11 @@
    <script type="text/javascript" src="js/jquery.min.js"></script>
    <script src="plugins/layui/layui.js"></script>
    <script src="js/constant.js"></script>


    <script src="plugins/external/jszip.min.js"></script>

    <script src="plugins/external/FileSaver.js"></script>

    <script src="plugins/external/excel-gen.js"></script>



    <script type="text/javascript">

        var layer;// å®ä¹å¨å±åé
@@ -146,8 +172,7 @@
            var obj = {"enable":enable};
            $.post("./cgi-bin/snmp/enable", JSON.stringify(obj), function (data, status) {
                if (data.code == "success") {
                    //window.parent.parent.notify("æ°æ®ä¿åæå");
                    window.parent.parent.notify("SNMPæ¨¡ç»ç¶æä¿åæå");
                    window.parent.parent.notify("æ°æ®ä¿åæå");

                } else {
                    window.parent.parent.notify("æ°æ®ä¿ååºéï¼è¯·éæ°æä½ï¼"+data.msg+"ï¼");
                }
@@ -157,34 +182,70 @@
        //å¯¼åº
        function downLoadF() {
            $.ajaxSettings.async = false;
            $.get("./cgi-bin/snmp/download", function (data, status) {
                if ("success" == data.code) {
                    downLoadF2();
                }else{
                    window.parent.parent.notify("çæoidè¡¨åºé");
                }
            $.get("./cgi-bin/snmp/query_oid", function (data, status) {

                renderHtml(data);

                // if ("success" == data.code) {

                //     renderHtml(data);

                // }else{

                //     window.parent.parent.notify("çæoidè¡¨åºé");

                // }

            }, "json");
        }
        
        function downLoadF2() {
            var fileName = "oid_list.csv";
            var url = "./cgi-bin/download/download.cgi?filename=/tmp/oid_list.csv";
        function renderHtml(data) {

            console.log(data);


            // å¯¹äº<a>æ ç¾ï¼åªæ Firefox å Chromeï¼åæ ¸ï¼ æ¯æ download å±æ§
            if ('download' in document.createElement('a')) { // æ¯æaæ ç¾downloadçæµè§å¨
                var link = document.createElement('a'); // åå»ºaæ ç¾
                link.download = fileName;// aæ ç¾æ·»å å±æ§
                link.style.display = 'none';
                // link.href = URL.createObjectURL(blob);
                link.href = url;
                document.body.appendChild(link);
                link.click(); // æ§è¡ä¸è½½
                URL.revokeObjectURL(link.href); // éæ¾url
                document.body.removeChild(link); // éæ¾æ ç¾
            } else { // å¶ä»æµè§å¨
                navigator.msSaveBlob(url, fileName);


            var thead = "";

            thead += "<thead><tr>";

            thead += "<th>è®¾å¤åç§°</th>";

            thead += "<th>OID</th>";

            thead += "<th>è®¾å¤ID</th>";

            thead += "<th>è®¾å¤ç±»å</th>";

            thead += "<th>ééå·</th>";

            thead += "<th>æ°æ®åç§°</th>";

            thead += "<th>å¤æ³¨</th>";

            thead += "</tr></thead>";



            var tbody = "";

            if (data != null && data.length > 0) {

                $.each(data, function (index, item) {

                    tbody += "<tr><td>" + item.device + "</td>";

                    tbody += "<td>" + item.oid + "</td>";

                    tbody += "<td>" + item.index1 + "</td>";

                    tbody += "<td>" + item.type + "</td>";

                    tbody += "<td>" + item.index2 + "</td>";

                    tbody += "<td>" + item.param + "</td>";

                    tbody += "<td>" + (item.unit ?? "") + "</td></tr>";

                });

            }else {

                tbody += '<tr><td colspan="8">ææªåå»ºè®¾å¤</td></tr>';

            }
            var html = thead + tbody;



            tableToExcel(html);

        }




        function tableToExcel(html) {

            var name = "åè¦è®°å½";

            var uri = 'data:application/vnd.ms-excel;base64,';

            var template = '<html><head><meta charset="UTF-8"></head><body><table border="1">{table}</table></body></html>';



            if(!html){

                layer.msg("æ²¡æè·åå°è¦å¯¼åºçåå®¹ï¼");

            }



            var ctx = {worksheet: name || 'Worksheet', table: html};

            window.location.href = uri + base64(format(template, ctx))

        }

        function format(s, c) {

            return s.replace(/{(\w+)}/g,function(m, p) { return c[p]; });

        }



        function base64(s) {

            return window.btoa(unescape(encodeURIComponent(s)))

};

    </script>
</body>
</html>

			@@ -1,7 +1,7 @@
			#!/bin/sh

			sqlite3 /work/iot_cfg.db ".headers on " "select d.name as è®¾å¤åç§°,'1.3.6.1.4.1.27116.'\|\|d.id\|\|'.'\|\|a.passcode as OID, d.id as è®¾å¤ID, a.passcode as ééå·, a.name as æ°æ®åç§°,a.note as å¤æ³¨ from device d left join accuracy a on d.id=a.id where uploadFlag=0" > /tmp/oid_list.csv
			sqlite3 /work/iot_cfg.db "SELECT name as è®¾å¤åç§°, '1.3.6.1.4.1.27116.'\|\|id\|\|'.3' as OID, id as è®¾å¤ID, 3 as ééå· , 'ç¶æ' as æ°æ®åç§°, '0-æ£å¸¸;1-åè¦' as å¤æ³¨ FROM ioDevice ;" >> /tmp/oid_list.csv
			sqlite3 /work/iot_cfg.db ".headers on " "select d.name as è®¾å¤åç§°,'1.3.6.1.4.1.27116.'\|\|d.id\|\|'.'\|\|a.passcode as OID, d.id as è®¾å¤ID, d.type as è®¾å¤ç±»å, a.passcode as ééå·, a.name as æ°æ®åç§°,a.note as å¤æ³¨ from device d left join accuracy a on d.id=a.id where uploadFlag=0" > /tmp/oid_list.csv
			sqlite3 /work/iot_cfg.db "SELECT name as è®¾å¤åç§°, '1.3.6.1.4.1.27116.'\|\|id\|\|'.3' as OID, id as è®¾å¤ID, type as è®¾å¤ç±»å, 3 as ééå· , 'ç¶æ' as æ°æ®åç§°, '0-æ£å¸¸;1-åè¦' as å¤æ³¨ FROM ioDevice ;" >> /tmp/oid_list.csv

			sed -i 's/\|/,/g' /tmp/oid_list.csv

			@@ -5,7 +5,7 @@

			# è·åä¼ å¥ç OID
			OID="$1"
			jsoner=/usr/sbin/jsoner
			jsoner=./jsoner

			#echo "èæ¬è¢«è°ç¨, OID: $OID"
			chn=${OID##*.}
			@@ -23,11 +23,11 @@

			if [ $ret -eq 0 ]
			then
			RESPONSE="{\"type\": \"OctetString\", \"value\": \"$val\" }"
			RESPONSE="{\"dataType\": \"OctetString\", \"value\": \"$val\" }"
			echo "$RESPONSE"

			else
			# é»è®¤è¿å
			RESPONSE="{\"type\": \"OctetString\", \"value\": \"noData\"}"
			RESPONSE="{\"dataType\": \"OctetString\", \"value\": \"noData\"}"
			echo "$RESPONSE"
			fi

¶Ô±ÈÐÂÎÄ¼þ
			@@ -0,0 +1,41 @@
			#!/bin/sh
			#SNMPæ¨¡ç»ç¶ææ¥è¯¢
			export PATH=/sbin:/usr/sbin:$PATH
			echo -en "Content-type: text/html; charset=utf-8\n\n"
			#*****************************************************
			source ../bin/env.sh
			db="../bin/db"

			file="/tmp/oid_list.csv"

			/usr/local/bin/export.sh >> /dev/null

			awk -F ',' '
			BEGIN {
			print "["
			}
			NR > 1 && $0 != "" { # è·³è¿é¦è¡æ é¢ï¼å¦æï¼åç©ºè¡
			printf " {\n"
			printf " \"device\": \"%s\",\n", $1
			printf " \"oid\": \"%s\",\n", $2
			printf " \"index1\": %d,\n", $3
			printf " \"type\": %d,\n", $4
			printf " \"index2\": %d,\n", $5
			printf " \"param\": \"%s\"", $6
			# å¤çåä½åæ®µï¼ç¬¬6åï¼
			if (NF >= 7 && $7 != "") {
			printf ",\n \"unit\": \"%s\"\n", $7
			} else {
			printf "\n"
			}
			# å¤ææ¯å¦ä¸ºæåä¸è¡
			if (NR == last_line) {
			printf " }\n"
			} else {
			printf " },\n"
			}
			}
			END {
			print "]"
			}
			' last_line=$(wc -l < $file) $file

			@@ -25,12 +25,33 @@
			.btns button{
			width: 120px;
			}

			@media only screen and (max-width:1080px) and (max-height: 1920px){
			.i-container {
			min-width: 750px;
			height: 100%;
			overflow-y: scroll;
			}
			/ éèåè¡¨ä¸ææ»å¨æ¡ /
			.div-body::-webkit-scrollbar {
			display: none;
			}
			/IE 10+ ----éèæ»å¨æ¡/
			.div-body {
			-ms-overflow-style: none;
			}
			/Firefox ----éèæ»å¨æ¡/
			.div-body {
			scrollbar-width: none;
			}
			.pdgxq-m1-left{
			height: 1400px;
			}
			}
			</style>
			</head>

			<body class="pdgxq-body">
			<div class="i-container">
			<div class="i-container div-body">
			<div class="jmkt-main">
			<div class="layui-fluid">
			<div class="pdgxq-m1 layui-row layui-col-space20">
			@@ -42,7 +63,7 @@

			<div class="layui-col-md4">
			<div class="layui-inline" style="margin-left: -16%">
			<label class="layui-form-label">SNMPåè½ï¼</label>
			<label class="layui-form-label">SNMPæ¨¡ç»ï¼</label>
			<div class="layui-input-block">
			<input type="checkbox" id="enable" name="enable" lay-skin="switch"
			lay-filter="switch" lay-text="å¯ç¨\|åç¨">
			@@ -105,6 +126,11 @@
			<script type="text/javascript" src="js/jquery.min.js"></script>
			<script src="plugins/layui/layui.js"></script>
			<script src="js/constant.js"></script>

			<script src="plugins/external/jszip.min.js"></script>
			<script src="plugins/external/FileSaver.js"></script>
			<script src="plugins/external/excel-gen.js"></script>

			<script type="text/javascript">

			var layer;// å®ä¹å¨å±åé
			@@ -146,8 +172,7 @@
			var obj = {"enable":enable};
			$.post("./cgi-bin/snmp/enable", JSON.stringify(obj), function (data, status) {
			if (data.code == "success") {
			//window.parent.parent.notify("æ°æ®ä¿åæå");
			window.parent.parent.notify("SNMPæ¨¡ç»ç¶æä¿åæå");
			window.parent.parent.notify("æ°æ®ä¿åæå");
			} else {
			window.parent.parent.notify("æ°æ®ä¿ååºéï¼è¯·éæ°æä½ï¼"+data.msg+"ï¼");
			}
			@@ -157,34 +182,70 @@
			//å¯¼åº
			function downLoadF() {
			$.ajaxSettings.async = false;
			$.get("./cgi-bin/snmp/download", function (data, status) {
			if ("success" == data.code) {
			downLoadF2();
			}else{
			window.parent.parent.notify("çæoidè¡¨åºé");
			}
			$.get("./cgi-bin/snmp/query_oid", function (data, status) {
			renderHtml(data);
			// if ("success" == data.code) {
			// renderHtml(data);
			// }else{
			// window.parent.parent.notify("çæoidè¡¨åºé");
			// }
			}, "json");
			}

			function downLoadF2() {
			var fileName = "oid_list.csv";
			var url = "./cgi-bin/download/download.cgi?filename=/tmp/oid_list.csv";
			function renderHtml(data) {
			console.log(data);

			// å¯¹äº<a>æ ç¾ï¼åªæ Firefox å Chromeï¼åæ ¸ï¼ æ¯æ download å±æ§
			if ('download' in document.createElement('a')) { // æ¯æaæ ç¾downloadçæµè§å¨
			var link = document.createElement('a'); // åå»ºaæ ç¾
			link.download = fileName;// aæ ç¾æ·»å å±æ§
			link.style.display = 'none';
			// link.href = URL.createObjectURL(blob);
			link.href = url;
			document.body.appendChild(link);
			link.click(); // æ§è¡ä¸è½½
			URL.revokeObjectURL(link.href); // éæ¾url
			document.body.removeChild(link); // éæ¾æ ç¾
			} else { // å¶ä»æµè§å¨
			navigator.msSaveBlob(url, fileName);

			var thead = "";
			thead += "<thead><tr>";
			thead += "<th>è®¾å¤åç§°</th>";
			thead += "<th>OID</th>";
			thead += "<th>è®¾å¤ID</th>";
			thead += "<th>è®¾å¤ç±»å</th>";
			thead += "<th>ééå·</th>";
			thead += "<th>æ°æ®åç§°</th>";
			thead += "<th>å¤æ³¨</th>";
			thead += "</tr></thead>";

			var tbody = "";
			if (data != null && data.length > 0) {
			$.each(data, function (index, item) {
			tbody += "<tr><td>" + item.device + "</td>";
			tbody += "<td>" + item.oid + "</td>";
			tbody += "<td>" + item.index1 + "</td>";
			tbody += "<td>" + item.type + "</td>";
			tbody += "<td>" + item.index2 + "</td>";
			tbody += "<td>" + item.param + "</td>";
			tbody += "<td>" + (item.unit ?? "") + "</td></tr>";
			});
			}else {
			tbody += '<tr><td colspan="8">ææªåå»ºè®¾å¤</td></tr>';
			}
			var html = thead + tbody;

			tableToExcel(html);
			}


			function tableToExcel(html) {
			var name = "åè¦è®°å½";
			var uri = 'data:application/vnd.ms-excel;base64,';
			var template = '<html><head><meta charset="UTF-8"></head><body><table border="1">{table}</table></body></html>';

			if(!html){
			layer.msg("æ²¡æè·åå°è¦å¯¼åºçåå®¹ï¼");
			}

			var ctx = {worksheet: name \|\| 'Worksheet', table: html};
			window.location.href = uri + base64(format(template, ctx))
			}
			function format(s, c) {
			return s.replace(/{(\w+)}/g,function(m, p) { return c[p]; });
			}

			function base64(s) {
			return window.btoa(unescape(encodeURIComponent(s)))
			};
			</script>
			</body>
			</html>