Procházet zdrojové kódy

返回首页数据

李天标 před 5 roky
rodič
revize
d81f5948cc

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

@@ -83,7 +83,8 @@ public class IndexController extends BaseController {
      *机器启动数量/机器总数量
      */
     @RequestMapping(value = "/equipmentNumber", method = RequestMethod.GET)
-    public Map<String,Integer> equipmentNumber(ModelMap model , RedirectAttributes redirectAttributes) {
+    @ResponseBody
+    public String equipmentNumber(ModelMap model , RedirectAttributes redirectAttributes) {
         Map<String,Integer> map = new HashMap<>();
         Admin admin = adminService.getCurrent();
         List<Equipment> equipmentList = equipmentService.findByAdminId(admin.getId());
@@ -97,13 +98,17 @@ public class IndexController extends BaseController {
         map.put("totalNum",equipmentList.size());
         map.put("openNum",on);
         model.addAttribute("equipmentNumber", map);
-        return map;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("totalNum",equipmentList.size());
+        jsonObject.put("openNum",on);
+        return jsonObject.toString();
     }
     /**
      *今日定时清洗次数/随机清洗次数
      */
     @RequestMapping(value = "/cleanNumber", method = RequestMethod.GET)
-    public Map<String,Integer> cleanNumber(ModelMap model , RedirectAttributes redirectAttributes) {
+    @ResponseBody
+    public String cleanNumber(ModelMap model , RedirectAttributes redirectAttributes) {
         Map<String,Integer> map = new HashMap<>();
         Admin admin = adminService.getCurrent();
         List<Filter> fs = new ArrayList<>();
@@ -148,26 +153,31 @@ public class IndexController extends BaseController {
         map.put("random",random);
         map.put("regular",regular);
         model.addAttribute("cleanNumber", map);
-        return map;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("random",random);
+        jsonObject.put("regular",regular);
+        return jsonObject.toString();
     }
     /**
      *机器的状态,温度,湿度,清洗剂的剩余用量
      */
-    @RequestMapping(value = "/equipmentStatus", method = RequestMethod.GET)
-    public List<Equipment> equipmentStatus(ModelMap model , RedirectAttributes redirectAttributes) {
+    @RequestMapping(value = "/equipmentStatus", method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public String equipmentStatus(ModelMap model , RedirectAttributes redirectAttributes) {
         List<Equipment> equipmentList = new ArrayList<>();
         Admin admin = adminService.getCurrent();
         equipmentList = equipmentService.findByAdminId(admin.getId());
         model.addAttribute("equipmentList", equipmentList);
-        return equipmentList;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("equipmentList",equipmentList);
+        return jsonObject.toString();
     }
     /**
      *机器今日的报警记录,故障处理
      */
-    @RequestMapping(value = "/alarmRecordList", method = RequestMethod.GET)
+    @RequestMapping(value = "/alarmRecordList", method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
     @ResponseBody
     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<>();
@@ -204,19 +214,22 @@ public class IndexController extends BaseController {
      */
     @RequestMapping(value = "/allCleanNumber", method = RequestMethod.GET)
     @ResponseBody
-    public List<CleanStatisticsDTO> allCleanNumber(ModelMap model , RedirectAttributes redirectAttributes) {
+    public String allCleanNumber(ModelMap model , RedirectAttributes redirectAttributes) {
         List<CleanStatisticsDTO> list = new ArrayList<>();
         Admin admin = adminService.getCurrent();
         list = cleanHistoryService.findByTime(admin.getId());
         model.addAttribute("allCleanNumber", list);
-        return list;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("allCleanNumber",list);
+        return jsonObject.toString();
     }
 
     /**
      *机器消耗的资源,水电
      */
     @RequestMapping(value = "/consumedResources", method = RequestMethod.GET)
-    public Map<String,Integer> consumedResources(String time,ModelMap model , RedirectAttributes redirectAttributes) {
+    @ResponseBody
+    public String consumedResources(String time,ModelMap model , RedirectAttributes redirectAttributes) {
         Map<String,Integer> map = new HashMap<>();
         Admin admin = adminService.getCurrent();
         List<Filter> fs = new ArrayList<>();
@@ -269,13 +282,17 @@ public class IndexController extends BaseController {
         map.put("electricity",electricity);
         map.put("water",water);
         model.addAttribute("consumedResources", map);
-        return map;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("electricity",electricity);
+        jsonObject.put("water",water);
+        return jsonObject.toString();
     }
     /**
      *报警的类型统计,问题占比
      */
-    @RequestMapping(value = "/alarmRecordType", method = RequestMethod.GET)
-    public List<AlarmStatisticsDTO> alarmRecordType(String time, ModelMap model , RedirectAttributes redirectAttributes) {
+    @RequestMapping(value = "/alarmRecordType", method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public String alarmRecordType(String time, ModelMap model , RedirectAttributes redirectAttributes) {
         List<AlarmStatisticsDTO> list = new ArrayList<>();
         Admin admin = adminService.getCurrent();
         List<Filter> fs = new ArrayList<>();
@@ -291,14 +308,17 @@ public class IndexController extends BaseController {
             end = endM(time);
         }
         list = alarmRecordService.findByType(admin.getId(),begin,end);
-        model.addAttribute("alarmRecordType", list);
-        return list;
+        model.addAttribute("", list);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("alarmRecordType",list);
+        return jsonObject.toString();
     }
     /**
      *机器故障排行
      */
-    @RequestMapping(value = "/alarmRecordLine", method = RequestMethod.GET)
-    public List<AlarmStatisticsDTO> alarmRecordLine(String time, ModelMap model , RedirectAttributes redirectAttributes) {
+    @RequestMapping(value = "/alarmRecordLine", method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public String alarmRecordLine(String time, ModelMap model , RedirectAttributes redirectAttributes) {
         List<AlarmStatisticsDTO> list = new ArrayList<>();
         Admin admin = adminService.getCurrent();
         List<Filter> fs = new ArrayList<>();
@@ -315,13 +335,16 @@ public class IndexController extends BaseController {
         }
         list = alarmRecordService.findLine(admin.getId(),begin,end);
         model.addAttribute("alarmRecordLine", list);
-        return list;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("alarmRecordLine",list);
+        return jsonObject.toString();
     }
     /**
      *机器清洗排行
      */
-    @RequestMapping(value = "/cleanLine", method = RequestMethod.GET)
-    public List<AlarmStatisticsDTO> cleanLine(String time, ModelMap model , RedirectAttributes redirectAttributes) {
+    @RequestMapping(value = "/cleanLine", method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public String cleanLine(String time, ModelMap model , RedirectAttributes redirectAttributes) {
         List<AlarmStatisticsDTO> list = new ArrayList<>();
         Admin admin = adminService.getCurrent();
         List<Filter> fs = new ArrayList<>();
@@ -338,7 +361,9 @@ public class IndexController extends BaseController {
         }
         list = cleanHistoryService.findLine(admin.getId(),begin,end);
         model.addAttribute("cleanLine", list);
-        return list;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("cleanLine",list);
+        return jsonObject.toString();
     }
     private Date beginY(String time) {
         Date dater = null;

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

@@ -261,10 +261,27 @@ $(function(){
             success: function(data){
                     list =data.alarmRecordList;
                     var lis = list;
+                    console.log("list:",list);
             }
         });
-		console.log("list:",list);
+
 	};
+    //机器启动数量/机器总数量
+    setInterval(getEquipmentNumber,7000);
+    function getEquipmentNumber(){
+        var equipmentNumber = null;
+        $.ajax({
+            url:"/asl-admin/index/equipmentNumber.htm",
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                equipmentNumber = data;
+                console.log("equipmentNumber:",equipmentNumber);
+            }
+        });
+
+    };
     //人流量
     setInterval(getPeopleCounting,6000);
     function getPeopleCounting(){
@@ -277,9 +294,118 @@ $(function(){
             // dataType: "json",
             success: function(data){
                 number = data;
+                console.log("number:",number);
+            }
+        });
+    };
+    //今日定时清洗次数/随机清洗次数
+    setInterval(getCleanNumber,6000);
+    function getCleanNumber(){
+        var number = 1;
+        $.ajax({
+            url:"/asl-admin/index/cleanNumber.htm",
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("cleanNumber:",number);
+            }
+        });
+    };
+    //机器的状态,温度,湿度,清洗剂的剩余用量
+    setInterval(getEquipmentStatus,6000);
+    function getEquipmentStatus(){
+        var equipmentList =null;
+        $.ajax({
+            url:"/asl-admin/index/equipmentStatus.htm",
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("equipmentList:",number);
+            }
+        });
+    };
+    //机器全年的使用统计
+    setInterval(getAllCleanNumber,6000);
+    function getAllCleanNumber(){
+        var equipmentList =null;
+        $.ajax({
+            url:"/asl-admin/index/allCleanNumber.htm",
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("allCleanNumber:",number);
+            }
+        });
+    };
+    //机器消耗的资源,水电
+    setInterval(getConsumedResources,6000);
+    function getConsumedResources(){
+        var equipmentList =null;
+        var time = "All";
+        $.ajax({
+            url:"/asl-admin/index/consumedResources.htm?time="+time,
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("consumedResources:",number);
+            }
+        });
+    };
+    //报警的类型统计,问题占比
+    setInterval(getAlarmRecordType,6000);
+    function getAlarmRecordType(){
+        var equipmentList =null;
+        var time = "All";
+        $.ajax({
+            url:"/asl-admin/index/alarmRecordType.htm?time="+time,
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("alarmRecordType:",number);
             }
         });
-        console.log("number:",number);
-
     };
+    //机器故障排行
+    setInterval(getAlarmRecordLine,6000);
+    function getAlarmRecordLine(){
+        var equipmentList =null;
+        var time = "All";
+        $.ajax({
+            url:"/asl-admin/index/alarmRecordLine.htm?time="+time,
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("alarmRecordLine:",number);
+            }
+        });
+    };
+    //机器清洗排行
+    setInterval(getCleanLine,6000);
+    function getCleanLine(){
+        var equipmentList =null;
+        var time = "All";
+        $.ajax({
+            url:"/asl-admin/index/cleanLine.htm?time="+time,
+            type:"get",
+            contentType: "application/json;charset=utf-8",
+            dataType: "json",
+            success: function(data){
+                number = data;
+                console.log("cleanLine:",number);
+            }
+        });
+    };
+
 });