elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

webservice接口bug修改

dev
尹作梅 6 years ago
parent
0421ddf2c6
commit
e5e721ba01
5 changed files with 0 additions and 416 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 176
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java
  2. 101
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java
  3. 91
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java
  4. 1
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java
  5. 47
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java

176
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java
View File

@ -1,176 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 网格化平台处理日志表 网格化平台处理日志表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-31
*/
@Data
public class GridPlatformHandleLogDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 网格化平台项目关系表ID
*/
private String itemGridPlatformId;
/**
* 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，55-网格化平台-结案
*/
private Integer status;
/**
* 项目处理表ID
*/
private String itemHandleProcessId;
/**
* 处理人
*/
private String handler;
/**
* 处理意见
*/
private String handlingOpinions;
/**
* 处理部门
*/
private String handlingDept;
/**
* 处理时间
*/
private Date handlingTime;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 删除标记
*/
private String delFlag;
/**
* 派遣时间（格式：yyyy-MM-dd HH24:mm:ss）
*/
private String dispatchTime;
/**
* 派遣部门编号
*/
private String deptCode;
/**
* 派遣部门名称
*/
private String deptName;
/**
* 主责部门编号
*/
private String execDeptCode;
/**
* 主责部门名称
*/
private String execDeptName;
/**
* 到场时间要求（分钟数）
*/
private Integer carriveTime;
/**
* 处置时间要求（分钟数）
*/
private Integer csolvingTime;
/**
* 到场截止时间（格式：yyyy-MM-dd HH24:mm:ss）
*/
private String arriveTime;
/**
* 处置截止时间（格式：yyyy-MM-dd HH24:mm:ss）
*/
private String solvingTime;
/**
* 派遣意见、最终主责单位处理完成意见
*/
private String solvingNote;
/**
* 结案时间（格式：yyyy-MM-dd HH24:mm:ss）
*/
private String endTime;
/**
* 最终处理时间（格式：yyyy-MM-dd HH24:mm:ss）
*/
private String lastSolvingTime;
/**
* 结案意见
*/
private String endNote;
/**
* 结案评判（实际解决、解释说明等）
*/
private String banliResult;
}

101
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java
View File

@ -1,101 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 接口日志表 接口日志表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-31
*/
@Data
public class InterfaceLogDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 引用ID
*/
private String referenceId;
/**
* 业务类型(1:项目上报网格化平台)
*/
private String businessType;
/**
* 调用接口名称
*/
private String interfaceName;
/**
* 调用是否成功 0-调用失败，1-调用成功
*/
private String successFlag;
/**
* 调用消息体
*/
private String callMsgBody;
/**
* 调用返回消息体
*/
private String returnMsgBody;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 删除标记
*/
private String delFlag;
}

91
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java
View File

@ -1,91 +0,0 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 网格化平台项目关系表 网格化平台项目关系表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-31
*/
@Data
public class ItemGridPlatformDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 关联表ID
*/
private String referenceId;
/**
* 网格平台任务ID
*/
private String taskid;
/**
* 上报人部门ID
*/
private Long reportPersonDeptId;
/**
* 状态 15-网格化平台-上报，20-网格化平台-受理，25-网格化平台-立案，30-网格化平台-派遣，35-网格化平台-中间再派，40-网格化平台-接单，45-网格化平台-处理，50-网格化平台-中间督办，55-网格化平台-催办，60-网格化平台-结案
*/
private Integer status;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 删除标记
*/
private String delFlag;
}

1
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java
View File

@ -174,7 +174,6 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface
itemHandleProcessDTO.setState(ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue()); itemHandleProcessDTO.setState(ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue());
itemHandleProcessDTO.setHandleAdvice(formDto.getSolvingNote()); itemHandleProcessDTO.setHandleAdvice(formDto.getSolvingNote());
itemHandleProcessDTO.setOutHandleAdvice(formDto.getSolvingNote()); itemHandleProcessDTO.setOutHandleAdvice(formDto.getSolvingNote());
itemHandleProcessDTO.setHandlerDeptId(Long.valueOf(formDto.getDeptCode()));// 存储平台部门id有必要吗？？？？？
itemHandleProcessDTO.setHandlerDept(formDto.getDeptName()); itemHandleProcessDTO.setHandlerDept(formDto.getDeptName());
itemHandleProcessDTO.setCreatedTime(nowDate);//测试事务回滚可以注释掉此行代码 itemHandleProcessDTO.setCreatedTime(nowDate);//测试事务回滚可以注释掉此行代码
itemHandleProcessDTO.setUpdatedTime(nowDate); itemHandleProcessDTO.setUpdatedTime(nowDate);

47
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java
View File

@ -1,47 +0,0 @@
package com.elink.esua.epdc.utils;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
import com.thoughtworks.xstream.io.xml.XppDriver;
/**
* @author rongchao
* @Date 18-12-4
*/
public class XstreamUtil {
/**
* 将xml转换为bean
*
* @param <T> 泛型
* @param xml 要转换为bean的xml
* @param cls bean对应的Class
* @return xml转换为bean
*/
public static <T> T xmlToObject(String xml, Class<T> cls) {
XStream xStream = new XStream(new DomDriver());
XStream.setupDefaultSecurity(xStream);
xStream.allowTypes(new Class[]{cls});
//xstream使用注解转换
xStream.processAnnotations(cls);
return (T) xStream.fromXML(xStream.fromXML(xml).toString());
}
/**
* 将bean转换为xml
*
* @param obj
* @return
*/
public static String objectToXml(Object obj) {
//解决下划线问题
XStream xStream = new XStream(new XppDriver(new XmlFriendlyNameCoder("_-", "_")));
XStream.setupDefaultSecurity(xStream);
xStream.allowTypes(new Class[]{obj.getClass()});
//xstream使用注解转换
xStream.processAnnotations(obj.getClass());
return xStream.toXML(obj);
}
}
Write Preview
Loading…
Cancel
Save