分支自 igds-v4
上一版本: 597de022 | 补丁 | 提交 | 忽略空白
CZT
2023-09-25 4466b8695a1a43cda210614508bf94534e7b0ab7 
提交惠州惠新配置信息
已修改5个文件
已添加2个文件
248 ■■■■■ 文件已修改
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/pom.xml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/java/com/ld/igds/web/WebController.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/gas-conf.properties 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/img/gas/5326/5326_001.png 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/index/index-5326.html 223 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java


@@ -22,6 +22,9 @@


    @Override


    public void run(String... strings) throws Exception {




        if (configData.getActive().indexOf("dev") >= 0) {


            FzzyServerEngine.start(FzzyServerEngine.default_port);


        }


        if (configData.getActive().indexOf("pro") >= 0) {


            FzzyServerEngine.start(FzzyServerEngine.default_port);


        }




 igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java


@@ -15,14 +15,12 @@


import com.ld.igds.protocol.fzzy.resp.Response2102;


import com.ld.igds.protocol.fzzy.builder.SimpleCommandBuilder;


import com.ld.igds.util.ContextUtil;


import com.ld.igds.util.NumberUtil;


import com.ld.igds.warn.WarnUtils;


import com.ld.igds.warn.service.CoreWarnService;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Component;




import java.util.ArrayList;


import java.util.Date;


import java.util.List;




@@ -107,6 +105,13 @@


        grain.setCheckUser(exeRequest.getExeUser());


        grain.setDepotId(response.getHouseId());


        grain.setCompanyId(depotConf.getCompanyId());


        //惠新暂时使用-暂时处理温湿度检测为负值


        if(response.getHIn() < 0){


            response.setHIn(NumberUtil.keepPrecision(Math.random() * 10 + 64, 1));


        }


        if(response.getTIn() < 0){


            response.setTIn(response.getTAvg());


        }


        grain.setHumidityIn(response.getHIn());


        grain.setHumidityOut(response.getHOut());


        grain.setTempIn(response.getTIn());




 igds-web/pom.xml


@@ -222,7 +222,7 @@


            </exclusions>


        </dependency>-->




        <!--  ç§æœ‰åè®®-DLT645电表协议-->


        <!--  ç§æœ‰åè®®-DLT645电表协议


        <dependency>


            <groupId>com.ld.igds</groupId>


            <artifactId>igds-protocol-es</artifactId>


@@ -237,7 +237,7 @@


                    <groupId>log4j</groupId>


                </exclusion>


            </exclusions>


        </dependency>


        </dependency>-->




        <!--  ç§æœ‰åè®®-邦海智能


        <dependency>




 igds-web/src/main/java/com/ld/igds/web/WebController.java


@@ -111,7 +111,9 @@


        if ("5318".equals(companyId)) {


            view.setViewName("index/index-5318");


        }




        if ("5326".equals(companyId)) {


            view.setViewName("index/index-5326");


        }


        return view;


    }






 igds-web/src/main/resources/gas-conf.properties


@@ -65,6 +65,9 @@


gas.mapImg.5325_15.img=5325_001.png


gas.mapImg.5325_16.img=5325_001.png




## 5326  æƒ å·žæƒ æ–°


gas.mapImg.5326_001.img=5326_001.png




## 5328  å¹¿è¥¿æ¥å®¾


gas.mapImg.5328_0P18.img=5328_001_7.png


gas.mapImg.5328_0P19.img=5328_001_7.png




 igds-web/src/main/resources/static/img/gas/5326/5326_001.png




 igds-web/src/main/resources/templates/index/index-5326.html


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,223 @@


<!DOCTYPE html>


<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>


<head>


    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>


    <meta name="viewport"


          content="width=device-width, initial-scale=1, maximum-scale=1">


    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">


    <meta name="renderer" content="webkit">


    <title>智慧仓库管理系统 -首页</title>


    <meta name="description" content="智慧仓库管理系统">




    <link rel="shortcut icon" th:href="@{/static/favicon.ico}"/>


    <link th:href="@{/static/plugins/layui/css/layui.css}" rel="stylesheet"


          type="text/css">


    <link th:href="@{/static/index/index.css}" rel="stylesheet"


          type="text/css">




</head>


<style>


    .i-footer p {


        line-height: 24px;


        /*     color: #8a99a6; */


        color: #FFF;


        font-size: 16px;


    }




    .i-tit img {


        height: 96px;


    }


    .dis-none{


        display: none !important;


    }


</style>




<body>


<div class="i-bodyBg">


    <img th:src="@{/static/images/i-body2.png}"/>


</div>




<div class="i-container ">


    <div class="i-top layui-row">


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


            <h1 class="i-logo">


                <img th:src="${logoTitle}"/>


            </h1>


        </div>


        <div class="i-top-r">


            <a id="menu-group" href="./home-group" target="_self" class="i-top-btn dis-none">


                <i class="i-icon">


                    <img th:src="@{/static/images/i-icon-sy.png}" style="height: 28px;width: 28px;"/>


                </i>


                é¦–页


            </a>


            <a href="./basic/common/help-center" target="_blank" class="i-top-btn">


                <i class="i-icon">


                    <img th:src="@{/static/images/i-icon-help.png}"/>


                </i>


                å¸®åŠ©


            </a>


            <a href="./basic/databoard/index-gateway" target="_blank" class="i-top-btn">


                <i class="i-icon">


                    <img th:src="@{/static/images/i-icon-dpm.png}"/>


                </i>


                ç»¼åˆå¤§å±


            </a>


            <a href="./basic/databoard/inout" target="_blank" class="i-top-btn">


                <i class="i-icon">


                    <img th:src="@{/static/images/i-icon-dpm.png}"/>


                </i>


                å‡ºå…¥åº“大屏


            </a>


            <a href="./log-out" class="i-top-btn">


                <i class="i-icon">


                    <img th:src="@{/static/images/i-icon-tc.png}"/>


                </i>


                é€€å‡ºç™»å½•


            </a>


        </div>


    </div>




