Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

潘钊
2 parents bd327425 c95559f3
Showing 11 changed files with 83 additions and 145 deletions
src/main/java/com/bsth/controller/realcontrol/calc/ReCalcDataController.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/resources/static/pages/base/line/list.html
src/main/resources/static/pages/base/lineversions/add.html
src/main/resources/static/pages/base/lineversions/js/lineversions-add-from.js
src/main/resources/static/pages/base/section/editsection.html
src/main/resources/static/pages/base/stationroute/editsection.html
src/main/resources/static/pages/forms/statement/account.html
src/main/resources/static/pages/report/sheet/list.html
-package com.bsth.controller.realcontrol.calc;
-
-import com.bsth.common.ResponseCode;
-import com.bsth.util.HttpClientUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 重新统计（数据汇总）
- * Created by panzhao on 2018/1/25.
- */
-@RestController
-@RequestMapping("/sch/reCalc")
-public class ReCalcDataController {
-
-    private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    /**
-     * 重新统计班次明细
-     * @param date
-     * @param line
-     * @return
-     */
-    @RequestMapping(value = "/scheduleDetail", method = RequestMethod.POST)
-    public Map<String, Object> reCalcScheduleDetail(@RequestParam String date, @RequestParam String line){
-        Map<String, Object> rs = new HashMap();
-        try{
-            HttpClientUtils.post(reCalcUrl + "?rq=" + date + "&lineCode=" + line, "");
-        }catch (Exception e){
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
-            rs.put("msg", e.getMessage());
-        }
-        return rs;
-    }
-}
+package com.bsth.controller.realcontrol.calc;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.util.HttpClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 重新统计（数据汇总）
+ * Created by panzhao on 2018/1/25.
+ */
+@RestController
+@RequestMapping("/sch/reCalc")
+public class ReCalcDataController {
+
+    private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    /**
+     * 重新统计班次明细
+     * @param date
+     * @param line
+     * @return
+     */
+    @RequestMapping(value = "/scheduleDetail", method = RequestMethod.POST)
+    public Map<String, Object> reCalcScheduleDetail(@RequestParam String date, @RequestParam String line){
+        Map<String, Object> rs = new HashMap();
+        try{
+            HttpClientUtils.post(reCalcUrl + "?rq=" + date + "&lineCode=" + line, "");
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+}
@@ -172,11 +172,11 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
 	void isRoadSpeedUpd(Integer isR,Integer line,Integer directions);
 	@Modifying
-	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+100) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+1) where line = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
 	public void sectionUpdSectionRouteCode(Integer line,Integer dir,Integer routeCod);
 	@Modifying
-	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+100) where line_code = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
+	@Query(value="UPDATE bsth_c_sectionroute set sectionroute_code = (sectionroute_code+1) where line_code = ?1  and directions = ?2 and sectionroute_code >=?3 and destroy = 0", nativeQuery=true)
 	public void sectionUpdSectionRouteCode(String lineCode,Integer dir,int routeCod);
 	@Modifying
@@ -235,7 +235,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
 			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
 			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));
 			lineVersions.setVersions(versions);
-			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
+			// 添加的线路版本默认为待更新的
+			lineVersions.setStatus(2);
 			lineVersions.setRemark(map.get("remark").toString());
 			repository.save(lineVersions);
 			// 更新上一版本时间
@@ -172,7 +172,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				SectionRoute route = new SectionRoute();
 				Line line = lineRepository.findOne(sectionRouteLine);
 				Section section = repository.findOne(sectionId);
-				route.setSectionrouteCode(sectionrouteCode+i*100);
+				route.setSectionrouteCode(sectionrouteCode+i);
 				route.setLineCode(lineCode);
 				route.setSectionCode(sectionCode);
 				route.setDirections(directions);
@@ -306,7 +306,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				LsSectionRoute route = new LsSectionRoute();
 				Line line = lineRepository.findOne(sectionRouteLine);
 				Section section = repository.findOne(sectionId);
-				route.setSectionrouteCode(sectionrouteCode+i*100);
+				route.setSectionrouteCode(sectionrouteCode+i);
 				route.setLineCode(lineCode);
 				route.setSectionCode(sectionCode);
 				route.setDirections(directions);
