diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPlatformItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPlatformItemController.java index 1b041765e..99a085acc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPlatformItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPlatformItemController.java @@ -43,29 +43,4 @@ public class ApiPlatformItemController { return itemService.reportCallback(formDto); } - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei @RequestParam("requestXML") - * @Description 1.1.派遣信息 - * @Date 2019/12/27 17:34 - **/ - @PostMapping(value = "report/SyncTaskDispatch") - public Result syncTaskDispatch(@RequestBody String requestXML){ - logger.info("requestXML="+requestXML); - return itemService.syncTaskDispatch(requestXML); - } - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 1.2.结案信息 - * @Date 2019/12/27 17:35 - **/ - @PostMapping("report/SyncTaskEnd") - public Result syncTaskEnd(@RequestBody String requestXML){ - return itemService.syncTaskEnd(requestXML); - } - } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 4d62247d2..0b6927b7b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -13,7 +13,6 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -103,23 +102,4 @@ public interface ItemFeignClient { @PostMapping(value = "events/epdc-app/item/report/callback", consumes = MediaType.APPLICATION_JSON_VALUE) Result reportCallback(ItemPlatformProcessFormDTO formDto); - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 派遣信息 - * @Date 2019/12/29 12:59 - **/ - @PostMapping(value = "events/epdc-app/item/report/syncTaskDispatch") - Result syncTaskDispatch(@RequestParam("requestXML") String requestXML); - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 结案信息 - * @Date 2019/12/29 12:59 - **/ - @PostMapping(value = "events/epdc-app/item/report/syncTaskEnd") - Result syncTaskEnd(@RequestParam("requestXML") String requestXML); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java index 30b272734..103e10773 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -60,14 +60,4 @@ public class ItemFeignClientFallback implements ItemFeignClient { public Result reportCallback(ItemPlatformProcessFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "reportCallback", formDto); } - - @Override - public Result syncTaskDispatch(String requestXML) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "syncTaskDispatch", requestXML); - } - - @Override - public Result syncTaskEnd(String requestXML) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "syncTaskEnd", requestXML); - } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index 90a5b147c..5afda54ab 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -90,21 +90,4 @@ public interface ItemService { */ Result reportCallback(ItemPlatformProcessFormDTO formDto); - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 派遣信息 - * @Date 2019/12/27 17:36 - **/ - Result syncTaskDispatch(String requestXML); - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 结案信息 - * @Date 2019/12/27 17:36 - **/ - Result syncTaskEnd(String requestXML); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 9087ea425..94eb09699 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -9,7 +9,6 @@ import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; import com.elink.esua.epdc.service.ItemService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -91,28 +90,4 @@ public class ItemServiceImpl implements ItemService { public Result reportCallback(ItemPlatformProcessFormDTO formDto) { return itemFeignClient.reportCallback(formDto); } - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 派遣信息 - * @Date 2019/12/27 17:36 - **/ - @Override - public Result syncTaskDispatch(String requestXML) { - return itemFeignClient.syncTaskDispatch(requestXML); - } - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 结案信息 - * @Date 2019/12/27 17:36 - **/ - @Override - public Result syncTaskEnd(String requestXML) { - return itemFeignClient.syncTaskEnd(requestXML); - } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemPlatFormConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemPlatFormConstant.java deleted file mode 100644 index 9d4f82542..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemPlatFormConstant.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * @Description 网格化平台常量 - * @Author yinzuomei - * @Date 2019/12/29 14:29 - */ -public class ItemPlatFormConstant { - /** - * 派遣信息 - */ - public static final String SyncTaskDispatch = "api/paltform/item/report/SyncTaskDispatch"; - - /** - * 结案信息 - */ - public static final String SyncTaskEnd = "api/paltform/item/report/syncTaskEnd"; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemPlatformSyncTaskDispatchFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemPlatformSyncTaskDispatchFormDTO.java deleted file mode 100644 index c08c64aeb..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemPlatformSyncTaskDispatchFormDTO.java +++ /dev/null @@ -1,195 +0,0 @@ -package com.elink.esua.epdc.dto.item.form; - - -import java.io.Serializable; -import com.thoughtworks.xstream.annotations.XStreamAlias; -/** - * @Description 1.1.派遣信息入参DTO - * @Author yinzuomei - * @Date 2019/12/29 13:10 - */ -@XStreamAlias("Request") -public class ItemPlatformSyncTaskDispatchFormDTO implements Serializable { - private static final long serialVersionUID = 429105992159345505L; - /** - * 必填 - * 任务号 - */ - @XStreamAlias("TaskNum") - private String taskNum; - - /** - * 必填 - * 派遣时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - @XStreamAlias("DispatchTime") - private String dispatchTime; - - /** - * 必填 - * 派遣部门编号 - */ - @XStreamAlias("DeptCode") - private String deptCode; - - /** - * 必填 - * 派遣部门名称 - */ - @XStreamAlias("DeptName") - private String deptName; - - /** - * 必填 - * 主责部门编号 - */ - @XStreamAlias("ExecDeptCode") - private String execDeptCode; - - /** - * 必填 - * 主责部门名称 - */ - @XStreamAlias("ExecDeptName") - private String execDeptName; - - /** - * 必填 - * 到场时间要求（分钟数） - */ - @XStreamAlias("CArriveTime") - private int carriveTime; - - /** - * 必填 - * 处置时间要求（分钟数） - */ - @XStreamAlias("CSolvingTime") - private int csolvingTime; - - /** - * 必填 - * 到场截止时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - @XStreamAlias("ArriveTime") - private String arriveTime; - - /** - * 必填 - * 处置截止时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - @XStreamAlias("SolvingTime") - private String solvingTime; - - /** - * 必填 - * 派遣意见 - */ - @XStreamAlias("SolvingNote") - private String solvingNote; - - - public String getTaskNum() { - return taskNum; - } - - public void setTaskNum(String taskNum) { - this.taskNum = taskNum; - } - - public String getDispatchTime() { - return dispatchTime; - } - - public void setDispatchTime(String dispatchTime) { - this.dispatchTime = dispatchTime; - } - - public String getDeptCode() { - return deptCode; - } - - public void setDeptCode(String deptCode) { - this.deptCode = deptCode; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getExecDeptCode() { - return execDeptCode; - } - - public void setExecDeptCode(String execDeptCode) { - this.execDeptCode = execDeptCode; - } - - public String getExecDeptName() { - return execDeptName; - } - - public void setExecDeptName(String execDeptName) { - this.execDeptName = execDeptName; - } - - public int getCarriveTime() { - return carriveTime; - } - - public void setCarriveTime(int carriveTime) { - this.carriveTime = carriveTime; - } - - public int getCsolvingTime() { - return csolvingTime; - } - - public void setCsolvingTime(int csolvingTime) { - this.csolvingTime = csolvingTime; - } - - public String getArriveTime() { - return arriveTime; - } - - public void setArriveTime(String arriveTime) { - this.arriveTime = arriveTime; - } - - public String getSolvingTime() { - return solvingTime; - } - - public void setSolvingTime(String solvingTime) { - this.solvingTime = solvingTime; - } - - public String getSolvingNote() { - return solvingNote; - } - - public void setSolvingNote(String solvingNote) { - this.solvingNote = solvingNote; - } - - public ItemPlatformSyncTaskDispatchFormDTO(String flag){ - if("test".equals(flag)){ - this.taskNum="1912H7813430"; - this.dispatchTime="2019-12-29 15:50:02"; - this.deptCode="123"; - this.deptName="测试"; - this.execDeptCode="123"; - this.execDeptName="测试1"; - this.carriveTime=10; - this.setCsolvingTime(20); - this.setArriveTime("2019-12-29 15:51:02"); - this.setSolvingTime("2019-12-29 15:52:02"); - this.setSolvingNote("派遣意见"); - } - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemPlatformSyncTaskEndFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemPlatformSyncTaskEndFormDTO.java deleted file mode 100644 index 09a39d42d..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemPlatformSyncTaskEndFormDTO.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.elink.esua.epdc.dto.item.form; - -import com.thoughtworks.xstream.annotations.XStreamAlias; - -import java.io.Serializable; - -/** - * @Description 结案信息入参DTO - * @Author yinzuomei - * @Date 2019/12/29 13:32 - */ -@XStreamAlias("Request") -public class ItemPlatformSyncTaskEndFormDTO implements Serializable { - private static final long serialVersionUID = -2939238662446032894L; - - /** - * 必填 - * 任务号 - */ - @XStreamAlias("TaskNum") - private String taskNum; - - /** - * 必填 - * 结案时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - @XStreamAlias("EndTime") - private String endTime; - - /** - * 必填 - * 最终处理时间（格式：yyyy-MM-dd HH24:mm:ss） - */ - @XStreamAlias("LastSolvingTime") - private String lastSolvingTime; - - /** - * 必填 - * 最终主责单位处理完成意见 - */ - @XStreamAlias("SolvingNote") - private String solvingNote; - - /** - * 必填 - * 结案意见 - */ - @XStreamAlias("EndNote") - private String endNote; - - /** - * 必填 - * 结案评判（实际解决、解释说明等） - */ - @XStreamAlias("BanliResult") - private String banliResult; - - /** - * 必填 - * 结案部门名称 - */ - @XStreamAlias("DeptName") - private String deptName; - - - public String getTaskNum() { - return taskNum; - } - - public void setTaskNum(String taskNum) { - this.taskNum = taskNum; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - - public String getLastSolvingTime() { - return lastSolvingTime; - } - - public void setLastSolvingTime(String lastSolvingTime) { - this.lastSolvingTime = lastSolvingTime; - } - - public String getSolvingNote() { - return solvingNote; - } - - public void setSolvingNote(String solvingNote) { - this.solvingNote = solvingNote; - } - - public String getEndNote() { - return endNote; - } - - public void setEndNote(String endNote) { - this.endNote = endNote; - } - - public String getBanliResult() { - return banliResult; - } - - public void setBanliResult(String banliResult) { - this.banliResult = banliResult; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java index 17975b418..5e26db1f4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcAppItemController.java @@ -111,28 +111,4 @@ public class EpdcAppItemController { return itemService.reportCallback(formDto); } - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 派遣信息:网格化系统将立案部门的主责派遣信息同步给外系统系统，多次主责派遣将同步多次 - * @Date 2019/12/29 13:03 - **/ - @PostMapping(value = "report/syncTaskDispatch") - public Result syncTaskDispatch(@RequestParam("requestXML")String requestXML) { - return itemService.syncTaskDispatch(requestXML); - } - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 结案信息:网格化系统将案件的结案信息同步给外系统系统。 - * @Date 2019/12/29 13:03 - **/ - @PostMapping(value = "report/syncTaskEnd") - public Result syncTaskEnd(@RequestParam("requestXML")String requestXML) { - return itemService.syncTaskEnd(requestXML); - } - } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java index 6cfdf00c7..aad309997 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/GridPlatformHandleLogDao.java @@ -66,5 +66,4 @@ public interface GridPlatformHandleLogDao extends BaseDao { */ ItemGridPlatformDTO selectOneOfItemGridPlatformByTaskId(String taskId); - /** - * @param taskNum - * @return com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity - * @Author yinzuomei - * @Description 根据任务号（网格平台任务ID）查询记录 - * @Date 2019/12/29 13:44 - **/ - ItemGridPlatformEntity selectByTaskId(String taskNum); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index b43b7f6a9..8574dd2e9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -313,21 +313,4 @@ public interface ItemService extends BaseService { */ Result reportCallback(ItemPlatformProcessFormDTO formDto); - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 派遣信息:网格化系统将立案部门的主责派遣信息同步给外系统系统，多次主责派遣将同步多次 - * @Date 2019/12/29 13:05 - **/ - Result syncTaskDispatch(String requestXML); - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 结案信息:网格化系统将案件的结案信息同步给外系统系统。 - * @Date 2019/12/29 13:05 - **/ - Result syncTaskEnd(String requestXML); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c39d22c01..ca1dd4179 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1169,144 +1169,4 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result(); } - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 派遣信息:网格化系统将立案部门的主责派遣信息同步给外系统系统，多次主责派遣将同步多次 - * @Date 2019/12/29 13:05 - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Result syncTaskDispatch(String requestXML) { - Result result = new Result(); - String successFlag = "1"; - ItemGridPlatformEntity itemGridPlatformEntity = null; - try { - //1、requestXML转化成Dto异常返回异常 - ItemPlatformSyncTaskDispatchFormDTO formDto = XstreamUtil.xmlToObject(requestXML, ItemPlatformSyncTaskDispatchFormDTO.class); - //ItemPlatformSyncTaskDispatchFormDTO formDto=new ItemPlatformSyncTaskDispatchFormDTO("test");//测试用 - //2、构造数据处理对象 - itemGridPlatformEntity = getItemGridPlatformEntity(formDto.getTaskNum()); - if (null == itemGridPlatformEntity) { - throw new Exception("根据任务号没有找到项目信息"); - } - itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue()); - ItemHandleProcessDTO itemHandleProcessDTO = constructItemHandleProcessDTO(itemGridPlatformEntity.getReferenceId(), formDto); - GridPlatformHandleLogEntity gridPlatformHandleLogEntity = constructGridPlatformHandleLogEntity(itemGridPlatformEntity, itemHandleProcessDTO, formDto); - //3、统一进行数据库操作 - itemGridPlatformDao.updateById(itemGridPlatformEntity);//网格化平台项目关系表修改状态 - itemHandleProcessDao.insertItemHandleProcess(itemHandleProcessDTO);//项目处理流程表新增一条处理记录 - gridPlatformHandleLogDao.insertGridPlatformHandleLog(gridPlatformHandleLogEntity);//网格化平台处理日志表新增一条处理记录 - } catch (Exception e) { - e.printStackTrace(); - successFlag = "0"; - result.error("接口异常" +e.getMessage()); - //TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚事务 - throw new Exception("接口异常"+e.getMessage()); - } finally { - logger.info("插入interfacelog"); - insertInterfaceLog(itemGridPlatformEntity, requestXML, successFlag);//接口日志表新增一条处理记录 - return result; - } - } - - /** - * @param taskNum - * @return com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity - * @Author yinzuomei - * @Description 根据任务号（网格平台任务ID）查询ItemGridPlatformEntity - * @Date 2019/12/29 14:50 - **/ - private ItemGridPlatformEntity getItemGridPlatformEntity(String taskNum) { - return itemGridPlatformDao.selectByTaskId(taskNum); - } - - /** - * @param itemGridPlatformEntity - * @param formDto - * @return com.elink.esua.epdc.modules.item.entity.GridPlatformHandleLogEntity - * @Author yinzuomei - * @Description 网格化平台处理日志表 - * @Date 2019/12/29 14:39 - **/ - private GridPlatformHandleLogEntity constructGridPlatformHandleLogEntity(ItemGridPlatformEntity itemGridPlatformEntity, - ItemHandleProcessDTO itemHandleProcessDTO, - ItemPlatformSyncTaskDispatchFormDTO formDto) throws ParseException { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - GridPlatformHandleLogEntity entity = ConvertUtils.sourceToTarget(formDto, GridPlatformHandleLogEntity.class); - entity.setItemGridPlatformId(itemGridPlatformEntity.getId()); - entity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue()); - entity.setItemHandleProcessId(itemHandleProcessDTO.getId()); - entity.setHandlingOpinions(formDto.getSolvingNote()); - entity.setHandlingDept(formDto.getDeptName()); - String dispatchTime = formDto.getDispatchTime(); - entity.setHandlingTime(format.parse(dispatchTime)); - Date currentDate = new Date(); - entity.setCreatedTime(currentDate); - entity.setUpdatedTime(currentDate); - return entity; - } - - /** - * @param itemId - * @param formDto - * @return com.elink.esua.epdc.dto.item.ItemHandleProcessDTO - * @Author yinzuomei - * @Description 构造 项目处理流程表对象 - * @Date 2019/12/29 13:59 - **/ - public ItemHandleProcessDTO constructItemHandleProcessDTO(String itemId, ItemPlatformSyncTaskDispatchFormDTO formDto) { - ItemHandleProcessDTO itemHandleProcessDTO = new ItemHandleProcessDTO(); - String id = UUID.randomUUID().toString().replaceAll("-", ""); - itemHandleProcessDTO.setId(id); - itemHandleProcessDTO.setItemId(itemId); - 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()); - Date now=new Date(); - itemHandleProcessDTO.setCreatedTime(now);//测试事务回滚可以注释掉此行代码 - itemHandleProcessDTO.setUpdatedTime(now); - return itemHandleProcessDTO; - } - - /** - * @param itemGridPlatformEntity - * @param requestXML - * @param successFlag - * @return void - * @Author yinzuomei - * @Description 保存接口日志记录 - * @Date 2019/12/29 14:35 - **/ - public void insertInterfaceLog(ItemGridPlatformEntity itemGridPlatformEntity, String requestXML, String successFlag) { - InterfaceLogEntity interfaceLogEntity = new InterfaceLogEntity(); - if (null != itemGridPlatformEntity) { - interfaceLogEntity.setReferenceId(itemGridPlatformEntity.getReferenceId()); - } else { - interfaceLogEntity.setReferenceId(NumConstant.ZERO_STR);//默认0 - } - interfaceLogEntity.setBusinessType(InterfaceLogBusinessTypeEnum.SYNC_TASK_DISPATCH.getValue()); - interfaceLogEntity.setInterfaceName(ItemPlatFormConstant.SyncTaskDispatch); - interfaceLogEntity.setSuccessFlag(successFlag); - interfaceLogEntity.setCallMsgBody(requestXML); - interfaceLogService.insert(interfaceLogEntity); - } - - /** - * @param requestXML - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 结案信息:网格化系统将案件的结案信息同步给外系统系统。 - * @Date 2019/12/29 13:05 - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Result syncTaskEnd(String requestXML) { - ItemPlatformSyncTaskEndFormDTO fromDto = XstreamUtil.xmlToObject(requestXML, ItemPlatformSyncTaskEndFormDTO.class); - return new Result(); - } - } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml index 3115af3b9..d9fa49ab6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/GridPlatformHandleLogDao.xml @@ -56,68 +56,4 @@ LIMIT 1 - - - INSERT INTO esua_epdc_events.epdc_grid_platform_handle_log ( - ID, - ITEM_GRID_PLATFORM_ID, - STATUS, - ITEM_HANDLE_PROCESS_ID, - HANDLER, - HANDLING_OPINIONS, - HANDLING_DEPT, - HANDLING_TIME, - REVISION, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME, - DEL_FLAG, - DispatchTime, - DeptCode, - DeptName, - ExecDeptCode, - ExecDeptName, - CArriveTime, - CSolvingTime, - ArriveTime, - SolvingTime, - SolvingNote, - EndTime, - LastSolvingTime, - EndNote, - BanliResult - ) - VALUES - ( - #{id}, - #{itemGridPlatformId}, - #{status}, - #{itemHandleProcessId}, - '网格化平台', - #{handlingOpinions}, - #{handlingDept}, - #{handlingTime}, - 0, - '网格化平台', - #{createdTime}, - '网格化平台', - #{updatedTime}, - '0', - #{dispatchTime}, - #{deptCode}, - #{deptName}, - #{execDeptCode}, - #{execDeptName}, - #{carriveTime}, - #{csolvingTime}, - #{arriveTime}, - #{solvingTime}, - #{solvingNote}, - #{endTime}, - #{lastSolvingTime}, - #{endNote}, - #{banliResult} - ) - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml index 6b9a69081..d911e52db 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemGridPlatformDao.xml @@ -45,10 +45,4 @@ AND TASKID = #{taskId} - - 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 index b134e1097..565022fc3 100644 --- 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 @@ -106,71 +106,71 @@ public class GridPlatformHandleLogDTO implements Serializable { /** * 派遣时间（格式：yyyy-MM-dd HH24:mm:ss） */ - private String dispatchtime; + private String dispatchTime; /** * 派遣部门编号 */ - private String deptcode; + private String deptCode; /** * 派遣部门名称 */ - private String deptname; + private String deptName; /** * 主责部门编号 */ - private String execdeptcode; + private String execDeptCode; /** * 主责部门名称 */ - private String execdeptname; + private String execDeptName; /** * 到场时间要求（分钟数） */ - private Integer carrivetime; + private Integer carriveTime; /** * 处置时间要求（分钟数） */ - private Integer csolvingtime; + private Integer csolvingTime; /** * 到场截止时间（格式：yyyy-MM-dd HH24:mm:ss） */ - private String arrivetime; + private String arriveTime; /** * 处置截止时间（格式：yyyy-MM-dd HH24:mm:ss） */ - private String solvingtime; + private String solvingTime; /** * 派遣意见、最终主责单位处理完成意见 */ - private String solvingnote; + private String solvingNote; /** * 结案时间（格式：yyyy-MM-dd HH24:mm:ss） */ - private String endtime; + private String endTime; /** * 最终处理时间（格式：yyyy-MM-dd HH24:mm:ss） */ - private String lastsolvingtime; + private String lastSolvingTime; /** * 结案意见 */ - private String endnote; + private String endNote; /** * 结案评判（实际解决、解释说明等） */ - private String banliresult; + private String banliResult; -} \ No newline at end of file +}