From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 22 八月 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 80 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 0 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..bff4bd6 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,17 +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.commons.enums.E;
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.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;
@@ -27,6 +35,16 @@
@DubboReference(check = false)
private AccountDepartmentService accountDepartmentService;
+
+ @Autowired
+ private EmergencySuppliesInfoService emergencySuppliesInfoService;
+
+ /**
+ * redisson客户端
+ */
+ @Autowired
+ private RedissonClient redissonClient;
+
@Override
@@ -76,4 +94,66 @@
}
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