From 4466b8695a1a43cda210614508bf94534e7b0ab7 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 25 九月 2023 20:58:28 +0800
Subject: [PATCH] 提交惠州惠新配置信息
---
igds-web/src/main/resources/templates/index/index-5326.html | 223 ++++++++++++++++++++++++++++++++++++++++++++
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java | 11 +
igds-web/src/main/java/com/ld/igds/web/WebController.java | 4
igds-web/src/main/resources/gas-conf.properties | 3
igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java | 3
igds-web/pom.xml | 4
igds-web/src/main/resources/static/img/gas/5326/5326_001.png | 0
7 files changed, 242 insertions(+), 6 deletions(-)
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
index e7c18cf..13ddaf6 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/ServerRunner.java
+++ b/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);
}
diff --git a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java b/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
index fefac90..ded366b 100644
--- a/igds-protocol-fzzy3/src/main/java/com/ld/igds/protocol/fzzy/analysis/AnalysisGrain.java
+++ b/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());
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 0ba6140..82287d2 100644
--- a/igds-web/pom.xml
+++ b/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>
diff --git a/igds-web/src/main/java/com/ld/igds/web/WebController.java b/igds-web/src/main/java/com/ld/igds/web/WebController.java
index 9f871a9..1c8ed99 100644
--- a/igds-web/src/main/java/com/ld/igds/web/WebController.java
+++ b/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;
}
diff --git a/igds-web/src/main/resources/gas-conf.properties b/igds-web/src/main/resources/gas-conf.properties
index 0f75746..b5d538b 100644
--- a/igds-web/src/main/resources/gas-conf.properties
+++ b/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
diff --git a/igds-web/src/main/resources/static/img/gas/5326/5326_001.png b/igds-web/src/main/resources/static/img/gas/5326/5326_001.png
new file mode 100644
index 0000000..6f8c7aa
--- /dev/null
+++ b/igds-web/src/main/resources/static/img/gas/5326/5326_001.png
Binary files differ
diff --git a/igds-web/src/main/resources/templates/index/index-5326.html b/igds-web/src/main/resources/templates/index/index-5326.html
new file mode 100644
index 0000000..09b35d2
--- /dev/null
+++ b/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>
--
Gitblit v1.9.3