人物审核完成直接同步给采集

src/main/java/com/zzsn/leaderbase/controller/CharacterBasicInfoController.java

@@ -88,7 +88,7 @@ public class CharacterBasicInfoController {
     public Result<?> add(@RequestBody CharacterBasicInfo characterBasicInfo) {
         log.info("新增人物:{}", characterBasicInfo);
         Result<?> add = characterBasicInfoService.add(characterBasicInfo);
-        syncToCaoji(characterBasicInfo);
+        characterBasicInfoService.syncToCaoji(characterBasicInfo);
         return add;
     }
 
@@ -103,7 +103,7 @@ public class CharacterBasicInfoController {
             return Result.error("人物id不能为空");
         }
         Result<?> edit = characterBasicInfoService.edit(characterBasicInfo);
-        syncToCaoji(characterBasicInfo);
+        characterBasicInfoService.syncToCaoji(characterBasicInfo);
         return edit;
     }
 
@@ -120,37 +120,11 @@ public class CharacterBasicInfoController {
         if(byId!=null){
             byId.setTakeOfficeStatus("历任");
             Boolean res = characterBasicInfoService.del(id);
-            syncToCaoji(byId);
+            characterBasicInfoService.syncToCaoji(byId);
             return Result.OK(res);
         }
         return Result.error("人物不存在");
     }
