Selaa lähdekoodia

修改机器定时规则的bug

李天标 5 vuotta sitten
vanhempi
commit
d961861a1f

+ 19 - 12
app-backend-web/src/main/java/com/hboxs/control/admin/EquipmentController.java

@@ -77,18 +77,25 @@ public class EquipmentController extends BaseController {
         Equipment equipment = equipmentService.find(id);
         model.addAttribute("equipment", equipment);
         String rule = equipment.getRule();
-//        if(rule.length()>1){
-//            String[] split = rule.split(",");
-//            List<String> list = new ArrayList<>(Arrays.asList(split));
-//            model.addAttribute("rules", list);
-//            if(list.size()<10){
-//                List<String> lis = new ArrayList<>();
-//                for(int i = 0;i<(10-list.size());i++){
-//                    lis.add("a");
-//                }
-//                model.addAttribute("rulesCkche", lis);
-//            }
-//        }
+        if(equipment.getRule()!=null&&rule.length()>1){
+            String[] split = rule.split(",");
+            List<String> list = new ArrayList<>(Arrays.asList(split));
+            model.addAttribute("rules", list);
+            if(list.size()<10){
+                List<String> lis = new ArrayList<>();
+                for(int i = 0;i<(10-list.size());i++){
+                    lis.add("a");
+                }
+                model.addAttribute("rulesCkche", lis);
+            }
+        }
+        if(equipment.getRule()==null){
+            List<String> lis = new ArrayList<>();
+            for(int i = 0;i<10;i++){
+                lis.add("a");
+            }
+            model.addAttribute("rulesCkche", lis);
+        }
 //        List<TimeRule> timeRules = timeRuleService.findAll();
 //        model.addAttribute("timeRules", timeRules);
         String type = adminService.getCurrent().getType().toValue();

+ 321 - 303
app-backend-web/src/main/webapp/WEB-INF/template/admin/common/index.ftl

@@ -1,324 +1,342 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
-<title>申泽智能</title>
-<link rel="stylesheet" type="text/css" href="/resources/index/css/reset.css" />
-<link rel="stylesheet" type="text/css" href="/resources/index/css/scanboard.css" />
-<link rel="stylesheet" type="text/css" href="/resources/index/css/animsition.css" />
-<link rel="stylesheet" type="text/css" href="/resources/index/css/jquery.shCircleLoader.css" />
-<script type="text/javascript" src="/resources/index/js/jquery.min.js"></script>
-<script type="text/javascript" src="/resources/index/js/jquery.shCircleLoader-min.js"></script>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
+    <title>申泽智能</title>
+    <link rel="stylesheet" type="text/css" href="/resources/index/css/reset.css"/>
+    <link rel="stylesheet" type="text/css" href="/resources/index/css/scanboard.css"/>
+    <link rel="stylesheet" type="text/css" href="/resources/index/css/animsition.css"/>
+    <link rel="stylesheet" type="text/css" href="/resources/index/css/jquery.shCircleLoader.css"/>
+    <script type="text/javascript" src="/resources/index/js/jquery.min.js"></script>
+    <script type="text/javascript" src="/resources/index/js/jquery.shCircleLoader-min.js"></script>
+    <script src="/resources/index/js/angular.min.js"></script>
+<#--<script type="text/javascript" src="/resources/index/js/angularIndex.js"></script>-->
+    <script type="text/javascript">
+        // 创建 angular 模块
+        // 参数 1 :模块的名称
+        // 参数 2 :要加载的其它模块列表,如果没有也得加这个空数组,不加表示获取一个模块
+        var app = angular.module("app", []);
+        // 注册处理器,名称为 myController ,注入 $scope 上下文服务
+        app.controller("indexController", function ($scope) {
+            $scope.add = function () {
+                return parseInt($scope.x) + parseInt($scope.y);
+            }
+        });
+    </script>
 </head>
-<body>
+<body ng-app="app" ng-model="indexController">
 <div id="loader"></div>
 <script type="text/javascript">
-	$('#loader').shCircleLoader({color: "#00deff"});
+    $('#loader').shCircleLoader({color: "#00deff"});
 </script>
 <!--Top Start!-->
 <div class="scanboardWp animsition">
-	<div id="top">
-		<div class="wp clearfix">
-			<div class="left topBar">
-				<div class="topTime">时间加载中...</div>
-			</div>
+    <div id="top">
+        <div class="wp clearfix">
+            <div class="left topBar">
+                <div class="topTime">时间加载中...</div>
+            </div>
 
-			<div class="center topLogo">
-				<div class="title">智能洗手间物联系统</div>
-				<!--					<a href="#"><img src="images/logo.png"></a>-->
-			</div>
-			<div class="right pageTit">
-				<a class="summaryBtn" href="javascript:;">进入后台</a>
-				<div class="shebei">设备编号:33333444</div>
-			</div>
-		</div>
-	</div>
-	<!--Top End!-->
+            <div class="center topLogo">
+                <div class="title">智能洗手间物联系统</div>
+                <!--					<a href="#"><img src="images/logo.png"></a>-->
+            </div>
+            <div class="right pageTit">
+                <a class="summaryBtn" href="/asl-admin/common/main.htm">进入后台</a>
+                <div class="shebei"></div>
+            </div>
+        </div>
+    </div>
+    <!--Top End!-->
 
-	<!--Main Start!-->
-	<div id="main" class="wp clearfix">
-		<div class="left">
-			<!-- 今日人流量、在线机台数量 -->
-			<div class="item total left1">
-				<div class="itemTit">
-					<span class="border-yellow">今日人流量、在线机台数量</span>
-				</div>
-				<div class="tag1 itembg">
-					<ul>
-						<li style="font-size: 30px;color: aqua;">7677W</li><li style="font-size: 30px;color: aqua;">12/<span style="font-size: 30px;color: #ffd220;">76</span></li>
-					</ul>
-					<ul>
-						<li style="font-size: 16px;color: #fff;">人流量</li><li style="font-size: 16px;color: #fff;">在线设备</li>
-					</ul>
-				</div>
-			</div>
-			<!--设备清洗排行-->
-			<div class="left2 item billState2">
-				<div class="itemTit" style="position: relative">
-					<span class="border-blue">设备清洗排行</span>
-					<div class="dateDropdown fr">
-						<h3>2020-01-01</h3>
-						<div class="dropdown">
-							<a href="#">2020-01-01</a>
-							<a href="#">2020-02-01</a>
-							<a href="#">2020-02-01</a>
-						</div>
-					</div>
-				</div>
-				<div class="itemCon">
-					<div class="StateBox">
-						<div class="StateTit">
-							<span>排名</span>
-							<span>设备名称</span>
-							<span>次数</span>
-						</div>
-						<div id="FontScroll2">
-							<ul>
-								<li>
-									<div class="fontInner clearfix">
-										<span>1</span>
-										<span>机器人1</span>
-										<span>1</span>
-									</div>
-								</li>
-								<li>
-									<div class="fontInner clearfix">
-										<span>2</span>
-										<span>机器人2</span>
-										<span>2</span>
-									</div>
-								</li>
-								<li>
-									<div class="fontInner clearfix">
-										<span>3</span>
-										<span>机器人3</span>
-										<span>3</span>
-									</div>
-								</li>
-								<li>
-									<div class="fontInner clearfix">
-										<span>4</span>
-										<span>机器人4</span>
-										<span>4</span>
-									</div>
-								</li>
-								<li>
-									<div class="fontInner clearfix">
-										<span>5</span>
-										<span>机器人5</span>
-										<span>5</span>
-									</div>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-			</div>
+    <!--Main Start!-->
+    <div id="main" class="wp clearfix">
+        <div class="left">
+            <!-- 今日人流量、在线机台数量 -->
+            <div class="item total left1">
+                <div class="itemTit">
+                    <span class="border-yellow">今日人流量、在线机台数量</span>
+                </div>
 
-			<!--问题占比-->
-			<div class="item left3">
-				<div class="itemTit" style="position: relative">
-					<span class="border-blue" >问题占比</span>
-					<div class="dateDropdown fr">
-						<h3>2020-01-01</h3>
-						<div class="dropdown">
-							<a href="#">2020-01-01</a>
-							<a href="#">2020-02-01</a>
-							<a href="#">2020-02-01</a>
-						</div>
-					</div>
-				</div>
-				<div id="myChart2"></div>
-			</div>
-		</div>
+                <div class="tag1 itembg">
+                    <ul>
+                        <li style="font-size: 30px;color: aqua;">666</li>
+                        <li style="font-size: 30px;color: aqua;">12/<span
+                                style="font-size: 30px;color: #ffd220;">76</span></li>
+                    </ul>
+                    <ul>
+                        <li style="font-size: 16px;color: #fff;">人流量</li>
+                        <li style="font-size: 16px;color: #fff;">在线设备</li>
+                    </ul>
+                </div>
+            </div>
+            <!--设备清洗排行-->
+            <div class="left2 item billState2">
+                <div class="itemTit" style="position: relative">
+                    <span class="border-blue">设备清洗排行</span>
+                    <div class="dateDropdown fr">
+                        <h3>2020-01-01</h3>
+                        <div class="dropdown">
+                            <a href="#">2020-01-01</a>
+                            <a href="#">2020-02-01</a>
+                            <a href="#">2020-02-01</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="itemCon">
+                    <div class="StateBox">
+                        <div class="StateTit">
+                            <span>排名</span>
+                            <span>设备名称</span>
+                            <span>次数</span>
+                        </div>
+                        <div id="FontScroll2">
+                            <ul>
+                                <li>
+                                    <div class="fontInner clearfix">
+                                        <span>1</span>
+                                        <span>机器人1</span>
+                                        <span>1</span>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="fontInner clearfix">
+                                        <span>2</span>
+                                        <span>机器人2</span>
+                                        <span>2</span>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="fontInner clearfix">
+                                        <span>3</span>
+                                        <span>机器人3</span>
+                                        <span>3</span>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="fontInner clearfix">
+                                        <span>4</span>
+                                        <span>机器人4</span>
+                                        <span>4</span>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="fontInner clearfix">
+                                        <span>5</span>
+                                        <span>机器人5</span>
+                                        <span>5</span>
+                                    </div>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
 
-		<div class="center">
-			<div class="centerWp">
-				<!--中间大地图-->
-				<div class="center1 item total itembg">
-					<div class="itemCon tag2" style="min-height: 125px;">
-						<ul>
-							<li>767次</li>
-							<li class="totalNum"><strong id="totalNum" total="8082">0</strong><span>次</span></li>
-							<li>88次</li>
-						</ul>
-						<ul>
-							<li>今日随机清洗次数</li>
-							<li>今日总清洗次数</li>
-							<li>今日定时清洗次数</li>
-						</ul>
-					</div>
-				</div>
-				<div class="center2">
-					<div class="itemTit" style="position: relative">
-						<span class="border-yellow">环境检测</span>
-						<div class="dateDropdown fr">
-							<h3>申泽机器人1号</h3>
-							<div class="dropdown">
-								<a href="#">申泽机器人1号</a>
-								<a href="#">申泽机器人2号</a>
-								<a href="#">申泽机器人3号</a>
-							</div>
-						</div>
-					</div>
-					<div class="itemCon itembg">
-						<div class="infoPie2" style="min-height: 125px;">
-							<ul class="clearfix">
-								<li class="color-zi">
-									<span class="border-zi">99%</span>
-									<p>气味浓度</p>
-								</li>
-								<li class="color-blue">
-									<span class="border-blue">23℃</span>
-									<p>温度</p>
-								</li>
-								<li class="color-yellow">
-									<span class="border-yellow">36°</span>
-									<p>湿度</p>
-								</li>
-								<li class="color-green">
-									<span class="border-green">89%</span>
-									<p>环境舒适度</p>
-								</li>
-							</ul>
-						</div>
-					</div>
-				</div>
-				<!--故障处理-->
-				<div class="center3 item billState">
-					<div class="itemTit">
-						<span class="border-blue">故障处理</span>
-					</div>
-					<div class="itemCon">
-						<div class="StateBox">
-							<div class="StateTit">
-								<span>设备唯一码</span>
-								<span>设备名称</span>
-								<span>报警内容</span>
-								<span>报警时间</span>
-								<span>区域</span>
-								<span>全部状态</span>
-							</div>
-							<div id="FontScroll">
-								<ul>
-									<li>
-										<div class="fontInner clearfix">
-											<span>ZC1712120023</span>
-											<span>机器人1</span>
-											<span>尾部喷水异常</span>
-											<span>2小时15分</span>
-											<span>申泽1层</span>
-											<span>待处理</span>
-										</div>
-									</li>
-									<li>
-										<div class="fontInner clearfix">
-											<span>ZC1712120023</span>
-											<span>机器人1</span>
-											<span>尾部喷水异常</span>
-											<span>2小时15分</span>
-											<span>申泽1层</span>
-											<span>待处理</span>
-										</div>
-									</li>
-									<li>
-										<div class="fontInner clearfix">
-											<span>ZC1712120023</span>
-											<span>机器人1</span>
-											<span>尾部喷水异常</span>
-											<span>2小时15分</span>
-											<span>申泽1层</span>
-											<span>待处理</span>
-										</div>
-									</li>
-								</ul>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
+            <!--问题占比-->
+            <div class="item left3">
+                <div class="itemTit" style="position: relative">
+                    <span class="border-blue">问题占比</span>
+                    <div class="dateDropdown fr">
+                        <h3>2020-01-01</h3>
+                        <div class="dropdown">
+                            <a href="#">2020-01-01</a>
+                            <a href="#">2020-02-01</a>
+                            <a href="#">2020-02-01</a>
+                        </div>
+                    </div>
+                </div>
+                <div id="myChart2"></div>
+            </div>
+        </div>
 
-		<div class="right">
-			<!--剩余物料-->
-			<div class="right1 item waybill">
-				<div class="itemTit" style="position: relative">
-					<span class="border-yellow">剩余物料</span>
-					<div class="dateDropdown fr">
-						<h3>2020-01-01</h3>
-						<div class="dropdown">
-							<a href="#">2020-01-01</a>
-							<a href="#">2020-02-01</a>
-							<a href="#">2020-02-01</a>
-						</div>
-					</div>
-				</div>
-				<div class="itemCon">
-					<div class="progress" progress="100%">
-						<h3 class="clearfix"><span>清洁剂</span><i>100%</i></h3>
-						<div class="progressBar">
-							<span></span>
-						</div>
-					</div>
-					<div class="progress" progress="40%">
-						<h3 class="clearfix"><span>消毒水</span><i>40%</i></h3>
-						<div class="progressBar">
-							<span></span>
-						</div>
-					</div>
-					<div class="progress" progress="60%">
-						<h3 class="clearfix"><span>清新剂</span><i>60%</i></h3>
-						<div class="progressBar">
-							<span></span>
-						</div>
-					</div>
-				</div>
-			</div>
+        <div class="center">
+            <div class="centerWp">
+                <!--中间大地图-->
+                <div class="center1 item total itembg">
+                    <div class="itemCon tag2" style="min-height: 125px;">
+                        <ul>
+                            <li>598次</li>
+                            <li class="totalNum"><strong id="totalNum" total="666">0</strong><span>次</span></li>
+                            <li>68次</li>
+                        </ul>
+                        <ul>
+                            <li>今日随机清洗次数</li>
+                            <li>今日总清洗次数</li>
+                            <li>今日定时清洗次数</li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="center2">
+                    <div class="itemTit" style="position: relative">
+                        <span class="border-yellow">环境检测</span>
+                        <div class="dateDropdown fr">
+                            <h3>申泽机器人1号</h3>
+                            <div class="dropdown">
+                                <a href="#">申泽机器人1号</a>
+                                <a href="#">申泽机器人2号</a>
+                                <a href="#">申泽机器人3号</a>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="itemCon itembg">
+                        <div class="infoPie2" style="min-height: 125px;">
+                            <ul class="clearfix">
+                                <li class="color-zi">
+                                    <span class="border-zi">29%</span>
+                                    <p>气味浓度</p>
+                                </li>
+                                <li class="color-blue">
+                                    <span class="border-blue">23℃</span>
+                                    <p>温度</p>
+                                </li>
+                                <li class="color-yellow">
+                                    <span class="border-yellow">36%</span>
+                                    <p>湿度</p>
+                                </li>
+                                <li class="color-green">
+                                    <span class="border-green">89%</span>
+                                    <p>环境舒适度</p>
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+                <!--故障处理-->
+                <div class="center3 item billState">
+                    <div class="itemTit">
+                        <span class="border-blue">故障处理</span>
+                    </div>
+                    <div class="itemCon">
+                        <div class="StateBox">
+                            <div class="StateTit">
+                                <span>设备唯一码</span>
+                                <span>设备名称</span>
+                                <span>报警内容</span>
+                                <span>报警时间</span>
+                                <span>区域</span>
+                                <span>全部状态</span>
+                            </div>
+                            <div id="FontScroll">
+                                <ul>
+                                    <li>
+                                        <div class="fontInner clearfix">
+                                            <span>ZC1712120023</span>
+                                            <span>机器人1</span>
+                                            <span>尾部喷水异常</span>
+                                            <span>2小时15分</span>
+                                            <span>申泽1层</span>
+                                            <span>待处理</span>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="fontInner clearfix">
+                                            <span>ZC1712120023</span>
+                                            <span>机器人1</span>
+                                            <span>尾部喷水异常</span>
+                                            <span>2小时15分</span>
+                                            <span>申泽1层</span>
+                                            <span>待处理</span>
+                                        </div>
+                                    </li>
+                                    <li>
+                                        <div class="fontInner clearfix">
+                                            <span>ZC1712120023</span>
+                                            <span>机器人1</span>
+                                            <span>尾部喷水异常</span>
+                                            <span>2小时15分</span>
+                                            <span>申泽1层</span>
+                                            <span>待处理</span>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
-			<!--使用统计-->
-			<div class="right2 item basicInfo">
-				<div class="itemTit">
-					<span class="border-green">能耗</span>
-				</div>
-				<div class="itemCon itembg">
-					<div class="infoPie">
-						<ul class="clearfix">
-							<li class="color-yellow">
-								<span class="border-yellow">32</span>
-								<p>水耗(吨)</p>
-							</li>
-							<li class="color-green">
-								<span class="border-green">65</span>
-								<p>电耗(度)</p>
-							</li>
-							<li class="color-blue">
-								<p>水费:66元</p>
-								<p>电费:66元</p>
-							</li>
-						</ul>
-					</div>
-				</div>
-			</div>
+        <div class="right">
+            <!--剩余物料-->
+            <div class="right1 item waybill">
+                <div class="itemTit" style="position: relative">
+                    <span class="border-yellow">剩余物料</span>
+                    <div class="dateDropdown fr">
+                        <h3>2020-01-01</h3>
+                        <div class="dropdown">
+                            <a href="#">2020-01-01</a>
+                            <a href="#">2020-02-01</a>
+                            <a href="#">2020-02-01</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="itemCon">
+                    <div class="progress" progress="100%">
+                        <h3 class="clearfix"><span>清洁剂</span><i>100%</i></h3>
+                        <div class="progressBar">
+                            <span></span>
+                        </div>
+                    </div>
+                    <div class="progress" progress="40%">
+                        <h3 class="clearfix"><span>消毒水</span><i>40%</i></h3>
+                        <div class="progressBar">
+                            <span></span>
+                        </div>
+                    </div>
+                    <div class="progress" progress="60%">
+                        <h3 class="clearfix"><span>清新剂</span><i>60%</i></h3>
+                        <div class="progressBar">
+                            <span></span>
+                        </div>
+                    </div>
+                </div>
+            </div>
 
-			<!--使用统计-->
-			<div class="right3 item billState">
-				<div class="itemTit">
-					<span class="border-green">使用统计</span>
-				</div>
-				<div id="myChart3"></div>
-			</div>
-		</div>
-	</div>
-	<!--Main End!-->
+            <!--使用统计-->
+            <div class="right2 item basicInfo">
+                <div class="itemTit">
+                    <span class="border-green">能耗</span>
+                </div>
+                <div class="itemCon itembg">
+                    <div class="infoPie">
+                        <ul class="clearfix">
+                            <li class="color-yellow">
+                                <span class="border-yellow">32</span>
+                                <p>水耗(吨)</p>
+                            </li>
+                            <li class="color-green">
+                                <span class="border-green">66</span>
+                                <p>电耗(度)</p>
+                            </li>
+                            <li class="color-blue">
+                                <p>水费:66元</p>
+                                <p>电费:66元</p>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
+            <!--使用统计-->
+            <div class="right3 item billState">
+                <div class="itemTit">
+                    <span class="border-green">使用统计</span>
+                </div>
+                <div id="myChart3"></div>
+            </div>
+        </div>
+    </div>
+    <!--Main End!-->
 </div>
 
 <canvas id="canvas" style="position: absolute;top: 0;left: 0;"></canvas>
 </body>
-<script type="text/javascript" src="js/bg.js"></script>
-<script type="text/javascript" src="js/scanboard.js"></script>
-<script type="text/javascript" src="js/fontscroll.js"></script>
-<script type="text/javascript" src="js/jquery.animsition.js"></script>
-<script type="text/javascript" src="js/jquery.nicescroll.js"></script>
-<script type="text/javascript" src="js/echarts.min.js"></script>
+<script type="text/javascript" src="/resources/index/js/bg.js"></script>
+<script type="text/javascript" src="/resources/index/js/scanboard.js"></script>
+<script type="text/javascript" src="/resources/index/js/fontscroll.js"></script>
+<script type="text/javascript" src="/resources/index/js/jquery.animsition.js"></script>
+<script type="text/javascript" src="/resources/index/js/jquery.nicescroll.js"></script>
+<script type="text/javascript" src="/resources/index/js/echarts.min.js"></script>
 </html>

+ 1 - 1
app-backend-web/src/main/webapp/WEB-INF/template/admin/equipment/edit.ftl

@@ -411,7 +411,7 @@
                         </div>
                     </tr>
                     [/#list]
-                    [#if rules.length<10]
+                    [#if rules==null || rules.length<10]
                         [#list rulesCkche as lis]
                             <tr>
                                 <input type="hidden" name="equipmentId" value="${equipment.id}"/>

+ 1 - 1
app-backend-web/src/main/webapp/resources/index/js/scanboard.js

@@ -250,7 +250,7 @@ $(function(){
 		myChart2.resize();
 		myChart3.resize();
 	});
-    setInterval(getAlarmRecord,15000);
+    // setInterval(getAlarmRecord,15000);
     function getAlarmRecord(){
     	var list = null;
         $.ajax({