Merge remote-tracking branch 'origin/feature/pushCaseTo_city' into feature/pushCaseTo_city

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

@@ -7,80 +7,85 @@ package com.elink.esua.epdc.constant;
  */
 public interface PushToCityGridConstant {
 
+    /**
+     * 市平台地址
+     */
+    public final static String URL_PREFIX = "http://60.166.25.58:6120/sjgl/a/case";
+
     /**
      * 民生诉求上报
      */
-    public final static String CASE_LIVELIHOOD = "http://ip:port/case/dispatch";
+    public final static String CASE_LIVELIHOOD = URL_PREFIX + "/dispatch";
 
     /**
      * 发展诉求上报
      */
-    public final static String CASE_DEVELOP = "http://ip:port/case/dispatch";
+    public final static String CASE_DEVELOP = URL_PREFIX + "/dispatch";
 
     /**
      * 执法诉求上报
      */
-    public final static String CASE_LAWENFORCEMENT = "http://ip:port/case/dispatch";
+    public final static String CASE_LAWENFORCEMENT = URL_PREFIX + "/dispatch";
 
     /**
      * 诉求派遣
      */
-    public final static String APPEAL_DISPATCH = "http://ip:port/case/dispatch";
+    public final static String APPEAL_DISPATCH = URL_PREFIX + "/dispatch";
 
     /**
      * 诉求结案
      */
-    public final static String CASE_CLOSED = "http://ip:port/case/closed";
+    public final static String CASE_CLOSED = URL_PREFIX + "/closed";
 
     /**
      * 派遣审核
      */
-    public final static String DISP_ATCH_AUDIT = "http://ip:port/case/dispatchAudit";
+    public final static String DISP_ATCH_AUDIT = URL_PREFIX + "/dispatchAudit";
 
     /**
      * 诉求上报
      */
-    public final static String APPEAL_REPORT = "http://ip:port/case/report";
+    public final static String APPEAL_REPORT = URL_PREFIX + "/report";
 
     /**
      * 上报驳回
      */
-    public final static String REPORT_REBUT = "http://ip:port/case/ reportRebut";
+    public final static String REPORT_REBUT = URL_PREFIX + "/ reportRebut";
 
     /**
      * 诉求处理
      */
-    public final static String HANDLE = "http://ip:port/case/ handle";
+    public final static String HANDLE = URL_PREFIX + "/ handle";
 
     /**
      * 诉求废弃
      */
-    public final static String APPEAL_SCRAP = "http://ip:port/case/scrap";
+    public final static String APPEAL_SCRAP = URL_PREFIX + "/scrap";
 
     /**
      * 诉求督办
      */
-    public final static String APPEAL_SUPERVISE = "http://ip:port/case/supervise";
+    public final static String APPEAL_SUPERVISE = URL_PREFIX + "/supervise";
 
     /**
      * 诉求废弃
      */
-    public final static String APPEAL_WHISTLE_REPORT = "http://ip:port/case/whistle/report";
+    public final static String APPEAL_WHISTLE_REPORT = URL_PREFIX + "/whistle/report";
 
     /**
      * 吹哨驳回
      */
-    public final static String APPEAL_WHISTLE_REPORT_REJECT = "http://ip:port/case/whistle/reportreject";
+    public final static String APPEAL_WHISTLE_REPORT_REJECT = URL_PREFIX + "/whistle/reportreject";
 
     /**
      * 吹哨反馈
      */
-    public final static String APPEAL_WHISTLE_FEEDBACK = "http://ip:port/case/whistle/feedback";
+    public final static String APPEAL_WHISTLE_FEEDBACK = URL_PREFIX + "/whistle/feedback";
 
     /**
      * 事件感知
      */
-    public final static String APPEAL_MSG = "http://ip:port/case/msg";
+    public final static String APPEAL_MSG = URL_PREFIX + "/msg";
 
     /**
      * 2.8 诉求退件

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java

@@ -0,0 +1,122 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2022-09-15 10:57
+ **/
+@Data
+public class CityCaseLawenforcementDTO implements Serializable {
+
+    private static final long serialVersionUID = -1806537123570448354L;
+    /**
+     *唯一标识
+     */
+    private String id;
+
+    /**
+     *紧急程度 01一般 02紧急
+     */
+    private String jjcd;
+
+    /**
+     *诉求来源 01微信诉求
+     */
+    private String sqly;
+
+    /**
+     *诉求来源 01微信诉求
+     */
+    private String sqzt;
+
+    /**
+     *当前处理环节
+     */
+    private String dqclhj;
+
+    /**
+     *上报区市：370203市北区
+     */
+    private String sbqs;
+
+    /**
+     *诉求所属机构：370203市北区
+     */
+    private String sbssjg;
+
+    /**
+     *诉求所属机构名称
+     */
+    private String sbssjgmc;
+
+    /**
+     *诉求吹哨事由
+     */
+    private String sqcssy;
+
+    /**
+     *上报人联系方式
+     */
+    private String sbrlxfs;
+
+    /**
+     *诉求主要内容
+     */
+    private String sqzynr;
+
+    /**
+     *牵头单位
+     */
+    private CityCaseLawenforcementQtdwDTO qtdw;
+
+    /**
+     *责任单位
+     */
+    private List<CityCaseLawenforcementZrdwDTO> zrdw;
+
+    /**
+     *报道时间
+     */
+    private String bdsj;
+
+    /**
+     *报道位置
+     */
+    private String bdwz;
+
+    /**
+     *诉求详细地址
+     */
+    private String sqdz;
+
+    /**
+     *诉求地理坐标		百度坐标系
+     */
+    private String sqxy;
+
+    /**
+     *诉求登记日期
+     */
+    private String sqdjrq;
+
+    /**
+     *诉求登记人
+     */
+    private CityCaseLawenforcementdPersonDTO sqdjr;
+
+    /**
+     *诉求照片	多张照片用逗号分隔
+     */
+    private String sqzp;
+
+    /**
+     *上报说明
+     */
+    private String sbsm;
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementQtdwDTO.java

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2022-09-15 10:57
+ **/
+@Data
+public class CityCaseLawenforcementQtdwDTO implements Serializable {
+
+    private static final long serialVersionUID = -1806537123570448354L;
+    /**
+     *牵头机构编码
+     */
+    private String qtjgbm;
+
+    /**
+     *牵头机构
+     */
+    private String qtjg;
+
+    /**
+     *牵头部门编码
+     */
+    private String qtbmbm;
+
+    /**
+     *牵头部门
+     */
+    private String qtbm;
+
+
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementZrdwDTO.java

@@ -0,0 +1,39 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2022-09-15 10:57
+ **/
+@Data
+public class CityCaseLawenforcementZrdwDTO implements Serializable {
+
+    private static final long serialVersionUID = -1806537123570448354L;
+    /**
+     *责任机构编码
+     */
+    private String zrjgbm;
+
+    /**
+     *责任机构
+     */
+    private String zrjg;
+
+    /**
+     *责任部门编码
+     */
+    private String zrbmbm;
+
+    /**
+     *责任部门
+     */
+    private String zrbm;
+
+
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementdPersonDTO.java

@@ -0,0 +1,50 @@
+package com.elink.esua.epdc.dto.item.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: esua-epdc
+ * @description:
+ * @author: wangtong
+ * @create: 2022-09-15 10:57
+ **/
+@Data
+public class CityCaseLawenforcementdPersonDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 856689091696538499L;
+
+    /**
+     *诉求登记人Id
+     */
+    private String id;
+
+    /**
+     *诉求登记人姓名
+     */
+    private String xm;
+
+    /**
+     *所属机构Id
+     */
+    private String ssjgId;
+
+    /**
+     *所属部门Id
+     */
+    private String ssjg;
+
+    /**
+     *所属部门Id
+     */
+    private String ssbmId;
+
+    /**
+     *所属部门
+     */
+    private String ssbm;
+
+
+}

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

@@ -80,5 +80,10 @@ public class ItemHandleProcessToCityResultDTO implements Serializable {
      */
     private String delFlag;
 
+    /**
+     * 网格化平台-人员名称
+     */
+    private String gridPartyname;
+
 
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java

@@ -113,19 +113,21 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
      * @author LZN
      * @date 2022/9/19 10:25
      */
-    List<ItemHandleProcessToCityResultDTO> getAppealReporting(String state);
+    List<ItemHandleProcessToCityResultDTO> getAppealReporting(int state);
 
     /**
      * 上报驳回
      * @param state
      * @return
      */
-    List<ItemHandleProcessToCityResultDTO> getReportRejection(String state);
+    List<ItemHandleProcessToCityResultDTO> getReportRejection(int state);
 
     /**
      * 诉求处理
      * @param state
      * @return
      */
-    List<ItemHandleProcessToCityResultDTO> getAppealHandling(String state);
+    List<ItemHandleProcessToCityResultDTO> getAppealHandling(int state);
+
+    List<String> getURL(String itemId);
 }

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

@@ -430,9 +430,83 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice());
         dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
         sendItemToDsf(dto,itemHandleProcessEntity);
+        //发送事件到市中心
+        sendCaseLaw(itemEntity);
         return new Result().ok(itemEntity.getSerialNum());
     }
 
+    /**
+    * @describe: 执法诉求 组装数据到市平台
+    * @author wangtong
+    * @date 2022/9/19 14:11
+    * @params [entity]
+    * @return void
+    */
+    private void sendCaseLaw(ItemEntity entity) {
+        CityCaseLawenforcementDTO data = new CityCaseLawenforcementDTO();
+        data.setId(entity.getId());
+        data.setJjcd(CityPushEnum.JJCD_YB.getCode());
+        data.setSqly(CityPushEnum.SQLY_WX.getCode());
+        data.setSqzt(CityPushEnum.SQZT_DPQ.getCode());
+        data.setSbqs(CityPushEnum.SBQS_SB.getCode());
+        data.setSbssjg(CityPushEnum.SBQS_SB.getCode());
+        data.setSbssjgmc(CityPushEnum.SBQS_MC.getCode());
+        data.setSqcssy("执法诉求上报");
+        //组装数据
+        QueryWrapper<ItemLawEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("item_id", entity.getId());
+        wrapper.eq("del_flag", "0");
+        ItemLawEntity il = itemLawDao.selectOne(wrapper);
+        if(null != il){
+            //牵头单位
+            CityCaseLawenforcementQtdwDTO qtdw = new CityCaseLawenforcementQtdwDTO();
+            qtdw.setQtbm(il.getHostUnit());
+            qtdw.setQtbmbm(il.getHostUnit());
+            qtdw.setQtjg(il.getHostUnit());
+            qtdw.setQtjgbm(il.getHostUnit());
+            data.setQtdw(qtdw);
+            //责任单位
+            List<CityCaseLawenforcementZrdwDTO> zrdwList = new ArrayList<>();
+            CityCaseLawenforcementZrdwDTO zrdw = new CityCaseLawenforcementZrdwDTO();
+            zrdw.setZrbm(il.getAssistUnit());
+            zrdw.setZrbmbm(il.getAssistUnit());
+            zrdw.setZrjg(il.getAssistUnit());
+            zrdw.setZrjgbm(il.getAssistUnit());
+            zrdwList.add(zrdw);
+            data.setZrdw(zrdwList);
+            data.setBdsj(DateUtils.format(il.getReportTime(),DateUtils.DATE_TIME_PATTERN));
+            data.setBdwz(il.getReportAddress());
+        }
+
+        data.setSbrlxfs(entity.getMobile());
+        data.setSqzynr(entity.getItemContent());
+        data.setSqdz(entity.getIssueAddress());
+        // todo jack转百度坐标系格式：x,y
+        data.setSqxy(entity.getIssueLatitude().toString()+","+entity.getIssueLongitude().toString());
+        data.setSqdjrq(DateUtils.format(entity.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
+        //诉求登记人
+        CityCaseLawenforcementdPersonDTO sqdjr = new CityCaseLawenforcementdPersonDTO();
+        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<ImgEntity> imgWrapper = new QueryWrapper<>();
+        wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId());
+        List<ImgEntity> imageList = imgDao.selectList(imgWrapper);
+        //诉求照片
+        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_LAWENFORCEMENT,"执法诉求");
+    }
+
 
     @Override
     public Result<List<ItemResultDTO>> getQuestionList(ItemByQuestionFormDTO formDto) {

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

@@ -107,7 +107,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
         // state=作废的流程数据
         List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue()), date);
