bf

yiming
1 parent a937be67
Showing 10 changed files with 176 additions and 134 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/mapper/BsthTLineMapper.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/IBsthTLineService.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/service/impl/BsthTLineServiceImpl.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
bsthLineProfiles/src/main/resources/mybatis/mybatis/system/BsthTLineMapper.xml
bsthLineProfiles/src/main/resources/templates/system/line/line.html
bsthLineProfiles/src/main/resources/templates/system/line/map.html
bsthLineProfiles/src/main/resources/templates/system/lineAdd/line.html
bsthLineProfiles/src/main/resources/templates/system/lineExamine/line.html
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
 import java.io.File;
 import java.lang.reflect.Field;
@@ -52,11 +53,15 @@ public class BsthTLineController extends BaseController
      */
     @RequiresPermissions("system:line:view")
     @GetMapping()
-    public String line()
+    public ModelAndView line()
     {
-        return prefix + "/line";
+        ModelAndView mv=new ModelAndView(prefix + "/line");
+        List<Map> companyList=bsthTLineService.selectCompany();
+        mv.addObject("companyList",companyList);
+        return mv;
     }
+
     /**
      * 线路分页
      */
@@ -277,6 +282,9 @@ public class BsthTLineController extends BaseController
         return ajaxResult;
     }
+
+
+
     /*
 package com.ruoyi.project.system.line.mapper;
 import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.project.system.line.domain.BsthTLine;
 import com.ruoyi.project.system.line.domain.LineEditReport;
 import org.apache.ibatis.annotations.Mapper;
@@ -71,7 +73,7 @@ public interface BsthTLineMapper
 	/*int createLineMonthReport(BsthTLine line);*/
-
+	List<Map> selectCompany();
 package com.ruoyi.project.system.line.service;
 import java.util.List;
+import java.util.Map;
 import com.alibaba.fastjson.JSONArray;
 import com.ruoyi.project.system.line.domain.BsthTLine;
@@ -60,5 +61,7 @@ public interface IBsthTLineService
 	BsthTLine selectHistoryByLineNameAndUpdateStatus(BsthTLine bsthTLine);
 	int deleteBsthTLineHistoryById(Long id);
+
+	List<Map> selectCompany();
 	/*int createLineMonthReport();*/
 }
@@ -443,4 +443,9 @@ public class BsthTLineServiceImpl implements IBsthTLineService
 		return bsthTLineMapper.deleteBsthTLineHistoryById(id);
 	}
+	@Override
+	public List<Map> selectCompany(){
+		return bsthTLineMapper.selectCompany();
+	}
+
 }
 package com.ruoyi.project.system.user.controller;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.UsernamePasswordToken;
@@ -27,9 +18,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -38,25 +26,23 @@ import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.shiro.service.PasswordService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.service.PermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.project.system.config.service.IConfigService;
 import com.ruoyi.project.system.menu.domain.Menu;
 import com.ruoyi.project.system.menu.service.IMenuService;
+import com.ruoyi.project.system.menu.service.MenuServiceImpl;
 import com.ruoyi.project.system.user.domain.User;
