公务用车 大屏接口 调整

project-zcustom/src/main/java/com/project/zcustom/controller/car/PlatCarController.java

@@ -61,7 +61,7 @@ public class PlatCarController {
      * 运行管理 下
      */
     @GetMapping("/operationManageLastHalf")
-    public AjaxResult getOperationManageLastHalf(@RequestParam String appOrg) {
-        return AjaxResult.success("查询成功", largePlatCarService.getOperationManageLastHalf(appOrg));
+    public AjaxResult getOperationManageLastHalf() {
+        return AjaxResult.success("查询成功", largePlatCarService.getOperationManageLastHalf());
     }
 }

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

@@ -93,18 +93,11 @@ public class LargeCar extends CustomBaseEntity {
     private Long newPowerCarNum;
 
     /**
-     * 公务车缺编率
+     * 公务车缺编数
      */
-    @Excel(name = "公务车缺编率")
 
-    private BigDecimal lackRate;
+    private Long lackCarNum;
 
-    /**
-     * 公务车占编率
-     */
-    @Excel(name = "公务车占编率")
-
-    private BigDecimal possesRate;
 
     /**
      * 公务车编制数
@@ -128,18 +121,21 @@ public class LargeCar extends CustomBaseEntity {
     private Long yearReduceNum;
 
     /**
-     * 公务车终端安装率
+     * 公务车终端数
+     */
+    private Long terminalTotal;
+
+    /**
+     * 公务车终端安装数
      */
-    @Excel(name = "公务车终端安装率")
 
-    private BigDecimal terminalInstallRate;
+    private Long terminalInstall;
 
     /**
-     * 公务车终端在线率
+     * 公务车终端在线数
      */
-    @Excel(name = "公务车终端在线率")
 
-    private BigDecimal terminalOnlineRate;
+    private Long terminalOnline;
 
     /**
      * 处置未归档数量

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

@@ -5,19 +5,19 @@ import com.project.zcustom.domain.addional.*;
 import java.util.List;
 
 public interface PlatCarMapper {
-    LargeCar getResource(String appOrg);
+    LargeCar getResourceNumber(String appOrg);
 
     List<LargeCarDetail> getCarDetail(String appOrg, Long flag);
 
-    LargeCar getMonitor(String appOrg);
+    LargeCar getMonitorNumber(String appOrg);
 
     List<LargeWarnDetail> getWarnDetail(String appOrg);
 
     LargeCar getOperationManageTopHalf(String appOrg);
 
-    List<LargeUnitRank> getUnitRankTop(String appOrg);
+    List<LargeUnitRank> getUnitRankTop();
 
-    List<LargeUnitRank> getUnitRankLast(String appOrg);
+    List<LargeUnitRank> getUnitRankLast();
 
-    List<LargeCarRank> getCarRank(String appOrg);
+    List<LargeCarRank> getCarRank();
 }

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatAppOrgServiceImpl.java

@@ -36,6 +36,7 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
                 PlatAppOrg::getId,
                 PlatAppOrg::getAppOrg,
                 PlatAppOrg::getAppParentOrg,
+                PlatAppOrg::getAppEncode,
                 PlatAppOrg::getAppName,
                 PlatAppOrg::getConnectFlag
         );

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

@@ -13,5 +13,5 @@ public interface ILargePlatCarService {
     LargeCar getMonitor(String appOrg);
     List<LargeWarnDetail> getWarnDetail(String appOrg);
     LargeCar getOperationManageTopHalf(String appOrg);
-    Map<String, Object> getOperationManageLastHalf(String appOrg);
+    Map<String, Object> getOperationManageLastHalf();
 }

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

@@ -20,7 +20,7 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
     private PlatCarMapper platCarMapper;
 
     public LargeCar getResource(String appOrg){
-        return platCarMapper.getResource(appOrg);
+        return platCarMapper.getResourceNumber(appOrg);
     }
 
     public List<LargeCarDetail> getCarDetail(String appOrg, Long flag){
@@ -28,7 +28,7 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
     }
 
     public LargeCar getMonitor(String appOrg){
-        return platCarMapper.getMonitor(appOrg);
+        return platCarMapper.getMonitorNumber(appOrg);
     }
 
     public List<LargeWarnDetail> getWarnDetail(String appOrg){
@@ -39,17 +39,17 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
         return platCarMapper.getOperationManageTopHalf(appOrg);
     }
 
-    public Map<String, Object> getOperationManageLastHalf(String appOrg){
+    public Map<String, Object> getOperationManageLastHalf(){
         Map<String, Object> map = new HashMap<>();
-        List<LargeUnitRank> list1 = platCarMapper.getUnitRankTop(appOrg);
+        List<LargeUnitRank> list1 = platCarMapper.getUnitRankTop();
         map.put("x1", list1.stream().map(LargeUnitRank::getGwcCount).collect(Collectors.toList()));
         map.put("y1", list1.stream().map(LargeUnitRank::getGwcPcd).collect(Collectors.toList()));
         map.put("z1", list1.stream().map(LargeUnitRank::getAppName).collect(Collectors.toList()));
-        List<LargeUnitRank> list2 = platCarMapper.getUnitRankLast(appOrg);
+        List<LargeUnitRank> list2 = platCarMapper.getUnitRankLast();
         map.put("x2", list2.stream().map(LargeUnitRank::getGwcCount).collect(Collectors.toList()));
         map.put("y2", list2.stream().map(LargeUnitRank::getGwcPcd).collect(Collectors.toList()));
         map.put("z2", list2.stream().map(LargeUnitRank::getAppName).collect(Collectors.toList()));
-        map.put("list", platCarMapper.getCarRank(appOrg));
+        map.put("list", platCarMapper.getCarRank());
         return map;
     }
 }

project-zcustom/src/main/java/com/project/zcustom/service/unit/impl/LargePublicCarServiceImpl.java

@@ -55,11 +55,8 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
         if (StringUtils.isNotNull(largeCar.getNewPowerCarNum())){
             lqw.eq(LargeCar::getNewPowerCarNum ,largeCar.getNewPowerCarNum());
         }
-        if (StringUtils.isNotNull(largeCar.getLackRate())){
-            lqw.eq(LargeCar::getLackRate ,largeCar.getLackRate());
-        }
-        if (StringUtils.isNotNull(largeCar.getPossesRate())){
-            lqw.eq(LargeCar::getPossesRate ,largeCar.getPossesRate());
+        if (StringUtils.isNotNull(largeCar.getLackCarNum())){
+            lqw.eq(LargeCar::getLackCarNum ,largeCar.getLackCarNum());
         }
         if (StringUtils.isNotNull(largeCar.getEstablishmentsCarNum())){
             lqw.eq(LargeCar::getEstablishmentsCarNum ,largeCar.getEstablishmentsCarNum());
@@ -70,11 +67,14 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
         if (StringUtils.isNotNull(largeCar.getYearReduceNum())){
             lqw.eq(LargeCar::getYearReduceNum ,largeCar.getYearReduceNum());
         }
-        if (StringUtils.isNotNull(largeCar.getTerminalInstallRate())){
-            lqw.eq(LargeCar::getTerminalInstallRate ,largeCar.getTerminalInstallRate());
+        if (StringUtils.isNotNull(largeCar.getTerminalTotal())){
+            lqw.eq(LargeCar::getTerminalTotal ,largeCar.getTerminalTotal());
+        }
+        if (StringUtils.isNotNull(largeCar.getTerminalInstall())){
+            lqw.eq(LargeCar::getTerminalInstall ,largeCar.getTerminalInstall());
         }
-        if (StringUtils.isNotNull(largeCar.getTerminalOnlineRate())){
-            lqw.eq(LargeCar::getTerminalOnlineRate ,largeCar.getTerminalOnlineRate());
+        if (StringUtils.isNotNull(largeCar.getTerminalOnline())){
+            lqw.eq(LargeCar::getTerminalOnline ,largeCar.getTerminalOnline());
         }
         if (StringUtils.isNotNull(largeCar.getNotArchivedNum())){
             lqw.eq(LargeCar::getNotArchivedNum ,largeCar.getNotArchivedNum());

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

@@ -68,28 +68,29 @@
     </resultMap>
 
 
-    <select id="getResource" parameterType="String" resultMap="LargePlatPublicCarResult">
+    <select id="getResourceNumber" parameterType="String" resultMap="LargePlatPublicCarResult">
         SELECT
-            total_car_num,
-            car_num_one,
-            car_num_two,
-            car_num_three,
-            car_num_four,
-            car_num_five,
-            enterprise_car_num,
-            head_car_num,
-            oil_car_num,
-            new_power_car_num,
-            lack_rate,
-            posses_rate,
-            establishments_car_num,
-            year_add_num,
-            year_reduce_num
+            SUM(total_car_num) AS total_car_num,
+            SUM(car_num_one) AS car_num_one,
+            SUM(car_num_two) AS car_num_two,
+            SUM(car_num_three) AS car_num_three,
+            SUM(car_num_four) AS car_num_four,
+            SUM(car_num_five) AS car_num_five,
+            SUM(enterprise_car_num) AS enterprise_car_num,
+            SUM(head_car_num) AS head_car_num,
+            SUM(oil_car_num) AS oil_car_num,
+            SUM(new_power_car_num) AS new_power_car_num,
+            SUM(lack_car_num) AS lack_car_num,
+            SUM(establishments_car_num) AS establishments_car_num,
+            SUM(year_add_num) AS year_add_num,
+            SUM(year_reduce_num) AS year_reduce_num
         FROM
             large_plat_public_car a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        <if test="appOrg != '10001'">
         WHERE
-            b.app_org = #{appOrg}
+            b.app_org = #{appOrg} OR b.app_parent_org = #{appOrg}
+        </if>
     </select>
 
     <select id="getCarDetail" resultMap="LargePlatPublicCarChangeDetailResult">
@@ -108,19 +109,22 @@
             b.app_org = #{arg0} AND flag = #{arg1}
     </select>
 
-    <select id="getMonitor" parameterType="String" resultMap="LargePlatPublicCarResult">
+    <select id="getMonitorNumber" parameterType="String" resultMap="LargePlatPublicCarResult">
         SELECT
-            terminal_install_rate,
-            terminal_online_rate,
-            not_archived_num,
-            no_pid_num,
-            over_speed_num,
-            holiday_num
+            SUM(not_archived_num) AS not_archived_num,
+            SUM(no_pid_num) AS no_pid_num,
+            SUM(over_speed_num) AS over_speed_num,
+            SUM(holiday_num) AS holiday_num,
+            SUM(terminal_total) AS terminal_total,
+            SUM(terminal_install) AS terminal_install,
+            SUM(terminal_online) AS terminal_online
         FROM
             large_plat_public_car a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        <if test="appOrg != '10001'">
         WHERE
-            b.app_org = #{appOrg}
+            b.app_org = #{appOrg} OR b.app_parent_org = #{appOrg}
+        </if>
     </select>
 
     <select id="getWarnDetail" parameterType="String" resultMap="LargePlatPublicCarWarnDetailResult">
@@ -139,18 +143,20 @@
 
     <select id="getOperationManageTopHalf" parameterType="String" resultMap="LargePlatPublicCarResult">
         SELECT
-            avg_mile,
-            mile_count,
-            avg_pcd_num,
-            pcd_num
+            AVG(avg_mile) AS avg_mile,
+            SUM(mile_count) AS mile_count,
+            AVG(avg_pcd_num) AS avg_pcd_num,
+            SUM(pcd_num) AS pcd_num
         FROM
             large_plat_public_car a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
+        <if test="appOrg != '10001'">
         WHERE
-            b.app_org = #{appOrg}
+            b.app_org = #{appOrg} OR b.app_parent_org = #{appOrg}
+        </if>
     </select>
 
-    <select id="getUnitRankTop" parameterType="String" resultMap="LargeUnitRankResult">
+    <select id="getUnitRankTop" resultMap="LargeUnitRankResult">
         SELECT
             app_name,
             gwc_pcd,
@@ -158,14 +164,12 @@
         FROM
             large_plat_public_car_rank_unit a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
-        WHERE
-            b.app_org = #{appOrg}
         ORDER BY
             a.id
             LIMIT 3
     </select>
 
-    <select id="getUnitRankLast" parameterType="String" resultMap="LargeUnitRankResult">
+    <select id="getUnitRankLast" resultMap="LargeUnitRankResult">
         SELECT
             app_name,
             gwc_pcd,
@@ -173,14 +177,12 @@
         FROM
             large_plat_public_car_rank_unit a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
-        WHERE
-            b.app_org = #{appOrg}
         ORDER BY
             a.id DESC
             LIMIT 3
     </select>
 
-    <select id="getCarRank" parameterType="String" resultMap="LargeCarRankResult">
+    <select id="getCarRank" resultMap="LargeCarRankResult">
         SELECT
             app_name,
             vechile_num,
@@ -188,8 +190,6 @@
         FROM
             large_plat_public_car_rank_person a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
-        WHERE
-            b.app_org = #{appOrg}
         ORDER BY
             pcd_count
             LIMIT 10