北尚诉办-民生、发展推送到市中心

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

@@ -29,6 +29,12 @@ public class CityCaseDevelopDTO implements Serializable {
      */
     private String sqly;
 
+
+    /**
+     *诉求来源 01微信诉求
+     */
+    private String sqzt;
+
     /**
      *上报区市：370203市北区
      */
@@ -39,6 +45,11 @@ public class CityCaseDevelopDTO implements Serializable {
      */
     private String sbssjg;
 
+    /**
+     *诉求所属机构名称
+     */
+    private String sbssjgmc;
+
     /**
      *企业名称
      */

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

@@ -49,6 +49,11 @@ public class CityCaseLivelihoodDTO implements Serializable {
      */
     private String sbssjg;
 
+    /**
+     *诉求所属机构名称
+     */
+    private String sbssjgmc;
+
     /**
      *上报人联系方式
      */

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

@@ -87,10 +87,7 @@ import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.interfacelog.entity.InterfaceLogEntity;
 import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService;
 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.dao.*;
-import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao;
-import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao;
-import com.elink.esua.epdc.modules.item.dao.ItemLawDao;
 import com.elink.esua.epdc.modules.item.entity.*;
 import com.elink.esua.epdc.modules.item.service.*;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
@@ -202,6 +199,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Autowired
     private CityGridApi cityGridApi;
 
+    @Autowired
+    private ItemEnterpriseDao itemEnterpriseDao;
+
     @Override
     public PageData<ItemDTO> page(Map<String, Object> params) {
         IPage<ItemEntity> page = baseDao.selectPage(
@@ -2589,7 +2589,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
             sendItemToDsf(dto,itemHandleProcessEntity);
         }
-        //发送到市平台-堡垒机
+        //发送到市平台
         if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
             //民生
             sendCaseLivelihood(entity);
@@ -2601,7 +2601,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
-    * @describe: 民生诉求 组装数据到市平台-堡垒机
+    * @describe: 民生诉求 组装数据到市平台
     * @author wangtong
     * @date 2022/9/15 10:48
     * @params [entity]
@@ -2616,6 +2616,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         data.setDqclhj(CityPushEnum.DQCLHJ_DJ.getCode());
         data.setSbqs(CityPushEnum.SBQS_SB.getCode());
         data.setSbssjg(CityPushEnum.SBQS_SB.getCode());
+        data.setSbssjgmc(CityPushEnum.SBQS_MC.getCode());
         data.setSbrlxfs(entity.getMobile());
         data.setSqzynr(entity.getItemContent());
         data.setSqdz(entity.getIssueAddress());
@@ -2646,7 +2647,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     }
 
     /**
-     * @describe: 发展诉求 组装数据到市平台-堡垒机
+     * @describe: 发展诉求 组装数据到市平台
      * @author wangtong
      * @date 2022/9/15 10:48
      * @params [entity]
@@ -2654,7 +2655,50 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     private void sendCaseDevelop(ItemEntity entity) {
         CityCaseDevelopDTO data = new CityCaseDevelopDTO();
+        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());
+        //组装企业数据
+        QueryWrapper<ItemEnterpriseEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("item_id", entity.getId());
+        wrapper.eq("del_flag", "0");
+        ItemEnterpriseEntity ie = itemEnterpriseDao.selectOne(wrapper);
+        if(null != ie){
+            data.setQymc(ie.getEnterpriseName());
+            data.setQytyxydm(ie.getUniformSocialCreditCode());
+        }
 
+        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));
+        //诉求登记人
+        CityCaseDevelopPersonDTO sqdjr = new CityCaseDevelopPersonDTO();
+        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_DEVELOP,"发展诉求");
     }