|
|
|
@ -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,49 +766,60 @@ 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()); |
|
|
|
SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); |
|
|
|
if ("community_party".equals(sysDeptDTO.getTypeKey())) { |
|
|
|
ArrayList<String> list = new ArrayList(); |
|
|
|
list.add("历史遗留暂不具备解决条件的事项"); |
|
|
|
list.add("依法应当通过诉讼、仲裁、行政复议解决的事项"); |
|
|
|
list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项"); |
|
|
|
list.add("属于军队职责范围的事项"); |
|
|
|
list.add("涉及国家机密、商业秘密、个人隐私的事项"); |
|
|
|
list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项"); |
|
|
|
list.add("依法应当通过110、119、120等紧急服务专线处理的事项"); |
|
|
|
list.add("涉及党组织、党员、监察对象的检举、控告和申诉，建议您到市北区纪委监委信访室（延吉路80号）反映问题，举报电话：12388"); |
|
|
|
list.add("不在市北区管辖范围的事项"); |
|
|
|
list.add("其他不予受理的事项"); |
|
|
|
if (list.contains(resultDTO.getHandleAdvice())) { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue()); |
|
|
|
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId); |
|
|
|
if (sysDeptInfo.success()) { |
|
|
|
SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); |
|
|
|
if (sysDeptDTO != null && "community_party".equals(sysDeptDTO.getTypeKey())) { |
|
|
|
ArrayList<String> list = new ArrayList<>(); |
|
|
|
list.add("历史遗留暂不具备解决条件的事项"); |
|
|
|
list.add("依法应当通过诉讼、仲裁、行政复议解决的事项"); |
|
|
|
list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项"); |
|
|
|
list.add("属于军队职责范围的事项"); |
|
|
|
list.add("涉及国家机密、商业秘密、个人隐私的事项"); |
|
|
|
list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项"); |
|
|
|
list.add("依法应当通过110、119、120等紧急服务专线处理的事项"); |
|
|
|
list.add("涉及党组织、党员、监察对象的检举、控告和申诉，建议您到市北区纪委监委信访室（延吉路80号）反映问题，举报电话：12388"); |
|
|
|
list.add("不在市北区管辖范围的事项"); |
|
|
|
list.add("其他不予受理的事项"); |
|
|
|
if (list.contains(resultDTO.getHandleAdvice())) { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue()); |
|
|
|
} else { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue()); |
|
|
|
} |
|
|
|
// 拼凑处理人部门数组（社区）
|
|
|
|
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<>(); |
|
|
|
DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO(); |
|
|
|
deptDto.setDeptId(resultDTO.getHandlerDeptId()); |
|
|
|
deptDto.setDeptName(sysDeptDTO.getName()); |
|
|
|
handlerDepts.add(deptDto); |
|
|
|
resultDTO.setHandlerDepts(handlerDepts); |
|
|
|
} else { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue()); |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); |
|
|
|
// 拼凑处理人部门数组（网格）
|
|
|
|
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<>(); |
|
|
|
DeptInfoWorkDetailResultDTO deptParentDto = new DeptInfoWorkDetailResultDTO(); |
|
|
|
deptParentDto.setDeptId(sysDeptDTO.getPid()); |
|
|
|
deptParentDto.setDeptName(sysDeptDTO.getParentName()); |
|
|
|
handlerDepts.add(deptParentDto); |
|
|
|
DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO(); |
|
|
|
deptDto.setDeptId(resultDTO.getHandlerDeptId()); |
|
|
|
deptDto.setDeptName(sysDeptDTO.getName()); |
|
|
|
handlerDepts.add(deptDto); |
|
|
|
resultDTO.setHandlerDepts(handlerDepts); |
|
|
|
} |
|
|
|
// 拼凑处理人部门数组（社区）
|
|
|
|
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<DeptInfoWorkDetailResultDTO>(); |
|
|
|
DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO(); |
|
|
|
deptDto.setDeptId(resultDTO.getHandlerDeptId()); |
|
|
|
deptDto.setDeptName(sysDeptDTO.getName()); |
|
|
|
handlerDepts.add(deptDto); |
|
|
|
resultDTO.setHandlerDepts(handlerDepts); |
|
|
|
} else { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); |
|
|
|
// 拼凑处理人部门数组（网格）
|
|
|
|
List<DeptInfoWorkDetailResultDTO> handlerDepts = new ArrayList<DeptInfoWorkDetailResultDTO>(); |
|
|
|
DeptInfoWorkDetailResultDTO deptParentDto = new DeptInfoWorkDetailResultDTO(); |
|
|
|
deptParentDto.setDeptId(sysDeptDTO.getPid()); |
|
|
|
deptParentDto.setDeptName(sysDeptDTO.getParentName()); |
|
|
|
handlerDepts.add(deptParentDto); |
|
|
|
DeptInfoWorkDetailResultDTO deptDto = new DeptInfoWorkDetailResultDTO(); |
|
|
|
deptDto.setDeptId(resultDTO.getHandlerDeptId()); |
|
|
|
deptDto.setDeptName(sysDeptDTO.getName()); |
|
|
|
handlerDepts.add(deptDto); |
|
|
|
resultDTO.setHandlerDepts(handlerDepts); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -945,31 +960,41 @@ 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()); |
|
|
|
SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); |
|
|
|
if ("community_party".equals(sysDeptDTO.getTypeKey())) { |
|
|
|
ArrayList<String> list = new ArrayList(); |
|
|
|
list.add("历史遗留暂不具备解决条件的事项"); |
|
|
|
list.add("依法应当通过诉讼、仲裁、行政复议解决的事项"); |
|
|
|
list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项"); |
|
|
|
list.add("属于军队职责范围的事项"); |
|
|
|
list.add("涉及国家机密、商业秘密、个人隐私的事项"); |
|
|
|
list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项"); |
|
|
|
list.add("依法应当通过110、119、120等紧急服务专线处理的事项"); |
|
|
|
list.add("涉及党组织、党员、监察对象的检举、控告和申诉，建议您到市北区纪委监委信访室（延吉路80号）反映问题，举报电话：12388"); |
|
|
|
list.add("不在市北区管辖范围的事项"); |
|
|
|
list.add("其他不予受理的事项"); |
|
|
|
if (list.contains(resultDTO.getHandleAdvice())) { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue()); |
|
|
|
Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId); |
|
|
|
if (sysDeptInfo.success()) { |
|
|
|
SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); |
|
|
|
|
|
|
|
if (sysDeptDTO != null && "community_party".equals(sysDeptDTO.getTypeKey())) { |
|
|
|
ArrayList<String> list = new ArrayList<>(); |
|
|
|
list.add("历史遗留暂不具备解决条件的事项"); |
|
|
|
list.add("依法应当通过诉讼、仲裁、行政复议解决的事项"); |
|
|
|
list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项"); |
|
|
|
list.add("属于军队职责范围的事项"); |
|
|
|
list.add("涉及国家机密、商业秘密、个人隐私的事项"); |
|
|
|
list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项"); |
|
|
|
list.add("依法应当通过110、119、120等紧急服务专线处理的事项"); |
|
|
|
list.add("涉及党组织、党员、监察对象的检举、控告和申诉，建议您到市北区纪委监委信访室（延吉路80号）反映问题，举报电话：12388"); |
|
|
|
list.add("不在市北区管辖范围的事项"); |
|
|
|
list.add("其他不予受理的事项"); |
|
|
|
if (list.contains(resultDTO.getHandleAdvice())) { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue()); |
|
|
|
} else { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue()); |
|
|
|
} |
|
|
|
} else { |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue()); |
|
|
|
resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); |
|
|
|
} |
|
|
|
} 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(""); |
|
|
|
// 操作时间
|
|
|
|
@ -2202,7 +2221,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem |
|
|
|
} |
|
|
|
//备注
|
|
|
|
log.info("上报网格化平台dto：" + dto); |
|
|
|
sendDto.setBZXX(dto.getHandleAdvice()+" 诉求编码：" + itemEntity.getSerialNum()); |
|
|
|
sendDto.setBZXX(dto.getHandleAdvice() + " 诉求编码：" + itemEntity.getSerialNum()); |
|
|
|
if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) { |
|
|
|
sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark() + "\n诉求编码：" + itemEntity.getSerialNum()); |
|
|
|
} |
|
|
|
@ -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()); |
|
|
|
|
zhangyuan
3 years ago