From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 262 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 222 insertions(+), 40 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
index bff4bd6..94c034b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
@@ -2,24 +2,30 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
-import com.gkhy.safePlatform.commons.enums.E;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.exception.BusinessException;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
+import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
+import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteNumRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.req.EmergencyExecuteTimeRPCReq;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumDetailRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteNumRPCResp;
+import com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp.EmergencyExecuteTimeRPCResp;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
-import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
import com.gkhy.safePlatform.emergency.utils.TimeUtils;
import org.apache.dubbo.config.annotation.DubboReference;
-import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -39,13 +45,203 @@
@Autowired
private EmergencySuppliesInfoService emergencySuppliesInfoService;
- /**
- * redisson客户端
- */
- @Autowired
- private RedissonClient redissonClient;
+ @Override
+ public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
+ EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = new EmergencyExecuteTimeRPCResp();
+ // 获取id对应的部门
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+ emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
+ emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
+ emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
+ getSingleTimeData(emergencyExecuteTimeRPCResp);
+ SearchResultVO searchResultVO = new SearchResultVO<>(
+ false,
+ null,
+ null,
+ null,
+ null,
+ emergencyExecuteTimeRPCResp,
+ ResultCodes.OK
+ );
+ searchResultVO.setCount(1);
+ return searchResultVO;
+ }
+ @Override
+ public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
+ List<EmergencyExecuteTimeRPCResp> list = new ArrayList<>();
+
+ // 获取该部门及其子部门的所有信息
+ List<DepInfoRPCRespDTO> depList = getDepListInfoByDepId(query.getDeptId());
+ for (DepInfoRPCRespDTO depInfoRPCRespDTO : depList){
+ EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = new EmergencyExecuteTimeRPCResp();
+ emergencyExecuteTimeRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
+ emergencyExecuteTimeRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
+ emergencyExecuteTimeRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteTimeRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
+
+ getSingleTimeData(emergencyExecuteTimeRPCResp);
+ list.add(emergencyExecuteTimeRPCResp);
+ }
+
+ SearchResultVO searchResultVO = new SearchResultVO<>(
+ false,
+ null,
+ null,
+ null,
+ null,
+ list,
+ ResultCodes.OK
+ );
+ if (!list.isEmpty()){
+ searchResultVO.setCount(list.size());
+ }
+ return searchResultVO;
+ }
+
+ private void getSingleTimeData(EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp){
+ // 查询该部门最后一次演练时间
+ String lastTime = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTimeByDeptId(emergencyExecuteTimeRPCResp.getDeptId());
+ if (StringUtils.isNotBlank(lastTime)){
+ emergencyExecuteTimeRPCResp.setLastTime(lastTime);
+// emergencyExecuteTimeRPCResp.setDays(TimeUtils.differentDays(lastTime, TimeUtils.formatDate(new Date())));
+ }
+ }
+
+ @Override
+ public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) {
+ if (query.getYear()==null){
+ throw new EmergencyException(EmergencyResultCodes.YEAR_NULL);
+ }
+ EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp = new EmergencyExecuteNumRPCResp();
+ // 获取id对应的部门
+ DepInfoRPCRespDTO depInfoRPCRespDTO = getDepInfoByDepId(query.getDeptId());
+ emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
+ emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
+ emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
+
+ getSingleNumData(emergencyExecuteNumRPCResp,query);
+
+ SearchResultVO searchResultVO = new SearchResultVO<>(
+ false,
+ null,
+ null,
+ null,
+ null,
+ emergencyExecuteNumRPCResp,
+ ResultCodes.OK
+ );
+ searchResultVO.setCount(1);
+ return searchResultVO;
+ }
+
+ @Override
+ public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
+ List<EmergencyExecuteNumRPCResp> list = new ArrayList<>();
+
+ // 获取该部门及其子部门的所有信息
+ List<DepInfoRPCRespDTO> deptList = getDepListInfoByDepId(query.getDeptId());
+
+ for (DepInfoRPCRespDTO depInfoRPCRespDTO : deptList){
+ EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp = new EmergencyExecuteNumRPCResp();
+ emergencyExecuteNumRPCResp.setDeptId(depInfoRPCRespDTO.getDepId());
+ emergencyExecuteNumRPCResp.setDeptName(depInfoRPCRespDTO.getDepName());
+ emergencyExecuteNumRPCResp.setDeptLevel(depInfoRPCRespDTO.getDepLevel());
+ emergencyExecuteNumRPCResp.setParentDepId(depInfoRPCRespDTO.getParentDepId());
+
+ getSingleNumData(emergencyExecuteNumRPCResp,query);
+ list.add(emergencyExecuteNumRPCResp);
+ }
+
+ SearchResultVO searchResultVO = new SearchResultVO<>(
+ false,
+ null,
+ null,
+ null,
+ null,
+ list,
+ ResultCodes.OK
+ );
+ if (!list.isEmpty()){
+ searchResultVO.setCount(list.size());
+ }
+ return searchResultVO;
+ }
+
+ private void getSingleNumData(EmergencyExecuteNumRPCResp emergencyExecuteNumRPCResp,EmergencyExecuteNumRPCReq query){
+ List<Long> deptIds = new ArrayList<>();
+ deptIds.add(emergencyExecuteNumRPCResp.getDeptId());
+
+ List<Map<String,Integer>> mapList = new ArrayList<>();
+ List<EmergencyDrillExecuteCountRPC> emergencyDrillExecuteCountDataList = new ArrayList<>();
+ String startTime ;
+ String endTime ;
+ Integer distType;
+ if (query.getMonth()==null){
+ distType=1;
+ // 查该年度12个月份的
+ startTime = TimeUtils.getYearFirst(query.getYear());
+ endTime = TimeUtils.getYearLast(query.getYear());
+ emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByMonthAndDeptForIntegerMonth(startTime, endTime, deptIds);
+ }else{
+ // 查该年度指定月份的
+ distType=2;
+ startTime = TimeUtils.getMonthFirst(query.getYear(),query.getMonth());
+ endTime = TimeUtils.getMonthLast(query.getYear(),query.getMonth());
+ emergencyDrillExecuteCountDataList= emergencyDrillExecuteInfoService.selectByDayAndDept(startTime, endTime, deptIds);
+ }
+ if (!emergencyDrillExecuteCountDataList.isEmpty()){
+ List<EmergencyExecuteNumDetailRPCResp> detailList =new ArrayList<>();
+ for (EmergencyDrillExecuteCountRPC emergencyDrillExecuteCountRPC : emergencyDrillExecuteCountDataList){
+
+ EmergencyExecuteNumDetailRPCResp emergencyExecuteNumDetailRPCResp = new EmergencyExecuteNumDetailRPCResp();
+
+ emergencyExecuteNumDetailRPCResp.setTime(emergencyDrillExecuteCountRPC.getName());
+ emergencyExecuteNumDetailRPCResp.setDistType(distType);
+ emergencyExecuteNumDetailRPCResp.setYear(query.getYear());
+ if (distType==1){
+ emergencyExecuteNumDetailRPCResp.setMonth(emergencyDrillExecuteCountRPC.getName());
+ }
+ if (distType==2){
+ emergencyExecuteNumDetailRPCResp.setMonth(query.getMonth());
+ emergencyExecuteNumDetailRPCResp.setDay(emergencyDrillExecuteCountRPC.getName());
+ }
+ emergencyExecuteNumDetailRPCResp.setNum(emergencyDrillExecuteCountRPC.getNum());
+ detailList.add(emergencyExecuteNumDetailRPCResp);
+ }
+ emergencyExecuteNumRPCResp.setDetail(detailList);
+ }
+
+ }
+
+ private DepInfoRPCRespDTO getDepInfoByDepId(Long deptId) {
+ DepInfoRPCRespDTO dep = new DepInfoRPCRespDTO();
+ ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(deptId);
+ if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
+ if (rpcResult.getData() != null) {
+ dep = (DepInfoRPCRespDTO) rpcResult.getData();
+ }
+ } else {
+ throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
+ }
+ return dep;
+ }
+
+ private List<DepInfoRPCRespDTO> getDepListInfoByDepId(Long deptId){
+ List<DepInfoRPCRespDTO> depList = new ArrayList<>();
+ ResultVO<List<DepInfoRPCRespDTO>> rpcResult = accountDepartmentService.listDepAndSubDepByDepId(deptId);
+ if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
+ if (rpcResult.getData() != null) {
+ depList = (List<DepInfoRPCRespDTO>)rpcResult.getData();
+ }
+ } else {
+ throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
+ }
+ return depList;
+ }
@Override
public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteCountQuery query) {
@@ -60,39 +256,39 @@
List<EmergencyDrillExecuteCountData> list = new ArrayList<>();
// 获取部门id集合
List<Long> deptIds = new ArrayList<>();
-
- ResultVO<List<Long>> rpcResult = accountDepartmentService.listDepAndSubDepIds(query.getDeptId());
+ deptIds.add(query.getDeptId());
+/* ResultVO<List<Long>> rpcResult = accountDepartmentService.listDepAndSubDepIds(query.getDeptId());
if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) {
if (rpcResult.getData() != null) {
deptIds = (List<Long>) rpcResult.getData();
}
- }else{
+ } else {
throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST);
- }
+ }*/
// 获取时间
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
Date date = new Date();
int year = Integer.parseInt(sdf.format(date));
- if (query.getType()==1){
+ if (query.getType() == 1) {
// 月
String startTime = TimeUtils.getYearFirst(year);
String endTime = TimeUtils.getYearLast(year);
- list = emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime,endTime,deptIds);
+ list = emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime, endTime, deptIds);
}
- if (query.getType()==2){
+ if (query.getType() == 2) {
// 年
- String startTime = TimeUtils.getYearFirst(year-10);
+ String startTime = TimeUtils.getYearFirst(year - 10);
String endTime = TimeUtils.getYearLast(year);
- list = emergencyDrillExecuteInfoService.selectByYearAndDept(startTime,endTime,deptIds);
+ list = emergencyDrillExecuteInfoService.selectByYearAndDept(startTime, endTime, deptIds);
}
- if (!CollectionUtils.isEmpty(list)){
- List<EmergencyDrillExecuteCountDataRespDTO> dataList = BeanCopyUtils.copyBeanList(list,EmergencyDrillExecuteCountDataRespDTO.class);
+ if (!CollectionUtils.isEmpty(list)) {
+ List<EmergencyDrillExecuteCountDataRespDTO> dataList = BeanCopyUtils.copyBeanList(list, EmergencyDrillExecuteCountDataRespDTO.class);
emergencyDrillExecuteCountRespDTO.setDataList(dataList);
- }else{
+ } else {
emergencyDrillExecuteCountRespDTO.setDataList(new ArrayList<>());
}
- return new ResultVO<>(ResultCodes.OK,emergencyDrillExecuteCountRespDTO);
+ return new ResultVO<>(ResultCodes.OK, emergencyDrillExecuteCountRespDTO);
}
@Override
@@ -101,11 +297,11 @@
Long pageIndex = pageQuery.getPageIndex();
Long pageSize = pageQuery.getPageSize();
- Page<EmergencySuppliesInfoDetailDO> page = new Page<>(pageIndex,pageSize);
- List<EmergencySuppliesInfoDetailDO> emergencySuppliesInfoDetailDOList = emergencySuppliesInfoService.countEmergencySupplies(page,pageQuery.getSearchParams());
+ Page<EmergencySuppliesInfoDetailDO> page = new Page<>(pageIndex, pageSize);
+ List<EmergencySuppliesInfoDetailDO> emergencySuppliesInfoDetailDOList = emergencySuppliesInfoService.countEmergencySupplies(page, pageQuery.getSearchParams());
- if (!CollectionUtils.isEmpty(emergencySuppliesInfoDetailDOList)){
- for (EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO :emergencySuppliesInfoDetailDOList){
+ if (!CollectionUtils.isEmpty(emergencySuppliesInfoDetailDOList)) {
+ for (EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO : emergencySuppliesInfoDetailDOList) {
EmergencySuppliesCountRespDTO emergencySuppliesCountRespDTO = new EmergencySuppliesCountRespDTO();
// 名称+数量
emergencySuppliesCountRespDTO.setName(emergencySuppliesInfoDetailDO.getName());
@@ -135,25 +331,11 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,page.getPages(),
+ pageSize, page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
);
}
- public static void main(String[] args) {
- Date date = new Date();//获取当前日期
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化一下
- Calendar calendar1 = Calendar.getInstance();//获取对日期操作的类对象
- //两种写法都可以获取到前三天的日期
- calendar1.set(Calendar.DAY_OF_YEAR,calendar1.get(Calendar.DAY_OF_YEAR) -40);
- //在当前时间的基础上获取前三天的日期
-// calendar1.add(Calendar.DATE, -40);
- //add方法 参数也可传入 月份，获取的是前几月或后几月的日期
- //calendar1.add(Calendar.MONTH, -3);
- Date today = calendar1.getTime();
- String time= sdf.format(today);
- System.out.println(time);
- }
}
--
Gitblit v1.9.2