-
         // 拼接数据
         list.forEach(item -> {
             AppealScrapResultDTO dto = new AppealScrapResultDTO();
@@ -229,25 +228,25 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             DispatchAuditResultDto data = new DispatchAuditResultDto();
 
             // 诉求id
-            data.setSqid("");
-            // 诉求状态（待审核）
-            data.setSqzt(CityPushStateEnum.DJA.getCode());
-            // 当前处理环节
+            data.setSqid(getSqid(item.getItemId()));
+            // 诉求状态（未知）
+            data.setSqzt(CityPushStateEnum.DSH.getCode());
+            // 当前处理环节(未知)
             data.setDqclhj("");
             // 审核时间
             data.setCzsj(item.getCreatedTime());
-            // 审核结果
+            // 审核结果（未知）
             data.setShjg("");
             // 审核意见
-            data.setCznr("");
+            data.setCznr(item.getHandleAdvice());
 
             // 操作人
             DispatchAuditResultDto.CzrDTO dto = new DispatchAuditResultDto.CzrDTO();
+            // 操作人员姓名
+            dto.setXm(item.getGridPartyname());
 
-            dto.setId((""));
-            dto.setXm("");
-
-
+            // 组装完成，推送
+            data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核");
         }
     }
@@ -308,7 +307,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      */
     @Override
     public void AppealReporting() {
-        String state = "11";
+        int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue();
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getAppealReporting(state);
 
         // 处理数据 todo
@@ -316,22 +315,24 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
             AppealReportResultDTO data = new AppealReportResultDTO();
 
-            data.setSqid("");
-            // 诉求状态
-            data.setSqzt(CityPushStateEnum.DCL.getCode());
-            // 当前处理环节
-            data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
+            // 诉求id
+            data.setSqid(getSqid(item.getItemId()));
+            // 诉求状态（未知）
+            data.setSqzt("");
+            // 当前处理环节（未知）
+            data.setDqclhj("");
             // 上报时间
             data.setCzsj(item.getCreatedTime());
             // 上报原因
-            data.setCznr("");
+            data.setCznr(item.getHandleAdvice());
 
             // 操作人
             AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO();
+            // 操作人姓名
+            dto.setXm(item.getGridPartyname());
 
-            dto.setId("");
-            dto.setXm("");
-
+            // 组装完成，推送
+            data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.APPEAL_REPORT,"诉求上报");
         }
     }
