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

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

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
feature/dangjian
wanggongfeng 3 years ago
parent
668d408afc 54f03d5328
commit
1cfee7153e
5 changed files with 93 additions and 85 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-cloud-commons-shibei
  2. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java
  3. 1
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  4. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
  5. 165
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

2
esua-epdc/epdc-cloud-commons-shibei

@ -1 +1 @@
Subproject commit 4341e4f121499ecdf86612dbd4b085f95f07ec13
Subproject commit 37affad8391aab6f2e07237cfd03ce4f6278c65d

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

@ -222,4 +222,9 @@ public class ItemDTO implements Serializable {
*/
private String categoryFullName;
/**
* 流水号
*/
private String serialNum;
}

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

@ -343,6 +343,7 @@ public class ItemController {
*/
@PostMapping("examineCase")
public Result examineCase(@RequestBody ExamineCaseFormDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return itemService.examineCase(formDto);
}
}

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

@ -235,4 +235,9 @@ public class ItemEntity extends BaseEpdcEntity {
*/
private String contactName;
/**
* 流水号
*/
private String serialNum;
}

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

@ -213,15 +213,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
//部门ID列表
List<Long> deptIdList = new ArrayList<>();
// 判断是否为社区网格，不为社区网格只能查看本部门下的项目数据
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) {
// 判断是否为网格，不为网格只能查看本部门下的项目数据
if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) {
deptIdList = user.getDeptIdList();
} else {
deptIdList.add(user.getDeptId());
}
if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){
params.put("isRemind", "isRemind");
}
params.put("deptIdList", null);
if (null != deptIdList && deptIdList.size() > 0) {
params.put("deptIdList", deptIdList);
@ -310,8 +307,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (null == userDetail) {
throw new RuntimeException("获取用户信息失败");
}
if(!(StringUtils.isNotBlank(userDetail.getTypeKey())
&& OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))){
if (!(StringUtils.isNotBlank(userDetail.getTypeKey())
&& OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) {
throw new RuntimeException("请用街道账号进行上报");
}
ItemEntity itemEntity = new ItemEntity();
@ -321,12 +318,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* grid："执法诉求"+街道名称
* grid_ID:街道ID
*/
itemEntity.setUserId("zfsq"+userDetail.getId());
itemEntity.setUserId("zfsq" + userDetail.getId());
itemEntity.setNickName(userDetail.getUsername());
itemEntity.setIsPartyMember(YesOrNoEnum.NO.value());
itemEntity.setMobile(userDetail.getMobile());
itemEntity.setDistributeTime(new Date());
itemEntity.setGrid("执法诉求"+userDetail.getDeptName());
itemEntity.setGrid("执法诉求" + userDetail.getDeptName());
itemEntity.setGridId(userDetail.getDeptId());
itemEntity.setItemContent(formDto.getLawContent());
itemEntity.setItemVoice(formDto.getItemVoice());
@ -342,6 +339,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
itemEntity.setItemCode("PT" + System.currentTimeMillis());//项目编号
itemEntity.setIsPeople("1");//诉求上报
itemEntity.setPeopleFlag("2");//执法诉求
// 流水号
itemEntity.setSerialNum(getSerialNum("ZF"));
baseDao.insert(itemEntity);
//插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(itemEntity);
@ -350,22 +349,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
//保存到执法诉求详情表
formDto.setItemId(itemEntity.getId());
itemLawService.saveLawDetail(formDto);
// 插入项目处理流程表
ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity();
itemHandleProcessEntity.setItemId(itemEntity.getId());
itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
itemHandleProcessEntity.setHandleAdvice("执法诉求上报");
itemHandleProcessEntity.setOutHandleAdvice("执法诉求上报");
itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId());
itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid());
itemHandleProcessService.insert(itemHandleProcessEntity);
//todo bssb上报网格化平台
//发送事件至区中心
ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO();
dto.setId(formDto.getItemId());
dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice());
dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
sendItemToDsf(dto,itemHandleProcessEntity);
return new Result();
}
@ -381,14 +365,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
@Override
public Result addQuestionInfo(AddQuestionCollectionFormDTO formDto) {
logger.info("进入关联项目添加："+formDto);
UserDetail user = formDto.getUserInfo();
logger.info("进入关联项目添加：" + formDto);
UserDetail user = formDto.getUserInfo();
Result<ParentAndAllDeptDTO> deptDTO = adminFeignClient.getParentAndAllDept(user.getDeptId());
if(null == deptDTO.getData()){
if (null == deptDTO.getData()) {
throw new RenException("未查到用户相关部门信息。");
}
ParentAndAllDeptDTO deptMsg = deptDTO.getData();
logger.info("获取完部门数据："+deptMsg);
logger.info("获取完部门数据：" + deptMsg);
ItemEntity entity = new ItemEntity();
entity.setUserId(user.getId().toString());
entity.setNickName(user.getUsername());
@ -411,7 +395,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
entity.setIssueLongitude(formDto.getLongitude());
entity.setIssueLatitude(formDto.getLatitude());
baseDao.insert(entity);
logger.info("成功插入关联项目："+entity);
logger.info("成功插入关联项目：" + entity);
return new Result().ok(entity.getId());
}
@ -456,8 +440,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
//内容审核
Boolean isConReview = evaluationFormDTO.getIsConReview();
String mobile = null;
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId());
if(null != user.getData()){
Result<UserDTO> user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId());
if (null != user.getData()) {
mobile = user.getData().getMobile();
}
// 获取所有上级机构名称和ID拼接
@ -468,11 +452,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
evaluationFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult,
null,null,mobile,"0",deptDto);
contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message);
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one,
ModuleName.ITEM_SATISFACTION.getCode(), textList, null, null, contentResult,
null, null, mobile, "0", deptDto);
contentSecurityFeign.insertViolationsRecord(record);
return new Result().error(CheckDataUtils.violations_code, CheckDataUtils.violations_message);
}
ItemEntity itemEntity = new ItemEntity();
@ -483,27 +467,27 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
baseDao.updateById(itemEntity);
//接口异常，保存至待审核信息
if(contentResult == null && !isConReview) {
if (contentResult == null && !isConReview) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
null, itemEntity.getId(),null,null, null,mobile,"1",deptDto);
contentSecurityFeign.insertRecords(record);
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
null, itemEntity.getId(), null, null, null, mobile, "1", deptDto);
contentSecurityFeign.insertRecords(record);
}
//判断是否为待审核
if(contentResult != null) {
if (contentResult != null) {
CheckResultMessageDTO twoTypes = null;
if(isConReview){
if (isConReview) {
twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null);
}else{
} else {
twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
}
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
//组装要保存的信息
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto);
contentSecurityFeign.insertRecords(record);
null, itemEntity.getId(), null, null, twoTypes, mobile, "0", deptDto);
contentSecurityFeign.insertRecords(record);
}
}
return new Result();
@ -543,9 +527,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
List<ItemDeptDTO> itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId());
Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId());
String typeKey = "";
if( 0 == deptMessage.getCode()){
if (0 == deptMessage.getCode()) {
typeKey = deptMessage.getData().toString();
}else{
} else {
throw new RenException(deptMessage.getMsg());
}
// 获取可操作处理和可流转部门
@ -572,7 +556,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* @Author: liuchuang
* @Date: 2019/9/16 13:40
*/
private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, List<ItemDeptDTO> itemDeptDTOS,Long deptId) {
private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, List<ItemDeptDTO> itemDeptDTOS, Long deptId) {
// 可流转部门
Result<CompleteDeptDTO> completeDept = adminFeignClient.getCompleteDept(deptId);
if (!completeDept.success()) {
@ -697,9 +681,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
public Result<List<ItemCirculationDeptResultDTO>> whistlingDept(EventDeptFormDTO formDto) {
Result deptMessage = adminFeignClient.getDeptTypeKey(formDto.getDeptId());
String typeKey = "";
if( 0 == deptMessage.getCode()){
if (0 == deptMessage.getCode()) {
typeKey = deptMessage.getData().toString();
}else{
} else {
throw new RenException(deptMessage.getMsg());
}
List<ItemCirculationDeptResultDTO> deptResultDTOS = new ArrayList<>();
@ -755,7 +739,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* @Date: 2019/9/16 16:17
*/
private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfStreet(ItemDetailForPCEndResultDTO resultDTO,
List<ItemDeptDTO> itemDeptDTOS,Long deptId) {
List<ItemDeptDTO> itemDeptDTOS, Long deptId) {
// 可流转部门
Result<List<SysDeptDTO>> listResult = adminFeignClient.listOfItemCirculationDept(deptId);
if (!listResult.success()) {
@ -835,9 +819,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) {
try {
Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
log.info("处理项目-deptMessage："+deptMessage);
log.info("处理项目-deptMessage：" + deptMessage);
String typeKey = "";
if( 0 == deptMessage.getCode()){
if (0 == deptMessage.getCode()) {
typeKey = deptMessage.getData().toString();
}else{
throw new RenException(deptMessage.getMsg());
@ -2150,6 +2134,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
*
* 组织机构信息处理
*
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
* @params [dto, eventsList]
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
* @author liuchuang
@ -2265,39 +2250,22 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
entity.setFirstCategoryCode("13");
entity.setItemCode("PT" + System.currentTimeMillis());//项目编号
entity.setIsPeople("1");//诉求上报
if (NumConstant.ZERO_STR.equals(formDto.getPeopleFlag())) {
entity.setSerialNum(getSerialNum("MS"));
} else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
entity.setSerialNum(getSerialNum("FZ"));
}
baseDao.insert(entity);
//插入项目部门关联表
itemDeptService.savePeopleSubmitInfo(entity);
// 保存图片
imgService.saveImages(formDto.getImages(), entity.getId(), ImageConstant.TYPE_IMAGE_BIZ_ITEMS);
// 插入项目处理流程表
ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity();
itemHandleProcessEntity.setItemId(entity.getId());
itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
if("0".equals(formDto.getPeopleFlag())){
itemHandleProcessEntity.setHandleAdvice("民生诉求上报");
itemHandleProcessEntity.setOutHandleAdvice("民生诉求上报");
}else{
itemHandleProcessEntity.setHandleAdvice("发展诉求上报");
itemHandleProcessEntity.setOutHandleAdvice("发展诉求上报");
}
itemHandleProcessEntity.setHandlerDeptId(entity.getGridId());
itemHandleProcessEntity.setHandlerDept(entity.getGrid());
itemHandleProcessService.insert(itemHandleProcessEntity);
//发送事件至区中心
if("1".equals(formDto.getPeopleFlag())){
ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO();
dto.setId(entity.getId());
dto.setOutHandleAdvice(itemHandleProcessEntity.getOutHandleAdvice());
dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue());
sendItemToDsf(dto,itemHandleProcessEntity);
}
return new Result();
}
/**
*
* @param params
* @return
*/
@ -2338,11 +2306,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
/**
*
* 分类信息处理
*
* @params [dto, eventsList]
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.ItemEntity>
* @params [dto, eventsList]
* @author liuchuang
* @since 2020/3/7 17:00
*/
@ -2421,6 +2388,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
ItemHandleProcessEntity process = new ItemHandleProcessEntity();
process.setItemId(formDto.getItemId());
process.setOutHandleAdvice(formDto.getOutHandleAdvice());
process.setHandleAdvice(formDto.getOutHandleAdvice());
process.setHandlerDept(user.getDeptName());
process.setHandlerDeptId(user.getDeptId());
if("0".equals(formDto.getCheckFlag())){
@ -2446,12 +2414,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
/**
* @describe: 上报项目至网格化平台并保存记录
* @author wangtong
* @date 2022/9/5 14:37
* @params [dto]
* @return void
*/
* @return void
* @describe: 上报项目至网格化平台并保存记录
* @author wangtong
* @date 2022/9/5 14:37
* @params [dto]
*/
@Transactional(rollbackFor = Exception.class)
public void sendItemToDsf(ItemHandleSubmitFormDTO dto,ItemHandleProcessEntity process){
boolean reportFlag = this.checkReport(dto.getId());
@ -2472,4 +2440,33 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
this.saveItemGridPlatformInfo(sendResult, process);
}
/**
* 流水号
*
* @param
* @return java.lang.String
* @author zhy
* @date 2022/9/5 18:17
*/
private String getSerialNum(String prefix) {
String serialNum = prefix;
String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME_HOUR);
serialNum = serialNum + dateStr;
String key = RedisKeys.getSerialNumKey(serialNum);
Object obj = redisUtils.get(key);
if (null != obj) {
int number = (int) obj;
number = number + 1;
String numStr = String.format("%03d", number);
redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE);
return serialNum + numStr;
}
int number = 1;
String numStr = "001";
redisUtils.set(key, number, RedisUtils.DEFAULT_EXPIRE);
return serialNum + numStr;
}
}

Write Preview
Loading…
Cancel
Save