diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java
deleted file mode 100644
index 565022fc3..000000000
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/GridPlatformHandleLogDTO.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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;
-
-}
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java
deleted file mode 100644
index 633b85f65..000000000
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/InterfaceLogDTO.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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;
-
-}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java
deleted file mode 100644
index 2dc8d8c03..000000000
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/ItemGridPlatformDTO.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-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;
-
-}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java
index 570ed7339..ef48ce055 100644
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java
@@ -174,7 +174,6 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface
itemHandleProcessDTO.setState(ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue());
itemHandleProcessDTO.setHandleAdvice(formDto.getSolvingNote());
itemHandleProcessDTO.setOutHandleAdvice(formDto.getSolvingNote());
- itemHandleProcessDTO.setHandlerDeptId(Long.valueOf(formDto.getDeptCode()));// 存储平台部门id有必要吗?????
itemHandleProcessDTO.setHandlerDept(formDto.getDeptName());
itemHandleProcessDTO.setCreatedTime(nowDate);//测试事务回滚可以注释掉此行代码
itemHandleProcessDTO.setUpdatedTime(nowDate);
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java
deleted file mode 100644
index d50132d66..000000000
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/XstreamUtil.java
+++ /dev/null
@@ -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 泛型
- * @param xml 要转换为bean的xml
- * @param cls bean对应的Class
- * @return xml转换为bean
- */
- public static T xmlToObject(String xml, Class 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);
- }
-
-}