Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/common/schedule/OrgSyncJob.java

@@ -48,34 +48,39 @@ public class OrgSyncJob extends QuartzJobBean {
         Map<String, String> headers = new HashMap<>();
         headers.put("token", token);
         headers.put("Content-Type", "application/x-www-form-urlencoded");
+        headers.put("Idap", "eddie.wu_v");
+        int pageSize = 1;
         try {
-            // todo 这里要加分页查询的参数
-            String response = HttpUtil.get(orgSyncUrl, headers);
-            DDSyncOrgInfo ddSyncOrgInfo = JSONObject.parseObject(response, DDSyncOrgInfo.class);
-            List<OrgSyncData> orgSyncDatas = ddSyncOrgInfo.getData();
-            orgSyncDatas.forEach(osd -> {
-                OrganizationExample example = new OrganizationExample();
-                example.createCriteria().andNameEqualTo(osd.getNameCN());
-                Organization o = new Organization();
-                o.setClientCode(osd.getCode());
-                o.setCode(osd.getCode());
-                o.setEnterpriseAccountCode(String.valueOf(osd.getSobId()));
-                o.setEnterpriseAccountName(osd.getSobName());
-                o.setCurrencyCode(osd.getCurrencyCode());
-                o.setLegalEntity(osd.getLegalEntity());
-                o.setLegalPersonName(osd.getLegalRepresentative());
-                o.setAddress(osd.getAddress());
-                o.setCreateTime(osd.getGmtCreate());
-                o.setUpdateTime(osd.getGmtModified());
-                o.setPsCode(osd.getPsCode());
-                RegionExample regionExample = new RegionExample();
-                regionExample.createCriteria().andShortNameEqualTo(osd.getCompanyLocation());
-                List<Region> regions = regionMapper.selectByExample(regionExample);
-                if (regions.size() > 0) {
-                    o.setRegionId(regions.get(0).getId());
-                }
-                organizationMapper.updateByExampleSelective(o, example);
-            });
+            for (int i = 1; i <= pageSize; i++) {
+                String response = HttpUtil.get(orgSyncUrl+"?currentPage="+i, headers);
+                DDSyncOrgInfo ddSyncOrgInfo = JSONObject.parseObject(response, DDSyncOrgInfo.class);
+                pageSize = ddSyncOrgInfo.getPageSize();
+                List<OrgSyncData> orgSyncDatas = ddSyncOrgInfo.getData();
+                orgSyncDatas.forEach(osd -> {
+                    OrganizationExample example = new OrganizationExample();
+                    example.createCriteria().andNameEqualTo(osd.getNameCN());
+                    Organization o = new Organization();
+                    o.setClientCode(osd.getCode());
+                    o.setCode(osd.getCode());
+                    o.setEnterpriseAccountCode(String.valueOf(osd.getSobId()));
+                    o.setEnterpriseAccountName(osd.getSobName());
+                    o.setCurrencyCode(osd.getCurrencyCode());
+                    o.setLegalEntity(osd.getLegalEntity());
+                    o.setLegalPersonName(osd.getLegalRepresentative());
+                    o.setAddress(osd.getAddress());
+                    o.setCreateTime(osd.getGmtCreate());
+                    o.setUpdateTime(osd.getGmtModified());
+                    o.setPsCode(osd.getPsCode());
+                    RegionExample regionExample = new RegionExample();
+                    regionExample.createCriteria().andShortNameEqualTo(osd.getCompanyLocation());
+                    List<Region> regions = regionMapper.selectByExample(regionExample);
+                    if (regions.size() > 0) {
+                        o.setRegionId(regions.get(0).getId());
+                    }
+                    organizationMapper.updateByExampleSelective(o, example);
+                });
+            }
+
         } catch (Exception e) {
             logger.error(String.format("机构信息同步异常:[%s]", e.getMessage()), e);
         }