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

Merge branch 'feature/hotfix_shangbao' into feature/bssb_screen 

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
feature/dangjian
zhangyuan 3 years ago
parent
cd3fc59f4d ec6534a96c
commit
a3ca09b52a
7 changed files with 268 additions and 212 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-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
  2. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
  3. 56
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  4. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  5. 169
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  6. 45
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
  7. 24
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

2
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
View File

@ -15,7 +15,7 @@
<if test="pid != null and pid != ''">
AND t1.pid = #{pid}
</if>
<if test="eventContent != null and eventContent != ''">
<if test="typeKey != null and typeKey != ''">
AND t1.type_key = #{typeKey}
</if>
order by t1.sort asc

10
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
View File

@ -217,6 +217,16 @@ public class ItemDTO implements Serializable {
*/
private String allDeptNames;
/**
* 分类code
*/
private String categoryCode;
/**
* 12345平台原始code
*/
private String categoryCodeOrigin;
/**
* 分类全称
*/

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

@ -19,8 +19,6 @@ package com.elink.esua.epdc.modules.item.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
@ -47,6 +45,16 @@ import java.util.Map;
@Mapper
public interface ItemDao extends BaseDao<ItemEntity> {
/**
* 查询类别
*
* @param id
* @return ItemDTO
* @author
* @date
*/
ItemDTO getCategoryInfo(@Param("id") String id);
/**
* 根据议题ID获取项目信息
*
@ -149,8 +157,8 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @Date: 2019/9/12 18:21
*/
List<ItemPendingHandleDTO> selectListOfPendingHandleItems(Map<String, Object> params);
List<ItemPendingHandleDTO> listEqPc(ItemWorkListFormDTO formDTO);
List<ItemPendingHandleDTO> itemPageList(Map<String, Object> params);
/**
* PC端项目驳回列表
@ -161,10 +169,12 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @Date: 2019/9/12 18:21
*/
List<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params);
List<ItemPendingHandleDTO> rejectListEqPc(ItemWorkListFormDTO formDTO);
/**
* 工作端诉求列表
*
* @param formDTO
* @return
*/
@ -180,6 +190,9 @@ public interface ItemDao extends BaseDao<ItemEntity> {
*/
ItemDetailForPCEndResultDTO selectOneOfItemDetailForPCEnd(String itemId);
ItemDetailForPCEndResultDTO getHandlerDeptIdByItemId(String itemId);
/**
* 项目处理进度
*
@ -412,11 +425,11 @@ public interface ItemDao extends BaseDao<ItemEntity> {
List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
* @describe: 北尚诉求列表(不满意列表)
* @author wgf
* @date 2022/10/10 08:39
* @params [dto]
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
*/
List<ItemAppealPageResultDTO> getItemAppealPageUnsatisfactory(Map<String, Object> params);
@ -446,14 +459,15 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @params [params]
*/
List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
List<ItemExaminePageResultDTO> getExaminePageEqPc(ItemExamineWorkListFormDTO formDTO);
/**
* @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity
* @describe: 获取项目的第一个结案申请/吹哨的意见
* @author wangtong
* @date 2022/9/8 19:54
* @params [itemId]
* @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity
*/
ItemHandleProcessEntity selectFirstHandleProcessByItemId(@Param("itemId") String itemId);
@ -476,36 +490,4 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @date 2022/9/19 10:51
*/
List<ItemHandleProcessDTO> listItemHandleDept();
ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
/**
* 类别分析
* @param formDTO
* @return
*/
List<CategoryAnalysisPieResultDTO> categoryAnalysis(ScreenTotalFormDTO formDTO);
/**
* 满意度统计
* @param formDTO
* @return
*/
List<EvaluationTotalPieResultDTO> evaluationTotal(ScreenTotalFormDTO formDTO);
/**
* 满意度趋势-日数据
* @param formDTO
* @return
*/
List<EvaluationTotalLineDetailResultDTO> getEvaluationDataListByDays(ScreenTotalFormDTO formDTO);
/**
* 满意度趋势-月数据
* @param formDTO
* @return
*/
List<EvaluationTotalLineDetailResultDTO> getEvaluationDataListByMonths(ScreenTotalFormDTO formDTO);
List<ItemStatisListPageResultDTO> getItemStatisListPage(Map<String, Object> params);
}

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

@ -110,6 +110,16 @@ public interface ItemService extends BaseService<ItemEntity> {
*/
ItemDTO get(String id);
/**
* 查询类别
*
* @param id
* @return ItemDTO
* @author
* @date
*/
ItemDTO getCategoryInfo(String id);
/**
* 项目详情
*

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

@ -109,7 +109,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@ -131,9 +131,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Autowired
private ItemDeptService itemDeptService;
@Autowired
private AdminFeignClient adminFeignClient;
@Autowired
private ItemHandleProcessService itemHandleProcessService;
@ -176,6 +173,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Autowired
private IssueOverseeResultsTask issueOverseeResultsTask;
@Autowired
private AdminFeignClient adminFeignClient;
@Autowired
private OssFeignClient ossFeignClient;
@ -203,7 +203,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Autowired
private PushToCityGridServiceImpl pushToCityGridServiceImpl;
@Autowired
private ItemEnterpriseService itemEnterpriseService;
@ -443,6 +442,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return ConvertUtils.sourceToTarget(entity, ItemDTO.class);
}
@Override
public ItemDTO getCategoryInfo(String id) {
return baseDao.getCategoryInfo(id);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ItemDTO dto) {
@ -502,11 +506,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
throw new RenException("请用街道账号进行上报");
}
ItemEntity itemEntity = new ItemEntity();
/**
* userID：zfsq+当前账户ID。
* is_party_member:统一填0。
* grid："执法诉求"+街道名称
* grid_ID:街道ID
/*
userID：zfsq+当前账户ID。
is_party_member:统一填0。
grid："执法诉求"+街道名称
grid_ID:街道ID
*/
itemEntity.setUserId("zfsq" + userDetail.getId());
itemEntity.setNickName(formDto.getContactName());
@ -637,9 +641,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
data.setSbrlxfs(entity.getMobile());
data.setSqzynr(entity.getItemContent());
data.setSqdz(entity.getIssueAddress());
Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
double issueLatitude = BigDecimal.valueOf(entity.getIssueLatitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
double issueLongitude = BigDecimal.valueOf(entity.getIssueLongitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
data.setSqxy(issueLatitude + "," + issueLongitude);
data.setSqdjrq(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
//诉求登记人
CityCaseLawenforcementdPersonDTO sqdjr = new CityCaseLawenforcementdPersonDTO();
@ -742,7 +746,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 解析分类全部编码[前端分类复显使用]
if (StringUtils.isNotBlank(resultDTO.getCategoryFullCode())) {
List<GategoryInfoWorkDetailResultDTO> categoryDtos = new ArrayList<GategoryInfoWorkDetailResultDTO>();
List<GategoryInfoWorkDetailResultDTO> categoryDtos = new ArrayList<>();
String categoryFullCode = resultDTO.getCategoryFullCode();
String[] categoryIds = categoryFullCode.split("-");
@ -762,14 +766,23 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
// 处理详情获取存在多条1065的作物数据情况
Long handlerDeptId;
if (resultDTO.getHandlerDeptId() == 0) {
ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
handlerDeptId = byItemId.getHandlerDeptId();
} else {
handlerDeptId = resultDTO.getHandlerDeptId();
}
// 对于存在有操作记录的数据，进行复显字段赋值
if (resultDTO.getHandlerDeptId() != null) {
if (handlerDeptId != null) {
// 根据操作人部门，获取上一级部门ID
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId);
if (sysDeptInfo.success()) {
SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
if ("community_party".equals(sysDeptDTO.getTypeKey())) {
ArrayList<String> list = new ArrayList();
if (sysDeptDTO != null && "community_party".equals(sysDeptDTO.getTypeKey())) {
ArrayList<String> list = new ArrayList<>();
list.add("历史遗留暂不具备解决条件的事项");
list.add("依法应当通过诉讼、仲裁、行政复议解决的事项");
list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项");
@ -786,7 +799,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue());
}
// 拼凑处理人部门数组（社区）
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<DeptInfoWorkDetailResultDTO>();
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<>();
DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO();
deptDto.setDeptId(resultDTO.getHandlerDeptId());
deptDto.setDeptName(sysDeptDTO.getName());
@ -795,7 +808,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
} else {
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue());
// 拼凑处理人部门数组（网格）
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<DeptInfoWorkDetailResultDTO>();
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<>();
DeptInfoWorkDetailResultDTO deptParentDto = new DeptInfoWorkDetailResultDTO();
deptParentDto.setDeptId(sysDeptDTO.getPid());
deptParentDto.setDeptName(sysDeptDTO.getParentName());
@ -807,6 +820,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
resultDTO.setHandlerDepts(handlerDepts);
}
}
}
@ -945,12 +960,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
// 处理详情获取存在多条1065的作物数据情况
Long handlerDeptId;
if (resultDTO.getHandlerDeptId() == 0) {
ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
handlerDeptId = byItemId.getHandlerDeptId();
} else {
handlerDeptId = resultDTO.getHandlerDeptId();
}
// 根据操作人部门，获取上一级部门ID
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId);
if (sysDeptInfo.success()) {
SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
if ("community_party".equals(sysDeptDTO.getTypeKey())) {
ArrayList<String> list = new ArrayList();
if (sysDeptDTO != null && "community_party".equals(sysDeptDTO.getTypeKey())) {
ArrayList<String> list = new ArrayList<>();
list.add("历史遗留暂不具备解决条件的事项");
list.add("依法应当通过诉讼、仲裁、行政复议解决的事项");
list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项");
@ -969,7 +994,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
} else {
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue());
}
}
return resultDTO;
}
@ -1026,19 +1051,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
CompleteDeptDTO completeDeptDTO = completeDept.getData();
// 是否已流转
boolean selected = false;
boolean communitySelected = false;
boolean streetSelected = false;
if (null != itemDeptDTOS && itemDeptDTOS.size() > 0) {
selected = true;
// 判断已流转部门
for (ItemDeptDTO dto : itemDeptDTOS) {
if (dto.getDeptId().equals(completeDeptDTO.getCommunityId())) {
communitySelected = true;
}
if (dto.getDeptId().equals(completeDeptDTO.getStreetId())) {
streetSelected = true;
}
}
}
@ -1294,7 +1313,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
String advice = dto.getAdvice();
// 对包含【h_s】的数据进行重新组装
if (advice.contains("h_s") && advice.contains(" 办理人：")) {
String hsStr = advice.substring(advice.indexOf("h_s"), advice.length());
String hsStr = advice.substring(advice.indexOf("h_s"));
String adviceOld = advice.substring(0, advice.indexOf(" 办理人："));
String adviceNew = adviceOld + hsStr;
dto.setAdvice(adviceNew);
@ -1311,7 +1330,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
try {
Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
log.info("处理项目-deptMessage：" + deptMessage);
String typeKey = "";
String typeKey;
if (0 == deptMessage.getCode()) {
typeKey = deptMessage.getData().toString();
} else {
@ -1365,7 +1384,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
itemCirculationDeptResultDTO.setSelected(false);
itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
deptList.add(itemCirculationDeptResultDTO);
dto.setDeptResultDTOS(deptList);
@ -1437,7 +1456,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
itemCirculationDeptResultDTO.setSelected(false);
itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
deptList.add(itemCirculationDeptResultDTO);
dto.setDeptResultDTOS(deptList);
@ -1574,7 +1593,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 拼接被吹哨部门
String whistlDept = "";
for (int i = 0; i < deptList.size(); i++) {
ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i);
ItemCirculationDeptResultDTO indexDto = deptList.get(i);
if (i == 0) {
whistlDept += indexDto.getDeptName();
} else {
@ -1601,13 +1620,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName());
itemCirculationDeptResultDTO.setSelected(false);
itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey());
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<ItemCirculationDeptResultDTO>();
List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
deptList.add(itemCirculationDeptResultDTO);
// 拼接被吹哨部门
String whistlDept = "";
for (int i = 0; i < deptList.size(); i++) {
ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i);
ItemCirculationDeptResultDTO indexDto = deptList.get(i);
if (i == 0) {
whistlDept += indexDto.getDeptName();
} else {
@ -2114,9 +2133,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
formDto.setContactMode(itemEntity.getMobile());
double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude());
// 坐标X
formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP));
formDto.setCoordX(BigDecimal.valueOf(gps[1]).setScale(15, RoundingMode.HALF_UP));
// 坐标Y
formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP));
formDto.setCoordY(BigDecimal.valueOf(gps[0]).setScale(15, RoundingMode.HALF_UP));
// 监督员编号
formDto.setKeepersn("");
// 操作时间
@ -2250,9 +2269,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude());
log.info("处理项目-gps结束");
//X坐标（经纬度）
sendDto.setXZB(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP));
sendDto.setXZB(BigDecimal.valueOf(gps[1]).setScale(15, RoundingMode.HALF_UP));
//Y坐标（经纬度）
sendDto.setYZB(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP));
sendDto.setYZB(BigDecimal.valueOf(gps[0]).setScale(15, RoundingMode.HALF_UP));
//事件处理进度
List<String> handleImagesList = new ArrayList<>();
log.info("处理项目-获取进度开始");
@ -2463,9 +2482,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
//迁移图片到事件图片中去
log.info("处理项目-迁移图片");
if (null != ipr.getImages() && ipr.getImages().size() > 0) {
for (String image : ipr.getImages()) {
handleImagesList.add(image);
}
handleImagesList.addAll(ipr.getImages());
ipr.setImages(null);
}
i++;
@ -2566,7 +2583,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
notNeedCompressImgUrlList.add(image.getImgUrl());
}
}
if (null != needCompressImgUrlList && needCompressImgUrlList.size() > 0) {
if (needCompressImgUrlList.size() > 0) {
//如果图片大于1M则需要压缩
Result<List<String>> result = ossFeignClient.compressImg(needCompressImgUrlList);
if (!result.success()) {
@ -2713,22 +2730,29 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
QueryWrapper<ItemHandleProcessEntity> wrapper = new QueryWrapper<>();
wrapper.eq("item_id", itemId);
wrapper.eq("created_by", "网格化平台");
wrapper.eq("del_flag", "0");
wrapper.eq("del_flag", NumConstant.ZERO_STR);
wrapper.notIn("state", ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
wrapper.orderByDesc("created_time");
wrapper.last("limit 1");
ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectOne(wrapper);
//22.9.22 end
for (EventProcessResultDto dto :
progressList) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date insertTime = sdf.parse(dto.getCREATEDATE());
for (EventProcessResultDto dto : progressList) {
Date insertTime = DateUtils.parse(dto.getCREATEDATE(), DateUtils.DATE_TIME_PATTERN);
if (null != processEntity) {
Date firstTime = new Date(processEntity.getCreatedTime().getTime() - 55000);
if (null != processEntity && insertTime.compareTo(firstTime) < NumConstant.ONE) {
// 已存数据中最新一条的时间
Date latestTime = new Date(processEntity.getCreatedTime().getTime() - 55000);
// 只处理最新时间之后的数据
assert insertTime != null;
if (insertTime.compareTo(latestTime) < NumConstant.ONE) {
continue;
}
// 驳回和结案的是由网格化直接调取我方接口产生的，所以也不需要再添加了
if (ItemGridPlatformHandleStatusEnum.HANDLE_BH.getName().equals(dto.getTASKCNNAME()) || ItemGridPlatformHandleStatusEnum.HANDLE_JA.getName().equals(dto.getTASKCNNAME())) {
continue;
}
}
// 拉取的记录增加55秒，防止出现排序问题
assert insertTime != null;
insertTime.setTime(insertTime.getTime() + 55000);
String itemHandleProcessId = UUID.randomUUID().toString().replaceAll("-", "");
// 插入项目处理进度表
@ -2811,9 +2835,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (null == dto) {
return;
}
if (ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_CZ.getValue() == dto.getState()) {
if (ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue() == dto.getState()) {
pushToCityGridService.appealDispatch(dto);//2.2 诉求派遣
pushToCityGridService.dispatchAudit(dto);//2.4 派遣审核
} else if (ItemGridPlatformHandleStatusEnum.HANDLE_CZ.getValue() == dto.getState()) {
if ("区中心".equals(dto.getGridNextpartname())) {
// 诉求上报
pushToCityGridService.appealReporting(dto.getId(), NumConstant.ONE_STR);
} else {
pushToCityGridService.appealDispatch(dto);//2.2 诉求派遣
pushToCityGridService.dispatchAudit(dto);//2.4 派遣审核
}
} else if (ItemGridPlatformHandleStatusEnum.HANDLE_TD.getValue() == dto.getState()) {
pushToCityGridService.rebut(dto);//2.8 诉求退件
} else if (ItemGridPlatformHandleStatusEnum.HANDLE_JJTD.getValue() == dto.getState()) {
@ -2879,9 +2911,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
List<Long> deptId = new ArrayList<>();
if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
List<ItemCirculationDeptResultDTO> deptList = dto.getDeptResultDTOS();
for (int i = 0; i < deptList.size(); i++) {
ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i);
deptId.add(indexDto.getDeptId());
for (ItemCirculationDeptResultDTO itemCirculationDeptResultDTO : deptList) {
deptId.add(itemCirculationDeptResultDTO.getDeptId());
}
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, dto.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信
if (dto.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) { //如果是街道做吹哨处理, 做回应处理
@ -2924,7 +2955,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
break;
}
}
if (deptId != null && deptId.size() > 0) {
if (deptId.size() > 0) {
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, dto.getTypeKey());//做回应处理，向部门下的所有人员发送短信
}
}
@ -3237,7 +3268,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
data.setId(entity.getId());
data.setSqbm(entity.getSerialNum());
data.setJjcd(CityPushEnum.JJCD_YB.getCode());
data.setSqly(CityPushEnum.SQLY_WX.getCode());
data.setSqly(CityPushEnum.SQLY_WLFS.getCode());
data.setSqzt(CityPushEnum.SQZT_DPQ.getCode());
data.setDqclhj(CityPushEnum.DQCLHJ_DJ.getCode());
data.setSbqs(CityPushEnum.SBQS_SB.getCode());
@ -3249,18 +3280,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
code = result.getData().getCommunityDisCenterZoningCode();
name = result.getData().getCommunity();
}
/* data.setSqssjg(CityPushEnum.SBQS_SB.getCode());
data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/
data.setSqssjg(code);
data.setSqssjgmc(name);
data.setSbrlxfs(entity.getMobile());
data.setSqzynr(entity.getItemContent());
data.setSqdz(entity.getIssueAddress());
Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
double issueLatitude = BigDecimal.valueOf(entity.getIssueLatitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
double issueLongitude = BigDecimal.valueOf(entity.getIssueLongitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
data.setSqxy(issueLatitude + "," + issueLongitude);
data.setSqdjrq(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
//data.setJzrq();
//诉求登记人
CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO();
sqdjr.setId(entity.getId());
@ -3316,8 +3346,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
code = dtoResult.getData().getDisCenterZoningCode();
name = dtoResult.getData().getName();
}
/*data.setSqssjg(CityPushEnum.SBQS_SB.getCode());
data.setSqssjgmc(CityPushEnum.SBQS_MC.getCode());*/
data.setSqssjg(code);
data.setSqssjgmc(name);
//组装企业数据
@ -3333,9 +3362,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
data.setSbrlxfs(entity.getMobile());
data.setSqzynr(entity.getItemContent());
data.setSqdz(entity.getIssueAddress());
Double issueLatitude = new BigDecimal(entity.getIssueLatitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
Double issueLongitude = new BigDecimal(entity.getIssueLongitude()).setScale(6, BigDecimal.ROUND_HALF_UP).doubleValue();
data.setSqxy(issueLatitude.toString() + "," + issueLongitude.toString());
double issueLatitude = BigDecimal.valueOf(entity.getIssueLatitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
double issueLongitude = BigDecimal.valueOf(entity.getIssueLongitude()).setScale(6, RoundingMode.HALF_UP).doubleValue();
data.setSqxy(issueLatitude + "," + issueLongitude);
data.setSqdjrq(DateUtils.format(entity.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
//诉求登记人
CityCaseDevelopPersonDTO sqdjr = new CityCaseDevelopPersonDTO();
@ -3344,7 +3373,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
sqdjr.setSsbm(entity.getGrid());
sqdjr.setSsbmbm(entity.getGridId().toString());
sqdjr.setSsjg(name);
/* sqdjr.setSsjgbm(getJgbm(entity.getGridId()));*/
sqdjr.setSsjgbm(code);
data.setSqdjr(sqdjr);
List<ImgEntity> imageList = imgDao.selectListByRefeId(entity.getEventId() == null ? entity.getId() : entity.getEventId());

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

@ -20,7 +20,6 @@ package com.elink.esua.epdc.modules.item.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.R;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum;
@ -35,6 +34,7 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
@ -212,12 +212,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
*/
@Override
public Result caseClosedSentoCity(String id) {
String isPartyMember = id; // ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue();
ItemHandleProcessCaseClosedToCityDTO item = itemHandleProcessDao.getHandler(isPartyMember);
ItemHandleProcessCaseClosedToCityDTO item = itemHandleProcessDao.getHandler(id);
// 组装数据
// for (ItemHandleProcessCaseClosedToCityDTO item: itemProcessDto) {
PushToCityGridCaseClosedDTO data = new PushToCityGridCaseClosedDTO();
// 诉求id
@ -229,7 +226,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 处置结果
data.setCzjg(NumConstant.ONE_STR);
// 结案时间
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
data.setCzsj(DateUtils.format(DateUtils.addDateSeconds(item.getCreatedTime(), 30), DateUtils.DATE_TIME_PATTERN));
// 操作人
PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO();
@ -242,7 +239,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 所属机构
czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR));
//所属部门id
czr.setSsbmbm(item.getGridUnitid());;
czr.setSsbmbm(item.getGridUnitid());
;
// 所属部门名称
czr.setSsbm(item.getGridUnitname());
@ -250,12 +248,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setCzr(czr);
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(ItemHandleProcessDTO processDTO) {
if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
@ -331,8 +327,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
*/
@Override
public Result dispatchAudit(ItemHandleProcessDTO formDTO) {
/*String state = "1001";
List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getDispatchAudit(state);*/
/*String state = "1001";*/
List<ItemHandleProcessDTO> list = new ArrayList<>();
if (null != formDTO && StringUtils.isNotBlank(formDTO.getItemId())) {
@ -447,8 +442,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
// 处理数据
// for(ItemHandleProcessToCityResultDTO item : list) {
AppealReportResultDTO data = new AppealReportResultDTO();
// 诉求id
@ -515,7 +508,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.APPEAL_REPORT, "诉求上报");
saveLog(item.getItemId(), item.getId(), "诉求上报", PushToCityGridConstant.APPEAL_REPORT, JSONObject.toJSONString(data), result);
// }
return new Result();
}
@ -537,8 +529,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
}
// 处理数据
// for(ItemHandleProcessToCityResultDTO item : list) {
ReportRejectionResultDTO data = new ReportRejectionResultDTO();
// 诉求id
@ -565,7 +555,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
// 所属机构名称
dto.setSsjg(item.getGridUnitname());
// 所属部门id
dto.setSsbmbm(item.getGridUnitid());;
dto.setSsbmbm(item.getGridUnitid());
;
// 所属部门名称
dto.setSsbm(item.getGridUnitname());
@ -574,7 +565,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.REPORT_REBUT, "上报驳回");
saveLog(item.getItemId(), item.getId(), "上报驳回", PushToCityGridConstant.REPORT_REBUT, JSONObject.toJSONString(data), result);
// }
return new Result();
}
@ -589,9 +579,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
@Override
public Result appealHandling(ItemHandleProcessDTO processDTO) {
String id = processDTO.getId();
String itemId = processDTO.getItemId();
AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());
if (null == item) {
ItemDTO itemDTO = itemService.getCategoryInfo(itemId);
if (null == item || itemDTO == null) {
log.error("流程节点不存在");
return new Result();
}
@ -607,8 +598,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setCzbs(getItemCzbs(item.getGridCantoncode()));
// 执法类型添加类型，纪要，进度字段
if (item.getPeopleFlag().equals(NumConstant.TWO_STR)) {
// 诉求类型（未知）
data.setSqlx(NumConstant.TWO_STR);
//办理进度 诉求分类是执法的时候
//获取taskID
LambdaQueryWrapper<ItemGridPlatformEntity> wrapper = new LambdaQueryWrapper<>();
@ -655,6 +644,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
//办理进度
data.setClfj(clfjList);
}
// 处理类型
data.setSqlx(itemDTO.getCategoryCodeOrigin());
// 处理时间
data.setCzsj(DateUtils.format(item.getCreatedTime(), DateUtils.DATE_TIME_PATTERN));
// 处理内容
@ -668,10 +659,18 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
data.setClzp(url.replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter));
// 操作人
AppealHandlingResultDTO.CzrDTO dto = new AppealHandlingResultDTO.CzrDTO();
if ("网格化平台".equals(item.getCreatedBy())) {
// 操作人姓名
dto.setXm(item.getGridPartyname());
// 操作人员唯一标识
dto.setId(item.getGridPartyid());
} else {
// 操作人姓名
dto.setXm(null == SecurityUser.getUser() ? "" : SecurityUser.getUser().getUsername());
// 操作人员唯一标识
dto.setId(item.getCreatedBy());
}
// 所属机构id
dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
// 所属机构名称
@ -1229,6 +1228,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
/**
* 获取机构编码
*
* @Param type 0返回编码，1返回名字
* @Param deptId
* @Return {@link String}
@ -1254,6 +1254,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
/**
* 获取项目节点数据操作人对应的处置标识
*
* @param code
* @return
*/

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

@ -2,6 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.modules.item.dao.ItemDao">
<select id="getCategoryInfo" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
SELECT
i.*,
c.category_code AS categoryCodeOrigin
FROM
epdc_item i
LEFT JOIN epdc_category c ON i.CATEGORY_CODE = c.id
WHERE
i.DEL_FLAG = '0'
AND i.id = #{id}
</select>
<select id="selectOneItemByIssueId" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
SELECT * FROM epdc_item WHERE DEL_FLAG = '0' AND ISSUE_ID = #{issueId}
</select>
@ -1060,6 +1073,17 @@
item.DEL_FLAG = '0'
AND item.ID = #{itemId}
</select>
<select id="getHandlerDeptIdByItemId" resultType="com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO">
SELECT
ID,
HANDLER_DEPT_ID
FROM epdc_item_handle_process
where DEL_FLAG = '0'
and HANDLER_DEPT != '网格化平台'
and ITEM_ID = #{itemId}
order by CREATED_TIME desc
LIMIT 1
</select>
<select id="selectOneOfItemDetailForWork" resultMap="itemDetailMap">
SELECT
item.ID,

Write Preview
Loading…
Cancel
Save