公务用车 数据同步 修改

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

@@ -17,27 +17,23 @@ public class LargeCarRank extends CustomBaseEntity {
     /**
      * 单位名称
      */
-    @TableField(exist = false)
-    private String appName;
+    @JSONField(name = "orgName")
+    private String orgName;
 
     /**
      * 派车单总数
      */
-    @Excel(name = "派车单总数")
-
     private Long pcdCount;
 
     /**
      * 车牌号
      */
-    @Excel(name = "车牌号")
     @JSONField(name = "vehicleNumber")
     private String vechileNum;
 
     /**
      * 单位编码
      */
-    @Excel(name = "单位编码")
     @JSONField(name = "orgCode")
     private String appEncode;
 

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

@@ -1,5 +1,6 @@
 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;
@@ -17,6 +18,7 @@ public class LargeUnitRank extends CustomBaseEntity {
      * 单位名称
      */
     @TableField(exist = false)
+    @JSONField(name = "orgName")
     private String appName;
 
 

project-zcustom/src/main/java/com/project/zcustom/tools/CarService.java

@@ -9,13 +9,16 @@ import com.project.zcustom.domain.addional.LargeCar;
 import com.project.zcustom.domain.addional.LargeCarDetail;
 import com.project.zcustom.domain.addional.LargeCarRank;
 import com.project.zcustom.domain.addional.LargeWarnDetail;
+import com.project.zcustom.domain.basics.PlatAppOrg;
 import com.project.zcustom.domain.plat.PlatApiRecord;
 import com.project.zcustom.domain.property.PlatProperty;
 import com.project.zcustom.service.plat.IPlatApiRecordService;
+import com.project.zcustom.service.service.basics.IPlatAppOrgService;
 import com.project.zcustom.service.unit.ILargeCarDetailService;
 import com.project.zcustom.service.unit.ILargeCarRankService;
 import com.project.zcustom.service.unit.ILargePublicCarService;
 import com.project.zcustom.service.unit.ILargeWarnDetailService;
+import com.sun.xml.internal.bind.v2.TODO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,6 +26,7 @@ import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class CarService {
@@ -41,6 +45,9 @@ public class CarService {
     @Autowired
     private ILargeCarRankService largeCarRankService;
 
+    @Autowired
+    private IPlatAppOrgService platAppOrgService;
+
     /**
      * 公务用车
      */
@@ -49,23 +56,25 @@ public class CarService {
         int year = currentDate.getYear();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
         String formattedDate = currentDate.format(formatter);
-        // TODO
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarChange(), "year=" + year), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarType(), "year=" + year), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEnterpriseCar(), "year=" + year), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarPowerType(), "year=" + year), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarOrderAndMileage(), "yearMonth=" + formattedDate), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarTerminal(), "yearMonth=" + formattedDate), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarNotArchived(), "yearMonth=" + formattedDate), LargeCar.class));
-//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarning(), "yearMonth=" + formattedDate), LargeCar.class));
-//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarIncrease(), "year=" + year), LargeCarDetail.class));
-//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarReduce(), "year=" + year), LargeCarDetail.class));
-//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningTickets(), "yearMonth=" + formattedDate), LargeWarnDetail.class));
-//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningHoliday(), "yearMonth=" + formattedDate), LargeWarnDetail.class));
-//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningOverSpeed(), "yearMonth=" + formattedDate), LargeWarnDetail.class));
-//        entryD(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarRank(), "yearMonth=" + formattedDate), LargeCarRank.class));
+        List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
+        List<String> xList = orgList.stream().map(PlatAppOrg::getAppEncode).collect(Collectors.toList());
+//        TODO
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarChange(), "year=" + year), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarType(), "year=" + year), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEnterpriseCar(), "year=" + year), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarPowerType(), "year=" + year), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarOrderAndMileage(), "yearMonth=" + formattedDate), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarTerminal(), "yearMonth=" + formattedDate), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarNotArchived(), "yearMonth=" + formattedDate), LargeCar.class), xList);
+//        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarning(), "yearMonth=" + formattedDate), LargeCar.class), xList);
+//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarIncrease(), "year=" + year), LargeCarDetail.class), xList);
+//        entryB(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarReduce(), "year=" + year), LargeCarDetail.class), xList);
+//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningTickets(), "yearMonth=" + formattedDate), LargeWarnDetail.class), xList);
+//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningHoliday(), "yearMonth=" + formattedDate), LargeWarnDetail.class), xList);
+//        entryC(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarWarningOverSpeed(), "yearMonth=" + formattedDate), LargeWarnDetail.class), xList);
+//        entryD(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarRank(), "yearMonth=" + formattedDate), LargeCarRank.class), xList);
         String a = "[\n" +
                 "        {\n" +
                 "            \"lockTag\": \"已审核\",\n" +