-    /**
-     * 同步高管信息到采集中心
-     * @param basicInfo
-     */
-    private void syncToCaoji(CharacterBasicInfo basicInfo) {
-        try{
-            if(basicInfo==null || !"3".equals(basicInfo.getCategory()) || StringUtils.isEmpty(basicInfo.getSocialCreditCode())){
-                return;
-            }
-            //查询人物对应企业中的所有职位
-            List<CharacterBasicInfo> dutyList = characterBasicInfoService.getDutyList(basicInfo.getUid(),basicInfo.getSocialCreditCode(),basicInfo.getName());
-            if(dutyList.isEmpty()){
-                basicInfo.setTakeOfficeStatus("历任");
-            }else{
-                basicInfo = dutyList.get(0);
-                List<String> collect = dutyList.stream().map(CharacterBasicInfo::getDuty).distinct().collect(Collectors.toList());
-                basicInfo.setDuty(StringUtils.join(collect,","));
-            }
-            ExecutiveNew executive = SyncUtil.convertToCaiji(basicInfo);
-            log.info("同步高管信息到采集中心：{}", JSON.toJSONString(executive));
-            String post = HttpUtil.post("http://1.95.79.85:8824/subjectProject/enterprise/api/personnelUpdate", JSON.toJSONString(executive));
-            log.info("同步高管信息到采集中心结果：{}", post);
-        }catch (Exception e){
-            log.error("同步高管信息到采集中心异常：{}", e.getMessage());
-        }
-    }
 
     /**
      * 根据uid查询人物的历任职务
@@ -188,7 +162,7 @@ public class CharacterBasicInfoController {
     public Result<?> correlationEdit(@RequestBody CharacterBasicInfo characterBasicInfo) {
         log.info("修改关联人物:{}", characterBasicInfo.getId());
         Result<?> edit = characterBasicInfoService.correlationEdit(characterBasicInfo);
-        syncToCaoji(characterBasicInfo);
+        characterBasicInfoService.syncToCaoji(characterBasicInfo);
         return edit;
     }
 

src/main/java/com/zzsn/leaderbase/controller/CharacterExtractInfoController.java

 package com.zzsn.leaderbase.controller;
 
+import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.entity.CharacterExtractInfo;
+import com.zzsn.leaderbase.service.CharacterBasicInfoService;
 import com.zzsn.leaderbase.service.CharacterExtractInfoService;
 import com.zzsn.leaderbase.util.SortUtil;
 import com.zzsn.leaderbase.vo.CheckVo;
@@ -21,6 +23,8 @@ public class CharacterExtractInfoController {
 
     @Autowired
     CharacterExtractInfoService characterExtractInfoService;
+    @Autowired
+    CharacterBasicInfoService characterBasicInfoService;;
 
 
     /**
@@ -75,6 +79,9 @@ public class CharacterExtractInfoController {
             return Result.error("extractId 不能为空！");
         }
         Result<?> result = characterExtractInfoService.checkNewlyAdded(checkVo);
+        if(result.isSuccess()){
+            characterBasicInfoService.syncToCaoji((CharacterBasicInfo) result.getResult());
+        }
         return result;
     }
 
@@ -94,6 +101,9 @@ public class CharacterExtractInfoController {
             return Result.error("suspectedId 不能为空！");
         }
         Result<?> result = characterExtractInfoService.checkMerge(checkVo);
+        if(result.isSuccess()){
+            characterBasicInfoService.syncToCaoji((CharacterBasicInfo) result.getResult());
+        }
         return result;
     }
 

src/main/java/com/zzsn/leaderbase/service/CharacterBasicInfoService.java

@@ -74,4 +74,6 @@ public interface CharacterBasicInfoService extends IService<CharacterBasicInfo>
     ResponseEntity<byte[]> exportTemplate(Map<String, String> importFieldMap) throws IOException;
 
     List<CharacterBasicInfo> getDutyList(String uid, String socialCreditCode, String name);
+
+    void syncToCaoji(CharacterBasicInfo basicInfo);
 }

src/main/java/com/zzsn/leaderbase/service/impl/CharacterBasicInfoServiceImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -17,11 +18,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zzsn.leaderbase.entity.CharacterBasicInfo;
 import com.zzsn.leaderbase.entity.CharacterCategoryStructure;
 import com.zzsn.leaderbase.entity.CharacterTagMap;
+import com.zzsn.leaderbase.entity.ExecutiveNew;
 import com.zzsn.leaderbase.feign.api.RemoteSystemService;
 import com.zzsn.leaderbase.feign.entity.SysDictItem;
 import com.zzsn.leaderbase.mapper.CharacterBasicInfoMapper;
 import com.zzsn.leaderbase.service.*;
 import com.zzsn.leaderbase.util.ExcelUtil;
+import com.zzsn.leaderbase.util.SyncUtil;
 import com.zzsn.leaderbase.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -84,6 +87,33 @@ public class CharacterBasicInfoServiceImpl extends ServiceImpl<CharacterBasicInf
         return basicInfo;
     }
 
+    /**
+     * 同步高管信息到采集中心
+     * @param basicInfo
+     */
+    public void syncToCaoji(CharacterBasicInfo basicInfo) {
+        try{
+            if(basicInfo==null || !"3".equals(basicInfo.getCategory()) || StringUtils.isEmpty(basicInfo.getSocialCreditCode())){
+                return;
+            }
+            //查询人物对应企业中的所有职位
+            List<CharacterBasicInfo> dutyList = this.getDutyList(basicInfo.getUid(),basicInfo.getSocialCreditCode(),basicInfo.getName());
+            if(dutyList.isEmpty()){
+                basicInfo.setTakeOfficeStatus("历任");
+            }else{
+                basicInfo = dutyList.get(0);
+                List<String> collect = dutyList.stream().map(CharacterBasicInfo::getDuty).distinct().collect(Collectors.toList());
+                basicInfo.setDuty(StringUtils.join(collect,","));
+            }
+            ExecutiveNew executive = SyncUtil.convertToCaiji(basicInfo);
+            log.info("同步高管信息到采集中心：{}", com.alibaba.fastjson2.JSON.toJSONString(executive));
+            String post = HttpUtil.post("http://1.95.79.85:8824/subjectProject/enterprise/api/personnelUpdate", com.alibaba.fastjson2.JSON.toJSONString(executive));
+            log.info("同步高管信息到采集中心结果：{}", post);
+        }catch (Exception e){
+            log.error("同步高管信息到采集中心异常：{}", e.getMessage());
+        }
+    }
+
     @Override
     public IPage<CharacterBasicInfo> getList(BasicInfoListVo basicInfoListVo) {
         //多级数据字典标签，获取当前选择标签层级之后的相差3级以内的标签

src/main/java/com/zzsn/leaderbase/service/impl/CharacterExtractInfoServiceImpl.java

@@ -90,7 +90,7 @@ public class CharacterExtractInfoServiceImpl extends ServiceImpl<CharacterExtrac
         if(!updateCheck)
             return Result.error("审核状态更改失败！");
 
-        return Result.OK();
+        return Result.OK(character);
     }
 
 
@@ -132,7 +132,7 @@ public class CharacterExtractInfoServiceImpl extends ServiceImpl<CharacterExtrac
         if(!updateCheck)
             return Result.error("审核状态更改失败！");
 
-        return Result.OK();
+        return Result.OK(character);
     }