@@ -405,9 +405,9 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 					Integer routeCode = 0;
 					if(!sectionrouteCode.equals("")){
 						String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
-						routeCode = Integer.valueOf(sectionrouteCodeArray[0])+100;
+						routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
 					}else {
-						routeCode = 100;
+						routeCode = 1;
 					}
 					// 增加路段序号
@@ -455,11 +455,11 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 						}
 						repository.systemSave(sectionCode, sectionName, "", "", "", "", gsectionVector, bsectionVectorS, "", "", "", 0, 0, "", 0, "", 1, sectionId);
-						routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode+i*100);
+						routeRepository.sectionUpdSectionRouteCode(lineId, directions,routeCode+i);
 						SectionRoute route = new SectionRoute();
 						Line line = lineRepository.findOne(lineId);
 						Section section = repository.findOne(sectionId);
-						route.setSectionrouteCode(routeCode+i*100);
+						route.setSectionrouteCode(routeCode+i);
 						route.setLineCode(lineCode);
 						route.setSectionCode(sectionCode);
 						route.setDirections(directions);
@@ -662,11 +662,12 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段路由
 			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
 			SectionRoute resultS = routeRepository.findOne(sectionRouteId);
-			int old_code = resultS.getSectionrouteCode();
+//			int old_code = resultS.getSectionrouteCode();
+			// 如果为空，默认在第一个路段
 			if(sectionrouteCode!=null) {
-				sectionrouteCode += 100;
+				sectionrouteCode += 1;
 			}else {
-				sectionrouteCode = old_code;
+				sectionrouteCode = 1;
 			}
 			routeRepository.sectionUpdSectionRouteCode(lineCode, directions,sectionrouteCode);
 			// 限速
@@ -784,18 +785,14 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Double  sectionTime = map.get("sectionTime").equals("") ? null : Double.valueOf(map.get("sectionTime").toString());
 			// 路段路由
 //			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
-			Integer sectionrouteCode = 100;
+			Integer sectionrouteCode = 1;
 			SectionRouteCache resultS = routeCacheRepository.findOne(sectionRouteId);
 			int old_code = resultS.getSectionrouteCode();
 			if(sectionrouteCode!=null) {
-				int new_code = sectionrouteCode+100;
-				if(new_code==old_code){
-					sectionrouteCode = new_code;
-				}else {
-					sectionrouteCode = new_code-100+1;
-				}
+				sectionrouteCode += 1;
+				// 默认是最前面路段
 			}else {
-				sectionrouteCode = old_code;
+				sectionrouteCode = 1;
 			}
 			routeRepository.sectionUpdSectionRouteCode(lineCode, directions,sectionrouteCode);
 			// 限速
@@ -959,9 +956,9 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Integer routeCode = null;
 			if(!sectionrouteCode.equals("")){
 				String sectionrouteCodeArray[] =  sectionrouteCode.split("_");
-				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+100;
+				routeCode = Integer.valueOf(sectionrouteCodeArray[0])+1;
 			}else {
-				routeCode = 100;
+				routeCode = 1;
 			}	
 			routeRepository.sectionUpdSectionRouteCode(lineId, directions, routeCode);
 			sectionRoute.setSectionrouteCode(routeCode);
@@ -247,75 +247,9 @@
 			</td>
 			<td>
 				{{obj.gsmc}}
-				<!--{{if obj.company == '55'}}
-					上南公司
-				{{else if obj.company == '22'}}
-					金高公司
-				{{else if obj.company == '05'}}
-					杨高公司
-				{{else if obj.company == '26'}}
-					南汇公司
-				{{else if obj.company == '77'}}
-					闵行公司
-				{{/if}}-->
 			</td>
 			<td>
 				{{obj.fgsmc}}
