From 05d2819f1069d24ceb96615705d40f44ab5f1f9c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 28 十二月 2023 13:55:50 +0800
Subject: [PATCH] 调整上海嘉定纪委接口3

---
 src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java |   42 ++++++------------------------------------
 1 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index c35d10a..62d64bf 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -109,52 +109,22 @@
     }
 
     /**
-     * 鑾峰彇鐔忚捀浣滀笟浜哄憳淇℃伅琛�
-     * gDApi1023PR#peopleList
-     */
-    @DataProvider
-    public List<GdApi1023People> peopleList(String code) {
-        return JSON.parseArray(code, GdApi1023People.class);
-    }
-
-    /**
-     * 鑾峰彇鐔忚捀澶囨鏂瑰紡琛ㄨ〃淇℃伅
-     * gDApi1023PR#wayList
-     */
-    @DataProvider
-    public List<GdApi1023Way> wayList(String code) {
-        return JSON.parseArray(code, GdApi1023Way.class);
-    }
-
-    /**
-     * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
-     * gDApi1023PR#dtlList
-     */
-    @DataProvider
-    public List<GdApi1023Dtl> dtlList(String code) {
-        return JSON.parseArray(code, GdApi1023Dtl.class);
-    }
-
-    /**
      * gDApi1023PR#saveData
      */
     @DataResolver
     public void saveData(GdApi1023 data) {
-        data.setDtlList(JSON.toJSONString(data.getDtls()));
-        data.setWayList(JSON.toJSONString(data.getWays()));
-        data.setPeopleList(JSON.toJSONString(data.getPeoples()));
         ApiInfoData infoData;
-        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
         if (apiInfoList.size() != 0) {
             infoData = apiInfoList.get(0);
             infoData.setData(JSON.toJSONString(data));
         } else {
             infoData = new ApiInfoData();
-            infoData.setId(ContextUtil.getUUID());
+            infoData.setId(data.getXzbm());
             infoData.setKqdm(data.getKqdm());
             infoData.setInteId(ApiCodeConstant.API_1023);
             infoData.setUpdateTime(new Date());
-            infoData.setDataId(data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+            infoData.setDataId(data.getXzbm());
             infoData.setData(JSON.toJSONString(data));
             infoData.setCzbz(Constant.CZBZ_I);
             infoData.setRemarks("澶囨敞淇℃伅");
@@ -167,7 +137,7 @@
      */
     @Expose
     public void delData(GdApi1023 data) {
-        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
         apiInfoDataRep.deleteById(apiInfoList.get(0).getId());
     }
 
@@ -179,7 +149,7 @@
         if (null == data) {
             return "鏃犳暟鎹墽琛�";
         }
-        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+        List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
         data.setCzbz(Constant.CZBZ_D);
         apiInfoDataRep.updateStatus(apiInfoList.get(0).getId(), JSON.toJSONString(data), Constant.CZBZ_D);
         return null;
@@ -219,7 +189,7 @@
 
             ApiInfoData infoData;
             for (GdApi1023 data : items) {
-                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getKqdm() + DateFormatUtils.format(data.getTbrq(), "yyyyMMdd") + data.getXzbm());
+                List<ApiInfoData> apiInfoList = apiInfoDataRep.getDataByInteAndData(ApiCodeConstant.API_1023, data.getXzbm(), data.getKqdm());
                 data.setCzbz(Constant.CZBZ_U);
                 infoData = apiInfoList.get(0);
                 infoData.setUpdateTime(new Date());

--
Gitblit v1.9.3