|
|
|
@ -49,6 +49,14 @@ import com.elink.esua.epdc.dto.item.form.*; |
|
|
|
import com.elink.esua.epdc.dto.item.result.*; |
|
|
|
import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; |
|
|
|
import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; |
|
|
|
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.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.NewsTask; |
|
|
|
import com.elink.esua.epdc.modules.events.dao.ImgDao; |
|
|
|
import com.elink.esua.epdc.modules.events.entity.ImgEntity; |
|
|
|
@ -61,13 +69,6 @@ import com.elink.esua.epdc.modules.issue.service.IssueService; |
|
|
|
import com.elink.esua.epdc.modules.item.dao.ItemDao; |
|
|
|
import com.elink.esua.epdc.modules.item.entity.*; |
|
|
|
import com.elink.esua.epdc.modules.item.service.*; |
|
|
|
import com.elink.esua.gird.shibei.api.ShiBeiCityGridApi; |
|
|
|
import com.elink.esua.gird.shibei.constant.CommonConstants; |
|
|
|
import com.elink.esua.gird.shibei.contants.ApiConstants; |
|
|
|
import com.elink.esua.gird.shibei.dto.GridDto; |
|
|
|
import com.elink.esua.gird.shibei.dto.form.ImageFile; |
|
|
|
import com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto; |
|
|
|
import com.elink.esua.gird.shibei.util.XstreamUtil; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.logging.log4j.LogManager; |
|
|
|
import org.apache.logging.log4j.Logger; |
|
|
|
@ -598,20 +599,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { |
|
|
|
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()); |
|
|
|
GridDto gridDto = null; |
|
|
|
try { |
|
|
|
gridDto = this.reportCase(dto); |
|
|
|
} catch (Exception e) { |
|
|
|
return new Result().error("上报网格化平台接口失败" + e.getMessage()); |
|
|
|
} |
|
|
|
if (null == gridDto||!("0").equals(gridDto.getReturnCode())) { |
|
|
|
if (null == gridDto || !("0").equals(gridDto.getReturnCode())) { |
|
|
|
// 接口没有返回信息，也没有异常信息
|
|
|
|
return new Result().error("上报网格化平台接口失败"+gridDto.getReturnDescription()); |
|
|
|
return new Result().error("上报网格化平台接口失败" + gridDto.getReturnDescription()); |
|
|
|
} |
|
|
|
// 记录处理记录
|
|
|
|
itemHandleProcessService.insert(handleProcessEntity); |
|
|
|
// 记录平台上报信息
|
|
|
|
this.saveItemGridPlatformInfo(gridDto,handleProcessEntity); |
|
|
|
this.saveItemGridPlatformInfo(gridDto, handleProcessEntity); |
|
|
|
} else { |
|
|
|
handleProcessEntity.setState(dto.getHandleCategory()); |
|
|
|
// 更新项目状态
|
|
|
|
@ -862,25 +863,25 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
* @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); |
|
|
|
// 保存接口调用日志
|
|
|
|
InterfaceLogEntity interfaceLogEntity = new InterfaceLogEntity(); |
|
|
|
interfaceLogEntity.setReferenceId(dto.getId()); |
|
|
|
interfaceLogEntity.setBusinessType(InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue()); |
|
|
|
interfaceLogEntity.setInterfaceName(ApiConstants.newSendInputInfo); |
|
|
|
ItemEntity entity = baseDao.selectById(dto.getId()); |
|
|
|
// 组装上报信息
|
|
|
|
SendInputInfoFormDto sendInputInfoFormDto = packageReportEntity(entity); |
|
|
|
// 接口请求返回实体，getReturnCode 1失败 0成功（非空）
|
|
|
|
GridDto gridDto = shiBeiCityGridApi.newSendInputInfo(sendInputInfoFormDto); |
|
|
|
// 保存接口调用日志
|
|
|
|
InterfaceLogEntity interfaceLogEntity = new InterfaceLogEntity(); |
|
|
|
interfaceLogEntity.setReferenceId(dto.getId()); |
|
|
|
interfaceLogEntity.setBusinessType(InterfaceLogBusinessTypeEnum.REPORT_ITEM.getValue()); |
|
|
|
interfaceLogEntity.setInterfaceName(ApiConstants.newSendInputInfo); |
|
|
|
if ("1".equals(gridDto.getReturnCode())) {//保存结果 1失败 0成功（非空）
|
|
|
|
interfaceLogEntity.setSuccessFlag(YesOrNoEnum.NO.value()); |
|
|
|
} else if ("0".equals(gridDto.getReturnCode())) { |
|
|
|
interfaceLogEntity.setSuccessFlag(YesOrNoEnum.YES.value()); |
|
|
|
} |
|
|
|
interfaceLogEntity.setCallMsgBody(XstreamUtil.objectToXml(sendInputInfoFormDto)); |
|
|
|
interfaceLogEntity.setReturnMsgBody(XstreamUtil.objectToXml(gridDto)); |
|
|
|
interfaceLogService.insert(interfaceLogEntity); |
|
|
|
return gridDto; |
|
|
|
interfaceLogEntity.setCallMsgBody(XstreamUtil.objectToXml(sendInputInfoFormDto)); |
|
|
|
interfaceLogEntity.setReturnMsgBody(XstreamUtil.objectToXml(gridDto)); |
|
|
|
interfaceLogService.insert(interfaceLogEntity); |
|
|
|
return gridDto; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
@ -908,9 +909,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
// 发生地址
|
|
|
|
formDto.setStandardAddress(itemEntity.getIssueAddress()); |
|
|
|
// 问题描述
|
|
|
|
formDto.setDescription("测试999勿删谢谢");// itemEntity.getItemContent()
|
|
|
|
formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢
|
|
|
|
// 反映人
|
|
|
|
formDto.setReportPerson("测试人员");// itemEntity.getNickName()
|
|
|
|
formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员
|
|
|
|
// 联系方式
|
|
|
|
formDto.setContactMode(itemEntity.getMobile()); |
|
|
|
// 坐标X
|
|
|
|
@ -922,7 +923,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
// 操作时间
|
|
|
|
formDto.setInsertTime(new Date()); |
|
|
|
// 操作人
|
|
|
|
formDto.setInsertUser("尹作梅");// user.getRealName()
|
|
|
|
formDto.setInsertUser(user.getRealName());//
|
|
|
|
// 外系统编号
|
|
|
|
formDto.setHotLinesn(itemEntity.getId()); |
|
|
|
// 先查询网格对应街道id
|
|
|
|
@ -949,13 +950,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
if (null != imageList && !imageList.isEmpty()) { |
|
|
|
String url = null; |
|
|
|
String filename = null; |
|
|
|
com.elink.esua.gird.shibei.dto.form.ReportFile reportFile = null; |
|
|
|
List<com.elink.esua.gird.shibei.dto.form.ReportFile> reportFiles = new ArrayList<>(); |
|
|
|
ReportFile reportFile = null; |
|
|
|
List<ReportFile> reportFiles = new ArrayList<>(); |
|
|
|
for (ImgEntity image : imageList) { |
|
|
|
url = image.getImgUrl(); |
|
|
|
if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { |
|
|
|
filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); |
|
|
|
reportFile = new com.elink.esua.gird.shibei.dto.form.ReportFile(); |
|
|
|
reportFile = new ReportFile(); |
|
|
|
reportFile.setName(filename); |
|
|
|
reportFile.setUrl(url); |
|
|
|
reportFile.setBase64string(""); |
|
|
|
@ -977,25 +978,25 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
* @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(Integer.valueOf(String.valueOf(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); |
|
|
|
} |
|
|
|
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 |
|
|
|
|
