From c1cb1198cd331fa949fc10fb7bd5c7093f47e61b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sun, 18 Feb 2024 17:20:13 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java | 82 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
index 345191f..b417634 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceCheckServiceImpl.java
@@ -16,16 +16,20 @@
*/
package org.springblade.modules.place.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xxl.job.core.util.FileUtil;
+import org.apache.logging.log4j.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.place.dto.PlaceCheckDTO;
@@ -34,6 +38,9 @@
import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.mapper.PlaceCheckMapper;
import org.springblade.modules.place.service.IPlaceCheckService;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.service.ITaskService;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
@@ -41,8 +48,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* 场所检查表 服务实现类
@@ -57,7 +66,29 @@
@Override
public IPage<PlaceCheckVO> selectPlaceCheckPage(IPage<PlaceCheckVO> page, PlaceCheckVO placeCheck) {
- List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page, placeCheck);
+ String roleName = SpringUtils.getRequestParam("roleName");
+ String communityCode = SpringUtils.getRequestParam("communityCode");
+ if (!Strings.isBlank(communityCode)){
+ // 校验社区编号是否合规
+ if(null!=SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+ placeCheck.setCommunityCode(communityCode);
+ }
+ }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ // 网格编号集合
+ List<String> gridCodeList = new ArrayList<>();
+ // 民警角色
+ if (!Strings.isBlank(roleName)){
+ placeCheck.setRoleName(roleName);
+ if(roleName.equals("mj")) {
+ regionChildCodesList = SpringUtil.getBean(IPoliceAffairsGridService.class).getCommunityCodeListByUserId(AuthUtil.getUserId());
+ }
+ if (roleName.equals("wgy")) {
+ gridCodeList = SpringUtil.getBean(IGridService.class).getGridListByUserId(AuthUtil.getUserId());
+ }
+ }
+ List<PlaceCheckVO> placeCheckVOS = baseMapper.selectPlaceCheckPage(page, placeCheck,isAdministrator,regionChildCodesList,gridCodeList);
for (PlaceCheckVO placeCheckVO : placeCheckVOS) {
int number = 0;
for (PatrolRecord patrolRecord : placeCheckVO.getPatrolRecordVOList()) {
@@ -89,33 +120,36 @@
item.setPlaceCheckId(placeCheck.getId());
item.setCreateUser(AuthUtil.getUserId());
});
- boolean b = bean.saveBatch(patrolRecordVOList);
- updateById(placeCheck);
- if (b) {
- // 隐患问题大于0 则创建任务
- try {
- Integer integer = number.get();
- if (integer > 0) {
- // 保存任务表
- ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
- Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
- "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT);
- if (aLong > 0) {
- // 保存任务详情表
- ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
- TaskPlaceRectificationEntity copy = BeanUtil.copy(placeCheck, TaskPlaceRectificationEntity.class);
- copy.setTaskId(aLong);
- copy.setPlaceCheckId(placeCheck.getId());
- copy.setId(null);
- bean1.save(copy);
+ // List<PatrolRecord> collect = patrolRecordVOList.stream().filter(item -> item.getState().equals(0)).collect(Collectors.toList());
+ if (patrolRecordVOList != null && patrolRecordVOList.size() > 0) {
+ boolean b = bean.saveBatch(patrolRecordVOList);
+ if (b) {
+ // 隐患问题大于0 则创建任务
+ try {
+ Integer integer = number.get();
+ if (integer > 0) {
+ // 保存任务表
+ ITaskService bean2 = SpringUtils.getBean(ITaskService.class);
+ Long aLong = bean2.saveTask(CommonConstant.NUMBER_FOUR, DictConstant.FIRE_RECTIFICATION_NOTICE, 1,
+ "", AuthUtil.getUserId(), placeCheck.getHouseCode(), CommonConstant.NUMBER_EIGHT, 4);
+ if (aLong > 0) {
+ // 保存任务详情表
+ ITaskPlaceRectificationService bean1 = SpringUtil.getBean(ITaskPlaceRectificationService.class);
+ TaskPlaceRectificationEntity copy = BeanUtil.copy(placeCheck, TaskPlaceRectificationEntity.class);
+ copy.setTaskId(aLong);
+ copy.setPlaceCheckId(placeCheck.getId());
+ copy.setId(null);
+ copy.setStatus(4);
+ bean1.save(copy);
+ }
}
+ } catch (Exception e) {
+ logger.error("任务保存失败！", e);
}
- } catch (Exception e) {
- logger.error("任务保存失败！", e);
+ return b;
}
- return b;
}
- throw new Exception("保存失败！");
+ return save;
}
return false;
}
--
Gitblit v1.9.3