Merge branch 'feature/pushCaseTo_city' of http://121.42.41.42:7070/r/esua-epdc-cloud into feature/pushCaseTo_city

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java

@@ -15,17 +15,17 @@ public interface PushToCityGridConstant {
     /**
      * 民生诉求上报
      */
-    public final static String CASE_LIVELIHOOD = URL_PREFIX + "/dispatch";
+    public final static String CASE_LIVELIHOOD = URL_PREFIX + "/livelihood";
 
     /**
      * 发展诉求上报
      */
-    public final static String CASE_DEVELOP = URL_PREFIX + "/dispatch";
+    public final static String CASE_DEVELOP = URL_PREFIX + "/develop";
 
     /**
      * 执法诉求上报
      */
-    public final static String CASE_LAWENFORCEMENT = URL_PREFIX + "/dispatch";
+    public final static String CASE_LAWENFORCEMENT = URL_PREFIX + "/lawenforcement";
 
     /**
      * 诉求派遣
@@ -90,42 +90,42 @@ public interface PushToCityGridConstant {
     /**
      * 2.8 诉求退件
      */
-    public final static String REBUT = "http://ip:port/case/rebut";
+    public final static String REBUT =  URL_PREFIX + "/rebut";
 
     /**
      * 2.9 退件审核
      */
-    public final static String REBUT_AUDIT = "http://ip:port/case/rebutAudit";
+    public final static String REBUT_AUDIT =  URL_PREFIX + "/rebutAudit";
 
     /**
      * 2.10 延期申请
      */
-    public final static String DELAY_APPLY = "http://ip:port/case/delayApply";
+    public final static String DELAY_APPLY =  URL_PREFIX + "/delayApply";
 
     /**
      * 2.11 延期审核
      */
-    public final static String DELAY_AUDIT = "http://ip:port/case/delayAudit";
+    public final static String DELAY_AUDIT =  URL_PREFIX + "/delayAudit";
 
     /**
      * 2.12 诉求评价
      */
-    public final static String EVALUATION = "http://ip:port/case/evaluation";
+    public final static String EVALUATION =  URL_PREFIX + "/evaluation";
 
     /**
      * 2.13 初验申请
      */
-    public final static String EARLY_INSPECTION_APPLY = "http://ip:port/case/earlyInspectionApply";
+    public final static String EARLY_INSPECTION_APPLY =  URL_PREFIX + "/earlyInspectionApply";
 
     /**
      * 2.14 诉求初验
      */
-    public final static String EARLY_INSPECTION = "http://ip:port/case/earlyInspection";
+    public final static String EARLY_INSPECTION =  URL_PREFIX + "/earlyInspection";
 
     /**
      * 2.15 诉求终验
      */
-    public final static String END_INSPECTION = "http://ip:port/case/endInspection";
+    public final static String END_INSPECTION =  URL_PREFIX + "/endInspection";
 
 
 

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CitySendReturnResultDTO.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2022-09-20 09:07
+ **/
+@Data
+public class CitySendReturnResultDTO implements Serializable {
+    private static final long serialVersionUID = -7453179773137916110L;
+
+    /**
+     * 诉求上报后青诉即办平台返回的唯一标识
+     */
+    private String sqid;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.item.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -504,7 +505,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         });
         data.setSqzp(sqzp.substring(0,sqzp.length()-1));
         //发送到市平台
-        cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LAWENFORCEMENT,"执法诉求");
+        String resultString = cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LAWENFORCEMENT,"执法诉求");
+        //保存sqid
+        Result<CitySendReturnResultDTO> resultInfo = JSONObject.parseObject(resultString, Result.class);
+        CitySendReturnResultDTO sqid = resultInfo.getData();
+        entity.setSqid(sqid.getSqid());
+        updateById(entity);
     }
 
 
@@ -2717,7 +2723,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         });
         data.setSqzp(sqzp.substring(0,sqzp.length()-1));
         //发送到市平台
-        cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LIVELIHOOD,"民生诉求");
+        String resultString =  cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_LIVELIHOOD,"民生诉求");
+        //保存sqid
+        Result<CitySendReturnResultDTO> resultInfo = JSONObject.parseObject(resultString, Result.class);
+        CitySendReturnResultDTO sqid = resultInfo.getData();
+        entity.setSqid(sqid.getSqid());
+        updateById(entity);
     }
 
     /**
@@ -2772,7 +2783,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         });
         data.setSqzp(sqzp.substring(0,sqzp.length()-1));
         //发送到市平台
-        cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_DEVELOP,"发展诉求");
+        String resultString = cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_DEVELOP,"发展诉求");
+        //保存sqid
+        Result<CitySendReturnResultDTO> resultInfo = JSONObject.parseObject(resultString, Result.class);
+        CitySendReturnResultDTO sqid = resultInfo.getData();
+        entity.setSqid(sqid.getSqid());
+        updateById(entity);
     }