1

app-backend-web/src/main/java/com/hboxs/control/admin/IndexController.java

@@ -29,6 +29,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -165,7 +166,8 @@ public class IndexController extends BaseController {
      */
     @RequestMapping(value = "/alarmRecordList", method = RequestMethod.GET)
     @ResponseBody
-    public  String alarmRecordList() {
+    public  String alarmRecordList(ModelMap model , RedirectAttributes redirectAttributes) {
+//        HttpServletResponse response = new HttpServletResponse;
         List<AlarmRecord> alarmRecordList = new ArrayList<>();
         Admin admin = adminService.getCurrent();
         List<Filter> fs = new ArrayList<>();

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

@@ -257,19 +257,13 @@ $(function(){
         $.ajax({
             url:"/asl-admin/index/alarmRecordList.htm",
             type:"get",
-            contentType: "application/json;charset=utf-8",
             dataType: "json",
             success: function(data){
-                if(data.length>0){
-                    list = data[0].id;
-                }
-
+                    list =data.alarmRecordList;
+                    var lis = list;
             }
         });
-        var da = list;
-        var ta = da;
 		console.log("list:",list);
-
 	};
     //人流量
     setInterval(getPeopleCounting,6000);
@@ -285,9 +279,7 @@ $(function(){
                 number = data;
             }
         });
-        var da = number;
-        var ta = da;
         console.log("number:",number);
-        return number;
+
     };
 });

conf/default/system.properties

@@ -1,7 +1,7 @@
 ### System Properties
 ## DB Config
 # localhost connect url
-jdbc.url=jdbc\:mysql\://localhost\:3306/cleanMachine?useUnicode\=true&characterEncoding\=UTF-8
+jdbc.url=jdbc\:mysql\://47.112.127.131\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
 jdbc.username=hboxs
 jdbc.password=hboxs@mysql
 jdbc.driver=com.mysql.jdbc.Driver

conf/local/system.properties

@@ -1,9 +1,12 @@
 ### System Properties
 ## DB Config
 # localhost connect url
-jdbc.url=jdbc\:mysql\://localhost\:3306/cleanMachine?useUnicode\=true&characterEncoding\=UTF-8
+jdbc.url=jdbc\:mysql\://47.112.127.131\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
 jdbc.username=hboxs
 jdbc.password=hboxs@mysql
+#jdbc.url=jdbc\:mysql\://localhost\:3306/clean_machine?useUnicode\=true&characterEncoding\=UTF-8
+#jdbc.username=root
+#jdbc.password=123456
 jdbc.driver=com.mysql.jdbc.Driver
 ## Connection Pool Config
 connection_pools.min_pool_size=5