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

business-service/src/main/java/com/ozs/entity/TerminalIgnoreAlarm.java

@@ -1,10 +1,13 @@
 package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ozs.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
@@ -39,16 +42,27 @@ public class TerminalIgnoreAlarm extends BaseEntity implements Serializable {
     /**
      * 终端编码
      */
+    @Excel(name = "终端编码")
     private String terminalCode;
 
+    /**
+     * 终端名称
+     */
+    @Excel(name = "终端名称")
+    @TableField(exist = false)
+    private String terminalName;
+
     /**
      * 报警唯一标识UUID
      */
+    @Excel(name = "报警唯一标识")
     private String alarmId;
 
     /**
      * 忽略时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "忽略时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date ignoreTime;
 
     /**
@@ -74,7 +88,6 @@ public class TerminalIgnoreAlarm extends BaseEntity implements Serializable {
     /**
      * 备注
      */
+    @Excel(name = "备注")
     private String remark;
-
-
 }

business-service/src/main/java/com/ozs/entity/vo/AlarmFreqArea.java

@@ -14,6 +14,7 @@ public class AlarmFreqArea {
     /**
      * 线路名称
      */
+    @Excel(name = "线路名称")
     private String railwayName;
 
     /**
@@ -29,10 +30,12 @@ public class AlarmFreqArea {
     /**
      * 报警里程位置字符串形式
      */
+    @Excel(name = "报警里程位置")
     private String alarmMiles;
 
     /**
      * 报警频次
      */
+    @Excel(name = "报警频次")
     private Integer frequency;
 }

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

@@ -4,6 +4,7 @@
     <resultMap id="TerminalIgnoreAlarmResult" type="com.ozs.entity.TerminalIgnoreAlarm">
         <id column="id" property="id"/>
         <result column="terminal_code" property="terminalCode"/>
+        <result column="terminal_name" property="terminalName"/>
         <result column="alarm_id" property="alarmId"/>
         <result column="ignore_time" property="ignoreTime"/>
         <result column="create_by" property="createBy"/>
@@ -15,6 +16,7 @@
     <select id="list" resultMap="TerminalIgnoreAlarmResult" >
         SELECT
         a.terminal_code,
+        b.terminal_name,
         a.alarm_id,
         a.ignore_time,
         a.create_by,
@@ -22,11 +24,11 @@
         a.update_by,
         a.update_time,
         a.remark
-        FROM terminal_ignore_alarm as a
-
+        FROM terminal_ignore_alarm as a inner join
+        base_vehicle_terminal as b on a.terminal_code = b.terminal_code
         <where>
             <if test="terminalCode != null and terminalCode != ''">
-                and a.terminalCode = #{terminalCode}
+                and a.terminal_code = #{terminalCode}
             </if>
         </where>
     </select>

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

@@ -13,7 +13,7 @@
         <result column="remark" property="remark"/>
         <result column="vehicle_name" property="vehicleName"/>
         <result column="railway_name" property="railwayName"/>
-        <result column="status" property="terminalStatus"/>
+        <result column="status" property="status"/>
     </resultMap>
     <select id="list" resultMap="VehiclePositionResult" >
         SELECT
@@ -42,7 +42,7 @@
                 and a.railway_code = #{railwayCode}
             </if>
             <if test="lineDir != null and lineDir != 0">
-                and a.line_dir = #{currentYear}
+                and a.line_dir = #{lineDir}
             </if>
             <if test="status != null and status != 0">
                 and c.status = #{status}

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

@@ -105,6 +105,17 @@ public class BaseVehicleController extends BaseController {
         }
     }
 
-
+    /**
+     * 机车信息表 查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "机车信息表 查询")
+    @PostMapping("/vehicleAll")
+    @Log(title = "机车信息表 查询", businessType = BusinessType.SELECT)
+    public AjaxResult vehicleAll() {
+        List<BaseVehicle> list = baseVehicleService.list();
+        return AjaxResult.success(list);
+    }
 }
 

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

@@ -1,9 +1,21 @@
 package com.ozs.web.controller.accountmanagment;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ozs.common.annotation.Log;
+import com.ozs.common.core.domain.AjaxResult;
+import com.ozs.common.enums.BusinessType;
+import com.ozs.entity.BaseVehicle;
+import com.ozs.entity.BaseVehicleTerminal;
+import com.ozs.service.BaseVehicleTerminalService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 机车车载终端信息表 前端控制器
@@ -13,8 +25,24 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2023-04-11
  */
 @RestController
