后台界面 -- 公务用车 大屏接口调整

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

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 
 @Data
 @TableName("large_plat_public_car")
-@JsonInclude(JsonInclude.Include.NON_NULL)
+
 public class LargeCar extends CustomBaseEntity {
     private Long id;
 
@@ -28,70 +28,70 @@ public class LargeCar extends CustomBaseEntity {
      */
 
     @JSONField(name = "gwcNum")
-    private Long totalCarNum;
+    private Long totalCarNum = 0L;
 
     /**
      * 商务车数量
      */
 
     @JSONField(name = "swc")
-    private Long carNumOne;
+    private Long carNumOne = 0L;
 
     /**
      * 越野车数量
      */
 
     @JSONField(name = "yyc")
-    private Long carNumTwo;
+    private Long carNumTwo = 0L;
 
     /**
      * 小轿车数量
      */
 
     @JSONField(name = "xjc")
-    private Long carNumThree;
+    private Long carNumThree = 0L;
 
     /**
      * 小型客车数量
      */
 
     @JSONField(name = "xxkc")
-    private Long carNumFour;
+    private Long carNumFour = 0L;
 
     /**
      * 大型客车数量
      */
 
     @JSONField(name = "dxkc")
-    private Long carNumFive;
+    private Long carNumFive = 0L;
 
     /**
      * 企业用车数量
      */
 
     @JSONField(name = "qyyc")
-    private Long enterpriseCarNum;
+    private Long enterpriseCarNum = 0L;
 
     /**
      * 企业负责人用车数量
      */
 
     @JSONField(name = "qyfzr")
-    private Long headCarNum;
+    private Long headCarNum = 0L;
 
     /**
      * 燃油车数量
      */
 
     @JSONField(name = "ryc")
-    private Long oilCarNum;
+    private Long oilCarNum = 0L;
 
     /**
      * 新能源车数量
      */
 
     @JSONField(name = "xnyc")
-    private Long newPowerCarNum;
+    private Long newPowerCarNum = 0L;
 
 
 
@@ -100,93 +100,93 @@ public class LargeCar extends CustomBaseEntity {
      */
 
     @JSONField(name = "gwcZbs")
-    private Long establishmentsCarNum;
+    private Long establishmentsCarNum = 0L;
 
     /**
      * 公务车年度增加数
      */
 
     @JSONField(name = "gwcZJS")
-    private Long yearAddNum;
+    private Long yearAddNum = 0L;
 
     /**
      * 公务车年度减少数
      */
 
     @JSONField(name = "gwcJSS")
-    private Long yearReduceNum;
+    private Long yearReduceNum = 0L;
 
     /**
      * 公务车终端数
      */
     @JSONField(name = "terminalTotal")
-    private Long terminalTotal;
+    private Long terminalTotal = 0L;
 
     /**
      * 公务车终端安装数
      */
     @JSONField(name = "terminalInstall")
-    private Long terminalInstall;
+    private Long terminalInstall = 0L;
 
     /**
      * 公务车终端在线数
      */
     @JSONField(name = "online")
-    private Long terminalOnline;
+    private Long terminalOnline = 0L;
 
     /**
      * 处置未归档数量
      */
 
     @JSONField(name = "CZWGD")
-    private Long notArchivedNum;
+    private Long notArchivedNum = 0L;
 
     /**
      * 未带工单数
      */
 
     @JSONField(name = "noPid")
-    private Long noPidNum;
+    private Long noPidNum = 0L;
 
     /**
      * 超速预警数
      */
 
     @JSONField(name = "overSpeed")
-    private Long overSpeedNum;
+    private Long overSpeedNum = 0L;
 
     /**
      * 节假日预警数
      */
 
     @JSONField(name = "Holiday")
-    private Long holidayNum;
+    private Long holidayNum = 0L;
 
     /**
      * 派车单总数
      */
 
     @JSONField(name = "pcdNum")
-    private String pcdNum;
+    private Long pcdNum = 0L;
 
     /**
      * 均车派车单数
      */
 
     @JSONField(name = "gwcTotal")
-    private String avgPcdNum;
+    private Long avgPcdNum = 0L;
 
     /**
      * 公务车行驶总里程
      */
 
     @JSONField(name = "mileCount")
-    private String mileCount;
+    private String mileCount = "0";
 
     /**
      * 均车里程
      */
 
     @JSONField(name = "avgMile")
-    private String avgMile;
+    private String avgMile = "0";
 }

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

@@ -20,7 +20,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
     private PlatCarMapper platCarMapper;
 
     public LargeCar getResource(String appOrg){
-        return platCarMapper.getResourceNumber(appOrg);
+        LargeCar largeCar = platCarMapper.getResourceNumber(appOrg);
+        if (largeCar == null){
+            return new LargeCar();
+        }
+        return largeCar;
     }
 
     public List<LargeCarDetail> getCarDetail(String appOrg, Long flag){
@@ -28,7 +32,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
     }
 
     public LargeCar getMonitor(String appOrg){
-        return platCarMapper.getMonitorNumber(appOrg);
+        LargeCar largeCar = platCarMapper.getMonitorNumber(appOrg);
+        if (largeCar == null){
+            return new LargeCar();
+        }
+        return largeCar;
     }
 
     public List<LargeWarnDetail> getWarnDetail(String appOrg){
@@ -36,7 +44,11 @@ public class LargePlatCarServiceImpl implements ILargePlatCarService {
     }
 
     public LargeCar getOperationManageTopHalf(String appOrg){
-        return platCarMapper.getOperationManageTopHalf(appOrg);
+        LargeCar largeCar = platCarMapper.getOperationManageTopHalf(appOrg);
+        if (largeCar == null){
+            return new LargeCar();
+        }
+        return largeCar;
     }
 
     public Map<String, Object> getOperationManageLastHalf(){

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

@@ -91,10 +91,10 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
         if (StringUtils.isNotNull(largeCar.getHolidayNum())){
             lqw.eq(LargeCar::getHolidayNum ,largeCar.getHolidayNum());
         }
-        if (StringUtils.isNotBlank(largeCar.getPcdNum())){
+        if (StringUtils.isNotNull(largeCar.getPcdNum())){
             lqw.eq(LargeCar::getPcdNum ,largeCar.getPcdNum());
         }
-        if (StringUtils.isNotBlank(largeCar.getAvgPcdNum())){
+        if (StringUtils.isNotNull(largeCar.getAvgPcdNum())){
             lqw.eq(LargeCar::getAvgPcdNum ,largeCar.getAvgPcdNum());
         }
         if (StringUtils.isNotBlank(largeCar.getMileCount())){

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

@@ -88,7 +88,7 @@
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         <if test="appOrg != '10001'">
         WHERE
-            b.app_org = #{appOrg} OR b.app_parent_org = #{appOrg}
+            b.app_org = #{appOrg}
         </if>
     </select>
 
@@ -122,7 +122,7 @@
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         <if test="appOrg != '10001'">
         WHERE
-            b.app_org = #{appOrg} OR b.app_parent_org = #{appOrg}
+            b.app_org = #{appOrg}
         </if>
     </select>
 
@@ -151,7 +151,7 @@
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         <if test="appOrg != '10001'">
         WHERE
-            b.app_org = #{appOrg} OR b.app_parent_org = #{appOrg}
+            b.app_org = #{appOrg}
         </if>
     </select>