2025年10月16日 1.2.26 增加重点隐患车辆页面电子围栏、总队治超数据查询页面

main
gaoshuguang 1 month ago
parent 4a9a8e2cba
commit 6729dcb103

@ -134,7 +134,7 @@ public class ExportController {
} }
list = list =
zdzcMapper.selectOverExcelList(params);; zdzcMapper.selectOverExcelList(params);;
ExcelUtil.process(fileName, list, GSCpDetailExcel.class, response); ExcelUtil.process(fileName, list, ZDOverDetailExcel.class, response);
} catch (IOException e) { } catch (IOException e) {
log.error("[uuid:{}]-根据条件导出高速卡口数据失败,报错{}", uuid, e.getMessage()); log.error("[uuid:{}]-根据条件导出高速卡口数据失败,报错{}", uuid, e.getMessage());
throw new PPException(MessageEnum.Excel.getCode(), MessageEnum.Excel.getMessage()); throw new PPException(MessageEnum.Excel.getCode(), MessageEnum.Excel.getMessage());

@ -12,8 +12,10 @@ import java.util.Date;
*/ */
@Data @Data
public class ZDOverDetailExcel { public class ZDOverDetailExcel {
@ExcelProperty("路段")
private String lineId;
@ExcelProperty("站点编码") @ExcelProperty("站点编码")
private String siteCode; private String sitecode;
@ExcelProperty("站点名称") @ExcelProperty("站点名称")
private String stationName; private String stationName;
@ExcelProperty("车道号") @ExcelProperty("车道号")
@ -21,15 +23,13 @@ public class ZDOverDetailExcel {
@ExcelProperty("车牌号码") @ExcelProperty("车牌号码")
private String vehplate; private String vehplate;
@ExcelProperty("车牌颜色") @ExcelProperty("车牌颜色")
private String platecolorname; private String platecolor;
@ExcelProperty("检测时间") @ExcelProperty("检测时间")
private Date detectiontime; private Date detectiontime;
@ExcelProperty("轴数") @ExcelProperty("轴数")
private Integer axlenum; private Integer axlenum;
@ExcelProperty("实际吨位(kg)") @ExcelProperty("实际吨位(kg)")
private Integer totalweight; private Integer totalweight;
@ExcelProperty("计量吨位(kg)")
private Integer scaleTotalweight;
@ExcelProperty("限重(kg)") @ExcelProperty("限重(kg)")
private Integer limitweight; private Integer limitweight;
@ExcelProperty("是否超重") @ExcelProperty("是否超重")

@ -39,10 +39,10 @@ public interface HiddenDangerAreaInfoMapper extends BaseMapper<HiddenDangerAreaI
/** /**
* *
* @param departmentno * @param equipmentid
* @return * @return
*/ */
List<Map<String, Object>> getDeptPointByDeptId(@Param("departmentno") int departmentno); List<Map<String, Object>> getDeptPointByDeptId(@Param("equipmentid") int equipmentid);
/** /**
* *

@ -72,6 +72,10 @@
<select id="selectOverExcelList" resultType="com.nmgs.entity.export.ZDOverDetailExcel"> <select id="selectOverExcelList" resultType="com.nmgs.entity.export.ZDOverDetailExcel">
SELECT SELECT
od.*, od.*,
CASE
WHEN od.totalweight > od.limitweight THEN '超重'
ELSE '未超重'
END AS isOverweight,
nt.stationName, nt.stationName,
nt.lineId nt.lineId
FROM FROM

@ -45,8 +45,8 @@ public class HiddenDangerAreaInfoServiceServiceImpl implements HiddenDangerAreaI
Map<String,Object> dept = new HashMap<>(); Map<String,Object> dept = new HashMap<>();
for (Map<String, Object> stringObjectMap : piLaoDate) { for (Map<String, Object> stringObjectMap : piLaoDate) {
List<Map<String, Object>> points = hiddenDangerAreaInfoMapper.getDeptPointByDeptId(Integer.parseInt(stringObjectMap.get("departmentno").toString())); List<Map<String, Object>> points = hiddenDangerAreaInfoMapper.getDeptPointByDeptId(Integer.parseInt(stringObjectMap.get("equipmentid").toString()));
dept.put(stringObjectMap.get("departmentno").toString(),points); dept.put(stringObjectMap.get("equipmentid").toString(),points);
} }
return dept; return dept;
} }

@ -71,8 +71,8 @@ public class PathUtil {
webPath = webPath + webName; webPath = webPath + webName;
TrafficTrajectoryTemplate = TomcatPath + "/TrafficTrajectoryTemplate"; TrafficTrajectoryTemplate = TomcatPath + "/TrafficTrajectoryTemplate";
} }
//applicationPath = webappsPath + "/application.properties"; applicationPath = webappsPath + "/application.properties";
applicationPath = webappsPath + "/application1.properties"; //applicationPath = webappsPath + "/application1.properties";
applicationTextPath = webappsPath + "/applicationText.properties"; applicationTextPath = webappsPath + "/applicationText.properties";
WebServiceWarPath = TomcatPath + "/WebServiceWar"; WebServiceWarPath = TomcatPath + "/WebServiceWar";
tomcatUserXMLPath = TomcatPath + "/conf/tomcat-users.xml"; tomcatUserXMLPath = TomcatPath + "/conf/tomcat-users.xml";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -5,8 +5,8 @@
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<title></title> <title></title>
<script type="module" crossorigin src="./assets/index.55b62e15.js"></script> <script type="module" crossorigin src="./assets/index.a914229a.js"></script>
<link rel="stylesheet" href="./assets/index.09c6e6b4.css"> <link rel="stylesheet" href="./assets/index.2a04e458.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">

@ -46,3 +46,6 @@
43 2025年09月15日 1.2.22 增加重点隐患车辆设备分布页面 43 2025年09月15日 1.2.22 增加重点隐患车辆设备分布页面
44 2025年10月09日 1.2.23 治超、卡口、定点测速、区间树形结构原值显示 44 2025年10月09日 1.2.23 治超、卡口、定点测速、区间树形结构原值显示
45 2025年10月13日 1.2.24 增加重点隐患车辆页面使用频次、预警结果 45 2025年10月13日 1.2.24 增加重点隐患车辆页面使用频次、预警结果
46 2025年10月15日 1.2.25 增加重点隐患车辆页面隐患区域、隐患车辆
47 2025年10月16日 1.2.26 增加重点隐患车辆页面电子围栏、总队治超数据查询页面

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,54 +0,0 @@
<!DOCTYPE html>
<html lang="en" >
<!--<html lang="en" class="dark">-->
<head>
<meta charset="UTF-8"/>
<title></title>
<script type="module" crossorigin src="./assets/index.55b62e15.js"></script>
<link rel="stylesheet" href="./assets/index.09c6e6b4.css">
</head>
<body>
<div id="app">
<div class="loading">
<div class="loading-wrap">
<div class="loading-dots">
<span class="dot dot-spin">
<i></i>
<i></i>
<i></i>
<i></i>
</span>
</div>
<div class="loading-title" style="color: white">
正在缓冲...
</div>
</div>
</div>
</div>
<script type="text/javascript" src="public/resource/hdmap/hdmap.js"></script>
</body>
<style>
.html, body {
background-color: rgb(2, 11, 49);
}
.el-table {
background-color: rgb(2, 11, 49) !important;
/*color: white;*/
--el-table-bg-color: rgb(2, 11, 49) !important;
}
.el-table__header {
background-color: rgb(2, 11, 49) !important;
/*color: white;*/
}
.el-table__header-wrapper {
background-color: rgb(2, 11, 49) !important;
/*color: white;*/
}
</style>
</html>

@ -1,2 +0,0 @@
window.mapCenter = [111.80282489244144, 41.72225716089292]
window.mapZoom = 5.4

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save