diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementDTO.java new file mode 100644 index 000000000..558a56d9b --- /dev/null +++ b/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 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; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementQtdwDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementQtdwDTO.java new file mode 100644 index 000000000..525591f87 --- /dev/null +++ b/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; + + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementZrdwDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementZrdwDTO.java new file mode 100644 index 000000000..56182b3e6 --- /dev/null +++ b/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; + + + +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementdPersonDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/CityCaseLawenforcementdPersonDTO.java new file mode 100644 index 000000000..f3bf8cd3e --- /dev/null +++ b/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; + + +} 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 b779a9ffb..c2d7c20cd 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 @@ -430,9 +430,83 @@ public class ItemServiceImpl extends BaseServiceImpl 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 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 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 imgWrapper = new QueryWrapper<>(); + wrapper.eq("REFERENCE_ID", entity.getEventId() == null?entity.getId():entity.getEventId()); + List 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> getQuestionList(ItemByQuestionFormDTO formDto) {