Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into

minhang

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang
廖磊
2 parents e4acdc1f 00a6afef
Showing 5 changed files with 36 additions and 7 deletions
src/main/java/com/bsth/controller/realcontrol/PageForwardingController.java
src/main/java/com/bsth/entity/sys/RealControAuthority.java
src/main/java/com/bsth/filter/ResourceFilter.java
src/main/resources/ms-jdbc.properties
src/main/resources/static/real_control_v2/js/north/toolbar.js
 package com.bsth.controller.realcontrol;
  
+import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.security.util.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
  
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 线调登入页面转发
  * Created by panzhao on 2017/1/21.
@@ -14,18 +19,36 @@ import org.springframework.web.servlet.ModelAndView;
 @RequestMapping("real_control")
 public class PageForwardingController {
  
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
     @RequestMapping("/v2")
-    public ModelAndView v2(){
+    public ModelAndView v2(HttpServletResponse response){
         ModelAndView mv = new ModelAndView();
         SysUser user = SecurityUtils.getCurrentUser();
  
         //班次管理员
         if(user.getUserName().equals("bcgly")){
             mv.setViewName("/real_control_v2/sch_manage/sch_imitate.html");
+            return mv;
         }
+
+        try{
+            //闵行运管所，直接打开地图页面
+            if(user.getRoles().size() == 1){
+                for(Role role : user.getRoles()){
+                    if(role.getCodeName().equals("MH_YGS")){
+                        // 直接重定向
+                        response.sendRedirect("/pages/mapmonitor/alone/wrap.html");
+                        return null;
+                    }
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+
         //正常线调主页
-        else
-            mv.setViewName("/real_control_v2/main.html");
+        mv.setViewName("/real_control_v2/main.html");
         return mv;
     }
 }
@@ -16,6 +16,7 @@ public class RealControAuthority {
     /**
      * 可调度的线路 , 分隔多个
      */
+    @Column(length = 4000)
     private String lineCodeStr;
  
     /**
@@ -42,7 +42,6 @@ public class ResourceFilter extends BaseFilter {
  
             if (f.exists() && f.isFile()) {
                 request.getRequestDispatcher("/?initFragment=" + joinParam(request)).forward(request, response);
-                ;
             } else
                 response.sendRedirect("/");
         }
 #ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #ms.mysql.username= root
 #ms.mysql.password= 123456
  
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= 123456
 \ No newline at end of file
+ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -179,6 +179,12 @@ var gb_northToolbar = (function () {
         },
         curr_date_schedule: function () {
             open_modal('/real_control_v2/fragments/north/nav/curr_date_schedule.html', {}, modal_opts);
+        },
+        form_schedule_daily_qp: function () {
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDailyQp.html', '调度工作日报表');
+        },
+        form_schedule_daily: function () {
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/statement/scheduleDaily.html', '调度工作日报表');
         }
     };