From 37f303aa95b9f6e09db8db216dbe39834ef4ca98 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期五, 02 九月 2022 13:58:58 +0800 Subject: [PATCH] fix --- emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 146 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 136 insertions(+), 10 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 12d1587..027b313 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 @@ -1,15 +1,25 @@ package com.gkhy.safePlatform.emergency.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService; +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.vo.ResultVO; +import com.gkhy.safePlatform.commons.vo.SearchResultVO; import com.gkhy.safePlatform.emergency.entity.*; 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.req.EmergencyExecuteNumRPCReq; +import com.gkhy.safePlatform.emergency.rpc.api.model.req.EmergencyExecuteTimeRPCReq; +import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteNumRPCResp; +import com.gkhy.safePlatform.emergency.rpc.api.model.resp.EmergencyExecuteTimeRPCResp; import com.gkhy.safePlatform.emergency.service.EmergencyCountService; 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.springframework.beans.factory.annotation.Autowired; @@ -27,6 +37,59 @@ @DubboReference(check = false) private AccountDepartmentService accountDepartmentService; + + @Autowired + private EmergencySuppliesInfoService emergencySuppliesInfoService; + + @Override + public SearchResultVO<EmergencyExecuteTimeRPCResp> getTimeByDeptId(EmergencyExecuteTimeRPCReq query) { + EmergencyExecuteTimeRPCResp emergencyExecuteTimeRPCResp = new EmergencyExecuteTimeRPCResp(); + + ResultVO<DepInfoRPCRespDTO> rpcResult = accountDepartmentService.getDepInfoByDepId(query.getDeptId()); + if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) { + if (rpcResult.getData() != null) { + DepInfoRPCRespDTO dep = (DepInfoRPCRespDTO) rpcResult.getData(); + emergencyExecuteTimeRPCResp.setDeptId(dep.getDepId()); + emergencyExecuteTimeRPCResp.setDeptName(dep.getDepName()); + emergencyExecuteTimeRPCResp.setDeptLevel(dep.getDepLevel()); + } + } else { + throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST); + } + return new SearchResultVO<>( + false, + null, + null, + null, + 1L, + emergencyExecuteTimeRPCResp, + ResultCodes.OK + ); + } + + @Override + public SearchResultVO<List<EmergencyExecuteTimeRPCResp>> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) { + List<EmergencyExecuteTimeRPCResp> list = new ArrayList<>(); + return new SearchResultVO<>( + false, + null, + null, + null, + (long)list.size(), + list, + ResultCodes.OK + ); + } + + @Override + public SearchResultVO<EmergencyExecuteNumRPCResp> getNumByDeptId(EmergencyExecuteNumRPCReq query) { + return null; + } + + @Override + public SearchResultVO<List<EmergencyExecuteNumRPCResp>> getNumByDeptIds(EmergencyExecuteNumRPCReq query) { + return null; + } @Override @@ -48,32 +111,95 @@ 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 + public ResultVO<List<EmergencySuppliesCountRespDTO>> countEmergencySupplies(PageQuery<EmergencySuppliesCountQuery> pageQuery) { + List<EmergencySuppliesCountRespDTO> respList = new ArrayList<>(); + + Long pageIndex = pageQuery.getPageIndex(); + Long pageSize = pageQuery.getPageSize(); + Page<EmergencySuppliesInfoDetailDO> page = new Page<>(pageIndex, pageSize); + List<EmergencySuppliesInfoDetailDO> emergencySuppliesInfoDetailDOList = emergencySuppliesInfoService.countEmergencySupplies(page, pageQuery.getSearchParams()); + + if (!CollectionUtils.isEmpty(emergencySuppliesInfoDetailDOList)) { + for (EmergencySuppliesInfoDetailDO emergencySuppliesInfoDetailDO : emergencySuppliesInfoDetailDOList) { + EmergencySuppliesCountRespDTO emergencySuppliesCountRespDTO = new EmergencySuppliesCountRespDTO(); + // 名称+数量 + emergencySuppliesCountRespDTO.setName(emergencySuppliesInfoDetailDO.getName()); + emergencySuppliesCountRespDTO.setTotalNum(emergencySuppliesInfoDetailDO.getCount()); +// // 保质期内数量 +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");//格式化一下 +// Date produceDate = emergencySuppliesInfoDetailDO.getProductionDate(); +// Integer usePeriod = emergencySuppliesInfoDetailDO.getUsePeriod(); +// +// String[] arr = sdf.format(produceDate).split("-"); +// +// Calendar calendar = Calendar.getInstance();//获取对日期操作的类对象 +// calendar.clear(); +// calendar.set(Calendar.YEAR, Integer.parseInt(arr[0])); +// calendar.set(Calendar.MONTH, Integer.parseInt(arr[1])); +// calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(arr[2])); +// +// calendar.set(Calendar.DAY_OF_YEAR,calendar.get(Calendar.DAY_OF_YEAR) +usePeriod); +// +// Date qualityD = calendar.getTime(); +// String time= sdf.format(calendar.getTime()); +// System.out.println(time); + + respList.add(emergencySuppliesCountRespDTO); + } + } + return new SearchResultVO<>( + true, + pageIndex, + 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