市平台-民生上报

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";
+
     /**
      * 诉求派遣
      */

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市北区
      */

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<ItemDao, ItemEntity> 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.setSqxy(entity.getIssueLatitude().toString()+","+entity.getIssueLongitude().toString());
-//        data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
+        data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
-//        data.setSqdjr();
+        //诉求登记人
-//        // todo jack照片格式调整为http
+        CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO();
-//        QueryWrapper<ImgEntity> wrapper = new QueryWrapper<>();
+        sqdjr.setId(entity.getId());
-//        wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId());
+        sqdjr.setXm(entity.getNickName());
-//        List<ImgEntity> imageList = imgDao.selectList(wrapper);
+        sqdjr.setSsbm(entity.getGrid());
-//        //诉求照片
+        sqdjr.setSsbmId(entity.getGridId().toString());
-//        StringBuffer sqzp = new StringBuffer("");
+        sqdjr.setSsjg(entity.getGrid());
-//        imageList.forEach(img ->{
+        sqdjr.setSsjgId(entity.getGridId().toString());
-//            sqzp.append(img.getImgUrl()).append(",");
+        data.setSqdjr(sqdjr);
-//        });
+        // todo jack照片格式调整为http
-//        data.setSqzp(sqzp.substring(0,sqzp.length()-1));
+        QueryWrapper<ImgEntity> wrapper = new QueryWrapper<>();
-//        //发送到市平台
+        wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId());
-//        cityGridApi.sendItemToCity(data,httpUrl);
+        List<ImgEntity> 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,"民生诉求");
     }
 
     /**