1.修改启动脚本，增加crond启动相关的目录配置

lgq

2025-11-18 956f10584a109456c1bb8c72c9a4e02494812c03

1.修改启动脚本，增加crond启动相关的目录配置

 local/app/MainControl

Binary files differ

 local/app/NetModule

Binary files differ

 local/app/svr

Binary files differ

 local/bin/db

Binary files differ

 local/bin/export.sh

@@ -9,4 +9,4 @@

/usr/local/bin/snmp_cfg -f /work/snmp.json /tmp/oid_list.csv

jsoner -s /work/snmp.json script_handler \"/usr/local/bin/getval\"
jsoner -s /work/snmp.json script_handler \"/usr/local/bin/getval\"

 local/bin/getval

Binary files differ

 local/bin/msg

Binary files differ

 local/default/app.ini

@@ -9,6 +9,5 @@
mul=MulticastIP
lk=linkage
rtsp=rtsp
dp=display
export applist=" $main $dc $net $gate $svr  $mul $dp"
export applist=" $main $dc $net $gate $svr $lk"


 local/default/snmp.json

@@ -1,5 +1,5 @@
{

    "script_handler": "/usr/local/bin/snmp_val.sh",

    "script_handler": "/usr/local/bin/getval",

    "oids": [

        {

            "oid": "1.3.6.1.4.1.71116.1.1",

@@ -26,4 +26,4 @@
            "description": "hum"

        }

    ]

}
}


 local/init.sh

@@ -47,7 +47,6 @@
then
sh $startScript &
fi

#----------------------------------------------------
echo "set eth ..."
/usr/sbin/set_net
@@ -58,6 +57,9 @@
#----------------------------------------------------

#启动crontab服务
rm /var/spool
ln -s /usr/local/spool /var/spool 

/usr/sbin/crond 

#sys off time 

 local/userlib/libfz_ivg.so

Binary files differ

 local/userlib/libivg_2.so

Binary files differ

 local/version

@@ -1,3 +1,3 @@
2025-07-18-v001
2025-11-18-v001
type=1
IGD5300

 local/www/cgi-bin/device-ctrl/reboot-device

@@ -6,7 +6,7 @@

echo "{\"code\": \"success\"}"
pontime=`date  '+%Y-%m-%d %H:%M:%S: '`
echo "$pontime web页面手动重启" > /work/data/power.log
echo "$pontime web页面手动重启" >> /work/data/power.log

result=`/usr/local/script/backup_cfg.sh`


 local/www/cgi-bin/device-ctrl/reboot-service

@@ -6,7 +6,7 @@

echo "{\"code\": \"success\"}"
pontime=`date  '+%Y-%m-%d %H:%M:%S: '`
echo "$pontime web页面手动重启主程序" > /work/data/power.log
echo "$pontime web页面手动重启主程序" >> /work/data/power.log

#result=`/usr/local/script/backup_cfg.sh`
killall -9 MainControl

 local/www/cgi-bin/device/add-note

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
#!/bin/sh

# ä¿å­˜è½¬ä¹‰ä¸­é—´è¡¨

echo -en "Content-type: text/html; charset=utf-8\n\n"

#*****************************************************

source ../bin/env.sh

db="../bin/db"



read data

content=`$db add_note "$data"`

echo $content



#echo " add db common device : $data" > log

#echo " add result : $content" >> log

 



 local/www/cgi-bin/device/batch-note

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
#!/bin/sh

# æ‰¹é‡é…ç½®è®¾å¤‡è½¬ä¹‰ä¿¡æ¯

#

echo -en "Content-type: text/html; charset=utf-8\n\n"

#*****************************************************

source ../bin/env.sh

db="../bin/db"

jsoner="../bin/jsoner"

msg="../bin/msg"

dbFile="/work/iot_cfg.db"





read content

 
#echo $content > log



startChn=`$jsoner $content passcode0`

if [ $? -ne 0 ]

then

    echo "{\"code\": \"error\"}" 
    exit

fi

endChn=`$jsoner $content passcode1`

if [ $? -ne 0 ]

then

    echo "{\"code\": \"error\"}" 
    exit

fi



ids=`$jsoner $content devIds`

if [ $? -ne 0 ]

then

    echo "{\"code\": \"error\"}" 
fi





dictType=`$jsoner $content dictType`

if [ $? -eq 0 ]

then

    sqlite3 $dbFile "update escape set dictType=$dictType where id in ($ids) and passcode>=$startChn and passcode<=$endChn"

    if [ $? -ne 0 ]

    then

        echo "{\"code\": \"error\"}"

        echo "dictType exec error " >> log

        exit

    fi

