From 8702c17288c16ec3d6760326e85cae37bbb10af8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 17 八月 2022 16:07:17 +0800
Subject: [PATCH] 事故fix统计
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentCountService.java | 12
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java | 1
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java | 61 +++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetTypeDto.java | 62 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java | 73 +++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetTypeServiceImpl.java | 61 ++++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportCountQuery.java | 2
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java | 9
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesCountQuery.java | 14 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java | 6
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java | 56 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesInfoService.java | 3
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java | 93 ++++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetTypeRepository.java | 16 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesCountRespDTO.java | 26 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java | 3
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java | 1
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetTypeService.java | 23 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java | 1
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetTypeQueryCriteria.java | 63 ++++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java | 1
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetType.java | 52 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java | 7
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml | 5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesInfoRepository.java | 3
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentCountController.java | 28 ++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java | 17
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java | 29 --
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java | 2
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java | 54 +++
31 files changed, 722 insertions(+), 66 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
index a7f75a6..1430965 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
@@ -4,9 +4,9 @@
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
-import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyCountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -28,16 +28,13 @@
return emergencyCountService.countEmergencyDrillExecute(query);
}
-/* *//**
+ /**
* 应急物资统计图
- *//*
+ */
@RequestMapping(value = "/emergencySupplies/count" ,method = RequestMethod.POST)
- private ResultVO<List<EmergencyDrillExecutePageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillExecuteQuery> pageQuery){
+ private ResultVO<List<EmergencySuppliesCountRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesCountQuery> pageQuery){
PageUtils.checkCheck(pageQuery);
- return emergencyDrillExecuteService.selectEmergencyDrillExecuteList(pageQuery);
- }*/
-
-
-
+ return emergencyCountService.countEmergencySupplies(pageQuery);
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesCountRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesCountRespDTO.java
new file mode 100644
index 0000000..9715bff
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesCountRespDTO.java
@@ -0,0 +1,26 @@
+package com.gkhy.safePlatform.emergency.model.dto.resp;
+
+
+public class EmergencySuppliesCountRespDTO {
+
+ private String name;
+
+ private Integer totalNum;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getTotalNum() {
+ return totalNum;
+ }
+
+ public void setTotalNum(Integer totalNum) {
+ this.totalNum = totalNum;
+ }
+
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java
index 5637f0f..d3ae591 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java
@@ -6,6 +6,7 @@
// type=1:月 type=2:年
private Integer type;
+ // 部门id
private Long deptId;
public Integer getType() {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesCountQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesCountQuery.java
new file mode 100644
index 0000000..2d16412
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesCountQuery.java
@@ -0,0 +1,14 @@
+package com.gkhy.safePlatform.emergency.query;
+
+public class EmergencySuppliesCountQuery {
+
+ private String classification ;
+
+ public String getClassification() {
+ return classification;
+ }
+
+ public void setClassification(String classification) {
+ this.classification = classification;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesInfoRepository.java
index 8c317e2..7783407 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencySuppliesInfoRepository.java
@@ -5,6 +5,7 @@
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesDBQuery;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -23,4 +24,6 @@
void updateEmergencySupplies(EmergencySuppliesInfo emergencySuppliesInfo);
void deleteEmergencySupplies(@Param("id") Long id);
+
+ List<EmergencySuppliesInfoDetailDO> countEmergencySupplies(Page<EmergencySuppliesInfoDetailDO> page, EmergencySuppliesCountQuery query);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
index 342888a..13379ff 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
@@ -1,10 +1,17 @@
package com.gkhy.safePlatform.emergency.service;
+import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesCountRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
+
+import java.util.List;
public interface EmergencyCountService {
ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteCountQuery query);
+
+ ResultVO<List<EmergencySuppliesCountRespDTO>> countEmergencySupplies(PageQuery<EmergencySuppliesCountQuery> pageQuery);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
index 4463d16..7a13d85 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencySuppliesService.java
@@ -21,4 +21,5 @@
ResultVO updateEmergencySupplies(Long uid, EmergencySuppliesReqDTO emergencySuppliesReqDTO);
ResultVO batchDeleteEmergencySupplies( Long[] ids);
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesInfoService.java
index 4e8c1e0..0da757e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencySuppliesInfoService.java
@@ -5,6 +5,7 @@
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesDBQuery;
import java.util.List;
@@ -21,4 +22,6 @@
void updateEmergencySupplies(EmergencySuppliesInfo emergencySuppliesInfo);
void deleteEmergencySupplies(Long SuppliesId);
+
+ List<EmergencySuppliesInfoDetailDO> countEmergencySupplies(Page<EmergencySuppliesInfoDetailDO> page,EmergencySuppliesCountQuery query);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java
index 85c6343..19b2d8e 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencySuppliesInfoServiceImpl.java
@@ -5,6 +5,7 @@
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfoPageDO;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesDBQuery;
import com.gkhy.safePlatform.emergency.repository.EmergencySuppliesInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencySuppliesInfoService;
@@ -44,5 +45,10 @@
emergencySuppliesInfoRepository.deleteEmergencySupplies(SuppliesId);
}
+ @Override
+ public List<EmergencySuppliesInfoDetailDO> countEmergencySupplies(Page<EmergencySuppliesInfoDetailDO> page,EmergencySuppliesCountQuery query){
+ return emergencySuppliesInfoRepository.countEmergencySupplies(page,query);
+ }
+
}
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..b9ddad0 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,22 @@
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.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +34,10 @@
@DubboReference(check = false)
private AccountDepartmentService accountDepartmentService;
+
+ @Autowired
+ private EmergencySuppliesInfoService emergencySuppliesInfoService;
+
@Override
@@ -76,4 +87,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);
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
index ee0cac2..4144f5c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencySuppliesServiceImpl.java
@@ -13,6 +13,7 @@
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
import com.gkhy.safePlatform.emergency.model.dto.resp.*;
+import com.gkhy.safePlatform.emergency.query.EmergencySuppliesCountQuery;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencySuppliesDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesMaintainService;
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
index 9b4c5c5..f9d36cf 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
@@ -114,6 +114,11 @@
from emergency_supplies where del_flag = 0 and id = #{id}
</select>
+ <select id="countEmergencySupplies" resultMap="emergencySuppliesInfoDetailDOResult">
+ select id,`name`,`count`,`production_date`,`use_period`,classification from emergency_supplies where del_flag = 0
+ <if test="query.classification != null and query.classification != ''">and `classification` = #{query.classification}</if>
+ </select>
+
<update id="updateEmergencySupplies" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfo">
update emergency_supplies
<trim prefix="SET" suffixOverrides=",">
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
index d0e84d5..bf3ec93 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -217,7 +217,7 @@
*/
@PostMapping(value = "/checkAndSubimt/list")
public ResultVO list(Authentication authentication, @RequestBody PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery){
- if(pageQuery.getSearchParams().getTargetType() == null){
+ if(pageQuery.getSearchParams().getRelateType() == null){
return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL,"缺少targetType");
}
PageUtils.checkCheck(pageQuery);
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
new file mode 100644
index 0000000..9be26a9
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
@@ -0,0 +1,93 @@
+package com.gkhy.safePlatform.targetDuty.controller;
+
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
+import org.springframework.web.bind.annotation.*;
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.utils.PageUtils;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetTypeQueryCriteria;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 目标分类(TargetType)表控制层
+ *
+ * @author xurui
+ * @since 2022-08-17 10:20:01
+ */
+@RestController
+@RequestMapping("targetType")
+public class TargetTypeController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private TargetTypeService targetTypeService;
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param pageQuery 查询实体
+ * @return 所有数据
+ */
+ @PostMapping(value = "/page/list")
+ public ResultVO selectAll(@RequestBody PageQuery<TargetTypeQueryCriteria> pageQuery){
+ PageUtils.checkCheck(pageQuery);
+ return this.targetTypeService.queryAll(pageQuery);
+ }
+
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping(value = "/selectOne/{id}")
+ public ResultVO selectOne(@PathVariable Serializable id) {
+ return new ResultVO<>(ResultCodes.OK,this.targetTypeService.getById(id));
+ }
+
+ /**
+ * 新增或者修改数据
+ *
+ * @param targetType 实体对象
+ * @return 修改结果
+ */
+ @PostMapping(value = "/addOrUpdate")
+ public ResultVO update(@RequestBody TargetType targetType) {
+ if (targetType.getId() == null) {
+ return new ResultVO<>(ResultCodes.OK,targetTypeService.save(targetType));
+ } else {
+ targetTypeService.update(targetType,new UpdateWrapper<TargetType>().eq("id",targetType.getId()));
+ return new ResultVO<>(ResultCodes.OK);
+ }
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param ids 主键结合
+ * @return 删除结果
+ */
+ @RequestMapping(value = "/delete",method = RequestMethod.POST)
+ public ResultVO delete(@RequestBody Long[] ids) {
+ if(ids == null){
+ return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
+ }
+ List<Long> idList = Arrays.asList(ids);
+ this.targetTypeService.removeByIds(idList);
+ return new ResultVO<>(ResultCodes.OK);
+ }
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
index 77f17d2..d28e720 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 目标指标分解详情(TargetDivideDetail)表实体类
*
* @author xurui
- * @since 2022-08-03 09:25:40
+ * @since 2022-08-17 11:22:35
*/
@SuppressWarnings("serial")
@TableName("target_divide_detail")
@@ -30,7 +29,7 @@
}
//关联的目标指标/外键
- private Long targetId;
+ private Long targetId;
public Long getTargetId() {
return targetId;
@@ -40,7 +39,7 @@
this.targetId = targetId;
}
//考核指标值
- private String value;
+ private String value;
public String getValue() {
return value;
@@ -50,8 +49,8 @@
this.value = value;
}
//制定日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Timestamp makeDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp makeDate;
public Timestamp getMakeDate() {
return makeDate;
@@ -61,7 +60,7 @@
this.makeDate = makeDate;
}
//责任部门/外键
- private Long dutyDepartmentId;
+ private Long dutyDepartmentId;
public Long getDutyDepartmentId() {
return dutyDepartmentId;
@@ -71,7 +70,7 @@
this.dutyDepartmentId = dutyDepartmentId;
}
//制定人部门/外键
- private Long makerDepartmentId;
+ private Long makerDepartmentId;
public Long getMakerDepartmentId() {
return makerDepartmentId;
@@ -81,7 +80,7 @@
this.makerDepartmentId = makerDepartmentId;
}
//上报人/外键
- private Long commitPersonId;
+ private Long commitPersonId;
public Long getCommitPersonId() {
return commitPersonId;
@@ -91,7 +90,7 @@
this.commitPersonId = commitPersonId;
}
//上报人名称
- private String commitPersonName;
+ private String commitPersonName;
public String getCommitPersonName() {
return commitPersonName;
@@ -100,5 +99,45 @@
public void setCommitPersonName(String commitPersonName) {
this.commitPersonName = commitPersonName;
}
+ //目标分类/外键
+ private Long targetTypeId;
+
+ public Long getTargetTypeId() {
+ return targetTypeId;
+ }
+
+ public void setTargetTypeId(Long targetTypeId) {
+ this.targetTypeId = targetTypeId;
+ }
+ //责任人/外键
+ private Long dutyPersonId;
+
+ public Long getDutyPersonId() {
+ return dutyPersonId;
+ }
+
+ public void setDutyPersonId(Long dutyPersonId) {
+ this.dutyPersonId = dutyPersonId;
+ }
+ //责任人名称
+ private String dutyPersonName;
+
+ public String getDutyPersonName() {
+ return dutyPersonName;
+ }
+
+ public void setDutyPersonName(String dutyPersonName) {
+ this.dutyPersonName = dutyPersonName;
+ }
+ //计划措施
+ private String planDesc;
+
+ public String getPlanDesc() {
+ return planDesc;
+ }
+
+ public void setPlanDesc(String planDesc) {
+ this.planDesc = planDesc;
+ }
}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetType.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetType.java
new file mode 100644
index 0000000..0077802
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetType.java
@@ -0,0 +1,52 @@
+package com.gkhy.safePlatform.targetDuty.entity;
+
+import java.sql.Timestamp;
+import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 目标分类(TargetType)表实体类
+ *
+ * @author xurui
+ * @since 2022-08-17 10:26:39
+ */
+@SuppressWarnings("serial")
+@TableName("target_type")
+public class TargetType extends BaseDomain {
+
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ //分类名称
+ private String typeName;
+
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+ //说明
+ private String memo;
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
index 26dd754..e268017 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/enums/TargetDutyResultCodes.java
@@ -13,6 +13,7 @@
APPROVE_STATUS_NULL("A1004","审批状态不可为空"),
APPROVE_NOT_EXIST("A1005" , "审批记录不存在"),
+
ERROR("A3000", "未知错误");
private String code;
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetTypeQueryCriteria.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetTypeQueryCriteria.java
new file mode 100644
index 0000000..289edee
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetTypeQueryCriteria.java
@@ -0,0 +1,63 @@
+package com.gkhy.safePlatform.targetDuty.model.dto.req;
+
+import java.sql.Timestamp;
+import com.gkhy.safePlatform.targetDuty.annotation.Query;
+
+public class TargetTypeQueryCriteria {
+
+ @Query()
+ private Long id;
+ //分类名称
+ @Query(type = Query.Type.INNER_LIKE)
+ private String typeName;
+ //说明
+ @Query()
+ private String memo;
+
+ @Query()
+ private Timestamp createTime;
+
+ @Query()
+ private Timestamp updateTime;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ //分类名称
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+ //说明
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ public Timestamp getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Timestamp createTime) {
+ this.createTime = createTime;
+ }
+
+ public Timestamp getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Timestamp updateTime) {
+ this.updateTime = updateTime;
+ }
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java
index f7e4147..1207fbd 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetDivideDetailDto.java
@@ -31,6 +31,60 @@
//制定人部门名称
private String makerDepartmentName;
+ //目标分类/外键
+ private Long targetTypeId;
+
+ public Long getTargetTypeId() {
+ return targetTypeId;
+ }
+
+ public void setTargetTypeId(Long targetTypeId) {
+ this.targetTypeId = targetTypeId;
+ }
+
+ //目标分类名称
+ private String targetTypeName;
+
+ public String getTargetTypeName() {
+ return targetTypeName;
+ }
+
+ public void setTargetTypeName(String targetTypeName) {
+ this.targetTypeName = targetTypeName;
+ }
+
+ //责任人/外键
+ private Long dutyPersonId;
+
+ public Long getDutyPersonId() {
+ return dutyPersonId;
+ }
+
+ public void setDutyPersonId(Long dutyPersonId) {
+ this.dutyPersonId = dutyPersonId;
+ }
+ //责任人名称
+ private String dutyPersonName;
+
+ public String getDutyPersonName() {
+ return dutyPersonName;
+ }
+
+ public void setDutyPersonName(String dutyPersonName) {
+ this.dutyPersonName = dutyPersonName;
+ }
+ //计划措施
+ private String planDesc;
+
+ public String getPlanDesc() {
+ return planDesc;
+ }
+
+ public void setPlanDesc(String planDesc) {
+ this.planDesc = planDesc;
+ }
+
+
public String getDutyDepartmentName() {
return dutyDepartmentName;
}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetTypeDto.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetTypeDto.java
new file mode 100644
index 0000000..ea0219e
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/resp/TargetTypeDto.java
@@ -0,0 +1,62 @@
+package com.gkhy.safePlatform.targetDuty.model.dto.resp;
+
+import java.sql.Timestamp;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class TargetTypeDto implements Serializable {
+
+ private Long id;
+ //分类名称
+ private String typeName;
+ //说明
+ private String memo;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp createTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp updateTime;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+ //分类名称
+ public String getTypeName() {
+ return typeName;
+ }
+
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+ //说明
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+ public Timestamp getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Timestamp createTime) {
+ this.createTime = createTime;
+ }
+
+ public Timestamp getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Timestamp updateTime) {
+ this.updateTime = updateTime;
+ }
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetTypeRepository.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetTypeRepository.java
new file mode 100644
index 0000000..cdd5690
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/repository/TargetTypeRepository.java
@@ -0,0 +1,16 @@
+package com.gkhy.safePlatform.targetDuty.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 目标分类(TargetType)表数据库访问层
+ *
+ * @author xurui
+ * @since 2022-08-17 10:26:39
+ */
+@Repository
+public interface TargetTypeRepository extends BaseMapper<TargetType> {
+
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetTypeService.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetTypeService.java
new file mode 100644
index 0000000..cbb7b85
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/TargetTypeService.java
@@ -0,0 +1,23 @@
+package com.gkhy.safePlatform.targetDuty.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetTypeQueryCriteria;
+
+import java.util.List;
+
+
+/**
+ * 目标分类(TargetType)表服务接口
+ *
+ * @author xurui
+ * @since 2022-08-17 10:20:01
+ */
+public interface TargetTypeService extends IService<TargetType> {
+ ResultVO queryAll(PageQuery<TargetTypeQueryCriteria> pageQuery);
+
+ List<TargetType> queryAll(TargetTypeQueryCriteria criteria);
+
+}
\ No newline at end of file
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetTypeServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetTypeServiceImpl.java
new file mode 100644
index 0000000..b49a247
--- /dev/null
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetTypeServiceImpl.java
@@ -0,0 +1,61 @@
+package com.gkhy.safePlatform.targetDuty.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.targetDuty.repository.TargetTypeRepository;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import com.gkhy.safePlatform.targetDuty.service.TargetTypeService;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.query.PageQuery;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetTypeQueryCriteria;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetTypeDto;
+import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+
+import java.util.List;
+
+/**
+ * 目标分类(TargetType)表服务实现类
+ *
+ * @author xurui
+ * @since 2022-08-17 10:20:01
+ */
+@Service("targetTypeService")
+public class TargetTypeServiceImpl extends ServiceImpl<TargetTypeRepository, TargetType> implements TargetTypeService {
+
+ @Autowired
+ private TargetTypeRepository targetTypeRepository;
+
+
+
+ @Override
+ public ResultVO queryAll(PageQuery<TargetTypeQueryCriteria> pageQuery) {
+ Long pageIndex = pageQuery.getPageIndex();
+ Long pageSize = pageQuery.getPageSize();
+ IPage<TargetType> page = new Page<>(pageIndex, pageSize);
+
+ page = baseMapper.selectPage(page,
+ QueryHelpPlus.getPredicate(TargetType.class, pageQuery.getSearchParams()));
+ List<TargetTypeDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetTypeDto.class);
+
+ return new SearchResultVO<>(
+ true,
+ pageIndex,
+ pageSize,page.getPages(),
+ page.getTotal(),
+ respList,
+ ResultCodes.OK
+ );
+ }
+
+
+ @Override
+ public List<TargetType> queryAll(TargetTypeQueryCriteria criteria) {
+ return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetType.class, criteria));
+ }
+}
\ No newline at end of file
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentCountController.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentCountController.java
new file mode 100644
index 0000000..581eb80
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentCountController.java
@@ -0,0 +1,28 @@
+package com.gkhy.safePlatform.incidentManage.controller;
+
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportCountRespDTO;
+import com.gkhy.safePlatform.incidentManage.query.AccidentReportCountQuery;
+import com.gkhy.safePlatform.incidentManage.service.AccidentCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/accidentCount")
+public class AccidentCountController {
+
+ @Autowired
+ private AccidentCountService accidentCountService;
+
+
+ /**
+ * 事故报告统计的rpc接口
+ */
+ @RequestMapping(value = "/accidentReport/count",method = RequestMethod.POST)
+ public ResultVO<List<AccidentReportCountRespDTO>> countAccidentReport(@RequestBody AccidentReportCountQuery query){
+ return accidentCountService.countAccidentReport(query);
+ }
+
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java
index a037e86..ab0c764 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java
@@ -5,11 +5,9 @@
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportReqDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportCountRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportDetailRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportPageRespDTO;
import com.gkhy.safePlatform.incidentManage.query.AccidentReportQuery;
-import com.gkhy.safePlatform.incidentManage.query.AccidentReportRPCQuery;
import com.gkhy.safePlatform.incidentManage.service.AccidentReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
@@ -67,11 +65,4 @@
return accidentReportService.batchDeleteAccidentReport(ids);
}
- /**
- * 事故报告统计的rpc接口
- */
- @RequestMapping(value = "/count",method = RequestMethod.POST)
- public ResultVO<List<AccidentReportCountRespDTO>> countAccidentReport(@RequestBody AccidentReportRPCQuery query){
- return accidentReportService.countAccidentReport(query);
- }
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportRPCQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportCountQuery.java
similarity index 94%
rename from incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportRPCQuery.java
rename to incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportCountQuery.java
index bc7008a..2651b2a 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportRPCQuery.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportCountQuery.java
@@ -1,6 +1,6 @@
package com.gkhy.safePlatform.incidentManage.query;
-public class AccidentReportRPCQuery {
+public class AccidentReportCountQuery {
private String level;
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentCountService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentCountService.java
new file mode 100644
index 0000000..dff27a0
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentCountService.java
@@ -0,0 +1,12 @@
+package com.gkhy.safePlatform.incidentManage.service;
+
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportCountRespDTO;
+import com.gkhy.safePlatform.incidentManage.query.AccidentReportCountQuery;
+
+import java.util.List;
+
+public interface AccidentCountService {
+
+ ResultVO<List<AccidentReportCountRespDTO>> countAccidentReport(AccidentReportCountQuery query);
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java
index 77d07de..9f6b0ad 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java
@@ -4,11 +4,9 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportReqDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportCountRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportDetailRespDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentReportPageRespDTO;
import com.gkhy.safePlatform.incidentManage.query.AccidentReportQuery;
-import com.gkhy.safePlatform.incidentManage.query.AccidentReportRPCQuery;
import java.util.List;
@@ -24,5 +22,4 @@
ResultVO batchDeleteAccidentReport(Long[] ids);
- ResultVO<List<AccidentReportCountRespDTO>> countAccidentReport(AccidentReportRPCQuery query);
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
new file mode 100644
index 0000000..bcadd55
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentCountServiceImpl.java
@@ -0,0 +1,56 @@
+package com.gkhy.safePlatform.incidentManage.service.impl;
+
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import com.gkhy.safePlatform.commons.vo.ResultVO;
+import com.gkhy.safePlatform.incidentManage.entity.*;
+import com.gkhy.safePlatform.incidentManage.model.dto.resp.*;
+import com.gkhy.safePlatform.incidentManage.query.AccidentReportCountQuery;
+import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
+import com.gkhy.safePlatform.incidentManage.service.AccidentCountService;
+import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportInfoService;
+import com.gkhy.safePlatform.incidentManage.utils.TimeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+@Service("accidentCountService")
+public class AccidentCountServiceImpl implements AccidentCountService {
+
+ @Autowired
+ private AccidentReportInfoService accidentReportInfoService;
+
+
+ @Override
+ public ResultVO<List<AccidentReportCountRespDTO>> countAccidentReport(AccidentReportCountQuery query) {
+
+ List<AccidentReportCount> list = new ArrayList<>();
+ AccidentReportRPCDBQuery dbQuery = new AccidentReportRPCDBQuery();
+ if (query.getType() == 1) {
+ // 月
+ int year = query.getYear();
+ int month;
+ if (query.getMonth() == 0) {
+ Calendar date = Calendar.getInstance();
+ month = date.get(Calendar.MONTH) + 1;
+ } else {
+ month = query.getMonth();
+ }
+ dbQuery.setStartTime(TimeUtils.getMonthFirst(year, month));
+ dbQuery.setEndTime(TimeUtils.getMonthLast(year, month));
+ list = accidentReportInfoService.selectByTimeAndType(dbQuery);
+ }
+ if (query.getType() == 2) {
+ // 年
+ int year = query.getYear();
+ dbQuery.setStartTime(TimeUtils.getYearFirst(year));
+ dbQuery.setEndTime(TimeUtils.getYearLast(year));
+ list = accidentReportInfoService.selectByTimeAndType(dbQuery);
+ }
+
+ List<AccidentReportCountRespDTO> accidentReportCountRespDTOList = BeanCopyUtils.copyBeanList(list, AccidentReportCountRespDTO.class);
+ return new ResultVO<>(ResultCodes.OK, accidentReportCountRespDTOList);
+ }
+
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
index 72b5683..69ee086 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java
@@ -16,17 +16,13 @@
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportReqDTO;
import com.gkhy.safePlatform.incidentManage.model.dto.resp.*;
import com.gkhy.safePlatform.incidentManage.query.AccidentReportQuery;
-import com.gkhy.safePlatform.incidentManage.query.AccidentReportRPCQuery;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
-import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
import com.gkhy.safePlatform.incidentManage.service.AccidentReportService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentExpressFileInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentExpressInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportFileInfoService;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportInfoService;
-import com.gkhy.safePlatform.incidentManage.utils.TimeUtils;
import org.apache.dubbo.config.annotation.DubboReference;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -310,31 +306,6 @@
if (AccidentReportReqDTO.getFillInTime() == null) {
throw new AccidentException(AccidentResultCodes.REPORT_FILL_IN_TIME_NULL);
}
- }
-
- @Override
- public ResultVO<List<AccidentReportCountRespDTO>> countAccidentReport(AccidentReportRPCQuery query) {
-
- List<AccidentReportCount> list = new ArrayList<>();
- AccidentReportRPCDBQuery dbQuery = new AccidentReportRPCDBQuery();
- if (query.getType()==1){
- // 月
- int year = query.getYear();
- int month = query.getMonth();
- dbQuery.setStartTime(TimeUtils.getMonthFirst(year,month));
- dbQuery.setEndTime(TimeUtils.getMonthLast(year,month));
- list = accidentReportInfoService.selectByTimeAndType(dbQuery);
- }
- if (query.getType()==2){
- // 年
- int year = query.getYear();
- dbQuery.setStartTime(TimeUtils.getYearFirst(year));
- dbQuery.setEndTime(TimeUtils.getYearLast(year));
- list = accidentReportInfoService.selectByTimeAndType(dbQuery);
- }
-
- List<AccidentReportCountRespDTO> accidentReportCountRespDTOList = BeanCopyUtils.copyBeanList(list,AccidentReportCountRespDTO.class);
- return new ResultVO<>(ResultCodes.OK,accidentReportCountRespDTOList);
}
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java
index 70d8f9d..e93eb27 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java
@@ -74,7 +74,7 @@
public static void main(String[] args) {
Calendar date = Calendar.getInstance();
int year = date.get(Calendar.YEAR);
- int month = date.get(Calendar.MONTH);
- System.out.println(getMonthLast(year,2));
+ int month = date.get(Calendar.MONTH) + 1;
+ System.out.println(month);
}
}
--
Gitblit v1.9.2