fix

songhuangfeng123

2022-09-02 d59ce37bc27d01da323b79c10200e93796865fee

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java

@@ -13,6 +13,10 @@
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.EmergencySuppliesService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
@@ -39,12 +43,25 @@
    @Autowired
    private EmergencySuppliesInfoService emergencySuppliesInfoService;

    /**
     * redisson客户端
     */
    @Autowired
    private RedissonClient redissonClient;
    @Override
    public EmergencyExecuteTimeRPCResp getTimeByDeptId(EmergencyExecuteTimeRPCReq query) {
        return null;
    }

    @Override
    public List<EmergencyExecuteTimeRPCResp> getTimeByDeptIds(EmergencyExecuteTimeRPCReq query) {
        return null;
    }

    @Override
    public EmergencyExecuteNumRPCResp getNumByDeptId(EmergencyExecuteNumRPCReq query) {
        return null;
    }

    @Override
    public List<EmergencyExecuteNumRPCResp> getNumByDeptIds(EmergencyExecuteNumRPCReq query) {
        return null;
    }


    @Override
@@ -66,33 +83,33 @@
            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 +118,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 +152,26 @@
        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);
         //在当前时间的基础上获取前三天的日期
        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);
        Date today = calendar1.getTime();
        String time = sdf.format(today);
        System.out.println(time);
    }
}