Преглед изворни кода

七个数据隔离 水源,救援设备,起降点,气象站,放火站,防火队,森林管理 经纬度 用户不验证Email Unique
非必填 APP 七个基础数据 修改用户登录状态判断 用户邮箱保存 Excel 上传 测距离跨域 测量面积 其他事件详情
按照时间查询 已归档的事件 五个导入 起降点,气象站,放火站,防火队,森林管理 上传.xle文件 历史火情
可视化人员 首页人员 30 分钟

wangzhe пре 3 година
родитељ
комит
bad2f8f2c8

+ 10 - 4
mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -97,12 +97,16 @@ public class Visualization_Event_Controller extends AppBaseController {
     @RequestMapping("/getVisualizationFrame")
     @RequestMapping("/getVisualizationFrame")
     public String getVisualizationFrame(ModelMap map, HttpServletRequest request) {
     public String getVisualizationFrame(ModelMap map, HttpServletRequest request) {
         logger.info("getVisualizationFrame");
         logger.info("getVisualizationFrame");
+        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdfStart = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Calendar start_time = Calendar.getInstance();
         Calendar start_time = Calendar.getInstance();
         Calendar end_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)-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);
         end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH));
         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") == "" ? sdf.format(start_time.getTime()) : request.getParameter("STARTTIME");
+        String STARTTIME = request.getParameter("STARTTIME") == null || request.getParameter("STARTTIME") == "" ? sdfStart.format(start_time.getTime()) : request.getParameter("STARTTIME");
+        System.out.println("STARTTIME====="+STARTTIME);
         String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
         String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
         String EVENTNAME = request.getParameter("EVENTNAME");
         String EVENTNAME = request.getParameter("EVENTNAME");
         String DEPTID = request.getParameter("DEPTID");
         String DEPTID = request.getParameter("DEPTID");
@@ -503,11 +507,13 @@ public class Visualization_Event_Controller extends AppBaseController {
     @ResponseBody
     @ResponseBody
     public List<Visualization_Event> getAllPendingList(HttpServletRequest request){
     public List<Visualization_Event> getAllPendingList(HttpServletRequest request){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdfStart = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Calendar start_time = Calendar.getInstance();
         Calendar start_time = Calendar.getInstance();
         Calendar end_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)-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);
         end_time.set(end_time.get(Calendar.YEAR), end_time.get(Calendar.MONTH), end_time.get(Calendar.DAY_OF_MONTH));
         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") == "" ? sdf.format(start_time.getTime()) : request.getParameter("STARTTIME");
+        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");
         String ENDTIME = request.getParameter("ENDTIME") == null || request.getParameter("ENDTIME") == "" ? sdf.format(end_time.getTime()) : request.getParameter("ENDTIME");
         String EVENTNAME = request.getParameter("EVENTNAME");
         String EVENTNAME = request.getParameter("EVENTNAME");
         String DEPTID = request.getParameter("DEPTID");
         String DEPTID = request.getParameter("DEPTID");