fi



echo "{\"code\": \"success\"}"




 local/www/cgi-bin/device/query-note

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
#!/bin/sh

# æŸ¥è¯¢-转义中间表

echo -en "Content-type: text/html; charset=utf-8\n\n"

#*****************************************************

source ../bin/env.sh



db="../bin/db"





content=`$db query_note`

if [ $? -eq 0 ]

then

    echo "$content"

else

    echo "[]"

fi



#echo "query_all: $content" > log

 



 local/www/cgi-bin/note/query

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
#!/bin/sh

# æŸ¥è¯¢æ‰€æœ‰è½¬ä¹‰å­—典信息

#

file="/work/escape.json"



cat $file

 local/www/cgi-bin/note/save

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
#!/bin/sh

# ä¿å­˜æ‰€æœ‰è½¬ä¹‰å­—典信息

#

file="/work/escape.json"



read data

echo $data > $file

 local/www/cgi-bin/sys-set/systemSpace

@@ -1,5 +1,5 @@
#!/bin/sh
# ä¿å­˜ä¸²å£è®¾å¤‡ä¿¡æ¯
# è¾“出存储信息
echo -en "Content-type: text/html; charset=utf-8\n\n"
#*****************************************************
source ../bin/env.sh
@@ -31,7 +31,8 @@

if [[ "$used_unit" = "G" ]]
then
    used_value=$(echo "$used_value * 1024" | bc)
    # ä½¿ç”¨awk替代bc进行乘法计算，%g自动处理小数位
    used_value=$(awk -v val="$used_value" 'BEGIN{printf "%g", val * 1024}')
    used_unit="M"
    used="$used_value$used_unit"
fi
@@ -44,7 +45,8 @@

if [[ "$available_unit" = "G" ]]
then
    available_value=$(echo "$available_value * 1024" | bc)
    # ä½¿ç”¨awk替代bc进行乘法计算
    available_value=$(awk -v val="$available_value" 'BEGIN{printf "%g", val * 1024}')
    available_unit="M"
    available="$available_value$available_unit"
fi
@@ -55,17 +57,15 @@
    exit 1
fi

# è®¡ç®— Size å­—段的值
size_value=$(echo "$used_value + $available_value" | bc)
# è®¡ç®— Size å­—段的值（使用awk替代bc加法）
size_value=$(awk -v u="$used_value" -v a="$available_value" 'BEGIN{printf "%g", u + a}')
size="${size_value}${used_unit}"  # ä¿ç•™å•ä½

# è®¡ç®— Use% å­—段的值
use_percent_value=$(echo "scale=2; $used_value / $size_value * 100" | bc)
# è®¡ç®— Use% å­—段的值（使用awk替代bc除法和乘法，保留两位小数）
use_percent_value=$(awk -v u="$used_value" -v s="$size_value" 'BEGIN{printf "%.2f", (u / s) * 100}')
use_percent="${use_percent_value}%"



# è¾“出解析结果
echo "{\"size\":\"$size\",\"used\":\"$used\",\"available\":\"$available\",\"use%\":\"$use_percent\"}"


echo "{\"size\":\"$size\",\"used\":\"$used\",\"available\":\"$available\",\"use%\":\"$use_percent\"}"

 local/www/cgi-bin/upload/upload.cgi

Binary files differ

 local/www/detail-dcz.html

@@ -35,7 +35,7 @@
                            <div class="pdgxq-group-item jmkt-yichuli">

                                <span id="conState">正常</span>通讯状态

                            </div>

                            <div class="pdgxq-group-item" style="width: 200px;">

                            <div class="pdgxq-group-item paixu" style="width: 200px;">

                                <select lay-ignore="" class="layui-input" id="sort-value">

                                    <option value="all" selected>默认排序</option>

                                    <option value="u1">按电压升序</option>

