bf

yiming
1 parent d7f90c62
Showing 3 changed files with 31 additions and 53 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/controller/BsthTLineHistoryReportController.java
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
bsthLineProfiles/src/main/resources/templates/system/line/map.html
 package com.ruoyi.project.system.line.controller;
  
-import java.io.IOException;
-import java.io.OutputStream;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import cn.hutool.poi.excel.StyleSet;
 import com.ruoyi.project.system.line.domain.Export;
-import org.apache.poi.*;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.project.system.line.domain.LineHistoryReport;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.system.dict.domain.DictData;
 import com.ruoyi.project.system.dict.service.IDictDataService;
 import com.ruoyi.project.system.line.domain.BsthTLine;
-import com.ruoyi.project.system.line.domain.LineEditReport;
 import com.ruoyi.project.system.line.service.IBsthTLineService;
-import com.ruoyi.project.system.user.domain.User;
 import com.ruoyi.project.system.user.service.IUserService;
 import com.ruoyi.project.utils.ExcelUtils;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
 @Controller
@@ -104,6 +84,7 @@ public class BsthTLineHistoryReportController extends BaseController
         List<DictData> dicts = dictDataService.selectDictDataList(null);
         Map<String,List<DictData>> dictMap = new HashMap();
         List<String> titles=new ArrayList<>();
