暂时

src/main/java/com/project/zcustom/controller/officalCar/PlatCarController.java

@@ -45,8 +45,8 @@ public class PlatCarController {
      * 公务车预警明细
      */
     @GetMapping("/warnDetail")
-    public AjaxResult getWarnDetail(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg));
+    public AjaxResult getWarnDetail(@RequestParam String appOrg, @RequestParam String alertType) {
+        return AjaxResult.success("查询成功", largePlatCarService.getWarnDetail(appOrg, alertType));
     }
 
     /**

src/main/java/com/project/zcustom/domain/addional/LargeCar.java

@@ -1,6 +1,7 @@
 package com.project.zcustom.domain.addional;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.zcustom.controller.core.CustomBaseEntity;
@@ -22,6 +23,9 @@ public class LargeCar extends CustomBaseEntity {
     @JSONField(name = "orgCode")
     private String appEncode;
 
+    @TableField(exist = false)
+    private String appOrg;
+
     private String orgName;
 
     /**

src/main/java/com/project/zcustom/domain/addional/LargeCarRank.java

@@ -27,7 +27,7 @@ public class LargeCarRank extends CustomBaseEntity {
      * 车牌号
      */
     @JSONField(name = "vehicleNumber")
-    private String vechileNum;
+    private String vehicleNum;
 
     /**
      * 单位编码

src/main/java/com/project/zcustom/mapper/car/PlatCarMapper.java

@@ -1,9 +1,11 @@
 package com.project.zcustom.mapper.car;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.project.zcustom.domain.addional.*;
 
 import java.util.List;
 
+@InterceptorIgnore(blockAttack = "true")
 public interface PlatCarMapper {
 
     List<LargeUnitRank> getUnitRankList();
@@ -14,7 +16,7 @@ public interface PlatCarMapper {
 
     LargeCar getMonitorNumber(String appOrg);
 
-    List<LargeWarnDetail> getWarnDetail(String appOrg);
+    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType);
 
     LargeCar getOperationManageTopHalf(String appOrg);
 
@@ -25,4 +27,10 @@ public interface PlatCarMapper {
     List<LargeCarRank> getCarRank();
 
     List<LargeCar> getSelfCarNum(List<String> appOrg);
+
+    int deleteAllCarDetail(Integer flag);
+
+    int deleteAllWarnDetail(String alertType);
+
+    int deleteAllCarRank();
 }

src/main/java/com/project/zcustom/service/car/ILargePlatCarService.java

@@ -11,7 +11,7 @@ public interface ILargePlatCarService {
     LargeCar getResource(String appOrg);
     List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
     LargeCar getMonitor(String appOrg);
-    List<LargeWarnDetail> getWarnDetail(String appOrg);
+    List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType);
     LargeCar getOperationManageTopHalf(String appOrg);
     Map<String, Object> getOperationManageLastHalf();
     List<Long> getSelfCarNum();

src/main/java/com/project/zcustom/service/car/Impl/LargePlatCarServiceImpl.java

@@ -61,8 +61,8 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
         return largeCar;
     }
 
-    public List<LargeWarnDetail> getWarnDetail(String appOrg){
-        return platCarMapper.getWarnDetail(appOrg);
+    public List<LargeWarnDetail> getWarnDetail(String appOrg, String alertType){
+        return platCarMapper.getWarnDetail(appOrg, alertType);
     }
 
     public LargeCar getOperationManageTopHalf(String appOrg){

src/main/java/com/project/zcustom/service/unit/impl/LargeCarRankServiceImpl.java

@@ -26,8 +26,8 @@ public class LargeCarRankServiceImpl extends ServiceImpl<LargeCarRankMapper, Lar
         if (StringUtils.isNotNull(largeCarRank.getPcdCount())){
             lqw.eq(LargeCarRank::getPcdCount ,largeCarRank.getPcdCount());
         }
-        if (StringUtils.isNotBlank(largeCarRank.getVechileNum())){
-            lqw.eq(LargeCarRank::getVechileNum ,largeCarRank.getVechileNum());
+        if (StringUtils.isNotBlank(largeCarRank.getVehicleNum())){
+            lqw.eq(LargeCarRank::getVehicleNum ,largeCarRank.getVehicleNum());
         }
         if (StringUtils.isNotBlank(largeCarRank.getAppEncode())){
             lqw.eq(LargeCarRank::getAppEncode ,largeCarRank.getAppEncode());

src/main/resources/mapper/zcustom/car/PlatCarMapper.xml

@@ -5,6 +5,7 @@
 <mapper namespace="com.project.zcustom.mapper.car.PlatCarMapper">
     <resultMap type="com.project.zcustom.domain.addional.LargeCar" id="LargePlatPublicCarResult">
         <result property="appEncode"    column="app_encode"    />
+        <result property="appOrg"    column="app_org"    />
         <result property="totalCarNum"    column="total_car_num"    />
         <result property="carNumOne"    column="car_num_one"    />
         <result property="carNumTwo"    column="car_num_two"    />
@@ -53,7 +54,7 @@
         <result property="orgName"    column="org_name"    />
         <result property="appEncode"    column="app_encode"    />
         <result property="pcdCount"    column="pcd_count"    />
-        <result property="vechileNum"    column="vechile_num"    />
+        <result property="vehicleNum"    column="vehicle_num"    />
     </resultMap>
 
     <resultMap type="com.project.zcustom.domain.addional.LargeUnitRank" id="LargeUnitRankResult">
@@ -123,7 +124,7 @@
         </if>
     </select>
 
-    <select id="getWarnDetail" parameterType="String" resultMap="LargePlatPublicCarWarnDetailResult">
+    <select id="getWarnDetail" resultMap="LargePlatPublicCarWarnDetailResult">
         SELECT
             app_name,
             vehicle_num,
@@ -134,7 +135,7 @@
             large_plat_public_car_warn_detail a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         WHERE
-            b.app_org = #{appOrg}
+            b.app_org = #{arg0} AND alert_type = #{arg1}
     </select>
 
     <select id="getOperationManageTopHalf" parameterType="String" resultMap="LargePlatPublicCarResult">
@@ -183,7 +184,7 @@
     <select id="getCarRank" resultMap="LargeCarRankResult">
         SELECT
             org_name,
-            vechile_num,
+            vehicle_num,
             pcd_count
         FROM
             large_plat_public_car_rank_person a
@@ -222,4 +223,16 @@
         ORDER BY
             pcd_num
     </select>
+
+    <delete id="deleteAllCarDetail" parameterType="integer">
+        delete from large_plat_public_car_change_detail where flag = #{flag}
+    </delete>
+
+    <delete id="deleteAllWarnDetail" parameterType="String">
+        delete from large_plat_public_car_warn_detail where alert_type = #{alertType}
+    </delete>
+
+    <delete id="deleteAllCarRank">
+        delete from large_plat_public_car_rank_person
+    </delete>
 </mapper>