From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 98 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 0703985..2974ac2 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -16,20 +16,27 @@
*/
package org.springblade.modules.task.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.grid.entity.GridmanEntity;
+import org.springblade.modules.grid.service.IGridService;
+import org.springblade.modules.sse.server.SSEServer;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.TaskEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
-import org.springblade.modules.task.service.ITaskService;
-import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.vo.TaskReportForRepairsVO;
import org.springblade.modules.task.vo.TaskReportStatistics;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 报事报修任务表 服务实现类
@@ -43,6 +50,12 @@
@Autowired
private ITaskService taskService;
+ @Autowired
+ private IGridService gridService;
+
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义分页
*
@@ -52,11 +65,29 @@
*/
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs));
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ taskReportForRepairs.setRegionCode(dept.getRegionCode());
+ }
+ List<String> list = new ArrayList<>();
+ if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
+ if (taskReportForRepairs.getRoleName().equals("网格员")) {
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ } else if (taskReportForRepairs.getRoleName().equals("居民")) {
+ taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
+ }
+ }
+ if (AuthUtil.getUserRole().equals("wygly")) {
+ taskReportForRepairs.setRegionCode("");
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
+ }
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
}
/**
* 查询报事报修统计
+ *
* @return
*/
@Override
@@ -66,6 +97,7 @@
/**
* 报事报修任务表 新增
+ *
* @param taskReportForRepairs
* @return
*/
@@ -74,21 +106,28 @@
boolean flag = false;
// 任务新增
TaskEntity taskEntity = new TaskEntity();
- taskEntity.setName("报事报修"+ System.currentTimeMillis());
+ taskEntity.setName(taskReportForRepairs.getRealName() + "报修");
taskEntity.setStatus(1);
taskEntity.setType(1);
taskEntity.setFrequency(3);
+ if (null != taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")) {
+ taskEntity.setHouseCode(taskReportForRepairs.getAddressCode());
+ }
// 新增
boolean save = taskService.save(taskEntity);
- if (save){
+ if (save) {
taskReportForRepairs.setTaskId(taskEntity.getId());
+ taskReportForRepairs.setConfirmFlag(1);
flag = save(taskReportForRepairs);
+ // 同时向web 端推送消息
+ SSEServer.sendMessage("web:1", "1");
}
return flag;
}
/**
* 报事报修任务表 自定义修改
+ *
* @param taskReportForRepairs
* @return
*/
@@ -103,24 +142,74 @@
/**
* 报事报修任务表 审核
+ *
* @param taskReportForRepairs
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean checkReportForRepairs(TaskReportForRepairsEntity taskReportForRepairs) {
boolean flag = false;
// 设置更新时间
taskReportForRepairs.setConfirmTime(new Date());
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
// 更新数据
boolean b = updateById(taskReportForRepairs);
if (b) {
+ TaskReportForRepairsEntity entity = getById(taskReportForRepairs.getId());
// 更新任务表状态
TaskEntity taskEntity = new TaskEntity();
- taskEntity.setId(taskReportForRepairs.getTaskId());
+ taskEntity.setId(entity.getTaskId());
taskEntity.setStatus(taskReportForRepairs.getConfirmFlag());
flag = taskService.updateById(taskEntity);
}
// 返回
return flag;
}
+
+ @Override
+ public Integer getStatistics(Long userId, String neiCode) {
+ return baseMapper.getStatistics(userId, neiCode);
+ }
+
+ /**
+ * 更新状态--临时接口
+ *
+ * @param gridman
+ * @return
+ */
+ @Override
+ public boolean updateView(GridmanEntity gridman) {
+ baseMapper.updateView(gridman);
+ return true;
+ }
+
+ @Override
+ public Object getReportForStatistics(String code, String roleType) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ if (roleType.equals("2")) {
+ Integer result1 = baseMapper.getReportForStatistics(code, null, null, null, roleType);
+ Integer result = baseMapper.getReportForStatistics(code, null, 3, null, roleType);
+ objectObjectHashMap.put("result", result1);
+ objectObjectHashMap.put("result1", result);
+ objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 4, BigDecimal.ROUND_HALF_UP));
+ objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, null, null, 1, roleType));
+ objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, null, null, 2, roleType));
+ objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, null, null, 3, roleType));
+ objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, null, null, 4, roleType));
+ } else {
+ Integer result1 = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, null, roleType);
+ Integer result = baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), 3, null, roleType);
+ // result 总数 result1 已处理 result2 处理率 result3 公共维修 result4 居家维修 result5 矛盾纠纷 result6 投诉举报
+ objectObjectHashMap.put("result", result1);
+ objectObjectHashMap.put("result1", result);
+ objectObjectHashMap.put("result2", result1.equals(0) ? 0 : BigDecimal.valueOf(result).divide(BigDecimal.valueOf(result1), 4, BigDecimal.ROUND_HALF_UP));
+ objectObjectHashMap.put("result3", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 1, roleType));
+ objectObjectHashMap.put("result4", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 2, roleType));
+ objectObjectHashMap.put("result5", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 3, roleType));
+ objectObjectHashMap.put("result6", baseMapper.getReportForStatistics(code, AuthUtil.getUserId(), null, 4, roleType));
+ }
+ return objectObjectHashMap;
+ }
+
}
--
Gitblit v1.9.3