@@ -547,7 +547,8 @@
        }

        // console.log(tag);

        // console.log(batteryList);

        renderData(list,batteryList,tag);

        // renderData(list,batteryList,tag);

        renderData2(list,batteryList,tag);

    }



    function renderData(list,batteryList,tag) {


 local/www/detail-jmkt.html

@@ -473,36 +473,22 @@


    function renderValue(type,item) {

        var result = item.value;

        // if(type == "2002" || type == "2020" || type == "2022"){

        //     if(item.passcode >= 8 && item.passcode <= 998){

        //         result = (item.value=="0"?"正常":"告警");

        //         if(item.passcode == 16){

        //             if(item.value=="0"){

        //                 result = "送风";

        //             }

        //             if(item.value=="1"){

        //                 result = "制热";

        //             }

        //             if(item.value=="2"){

        //                 result = "制冷";

        //             }

        //             // result = (item.value=="0"?"关闭":"开启");

        //         }

        //     }

        // }

        if(type == "2002" || type == "2020" || type == "2022"){

            if(item.passcode >= 13 && item.passcode <= 100){

                result = (item.value=="0"?"正常":"告警");

            }

        }



        var str = "";

        if(item.note && item.note.length > 0){

            str += item.note;

        }else{

            str += item.value;

            str += result;

        }

        if(item.unit && item.unit.length > 0){

            str += " " + item.unit;

        }

        result = str;



        return result;

        return str;

    }






 local/www/detail-ups.html

@@ -203,7 +203,7 @@
                    }

                    html += "<tr><td>"+cur.name+"</td><td>"+str+"</td><td>"+time+"</td></tr>";

                }else{

                    html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur.passcode,cur.value)+"</td><td>"+time+"</td></tr>";

                    html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur)+"</td><td>"+time+"</td></tr>";





                    //渲染列表

@@ -284,7 +284,7 @@
                    }

                    html += "<tr><td>"+cur.name+"</td><td>"+str+"</td><td>"+time+"</td></tr>";

                }else{

                    html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur.passcode,cur.value)+"</td><td>"+time+"</td></tr>";

                    html += "<tr><td>"+cur.name+"</td><td>"+renderValue(device.id,device.type,cur)+"</td><td>"+time+"</td></tr>";



                    //渲染列表

                    // html += "<tr><td>"+cur.name+"</td><td>"+(cur.value?cur.value:"")+"</td><td>"+time+"</td></tr>";

