Accueil Explorer Aide
S'inscrire Connexion
wuhongshuang
/
cleanMachine_houtai
2
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

修改接口

李天标 il y a 5 ans
Parent
d961861a1f
commit
a04b09f688
4 fichiers modifiés avec 36 ajouts et 18 suppressions
Vue séparée Afficher les stats Diff
  1. 9 3
      app-backend-web/src/main/java/com/hboxs/control/admin/IndexController.java
  2. 2 13
      app-backend-web/src/main/webapp/WEB-INF/template/admin/common/index.ftl
  3. BIN
      app-backend-web/src/main/webapp/resources/index/images/s_ico1.png
  4. 25 2
      app-backend-web/src/main/webapp/resources/index/js/scanboard.js

+ 9 - 3
app-backend-web/src/main/java/com/hboxs/control/admin/IndexController.java
Voir le fichier 

@@ -5,6 +5,7 @@
 
  */
 
 package com.hboxs.control.admin;
 
 
+import com.alibaba.fastjson.JSONArray;
 
 import com.hboxs.common.Filter;
 
 import com.hboxs.common.Message;
 
 import com.hboxs.common.Pageable;
 
@@ -15,6 +16,7 @@ import com.hboxs.entity.BaseEntity.Save;
 
 import com.hboxs.service.*;
 
 import org.apache.commons.codec.digest.DigestUtils;
 
 import org.apache.commons.lang.StringUtils;
 
+import org.json.JSONObject;
 
 import org.springframework.stereotype.Controller;
 
 import org.springframework.ui.Model;
 
 import org.springframework.ui.ModelMap;
 
@@ -62,7 +64,8 @@ public class IndexController extends BaseController {
 
      *今日人流量
 
      */
 
     @RequestMapping(value = "/peopleCounting", method = RequestMethod.GET)
 
-    public Integer peopleCounting(ModelMap model , RedirectAttributes redirectAttributes) {
 
+    @ResponseBody
 
+    public int peopleCounting(ModelMap model , RedirectAttributes redirectAttributes) {
 
         int number = 0;
 
         Admin admin = adminService.getCurrent();
 
         List<Equipment> equipmentList = equipmentService.findByAdminId(admin.getId());
 
@@ -162,7 +165,7 @@ public class IndexController extends BaseController {
 
      */
 
     @RequestMapping(value = "/alarmRecordList", method = RequestMethod.GET)
 
     @ResponseBody
 
-    public List<AlarmRecord> alarmRecordList(ModelMap model , RedirectAttributes redirectAttributes) {
 
+    public  String alarmRecordList() {
 
         List<AlarmRecord> alarmRecordList = new ArrayList<>();
 
         Admin admin = adminService.getCurrent();
 
         List<Filter> fs = new ArrayList<>();
 
@@ -189,7 +192,10 @@ public class IndexController extends BaseController {
 
         fs.add(Filter.geDate("createDate", begin));
 
         fs.add(Filter.leDate("createDate", end));
 
         alarmRecordList = alarmRecordService.findList(999, fs, null);
 
-        return alarmRecordList;
 
+        JSONObject jsonObject = new JSONObject();
 
+        jsonObject.put("alarmRecordList",alarmRecordList);
 
+        String js = jsonObject.toString();
 
+        return js;
 
     }
 
     /**
 
      *机器全年的使用统计

+ 2 - 13
app-backend-web/src/main/webapp/WEB-INF/template/admin/common/index.ftl
Voir le fichier 

@@ -12,20 +12,9 @@
 
     <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 ng-app="app" ng-model="indexController">
 
+<body>
 
 <div id="loader"></div>
 
 <script type="text/javascript">
 
     $('#loader').shCircleLoader({color: "#00deff"});

BIN
app-backend-web/src/main/webapp/resources/index/images/s_ico1.png
Voir le fichier


+ 25 - 2
app-backend-web/src/main/webapp/resources/index/js/scanboard.js
Voir le fichier 

@@ -250,7 +250,8 @@ $(function(){
 
 		myChart2.resize();
 
 		myChart3.resize();
 
 	});
 
-    // setInterval(getAlarmRecord,15000);
 
+	//获取今日报警
 
+    setInterval(getAlarmRecord,5000);
 
     function getAlarmRecord(){
 
     	var list = null;
 
         $.ajax({
 
@@ -259,7 +260,10 @@ $(function(){
 
             contentType: "application/json;charset=utf-8",
 
             dataType: "json",
 
             success: function(data){
 
-            	list = data[0].id;
 
+                if(data.length>0){
 
+                    list = data[0].id;
 
+                }
 
+
 
             }
 
         });
 
         var da = list;
 
@@ -267,4 +271,23 @@ $(function(){
 
 		console.log("list:",list);
 
 
 	};
 
+    //人流量
 
+    setInterval(getPeopleCounting,6000);
 
+    function getPeopleCounting(){
 
+        var number = 1;
 
+        $.ajax({
 
+            url:"/asl-admin/index/peopleCounting.htm",
 
+            type:"get",
 
+            async: true,
 
+            // contentType: "application/json;charset=utf-8",
 
+            // dataType: "json",
 
+            success: function(data){
 
+                number = data;
 
+            }
 
+        });
 
+        var da = number;
 
+        var ta = da;
 
+        console.log("number:",number);
 
+        return number;
 
+    };
 
 });