-				<!--{{if obj.company == '55'}}
-
-					{{if obj.brancheCompany == '1'}}
-						上南二分公司
-					{{else if obj.brancheCompany == '2'}}
-						上南三分公司
-					{{else if obj.brancheCompany == '3'}}
-						上南六分公司
-					{{else if obj.brancheCompany == '4'}}
-						上南一分公司
-					{{/if}}
-
-				{{else if obj.company == '22'}}
-
-					{{if obj.brancheCompany == '1'}}
-						四分公司
-					{{else if obj.brancheCompany == '2'}}
-						二分公司
-					{{else if obj.brancheCompany == '3'}}
-						三分公司
-					{{else if obj.brancheCompany == '5'}}
-						一分公司
-					{{/if}}
-		
-				{{else if obj.company == '05'}}
-					
-					{{if obj.brancheCompany == '1'}}
-						川沙分公司
-					{{else if obj.brancheCompany == '2'}}
-						金桥分公司
-					{{else if obj.brancheCompany == '3'}}
-						芦潮港分公司
-					{{else if obj.brancheCompany == '5'}}
-						杨高分公司
-					{{else if obj.brancheCompany == '6'}}
-						周浦分公司
-					{{/if}}
-
-				{{else if obj.company == '26'}}
-
-					{{if obj.brancheCompany == '1'}}
-						南汇一分
-					{{else if obj.brancheCompany == '2'}}
-						南汇二分
-					{{else if obj.brancheCompany == '3'}}
-						南汇三分
-					{{else if obj.brancheCompany == '4'}}
-						南汇维修公司
-					{{else if obj.brancheCompany == '5'}}
-						南汇公司
-					{{else if obj.brancheCompany == '6'}}
-						航头枢纽站
-					{{/if}}
-
-				{{/if}}-->
 			</td>
 			<td>
 				{{if obj.nature == 'lj'}}
@@ -44,8 +44,7 @@
 			<div class="form-body">
 				<input type="hidden" name="lineId" id="lineIdInput" />
 				<input type="hidden" name="lineCode" id="lineCodeInput" />
-				<input type="hidden" name="lineCode" id="statusInput" />
-                 
+
                  <!-- 表单分组组件 form-group START -->
 				<div class="form-group">
 						<label class="control-label col-md-5">
@@ -198,7 +198,7 @@
 				// 防止用户多次提交
 				$("#submintBtn").addClass("disabled");
 				// 添加数据
-				$post('/lineVersions/add', params, function(result) {
+                $post('/lineVersions/add', params, function(result) {
 					// 如果返回结果不为空
 					if(result){
 						// 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
@@ -184,7 +184,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 		}); */
 		var array = treeData[0].children[1].children,paramsD =new Array();	
 		var eq_scetionRouteCode =  Section.sectionRouteCode;
-		paramsD.push({'id':'请选择...','text':'请选择...'});
+		paramsD.push({'id':'请选择...','text':'将此路段设置位第一个路段'});
 		// 遍历.
 		$.each(array, function(i, g){
 			// 判断.
@@ -300,5 +300,5 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			});
 		}
 	});
-});
+});
 </script>
 \ No newline at end of file
@@ -168,7 +168,7 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 										+ ' --' + fun.dirdmToName(dArray[i].sectionrouteDirections)  + '</option>' ;
 		}
 		$('#sectionrouteCodeSelect').html(options); */
-		paramsD.push({'id':'请选择...','text':'请选择...'});
+		paramsD.push({'id':'请选择...','text':'将此路段设置位第一个路段'});
 		// 遍历.
 		$.each(array, function(i, g){
 			// 判断.
@@ -270,5 +270,5 @@ $(&#39;#edit_section_mobal&#39;).on(&#39;editSectionMobal_show&#39;, function(e, map_,ajaxd,sect
 			});
 		}
 	});
-});
+});
 </script>
 \ No newline at end of file
@@ -114,7 +114,7 @@
 					}
 				}
 				initPinYinSelect2('#line',data,'');
-				
+				initCl();
 			});
 		});
 		//重置
@@ -49,7 +49,7 @@
 		</div>
 	</div>
 </div>
-
+<script src="/pages/mforms/singledatas/jquery.table2excel.min.js"></script>
 <script>
 	$(function(){
 		// 关闭左侧栏
@@ -64,10 +64,17 @@
 				});
 		 })
 		 $("#exportList").on('click',function(){
-			
-			 $get('/sheet/exportList',params,function(result){
-					window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+			 $("#forms_2").table2excel({
+					// 不被导出的表格行的CSS class类
+					exclude: ".noExl",
+					// 导出的Excel文档的名称，（没看到作用）
+					name: "Excel Document Name.xlsx",
+					// Excel文件的名称
+					filename: "班次准点率"
 				});
+// 			 $get('/sheet/exportList',params,function(result){
+// 					window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+// 				});
 		});