diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 6924b7cd6..ee9c7af7d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -808,5 +808,10 @@ public class ItemController { public Result niceItem(){ return itemService.pushToCityAgain(); } + + @PostMapping("gov/pushToCityAgainDan") + public Result pushToCityAgainDan(){ + return itemService.pushToCityAgainDan(); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 55058a4d5..fbbd500b4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -846,4 +846,6 @@ public interface ItemService extends BaseService { Result> getItemList(Map params); Result pushToCityAgain(); + + Result pushToCityAgainDan(); } 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 b8d0d3e27..a807b729f 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 @@ -6222,6 +6222,74 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result>().ok(itemToEpmetList); } + @Override + public Result pushToCityAgainDan() { + + List itemList = baseDao.getNoSqidList(); + itemList.forEach(entity -> { + if (entity.getSqid() == null){ + // todo 第一步 诉求登记 + CityCaseLivelihoodDTO data = new CityCaseLivelihoodDTO(); + data.setSqly(CityPushEnum.SQLY_WLFS.getCode()); + data.setSqbm(entity.getSerialNum()); + data.setJjcd(CityPushEnum.JJCD_YB.getCode()); + data.setSqzt(CityPushLinkEnum.DJ.getCode()); + data.setDqclhj(CityPushLinkEnum.SQCL.getCode()); + data.setSbqs(CityPushEnum.SBQS_SB.getCode()); + //民生诉求所属网格对应的所属社区的市中心编码 + String code = ""; + String name = ""; + Result resultOne = adminFeignClient.getCompleteDept(entity.getGridId()); + if (resultOne.success()) { + code = resultOne.getData().getCommunityDisCenterZoningCode(); + name = resultOne.getData().getCommunity(); + } + + data.setSqssjg(code); + data.setSqssjgmc(name); + data.setSbrlxfs(entity.getMobile()); + data.setSqzynr(entity.getItemContent()); + data.setSqdz(entity.getIssueAddress()); + 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)); + //诉求登记人 + CityCaseLivelihoodPersonDTO sqdjr = new CityCaseLivelihoodPersonDTO(); + sqdjr.setId(entity.getId()); + sqdjr.setXm(entity.getContactName()); + sqdjr.setSsbm(entity.getGrid()); + sqdjr.setSsbmbm(getJgbm(entity.getGridId())); + sqdjr.setSsjg(name); + sqdjr.setSsjgbm(code); + data.setSqdjr(sqdjr); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("REFERENCE_ID", entity.getEventId() == null ? entity.getId() : entity.getEventId()); + List imageList = imgDao.selectList(wrapper); + //诉求照片 + StringBuffer sqzp = new StringBuffer(); + imageList.forEach(img -> { + sqzp.append(img.getImgUrl().replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter)).append(","); + }); + if (StringUtils.isNotBlank(sqzp)) { + data.setSqzp(sqzp.substring(0, sqzp.length() - 1)); + } + data.setSbsm(""); + data.setCzbs("01"); + //发送到市平台 + String resultString = cityGridApi.sendItemToCity(data, PushToCityGridConstant.CASE_LIVELIHOOD, "民生诉求"); + //保存sqid + JSONObject shop_user = JSON.parseObject(resultString); + String sqid = JSON.parseObject(shop_user.getString("data")).getString("sqid"); + entity.setSqid(sqid); + updateById(entity); + //保存日志 + pushToCityGridServiceImpl.saveLog(entity.getId(), null, "诉求登记-民生-2", PushToCityGridConstant.CASE_LIVELIHOOD, JSONObject.toJSONString(data), resultString); + } + }); + return new Result(); + } + @Override public Result pushToCityAgain() { @@ -6234,7 +6302,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem // .orderByAsc(ItemEntity::getCreatedTime).last("limit 100") // List itemList = baseDao.selectList(itemEntityLambdaQueryWrapper); - List itemList = baseDao.getNoSqidList(); +// List itemList = baseDao.getNoSqidList(); + List itemList = new ArrayList<>(); /* LambdaQueryWrapper itemEntityLambdaQueryWrapper = new LambdaQueryWrapper() .isNull(ItemEntity::getSqid).eq(ItemEntity::getPeopleFlag,0).ne(ItemEntity::getAppealSource,0) .eq(ItemEntity::getId,"52ba27c1cfc04827d4efd4d487fb312c"); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 1886e7b5f..b58b5723e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -3570,7 +3570,7 @@