公务用车 数据同步 去除县

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

@@ -235,6 +235,7 @@ public class PlatAppOrgServiceImpl extends ServiceImpl<PlatAppOrgMapper, PlatApp
                 PlatAppOrg::getId,
                 PlatAppOrg::getAppEncode,
                 PlatAppOrg::getAppCode,
+                PlatAppOrg::getAppParentOrg,
                 PlatAppOrg::getAppName
         );
         lqw.isNotNull(PlatAppOrg::getAppCode);

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

@@ -186,11 +186,11 @@ public class LargeCarDetailServiceImpl extends ServiceImpl<LargeCarDetailMapper,
     public int upload(Map<String, Object> json, Integer flag){
         try {
             List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
-            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
+            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppParentOrg, (v1, v2) -> v1));
             List<LargeCarDetail> list = JSON.parseArray(JSON.toJSONString(json.get("data")), LargeCarDetail.class);
             platCarMapper.deleteAllCarDetail(flag);
             for (LargeCarDetail largeCarDetail : list){
-                if (!orgMap.containsKey(largeCarDetail.getAppEncode())){
+                if (!orgMap.containsKey(largeCarDetail.getAppEncode()) || !orgMap.get(largeCarDetail.getAppEncode()).equals("10001")){
                     continue;
                 }
                 largeCarDetail.setFlag(flag);

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

@@ -169,11 +169,11 @@ public class LargeCarRankServiceImpl extends ServiceImpl<LargeCarRankMapper, Lar
     public int upload(Map<String, Object> json){
         try {
             List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
-            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
+            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppParentOrg, (v1, v2) -> v1));
             List<LargeCarRank> list = JSON.parseArray(JSON.toJSONString(json.get("data")), LargeCarRank.class);
             platCarMapper.deleteAllCarRank();
             for (LargeCarRank largeCarRank : list){
-                if (!orgMap.containsKey(largeCarRank.getAppEncode())){
+                if (!orgMap.containsKey(largeCarRank.getAppEncode()) || !orgMap.get(largeCarRank.getAppEncode()).equals("10001")){
                     continue;
                 }
                 this.save(largeCarRank);

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

@@ -234,10 +234,10 @@ public class LargePublicCarServiceImpl extends ServiceImpl<LargePublicCarMapper,
     public int upload(String type, Map<String, Object> json){
         try {
             List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
-            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
+            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppParentOrg, (v1, v2) -> v1));
             List<LargeCar> list = JSON.parseArray(JSON.toJSONString(json.get("data")), LargeCar.class);
             for (LargeCar largeCar : list){
-                if (!orgMap.containsKey(largeCar.getAppEncode())){
+                if (!orgMap.containsKey(largeCar.getAppEncode()) || !orgMap.get(largeCar.getAppEncode()).equals("10001")){
                     continue;
                 }
                 LargeCar car = this.getOne(new QueryWrapper<LargeCar>().eq("app_encode", largeCar.getAppEncode()).last("limit 1"));

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

@@ -175,11 +175,11 @@ public class LargeWarnDetailServiceImpl extends ServiceImpl<LargeWarnDetailMappe
     public int upload(Map<String, Object> json, String alertType){
         try {
             List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
-            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
+            Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppParentOrg, (v1, v2) -> v1));
             List<LargeWarnDetail> list = JSON.parseArray(JSON.toJSONString(json.get("data")), LargeWarnDetail.class);
             platCarMapper.deleteAllWarnDetail(alertType);
             for (LargeWarnDetail largeWarnDetail : list){
-                if (!orgMap.containsKey(largeWarnDetail.getAppEncode())){
+                if (!orgMap.containsKey(largeWarnDetail.getAppEncode()) || !orgMap.get(largeWarnDetail.getAppEncode()).equals("10001")){
                     continue;
                 }
                 this.save(largeWarnDetail);

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

@@ -60,7 +60,7 @@ public class CarService {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
         String formattedDate = currentDate.format(formatter);
         List<PlatAppOrg> orgList = platAppOrgService.selectAppCodeList();
-        Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppName, (v1, v2) -> v1));
+        Map<String, String> orgMap = orgList.stream().collect(Collectors.toMap(PlatAppOrg::getAppEncode, PlatAppOrg::getAppParentOrg, (v1, v2) -> v1));
 //        TODO
 //        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonEstablishment(), "yearMonth=" + formattedDate), LargeCar.class), orgMap);
 //        entryA(JSON.parseArray(repeat(ApiUrlConfig.getJsonCarChange(), "year=" + year), LargeCar.class), orgMap);
@@ -1000,7 +1000,7 @@ public class CarService {
     public void entryA(List<LargeCar> x, Map<String, String> map){
         try {
             for (LargeCar it : x){
-                if (!map.containsKey(it.getAppEncode())){
+                if (!map.containsKey(it.getAppEncode()) || !map.get(it.getAppEncode()).equals("10001")){
                     continue;
                 }
                 QueryWrapper<LargeCar> lqw = new QueryWrapper<LargeCar>();
@@ -1028,7 +1028,7 @@ public class CarService {
         try {
             platCarMapper.deleteAllCarDetail(flag);
             for (LargeCarDetail it : x){
-                if (!map.containsKey(it.getAppEncode())){
+                if (!map.containsKey(it.getAppEncode()) || !map.get(it.getAppEncode()).equals("10001")){
                     continue;
                 }
                 it.setFlag(flag);
@@ -1048,7 +1048,7 @@ public class CarService {
         try {
             platCarMapper.deleteAllWarnDetail(alertType);
             for (LargeWarnDetail it : x){
-                if (!map.containsKey(it.getAppEncode())){
+                if (!map.containsKey(it.getAppEncode()) || !map.get(it.getAppEncode()).equals("10001")){
                     continue;
                 }
                 largeWarnDetailService.save(it);
@@ -1068,7 +1068,7 @@ public class CarService {
             platCarMapper.deleteAllCarRank();
             largeCarRankService.remove(null);
             for (LargeCarRank it : x){
-                if (!map.containsKey(it.getAppEncode())){
+                if (!map.containsKey(it.getAppEncode()) || !map.get(it.getAppEncode()).equals("10001")){
                     continue;
                 }
                 largeCarRankService.save(it);