Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
@@ -18,104 +18,110 @@ /** * 系统接口oid */ private String classifyoid; private String classifyOid; /** * 系统id */ private String btmoid; private String btmOid; /** * 系统id */ private String btmid; private String btmId; /** * 系统id */ private String sendtype; private String sendType; /*** * 分类名称 */ private String classifyName; /** * 是否分解任务 */ private String sendflag; private String sendFlag; /** * 系统id */ private String classifyid; private String classifyId; /** * 系统id */ private String classifyname; public String getClassifyOid() { return classifyOid; } public String getClassifyoid() { return classifyoid; } public void setClassifyOid(String classifyOid) { this.classifyOid = classifyOid; } public void setClassifyoid(String classifyoid) { this.classifyoid = classifyoid; } public String getBtmOid() { return btmOid; } public String getBtmoid() { return btmoid; } public void setBtmOid(String btmOid) { this.btmOid = btmOid; } public void setBtmoid(String btmoid) { this.btmoid = btmoid; } public String getBtmId() { return btmId; } public String getBtmid() { return btmid; } public void setBtmId(String btmId) { this.btmId = btmId; } public void setBtmid(String btmid) { this.btmid = btmid; } public String getSendType() { return sendType; } public String getSendtype() { return sendtype; } public void setSendType(String sendType) { this.sendType = sendType; } public void setSendtype(String sendtype) { this.sendtype = sendtype; } public String getSendFlag() { return sendFlag; } public String getSendflag() { return sendflag; } public void setSendFlag(String sendFlag) { this.sendFlag = sendFlag; } public void setSendflag(String sendflag) { this.sendflag = sendflag; } public String getClassifyId() { return classifyId; } public String getClassifyid() { return classifyid; } public void setClassifyId(String classifyId) { this.classifyId = classifyId; } public void setClassifyid(String classifyid) { this.classifyid = classifyid; } public String getClassifyName() { return classifyName; } public String getClassifyname() { return classifyname; } public void setClassifyName(String classifyName) { this.classifyName = classifyName; } public void setClassifyname(String classifyname) { this.classifyname = classifyname; } @Override public String toString() { return "DockingDataDO{" + "classifyoid='" + classifyoid + '\'' + ", btmoid='" + btmoid + '\'' + ", btmid='" + btmid + '\'' + ", sendtype='" + sendtype + '\'' + ", sendflag='" + sendflag + '\'' + ", classifyid='" + classifyid + '\'' + ", classifyname='" + classifyname + '\'' + '}'; } /** * 系统id */ @Override public String toString() { return "DockingDataVO{" + "classifyOid='" + classifyOid + '\'' + ", btmOid='" + btmOid + '\'' + ", btmId='" + btmId + '\'' + ", sendType='" + sendType + '\'' + ", classifyName='" + classifyName + '\'' + ", sendFlag='" + sendFlag + '\'' + ", classifyId='" + classifyId + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
@@ -1,6 +1,7 @@ package com.vci.ubcs.code.vo.pagemodel; import com.vci.ubcs.starter.revision.model.BaseModel; import io.swagger.annotations.ApiModelProperty; /** * 资源对接通知、查询接口日志显示对象 @@ -15,46 +16,63 @@ */ private static final long serialVersionUID = 4615707121064918548L; private String uniqueCode; /** * 分类oid */ private String classifyOid; /** * 分类id */ private String classifyId; /** * 分类name */ private String classifyName; /** * 接口状态 */ private String interfacestatus; private String interfaceStatus; /** * 参数 */ private String paramstring; private String paramString; /** * 返回 */ private String returnstring; private String returnString; /** * 系统编号 */ private String systemcode; private String systemCode; /** * 系统名称 */ private String systemname; private String systemName; /** * 系统id */ private String systemoid; private String systemOid; /** * 接口类型 */ private String type; /** * 传递xml */ private String sendXml; /** * 返还提示 @@ -69,84 +87,54 @@ this.msg = msg; } /** * 获取 接口状态 */ public String getInterfacestatus (){ return interfacestatus; public String getInterfaceStatus() { return interfaceStatus; } /** * 设置 接口状态 */ public void setInterfacestatus (String interfacestatus){ this.interfacestatus = interfacestatus; } /** * 获取 参数 */ public String getParamstring (){ return paramstring; public void setInterfaceStatus(String interfaceStatus) { this.interfaceStatus = interfaceStatus; } /** * 设置 参数 */ public void setParamstring (String paramstring){ this.paramstring = paramstring; } /** * 获取 返回 */ public String getReturnstring (){ return returnstring; public String getParamString() { return paramString; } /** * 设置 返回 */ public void setReturnstring (String returnstring){ this.returnstring = returnstring; } /** * 获取 系统编号 */ public String getSystemcode (){ return systemcode; public void setParamString(String paramString) { this.paramString = paramString; } /** * 设置 系统编号 */ public void setSystemcode (String systemcode){ this.systemcode = systemcode; } /** * 获取 系统名称 */ public String getSystemname (){ return systemname; public String getReturnString() { return returnString; } /** * 设置 系统名称 */ public void setSystemname (String systemname){ this.systemname = systemname; } /** * 获取 系统id */ public String getSystemoid (){ return systemoid; public void setReturnString(String returnString) { this.returnString = returnString; } /** * 设置 系统id */ public void setSystemoid (String systemoid){ this.systemoid = systemoid; public String getSystemCode() { return systemCode; } public void setSystemCode(String systemCode) { this.systemCode = systemCode; } public String getSystemName() { return systemName; } public void setSystemName(String systemName) { this.systemName = systemName; } public String getSystemOid() { return systemOid; } public void setSystemOid(String systemOid) { this.systemOid = systemOid; } /** * 获取 接口类型 */ @@ -161,17 +149,62 @@ this.type = type; } public String getUniqueCode() { return uniqueCode; } public void setUniqueCode(String uniqueCode) { this.uniqueCode = uniqueCode; } public String getClassifyOid() { return classifyOid; } public void setClassifyOid(String classifyOid) { this.classifyOid = classifyOid; } public String getClassifyId() { return classifyId; } public void setClassifyId(String classifyId) { this.classifyId = classifyId; } public String getClassifyName() { return classifyName; } public void setClassifyName(String classifyName) { this.classifyName = classifyName; } public String getSendXml() { return sendXml; } public void setSendXml(String sendXml) { this.sendXml = sendXml; } @Override public String toString() { return "DockingLogeVO{" + "interfacestatus='" + interfacestatus + '\'' + ", paramstring='" + paramstring + '\'' + ", returnstring='" + returnstring + '\'' + ", systemcode='" + systemcode + '\'' + ", systemname='" + systemname + '\'' + ", systemoid='" + systemoid + '\'' + ", type='" + type + '\'' + ", msg='" + msg + '\'' + '}'; "uniqueCode='" + uniqueCode + '\'' + ", classifyOid='" + classifyOid + '\'' + ", classifyId='" + classifyId + '\'' + ", classifyName='" + classifyName + '\'' + ", interfaceStatus='" + interfaceStatus + '\'' + ", paramString='" + paramString + '\'' + ", returnString='" + returnString + '\'' + ", systemCode='" + systemCode + '\'' + ", systemName='" + systemName + '\'' + ", systemOid='" + systemOid + '\'' + ", type='" + type + '\'' + ", sendXml='" + sendXml + '\'' + ", msg='" + msg + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
@@ -93,6 +93,126 @@ */ private String dataOid; public String getSysInfoOid() { return sysInfoOid; } public void setSysInfoOid(String sysInfoOid) { this.sysInfoOid = sysInfoOid; } public String getSystemOid() { return systemOid; } public void setSystemOid(String systemOid) { this.systemOid = systemOid; } public String getSystemCode() { return systemCode; } public void setSystemCode(String systemCode) { this.systemCode = systemCode; } public String getSystemName() { return systemName; } public void setSystemName(String systemName) { this.systemName = systemName; } public String getClassifyOid() { return classifyOid; } public void setClassifyOid(String classifyOid) { this.classifyOid = classifyOid; } public String getClassifyId() { return classifyId; } public void setClassifyId(String classifyId) { this.classifyId = classifyId; } public String getClassifyName() { return classifyName; } public void setClassifyName(String classifyName) { this.classifyName = classifyName; } public String getBtmOid() { return btmOid; } public void setBtmOid(String btmOid) { this.btmOid = btmOid; } public String getBtmId() { return btmId; } public void setBtmId(String btmId) { this.btmId = btmId; } public String getUniqueCode() { return uniqueCode; } public void setUniqueCode(String uniqueCode) { this.uniqueCode = uniqueCode; } public String getSendType() { return sendType; } public void setSendType(String sendType) { this.sendType = sendType; } public String getSendTypeText() { return sendTypeText; } public void setSendTypeText(String sendTypeText) { this.sendTypeText = sendTypeText; } public String getSendFlag() { return sendFlag; } public void setSendFlag(String sendFlag) { this.sendFlag = sendFlag; } public String getSendFlagText() { return sendFlagText; } public void setSendFlagText(String sendFlagText) { this.sendFlagText = sendFlagText; } public String getDataOid() { return dataOid; } public void setDataOid(String dataOid) { this.dataOid = dataOid; } @Override public String toString() { return "DockingTaskVO{" + Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -244,7 +244,7 @@ } if(dockingTask_insert.size()!=0) { // dockingTaskService.saveBatch(dockingTask_insert); dockingTaskService.saveBatch(dockingTask_insert); } //dockingTaskDaoI.updateByPrimaryKey方法报错了,所以手写了这个 boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -32,6 +32,12 @@ private IDockingLogeService dockingLogeService; /*** * 集成任务服务 */ @Autowired( required = false) private IDockingTaskService dockingTaskService; /*** * 集成接口头协议服务 */ @Autowired( required = false) @@ -54,8 +60,7 @@ */ @Override public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) { IPage<DockingTask> pages=null; // IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask)); IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask)); return DockingTaskWrapper.build().pageVO(pages); }