1.3月31日更新

王通
1 parent c33aec36
Showing 7 changed files with 70 additions and 6 deletions
src/main/java/com/bsth/controller/StationController.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/service/StationService.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/resources/static/pages/base/station/js/station-list-table.js
src/main/resources/static/pages/base/station/list.html
src/main/resources/static/pages/home.html
@@ -42,6 +42,8 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	@Autowired
 	private ObjectMapper mapper;
+	private boolean executing = false;
+
 	/** 日志记录器 */
 	private static final Logger log = LoggerFactory.getLogger(StationController.class);
@@ -121,4 +123,31 @@ public class StationController extends BaseController&lt;Station, Integer&gt; {
 	public List<Station> findStationByName(String stationName) {
 		return stationService.findStationByName(stationName);
 	}
+
+	/**
+	 * 更新所有站点途径线路信息
+	 * @return
+	 */
+	@RequestMapping(value="generate-pass-line" , method = RequestMethod.POST)
+	public Map<String, Object> generatePassLine() {
+		Map<String, Object> result = new HashMap<>();
+		if (executing) {
+			result.put("status", ResponseCode.ERROR);
+			result.put("msg", "计算正在执行中,请勿重复操作");
+
+			return result;
+		}
+		executing = true;
+		try {
+			stationService.generatePassLine();
+			result.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			result.put("status", ResponseCode.ERROR);
+			throw new RuntimeException(e);
+		} finally {
+			executing = false;
+		}
+
+		return result;
+	}
 }
@@ -45,4 +45,11 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
 	@Query(value = "SELECT ST_AsText(b.buffer_polygon_wgs) g_polygon_grid, b.shaped_type,CONCAT(ST_X(a.center_point), ' ', ST_Y(a.center_point)) g_center_point , b.radius, a.station_code, b.station_name FROM bsth_c_station a JOIN bsth_c_stationroute b ON a.id = b.station WHERE b.line_code = ?1 AND a.station_code = ?2", nativeQuery = true)
 	Object[][] findBufferArea(String lineCode, String stationCode);
+
+	/**
+	 * 根据站点被引用情况生成站点的途径线路
+	 */
+	@Modifying
+	@Query(value="UPDATE bsth_c_station t4 JOIN (SELECT t1.id, GROUP_CONCAT(t3.name,'-',t2.directions,'[',t2.station_name,']') pass_lines FROM bsth_c_station t1 LEFT JOIN bsth_c_stationroute t2 ON t1.id = t2.station LEFT JOIN bsth_c_line t3 ON t2.line = t3.id WHERE t2.destroy = 0 GROUP BY t1.id) t5 ON t4.id = t5.id SET t4.pass_lines = t5.pass_lines", nativeQuery = true)
+	void generatePassLine();
 }
@@ -62,4 +62,9 @@ public interface StationService extends BaseService&lt;Station, Integer&gt; {
 	 * 将路段的WGS坐标数据转换到百度坐标并保存
 	 */
 	void translateWgs2Bd();
+
+	/**
+	 * 更新站点信息
+	 */
+	void generatePassLine();
 }
@@ -152,6 +152,15 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 	}
 	/**
+	 * 更新所有站点途径线路信息
+	 */
+	@Transactional
+	@Override
+	public void generatePassLine() {
+		stationRepository.generatePassLine();
+	}
+
+	/**
 	 * 存在wkt 则转换wkt为geo信息
 	 * @param station
 	 */
@@ -64,7 +64,17 @@
 	$('tr.filter .filter-submit').on('click',function(){
 		initSearch();
 	});
-	
+
+	$('#generatePassLine').on('click', function () {
+		$.post('/station/generate-pass-line', {}, function(res) {
+			if(res.status == 'SUCCESS') {
+				layer.msg('操作成功...');
+			} else {
+				layer.msg('操作失败...');
+			}
+		});
+	});
+
 	function initSearch() {
 		var params = getParams();
 		page = 0;
@@ -23,6 +23,7 @@
 				<div class="actions">
 					<div class="btn-group btn-group-devided" data-toggle="buttons">
 						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加站点</a>
+						<a class="btn btn-circle blue" href="javascript:void(0)" id="generatePassLine"><i class="fa fa-wrench"></i> 生成途径线路</a>
 					</div>
 				</div>
 			</div>
@@ -50,7 +51,9 @@
 								<td>
 									<input type="text" class="form-control form-filter input-sm" id="stationCode" name="stationCode_like">
 								</td>
-								<td></td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" id="passLines" name="passLines_like">
+								</td>
 								<td>
 									 <input type="text" class="form-control form-filter input-sm" id="standardStationCode" name="standardStationCode_like">
 								</td>
@@ -59,14 +59,15 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2024-09-12 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2025-03-31 更新说明 Changelog</h2>
     <br><br>
     <ul>
         <li class="sub_title"><h6>报表</h6></li>
-        <li><span class="label s_c_change">修改</span>1.某些报表在选择过多线路时无法得到查询结果问题修复</li>
-        <li><span class="label s_c_change">修改</span>2.审计公里汇总表显示异常问题修复</li>
+        <li><span class="label s_c_change">修改</span>1.线路调查表加入公司、起讫站列</li>
+        <li><span class="label s_c_change">修改</span>2.油电量计算保留三位小数</li>
         <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">新增</span>1.线调中查看车辆信息的tip弹窗加入驾驶员联系方式（手机号存在的情况）</li>
+        <li><span class="label s_c_change">修改</span>1.服务热线-报备登记重复提交问题修复</li>
+        <li><span class="label s_c_change">修改</span>2.带前置电子围栏的终点站进站计算逻辑优化</li>
     </ul>
 </div>