Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
@@ -67,12 +67,10 @@ */ private String description; /** * 接口类型 */ private String interfaceType; /** * 接口类型显示文本 @@ -83,7 +81,6 @@ */ private String paramType; /** * 参数类型显示文本 */ @@ -92,7 +89,6 @@ * 请求方式 */ private String requestMethod; /** * 请求方式显示文本 @@ -128,12 +124,15 @@ */ private String requestUrl; /** * 返回值类型 */ private String returnType; /** * 内容类型 */ private String contentType; /** * 返回值类型显示文本 @@ -308,4 +307,5 @@ ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -181,7 +181,6 @@ @ApiModelProperty(value = "内容类型") private String contentType; /** * 返回值类型显示文本 */ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,12 +1,9 @@ package com.vci.ubcs.code.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.vci.ubcs.code.dto.DockingSystemConfigDTO; import com.vci.ubcs.code.dto.DockingSystemDTO; import com.vci.ubcs.code.dto.DockingTaskDTO; import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.service.*; @@ -17,13 +14,10 @@ import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import javafx.scene.control.TableRow; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*;
@@ -45,8 +45,7 @@ * @param sysInfoStatusDTO * @return */ public R updateStatus(UpdateSysInfoStatusDTO sysInfoStatusDTO); R updateStatus(UpdateSysInfoStatusDTO sysInfoStatusDTO); /*** * 手动同步接口，只有推送的才会 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -535,7 +535,7 @@ dockingLoge.setInterfaceStatus("false");//接口集成状态 } dockingLogeService.save(dockingLoge); log.info("集成推送数据成功,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData); log.info("集成推送数据,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData); } /*** Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -462,7 +462,7 @@ if(isUsedFlag){ AtomicBoolean success= new AtomicBoolean(true); List<PersonMasterData> masterDataList=new ArrayList<>(); List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields()); List<String> fields = Func.toStrList(personAndDeptConfig.getPersonFields()); try { if(personData==null){ throw new Throwable("传入参数为null"); @@ -695,7 +695,8 @@ } }catch (Throwable e){ success.set(false); message="人员数据接收失败:"+e.getMessage(); message = "人员数据接收失败:"+e.getMessage(); msg = "人员数据接收失败:"+e.getMessage(); //组织返回结果 boolean finalSuccess = success.get(); String finalMessage = message; @@ -744,7 +745,7 @@ String systemCode=""; if(isUsedFlag){ List<OrgMasterData> orgMasterDataList=new ArrayList<>(); List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getDeptFields()); List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields()); try { if(orgData==null){ throw new Throwable("传入参数为null"); @@ -973,7 +974,8 @@ } }catch (Throwable e){ success.set(false); message="部门数据接受失败:"+e.getMessage(); message = "部门数据接收失败:"+e.getMessage(); msg = "部门数据接收失败:"+e.getMessage(); //组织返回结果 boolean finalSuccess = success.get(); String finalMessage = message; @@ -2724,7 +2726,7 @@ dockingLoge.setInterfaceStatus("false");//接口集成状态 } dockingLogeService.save(dockingLoge); log.info("集成推送数据成功,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData); log.info("集成推送数据,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData); } /***