@@ -357,8 +357,8 @@
        }

    }



    function renderValue(id,type,code,value) {

        var res = value;

    function renderValue(id,type,cur) {

        var res = cur.value;



        // if(type == "1001"){

        //     if(code == 3 || code == 5){


 local/www/detail-video.html

@@ -33,7 +33,7 @@
</head>



<body class="pdgxq-body">

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

<div class="i-container">



    <div class="jmkt-main">

        <div class="layui-fluid">

@@ -43,65 +43,46 @@
                        <div class="pdgxq-H">

                            <h3><i></i>监控信息</h3>



<!--                            <div class="sp-tab-hd">-->

<!--                                <select id="select_type" class="videoType">-->

<!--                                    <option value="IN">VLC内网播放</option>-->

<!--                                    <option value="OUT">VLC外网播放</option>-->

<!--                                    <option value="WEB">Web直播访问</option>-->

<!--                                </select>-->

<!--                                <span><img src="./images/sp-tabImg2.png"/></span>-->

<!--                                <span class="active"><img src="./images/sp-tabImg1.png"/></span>-->

<!--                            </div>-->

                            <div class="sp-tab-hd">

                                <select id="select_type" class="videoType">

                                    <option value="IN">VLC内网播放</option>

                                    <option value="OUT">VLC外网播放</option>

                                    <option value="WEB">Web直播访问</option>

                                </select>

                                <span><img src="./images/sp-tabImg2.png"/></span>

                                <span class="active"><img src="./images/sp-tabImg1.png"/></span>

                            </div>

                        </div>

                        <div class="sp-tab-bd">

                            <div class="sp-showBox layui-row ">

                                <div class="layui-col-lg4 layui-col-md4">

                            <div class="sp-showBox layui-row">

                                <div class="layui-col-lg6 layui-col-md6">

                                    <div id="video1" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

<!--                                        <iframe id="myPlayer1" width="100%" height="100%"style="border-radius: 5px;"-->

<!--                                                src="http://127.0.0.1:8083/stream/player/摄像机1" ></iframe>-->

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                <div class="layui-col-lg6 layui-col-md6">

                                    <div id="video2" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

<!--                                        <iframe id="myPlayer2" width="100%" height="100%"style="border-radius: 5px;"-->

<!--                                                src="http://127.0.0.1:8083/stream/player/摄像机2" ></iframe>-->

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                <div class="layui-col-lg6 layui-col-md6">

                                    <div id="video3" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

<!--                                        <iframe id="myPlayer3" width="100%" height="100%"style="border-radius: 5px;"-->

<!--                                                src="http://127.0.0.1:8083/stream/player/摄像机3" ></iframe>-->

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                <div class="layui-col-lg6 layui-col-md6">

                                    <div id="video4" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

<!--                                        <iframe id="myPlayer4" width="100%" height="100%"style="border-radius: 5px;"-->

<!--                                                src="http://127.0.0.1:8083/stream/player/摄像机4" ></iframe>-->

                                    </div>

                                </div>



                                <div class="layui-col-lg4 layui-col-md4">

                                    <div id="video5" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                    <div id="video6" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                    <div id="video7" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                    <div id="video8" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

                                    </div>

                                </div>

                                <div class="layui-col-lg4 layui-col-md4">

                                    <div id="video9" class="sp-showItem ">

                                        <img src="./images/sp-img.png" class="sp-hideImg"/>

                                    </div>

                                </div>



                            </div>



                            <div class="sp-showBox layui-row show">

@@ -218,7 +199,7 @@
<script src="./plugins/layui/layui.js"></script>

<script src="./js/constant.js"></script>

<script src="./plugins/EZUIKit/ezuikit.js"></script>

<script src="./js/page/detail-video-dkkj.js"></script>

<script src="./js/page/detail-video.js"></script>



</body>




 local/www/detail-yg.html

@@ -152,6 +152,9 @@
                    if (item.passcode == 1) {

                        if (item.value == "0") {  //正常

                            html1 += '<td>正常</td>';

                            if(!conTag){

                                conTag = true;

                            }

                        } else {    //异常

                            html1 += '<td>异常</td>';

                            tag1 = false;

@@ -164,6 +167,9 @@
                    if (item.passcode == 2) {

                        if (item.value == "0") {  //正常

                            html1 += '<td>正常</td>';

                            if(!warnTag){

                                warnTag = true;

                            }

                        } else {    //异常

                            html1 += '<td>报警</td>';

                            tag2 = false;


 local/www/device-common.html

@@ -137,7 +137,7 @@
                        <label class="layui-form-label">设备ID</label>

                        <div class="layui-input-block">

                            <input type="text" id="device-id" name="id" class="layui-input pop-input"

                                   placeholder="请输入：0~999">

                                   placeholder="请输入：1~999">

                        </div>

                    </div>

                </div>


 local/www/js/page/detail-yg-hw-ls.js

@@ -27,12 +27,15 @@
    var dataList = new Array();

    //遍历同类型设备集合，根据id查询数据后保存

    for (var i = 0; i < deviceList.length; i++) {

        $.post("./cgi-bin/detail/query-data", JSON.stringify({id: deviceList[i].id}), function (data, status) {

            if ("success" == status) {

                console.log(data);

                dataList.push(data);

            }

        }, "json");

        var cur = deviceList[i];

        if(cur.vld != 1){

            $.post("./cgi-bin/detail/query-data", JSON.stringify({id: deviceList[i].id}), function (data, status) {

                if ("success" == status) {

                    console.log(data);

                    dataList.push(data);

                }

            }, "json");

        }

    }

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

        renderInfo(dataList);


 local/www/js/page/device-common.js

@@ -286,11 +286,11 @@
    }
    var r = /^\d{1,3}$/;
    if(!r.test(data.id)){
        window.parent.notify("您输入的ID不符合要求！设备ID设置范围为0~999的正整数！");
        window.parent.notify("您输入的ID不符合要求！设备ID设置范围为1~999的正整数！");
        return;
    }
    if (data.id<0 || data.id>999) {
        window.parent.notify("设备ID设置范围为0~999！");
    if (data.id<1 || data.id>999) {
        window.parent.notify("设备ID设置范围为1~999！");
        return;
    }
    if (valueList.length == 0) {

 local/www/js/page/single/single.js

@@ -152,7 +152,7 @@
    sysStart = sysStart.substring(0, 4) + "-" + sysStart.substring(4, 6) + "-" + sysStart.substring(6, 8) + " 00:00:00";

    // è®¾ç½®ä¸»ç•Œé¢çš„标题screenName
    $("#main-title span").text(screenName);
    $("#main-title").text(screenName);
    // è®¾ç½®ä¸»ç•Œé¢çš„标语screenSlogan
    $("#main-slogan").text(screenSlogan);
    // åˆå§‹åŒ–运行天数

 local/www/js/page/sys-port.js

@@ -94,6 +94,7 @@
    html += '<option value="9600">9600</option>';

    html += '<option value="4800">4800</option>';

    html += '<option value="2400">2400</option>';

    html += '<option value="1200">1200</option>';

    html += '</select>';

    html += '</td>';

    html += '<td>';


 local/www/sys-port.html

@@ -104,6 +104,7 @@
                                            <option value="9600" selected>9600</option>

                                            <option value="4800">4800</option>

                                            <option value="2400">2400</option>

                                            <option value="1200">1200</option>

                                        </select>

                                    </td>

                                    <td>


 upgrade/app.tgz

Binary files differ