-import io.jsonwebtoken.lang.Assert;
-
 /**
  * 登录验证
- * 
+ *
  * @author ruoyi
  */
 @Controller
 public class LoginController extends BaseController
 {
-	@Autowired
-	TokenService tokenService;
+    @Autowired
+    TokenService tokenService;
     @Autowired
     private IMenuService menuService;
@@ -69,8 +55,7 @@ public class LoginController extends BaseController
     @Autowired
     private RuoYiConfig ruoYiConfig;
-    
-	
+
     @GetMapping("/login")
     public String login(HttpServletRequest request, HttpServletResponse response)
     {
@@ -82,62 +67,23 @@ public class LoginController extends BaseController
         return "login";
     }
-    
+
     @GetMapping("/getInfo")
     public String getInfo(String token,ModelMap mmap)
     {
-    	
-    	if(token != null) {
-    		
-    		User user = tokenService.getUser(token);
-    	    if (user == null && token != null) {    	        
-    	        
-    	        String dataJsonStr = sendPost("http://180.169.154.251:18080/information/authenticate/loginAuthentication",token);
-    	        
-    	        
-    	        JSONObject jsonObject = JSON.parseObject(dataJsonStr);
-
-    	        
-    	        JSONObject dataJson = jsonObject.getJSONObject("data");
-
-    	        Assert.notNull(dataJson, "获取用户信息异常");
-    	        
-    	        
-    	        JSONArray jsonMenu = dataJson.getJSONArray("userAuthList").getJSONObject(0).getJSONArray("roleList").getJSONObject(0).getJSONArray("resourceList");
-    	        
-    	        Map<Long,Menu> menuMap = new HashMap<Long,Menu>();
-    	        
-    	        String ids = "";
-    	        
-	        	for(Object json:jsonMenu) {
-	        		ids += ((JSONObject)json).getLongValue("menuId") + ",";
-    	        }
-	        	
-	        	ids.substring(0,ids.length() -1);
+        if(token != null) {
-    	        List<Menu> allMenus = menuService.selectMenuNormalByMenuIds(ids.split(","));
-	        
-	        	
+            login("admin","admin123",false);
-        		login("admin","admin123",false);
-        		user = getSysUser();
-    	        user.setToken(token);
-//    	        user.setPermissions(permissionService.getMenuPermission());
-    	        tokenService.createToken(user);
-    	        
-    	      
-    	        //String username = dataJson.getString("account");
-//    	        String username = "admin";
-//    	        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-//    	        SysUser sysUser = sysUserService.selectUserByUserName(username);
-
-//    	        user.setPermissions(permissionService.getMenuPermission(sysUser));
-//    	        user.setUser(sysUser);
-    	
-    		
-            mmap.put("menus", allMenus);
+            // 取身份信息
+            User user = getSysUser();
+            // 根据用户id取出菜单
+            List<Menu> menus = menuService.selectMenusByUser(user);
+            mmap.put("menus", menus);
             mmap.put("user", user);
+            mmap.put("sideTheme", "theme-dark");
+            mmap.put("skinName", "skin-blue");
             mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
             mmap.put("copyrightYear", ruoYiConfig.getCopyrightYear());
             mmap.put("demoEnabled", ruoYiConfig.isDemoEnabled());
@@ -148,50 +94,36 @@ public class LoginController extends BaseController
             String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");
             // 移动端，默认使左侧导航菜单，否则取默认配置
             String indexStyle = ServletUtils.checkAgentIsMobile(ServletUtils.getRequest().getHeader("User-Agent")) ? "index" : menuStyle;
-            
-            
+
+            // 优先Cookie配置导航菜单
+            Cookie[] cookies = ServletUtils.getRequest().getCookies();
+            for (Cookie cookie : cookies)
+            {
+                if (StringUtils.isNotEmpty(cookie.getName()) && "nav-style".equalsIgnoreCase(cookie.getName()))
+                {
+                    indexStyle = cookie.getValue();
+                    break;
+                }
+            }
+
             return "index";
-    		
-    	}
-    	    
-    	}
+
+        }else {
+            return "login";
+        }
+
 //        User loginUser = tokenService.getUser(ServletUtils.getRequest());
-        
+
 //        UsernamePasswordToken token = new UsernamePasswordToken(loginUser.getUserName(), loginUser.getPassword(), false);
 //        Subject subject = SecurityUtils.getSubject();
 //            subject.login(token);
 //            return success();
-        	
-        return "index";
-    }
-public String sendPost(String url,String token) {
-	    String strresponse = null;
-	    try{
-	    	HttpClient hc = HttpClientBuilder.create().build();//获取DefaultHttpClient请求
-	       HttpPost hp = new HttpPost(url);
-	       JSONObject jsonParam = new JSONObject();
-	       jsonParam.put("token", token);
-	       jsonParam.put("systemCode", "SYS0015");
-	       //设置数据为utf-8编码
-	       StringEntity entity = new StringEntity(jsonParam.toString(),"utf-8");
-	       //设置请求编码
-	       entity.setContentEncoding("utf-8");
-	       //设置请求类型
-	       entity.setContentType("application/json");
-	       hp.setEntity(entity);
-	       //请求并得到结果
-	       HttpResponse result = hc.execute(hp);
-	       strresponse = EntityUtils.toString(result.getEntity(),"utf-8").trim();
-	    }catch(Exception e){
-	       e.printStackTrace();
-	}
-	return strresponse;
-	
-}
+
+    }
     // 检查初始密码是否提醒修改
     public boolean initPasswordIsModify(Date pwdUpdateDate)
