优化可视化界面事件总数查询

mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -66,8 +66,6 @@ public class Visualization_Event_Controller extends AppBaseController {
     ISysConfigService sysConfigService;
 
 
-
-
     private static final Logger logger = LoggerFactory.getLogger(Visualization_Event_Controller.class);
     private String prefix = "business/visualization";
     @Value("${leisp.videoUrl}")
@@ -99,22 +97,22 @@ public class Visualization_Event_Controller extends AppBaseController {
         List<Visualization_Car_Count> carCounts = visualization_event_service.getSuperMap_Car_Count();
         map.put("action", action);//跳转的路径
         map.put("loginName", ShiroUtils.getLoginName());
-        map.put("deptId",ShiroUtils.getSysUser().getDeptId());
+        map.put("deptId", ShiroUtils.getSysUser().getDeptId());
         map.put("carCounts", carCounts);
-        String visuSee="";
+        String visuSee = "";
 
-        SysUser user= ShiroUtils.getSysUser();
+        SysUser user = ShiroUtils.getSysUser();
         List<SysRole> roles = iSysRoleService.selectRolesByUserId(user.getUserId());
 
-        for(SysRole r: roles){
-            if(r.getVisuSee()!= null && !r.getVisuSee().equals("")){
+        for (SysRole r : roles) {
+            if (r.getVisuSee() != null && !r.getVisuSee().equals("")) {
                 visuSee += r.getVisuSee();
             }
         }
-        if(user.getLoginName().equals("admin")){
+        if (user.getLoginName().equals("admin")) {
             visuSee = "adminRole";
         }
-        map.put("visuSee",visuSee);
+        map.put("visuSee", visuSee);
         return prefix + "/event";
     }
 
@@ -132,10 +130,10 @@ public class Visualization_Event_Controller extends AppBaseController {
         Calendar start_time = Calendar.getInstance();
         Calendar end_time = Calendar.getInstance();
         //start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH)-1);
-        start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH) ,start_time.get(Calendar.HOUR_OF_DAY),start_time.get(Calendar.MINUTE)-30);
+        start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH), start_time.get(Calendar.HOUR_OF_DAY), start_time.get(Calendar.MINUTE) - 30);
         end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH));
         String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdfStart.format(start_time.getTime()) : request.getParameter("STARTTIME");
-        System.out.println("STARTTIME====="+STARTTIME);
+        System.out.println("STARTTIME=====" + STARTTIME);
         String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
         String EVENTNAME = request.getParameter("EVENTNAME");
         String DEPTID = request.getParameter("DEPTID");
