1

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmVehicleDrivingRecordController.java

@@ -59,6 +59,16 @@ public class PdmVehicleDrivingRecordController extends BaseController
         List<PdmVehicleDrivingRecord> list = pdmVehicleDrivingRecordService.selectPdmVehicleDrivingRecordList(pdmVehicleDrivingRecord);
         return getDataTable(list);
     }
+    /**
+     * 查询施工车辆行驶记录列表
+     */
+    @GetMapping("/list2")
+    public TableDataInfo list2(PdmVehicleDrivingRecord pdmVehicleDrivingRecord)
+    {
+        startPage();
+        List<PdmVehicleDrivingRecord> list = pdmVehicleDrivingRecordService.selectPdmVehicleDrivingRecordList2(pdmVehicleDrivingRecord);
+        return getDataTable(list);
+    }
 
     /**
      * 导出施工车辆行驶记录列表
@@ -111,27 +121,32 @@ public class PdmVehicleDrivingRecordController extends BaseController
         return toAjax(pdmVehicleDrivingRecordService.deletePdmVehicleDrivingRecordByIds(ids));
     }
     @PostMapping("/import")
-    public void importExcel(HttpServletRequest request, MultipartFile file)throws IOException, CsvValidationException {
-             CSVReader csvReader = new CSVReader(new InputStreamReader(file.getInputStream(), StandardCharsets.UTF_8));
-            String[] nextLine;
-            int i=0;
-            List<PdmVehicleDrivingRecord> dataList=new ArrayList<>();
-            while ((nextLine = csvReader.readNext()) != null) {
-                if(i>0) {
-                    // 处理每一行数据，nextLine是一个字符串数组，包含当前行的每个字段
-                    PdmVehicleDrivingRecord vehicleDrivingRecord = new PdmVehicleDrivingRecord();
-                    vehicleDrivingRecord.setVehicleGroup(nextLine[0]);
-                    vehicleDrivingRecord.setEquipNm(nextLine[1]);
-                    vehicleDrivingRecord.setEquipNo(nextLine[2]);
-                    vehicleDrivingRecord.setVehicleNo(nextLine[3]);
-                    vehicleDrivingRecord.setStartTm( DateUtils.covertStrToLocalTime(nextLine[4]));
-                    vehicleDrivingRecord.setEndTm( DateUtils.covertStrToLocalTime(nextLine[5]));
-                    vehicleDrivingRecord.setMileage(new BigDecimal(nextLine[6]));
-                    dataList.add(vehicleDrivingRecord);
-                }
-                i++;
-            }
-            System.out.println(JSON.toJSON(dataList));
-        pdmVehicleDrivingRecordService.batchAdd(dataList);
+    public AjaxResult importExcel(HttpServletRequest request, MultipartFile file) {
+           try {
+               CSVReader csvReader = new CSVReader(new InputStreamReader(file.getInputStream(), StandardCharsets.UTF_8));
+               String[] nextLine;
+               int i = 0;
+               List<PdmVehicleDrivingRecord> dataList = new ArrayList<>();
+               while ((nextLine = csvReader.readNext()) != null) {
+                   if (i > 0) {
+                       // 处理每一行数据，nextLine是一个字符串数组，包含当前行的每个字段
+                       PdmVehicleDrivingRecord vehicleDrivingRecord = new PdmVehicleDrivingRecord();
+                       vehicleDrivingRecord.setVehicleGroup(nextLine[0]);
+                       vehicleDrivingRecord.setEquipNm(nextLine[1]);
+                       vehicleDrivingRecord.setEquipNo(nextLine[2]);
+                       vehicleDrivingRecord.setVehicleNo(nextLine[3]);
+                       vehicleDrivingRecord.setStartTm(DateUtils.covertStrToLocalTime(nextLine[4]));
+                       vehicleDrivingRecord.setEndTm(DateUtils.covertStrToLocalTime(nextLine[5]));
+                       vehicleDrivingRecord.setMileage(new BigDecimal(nextLine[6]));
+                       dataList.add(vehicleDrivingRecord);
+                   }
+                   i++;
+               }
+
+               pdmVehicleDrivingRecordService.batchAdd(dataList);
+           }catch(Exception e){
+               return  AjaxResult.error("导入失败，请检查文件");
+           }
+           return AjaxResult.success();
     }
 }

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmVehicleAlarmHist.java

@@ -40,6 +40,10 @@ public class PdmVehicleAlarmHist extends BaseEntity
 
     private  String endDate;
 
+    private String vehicleGroup;
+
+    private String eventStartDate;
+
     public void setId(Long id) 
     {
         this.id = id;

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/domain/PdmVehicleDrivingRecord.java

@@ -3,6 +3,7 @@ package com.ruoyi.powerdistribution.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -14,6 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-01-21
  */