@@ -199,7 +131,7 @@ public String sendPost(String url,String token) {
         Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
         return initPasswordModify !=null && initPasswordModify == 1 && pwdUpdateDate == null;
     }
-    
+
     // 检查密码是否过期
     public boolean passwordIsExpiration(Date pwdUpdateDate)
     {
@@ -216,7 +148,7 @@ public String sendPost(String url,String token) {
         }
         return false;
     }
-    
+
     public void login(String username, String password, Boolean rememberMe)
     {
         UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
@@ -234,7 +166,7 @@ public String sendPost(String url,String token) {
             }
         }
     }
-    
+
     @PostMapping("/login")
     @ResponseBody
     public AjaxResult ajaxLogin(String username, String password, Boolean rememberMe)
@@ -262,4 +194,4 @@ public String sendPost(String url,String token) {
     {
         return "error/unauth";
     }
 -}
+}
 \ No newline at end of file
@@ -1699,7 +1699,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		delete from bsth_t_line_history where id=#{id}
 	</delete>
-
+	<select id="selectCompany" resultType="map">
+		select * from bsth_company
+	</select>
 <!--
@@ -3,6 +3,7 @@
 	  xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<th:block th:include="include :: header('线路档案信息')" />
+	<th:block th:include="include :: select2-css" />
 </head>
 <body class="gray-bg">
 <div class="container-div" id="context">
@@ -11,9 +12,13 @@
 			<form id="formId">
 				<div class="select-list">
 					<ul>
-						<li><label>公司：</label> <input type="text" name="company" />
+						<li><label>公司：</label>
+							<select id='company' >
+							</select>
 						</li>
-						<li><label>分公司：</label> <input type="text" name="fCompany" />
+						<li><label>分公司：</label>
+							<select id='fCompany' >
+							</select>
 						</li>
 						<li><label>线路名称：</label> <input type="text" name="lineName" />
 						</li>
@@ -214,6 +219,7 @@
 	</div>
 </div>
 <th:block th:include="include :: footer" />
+<th:block th:include="include :: select2-js" />
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 	 aria-labelledby="myModalLabel" aria-hidden="true">
 	<div class="modal-dialog">
@@ -241,7 +247,83 @@
 <script th:inline="javascript">