@@ -143,17 +141,28 @@ public class Visualization_Event_Controller extends AppBaseController {
 
         //上报总数
 //        int Visualization_Report_Event_Count = visualization_event_service.Visualization_Report_Event_Count();
-        int Visualization_Report_Event_Count =0;
+        int Visualization_Report_Event_Count = 0;
 
         //各类事件数量
-        Visualization_Event_Count v = new Visualization_Event_Count();
-        List <Visualization_Event_Count> Visualization_Event_Each_Count = visualization_event_service.Visualization_Event_Each_Count(v);
+//        Visualization_Event_Count v = new Visualization_Event_Countalization_Event_Count();
+//        List <Visualization_Event_Count> Visualization_Event_Each_Count = visualization_event_service.Visualization_Event_Each_Count(v);
+
+        //查询t_u_event_fire表事件数量（森林防火）
+        List<Visualization_Event_Count> fireEventCount = visualization_event_service.fireEventCount();
+        for (int i = 0; i < fireEventCount.size(); i++) {
+            Visualization_Event_Count c = fireEventCount.get(i);
+            Visualization_Report_Event_Count += Integer.parseInt(c.getCOUNT());
+        }
+
+        //查询t_u_event_others表事件数量（其他）
+        List<Visualization_Event_Count> othersEventCount = visualization_event_service.othersEventCount();
 
-        for(int i=0;i<Visualization_Event_Each_Count.size();i++){
-            Visualization_Event_Count c = Visualization_Event_Each_Count.get(i);
-            Visualization_Report_Event_Count+= Integer.parseInt(c.getCOUNT());
+        for (int i = 0; i < othersEventCount.size(); i++) {
+            Visualization_Event_Count c = othersEventCount.get(i);
+            Visualization_Report_Event_Count += Integer.parseInt(c.getCOUNT());
         }
 
+
         //各类事件已确定数量
         List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count = visualization_event_service.Visualization_ALL_Event_Each_Count();
         //事件总数
@@ -177,7 +186,10 @@ public class Visualization_Event_Controller extends AppBaseController {
         event.setUSER_DEPTID(DEPTID);
         List<Visualization_Event> Visualization_Pending_List = visualization_event_service.Visualization_Pending_List(event);
         map.put("Visualization_Report_Event_Count", Visualization_Report_Event_Count);
-        map.put("Visualization_Event_Each_Count", Visualization_Event_Each_Count);
+//        map.put("Visualization_Event_Each_Count", Visualization_Event_Each_Count);
+        map.put("fireEventCount", fireEventCount);
+        map.put("othersEventCount", othersEventCount);
+
         map.put("Visualization_ALL_Event_Each_Count", Visualization_ALL_Event_Each_Count);
         map.put("Visualization_All_Event_Count", Visualization_All_Event_Count);
         map.put("Visualization_User_Count", Visualization_User_Count);
@@ -185,11 +197,11 @@ public class Visualization_Event_Controller extends AppBaseController {
         map.put("Visualization_Tower_Count", Visualization_Tower_Count);
         map.put("Visualization_Camera_Count", Visualization_Camera_Count);
         map.put("Visualization_Pending_List", Visualization_Pending_List);
-        map.put("EVENTNAME",EVENTNAME);
-        map.put("STARTTIME",STARTTIME);
-        map.put("ENDTIME",ENDTIME);
-        map.put("DEPTID",DEPTID);
-        map.put("DEPTNAME",DEPTNAME);
+        map.put("EVENTNAME", EVENTNAME);
+        map.put("STARTTIME", STARTTIME);
+        map.put("ENDTIME", ENDTIME);
+        map.put("DEPTID", DEPTID);
+        map.put("DEPTNAME", DEPTNAME);
         return prefix + "/frame";
     }
 
@@ -206,27 +218,26 @@ public class Visualization_Event_Controller extends AppBaseController {
     }
 
 
-
     @RequestMapping("/getVisualizationDetails")
     public String getVisualizationDetails(ModelMap map, HttpServletRequest request) {
 
-        String dahua_picture_url =iSysConfigService.selectConfigByKey("dahua_picture_url");
+        String dahua_picture_url = iSysConfigService.selectConfigByKey("dahua_picture_url");
 
         String eventId = request.getParameter("eventId");
         String reservePlanType = request.getParameter("reservePlanType");
-        visualization_event_service.updateEventSign(eventId,reservePlanType);
+        visualization_event_service.updateEventSign(eventId, reservePlanType);
         Visualization_Event visualization_event = visualization_event_service.Visualization_getOne(eventId, reservePlanType);
         List<Visualization_EventProcess> visualization_eventProcess = visualization_event_service.Visualization_Get_EventProcess(eventId);
         String basebath = iSysConfigService.selectConfigByKey("http_basepath");
-        for(int i=0;i<visualization_eventProcess.size();i++){
-            List<Visualization_Attach>  p = visualization_eventProcess.get(i).getIMAGELIST();
-            for(int j=0;j<p.size();j++){
-                Visualization_Attach s =p.get(j);
-                if(s.getRES_URL() != null && !s.getRES_URL().equals("")){
-                    if(visualization_event.getREPORT_TYPE() != null && visualization_event.getREPORT_TYPE().equals("report_type_2") && s.getRES_URL()!= null && s.getRES_URL().indexOf("@")>0){
-                        s.setRES_URL("https://119.52.253.110:4430/alarm/"+s.getRES_URL());
-                    }else{
-                        s.setRES_URL(basebath+s.getRES_URL());
+        for (int i = 0; i < visualization_eventProcess.size(); i++) {
+            List<Visualization_Attach> p = visualization_eventProcess.get(i).getIMAGELIST();
+            for (int j = 0; j < p.size(); j++) {
+                Visualization_Attach s = p.get(j);
+                if (s.getRES_URL() != null && !s.getRES_URL().equals("")) {
+                    if (visualization_event.getREPORT_TYPE() != null && visualization_event.getREPORT_TYPE().equals("report_type_2") && s.getRES_URL() != null && s.getRES_URL().indexOf("@") > 0) {
+                        s.setRES_URL("https://119.52.253.110:4430/alarm/" + s.getRES_URL());
+                    } else {
+                        s.setRES_URL(basebath + s.getRES_URL());
                     }
                 }
 
@@ -234,28 +245,26 @@ public class Visualization_Event_Controller extends AppBaseController {
         }
 
 
-
         List<Visualization_Attach> imageList = visualization_event_service.Visualization_Get_Imagelist(eventId);
 
         //REPORT_TYPE report_type_1 == 人工      report_type_2 ==机器上报
 
-        for(int i=0;i<imageList.size();i++){
+        for (int i = 0; i < imageList.size(); i++) {
             Visualization_Attach s = imageList.get(i);
-            if(visualization_event.getREPORT_TYPE().equals("report_type_1")){
+            if (visualization_event.getREPORT_TYPE().equals("report_type_1")) {
                 SysConfig sysConfig = new SysConfig();
                 sysConfig.setConfigKey("http_basepath");
                 SysConfig config = sysConfigMapper.selectConfig(sysConfig);
                 String http_basepath = config.getConfigValue();
-                String url = http_basepath+s.getRES_URL();
+                String url = http_basepath + s.getRES_URL();
                 s.setRES_URL(url);
-            }else{
-                s.setRES_URL("https://119.52.253.110:4430/alarm/"+s.getRES_URL());
+            } else {
+                s.setRES_URL("https://119.52.253.110:4430/alarm/" + s.getRES_URL());
             }
 
         }
 
 
-
         //根据事件等级查询应急预案
         Visualization_Plan visualization_plan = visualization_event_service.getVisualizationPlanByLevel(visualization_event.getEVENT_LEVEL());
         //查询所有摄像头
@@ -264,24 +273,24 @@ public class Visualization_Event_Controller extends AppBaseController {
         List<Visualization_Camera> visualization_cameras = visualization_event_service.getAllCamera(camera);
         List<Visualization_Camera> cameraList = new ArrayList<>();
 
-        if(visualization_cameras.size()>0){
+        if (visualization_cameras.size() > 0) {
             /**
              * 过滤出事件发生范围内的摄像头
              * */
             SysConfig sysConfig = new SysConfig();
             sysConfig.setConfigKey("distanceRad");
             double distance = Double.valueOf(sysConfigMapper.selectConfig(sysConfig).getConfigValue());//米 默认200
-            for(Visualization_Camera vc : visualization_cameras){
+            for (Visualization_Camera vc : visualization_cameras) {
                 double d = DistanceRad.getDistance(Double.parseDouble(visualization_event.getLATITUDE()),
                         Double.parseDouble(visualization_event.getLONGITUDE()),
-                        Double.parseDouble(vc.getLATITUDE()),Double.parseDouble(vc.getLONGITUDE()));
+                        Double.parseDouble(vc.getLATITUDE()), Double.parseDouble(vc.getLONGITUDE()));
                 /**如果在范围内 插入距离**/
-                if(distance >= d){
-                    vc.setRemark(d+"");
-                    if(d<1000){//不足1 km
-                        vc.setREMARK((d+"").length()<=4?d+"":(d+"").substring(0,4)+" m");
-                    }else {
-                        vc.setREMARK(getDoubleString(d)+" km");
+                if (distance >= d) {
+                    vc.setRemark(d + "");
+                    if (d < 1000) {//不足1 km
+                        vc.setREMARK((d + "").length() <= 4 ? d + "" : (d + "").substring(0, 4) + " m");
+                    } else {
+                        vc.setREMARK(getDoubleString(d) + " km");
                     }
                     cameraList.add(vc);
                 }
@@ -311,9 +320,9 @@ public class Visualization_Event_Controller extends AppBaseController {
         map.put("visualization_plan", visualization_plan);//应急预案
         map.put("imageList", imageList);//图片后缀
         map.put("proFile", iSysConfigService.selectConfigByKey("http_basepath"));//图片前缀
-        map.put("videoUrl",videoUrl);
+        map.put("videoUrl", videoUrl);
         //map.put("cameraList",iTResCameraService.selectTResCameraList(new TResCamera()));//查询所有摄像头列表 监控探头
-        map.put("cameraList",cameraList);
+        map.put("cameraList", cameraList);
         return prefix + "/details";
     }
 
@@ -348,8 +357,8 @@ public class Visualization_Event_Controller extends AppBaseController {
         Visualization_Camera_Count Visualization_Camera_Count = visualization_event_service.getVisualization_Camera_Count(visualization_camera);
         map.put("Visualization_Camera_List", Visualization_Camera_List);
         map.put("Visualization_Camera_Count", Visualization_Camera_Count);
-        map.put("towerName",towerName);
-        map.put("superMapId",superMapId);
+        map.put("towerName", towerName);
+        map.put("superMapId", superMapId);
 
         return prefix + "/lwt";
     }
@@ -375,9 +384,9 @@ public class Visualization_Event_Controller extends AppBaseController {
         Visualization_Camera_Count Visualization_Camera_Count = visualization_event_service.getVisualization_Camera_Count(visualization_camera);
         map.put("Visualization_Camera_List", Visualization_Camera_List);
         map.put("Visualization_Camera_Count", Visualization_Camera_Count);
-        map.put("name",name);
-        map.put("deptId",deptId);
-        map.put("deptName",deptName);
+        map.put("name", name);
+        map.put("deptId", deptId);
+        map.put("deptName", deptName);
         return prefix + "/sxt";
     }
 
@@ -406,8 +415,8 @@ public class Visualization_Event_Controller extends AppBaseController {
         appPageModel.setPageNum(canalPageNum == 0 ? 1 : canalPageNum);
         appPageModel.setPageSize(14);
         map.put("canalList", app_startPage(appPageModel, canalList));//水渠list
-        map.put("sourceWaterPageCount", getPageCount(sourceWaterList,14));//水源总页数
-        map.put("canalPageCount", getPageCount(canalList,14));//水渠总页数
+        map.put("sourceWaterPageCount", getPageCount(sourceWaterList, 14));//水源总页数
+        map.put("canalPageCount", getPageCount(canalList, 14));//水渠总页数
         map.put("sourceWaterPageNum", sourceWaterPageNum);//水源当前页数
         map.put("canalPageNum", canalPageNum);//水渠当前页数
         map.put("proFile", iSysConfigService.selectConfigByKey("http_basepath"));//图片前缀
@@ -433,7 +442,7 @@ public class Visualization_Event_Controller extends AppBaseController {
         appPageModel.setPageSize(14);
         List<Visualization_Forest> appPageModelList = app_startPage(appPageModel, Visualization_Forest_List);
         map.put("Visualization_Forest_List", appPageModelList);
-        map.put("pageCount", getPageCount(appPageModelList,14));//总页数
+        map.put("pageCount", getPageCount(appPageModelList, 14));//总页数
         map.put("pageNum", pageNum);//当前页数
         return prefix + "/sl";
     }
@@ -473,7 +482,7 @@ public class Visualization_Event_Controller extends AppBaseController {
         Calendar start_time = Calendar.getInstance();
         Calendar end_time = Calendar.getInstance();
         start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
-        end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH)+1, 0, 0, 0);
+        end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH) + 1, 0, 0, 0);
         String USER_NAME = request.getParameter("makeupCo") == null ? "" : request.getParameter("makeupCo");
         String DEPT_NAME = request.getParameter("DEPT_NAME") == null ? "" : request.getParameter("DEPT_NAME");
         String DEPT_ID = request.getParameter("DEPT_ID") == null ? "" : request.getParameter("DEPT_ID");
@@ -502,13 +511,13 @@ public class Visualization_Event_Controller extends AppBaseController {
 
     @RequestMapping("/getTrajectory")
     @ResponseBody
-    public List<Visualization_Trajectory> getTrajectory(HttpServletRequest request){
+    public List<Visualization_Trajectory> getTrajectory(HttpServletRequest request) {
         String userId = request.getParameter("USERID") == null ? "" : request.getParameter("USERID");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Calendar start_time = Calendar.getInstance();
         Calendar end_time = Calendar.getInstance();
         start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
-        end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH)+1, 0, 0, 0);
+        end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH) + 1, 0, 0, 0);
         String STARTTIME = request.getParameter("STARTTIME") == "" ? sdf.format(start_time.getTime()) : request.getParameter("STARTTIME");
         String ENDTIME = request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
         return visualization_event_service.getUserTrajectory(userId, STARTTIME, ENDTIME);
@@ -530,12 +539,12 @@ public class Visualization_Event_Controller extends AppBaseController {
 
 
     @RequestMapping("/showWrjDia")
-    public String showWrjDia(ModelMap map,HttpServletRequest request) {
-        map.put("previewURL",request.getParameter("url"));
+    public String showWrjDia(ModelMap map, HttpServletRequest request) {
+        map.put("previewURL", request.getParameter("url"));
         return prefix + "/wrjDia";
     }
 
-    private Integer getPageCount(List list,Integer pageSize) {
+    private Integer getPageCount(List list, Integer pageSize) {
         if (list.size() % pageSize == 0) {
             return list.size() / pageSize;
         } else {
@@ -545,41 +554,41 @@ public class Visualization_Event_Controller extends AppBaseController {
 
     /**
      * 设置障碍点
-     * */
+     */
     @RequestMapping("getVisualizationFrame_LZ")
-    public String getVisualizationFrame_LZ(ModelMap map){
+    public String getVisualizationFrame_LZ(ModelMap map) {
         Visualization_Level level = visualization_event_service.getResLevel();
-        map.put("level",level);
+        map.put("level", level);
         return prefix + "/lz";
     }
+
     /**
      * 设置无人机轨迹
-     * */
+     */
     @RequestMapping("getVisualizationFrame_WRJGJ")
-    public String getVisualizationFrame_WRJGJ(ModelMap map){
+    public String getVisualizationFrame_WRJGJ(ModelMap map) {
         List<Visualizaiton_UAV> wrjGjs = visualization_event_service.getWrjGjs();
-        map.put("wrjGjs",wrjGjs);
+        map.put("wrjGjs", wrjGjs);
         return prefix + "/wrjgj";
     }
 
 
     /**
      * 测量
-     * */
+     */
     @RequestMapping("getmeasure")
-    public String getmeasure(ModelMap map){
+    public String getmeasure(ModelMap map) {
 
         return prefix + "/measure";
     }
+
     @RequestMapping("getmeasure_size")
-    public String getmeasure_size(ModelMap map){
+    public String getmeasure_size(ModelMap map) {
 
         return prefix + "/measure_size";
     }
 
 
-
-
     @RequestMapping("/getAllFire")
     @ResponseBody
     public List<Visualization_Event> getAllFire() {
@@ -591,17 +600,18 @@ public class Visualization_Event_Controller extends AppBaseController {
     @ResponseBody
     public List<Visualization_Event> getAllOthers(HttpServletRequest request) {
         String reservePlanType = request.getParameter("reservePlanType");
-        return visualization_event_service.getAllOthers(reservePlanType,userInfoUtil.getLoginUserInfo().getDeptId().toString());
+        return visualization_event_service.getAllOthers(reservePlanType, userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
+
     @RequestMapping("/getAllPendingList")
     @ResponseBody
-    public List<Visualization_Event> getAllPendingList(HttpServletRequest request){
+    public List<Visualization_Event> getAllPendingList(HttpServletRequest request) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdfStart = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Calendar start_time = Calendar.getInstance();
         Calendar end_time = Calendar.getInstance();
         //start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH)-1);
-        start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH),start_time.get(Calendar.HOUR_OF_DAY),start_time.get(Calendar.MINUTE)-30);
+        start_time.set(start_time.get(Calendar.YEAR), start_time.get(Calendar.MONTH), start_time.get(Calendar.DAY_OF_MONTH), start_time.get(Calendar.HOUR_OF_DAY), start_time.get(Calendar.MINUTE) - 30);
         end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH));
         String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdfStart.format(start_time.getTime()) : request.getParameter("STARTTIME");
         String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
@@ -624,11 +634,11 @@ public class Visualization_Event_Controller extends AppBaseController {
 
     @RequestMapping("/getAllCamera")
     @ResponseBody
-    public List<Visualization_Camera> getAllCamera(HttpServletRequest request){
+    public List<Visualization_Camera> getAllCamera(HttpServletRequest request) {
         String model = request.getParameter("model");
         Visualization_Camera camera = new Visualization_Camera();
         camera.setDEPTID(userInfoUtil.getLoginUserInfo().getDeptId().toString());
-        if(model!= null && !model.equals("")){
+        if (model != null && !model.equals("")) {
             camera.setMODEL(model);
         }
         return visualization_event_service.getAllCamera(camera);
@@ -645,31 +655,35 @@ public class Visualization_Event_Controller extends AppBaseController {
     public Visualization_Camera getNearestCamera() {
         return visualization_event_service.getNearestCamera();
     }
+
     /*
      * 如果是小数，保留两位，非小数，保留整数
      * @param number
      */
     static int i = 0;
+
     public static String getDoubleString(double number) {
         String numberStr;
         if (((int) number * 1000) == (int) (number * 1000)) {
             //如果是一个整数
-            numberStr = String.valueOf((int) number/1000);
+            numberStr = String.valueOf((int) number / 1000);
         } else {
             DecimalFormat df = new DecimalFormat("######0.00");
-            numberStr = df.format(number/1000);
+            numberStr = df.format(number / 1000);
         }
-            if(i<5){
+        if (i < 5) {
             i++;
-            System.out.println(number+"=number numberStr="+numberStr);
+            System.out.println(number + "=number numberStr=" + numberStr);
         }
         return numberStr;
     }
+
     @RequestMapping("/getEventCount")
     @ResponseBody
     public int getEventCount() {
         return visualization_event_service.Visualization_Report_Event_Count();
     }
+
     @RequestMapping("/insertRoadBlocks")
     @ResponseBody
     public String insertRoadBlocks(HttpServletRequest request) {
@@ -678,13 +692,13 @@ public class Visualization_Event_Controller extends AppBaseController {
         roadBlocks.setID(UUID_Tools.getUUID());
         roadBlocks.setLATITUDE(request.getParameter("latitude"));
         roadBlocks.setLONGITUDE(request.getParameter("longitude"));
-        try{
+        try {
             visualization_event_service.insertRoadBlocks(roadBlocks);
-            jsonObject.put("code",100);
+            jsonObject.put("code", 100);
             return jsonObject.toString();
-        }catch(Exception ex){
+        } catch (Exception ex) {
             ex.printStackTrace();
-            jsonObject.put("code",200);
+            jsonObject.put("code", 200);
             return jsonObject.toString();
         }
     }
@@ -699,16 +713,19 @@ public class Visualization_Event_Controller extends AppBaseController {
         visualization_event_service.insertWrjGj(uav);
         return visualization_event_service.getWrjGjs();
     }
+
     @RequestMapping("/getWrjGjs")
     @ResponseBody
     public List<Visualizaiton_UAV> getWrjGjs() {
         return visualization_event_service.getWrjGjs();
     }
+
     @RequestMapping("/deleteWrjGjs")
     @ResponseBody
     public void deleteWrjGjs() {
         visualization_event_service.deleteWrjGjs();
     }
+
     @RequestMapping("/deleteRoadBlocks")
     @ResponseBody
     public String deleteRoadBlocks(HttpServletRequest request) {
@@ -716,16 +733,17 @@ public class Visualization_Event_Controller extends AppBaseController {
         roadBlocks.setLATITUDE(request.getParameter("latitude"));
         roadBlocks.setLONGITUDE(request.getParameter("longitude"));
         JSONObject jsonObject = new JSONObject();
-        try{
+        try {
             visualization_event_service.deleteRoadBlocks(roadBlocks);
-            jsonObject.put("code",100);
+            jsonObject.put("code", 100);
             return jsonObject.toString();
-        }catch(Exception ex){
+        } catch (Exception ex) {
             ex.printStackTrace();
-            jsonObject.put("code",200);
+            jsonObject.put("code", 200);
             return jsonObject.toString();
         }
     }
+
     @RequestMapping("/getRoadBlocks")
     @ResponseBody
     public List<Visualization_RoadBlocks> getRoadBlocks() {
@@ -740,9 +758,9 @@ public class Visualization_Event_Controller extends AppBaseController {
 
     @RequestMapping("/getXfResources")
     @ResponseBody
-    public List<Visualization_XF_Resources> getXfResources(@RequestParam(value = "typeArr[]") String [] typeArr, HttpServletRequest request) {
-        String [] types = typeArr;
-        return visualization_event_service.getXfResources(types,userInfoUtil.getLoginUserInfo().getDeptId().toString());
+    public List<Visualization_XF_Resources> getXfResources(@RequestParam(value = "typeArr[]") String[] typeArr, HttpServletRequest request) {
+        String[] types = typeArr;
+        return visualization_event_service.getXfResources(types, userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
 
     @RequestMapping("/getSourcesWater")

mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

@@ -113,4 +113,8 @@ public interface Visualization_Event_Mapper {
     List<Visualization_Event_Count> Visualization_Event_Each_Count(Visualization_Event_Count v);
 
     List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count(@Param("DEPT_ID") String DEPT_ID);
+
+    List<Visualization_Event_Count> fireEventCount();
+
+    List<Visualization_Event_Count> othersEventCount();
 }

mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java

@@ -57,4 +57,8 @@ public interface Visualization_Event_Service {
     List<Visualization_XF_Resources> getXfResources(String [] typeArr,String DEPT_ID);
     List<Visualization_Event_Count> Visualization_Event_Each_Count(Visualization_Event_Count v);
     List<Visualization_Event_Count> Visualization_ALL_Event_Each_Count();
+
+    List<Visualization_Event_Count> fireEventCount();
+
+    List<Visualization_Event_Count> othersEventCount();
 }

mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java

@@ -289,4 +289,14 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
         return Visualization_Event_Mapper.Visualization_ALL_Event_Each_Count(userInfoUtil.getLoginUserInfo().getDeptId().toString());
     }
 
+    @Override
+    public List<Visualization_Event_Count> fireEventCount() {
+        return Visualization_Event_Mapper.fireEventCount();
+    }
+
+    @Override
+    public List<Visualization_Event_Count> othersEventCount() {
+        return Visualization_Event_Mapper.othersEventCount();
+    }
+
 }

mybusiness/src/main/resources/templates/business/visualization/frame.html

@@ -25,7 +25,18 @@
         </div>
         <div id="jk_hover">
             <ul>
-                <li th:each="veec : ${Visualization_Event_Each_Count}">
+                <li th:each="veec : ${fireEventCount}">
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_1'">森林防火:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_2'">病虫害:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'">偷盗偷猎:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_4'">乱砍乱伐:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_5'">偷砂采石:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_6'">秸秆焚烧:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_7'">防汛防控:</span>
+                    <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_8'">野生动物:</span>
+                    [[${veec.COUNT}]]
+                </li>
+                <li th:each="veec : ${othersEventCount}">
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_1'">森林防火:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_2'">病虫害:</span>
                     <span th:if="${veec.RESERVEPLAN_TYPE} eq 'reserveplan_type_3'">偷盗偷猎:</span>