+@Data
 public class PdmVehicleDrivingRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -51,6 +53,8 @@ public class PdmVehicleDrivingRecord extends BaseEntity
     @Excel(name = "行驶里程")
     private BigDecimal mileage;
 
+    private boolean greaterThanZero;
+
     public void setId(Long id) 
     {
         this.id = id;

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/mapper/PdmVehicleDrivingRecordMapper.java

@@ -30,6 +30,13 @@ public interface PdmVehicleDrivingRecordMapper
     public List<PdmVehicleDrivingRecord> selectPdmVehicleDrivingRecordList(PdmVehicleDrivingRecord pdmVehicleDrivingRecord);
 
     /**
+     * 查询施工车辆行驶记录列表
+     *
+     * @param pdmVehicleDrivingRecord 施工车辆行驶记录
+     * @return 施工车辆行驶记录集合
+     */
+    public List<PdmVehicleDrivingRecord> selectPdmVehicleDrivingRecordList2(PdmVehicleDrivingRecord pdmVehicleDrivingRecord);
+    /**
      * 新增施工车辆行驶记录
      * 
      * @param pdmVehicleDrivingRecord 施工车辆行驶记录

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/IPdmVehicleDrivingRecordService.java

@@ -28,6 +28,14 @@ public interface IPdmVehicleDrivingRecordService
     public List<PdmVehicleDrivingRecord> selectPdmVehicleDrivingRecordList(PdmVehicleDrivingRecord pdmVehicleDrivingRecord);
 
     /**
+     * 查询施工车辆行驶记录列表
+     *
+     * @param pdmVehicleDrivingRecord 施工车辆行驶记录
+     * @return 施工车辆行驶记录集合
+     */
+    public List<PdmVehicleDrivingRecord> selectPdmVehicleDrivingRecordList2(PdmVehicleDrivingRecord pdmVehicleDrivingRecord);
+
+    /**
      * 新增施工车辆行驶记录
      * 
      * @param pdmVehicleDrivingRecord 施工车辆行驶记录

ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/service/impl/PdmVehicleDrivingRecordServiceImpl.java

@@ -44,6 +44,11 @@ public class PdmVehicleDrivingRecordServiceImpl implements IPdmVehicleDrivingRec
         return pdmVehicleDrivingRecordMapper.selectPdmVehicleDrivingRecordList(pdmVehicleDrivingRecord);
     }
 
+    @Override
+    public List<PdmVehicleDrivingRecord> selectPdmVehicleDrivingRecordList2(PdmVehicleDrivingRecord pdmVehicleDrivingRecord) {
+        return pdmVehicleDrivingRecordMapper.selectPdmVehicleDrivingRecordList2(pdmVehicleDrivingRecord);
+    }
+
     /**
      * 新增施工车辆行驶记录
      * 

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmVehicleAlarmHistMapper.xml

@@ -15,22 +15,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="remark"    column="remark"    />
     </resultMap>
-
+    <resultMap type="PdmVehicleAlarmHist" id="PdmVehicleAlarmHistResult2">
+        <result property="id"    column="id"    />
+        <result property="vehicleNo"    column="vehicle_no"    />
+        <result property="vehicleGroup"    column="vehicle_group"    />
+        <result property="occurDate"    column="occur_date"    />
+        <result property="alarmCd"    column="alarm_cd"    />
+        <result property="alarmDesc"    column="alarm_desc"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
     <sql id="selectPdmVehicleAlarmHistVo">
-        select id, vehicle_no, occur_date, alarm_cd, alarm_desc, create_time, update_by, update_time, remark from pdm_vehicle_alarm_hist
+        select id, vehicle_no, occur_date,event_start_date, alarm_cd, alarm_desc, create_time, update_by, update_time, remark from pdm_vehicle_alarm_hist
     </sql>
 
-    <select id="selectPdmVehicleAlarmHistList" parameterType="PdmVehicleAlarmHist" resultMap="PdmVehicleAlarmHistResult">
-        <include refid="selectPdmVehicleAlarmHistVo"/>
-        <where>  
-            <if test="vehicleNo != null  and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
-            <if test="occurDate != null  and occurDate != ''"> and occur_date = #{occurDate}</if>
-            <if test="startDate != null  and startDate != ''"> and occur_date &gt;= #{startDate}</if>
-            <if test="endDate != null  and endDate != ''"> and occur_date &lt;= #{endDate}</if>
-            <if test="alarmCd != null  and alarmCd != ''"> and alarm_cd = #{alarmCd}</if>
-            <if test="alarmDesc != null  and alarmDesc != ''"> and alarm_desc = #{alarmDesc}</if>
+    <select id="selectPdmVehicleAlarmHistList" parameterType="PdmVehicleAlarmHist" resultMap="PdmVehicleAlarmHistResult2">
+        select h.id, h.vehicle_no, a.vehicle_group, h.occur_date,h.event_start_date, h.alarm_cd, h.alarm_desc, h.create_time, h.update_by,h. update_time, h.remark from pdm_vehicle_alarm_hist h
+        left join  pdm_vehicle_alarm a on a.vehicle_no=h.vehicle_no
+        <where>
+
+            <if test="vehicleNo != null  and vehicleNo != ''"> and h.vehicle_no = #{vehicleNo}</if>
+            <if test="occurDate != null  and occurDate != ''"> and h.occur_date = #{occurDate}</if>
+            <if test="vehicleGroup != null  and vehicleGroup != ''"> and a.vehicle_group like concat('%', #{vehicleGroup}, '%')</if>
+            <if test="startDate != null  and startDate != ''"> and h.occur_date &gt;= #{startDate}</if>
+            <if test="endDate != null  and endDate != ''"> and h.occur_date &lt;= #{endDate}</if>
+            <if test="alarmCd != null  and alarmCd != ''"> and h.alarm_cd = #{alarmCd}</if>
+            <if test="alarmDesc != null  and alarmDesc != ''"> and h.alarm_desc = #{alarmDesc}</if>
         </where>
-        order by occur_date desc
+        order by h.occur_date desc
     </select>
     
     <select id="selectPdmVehicleAlarmHistById" parameterType="Long" resultMap="PdmVehicleAlarmHistResult">

ruoyi-powerdistribution/src/main/resources/mapper/powerdistribution/PdmVehicleDrivingRecordMapper.xml

@@ -30,13 +30,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="vehicleGroup != null  and vehicleGroup != ''"> and vehicle_group = #{vehicleGroup}</if>
             <if test="equipNo != null  and equipNo != ''"> and equip_no = #{equipNo}</if>
             <if test="equipNm != null  and equipNm != ''"> and equip_nm = #{equipNm}</if>
-            <if test="startTm != null "> and STR_TO_DATE(start_tm,'%Y-%m-%d') &gt;= #{startTm}</if>
-            <if test="endTm != null "> and STR_TO_DATE(end_tm,'%Y-%m-%d') &lt;= #{endTm}</if>
+            <if test="startTm != null "> and STR_TO_DATE(start_tm,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTm},'%Y-%m-%d')</if>
+            <if test="endTm != null "> and STR_TO_DATE(end_tm,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTm},'%Y-%m-%d')</if>
             <if test="mileage != null "> and mileage = #{mileage}</if>
+             <if test="greaterThanZero">and mileage &gt;0</if>
+        </where>
+        order by vehicle_no,start_tm desc
+    </select>
+
+    <select id="selectPdmVehicleDrivingRecordList2" parameterType="PdmVehicleDrivingRecord" resultMap="PdmVehicleDrivingRecordResult">
+        select distinct vehicle_no, vehicle_group, equip_no, equip_nm, start_tm, end_tm, mileage,create_time from pdm_vehicle_driving_record
+        <where>
+            <if test="vehicleNo != null  and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
+            <if test="vehicleGroup != null  and vehicleGroup != ''"> and vehicle_group = #{vehicleGroup}</if>
+            <if test="equipNo != null  and equipNo != ''"> and equip_no = #{equipNo}</if>
+            <if test="equipNm != null  and equipNm != ''"> and equip_nm = #{equipNm}</if>
+            <if test="startTm != null "> and STR_TO_DATE(start_tm,'%Y-%m-%d') &gt;= STR_TO_DATE(#{startTm},'%Y-%m-%d')</if>
+            <if test="endTm != null "> and STR_TO_DATE(end_tm,'%Y-%m-%d') &lt;= STR_TO_DATE(#{endTm},'%Y-%m-%d')</if>
+            <if test="mileage != null "> and mileage = #{mileage}</if>
+            <if test="greaterThanZero">and mileage &gt;0</if>
         </where>
         order by vehicle_no,start_tm desc
     </select>
-    
     <select id="selectPdmVehicleDrivingRecordById" parameterType="Long" resultMap="PdmVehicleDrivingRecordResult">
         <include refid="selectPdmVehicleDrivingRecordVo"/>
         where id = #{id}