From 5923bde071638060bdb2efbaa7560d9dcd8c429d Mon Sep 17 00:00:00 2001 From: rongchao Date: Mon, 27 Apr 2020 09:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=9B=9B=E4=B8=AA=E5=85=AC?= =?UTF-8?q?=E7=94=A8=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 12 + epdc-cloud-client-yushan | 1 + epdc-cloud-commons-yushan | 1 + epdc-cloud-events/pom.xml | 30 +- .../item/service/impl/ItemServiceImpl.java | 538 +++++++++--------- epdc-cloud-gateway-yushan | 1 + epdc-cloud-parent-yushan | 1 + pom.xml | 4 +- 8 files changed, 307 insertions(+), 281 deletions(-) create mode 100644 .gitmodules create mode 160000 epdc-cloud-client-yushan create mode 160000 epdc-cloud-commons-yushan create mode 160000 epdc-cloud-gateway-yushan create mode 160000 epdc-cloud-parent-yushan diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3f1f4a2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "epdc-cloud-client-yushan"] + path = epdc-cloud-client-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-client-yushan.git +[submodule "epdc-cloud-commons-yushan"] + path = epdc-cloud-commons-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git +[submodule "epdc-cloud-gateway-yushan"] + path = epdc-cloud-gateway-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-gateway-yushan.git +[submodule "epdc-cloud-parent-yushan"] + path = epdc-cloud-parent-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan new file mode 160000 index 0000000..cc0e5d4 --- /dev/null +++ b/epdc-cloud-client-yushan @@ -0,0 +1 @@ +Subproject commit cc0e5d4a31687b9224edc53d7b8d6414e7005d6a diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan new file mode 160000 index 0000000..f491284 --- /dev/null +++ b/epdc-cloud-commons-yushan @@ -0,0 +1 @@ +Subproject commit f49128405cd591b9aab7f129df01518c5aea143e diff --git a/epdc-cloud-events/pom.xml b/epdc-cloud-events/pom.xml index 657424f..95cf17f 100644 --- a/epdc-cloud-events/pom.xml +++ b/epdc-cloud-events/pom.xml @@ -5,10 +5,10 @@ 4.0.0 - com.esua.epdc.yunshan - epdc-cloud-parent-yunshan + com.esua.epdc.yushan + epdc-cloud-parent-yushan 1.0.0 - ../epdc-cloud-parent-yunshan + ../epdc-cloud-parent-yushan epdc-cloud-events @@ -51,19 +51,19 @@ - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-cloud-kpi-client ${epdc-cloud-client.version} - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-cloud-events-client ${epdc-cloud-client.version} - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-cloud-user-client ${epdc-cloud-client.version} @@ -71,36 +71,36 @@ - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-commons-tools 1.0.0 - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-commons-mybatis ${epdc-cloud-commons.version} - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-commons-tools-wx-ma ${epdc-cloud-commons.version} - com.esua.epdc.yunshan + com.esua.epdc.yushan epdc-commons-api-version-control ${epdc-cloud-commons.version} - - com.esua.epdc.yunshan - yunshan-gird-sdk - ${epdc-cloud-commons.version} - + + + + + diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index eff99ef..f93d05c 100755 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -54,16 +54,16 @@ import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; import com.elink.esua.epdc.enums.KpiMetaDataEnum; -import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; -import com.elink.esua.epdc.gird.shibei.constant.CommonConstants; -import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; -import com.elink.esua.epdc.gird.shibei.dto.GridDto; -import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto; -import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto; -import com.elink.esua.epdc.gird.shibei.dto.form.ImageFile; -import com.elink.esua.epdc.gird.shibei.dto.form.ReportFile; -import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto; -import com.elink.esua.epdc.gird.shibei.util.XstreamUtil; +//import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; +//import com.elink.esua.epdc.gird.shibei.constant.CommonConstants; +//import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; +//import com.elink.esua.epdc.gird.shibei.dto.GridDto; +//import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdDto; +//import com.elink.esua.epdc.gird.shibei.dto.SearchCaseProcessByTaskIdItemDto; +//import com.elink.esua.epdc.gird.shibei.dto.form.ImageFile; +//import com.elink.esua.epdc.gird.shibei.dto.form.ReportFile; +//import com.elink.esua.epdc.gird.shibei.dto.form.SendInputInfoFormDto; +//import com.elink.esua.epdc.gird.shibei.util.XstreamUtil; import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.events.dao.ImgDao; @@ -137,8 +137,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ImgDao imgDao; - @Autowired - private ShiBeiCityGridApi shiBeiCityGridApi; +// @Autowired +// private ShiBeiCityGridApi shiBeiCityGridApi; @Autowired private ItemGridPlatformService itemGridPlatformService; @@ -575,6 +575,16 @@ public class ItemServiceImpl extends BaseServiceImpl implem return baseDao.selectListOfItemHandleProgressByMobile(itemId); } + @Override + public Result queryItemHandle() { + return null; + } + + @Override + public Result reportCallback(ItemPlatformProcessFormDTO formDto) { + return null; + } + @Override @Transactional(rollbackFor = Exception.class) public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { @@ -634,20 +644,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem } handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); - GridDto gridDto = null; - try { - gridDto = this.reportCase(dto); - } catch (Exception e) { - return new Result().error("上报网格化平台接口失败" + e.getMessage()); - } - if (null == gridDto || !("0").equals(gridDto.getReturnCode())) { - // 接口没有返回信息，也没有异常信息 - return new Result().error("上报网格化平台接口失败" + gridDto.getReturnDescription()); - } +// GridDto gridDto = null; +// try { +// gridDto = this.reportCase(dto); +// } catch (Exception e) { +// return new Result().error("上报网格化平台接口失败" + e.getMessage()); +// } +// if (null == gridDto || !("0").equals(gridDto.getReturnCode())) { +// // 接口没有返回信息，也没有异常信息 +// return new Result().error("上报网格化平台接口失败" + gridDto.getReturnDescription()); +// } // 记录处理记录 - itemHandleProcessService.insert(handleProcessEntity); - // 记录平台上报信息 - this.saveItemGridPlatformInfo(gridDto, handleProcessEntity); +// itemHandleProcessService.insert(handleProcessEntity); +// // 记录平台上报信息 +// this.saveItemGridPlatformInfo(gridDto, handleProcessEntity); } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 @@ -961,29 +971,29 @@ public class ItemServiceImpl extends BaseServiceImpl implem return list; } - /** - * @param dto - * @return void - * @Author yinzuomei - * @Description 案件信息上报 - * @Date 2019/12/25 13:00 - **/ - private GridDto reportCase(ItemHandleSubmitFormDTO dto) throws Exception { - ItemEntity entity = baseDao.selectById(dto.getId()); - // 组装上报信息 - SendInputInfoFormDto sendInputInfoFormDto = packageReportEntity(entity); - // 接口请求返回实体，getReturnCode 1失败 0成功（非空） - GridDto gridDto = shiBeiCityGridApi.newSendInputInfo(sendInputInfoFormDto); - // 保存接口调用日志 - String successFlag = YesOrNoEnum.NO.value(); - if (NumConstant.ZERO_STR.equals(gridDto.getReturnCode())) { - successFlag = YesOrNoEnum.YES.value(); - } - this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(), - ApiConstants.newSendInputInfo, successFlag, XstreamUtil.objectToXml(sendInputInfoFormDto), - XstreamUtil.objectToXml(gridDto)); - return gridDto; - } +// /** +// * @param dto +// * @return void +// * @Author yinzuomei +// * @Description 案件信息上报 +// * @Date 2019/12/25 13:00 +// **/ +// private GridDto reportCase(ItemHandleSubmitFormDTO dto) throws Exception { +// ItemEntity entity = baseDao.selectById(dto.getId()); +// // 组装上报信息 +// SendInputInfoFormDto sendInputInfoFormDto = packageReportEntity(entity); +// // 接口请求返回实体，getReturnCode 1失败 0成功（非空） +// GridDto gridDto = shiBeiCityGridApi.newSendInputInfo(sendInputInfoFormDto); +// // 保存接口调用日志 +// String successFlag = YesOrNoEnum.NO.value(); +// if (NumConstant.ZERO_STR.equals(gridDto.getReturnCode())) { +// successFlag = YesOrNoEnum.YES.value(); +// } +// this.saveInterfaceLog(dto.getId(), InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue(), +// ApiConstants.newSendInputInfo, successFlag, XstreamUtil.objectToXml(sendInputInfoFormDto), +// XstreamUtil.objectToXml(gridDto)); +// return gridDto; +// } /** * 保存接口调用日志 @@ -1005,97 +1015,97 @@ public class ItemServiceImpl extends BaseServiceImpl implem interfaceLogService.insert(interfaceLogEntity); } - /** - * @param itemEntity - * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto - * @Author yinzuomei - * @Description 组装案件信息上报接口入参 - * @Date 2019/12/25 13:14 - **/ - private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { - UserDetail user = SecurityUser.getUser(); - SendInputInfoFormDto formDto = new SendInputInfoFormDto(); - // 案件来源 - formDto.setInfoSourceID(CommonConstants.INFO_SOURCE_ID); - // 渠道来源 - formDto.setReportDept(CommonConstants.REPORT_DEPT); - // 案件属性 - formDto.setInfoTypeID(CommonConstants.INFO_TYPE_ID); - // 案件大类 - formDto.setInfoBC(CommonConstants.INFO_BC); - // 案件小类 - formDto.setInfoSC(CommonConstants.INFO_SC); - // 案件子类 - formDto.setInfoZC(CommonConstants.INFO_ZC); - // 发生地址 - formDto.setStandardAddress(itemEntity.getIssueAddress()); - // 问题描述 - formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢 - // 反映人 - formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 - // 联系方式 - formDto.setContactMode(itemEntity.getMobile()); - double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude()); - // 坐标X - formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP)); - // 坐标Y - formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP)); - // 监督员编号 - formDto.setKeepersn(""); - // 操作时间 - formDto.setInsertTime(new Date()); - // 操作人 - formDto.setInsertUser(user.getRealName());// - // 外系统编号 - formDto.setHotLinesn(itemEntity.getId()); - // 先查询网格对应街道id - Result completeDeptDTOResult = adminFeignClient.getCompleteDept(itemEntity.getGridId()); - if (!completeDeptDTOResult.success()) { - throw new Exception("根据网格ID获取所有上级机构信息失败" + completeDeptDTOResult.getMsg()); - } - // 根据街道id查询对应平台的deptCode、streetCode - Result deptGridPlatformDTOResult = adminFeignClient.getDeptGridPlatformDTO(completeDeptDTOResult.getData().getStreetId().toString()); - if (!deptGridPlatformDTOResult.success() || null == deptGridPlatformDTOResult.getData()) { - throw new Exception("根据街道查询平台部门信息失败" + deptGridPlatformDTOResult.getMsg()); - } - //外系统编码 必填!!!!!!! - formDto.setDeptCode(deptGridPlatformDTOResult.getData().getDeptCode());// 130099 - // 街道编码!!!!!!!!!!!! - formDto.setStreetCode(deptGridPlatformDTOResult.getData().getStreetCode()); - // 网格编码 - formDto.setGridCode(null); - formDto.setImageFile(getImageFile(itemEntity.getEventId())); - return formDto; - } - - // 组装事件图片 - private ImageFile getImageFile(String eventId) { - ImageFile imageFile = new ImageFile(); - //查询图片列表 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(eventId), "REFERENCE_ID", eventId); - List imageList = imgDao.selectList(wrapper); - if (null != imageList && !imageList.isEmpty()) { - String url = null; - String filename = null; - ReportFile reportFile = null; - List reportFiles = new ArrayList<>(); - List imgUrlList = this.getUploadDTOList(imageList); - for (String imgUrl : imgUrlList) { - url = imgUrl; - if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { - filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); - reportFile = new ReportFile(); - reportFile.setName(filename); - reportFile.setUrl(url); - reportFile.setBase64string(""); - reportFiles.add(reportFile); - } - } - imageFile.setReportFileList(reportFiles); - } - return imageFile; - } +// /** +// * @param itemEntity +// * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto +// * @Author yinzuomei +// * @Description 组装案件信息上报接口入参 +// * @Date 2019/12/25 13:14 +// **/ +// private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { +// UserDetail user = SecurityUser.getUser(); +// SendInputInfoFormDto formDto = new SendInputInfoFormDto(); +// // 案件来源 +// formDto.setInfoSourceID(CommonConstants.INFO_SOURCE_ID); +// // 渠道来源 +// formDto.setReportDept(CommonConstants.REPORT_DEPT); +// // 案件属性 +// formDto.setInfoTypeID(CommonConstants.INFO_TYPE_ID); +// // 案件大类 +// formDto.setInfoBC(CommonConstants.INFO_BC); +// // 案件小类 +// formDto.setInfoSC(CommonConstants.INFO_SC); +// // 案件子类 +// formDto.setInfoZC(CommonConstants.INFO_ZC); +// // 发生地址 +// formDto.setStandardAddress(itemEntity.getIssueAddress()); +// // 问题描述 +// formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢 +// // 反映人 +// formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 +// // 联系方式 +// formDto.setContactMode(itemEntity.getMobile()); +// double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude()); +// // 坐标X +// formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP)); +// // 坐标Y +// formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP)); +// // 监督员编号 +// formDto.setKeepersn(""); +// // 操作时间 +// formDto.setInsertTime(new Date()); +// // 操作人 +// formDto.setInsertUser(user.getRealName());// +// // 外系统编号 +// formDto.setHotLinesn(itemEntity.getId()); +// // 先查询网格对应街道id +// Result completeDeptDTOResult = adminFeignClient.getCompleteDept(itemEntity.getGridId()); +// if (!completeDeptDTOResult.success()) { +// throw new Exception("根据网格ID获取所有上级机构信息失败" + completeDeptDTOResult.getMsg()); +// } +// // 根据街道id查询对应平台的deptCode、streetCode +// Result deptGridPlatformDTOResult = adminFeignClient.getDeptGridPlatformDTO(completeDeptDTOResult.getData().getStreetId().toString()); +// if (!deptGridPlatformDTOResult.success() || null == deptGridPlatformDTOResult.getData()) { +// throw new Exception("根据街道查询平台部门信息失败" + deptGridPlatformDTOResult.getMsg()); +// } +// //外系统编码 必填!!!!!!! +// formDto.setDeptCode(deptGridPlatformDTOResult.getData().getDeptCode());// 130099 +// // 街道编码!!!!!!!!!!!! +// formDto.setStreetCode(deptGridPlatformDTOResult.getData().getStreetCode()); +// // 网格编码 +// formDto.setGridCode(null); +// formDto.setImageFile(getImageFile(itemEntity.getEventId())); +// return formDto; +// } +// +// // 组装事件图片 +// private ImageFile getImageFile(String eventId) { +// ImageFile imageFile = new ImageFile(); +// //查询图片列表 +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq(StringUtils.isNotBlank(eventId), "REFERENCE_ID", eventId); +// List imageList = imgDao.selectList(wrapper); +// if (null != imageList && !imageList.isEmpty()) { +// String url = null; +// String filename = null; +// ReportFile reportFile = null; +// List reportFiles = new ArrayList<>(); +// List imgUrlList = this.getUploadDTOList(imageList); +// for (String imgUrl : imgUrlList) { +// url = imgUrl; +// if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { +// filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); +// reportFile = new ReportFile(); +// reportFile.setName(filename); +// reportFile.setUrl(url); +// reportFile.setBase64string(""); +// reportFiles.add(reportFile); +// } +// } +// imageFile.setReportFileList(reportFiles); +// } +// return imageFile; +// } //压缩图片并上传到服务器，得到新的地址 private List getUploadDTOList(List imageList) { @@ -1125,73 +1135,73 @@ public class ItemServiceImpl extends BaseServiceImpl implem return imgUrlList; } - /** - * @param gridDto - * @param handleProcessEntity - * @return void - * @Author yinzuomei - * @Description - * @Date 2019/12/25 15:29 - **/ - private void saveItemGridPlatformInfo(GridDto gridDto, ItemHandleProcessEntity handleProcessEntity) { - UserDetail user = SecurityUser.getUser(); - ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); - itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId()); - itemGridPlatformEntity.setTaskid(gridDto.getTaskId()); - itemGridPlatformEntity.setReportPersonDeptId(user.getDeptId()); - itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); - itemGridPlatformService.insert(itemGridPlatformEntity); - - GridPlatformHandleLogEntity logEntity = new GridPlatformHandleLogEntity(); - logEntity.setItemGridPlatformId(itemGridPlatformEntity.getId()); - logEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); - logEntity.setItemHandleProcessId(handleProcessEntity.getItemId()); - logEntity.setHandler(user.getRealName()); - logEntity.setHandlingOpinions(handleProcessEntity.getHandleAdvice()); - logEntity.setHandlingDept(handleProcessEntity.getHandlerDept()); - logEntity.setHandlingTime(handleProcessEntity.getCreatedTime()); - gridPlatformHandleLogService.insert(logEntity); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Result queryItemHandle() { - // 获取已上报网格平台未结案的项目 - List gridPlatformDTOList = itemGridPlatformService.listOfGridPlatformItemNotEnd(); - // 拉取处理情况 - for (ItemGridPlatformDTO dto : - gridPlatformDTOList) { - SearchCaseProcessByTaskIdDto searchResultDot = shiBeiCityGridApi.searchCaseProcessByTaskId(dto.getTaskid()); - String successFlag = YesOrNoEnum.NO.value(); - String returnMsgBody = ""; - if (null != searchResultDot) { - successFlag = YesOrNoEnum.YES.value(); - returnMsgBody = XstreamUtil.objectToXml(searchResultDot); - List progressList = searchResultDot.getRequest(); - if (null != progressList && progressList.size() > 0) { - // 删除已有处理记录 - this.removeOldHandleProcess(dto.getId()); - // 保存新的处理记录 - this.insertNewHandleProcess(progressList, dto.getReferenceId(), dto.getId()); - // 查询最新处理情况 - GridPlatformHandleLogDTO lastHandleLog = gridPlatformHandleLogService.getLastHandleProcess(dto.getId()); - // 更新网格化平台当前处理状态 - if (null != lastHandleLog && null != lastHandleLog.getStatus()) { - ItemGridPlatformEntity platformEntity = new ItemGridPlatformEntity(); - platformEntity.setId(dto.getId()); - platformEntity.setStatus(lastHandleLog.getStatus()); - itemGridPlatformService.updateById(platformEntity); - } - } - } - // 保存接口调用日志 - this.saveInterfaceLog(dto.getReferenceId(), InterfaceLogBusinessTypeEnum.PULL_ITEM_HANDLE_PROCESS.getValue(), - ApiConstants.SearchCaseProcessByTaskId, successFlag, dto.getTaskid(), returnMsgBody); - } - - return new Result(); - } +// /** +// * @param gridDto +// * @param handleProcessEntity +// * @return void +// * @Author yinzuomei +// * @Description +// * @Date 2019/12/25 15:29 +// **/ +// private void saveItemGridPlatformInfo(GridDto gridDto, ItemHandleProcessEntity handleProcessEntity) { +// UserDetail user = SecurityUser.getUser(); +// ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); +// itemGridPlatformEntity.setReferenceId(handleProcessEntity.getItemId()); +// itemGridPlatformEntity.setTaskid(gridDto.getTaskId()); +// itemGridPlatformEntity.setReportPersonDeptId(user.getDeptId()); +// itemGridPlatformEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); +// itemGridPlatformService.insert(itemGridPlatformEntity); +// +// GridPlatformHandleLogEntity logEntity = new GridPlatformHandleLogEntity(); +// logEntity.setItemGridPlatformId(itemGridPlatformEntity.getId()); +// logEntity.setStatus(ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue()); +// logEntity.setItemHandleProcessId(handleProcessEntity.getItemId()); +// logEntity.setHandler(user.getRealName()); +// logEntity.setHandlingOpinions(handleProcessEntity.getHandleAdvice()); +// logEntity.setHandlingDept(handleProcessEntity.getHandlerDept()); +// logEntity.setHandlingTime(handleProcessEntity.getCreatedTime()); +// gridPlatformHandleLogService.insert(logEntity); +// } + + +// @Override +// @Transactional(rollbackFor = Exception.class) +// public Result queryItemHandle() { +// // 获取已上报网格平台未结案的项目 +// List gridPlatformDTOList = itemGridPlatformService.listOfGridPlatformItemNotEnd(); +// // 拉取处理情况 +// for (ItemGridPlatformDTO dto : +// gridPlatformDTOList) { +// SearchCaseProcessByTaskIdDto searchResultDot = shiBeiCityGridApi.searchCaseProcessByTaskId(dto.getTaskid()); +// String successFlag = YesOrNoEnum.NO.value(); +// String returnMsgBody = ""; +// if (null != searchResultDot) { +// successFlag = YesOrNoEnum.YES.value(); +// returnMsgBody = XstreamUtil.objectToXml(searchResultDot); +// List progressList = searchResultDot.getRequest(); +// if (null != progressList && progressList.size() > 0) { +// // 删除已有处理记录 +// this.removeOldHandleProcess(dto.getId()); +// // 保存新的处理记录 +// this.insertNewHandleProcess(progressList, dto.getReferenceId(), dto.getId()); +// // 查询最新处理情况 +// GridPlatformHandleLogDTO lastHandleLog = gridPlatformHandleLogService.getLastHandleProcess(dto.getId()); +// // 更新网格化平台当前处理状态 +// if (null != lastHandleLog && null != lastHandleLog.getStatus()) { +// ItemGridPlatformEntity platformEntity = new ItemGridPlatformEntity(); +// platformEntity.setId(dto.getId()); +// platformEntity.setStatus(lastHandleLog.getStatus()); +// itemGridPlatformService.updateById(platformEntity); +// } +// } +// } +// // 保存接口调用日志 +// this.saveInterfaceLog(dto.getReferenceId(), InterfaceLogBusinessTypeEnum.PULL_ITEM_HANDLE_PROCESS.getValue(), +// ApiConstants.SearchCaseProcessByTaskId, successFlag, dto.getTaskid(), returnMsgBody); +// } +// +// return new Result(); +// } /** * 删除历史网格化平台处理记录 @@ -1212,64 +1222,64 @@ public class ItemServiceImpl extends BaseServiceImpl implem gridPlatformHandleLogService.removeHandleProcessByItemGridPlatFormId(itemGridPlatformId); } - /** - * 保存新的网格化平台处理记录 - * - * @return void - * @params [progressList] - * @author liuchuang - * @since 2019/12/25 19:27 - */ - private void insertNewHandleProcess(List progressList, String itemId, String itemGridPlatformId) { - - try { - for (SearchCaseProcessByTaskIdItemDto dto : - progressList) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - Date insertTime = sdf.parse(dto.getInserttime()); - String itemHandleProcessId = UUID.randomUUID().toString().replaceAll("-", ""); - // 插入项目处理进度表 - ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO(); - itemHandleProcessDto.setId(itemHandleProcessId); - itemHandleProcessDto.setItemId(itemId); - itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getItemname())); - itemHandleProcessDto.setHandleAdvice(dto.getNote()); - itemHandleProcessDto.setOutHandleAdvice(dto.getNote()); - itemHandleProcessDto.setHandlerDept(dto.getDeptname()); - itemHandleProcessDto.setCreatedTime(insertTime); - itemHandleProcessDto.setUpdatedTime(insertTime); - itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto); - - // 插入网格化平台处理记录表 - GridPlatformHandleLogEntity gridPlatformHandleLogEntity = new GridPlatformHandleLogEntity(); - gridPlatformHandleLogEntity.setItemGridPlatformId(itemGridPlatformId); - gridPlatformHandleLogEntity.setItemHandleProcessId(itemHandleProcessId); - gridPlatformHandleLogEntity.setStatus(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getItemname())); - gridPlatformHandleLogEntity.setHandler(dto.getUsername()); - gridPlatformHandleLogEntity.setHandlingOpinions(dto.getNote()); - gridPlatformHandleLogEntity.setHandlingDept(dto.getDeptname()); - gridPlatformHandleLogEntity.setHandlingTime(insertTime); - gridPlatformHandleLogService.insert(gridPlatformHandleLogEntity); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - public Result reportCallback(ItemPlatformProcessFormDTO formDto) { - // 获取上报项目信息 - ItemGridPlatformDTO platformDto = itemGridPlatformService.getInfoByTaskId(formDto.getTaskid()); - if (null == platformDto) { - return new Result(); - } - - // 保存网格化平台处理记录 - SearchCaseProcessByTaskIdItemDto taskDto = ConvertUtils.sourceToTarget(formDto, SearchCaseProcessByTaskIdItemDto.class); - this.insertNewHandleProcess(Collections.singletonList(taskDto), platformDto.getReferenceId(), platformDto.getId()); - - return new Result(); - } +// /** +// * 保存新的网格化平台处理记录 +// * +// * @return void +// * @params [progressList] +// * @author liuchuang +// * @since 2019/12/25 19:27 +// */ +// private void insertNewHandleProcess(List progressList, String itemId, String itemGridPlatformId) { +// +// try { +// for (SearchCaseProcessByTaskIdItemDto dto : +// progressList) { +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); +// Date insertTime = sdf.parse(dto.getInserttime()); +// String itemHandleProcessId = UUID.randomUUID().toString().replaceAll("-", ""); +// // 插入项目处理进度表 +// ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO(); +// itemHandleProcessDto.setId(itemHandleProcessId); +// itemHandleProcessDto.setItemId(itemId); +// itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getItemname())); +// itemHandleProcessDto.setHandleAdvice(dto.getNote()); +// itemHandleProcessDto.setOutHandleAdvice(dto.getNote()); +// itemHandleProcessDto.setHandlerDept(dto.getDeptname()); +// itemHandleProcessDto.setCreatedTime(insertTime); +// itemHandleProcessDto.setUpdatedTime(insertTime); +// itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto); +// +// // 插入网格化平台处理记录表 +// GridPlatformHandleLogEntity gridPlatformHandleLogEntity = new GridPlatformHandleLogEntity(); +// gridPlatformHandleLogEntity.setItemGridPlatformId(itemGridPlatformId); +// gridPlatformHandleLogEntity.setItemHandleProcessId(itemHandleProcessId); +// gridPlatformHandleLogEntity.setStatus(ItemGridPlatformHandleStatusEnum.getValueByName(dto.getItemname())); +// gridPlatformHandleLogEntity.setHandler(dto.getUsername()); +// gridPlatformHandleLogEntity.setHandlingOpinions(dto.getNote()); +// gridPlatformHandleLogEntity.setHandlingDept(dto.getDeptname()); +// gridPlatformHandleLogEntity.setHandlingTime(insertTime); +// gridPlatformHandleLogService.insert(gridPlatformHandleLogEntity); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } + +// @Override +// public Result reportCallback(ItemPlatformProcessFormDTO formDto) { +// // 获取上报项目信息 +// ItemGridPlatformDTO platformDto = itemGridPlatformService.getInfoByTaskId(formDto.getTaskid()); +// if (null == platformDto) { +// return new Result(); +// } +// +// // 保存网格化平台处理记录 +// SearchCaseProcessByTaskIdItemDto taskDto = ConvertUtils.sourceToTarget(formDto, SearchCaseProcessByTaskIdItemDto.class); +// this.insertNewHandleProcess(Collections.singletonList(taskDto), platformDto.getReferenceId(), platformDto.getId()); +// +// return new Result(); +// } /** * @Description: 工作端 根据项目的不同处理方式进行短信发放 diff --git a/epdc-cloud-gateway-yushan b/epdc-cloud-gateway-yushan new file mode 160000 index 0000000..2930742 --- /dev/null +++ b/epdc-cloud-gateway-yushan @@ -0,0 +1 @@ +Subproject commit 29307425ebc6c065fa5c2559dd4aa1013a8a7a77 diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan new file mode 160000 index 0000000..7d5b870 --- /dev/null +++ b/epdc-cloud-parent-yushan @@ -0,0 +1 @@ +Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c diff --git a/pom.xml b/pom.xml index d684c17..ce19060 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.esua.epdc.yunshan - epdc-cloud-events-yunshan + com.esua.epdc.yushan + epdc-cloud-events-yushan 1.0.0 pom