中燃-开发-肖顺,发来的代码，要求替换的

陈威
1 parent d2195b33
Showing 3 changed files with 29 additions and 24 deletions Show diff stats
zr-cloud/zr-api/zr-api-system/src/main/java/com/chinagas/api/otherSystem/Mdm.java
zr-cloud/zr-modules/zr-system/src/main/java/com/chinagas/modules/system/controller/DataSyncController.java
zr-cloud/zr-modules/zr-system/src/main/java/com/chinagas/modules/system/service/impl/DepInfoServiceImpl.java
@@ -9,7 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -98,17 +97,23 @@ public class Mdm {
             responseEntity = restTemplate.postForEntity(reqUrl,request,String.class);
             Map<String,Object> body = objectMapper.readValue(responseEntity.getBody(), Map.class);
             objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-            DataRecive<T> dataM = objectMapper.readValue(Base64.decode(body.get("data").toString()),typeReference);
-            if(DataSyncConstants.RYXX.equals(ifaceCode)){
-                instList.addAll(dataM.getCustMasterDataIntfList());
+            if (!DataSyncConstants.ZZJG.equals(ifaceCode)){
+                DataRecive<T> dataM = objectMapper.readValue(Base64.decode(body.get("data").toString()),typeReference);
+                if(DataSyncConstants.RYXX.equals(ifaceCode)){
+                    instList.addAll(dataM.getCustMasterDataIntfList());
+                }
+                if(DataSyncConstants.RYZZGX.equals(ifaceCode)){
+                    instList.addAll(dataM.getEmpDepRelationships());
+                }
             }
             if (DataSyncConstants.ZZJG.equals(ifaceCode)){
-                instList.addAll(dataM.getDepInfoList());
+                String decodedString = new String(Base64.decode(body.get("data").toString()), StandardCharsets.UTF_8);
+                ObjectMapper objectMapper = new ObjectMapper();
+                Map<String, Object> map = objectMapper.readValue(decodedString, Map.class);
+                List<T> list = (List<T>) map.get("depInfoList");
+                instList.addAll(list);
+//                instList.addAll(dataM.getDepInfoList());
             }
-            if(DataSyncConstants.RYZZGX.equals(ifaceCode)){
-                instList.addAll(dataM.getEmpDepRelationships());
-            }
-
         }
         return instList;
     }
 package com.chinagas.modules.system.controller;
+import com.alibaba.fastjson.JSON;
 import com.chinagas.api.otherSystem.Mdm;
 import com.chinagas.api.system.domain.DepInfo;
 import com.chinagas.api.system.domain.EmpDepRelationship;
 import com.chinagas.api.system.domain.EmpInfo;
-import com.chinagas.common.core.constants.Constants;
 import com.chinagas.common.core.constants.DataSyncConstants;
 import com.chinagas.common.core.domain.R;
 import com.chinagas.common.core.utils.sync.DataRecive;
-import com.chinagas.common.core.utils.sync.DataSyncUtils;
 import com.chinagas.common.core.web.controller.BaseController;
 import com.chinagas.common.security.annotation.InnerAuth;
 import com.chinagas.modules.system.service.IDepInfoService;
@@ -21,13 +20,12 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
-import javax.annotation.Resource;
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 /**
  * @ClassName DataSyncController
@@ -69,9 +67,13 @@ public class DataSyncController extends BaseController {
             res = empInfoService.insertEmpInfoBatch(empList);
         }
         if(DataSyncConstants.ZZJG.equals(iFaceCode)){
-            List<DepInfo> depList = mdm.requestOrgData(DataSyncConstants.ZZJG,startTime,endTime, new TypeReference<DataRecive<DepInfo>>() {});
+            List<Map> depList = mdm.requestOrgData(DataSyncConstants.ZZJG,startTime,endTime, new TypeReference<DataRecive<Map>>() {});
             System.out.println("depList size: "+depList.size());
-            res = depInfoService.insertDepInfoBach(depList);
+            List<DepInfo> depInfoArrayList = depList.stream()
+                    .map(map -> JSON.parseObject(JSON.toJSONString(map),DepInfo.class))
+                    .collect(Collectors.toList());
+
+            res = depInfoService.insertDepInfoBach(depInfoArrayList);
         }
         if(DataSyncConstants.RYZZGX.equals(iFaceCode)){
             List<EmpDepRelationship> empDepRelationshipList = mdm.requestOrgData(DataSyncConstants.RYZZGX,startTime,endTime, new TypeReference<DataRecive<EmpDepRelationship>>() {});
 package com.chinagas.modules.system.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chinagas.api.system.domain.DepInfo;
 import com.chinagas.api.system.domain.SysDept;
 import com.chinagas.common.core.constants.UserConstants;
 import com.chinagas.common.core.utils.StringUtils;
-import com.chinagas.common.log.enums.BusinessType;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chinagas.modules.system.mapper.DepInfoMapper;
-import com.chinagas.modules.system.service.ISysDeptService;
 import com.chinagas.modules.system.service.IDepInfoService;
+import com.chinagas.modules.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 /**
@@ -53,7 +49,7 @@ public class DepInfoServiceImpl extends ServiceImpl&lt;DepInfoMapper, DepInfo&gt; impl
 //    }
     @Override
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     public int insertDepInfoBach(List<DepInfo> depList){
         int rows = 0;
         SysDept sysDept = null;
@@ -66,7 +62,9 @@ public class DepInfoServiceImpl extends ServiceImpl&lt;DepInfoMapper, DepInfo&gt; impl
             }else {
                 sysDept.setDeptName("");
             }
-            sysDept.setParentId(Long.parseLong(depInfo.getCgDeptParent()));
+            if(StringUtils.isNotEmpty(depInfo.getCgDeptParent())){
+                sysDept.setParentId(Long.parseLong(depInfo.getCgDeptParent()));
+            }
             sysDept.setAncestors(getAncestors(depInfo.getDeptId(), depList));
             sysDept.setDeptPath(depInfo.getCgDeptPath());