+        titles.add("lineName");
         for(DictData d : dicts) {
             if(dictMap.get(d.getDictType()) == null) {
                 dictMap.put(d.getDictType(), new ArrayList<DictData>());
@@ -122,13 +103,15 @@ public class BsthTLineHistoryReportController extends BaseController
                         Field f2 = line.getClass().getDeclaredField(name+"Old");
                         f.setAccessible(true);
                         f2.setAccessible(true);
-                        f.get(line);
                         String v =f.get(line)==null?"":f.get(line).toString();
                         String vo=f2.get(line)==null?"":f2.get(line).toString();
                         //如果没变置空
                         if(v.equals(vo)){
                             f.set(line, null);
                             f2.set(line, null);
+                        }else {
+                            titles.add(name);
+                            titles.add(name+"Old");
                         }
                         v =f.get(line)==null?"":f.get(line).toString();
                         vo=f2.get(line)==null?"":f2.get(line).toString();
@@ -188,7 +171,7 @@ public class BsthTLineHistoryReportController extends BaseController
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
-
+        titles=titles.stream().distinct().collect(Collectors.toList());
  
         ExcelUtil<LineHistoryReport> util = new ExcelUtil<LineHistoryReport>(LineHistoryReport.class);
         util.setTitles(titles);
@@ -201,13 +184,12 @@ public class BsthTLineHistoryReportController extends BaseController
     @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @RequestMapping("/export2")
     @ResponseBody
-    public void export(HttpServletResponse response, BsthTLine bsthTLine, HttpServletRequest request) throws NoSuchFieldException {
+    public void export(HttpServletResponse response, BsthTLine bsthTLine) throws NoSuchFieldException {
         //查询变更记录
         List<LineHistoryReport> list =bsthTLineService.getLineHistoryReport(bsthTLine);
  
         List<DictData> dicts = dictDataService.selectDictDataList(null);
         Map<String,List<DictData>> dictMap = new HashMap();
-        List<String> titles=new ArrayList<>();
         for(DictData d : dicts) {
             if(dictMap.get(d.getDictType()) == null) {
                 dictMap.put(d.getDictType(), new ArrayList<DictData>());
@@ -301,7 +283,10 @@ public class BsthTLineHistoryReportController extends BaseController
         writer.passCurrentRow();
         writer.passCurrentRow();
         //设置列名
-        writer.merge(0,0,0,13, "2021年1月1日起至今延辟调线路情况",true);
+        String createTimeStr="".equals(bsthTLine.getCreateTimeStr())?"":bsthTLine.getCreateTimeStr().substring(0,10);
+        String getCreateTimeEnd="".equals(bsthTLine.getCreateTimeEnd())?"今":bsthTLine.getCreateTimeEnd().substring(0,10);
+        String title=createTimeStr+"至"+getCreateTimeEnd+"延辟调线路情况";
+        writer.merge(0,0,0,13,title,true);
         writer.setRowHeight(0,30);
         writer.merge(1,2,0,0,"单位",false);
         writer.merge(1,2,1,1,"序号",false);
@@ -441,7 +426,7 @@ public class BsthTLineHistoryReportController extends BaseController
         writer.write(result, false);
         //设置行高
         ExcelUtils.setHeight(writer, (short) 2);
-        ExcelUtils.downloadExcel(response,"变更报表",writer);
+        ExcelUtils.downloadExcel(response,title,writer);
     }
  
     public static Object getObjectField(Field field,String valueStr) throws Exception{
@@ -323,7 +323,7 @@ public class LineHistoryReport extends BaseEntity
  
 	@Excel(name = "站点名称")
 	private String halfwayStation;
-	@Excel(name = "站点名称")
+	@Excel(name = "原站点名称")
 	private String halfwayStationOld;
  
 	@Excel(name = "高峰系数")
@@ -197,20 +197,24 @@ body, html, #container {
 		});
 		var stations
 		*/
-
+		var sp;
+		var myicon = new BMapGL.Icon(
+				'http://webmap0.map.bdstatic.com/wolfman/static/common/images/us_cursor_9517a2b.png', // 百度图片
+				new BMapGL.Size(18,26), // 视窗大小
+				{
+					imageSize: new BMapGL.Size(144,92), // 引用图片实际大小
+					imageOffset:new BMapGL.Size(18,22)  // 图片相对视窗的偏移
+				}
+		);
 		//地点查询
 		function searchStation(){
-			var station=$('#stations').val();
-			var distance=$("#distance").val()
-
-			//创建地址解析器实例
-			var myGeo = new BMapGL.Geocoder();
-			// 将地址解析结果显示在地图上，并调整地图视野
-			myGeo.getPoint(station, function(point){
-				map.clearOverlays();
-				map.centerAndZoom(point, 17);
-				a(point.lng,point.lat,distance)
-			}, '上海市')
+			var distance=$("#distance").val();
+			map.clearOverlays();
+			map.centerAndZoom(sp, 18);
+			var marker = new BMapGL.Marker(sp);
+			marker.setIcon(myicon);
+			map.addOverlay(marker);    //添加标注
+			a(sp.lng,sp.lat,distance);
 		}
  
 		//道路查询
@@ -401,19 +405,16 @@ body, html, #container {
 			var _value = e.item.value;
 			myValue = _value.province +  _value.city +  _value.district +  _value.street +  _value.business;
 			G("stations").innerHTML ="onconfirm<br />index = " + e.item.index + "<br />myValue = " + myValue;
-
 			setPlace();
 		});
 		function setPlace(){
-			map.clearOverlays();    //清除地图上所有覆盖物
 			function myFun(){
-				var pp = local.getResults().getPoi(0).point;    //获取第一个智能搜索的结果
-				map.centerAndZoom(pp, 18);
-				map.addOverlay(new BMapGL.Marker(pp));    //添加标注
+				sp = local.getResults().getPoi(0).point;    //获取第一个智能搜索的结果
 			}
 			var local = new BMapGL.LocalSearch(map, { //智能搜索
 				onSearchComplete: myFun
 			});
+			local.search(myValue);
 		}
  
  
@@ -468,14 +469,6 @@ body, html, #container {
 		map.addEventListener('rightclick', function(e){
 			var pt = e.latlng;
 			var marker = new BMapGL.Marker(new BMapGL.Point(pt.lng, pt.lat));
-			var myicon = new BMapGL.Icon(
-					'http://webmap0.map.bdstatic.com/wolfman/static/common/images/us_cursor_9517a2b.png', // 百度图片
-					new BMapGL.Size(18,26), // 视窗大小
-					{
-						imageSize: new BMapGL.Size(144,92), // 引用图片实际大小
-						imageOffset:new BMapGL.Size(18,22)  // 图片相对视窗的偏移
-					}
-			);
 			marker.setIcon(myicon);
 			map.removeOverlay(p);
 			p=marker;