+	var companyList=[[${companyList}]];
+	var companies=new Array();
+	var fCompanies=new Array();
+	$(function() {
+			for(let i in companyList){
+				companies[i]=companyList[i].company;
+				fCompanies[i]=companyList[i].fCompany;
+			}
+			companies=Array.from(new Set(companies));
+			companySelect();
+			fCompanySelect(false);
+			$('#company').on('change.select2', function (e) {
+				fCompanySelect(true)
+			});
+		});
+
+	function companySelect(){
+		var arr = new Array();
+		var company=new Object();
+		company.id='';
+		company.text='';
+		company.value='';
+		arr.push(company)
+		for (var i = 0; i < companies.length; i++) {
+			company=new Object();
+			company.id=companies[i];
+			company.text=companies[i];
+			company.value=companies[i];
+			arr.push(company);
+		}
+		$("#company").select2({
+			data: arr,
+			placeholder:'请选择',
+			allowClear:true
+		})
+	}
+
+
+	function fCompanySelect(flag){
+		$('#fCompany').empty();
+		var company=$('#company').select2('val');
+		var arr = new Array();
+		var fCompany=new Object();
+		fCompany.id='';
+		fCompany.text='';
+		fCompany.value='';
+		arr.push(fCompany)
+		if(company==''){
+			for(let i in companyList){
+				var companyName=companyList[i].company;
+				var fCompanyName=companyList[i].fCompany;
+				fCompany=new Object();
+				fCompany.id=fCompanyName;
+				fCompany.text=fCompanyName;
+				fCompany.value=fCompanyName;
+				arr.push(fCompany);
+			}
+		}else {
+			for(let i in companyList){
+				var companyName=companyList[i].company;
+				var fCompanyName=companyList[i].fCompany;
+				if(companyName==company){
+					fCompany=new Object();
+					fCompany.id=fCompanyName;
+					fCompany.text=fCompanyName;
+					fCompany.value=fCompanyName;
+					arr.push(fCompany);
+				}
+			}
+		}
+		$("#fCompany").select2({
+			data: arr,
+			placeholder:'请选择',
+			allowClear:true
+		});
+	}
 	new Vue({
 		el: '#context',
@@ -404,6 +486,8 @@
 	function queryParams(params) {
 		var search = $.table.queryParams(params);
+		search.company=$('#company').select2('val');
+		search.fCompany=$('#fCompany').select2('val');
 		return search;
 	}
 	var editFlag = [[${@permission.hasPermi('system:line:edit')}]];
@@ -48,7 +48,7 @@ body, html, #container {
 		<form id="station">
 			<div class="row">
 				<h4></h4>
-				<label class="col-sm-3"><h4>&nbsp;&nbsp;站点</h4></label>
+				<label class="col-sm-3"><h4 style="text-align:right">站点</h4></label>
 				<div class="col-sm-9" >
 					<select id='stations' >
 						<option value=""></option>
@@ -58,7 +58,7 @@ body, html, #container {
 			</div>
 			<div class="row">
 				<h4></h4>
-				<label class="col-sm-3"><h4>&nbsp;&nbsp;范围</h4></label>
+				<label class="col-sm-3"><h4 style="text-align:right">范围</h4></label>
 				<div class="col-sm-9">
 					<input id="distance" class="form-control" type="text" placeholder="单位米">
 				</div>
@@ -78,7 +78,7 @@ body, html, #container {
 		<form id="road" style="display:none;">
 			<div class="row">
 				<h4></h4>
-				<label class="col-sm-3"><h4>&nbsp;&nbsp;路名</h4></label>
+				<label class="col-sm-3"><h4 style="text-align:right">路名</h4></label>
 				<div class="col-sm-9">
 					<input id="roadName" class="form-control" type="text">
 				</div>
@@ -113,7 +113,6 @@ body, html, #container {
 	<div class="info stationInfo">
 		<div id="stationInfo"></div>
-
 	</div>
 	<div id="container"></div>
@@ -67,6 +67,23 @@
 	<script th:inline="javascript">
+		$(function() {
+			stations=data.stations;
+			var arr = new Array();
+			for (var i = 0; i < stations.length; i++) {
+				var station=new Object();
+				station.id=stations[i];
+				station.text=stations[i];
+				station.value=stations[i];
+				arr.push(station);
+			}
+			$("#company").select2({
+				data: arr,
+				placeholder:'请选择',
+				allowClear:true
+			})
+		});
+
 		function add(obj){
 			if($(obj)[0].className.indexOf("disabled") == -1)
 				$.operate.addFull();
@@ -12,31 +12,20 @@
 				<form id="formId">
 					<div class="select-list">
 						<ul>
-							<div class="form-group">
-							<li class="col-sm-3"><label>公司：</label> <input type="text" name="company" />
+							<li><label>公司：</label> <input type="text" name="company" />
 							</li>
-							<li class="col-sm-3"><label>分公司：</label> <input type="text" name="fCompany" />
+							<li><label>分公司：</label> <input type="text" name="fCompany" />
 							</li>
-							<li class="col-sm-3"><label>线路名称：</label> <input type="text" name="lineName" />
+							<li><label>线路名称：</label> <input type="text" name="lineName" />
 							</li>
-							<li class="col-sm-3"><label>申请开始：</label>
-								<div class="input-group date">
-									<input name="createTimeStr" id="createTimeStr" class="form-control" placeholder="yyyy-MM-dd" type="text"
+							<li ><label>申请开始：</label>
+								<input name="createTimeStr" id="createTimeStr" class="form-control" placeholder="yyyy-MM-dd" type="text"
 										   autocomplete="off">
-									<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-								</div>
 							</li>
-							</div>
-							<div class="form-group">
-							<li class="col-sm-3"><label>申请结束：</label>
-								<div class="input-group date">
+							<li><label>申请结束：</label>
 									<input name="createTimeEnd" id="createTimeEnd" class="form-control" placeholder="yyyy-MM-dd" type="text"
 										   autocomplete="off">
-									<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-								</div>
 							</li>
-							</div>
-
 							<li>
 								<el-button size="mini" type="primary" icon="el-icon-search"  onClick="$.table.search();">搜索</el-button>
 								<el-button size="mini" icon="el-icon-refresh"  onClick="$.form.reset();">重置</el-button>