@@ -346,7 +347,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      */
     @Override
     public void ReportRejection() {
-        String state = "14";
+        int state = ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getReportRejection(state);
 
         // 处理数据 todo
@@ -354,21 +355,24 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
             ReportRejectionResultDTO data = new ReportRejectionResultDTO();
 
-            data.setSqid("");
-            // 诉求状态
+            // 诉求id
+            data.setSqid(getSqid(item.getItemId()));
+            // 诉求状态（未知）
             data.setSqzt("");
-            // 当前处理环节
+            // 当前处理环节（未知）
             data.setDqclhj("");
             // 驳回时间
             data.setCzsj(item.getCreatedTime());
             // 驳回原因
-            data.setCznr("");
+            data.setCznr(item.getHandleAdvice());
 
+            // 操作人
             ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO();
+            // 操作人姓名
+            dto.setXm(item.getGridPartyname());
 
-            dto.setId("");
-            dto.setXm("");
-
+            // 组装完成，推送
+            data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.REPORT_REBUT,"上报驳回");
         }
     }
@@ -383,33 +387,50 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      */
     @Override
     public void AppealHandling() {
-        String state = "0";
+        int state = ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue();
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getAppealHandling(state);
 
+        // 处理数据 todo
         for(ItemHandleProcessToCityResultDTO item : list) {
 
             AppealHandlingResultDTO data = new AppealHandlingResultDTO();
 
-            data.setSqid("");
+            // 诉求id
+            data.setSqid(getSqid(item.getItemId()));
             // 诉求状态
             data.setSqzt(CityPushStateEnum.DCL.getCode());
             // 当前处理环节
             data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
-            // 诉求类型
+            // 诉求类型（未知）
             data.setSqlx("");
             // 处理时间
             data.setCzsj(item.getCreatedTime());
             // 处理内容
-            data.setCznr("");
+            data.setCznr(item.getHandleAdvice());
+
             // 处理照片
-            data.setClzp("");
+            List<String> urlList = itemHandleProcessDao.getURL(item.getItemId());
+            String url = "";
+            for (String i : urlList) {
+                url = i+ "," + url;
+            }
+            data.setClzp(url);
+
+            // 会议纪要（未知）
+            data.setHyjy("");
+            // 责任分工
+            data.setZrfg("");
+            // 办理进度
+            data.setBljd("");
 
+            // 操作人
             AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
+            // 操作人姓名
+            dto.setXm(item.getGridPartyname());
 
-            dto.setId("");
-            dto.setXm("");
-
-            cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"上报驳回");
+            // 组装完成，推送
+            data.setCzr(dto);
+            cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"诉求处理");
         }
     }
 
@@ -442,7 +463,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     /**
      * 获取诉求编码，接口2-21可用
      *
-     * @param itemId
+     * @param itemId 项目ID
      * @return java.lang.String
      * @author zhy
      * @date 2022/9/19 11:07

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml

@@ -98,4 +98,25 @@
         and
             p.state = #{state}
     </select>
+    <select id="getURL" resultType="java.lang.String">
+        SELECT
+            img.img_url
+        FROM
+            epdc_img img
+        WHERE
+            REFERENCE_ID = (
+            SELECT
+                e.id
+            FROM
+                epdc_events e
+            WHERE
+                e.id = (
+                SELECT
+                    item.EVENT_ID
+                FROM
+                    epdc_item item
+                WHERE
+                    item.id = #{itemId}))
+    </select>
+
 </mapper>