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

市北推送

master
lichao 2 years ago
parent
7877c2d717
commit
a5b035c186
4 changed files with 83 additions and 3 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. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  3. 71
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  4. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

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

@ -808,5 +808,10 @@ public class ItemController {
public Result niceItem(){
return itemService.pushToCityAgain();
}
@PostMapping("gov/pushToCityAgainDan")
public Result pushToCityAgainDan(){
return itemService.pushToCityAgainDan();
}
}

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

@ -846,4 +846,6 @@ public interface ItemService extends BaseService<ItemEntity> {
Result<List<ItemToEpmetDTO>> getItemList(Map<String, Object> params);
Result pushToCityAgain();
Result pushToCityAgainDan();
}

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

@ -6222,6 +6222,74 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return new Result<List<ItemToEpmetDTO>>().ok(itemToEpmetList);
}
@Override
public Result pushToCityAgainDan() {
List<ItemEntity> 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<CompleteDeptDTO> 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<ImgEntity> wrapper = new QueryWrapper<>();
wrapper.eq("REFERENCE_ID", entity.getEventId() == null ? entity.getId() : entity.getEventId());
List<ImgEntity> 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<ItemDao, ItemEntity> implem
// .orderByAsc(ItemEntity::getCreatedTime).last("limit 100")
// List<ItemEntity> itemList = baseDao.selectList(itemEntityLambdaQueryWrapper);
List<ItemEntity> itemList = baseDao.getNoSqidList();
// List<ItemEntity> itemList = baseDao.getNoSqidList();
List<ItemEntity> itemList = new ArrayList<>();
/* LambdaQueryWrapper<ItemEntity> itemEntityLambdaQueryWrapper = new LambdaQueryWrapper<ItemEntity>()
.isNull(ItemEntity::getSqid).eq(ItemEntity::getPeopleFlag,0).ne(ItemEntity::getAppealSource,0)
.eq(ItemEntity::getId,"52ba27c1cfc04827d4efd4d487fb312c");

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

@ -3570,7 +3570,7 @@
</select>
<select id="getNoSqidList" resultType="com.elink.esua.epdc.modules.item.entity.ItemEntity">
select * from
/*select * from
epdc_item
where id in
(select item.id from epdc_item item
@ -3580,8 +3580,12 @@
and item.PEOPLE_FLAG = 0
and item.appeal_source !=0
and item.CREATED_TIME >= '2023-11-01 00:00:00'
and item.CREATED_TIME &lt;= '2024-01-01 00:00:00'
and process.STATE = '11'
and process.ID is not null
)
)*/
select * from
epdc_item
where SERIAL_NUM = 'MS370203026021-20231229-00013'
</select>
</mapper>

Write Preview
Loading…
Cancel
Save