Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/VehicleMonitor

 Conflicts:

	business-service/src/main/resources/mapper/BaseDeviceDynamicManagementMapper.xml

business-service/src/main/resources/mapper/BaseDeviceDynamicManagementMapper.xml

@@ -56,15 +56,17 @@
         a.install_mile AS installMile,
         a.id AS id
         FROM
-        base_camera_management AS a inner join
-        base_railway_management AS l on a.railway_code=l.railway_code
+        base_camera_management AS a
+        inner join
+        base_railway_management AS l
+        on a.railway_code=l.railway_code
         <where>
             <if test="railwayCode != null and railwayCode !=''">
                l.railway_name || a.camera_code
                like CONCAT('%', #{railwayCode}, '%')
             </if>
             <if test="lineDir != null and lineDir != ''">
-                line_dir = #{lineDir}
+                and a.line_dir = #{lineDir}
             </if>
             <if test="mils != null and mils != ''">
                 a.install_mile || a.begin_mile || a.end_mile = #{mils}

business-service/src/main/resources/mapper/MsgAlarmMapper.xml

@@ -21,7 +21,7 @@
     </resultMap>
 
     <select id="list" resultMap="AlarmStatisticDtoResult">
-        SELECT
+        SELECT /*+ GROUP_OPT_FLAG(1)*/
         a.alarm_id ,
         b.railway_name,
         a.alarm_time ,
@@ -66,6 +66,7 @@
         <result column="frequency" property="frequency"/>
     </resultMap>
     <select id="alarmTypeCount" resultMap="AlarmStatisticMonthDtoResult">
+
         SELECT /*+ GROUP_OPT_FLAG(1)*/ sum(p.fre) as frequency,p.alarmType as alarmType
         from
         (SELECT /*+ GROUP_OPT_FLAG(1)*/
@@ -119,9 +120,9 @@
     </select>
 
     <select id="listDtoDay" resultMap="AlarmStatisticMonthDtoResult">
-        SELECT p.daysta as monthsta,sum(p.fre) as frequency,p.daystaString as monthstaString
+        SELECT /*+ GROUP_OPT_FLAG(1)*/ p.daysta as monthsta,sum(p.fre) as frequency,p.daystaString as monthstaString
         from
-        (SELECT
+        (SELECT /*+ GROUP_OPT_FLAG(1)*/
         translate(to_char(a.alarm_time, 'yyyy-mm-dd#'),'-#','年月日')
         /*DATE_FORMAT(a.alarm_time,'%Y年%m月%d日')*/ as daystaString,
         DAY(a.alarm_time) as daysta,

business-service/src/main/resources/mapper/TerminalIgnoreAlarmMapper.xml

@@ -25,7 +25,7 @@
         a.update_time,
         a.remark
         FROM terminal_ignore_alarm as a inner join
-        base_vehicle_terminal as b on a.terminal_code = b.terminal_code
+        base_terminal as b on a.terminal_code = b.terminal_code
         <where>
             <if test="terminalCode != null and terminalCode != ''">
                 and a.terminal_code = #{terminalCode}
@@ -38,7 +38,7 @@
         from msg_alarm as a inner join
         base_railway_management as b on a.railway_code=b.railway_code left join
         terminal_ignore_alarm as t on a.alarm_id=t.alarm_id left join
-        base_vehicle_terminal as bt on t.terminal_code = bt.terminal_code
+        base_terminal as bt on t.terminal_code = bt.terminal_code
         where t.id = #{id}
     </select>
 

business-service/src/main/resources/mapper/VehiclePositionMapper.xml

@@ -23,7 +23,7 @@
         c.status
         FROM vehicle_position AS a LEFT JOIN
         base_vehicle AS b ON a.vehicle_code = b.vehicle_code LEFT JOIN
-        base_vehicle_terminal c ON a.terminal_code = c.terminal_code LEFT JOIN
+        base_terminal c ON a.terminal_code = c.terminal_code LEFT JOIN
         base_railway_management d ON a.railway_code = d.railway_code
 
         <where>
@@ -40,7 +40,7 @@
                 and c.status = #{status}
             </if>
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
 

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -709,7 +709,7 @@ public class BaseCameraManagementController extends BaseController {
     @PostMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo cameraTreeVo) {
-        cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
+        //cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
         int count = 0;
         if (!ObjectUtils.isEmpty(cameraTreeVo.getMils())) {
             cameraTreeVo.setMils(cameraTreeVo.getMils() * 1000);

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/VehiclePositionController.java

@@ -82,6 +82,16 @@ public class VehiclePositionController extends BaseController {
     @ApiOperation(value = "机车行驶日志导出")
     public void export(HttpServletResponse response, @RequestBody VehiclePositionResp vehiclePositionResp) {
         List<VehiclePosition> list = vehiclePositionService.selectVehiclePositionList(vehiclePositionResp);
+        if(!ObjectUtils.isEmpty(list)){
+            list.forEach(l -> {
+                if (!ObjectUtils.isEmpty(l.getTravelMile())) {
+                    l.setTravelMileFormat(AppendUtils.stringAppend(Integer.valueOf(l.getTravelMile())));
+                }
+                if(!ObjectUtils.isEmpty(l.getLineDir())){
+                    l.setLineDirName(l.getLineDir() == 1 ? "上行" : "下行");
+                }
+            });
+        }
         ExcelUtil<VehiclePosition> util = new ExcelUtil<VehiclePosition>(VehiclePosition.class);
         util.exportExcel(response, list, "机车行驶日志");
     }