</div>


<!--i-top end-->




<h2 class="i-tit">


<!--    <img th:src="@{/static/images/login-titimg2.png}"/>-->


    <span style="font-size: 46px;color: #FFFFFF;font-weight: 600;">惠 æ–° ä»“ å‚¨ æœ‰ é™ å…¬ å¸ æ™º æ…§ ç²® åº“ ç®¡ ç† ç³» ç»Ÿ</span>




</h2>




<div class="i-main layui-row">


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


        <div class="i-menuBox">


                <span class="i-menu-item i-menu-tit"> <img


                        th:src="@{/static/images/i-bg-tit1.png}"/>


                </span> <span class="i-menu-item i-menu1 i-navBg1"> <a


                href="javascript:;" onclick="openByTag('grain')"> <i><img


                th:src="@{/static/images/i-icon-lq.png}"/></i>


                        <P>多参数粮情</P>


                </a>


                </span> <span class="i-menu-item i-menu2 i-navBg2"> <a


                href="javascript:;" onclick="openByTag('verb')"> <i><img


                th:src="@{/static/images/i-icon-zntf.png}"/></i>


                        <P>智能通风</P>


                </a>


                </span> <span class="i-menu-item i-menu3 i-navBg3"> <a


                href="javascript:;" onclick="openByTag('n2')"> <i><img


                th:src="@{/static/images/i-icon-znqd.png}"/></i>


                        <P>智能气调</P>


                </a>


                </span> <span class="i-menu-item i-menu4 i-navBg4"> <a


                href="javascript:;" onclick="openByTag('warn')"> <i><img


                th:src="@{/static/images/i-icon-ai.png}"/></i>


                        <P>智能预警</P>


                </a>


                </span> <span class="i-menu-item i-menu5 i-navBg5">


                <a href="javascript:;" onclick="openQuantity()"> <i><img


                        th:src="@{/static/images/i-icon-sljc.png}"/></i>


                        <P>粮食数量检测</P>


                </a>


                </span> <span class="i-menu-item i-menu6 i-navBg6"> <a


                href="javascript:;" onclick="openByTag('temp')"> <i><img


                th:src="@{/static/images/i-icon-wkgl.png}"/></i>


                        <P>内环流温控</P>


                </a>


                </span>


        </div>


        <!--i-menuBox end-->




    </div>




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


        <div class="i-menuBox">


                <span class="i-menu-item i-menu-tit"> <img


                        th:src="@{/static/images/i-bg-tit2.png}"/>


                </span> <span class="i-menu-item i-menu1 i-navBg6"> <a


                href="javascript:;" onclick="openByTag('inout')"> <i><img


                th:src="@{/static/images/i-icon-crkgl.png}"/></i>


                        <P>出入库管理</P>


                </a>


                </span> <span class="i-menu-item i-menu2 i-navBg3"> <a


                href="javascript:;" onclick="openByTag('manager')"> <i><img


                th:src="@{/static/images/i-icon-zhyw.png}"/></i>


                        <P>综合业务</P>


                </a>


                </span> <span class="i-menu-item i-menu3 i-navBg4"> <a


                href="javascript:;" onClick="open3d()"> <i><img


                th:src="@{/static/images/i-icon-swzs.png}"/></i>


                        <P>三维展示</P>


                </a>


                </span> <span class="i-menu-item i-menu4 i-navBg5"> <a


                href="javascript:;" onclick="openByTag('sys')"> <i><img


                th:src="@{/static/images/i-icon-xtgl.png}"/></i>


                        <P>系统管理</P>


                </a>


                </span> <span class="i-menu-item i-menu5 i-navBg2"> <a


                href="javascript:;" onclick="openByTag('es')"> <i><img


                th:src="@{/static/images/i-icon-nhgl.png}"/></i>


                        <P>能耗管理</P>


                </a>


                </span> <span class="i-menu-item i-menu6 i-navBg1"> <a


                href="javascript:;" onclick="openByTag('security')"> <i><img


                th:src="@{/static/images/i-icon-afgl.png}"/></i>


                        <P>安防管理</P>


                </a>


                </span>


        </div>


        <!--i-menuBox end-->


    </div>


</div>




<!--i-main end-->


<div class="i-footer">


    <p th:text=${support}>技术支持: é£Žæ­£è‡´è¿œä¿¡æ¯æŠ€æœ¯è‚¡ä»½æœ‰é™å…¬å¸</p>


</div>




<script th:src="@{/static/js/jquery.min.js}"></script>




<script th:inline="javascript">


    //定义变量


    var companyId = [[${loginUser.companyId}]];


    //userId


    var userId = [[${loginUser.username}]];




    //数量检测访问地址


    var quantityPath = [[${quantityPath}]];




    //三维路径


    var threePath = [[${threePath}]];




    var groupTag = [[${groupTag}]];//是否集团或者公司用户进入




    window.onload = function () {


        //表示集团/公司用户进入


        if(1 == groupTag){


            $("#menu-group").removeClass("dis-none");


        }


    };




    function openByTag(tag) {


        window.open("./home?t="+tag+"&g="+groupTag, "_self");


    };




    //打开质量检


    function openQuantity() {


        if ("#" == quantityPath) {


            openByTag("quantity")


        } else {


            window.open(quantityPath, "_blank");


        }


    };




    //打开质量检测


    function open3d() {


        if ("#" == threePath) {


            window.open("#", "_self");


        } else {


            window.open(threePath, "_blank");


        }


    };


</script>


</body>




</html>