@@ -977,59 +986,89 @@ public class CarService {
                 "            \"COUNTNUM\": 1\n" +
                 "        }\n" +
                 "    ]\n";
-        entryB(JSON.parseArray(a, LargeCarDetail.class));
-        entryB(JSON.parseArray(b, LargeCarDetail.class));
-        entryC(JSON.parseArray(c, LargeWarnDetail.class));
-        entryC(JSON.parseArray(d, LargeWarnDetail.class));
-        entryC(JSON.parseArray(e, LargeWarnDetail.class));
-        entryD(JSON.parseArray(f, LargeCarRank.class));
+        entryB(JSON.parseArray(a, LargeCarDetail.class), xList);
+        entryB(JSON.parseArray(b, LargeCarDetail.class), xList);
+        entryC(JSON.parseArray(c, LargeWarnDetail.class), xList);
+        entryC(JSON.parseArray(d, LargeWarnDetail.class), xList);
+        entryC(JSON.parseArray(e, LargeWarnDetail.class), xList);
+        entryD(JSON.parseArray(f, LargeCarRank.class), xList);
     }
 
-    public void entryA(List<LargeCar> x){
-        for (LargeCar it : x){
-            QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
-            lqw.eq("app_encode", it.getAppEncode());
-            lqw.last("limit 1");
-            if (largePlatPublicCarService.getOne(lqw) != null){
-                largePlatPublicCarService.updateById(it);
+    public void entryA(List<LargeCar> x, List<String> list){
+        try {
+            for (LargeCar it : x){
+                if (list.contains(it.getAppEncode())){
+                    return;
+                }
+                QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
+                lqw.eq("app_encode", it.getAppEncode());
+                lqw.last("limit 1");
+                if (largePlatPublicCarService.getOne(lqw) != null){
+                    largePlatPublicCarService.updateById(it);
+                }
+                else largePlatPublicCarService.save(it);
             }
-            else largePlatPublicCarService.save(it);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
-    public void entryB(List<LargeCarDetail> x){
-        for (LargeCarDetail it : x){
-            QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
-            lqw.eq("app_encode", it.getAppEncode());
-            lqw.last("limit 1");
-            if (largeCarDetailService.getOne(lqw) != null){
-                largeCarDetailService.updateById(it);
+    public void entryB(List<LargeCarDetail> x, List<String> list){
+        try {
+            for (LargeCarDetail it : x){
+                if (list.contains(it.getAppEncode())){
+                    return;
+                }
+                QueryWrapper<LargeCarDetail> lqw = new QueryWrapper<LargeCarDetail>();
+                lqw.eq("app_encode", it.getAppEncode());
+                lqw.last("limit 1");
+                if (largeCarDetailService.getOne(lqw) != null){
+                    largeCarDetailService.updateById(it);
+                }
+                else largeCarDetailService.save(it);
             }
-            else largeCarDetailService.save(it);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
-    public void entryC(List<LargeWarnDetail> x){
-        for (LargeWarnDetail it : x){
-            QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
-            lqw.eq("app_encode", it.getAppEncode());
-            lqw.last("limit 1");
-            if (largeWarnDetailService.getOne(lqw) != null){
-                largeWarnDetailService.updateById(it);
+    public void entryC(List<LargeWarnDetail> x, List<String> list){
+        try {
+            for (LargeWarnDetail it : x){
+                if (list.contains(it.getAppEncode())){
+                    return;
+                }
+                QueryWrapper<LargeWarnDetail> lqw = new QueryWrapper<LargeWarnDetail>();
+                lqw.eq("app_encode", it.getAppEncode());
+                lqw.last("limit 1");
+                if (largeWarnDetailService.getOne(lqw) != null){
+                    largeWarnDetailService.updateById(it);
+                }
+                else largeWarnDetailService.save(it);
             }
-            else largeWarnDetailService.save(it);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 
-    public void entryD(List<LargeCarRank> x){
-        for (LargeCarRank it : x){
-            QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
-            lqw.eq("app_encode", it.getAppEncode());
-            lqw.last("limit 1");
-            if (largeCarRankService.getOne(lqw) != null){
-                largeCarRankService.updateById(it);
+    public void entryD(List<LargeCarRank> x, List<String> list){
+        try {
+            for (LargeCarRank it : x){
+                if (list.contains(it.getAppEncode())){
+                    return;
+                }
+                QueryWrapper<LargeCarRank> lqw = new QueryWrapper<LargeCarRank>();
+                lqw.eq("app_encode", it.getAppEncode());
+                lqw.last("limit 1");
+                Long id = largeCarRankService.getOne(lqw).getId();
+                if (id != null){
+                    it.setId(id);
+                    largeCarRankService.updateById(it);
+                }
+                else largeCarRankService.save(it);
             }
-            else largeCarRankService.save(it);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
     }
 

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

@@ -50,7 +50,7 @@
     </resultMap>
 
     <resultMap type="com.project.zcustom.domain.addional.LargeCarRank" id="LargeCarRankResult">
-        <result property="appName"    column="app_name"    />
+        <result property="orgName"    column="org_name"    />
         <result property="appEncode"    column="app_encode"    />
         <result property="pcdCount"    column="pcd_count"    />
         <result property="vechileNum"    column="vechile_num"    />
@@ -182,14 +182,14 @@
 
     <select id="getCarRank" resultMap="LargeCarRankResult">
         SELECT
-            app_name,
+            org_name,
             vechile_num,
             pcd_count
         FROM
             large_plat_public_car_rank_person a
                 LEFT JOIN large_plat_app_org b ON a.app_encode = b.app_encode
         ORDER BY
-            pcd_count
+            pcd_count DESC
             LIMIT 10
     </select>