From 2c9939b686bf964e058ea38b94518986b2520193 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 16 Sep 2022 16:18:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=B9=B3=E5=8F=B0-=E6=B0=91=E7=94=9F?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/PushToCityGridConstant.java | 15 +++++++ .../dto/item/form/CityCaseLivelihoodDTO.java | 10 +++++ .../item/service/impl/ItemServiceImpl.java | 40 ++++++++++++------- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java index b05ee38f0..f1458d4ab 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java @@ -7,6 +7,21 @@ package com.elink.esua.epdc.constant; */ public interface PushToCityGridConstant { + /** + * 民生诉求上报 + */ + public final static String CASE_LIVELIHOOD = "http://ip:port/case/dispatch"; + + /** + * 发展诉求上报 + */ + public final static String CASE_DEVELOP = "http://ip:port/case/dispatch"; + + /** + * 执法诉求上报 + */ + public final static String CASE_LAWENFORCEMENT = "http://ip:port/case/dispatch"; + /** * 诉求派遣 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java index 0f56ba9dd..add1990b9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLivelihoodDTO.java @@ -29,6 +29,16 @@ public class CityCaseLivelihoodDTO implements Serializable { */ private String sqly; + /** + *诉求来源 01微信诉求 + */ + private String sqzt; + + /** + *当前处理环节 + */ + private String dqclhj; + /** *上报区市：370203市北区 */ 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 47f5c7142..30e06e26f 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 @@ -2612,27 +2612,37 @@ public class ItemServiceImpl extends BaseServiceImpl implem data.setId(entity.getId()); data.setJjcd(CityPushEnum.JJCD_YB.getCode()); data.setSqly(CityPushEnum.SQLY_WX.getCode()); + data.setSqzt(CityPushEnum.SQZT_DPQ.getCode()); + data.setDqclhj(CityPushEnum.DQCLHJ_DJ.getCode()); data.setSbqs(CityPushEnum.SBQS_SB.getCode()); data.setSbssjg(CityPushEnum.SBQS_SB.getCode()); data.setSbrlxfs(entity.getMobile()); data.setSqzynr(entity.getItemContent()); data.setSqdz(entity.getIssueAddress()); // todo jack转百度坐标系格式：x,y -// data.setSqxy(); -// data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN)); -// data.setSqdjr(); -// // todo jack照片格式调整为http -// QueryWrapper wrapper = new QueryWrapper<>(); -// wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId()); -// List imageList = imgDao.selectList(wrapper); -// //诉求照片 -// StringBuffer sqzp = new StringBuffer(""); -// imageList.forEach(img ->{ -// sqzp.append(img.getImgUrl()).append(","); -// }); -// data.setSqzp(sqzp.substring(0,sqzp.length()-1)); -// //发送到市平台 -// cityGridApi.sendItemToCity(data,httpUrl); + data.setSqxy(entity.getIssueLatitude().toString()+","+entity.getIssueLongitude().toString()); + data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN)); + //诉求登记人 + CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO(); + sqdjr.setId(entity.getId()); + sqdjr.setXm(entity.getNickName()); + sqdjr.setSsbm(entity.getGrid()); + sqdjr.setSsbmId(entity.getGridId().toString()); + sqdjr.setSsjg(entity.getGrid()); + sqdjr.setSsjgId(entity.getGridId().toString()); + data.setSqdjr(sqdjr); + // todo jack照片格式调整为http + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId()); + List imageList = imgDao.selectList(wrapper); + //诉求照片 + StringBuffer sqzp = new StringBuffer(""); + imageList.forEach(img ->{ + sqzp.append(img.getImgUrl()).append(","); + }); + data.setSqzp(sqzp.substring(0,sqzp.length()-1)); + //发送到市平台 + cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LIVELIHOOD,"民生诉求"); } /**