elink-star
/
esua-epdc-cloud
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

feature/dangjian
sunyuchao 3 years ago
parent
d5234240c0 cd94572e85
commit
c212c729b0
9 changed files with 106 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java
  2. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
  3. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
  4. 4
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java
  5. 6
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
  6. 29
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  7. 68
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
  8. 28
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProcessCaseClosedToCityDTO.java
View File

@ -7,6 +7,8 @@ import java.util.Date;
@Data
public class ItemHandleProcessCaseClosedToCityDTO {
private String id;
/**
* 网格化平台-操作人标识
*/

3
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
View File

@ -37,7 +37,7 @@ public enum ItemGridPlatformHandleStatusEnum {
HANDLE_HT(1060, "回退"),
HANDLE_ZF(1061, "作废"),
HANDLE_XFHC(1062, "下发核查"),
HANDLE_CZWC(1063, "处置完成"),
// HANDLE_CZWC(1063, "处置完成"),
HANDLE_DB(1064, "督办"),
HANDLE_BH(1065, "驳回"),
HANDLE_CX(1066, "撤消办理"),
@ -48,6 +48,7 @@ public enum ItemGridPlatformHandleStatusEnum {
HANDLE_YQSH(1100, "延期审核"),
HANDLE_SQBJ(1101, "申请办结"),
HANDLE_CZ(1102, "处置"),
HANDLE_OTHER(999, "派遣中");

6
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
View File

@ -50,8 +50,8 @@ public class PushToCityGridController {
* @date 2022/9/20 10:48
*/
@PostMapping("AppealReporting")
public Result AppealReporting(){
return pushToCityGridService.AppealReporting();
public Result AppealReporting(String itemId,Integer state){
return pushToCityGridService.AppealReporting(itemId,state);
}
/**
@ -64,7 +64,7 @@ public class PushToCityGridController {
*/
@PostMapping("ReportRejection")
public Result ReportRejection(ItemHandleProcessDTO dto){
return pushToCityGridService.ReportRejection(dto);
return pushToCityGridService.ReportRejection(dto.getItemId(),dto.getState());
}
/**

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

@ -114,7 +114,8 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
* @author LZN
* @date 2022/9/19 10:25
*/
List<ItemHandleProcessToCityResultDTO> getAppealReporting(@Param("state") int state);
ItemHandleProcessToCityResultDTO getAppealReporting(@Param("state") int state,
@Param("itemId") String itemId);
/**
* 上报驳回
@ -130,7 +131,6 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
* @return
*/
AppealHandlingToCityResultDTO getAppealHandling(@Param("state") int state,
@Param("id") String id,
@Param("itemId") String itemId);
List<String> getURL(String itemId);

6
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
View File

@ -58,7 +58,7 @@ public interface PushToCityGridService {
* @author zhy
* @date 2022/9/19 9:40
*/
void appealSupervise();
void appealSupervise(ItemHandleProcessDTO dto);
/**
* 派遣审核
*
@ -107,7 +107,7 @@ public interface PushToCityGridService {
* @author LZN
* @date 2022/9/19 10:22
*/
Result AppealReporting();
Result AppealReporting(String itemId,Integer state);
/**
* 事件感知
@ -127,7 +127,7 @@ public interface PushToCityGridService {
* @author LZN
* @date 2022/9/19 10:43
*/
Result ReportRejection(ItemHandleProcessDTO dto);
Result ReportRejection(String itemId,Integer state);
/**
* 诉求处理

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

@ -654,6 +654,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
contentSecurityFeign.insertRecords(record);
}
}
//诉求评价
pushToCityGridService.evaluation(evaluationFormDTO.getItemId());
return new Result();
} else {
return new Result().error("您无法评价");
@ -1147,6 +1149,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
List<Long> deptIds = new ArrayList<>(longTreeSet);
// 发送菜单消息-待处理项目-吹哨部门
this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
// 网格吹哨,上报市平台
pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState());
// 上报网格化平台（社区吹哨）
} else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) {
log.info("处理项目-进入上报网格化平台（社区吹哨）");
@ -1155,6 +1159,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 记录处理记录
itemHandleProcessService.insert(handleProcessEntity);
log.info("处理项目-上报网格化平台-if结束");
//社区吹哨，上报市平台
pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState());
// 结案申请
} else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
log.info("处理项目-进入结案申请");
@ -1210,6 +1217,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
longTreeSet.addAll(oldDeptIds);
longTreeSet.addAll(newDeptIds);
List<Long> deptIds = new ArrayList<>(longTreeSet);
// 网格结案，社区结案，上报市平台
pushToCityGridService.AppealReporting(handleProcessEntity.getItemId(),handleProcessEntity.getState());
// 发送菜单消息-待处理项目-吹哨部门
this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
log.info("处理项目-结案申请-if结束");
@ -2377,7 +2387,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if(null ==dto){
return;
}
if (ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue() == dto.getState()) {
if (ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_CZ.getValue() == dto.getState()) {
pushToCityGridService.appealDispatch();//2.2 诉求派遣
} else if (ItemGridPlatformHandleStatusEnum.HANDLE_TD.getValue() == dto.getState()) {
pushToCityGridService.rebut();//2.8 诉求退件
@ -2387,8 +2397,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
pushToCityGridService.delayApply();//2.10 延期申请
} else if (ItemGridPlatformHandleStatusEnum.HANDLE_YQSH.getValue() == dto.getState()) {
pushToCityGridService.delayAudit();//2.11 延期审核
}else if(ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue() == dto.getState()){ // 2.7诉求处理
pushToCityGridService.AppealHandling(dto);
}else if(ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue() == dto.getState()){
pushToCityGridService.AppealHandling(dto); // 2.7诉求处理
}
// 网格化平台，处置完成、延期申请、申请办结、向上申请
if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState() ||
ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() ||
ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() ||
ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) {
pushToCityGridService.AppealReporting(dto.getItemId(),dto.getState());
} else if(ItemGridPlatformHandleStatusEnum.HANDLE_DB.getValue() == dto.getState()){ // 2.7诉求处理
pushToCityGridService.appealSupervise(dto);
}
}
@ -3017,6 +3036,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if("0".equals(formDto.getCheckFlag())){
//同意
process.setState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
// 社区审批，上报市平台
pushToCityGridService.AppealReporting(process.getItemId(),process.getState());
process.setOutHandleAdvice("街道网格化平台正在处理。");
}else if("1".equals(formDto.getCheckFlag())){
//不同意，返回网格待处理列表
@ -3181,7 +3202,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (formDto.getImages() != null && formDto.getImages().size() > 0) {
imgService.saveImages(formDto.getImages(), itemHandleProcessDto.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE);
}
pushToCityGridService.ReportRejection(itemHandleProcessDto);
pushToCityGridService.ReportRejection(itemHandleProcessDto.getItemId(),itemHandleProcessDto.getState());
successFlag = YesOrNoEnum.YES.value();
// 保存接口调用日志
this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),

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

@ -35,9 +35,11 @@ import com.elink.esua.epdc.modules.item.dao.ItemDao;
import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao;
import com.elink.esua.epdc.modules.item.dao.ItemReportInterfaceLogDao;
import com.elink.esua.epdc.modules.item.entity.ItemEntity;
import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
import com.elink.esua.epdc.modules.item.entity.ItemReportInterfaceLogEntity;
import com.elink.esua.epdc.modules.item.service.ItemService;
import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
@ -196,13 +198,25 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 传数据
data.setCzr(czr);
cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_CLOSED,"诉求结案");
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.CASE_CLOSED, "诉求结案");
saveLog(item.getItemId(), item.getId(), "诉求结案", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(data), result);
}
return new Result();
}
@Override
public void appealSupervise() {
public void appealSupervise(ItemHandleProcessDTO processDTO) {
if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId());
AppealSuperviseResultDTO dto = new AppealSuperviseResultDTO();
dto.setSqid(getSqid(item.getItemId()));
dto.setDbr(item.getGridPartyname());
dto.setDbsj(item.getCreatedTime().toString());
dto.setDbnr(item.getHandleAdvice());
// 组装好直接推送
String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办");
saveLog(item.getItemId(), item.getId(), "诉求督办", PushToCityGridConstant.APPEAL_SUPERVISE, JSONObject.toJSONString(dto), result);
} else {
// 昨天
String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
// state=诉求督办的流程数据
@ -216,8 +230,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
dto.setDbsj(item.getCreatedTime().toString());
dto.setDbnr(item.getHandleAdvice());
// 组装好直接推送
cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办");
String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SUPERVISE, "诉求督办");
saveLog(item.getItemId(), item.getId(), "诉求督办", PushToCityGridConstant.APPEAL_SUPERVISE, JSONObject.toJSONString(dto), result);
});
}
}
@ -297,7 +313,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 组装完成，推送
data.setCzr(dto);
cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核");
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.DISP_ATCH_AUDIT, "派遣审核");
saveLog(item.getItemId(),item.getId(),"派遣审核",PushToCityGridConstant.DISP_ATCH_AUDIT,JSONObject.toJSONString(data),result);
}
return new Result();
}
@ -355,12 +373,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
* @date 2022/9/19 10:22
*/
@Override
public Result AppealReporting() {
int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue();
List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getAppealReporting(state);
public Result AppealReporting(String itemId,Integer states) {
int state = states; // ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue();
ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(state,itemId);
// 处理数据
for(ItemHandleProcessToCityResultDTO item : list) {
// for(ItemHandleProcessToCityResultDTO item : list) {
AppealReportResultDTO data = new AppealReportResultDTO();
@ -392,8 +410,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 组装完成，推送
data.setCzr(dto);
cityGridApi.sendItemToCity(data,PushToCityGridConstant.APPEAL_REPORT,"诉求上报");
}
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_REPORT, "诉求上报");
saveLog(item.getItemId(),item.getId(),"诉求上报",PushToCityGridConstant.APPEAL_REPORT, JSONObject.toJSONString(data),result);
// }
return new Result();
}
@ -406,9 +426,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
* @date 2022/9/19 10:44
*/
@Override
public Result ReportRejection(ItemHandleProcessDTO itemHandleProcessDto) {
int state = itemHandleProcessDto.getState(); // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(state,itemHandleProcessDto.getItemId());
public Result ReportRejection(String itemId,Integer states) {
int state = states; // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(state,itemId);
// 处理数据
// for(ItemHandleProcessToCityResultDTO item : list) {
@ -443,7 +463,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 组装完成，推送
data.setCzr(dto);
cityGridApi.sendItemToCity(data,PushToCityGridConstant.REPORT_REBUT,"上报驳回");
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.REPORT_REBUT, "上报驳回");
saveLog(item.getItemId(),item.getId(),"上报驳回",PushToCityGridConstant.REPORT_REBUT,JSONObject.toJSONString(data),result);
// }
return new Result();
}
@ -459,7 +481,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
@Override
public Result AppealHandling(ItemHandleProcessDTO Prodto) {
int state = Prodto.getState(); // ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue();
AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(state,Prodto.getId(),Prodto.getItemId());
AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(state,Prodto.getItemId());
// 处理数据
// for(AppealHandlingToCityResultDTO item : list) {
@ -519,7 +541,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 组装完成，推送
data.setCzr(dto);
cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"诉求处理");
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.HANDLE, "诉求处理");
saveLog(item.getItemId(),item.getId(),"诉求处理",PushToCityGridConstant.HANDLE,JSONObject.toJSONString(data),result);
// }
return new Result();
}
@ -783,13 +807,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 昨天
String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
// state=作废的流程数据
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue()), date);
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue()), date);
// 拼接数据
list.forEach(item -> {
EarlyInspectionApplyResultDTO dto = new EarlyInspectionApplyResultDTO();
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.DYS.getCode());
dto.setSqzt(CityPushStateEnum.YJA.getCode());
dto.setDqclhj(CityPushLinkEnum.SQCY.getCode());
//申请内容
dto.setSqnr(item.getHandleAdvice());
@ -824,13 +848,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 昨天
String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
// state=作废的流程数据
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue()), date);
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue()), date);
// 拼接数据
list.forEach(item -> {
EarlyInspectionResultDTO dto = new EarlyInspectionResultDTO();
dto.setSqid(getSqid(item.getItemId()));
dto.setSqzt(CityPushStateEnum.DYS.getCode());
dto.setSqzt(CityPushStateEnum.YJA.getCode());
dto.setDqclhj(CityPushLinkEnum.SQ_CY.getCode());
//TODO 初验结果 1：初验通过；0：初验不通过
dto.setCzjg(NumConstant.ONE_STR);
@ -867,14 +891,14 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 昨天
String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
// state=作废的流程数据
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue()), date);
List<ItemHandleProcessDTO> list = itemHandleProcessDao.listProcessByStateAndDate(String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue()), date);
// 拼接数据
list.forEach(item -> {
EndInspectionResultDTO dto = new EndInspectionResultDTO();
dto.setSqid(getSqid(item.getItemId()));
//诉求状态
dto.setSqzt(CityPushStateEnum.DYS.getCode());
dto.setSqzt(CityPushStateEnum.YJA.getCode());
//当前处理环节
dto.setDqclhj(CityPushLinkEnum.SQ_ZY.getCode());
////TODO 终验结果 1：终验通过；0：终验不通过

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

@ -75,18 +75,7 @@
p.state = #{state}
and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
</select>
<select id="getAppealReporting"
resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
select
p.*
from
epdc_item_handle_process p
where
p.del_flag = 0
and
p.state = #{state}
and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
</select>
<select id="getURL" resultType="java.lang.String">
@ -125,8 +114,6 @@
p.del_flag = 0
and
p.state = #{state}
and
p.id = #{id}
and
p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
</select>
@ -144,5 +131,18 @@
p.state = #{state}
and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
</select>
<select id="getAppealReporting"
resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
select
p.*
from
epdc_item_handle_process p
where
p.del_flag = 0
and p.item_id = #{itemId}
and
p.state = #{state}
and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
</select>
</mapper>

Write Preview
Loading…
Cancel
Save