-@RequestMapping("/base-vehicle-terminal")
+@RequestMapping("/baseVehicleTerminal")
 public class BaseVehicleTerminalController {
 
+    @Autowired
+    private BaseVehicleTerminalService baseVehicleTerminalService;
+
+    /**
+     * 终端信息表 查询
+     *
+     * @return
+     */
+    @ApiOperation(value = "终端信息表 查询")
+    @PostMapping("/terminalAll")
+    @Log(title = "终端信息表 查询", businessType = BusinessType.SELECT)
+    public AjaxResult terminalAll() {
+        List<BaseVehicleTerminal> list = baseVehicleTerminalService.list();
+        return AjaxResult.success(list);
+    }
+
 }
 

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

@@ -227,6 +227,34 @@ public class DataStatisticController extends BaseController {
         return AjaxResult.success(null);
     }
 
+    /**
+     * web数据统计
+     *
+     * @param
+     * @return
+     */
+    @Log(title = "频繁出现灾害地点排导出", businessType = BusinessType.EXPORT)
+    @PostMapping("/alarmTypeAreaCountExport")
+    @ApiOperation(value = "web数据统计 频繁出现灾害地点排名导出")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(paramType = "query", name = "railwayCode", value = "线路编码"),
+            @ApiImplicitParam(paramType = "query", name = "currentYear", value = "当前年份"),
+            @ApiImplicitParam(paramType = "query", name = "currentMonth", value = "当前月份")
+    })
+    public void alarmTypeAreaCountExport(HttpServletResponse response,@RequestBody AlarmStatisticResVo alarmStatisticResVo) {
+        List<AlarmFreqArea> list = msgAlarmService.alarmTypeAreaCount(alarmStatisticResVo.getRailwayCode(), alarmStatisticResVo.getCurrentYear(),
+                alarmStatisticResVo.getCurrentMonth());
+        if (!CollectionUtils.isEmpty(list) && Objects.nonNull(list.get(0))) {
+            list.forEach(l -> {
+                if (!ObjectUtils.isEmpty(l.getAlarmMile())) {
+                    l.setAlarmMiles(AppendUtils.stringAppend(Integer.valueOf(l.getAlarmMile())));
+                }
+            });
+            ExcelUtil<AlarmFreqArea> util = new ExcelUtil<>(AlarmFreqArea.class);
+            util.exportExcel(response, list, "频繁出现灾害地点排导出");
+        }
+    }
+
     /**
      * web数据统计 数据导出
      *

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

@@ -10,9 +10,11 @@ import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.enums.BusinessType;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.poi.ExcelUtil;
+import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.MsgAlarm;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.ozs.entity.vo.TerminalIgnoreVo;
+import com.ozs.service.BaseVehicleTerminalService;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -41,6 +44,8 @@ public class TerminalIgnoreAlarmController extends BaseController {
     private TerminalIgnoreAlarmService terminalIgnoreAlarmService;
     @Autowired
     private ISysDictDataService dictDataService;
+    @Autowired
+    private BaseVehicleTerminalService baseVehicleTerminalService;
 
     /**
      * 查询终端忽略报警信息列表
@@ -58,6 +63,18 @@ public class TerminalIgnoreAlarmController extends BaseController {
         }
         wrapper.orderByDesc("ignore_time");
         IPage<TerminalIgnoreAlarm> page = terminalIgnoreAlarmService.page(new Page<>(terminalIgnoreVo.getPageNum(), terminalIgnoreVo.getPageSize()), wrapper);
+        List<BaseVehicleTerminal> terminal = baseVehicleTerminalService.list();
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+            List<TerminalIgnoreAlarm> dto = page.getRecords().stream().map(o -> {
+            for(BaseVehicleTerminal ter:terminal){
+                if(ter.getTerminalCode().equals(o.getTerminalCode())){
+                    o.setTerminalName(ter.getTerminalName());
+                }
+            }
+            return o;
+        }).collect(Collectors.toList());
+            page.setRecords(dto);
+        }
         return AjaxResult.success(page);
     }
 

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

@@ -61,6 +61,30 @@ public class VehiclePositionController extends BaseController {
         return AjaxResult.success(page);
     }
 
+    /**
+     * 获取机车行驶日志列表
+     *
+     * @param vehiclePositionResp
+     * @return
+     */
+    @ApiOperation(value = "获取机车日志列表")
+    @PostMapping("/listNoPage")
+    @Log(title = "报警信息管理", businessType = BusinessType.SELECT)
+    public AjaxResult listNoPage(@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 ? "上行" : "下行");
+                }
+            });
+        }
+        return AjaxResult.success(list);
+    }
+
     @Log(title = "机车行驶日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ApiOperation(value = "机车行驶日志导出")