From dd60de8d90f05c64e3cf166bc617b95a82102c52 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 11 Apr 2024 16:38:58 +0800
Subject: [PATCH] 新增自定义异常类
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 200 ++++++++++++++++++++++++++++---------------------
1 files changed, 115 insertions(+), 85 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index 3493a68..2e8c65e 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -23,22 +23,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.W;
import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
-import org.springblade.common.cache.SysCache;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
-import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridWorkLogService;
-import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalTenantVO;
@@ -46,23 +42,17 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
-import org.springblade.modules.police.service.IPoliceAffairsGridService;
-import org.springblade.modules.system.entity.Dept;
-import org.springblade.modules.system.service.IDeptService;
-import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.task.entity.*;
import org.springblade.modules.task.mapper.TaskMapper;
import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskVO;
-import org.springblade.modules.taskPlaceSelfCheck.entity.TaskPlaceSelfCheckEntity;
-import org.springblade.modules.taskPlaceSelfCheck.service.ITaskPlaceSelfCheckService;
+import org.springblade.modules.task.service.ITaskPlaceRectificationService;
+import org.springblade.modules.task.entity.TaskPlaceSelfCheckEntity;
+import org.springblade.modules.task.service.ITaskPlaceSelfCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@@ -101,47 +91,51 @@
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
- String roleName = SpringUtils.getRequestParam("roleName");
- String communityCode = SpringUtils.getRequestParam("communityCode");
- if (!Strings.isBlank(communityCode)) {
- // 校验社区编号是否合规
- if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
- task.setCommunityCode(communityCode);
- }
- }
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+// String roleName = SpringUtils.getRequestParam("roleName");
+// String communityCode = SpringUtils.getRequestParam("communityCode");
+// if (!Strings.isBlank(communityCode)) {
+// // 校验社区编号是否合规
+// if (null != SpringUtils.getBean(IRegionService.class).getById(communityCode)) {
+// task.setCommunityCode(communityCode);
+// }
+// }
+// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+// Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
// 网格编号集合
- List<String> gridCodeList = new ArrayList<>();
+// List<String> gridCodeList = new ArrayList<>();
// 民警角色
- if (!Strings.isBlank(roleName)) {
- task.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());
- }
- }
- if (AuthUtil.getUserAccount().equals("18879306957")) {
- task.setCommunityCode("361102003027");
- }
+// if (!Strings.isBlank(roleName)) {
+// task.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());
+// }
+// }
+// if (AuthUtil.getUserAccount().equals("18879306957")) {
+// task.setCommunityCode("361102003027");
+// }
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
if (null != task.getReportType() && task.getReportType() == 1) {
// 查询取保候审任务列表(人房相关)
- return page.setRecords(baseMapper.selectTaskPageByPerson(page, task, regionChildCodesList, isAdministrator, gridCodeList));
+ return page.setRecords(baseMapper.selectTaskPageByPerson(page, task, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
}
// 查询非取保候审任务列表(场所相关)
- return page.setRecords(baseMapper.selectTaskPage(page, task, regionChildCodesList, isAdministrator, gridCodeList));
+ return page.setRecords(baseMapper.selectTaskPage(page, task, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList()));
}
@Override
public IPage<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
// 民警角色
if (AuthUtil.getUserRole().equals("mj")) {
task.setUserId(AuthUtil.getUserId());
- return page.setRecords(baseMapper.selectTaskPageBy(page, task, regionChildCodesList, isAdministrator));
+ return page.setRecords(baseMapper.selectTaskPageBy(page, task,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator()));
} else {
if (AuthUtil.getUserAccount().equals("18879306957")) {
task.setCommunityCode("361102003027");
@@ -151,7 +145,12 @@
task.setUserId(AuthUtil.getUserId());
}
// 非民警角色
- List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page, task);
+ List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page,
+ task,
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getIsAdministrator());
+ // 返回
return page.setRecords(taskVOS);
}
}
@@ -225,36 +224,54 @@
taskVO.setStatus(1);
taskVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
taskVO.setNeiCode(neiCode);
- taskVO.setReportType(2);
+ taskVO.setReportType(5);
taskVO.setIsDeleted(0);
- // 查询网格员对应的网格id
- String gridCode = getGridCode();
- // 标签事件
- Integer bqsj = baseMapper.selectTaskCount(taskVO);
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, taskVO);
+
+ // 标签报事-二手交易
+ Integer bqsj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
taskVO.setReportType(1);
// 取保候审
- Integer qbhs = baseMapper.selectTaskCount(taskVO);
+ Integer qbhs = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
// 报事报修
Integer bsbx = SpringUtils.getBean(ITaskReportForRepairsService.class).getStatistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
- // 住房审核
- Integer zhsh = iHouseholdService.statistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode);
+ // 住户审核
+ Integer zhsh = iHouseholdService.statistics(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 0);
// 出租审核
HouseRentalTenantVO houseRentalTenantVO = new HouseRentalTenantVO();
- houseRentalTenantVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
- houseRentalTenantVO.setNeiCode(neiCode);
+ houseRentalTenantVO.setCommunityCode(neiCode);
+ houseRentalTenantVO.setAuditStatus(2);
Integer czsh = iHouseRentalService.getStatisticsCount(houseRentalTenantVO);
// 场所审核
Integer cssh = SpringUtils.getBean(IPlaceExtService.class).selectCount(roleType > 0 ? AuthUtil.getUserId() : null, neiCode, 1);
// 走访日志
+ // 查询网格员对应的网格id
+ String gridCode = getGridCode();
Integer zfrw = SpringUtils.getBean(IGridWorkLogService.class).getGridWorkCountHandleCount(gridCode, 1);
+ // 消防自查
+ Integer xfzc = SpringUtils.getBean(ITaskPlaceSelfCheckService.class).getCount(neiCode, 1);
+ // 消防隐患整改
+ Integer xfyhzg = SpringUtils.getBean(ITaskPlaceRectificationService.class).getCount(neiCode, 1);
+ // 居住证申请
+ Integer jzzsq = SpringUtils.getBean(ITaskResidencePermitApplyService.class).getCount(neiCode, 1);
+ // 无诈统计
+ taskVO.setReportType(6);
+ Integer wztj = baseMapper.selectTaskCount(taskVO, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
// 设置
- objectObjectHashMap.put("qbhs", qbhs);
- objectObjectHashMap.put("bqsj", bqsj);
- objectObjectHashMap.put("bsbx", bsbx);
- objectObjectHashMap.put("zhsh", zhsh);
- objectObjectHashMap.put("czsh", czsh);
- objectObjectHashMap.put("cssh", cssh);
- objectObjectHashMap.put("zfrw", zfrw);
+ objectObjectHashMap.put("qbhs", qbhs);// 取保候审
+ objectObjectHashMap.put("bqsj", bqsj);// 标签报事-二手交易
+ objectObjectHashMap.put("bsbx", bsbx);// 报事报修
+ objectObjectHashMap.put("zhsh", zhsh);// 住户审核
+ objectObjectHashMap.put("czsh", czsh);// 出租审核
+ objectObjectHashMap.put("cssh", cssh);// 场所审核
+ objectObjectHashMap.put("zfrw", zfrw);// 走访日志
+ objectObjectHashMap.put("xfzc", xfzc);// 消防自查
+ objectObjectHashMap.put("xfyhzg", xfyhzg);// 消防隐患整改
+ objectObjectHashMap.put("jzzsq", jzzsq);// 居住证申请
+ objectObjectHashMap.put("wztj", wztj);// 无诈
return objectObjectHashMap;
}
@@ -278,9 +295,9 @@
taskVO.setUserId(AuthUtil.getUserId());
taskVO.setFrequency(1);
taskVO.setStatus(1);
- Integer disposable = baseMapper.selectTaskCount(taskVO);
+ Integer disposable = baseMapper.selectTaskCount(taskVO, null, null, null);
taskVO.setFrequency(2);
- Integer periodicity = baseMapper.selectTaskCount(taskVO);
+ Integer periodicity = baseMapper.selectTaskCount(taskVO, null, null, null);
objectObjectHashMap.put("disposable", disposable);
objectObjectHashMap.put("periodicity", periodicity);
return objectObjectHashMap;
@@ -593,33 +610,46 @@
}
/**
- * 任务审核
- * @param task
- * @return
+ * 审核任务。
+ * 根据任务的报告类型，更新相应的任务状态，并触发相应的事件更新。
+ *
+ * @param task 任务实体，包含任务信息和报告类型。
+ * @return 返回审核结果，成功为true，失败为false。
*/
@Override
public Boolean examine(TaskEntity task) {
- // 二手交易
- if (task.getReportType().equals(5)) {
- boolean b = updateById(task);
- if (b) {
- ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
- return bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
- .set(TaskLabelReportingEventEntity::getConfirmFlag, task.getStatus())
- .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
- }
+ if (task == null || task.getReportType() == null) {
+ // 检查任务和报告类型是否为空，若为空则直接返回false
+ return false;
+ }
+ // 根据任务报告类型，更新任务状态并触发相应的事件更新
+ boolean result = updateById(task);
+ if (!result) {
+ return false;
+ }
+ if (task.getReportType().equals(CommonConstant.REPORT_TYPE_SECONDHAND_TRADE)) {
+ // 如果报告类型匹配，尝试更新任务标签报告事件状态
+ ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
+ return bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
+ .set(TaskLabelReportingEventEntity::getConfirmFlag, task.getStatus())
+ .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
+ } else if (task.getReportType().
+ equals(CommonConstant.REPORT_TYPE_FIRE_INSPECTION)) {
+ // 如果报告类型为消防自查，尝试更新消防自查状态
+ ITaskPlaceSelfCheckService bean = SpringUtils.getBean(ITaskPlaceSelfCheckService.class);
+ return bean.update(Wrappers.<TaskPlaceSelfCheckEntity>lambdaUpdate()
+ .set(TaskPlaceSelfCheckEntity::getStatus, task.getStatus())
+ .eq(TaskPlaceSelfCheckEntity::getTaskId, task.getId()));
+ } else if (task.getReportType().equals(CommonConstant.REPORT_TYPE_NO_FRAUD)) {
+ // 如果报告类型为无诈，尝试更新无诈报告状态
+ ITaskNoFraudReportingService bean = SpringUtils.getBean(ITaskNoFraudReportingService.class);
+ return bean.update(Wrappers.<TaskNoFraudReportingEntity>lambdaUpdate()
+ .set(TaskNoFraudReportingEntity::getStatus, task.getStatus())
+ .eq(TaskNoFraudReportingEntity::getTaskId, task.getId()));
}
- // 消防只查
- if (task.getReportType().equals(2)) {
- boolean b = updateById(task);
- if (b) {
- ITaskPlaceSelfCheckService bean = SpringUtils.getBean(ITaskPlaceSelfCheckService.class);
- return bean.update(Wrappers.<TaskPlaceSelfCheckEntity>lambdaUpdate()
- .set(TaskPlaceSelfCheckEntity::getStatus, task.getStatus())
- .eq(TaskPlaceSelfCheckEntity::getTaskId, task.getId()));
- }
- }
+ // 如果没有匹配的报告类型，返回false
return false;
}
+
}
--
Gitblit v1.9.3