From 1bdd6405e8caffc058066bdd26cb6de1ea9cf7ea Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 09 八月 2022 18:35:39 +0800
Subject: [PATCH] 8-9fix
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportCountRespDTO.java | 67 +++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java | 98 ++-
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java | 80 +++
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountRespDTO.java | 27 +
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/controller/MinioController.java | 27 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java | 8
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountDataRespDTO.java | 25 +
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java | 3
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportRPCQuery.java | 45 ++
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java | 97 ++++
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java | 3
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java | 9
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/utils/UUIDUtil.java | 25 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java | 45 ++
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java | 47 ++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java | 80 +++
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/config/MinioConfig.java | 2
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCount.java | 67 +++
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java | 4
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java | 48 +
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml | 29 +
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java | 4
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportRPCDBQuery.java | 34 +
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java | 16
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java | 16
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java | 14
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java | 5
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java | 26 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java | 11
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteRPCDBQuery.java | 36 +
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java | 4
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java | 3
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentReportInfoRepository.java | 4
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 42 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java | 5
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java | 4
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java | 3
/dev/null | 121 -----
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountData.java | 25 +
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentReportInfoServiceImpl.java | 6
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java | 22
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java | 1
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java | 31 +
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java | 17
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java | 3
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java | 8
46 files changed, 1,117 insertions(+), 180 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
index 44cd1eb..b1d6573 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
@@ -5,9 +5,11 @@
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteRPCQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillExecuteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
@@ -65,4 +67,13 @@
public ResultVO batchDeleteEmergencyDrillExecute(@RequestBody Long[] ids){
return emergencyDrillExecuteService.batchDeleteEmergencyDrillExecute(ids);
}
+
+ /**
+ * 应急演练统计的rpc接口
+ */
+ @RequestMapping(value = "/count",method = RequestMethod.POST)
+ public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(@RequestBody EmergencyDrillExecuteRPCQuery query){
+ return emergencyDrillExecuteService.countEmergencyDrillExecute(query);
+ }
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountData.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountData.java
new file mode 100644
index 0000000..2d9c4fd
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyDrillExecuteCountData.java
@@ -0,0 +1,25 @@
+package com.gkhy.safePlatform.emergency.entity;
+
+
+public class EmergencyDrillExecuteCountData {
+
+ private Integer num ;
+
+ private String name ;
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountDataRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountDataRespDTO.java
new file mode 100644
index 0000000..78551df
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountDataRespDTO.java
@@ -0,0 +1,25 @@
+package com.gkhy.safePlatform.emergency.model.dto.resp;
+
+
+public class EmergencyDrillExecuteCountDataRespDTO {
+
+ private Integer num ;
+
+ private String name ;
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountRespDTO.java
new file mode 100644
index 0000000..d4995a8
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteCountRespDTO.java
@@ -0,0 +1,27 @@
+package com.gkhy.safePlatform.emergency.model.dto.resp;
+
+
+import java.util.List;
+
+public class EmergencyDrillExecuteCountRespDTO {
+
+ private Integer days;
+
+ private List<EmergencyDrillExecuteCountDataRespDTO> dataList;
+
+ public Integer getDays() {
+ return days;
+ }
+
+ public void setDays(Integer days) {
+ this.days = days;
+ }
+
+ public List<EmergencyDrillExecuteCountDataRespDTO> getDataList() {
+ return dataList;
+ }
+
+ public void setDataList(List<EmergencyDrillExecuteCountDataRespDTO> dataList) {
+ this.dataList = dataList;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java
new file mode 100644
index 0000000..fb991a7
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java
@@ -0,0 +1,45 @@
+package com.gkhy.safePlatform.emergency.query;
+
+public class EmergencyDrillExecuteRPCQuery {
+
+ private String level;
+
+ // type=1:月 type=2:年
+ private Integer type;
+
+ private int year;
+
+ private int month;
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public int getYear() {
+ return year;
+ }
+
+ public void setYear(int year) {
+ this.year = year;
+ }
+
+ public int getMonth() {
+ return month;
+ }
+
+ public void setMonth(int month) {
+ this.month = month;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteRPCDBQuery.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteRPCDBQuery.java
new file mode 100644
index 0000000..b70ad0a
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteRPCDBQuery.java
@@ -0,0 +1,36 @@
+package com.gkhy.safePlatform.emergency.query.db;
+
+
+
+public class EmergencyDrillExecuteRPCDBQuery {
+
+ private String level;
+
+ private String startTime;
+
+ private String endTime;
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
index 59cc806..660dc83 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -25,4 +27,10 @@
void deleteEmergencyDrillExecute(@Param("id") Long id);
void updateStatusById(@Param("drillExecuteId")Long drillExecuteId);
+
+ Integer selectEmergencyDrillExecuteIntervalTime();
+
+ List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(@Param("query")EmergencyDrillExecuteRPCDBQuery dbQuery);
+
+ List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(@Param("query")EmergencyDrillExecuteRPCDBQuery dbQuery);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
index a22bdc6..94a6ebe 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
@@ -4,9 +4,11 @@
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteRPCQuery;
import java.util.List;
@@ -21,4 +23,6 @@
ResultVO updateEmergencyDrillExecute(Long uid, EmergencyDrillExecuteReqDTO emergencyDrillExecuteReqDTO);
ResultVO batchDeleteEmergencyDrillExecute(Long[] ids);
+
+ ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteRPCQuery query);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
index 117fec5..2ff3ce5 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery;
import java.util.List;
@@ -23,4 +25,10 @@
void deleteEmergencyDrillExecute(Long DrillExecuteId);
void updateStatusById(Long drillExecuteId);
+
+ Integer selectEmergencyDrillExecuteIntervalTime();
+
+ List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery);
+
+ List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery);
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
index ac2e2a9..5219134 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfoPageDO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery;
import com.gkhy.safePlatform.emergency.repository.EmergencyDrillExecuteInfoRepository;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,5 +51,20 @@
emergencyDrillExecuteInfoRepository.updateStatusById(drillExecuteId);
}
+ @Override
+ public Integer selectEmergencyDrillExecuteIntervalTime() {
+ return emergencyDrillExecuteInfoRepository.selectEmergencyDrillExecuteIntervalTime();
+ }
+
+ @Override
+ public List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery) {
+ return emergencyDrillExecuteInfoRepository.selectByMouthTimeAndType(dbQuery);
+ }
+
+ @Override
+ public List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery) {
+ return emergencyDrillExecuteInfoRepository.selectByYearTimeAndType(dbQuery);
+ }
+
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
index 6b9b87c..76c3610 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -1,11 +1,9 @@
package com.gkhy.safePlatform.emergency.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.commons.enums.E;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
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.*;
@@ -13,16 +11,17 @@
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteUserReqDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteDetailRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteUserRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.*;
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
+import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteRPCQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
+import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteRPCDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillExecuteService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteUserInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillPlanInfoService;
+import com.gkhy.safePlatform.emergency.utils.TimeUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -232,4 +231,43 @@
emergencyDrillExecuteUserInfoService.deleteEmergencyDrillExecuteUserByDrillExecuteId(DrillExecuteId);
}
}
+
+ @Override
+ public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteRPCQuery query) {
+
+ EmergencyDrillExecuteCountRespDTO emergencyDrillExecuteCountRespDTO = new EmergencyDrillExecuteCountRespDTO();
+
+ // 根据应急演练实施的创建时间与当前时间 获取间隔天数
+ Integer days = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTime();
+ emergencyDrillExecuteCountRespDTO.setDays(days);
+
+ // 根据时间、级别获取统计
+ List<EmergencyDrillExecuteCountData> list = new ArrayList<>();
+ EmergencyDrillExecuteRPCDBQuery dbQuery = new EmergencyDrillExecuteRPCDBQuery();
+ dbQuery.setLevel(query.getLevel());
+ 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 = emergencyDrillExecuteInfoService.selectByMouthTimeAndType(dbQuery);
+ }
+ if (query.getType()==2){
+ // 年
+ int year = query.getYear();
+ dbQuery.setStartTime(TimeUtils.getYearFirst(year));
+ dbQuery.setEndTime(TimeUtils.getYearLast(year));
+ list = emergencyDrillExecuteInfoService.selectByYearTimeAndType(dbQuery);
+ }
+
+ if (!CollectionUtils.isEmpty(list)){
+ List<EmergencyDrillExecuteCountDataRespDTO> dataList = BeanCopyUtils.copyBeanList(list,EmergencyDrillExecuteCountDataRespDTO.class);
+ emergencyDrillExecuteCountRespDTO.setDataList(dataList);
+ }else{
+ emergencyDrillExecuteCountRespDTO.setDataList(new ArrayList<>());
+ }
+
+ return new ResultVO<>(ResultCodes.OK,emergencyDrillExecuteCountRespDTO);
+ }
}
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
index 01766ef..9148846 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -102,6 +102,7 @@
emergencyPlanInfo.setDelFlag(false);
emergencyPlanInfo.setCreateUid(uid);
emergencyPlanInfo.setGmtCreate(nowDate);
+ emergencyPlanInfo.setAbolishStatus(false);
emergencyPlanInfoService.addEmergencyPlan(emergencyPlanInfo);
// 新增应急预案区域表
if (!CollectionUtils.isEmpty(emergencyPlanReqDTO.getAreaList())) {
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
new file mode 100644
index 0000000..13cd0dd
--- /dev/null
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/utils/TimeUtils.java
@@ -0,0 +1,80 @@
+package com.gkhy.safePlatform.emergency.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class TimeUtils {
+
+ public static String formatDate(Date date){
+ SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+ String sDate = f.format(date);
+ return sDate;
+ }
+
+ /**
+ * 获取某年第一天日期
+ * @param year 年份
+ * @return Date
+ */
+ public static String getYearFirst(int year){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ Date currYearFirst = calendar.getTime();
+ return formatDate(currYearFirst);
+ }
+
+ /**
+ * 获取某年最后一天日期
+ * @param year 年份
+ * @return Date
+ */
+ public static String getYearLast(int year){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ calendar.roll(Calendar.DAY_OF_YEAR, -1);
+ Date currYearLast = calendar.getTime();
+
+ return formatDate(currYearLast);
+ }
+
+ /**
+ * 获取某月第一天日期
+ * @param month 年份
+ * @return Date
+ */
+ public static String getMonthFirst(int year ,int month){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ calendar.set(Calendar.MONTH, month-1);
+ Date currYearFirst = calendar.getTime();
+ return formatDate(currYearFirst);
+ }
+
+ /**
+ * 获取某月最后一天日期
+ * @param month 年份
+ * @return Date
+ */
+ public static String getMonthLast(int year ,int month){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ calendar.set(Calendar.MONTH, month-1);
+ calendar.roll(Calendar.DAY_OF_MONTH, -1);
+ Date currYearLast = calendar.getTime();
+
+ return formatDate(currYearLast);
+ }
+
+
+ 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));
+ }
+}
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index eecefb1..8e603c8 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -120,4 +120,46 @@
<update id="updateStatusById">
update emergency_drill_execute set status = 1 where id = #{drillExecuteId}
</update>
+
+ <select id="selectEmergencyDrillExecuteIntervalTime" resultType="java.lang.Integer">
+ SELECT datediff( now( ), ( SELECT max( gmt_create ) FROM `emergency_drill_execute` ) )
+ </select>
+
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData"
+ id="emergencyDrillExecuteCountChart">
+ <result column="num" property="num"/>
+ <result column="name" property="name"/>
+ </resultMap>
+
+ <select id="selectByMouthTimeAndType" resultMap="emergencyDrillExecuteCountChart">
+ SELECT
+ count( 0 ) AS num,
+ DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ) AS `name`
+ FROM
+ `emergency_drill_execute` a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{query.startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{query.endTime}
+ <if test="query.level != null and query.level != ''" >and b.drill_level = #{query.level}</if>
+ GROUP BY
+ DATE_FORMAT( a.gmt_create, '%Y-%m-%d' )
+ </select>
+
+ <select id="selectByYearTimeAndType" resultMap="emergencyDrillExecuteCountChart">
+ SELECT
+ count( 0 ) AS num,
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ) AS `name`
+ FROM
+ `emergency_drill_execute` a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{query.startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{query.endTime}
+ <if test="query.level != null and query.level != ''" >and b.drill_level = #{query.level}</if>
+ GROUP BY
+ DATE_FORMAT( a.gmt_create, '%Y-%m' )
+ </select>
</mapper>
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/MetaHandler.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/MetaHandler.java
deleted file mode 100644
index 4628b06..0000000
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/MetaHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2018-2022
- * All rights reserved, Designed By www.yixiang.co
- * 注意：
- * 本软件为www.yixiang.co开发研制
- */
-package com.gkhy.safePlatform.equipment.config;
-
-/**
- * @date ：Created in 2020-04-10 15:47
- * @description：自动注入时间处理
- * @modified By：
- * @version:
- */
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import org.apache.ibatis.reflection.MetaObject;
-
-import java.sql.Timestamp;
-
-/**
- * 处理新增和更新的基础数据填充，配合BaseEntity和MyBatisPlusConfig使用
- */
-//@Component
-public class MetaHandler implements MetaObjectHandler {
-
-
- /**
- * 新增数据执行
- *
- * @param metaObject
- */
- @Override
- public void insertFill(MetaObject metaObject) {
- try {
- Timestamp time = new Timestamp(System.currentTimeMillis());
- if (metaObject.hasSetter("createTime")) {
- this.setFieldValByName("createTime", time, metaObject);
- }
- if (metaObject.hasSetter("updateTime")) {
- this.setFieldValByName("updateTime", time, metaObject);
- }
- if (metaObject.hasSetter("createDate")) {
- this.setFieldValByName("createDate", time, metaObject);
- }
- if (metaObject.hasSetter("updateDate")) {
- this.setFieldValByName("updateDate", time, metaObject);
- }
- if (metaObject.hasSetter("delFlag")) {
- this.setFieldValByName("delFlag", false, metaObject);
- }
- } catch (Exception e) {
- System.out.println("自动注入失败:"+e.getMessage());
- }
- }
-
- /**
- * 更新数据执行
- *
- * @param metaObject
- */
- @Override
- public void updateFill(MetaObject metaObject) {
- try {
- Timestamp time = new Timestamp(System.currentTimeMillis());
- if (metaObject.hasSetter("updateTime")) {
- this.setFieldValByName("updateTime", time, metaObject);
- }
- if (metaObject.hasSetter("updateDate")) {
- this.setFieldValByName("updateDate", time, metaObject);
- }
- if (metaObject.hasSetter("delFlag")) {
- this.setFieldValByName("delFlag", null, metaObject);
- }
- if (metaObject.hasSetter("createTime")) {
- this.setFieldValByName("createTime", null, metaObject);
- }
- } catch (Exception e) {
- System.out.println("自动注入失败:"+e.getMessage());
- }
- }
-
-}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/PublicFileUrlConfig.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/PublicFileUrlConfig.java
deleted file mode 100644
index 5365aaa..0000000
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/config/PublicFileUrlConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gkhy.safePlatform.equipment.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 公共文件的配置
- */
-
-@Configuration
-@ConfigurationProperties(prefix = "public-file")
-public class PublicFileUrlConfig {
-
- /**
- * 上传的地址
- */
- private static String uploadUrl;
-
- public void setUploadUrl(String uploadUrl) {
- PublicFileUrlConfig.uploadUrl = uploadUrl;
- }
-
- public static String getUploadUrl() {
- return uploadUrl;
- }
-
- /**
- * 资源的域名
- */
- private static String domain;
-
- public void setDomain(String domain) {
- PublicFileUrlConfig.domain = domain;
- }
-
- public static String getDomain() {
- return domain;
- }
-}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
index c6b03e7..38c557a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -108,6 +110,7 @@
this.setPart = setPart;
}
//生产日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp produceTime;
public Timestamp getProduceTime() {
@@ -138,6 +141,7 @@
this.lifeCycle = lifeCycle;
}
//投用日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp useDate;
public Timestamp getUseDate() {
@@ -168,6 +172,7 @@
this.stopStatus = stopStatus;
}
//上次检查日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousCheckDate;
public Timestamp getPreviousCheckDate() {
@@ -178,6 +183,7 @@
this.previousCheckDate = previousCheckDate;
}
//上次检测日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTestDate;
public Timestamp getPreviousTestDate() {
@@ -188,6 +194,7 @@
this.previousTestDate = previousTestDate;
}
//上次保养日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp previousTakecareDate;
public Timestamp getPreviousTakecareDate() {
@@ -198,6 +205,7 @@
this.previousTakecareDate = previousTakecareDate;
}
//下次检查日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextCheckDate;
public Timestamp getNextCheckDate() {
@@ -208,6 +216,7 @@
this.nextCheckDate = nextCheckDate;
}
//下次检测日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTestDate;
public Timestamp getNextTestDate() {
@@ -218,6 +227,7 @@
this.nextTestDate = nextTestDate;
}
//下次保养日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp nextTakecareDate;
public Timestamp getNextTakecareDate() {
@@ -418,6 +428,7 @@
this.afterStopStep = afterStopStep;
}
//实际停用日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualStopDate;
public Timestamp getActualStopDate() {
@@ -448,6 +459,7 @@
this.stopSubmitPersonName = stopSubmitPersonName;
}
//停用提交日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp stopSubmitDate;
public Timestamp getStopSubmitDate() {
@@ -468,6 +480,7 @@
this.recoveryReason = recoveryReason;
}
//恢复填报日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp recoverySubmitDate;
public Timestamp getRecoverySubmitDate() {
@@ -478,6 +491,7 @@
this.recoverySubmitDate = recoverySubmitDate;
}
//实际恢复日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualRecoveryDate;
public Timestamp getActualRecoveryDate() {
@@ -498,6 +512,7 @@
this.destoryReason = destoryReason;
}
//报废填报日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp destorySubmitDate;
public Timestamp getDestorySubmitDate() {
@@ -508,6 +523,7 @@
this.destorySubmitDate = destorySubmitDate;
}
//实际报废日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp actualDestoryDate;
public Timestamp getActualDestoryDate() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
index 4b5ab94..2568acd 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -68,6 +70,7 @@
this.repairPersonName = repairPersonName;
}
//维修开始日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairStartDate;
public Timestamp getRepairStartDate() {
@@ -78,6 +81,7 @@
this.repairStartDate = repairStartDate;
}
//维修结束日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairEndDate;
public Timestamp getRepairEndDate() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
index aa20823..c7c26f3 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -78,6 +80,7 @@
this.leadingPersonName = leadingPersonName;
}
//保养日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp takecareDate;
public Timestamp getTakecareDate() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
index 033adf1..66d3f26 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
@@ -1,6 +1,8 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -68,6 +70,7 @@
this.testPersonName = testPersonName;
}
//检测日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp testDate;
public Timestamp getTestDate() {
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
index 4b1c0bc..f5f875d 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
@@ -8,13 +8,13 @@
* 重点监管装置/设备 详细信息(KeypointEquipmentInfo)表实体类
*
* @author xurui
- * @since 2022-07-19 13:36:27
+ * @since 2022-08-09 09:39:39
*/
@SuppressWarnings("serial")
@TableName("keypoint_equipment_info")
public class KeypointEquipmentInfo extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -25,9 +25,9 @@
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
private Long equipmentTypeId;
-
+
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -35,9 +35,9 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //名称
+ //名称
private String name;
-
+
public String getName() {
return name;
}
@@ -45,9 +45,9 @@
public void setName(String name) {
this.name = name;
}
- //单位部门外键
+ //单位部门外键
private Long departmentId;
-
+
public Long getDepartmentId() {
return departmentId;
}
@@ -55,9 +55,9 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //具体位置
+ //具体位置
private String position;
-
+
public String getPosition() {
return position;
}
@@ -65,9 +65,9 @@
public void setPosition(String position) {
this.position = position;
}
- //负责人姓名
+ //负责人姓名
private String leadingPersonName;
-
+
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -75,9 +75,9 @@
public void setLeadingPersonName(String leadingPersonName) {
this.leadingPersonName = leadingPersonName;
}
- //联系人/外键
+ //联系人/外键
private Long connectPersonId;
-
+
public Long getConnectPersonId() {
return connectPersonId;
}
@@ -85,9 +85,19 @@
public void setConnectPersonId(Long connectPersonId) {
this.connectPersonId = connectPersonId;
}
- //录入人/外键
+ //联系人名称
+ private String connectPersonName;
+
+ public String getConnectPersonName() {
+ return connectPersonName;
+ }
+
+ public void setConnectPersonName(String connectPersonName) {
+ this.connectPersonName = connectPersonName;
+ }
+ //录入人/外键
private Long inputPersonId;
-
+
public Long getInputPersonId() {
return inputPersonId;
}
@@ -95,9 +105,19 @@
public void setInputPersonId(Long inputPersonId) {
this.inputPersonId = inputPersonId;
}
- //责任人/外键
+ //录入人名称
+ private String inputPersonName;
+
+ public String getInputPersonName() {
+ return inputPersonName;
+ }
+
+ public void setInputPersonName(String inputPersonName) {
+ this.inputPersonName = inputPersonName;
+ }
+ //责任人/外键
private Long responsibilityPersonId;
-
+
public Long getResponsibilityPersonId() {
return responsibilityPersonId;
}
@@ -105,9 +125,19 @@
public void setResponsibilityPersonId(Long responsibilityPersonId) {
this.responsibilityPersonId = responsibilityPersonId;
}
- //装置部位分类 1：关键装置 2：重点部位
+ //责任人名称
+ private String responsibilityPersonName;
+
+ public String getResponsibilityPersonName() {
+ return responsibilityPersonName;
+ }
+
+ public void setResponsibilityPersonName(String responsibilityPersonName) {
+ this.responsibilityPersonName = responsibilityPersonName;
+ }
+ //装置部位分类 1：关键装置 2：重点部位
private Integer partType;
-
+
public Integer getPartType() {
return partType;
}
@@ -115,9 +145,9 @@
public void setPartType(Integer partType) {
this.partType = partType;
}
- //检查周期
+ //检查周期
private String checkCycle;
-
+
public String getCheckCycle() {
return checkCycle;
}
@@ -125,9 +155,9 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //应急预案/外键
+ //应急预案/外键
private Long emergencePlanId;
-
+
public Long getEmergencePlanId() {
return emergencePlanId;
}
@@ -135,9 +165,9 @@
public void setEmergencePlanId(Long emergencePlanId) {
this.emergencePlanId = emergencePlanId;
}
- //主要危险有害因素
+ //主要危险有害因素
private String dangerousElement;
-
+
public String getDangerousElement() {
return dangerousElement;
}
@@ -145,9 +175,9 @@
public void setDangerousElement(String dangerousElement) {
this.dangerousElement = dangerousElement;
}
- //易导致风险
+ //易导致风险
private String toDangerous;
-
+
public String getToDangerous() {
return toDangerous;
}
@@ -155,9 +185,9 @@
public void setToDangerous(String toDangerous) {
this.toDangerous = toDangerous;
}
- //应急处置措施
+ //应急处置措施
private String treatment;
-
+
public String getTreatment() {
return treatment;
}
@@ -165,9 +195,9 @@
public void setTreatment(String treatment) {
this.treatment = treatment;
}
- //现场图片
+ //现场图片
private String scenePic;
-
+
public String getScenePic() {
return scenePic;
}
@@ -175,5 +205,5 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
-
+
}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
index a0e2a3d..b0bc8bd 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/EquipmentInfoDto.java
@@ -54,6 +54,8 @@
private Timestamp nextTakecareDate;
//负责人ID外键
private Long leadingPersonId;
+ //负责人姓名
+ private String leadingPersonName;
//负责人部门外键
private Long leadingPersonDepartmentId;
//负责人部门名称
@@ -96,7 +98,9 @@
private Timestamp actualStopDate;
//停用提交人/外键
private Long stopSubmitPersonId;
- //停用提交日期
+ //停用提交人名称
+ private String stopSubmitPersonName;
+ //停用提交日期
private Timestamp stopSubmitDate;
//恢复理由
private String recoveryReason;
@@ -168,6 +172,22 @@
this.takecareDetailList = takecareDetailList;
}
+ public String getLeadingPersonName() {
+ return leadingPersonName;
+ }
+
+ public void setLeadingPersonName(String leadingPersonName) {
+ this.leadingPersonName = leadingPersonName;
+ }
+
+
+ public String getStopSubmitPersonName() {
+ return stopSubmitPersonName;
+ }
+
+ public void setStopSubmitPersonName(String stopSubmitPersonName) {
+ this.stopSubmitPersonName = stopSubmitPersonName;
+ }
//ID
public Long getId() {
return id;
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
index 56dd407..541a34e 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoDto.java
@@ -12,6 +12,8 @@
private Long id;
//类型/类别外键
private Long equipmentTypeId;
+ //类型名称
+ private String equipmentTypeName;
//名称
private String name;
//单位部门外键
@@ -22,12 +24,43 @@
private String position;
//负责人姓名
private String leadingPersonName;
- //联系人/外键
+ //联系人/外键
private Long connectPersonId;
- //录入人/外键
+ //联系人名称
+ private String connectPersonName;
+
+ public String getConnectPersonName() {
+ return connectPersonName;
+ }
+
+ public void setConnectPersonName(String connectPersonName) {
+ this.connectPersonName = connectPersonName;
+ }
+ //录入人/外键
private Long inputPersonId;
- //责任人/外键
+ //录入人名称
+ private String inputPersonName;
+
+ public String getInputPersonName() {
+ return inputPersonName;
+ }
+
+ public void setInputPersonName(String inputPersonName) {
+ this.inputPersonName = inputPersonName;
+ }
+ //责任人/外键
private Long responsibilityPersonId;
+
+ //责任人名称
+ private String responsibilityPersonName;
+
+ public String getResponsibilityPersonName() {
+ return responsibilityPersonName;
+ }
+
+ public void setResponsibilityPersonName(String responsibilityPersonName) {
+ this.responsibilityPersonName = responsibilityPersonName;
+ }
//装置部位分类 1：关键装置 2：重点部位
private Integer partType;
//检查周期
@@ -325,4 +358,12 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public String getEquipmentTypeName() {
+ return equipmentTypeName;
+ }
+
+ public void setEquipmentTypeName(String equipmentTypeName) {
+ this.equipmentTypeName = equipmentTypeName;
+ }
}
\ No newline at end of file
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
index 6aab315..07e848a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -80,8 +80,8 @@
EquipmentTestDetailQueryCriteria criteria1 = new EquipmentTestDetailQueryCriteria();
criteria1.setEquipmentId(f.getId());
criteria1.setInfoTpe(pageQuery.getSearchParams().getInfoType());
- List<EquipmentTestDetail> checkDetailList = equipmentTestDetailService.queryAll(criteria1);
- f.setCheckDetailList(checkDetailList);
+ List<EquipmentTestDetail> testDetailList = equipmentTestDetailService.queryAll(criteria1);
+ f.setTestDetailList(testDetailList);
//设备检查 TODO
@@ -101,7 +101,7 @@
collectDepIdSet.add(f.getLeadingDepartmentId());
collectDepIdSet.add(f.getLeadingPersonDepartmentId());
takecareDetailList.forEach(info->{collectDepIdSet.add(info.getLeadingPersonDepartmentId());});
- checkDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
+ testDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
repairDetailList.forEach(info->{collectDepIdSet.add(info.getRepairPersonDepartmentId());});
//获取部门名集合
@@ -112,7 +112,7 @@
f.setLeadingDepartmentName(depNameMap.get(f.getLeadingDepartmentId()));
f.setLeadingPersonDepartmentName(depNameMap.get(f.getLeadingPersonDepartmentId()));
takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
- checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
+ testDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
});
@@ -152,8 +152,8 @@
EquipmentTestDetailQueryCriteria criteria1 = new EquipmentTestDetailQueryCriteria();
criteria1.setEquipmentId(infoDto.getId());
criteria1.setInfoTpe(infoDto.getInfoType());
- List<EquipmentTestDetail> checkDetailList = equipmentTestDetailService.queryAll(criteria1);
- infoDto.setCheckDetailList(checkDetailList);
+ List<EquipmentTestDetail> testDetailList = equipmentTestDetailService.queryAll(criteria1);
+ infoDto.setTestDetailList(testDetailList);
//设备检查 TODO
@@ -187,7 +187,7 @@
collectDepIdSet.add(infoDto.getLeadingDepartmentId());
collectDepIdSet.add(infoDto.getLeadingPersonDepartmentId());
takecareDetailList.forEach(info->{collectDepIdSet.add(info.getLeadingPersonDepartmentId());});
- checkDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
+ testDetailList.forEach(info->{collectDepIdSet.add(info.getTestPersonDepartmentId());});
repairDetailList.forEach(info->{collectDepIdSet.add(info.getRepairPersonDepartmentId());});
//获取部门名集合
@@ -198,7 +198,7 @@
infoDto.setLeadingDepartmentName(depNameMap.get(infoDto.getLeadingDepartmentId()));
infoDto.setLeadingPersonDepartmentName(depNameMap.get(infoDto.getLeadingPersonDepartmentId()));
takecareDetailList.forEach(info->{info.setLeadingPersonDepartmentName(depNameMap.get(info.getLeadingPersonDepartmentId()));});
- checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
+ testDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
return infoDto;
}
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
index b0d0434..1c87836 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.equipment.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,7 @@
import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.model.dto.req.*;
+import com.gkhy.safePlatform.equipment.repository.EquipmentTypeMngRepository;
import com.gkhy.safePlatform.equipment.repository.KeypointEquipmentInfoRepository;
import com.gkhy.safePlatform.equipment.service.*;
import org.apache.dubbo.config.annotation.DubboReference;
@@ -58,6 +60,9 @@
@Autowired
private EquipmentInfoService equipmentInfoService;
+
+ @Autowired
+ private EquipmentTypeMngRepository equipmentTypeMngRepository;
@Override
public ResultVO queryAll(PageQuery<KeypointEquipmentInfoQueryCriteria> pageQuery) {
@@ -69,6 +74,7 @@
QueryHelpPlus.getPredicate(KeypointEquipmentInfo.class, pageQuery.getSearchParams()));
List<KeypointEquipmentInfoDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), KeypointEquipmentInfoDto.class);
+ Set<Long> collectTypeIdSet = new HashSet();
//获取额外信息
respList.forEach(f->{
//设备保养
@@ -95,6 +101,8 @@
List<EquipmentRepairDetail> repairDetailList = equipmentRepairDetailService.queryAll(criteria2);
f.setRepaireDetailList(repairDetailList);
+ // --------------------------- 获取设备设施类型管理ID-----------------------
+ collectTypeIdSet.add(f.getEquipmentTypeId());
// --------------------------- 获取部门信息-----------------------
//收集所用到的部门ID
@@ -113,6 +121,20 @@
checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
});
+
+
+ //获取设备设施类型名称
+ if(!collectTypeIdSet.isEmpty()){
+ List<EquipmentTypeMng> typeMngList = equipmentTypeMngRepository.selectList(new QueryWrapper<EquipmentTypeMng>().in("id",collectTypeIdSet));
+ Map<Long, String> typePool = new HashMap<>();
+ typeMngList.forEach(f->{
+ typePool.put(f.getId(),f.getTypeName());
+ });
+ respList.forEach(f->{
+ f.setEquipmentTypeName(typePool.get(f.getEquipmentTypeId()));
+ });
+ }
+
return new SearchResultVO<>(
true,
pageIndex,
@@ -193,6 +215,10 @@
checkDetailList.forEach(info->{info.setTestPersonDepartmentName(depNameMap.get(info.getTestPersonDepartmentId()));});
repairDetailList.forEach(info->{info.setRepairPersonDepartmentName(depNameMap.get(info.getRepairPersonDepartmentId()));});
+ EquipmentTypeMng typeMng = equipmentTypeMngRepository.selectOne(new QueryWrapper<EquipmentTypeMng>().eq("id",infoDto.getEquipmentTypeId()));
+ if(typeMng != null){
+ infoDto.setEquipmentTypeName(typeMng.getTypeName());
+ }
return infoDto;
}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/MetaHandler.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/MetaHandler.java
deleted file mode 100644
index 2d0174e..0000000
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/MetaHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Copyright (C) 2018-2022
- * All rights reserved, Designed By www.yixiang.co
- * 注意：
- * 本软件为www.yixiang.co开发研制
- */
-package com.gkhy.safePlatform.targetDuty.config;
-
-/**
- * @date ：Created in 2020-04-10 15:47
- * @description：自动注入时间处理
- * @modified By：
- * @version:
- */
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import org.apache.ibatis.reflection.MetaObject;
-
-import java.sql.Timestamp;
-
-/**
- * 处理新增和更新的基础数据填充，配合BaseEntity和MyBatisPlusConfig使用
- */
-//@Component
-public class MetaHandler implements MetaObjectHandler {
-
-
- /**
- * 新增数据执行
- *
- * @param metaObject
- */
- @Override
- public void insertFill(MetaObject metaObject) {
- try {
- Timestamp time = new Timestamp(System.currentTimeMillis());
- if (metaObject.hasSetter("createTime")) {
- this.setFieldValByName("createTime", time, metaObject);
- }
- if (metaObject.hasSetter("updateTime")) {
- this.setFieldValByName("updateTime", time, metaObject);
- }
- if (metaObject.hasSetter("createDate")) {
- this.setFieldValByName("createDate", time, metaObject);
- }
- if (metaObject.hasSetter("updateDate")) {
- this.setFieldValByName("updateDate", time, metaObject);
- }
- if (metaObject.hasSetter("delFlag")) {
- this.setFieldValByName("delFlag", false, metaObject);
- }
- } catch (Exception e) {
- System.out.println("自动注入失败:"+e.getMessage());
- }
- }
-
- /**
- * 更新数据执行
- *
- * @param metaObject
- */
- @Override
- public void updateFill(MetaObject metaObject) {
- try {
- Timestamp time = new Timestamp(System.currentTimeMillis());
- if (metaObject.hasSetter("updateTime")) {
- this.setFieldValByName("updateTime", time, metaObject);
- }
- if (metaObject.hasSetter("updateDate")) {
- this.setFieldValByName("updateDate", time, metaObject);
- }
- if (metaObject.hasSetter("delFlag")) {
- this.setFieldValByName("delFlag", null, metaObject);
- }
- if (metaObject.hasSetter("createTime")) {
- this.setFieldValByName("createTime", null, metaObject);
- }
- } catch (Exception e) {
- System.out.println("自动注入失败:"+e.getMessage());
- }
- }
-
-}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/PublicFileUrlConfig.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/PublicFileUrlConfig.java
deleted file mode 100644
index 77d402d..0000000
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/config/PublicFileUrlConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gkhy.safePlatform.targetDuty.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 公共文件的配置
- */
-
-@Configuration("sss")
-@ConfigurationProperties(prefix = "public-file")
-public class PublicFileUrlConfig {
-
- /**
- * 上传的地址
- */
- private static String uploadUrl;
-
- public void setUploadUrl(String uploadUrl) {
- PublicFileUrlConfig.uploadUrl = uploadUrl;
- }
-
- public static String getUploadUrl() {
- return uploadUrl;
- }
-
- /**
- * 资源的域名
- */
- private static String domain;
-
- public void setDomain(String domain) {
- PublicFileUrlConfig.domain = domain;
- }
-
- public static String getDomain() {
- return domain;
- }
-}
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
index fa211c7..04a6a4d 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
@@ -1,6 +1,8 @@
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;
@@ -58,6 +60,7 @@
this.itemDetail = itemDetail;
}
//考核日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp examineDate;
public Timestamp getExamineDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
index 227072e..d440426 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
@@ -1,6 +1,8 @@
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;
@@ -107,7 +109,7 @@
public void setSetPersonDepartmentId(Long setPersonDepartmentId) {
this.setPersonDepartmentId = setPersonDepartmentId;
}
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp setTimem;
public Timestamp getSetTimem() {
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 3d99f43..77f17d2 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,6 +1,8 @@
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;
@@ -48,6 +50,7 @@
this.value = value;
}
//制定日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp makeDate;
public Timestamp getMakeDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
index 7344921..eca6eb8 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 目标责任书(TargetDutyfileInfo)表实体类
*
* @author xurui
- * @since 2022-07-21 10:07:54
+ * @since 2022-08-09 11:07:00
*/
@SuppressWarnings("serial")
@TableName("target_dutyfile_info")
@@ -28,7 +29,7 @@
}
//序号
- private String indexNum;
+ private String indexNum;
public String getIndexNum() {
return indexNum;
@@ -38,7 +39,7 @@
this.indexNum = indexNum;
}
//岗位号/外键
- private Long jobId;
+ private Long jobId;
public Long getJobId() {
return jobId;
@@ -48,7 +49,8 @@
this.jobId = jobId;
}
//责任书签订日期
- private Timestamp signDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Timestamp signDate;
public Timestamp getSignDate() {
return signDate;
@@ -58,7 +60,7 @@
this.signDate = signDate;
}
//备注信息
- private String memo;
+ private String memo;
public String getMemo() {
return memo;
@@ -68,7 +70,7 @@
this.memo = memo;
}
//责任书附件，多个附件用逗号隔开
- private String extraFile;
+ private String extraFile;
public String getExtraFile() {
return extraFile;
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
index 5178188..12cf42a 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
@@ -1,6 +1,8 @@
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;
@@ -68,6 +70,7 @@
this.makerDepartmentId = makerDepartmentId;
}
//制定日期
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp makeDate;
public Timestamp getMakeDate() {
@@ -88,6 +91,7 @@
this.uploadValue = uploadValue;
}
//上报时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp uploadDate;
public Timestamp getUploadDate() {
@@ -118,6 +122,7 @@
this.examinePersonId = examinePersonId;
}
//考核时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp examineDate;
public Timestamp getExamineDate() {
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
index 7013024..bd836e3 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -1,6 +1,8 @@
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;
@@ -79,6 +81,7 @@
this.level = level;
}
//完成期限
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp completeDate;
public Timestamp getCompleteDate() {
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 ab0c764..a037e86 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,9 +5,11 @@
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;
@@ -65,4 +67,11 @@
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/controller/AccidentWorkApproveController.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentWorkApproveController.java
deleted file mode 100644
index 4d6698a..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentWorkApproveController.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.controller;
-
-import com.gkhy.safePlatform.commons.co.ContextCacheUser;
-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.incidentManage.model.dto.req.AccidentWorkApproveReqDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO;
-import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery;
-import com.gkhy.safePlatform.incidentManage.service.AccidentWorkApproveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/accidentWorkApprove")
-public class AccidentWorkApproveController {
-
- @Autowired
- private AccidentWorkApproveService workApproveService;
-
- /**
- * 应急预案列表
- */
- @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
- private ResultVO<List<AccidentWorkApprovePageRespDTO>> list (@RequestBody PageQuery<AccidentWorkApproveQuery> pageQuery){
- PageUtils.checkCheck(pageQuery);
- return workApproveService.selectWorkApproveList(pageQuery);
- }
-
- /**
- * 应急预案新增
- */
- @RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addWorkApprove(Authentication authentication, @RequestBody AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) {
- ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return workApproveService.addWorkApprove(currentUser.getUid(), AccidentWorkApproveReqDTO);
- }
-
- /**
- * 应急预案详情
- */
- @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
- public ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(@PathVariable("id")Long id){
- return workApproveService.getWorkApproveById(id);
- }
-
- /**
- * 应急预案修改
- */
- @RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateWorkApprove(Authentication authentication, @RequestBody AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) {
- ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return workApproveService.updateWorkApprove(currentUser.getUid(), AccidentWorkApproveReqDTO);
- }
-
- /**
- * 应急预案删除/批量删除
- */
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteWorkApprove(@PathVariable("ids")String ids){
- return workApproveService.batchDeleteWorkApprove(ids);
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCount.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCount.java
new file mode 100644
index 0000000..17f1c85
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportCount.java
@@ -0,0 +1,67 @@
+package com.gkhy.safePlatform.incidentManage.entity;
+
+
+import java.math.BigDecimal;
+
+public class AccidentReportCount {
+
+ private String name ;
+
+ private Integer num ;
+
+ private int minorInjuryNum;
+
+ private int seriousInjuryNum;
+
+ private int deathNum;
+
+ private BigDecimal economicLoss;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public int getMinorInjuryNum() {
+ return minorInjuryNum;
+ }
+
+ public void setMinorInjuryNum(int minorInjuryNum) {
+ this.minorInjuryNum = minorInjuryNum;
+ }
+
+ public int getSeriousInjuryNum() {
+ return seriousInjuryNum;
+ }
+
+ public void setSeriousInjuryNum(int seriousInjuryNum) {
+ this.seriousInjuryNum = seriousInjuryNum;
+ }
+
+ public int getDeathNum() {
+ return deathNum;
+ }
+
+ public void setDeathNum(int deathNum) {
+ this.deathNum = deathNum;
+ }
+
+ public BigDecimal getEconomicLoss() {
+ return economicLoss;
+ }
+
+ public void setEconomicLoss(BigDecimal economicLoss) {
+ this.economicLoss = economicLoss;
+ }
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java
deleted file mode 100644
index f4f7752..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfo.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("work_approve")
-public class AccidentWorkApproveInfo {
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private Boolean delFlag;
-
- private Date gmtCreate;
-
- private Date gmtModitify;
-
- private Long createUid;
-
- private Long updateUid;
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批人ID/外键
- private Long approvePersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
- //审批意见
- private Boolean approveResult;
- //审批意见
- private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
- private Integer relateType;
- //关联的审批对象表ID
- private Long relateId;
- //关联业务说明
- private String relateDesc;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Boolean getDelFlag() {
- return delFlag;
- }
-
- public void setDelFlag(Boolean delFlag) {
- this.delFlag = delFlag;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-
- public Date getGmtModitify() {
- return gmtModitify;
- }
-
- public void setGmtModitify(Date gmtModitify) {
- this.gmtModitify = gmtModitify;
- }
-
- public Long getCreateUid() {
- return createUid;
- }
-
- public void setCreateUid(Long createUid) {
- this.createUid = createUid;
- }
-
- public Long getUpdateUid() {
- return updateUid;
- }
-
- public void setUpdateUid(Long updateUid) {
- this.updateUid = updateUid;
- }
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
- public Long getApprovePersonId() {
- return approvePersonId;
- }
-
- public void setApprovePersonId(Long approvePersonId) {
- this.approvePersonId = approvePersonId;
- }
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
- public Boolean getApproveResult() {
- return approveResult;
- }
-
- public void setApproveResult(Boolean approveResult) {
- this.approveResult = approveResult;
- }
-
- public String getApproveMemo() {
- return approveMemo;
- }
-
- public void setApproveMemo(String approveMemo) {
- this.approveMemo = approveMemo;
- }
-
- public Integer getRelateType() {
- return relateType;
- }
-
- public void setRelateType(Integer relateType) {
- this.relateType = relateType;
- }
-
- public Long getRelateId() {
- return relateId;
- }
-
- public void setRelateId(Long relateId) {
- this.relateId = relateId;
- }
-
- public String getRelateDesc() {
- return relateDesc;
- }
-
- public void setRelateDesc(String relateDesc) {
- this.relateDesc = relateDesc;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java
deleted file mode 100644
index f6a4c3f..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoDetailDO.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("work_approve")
-public class AccidentWorkApproveInfoDetailDO {
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private Date gmtCreate;
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批人ID/外键
- private Long approvePersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
- //审批意见
- private Boolean approveResult;
- //审批意见
- private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
- private Integer relateType;
- //关联的审批对象表ID
- private Long relateId;
- //关联业务说明
- private String relateDesc;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
- public Long getApprovePersonId() {
- return approvePersonId;
- }
-
- public void setApprovePersonId(Long approvePersonId) {
- this.approvePersonId = approvePersonId;
- }
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
- public Boolean getApproveResult() {
- return approveResult;
- }
-
- public void setApproveResult(Boolean approveResult) {
- this.approveResult = approveResult;
- }
-
- public String getApproveMemo() {
- return approveMemo;
- }
-
- public void setApproveMemo(String approveMemo) {
- this.approveMemo = approveMemo;
- }
-
- public Integer getRelateType() {
- return relateType;
- }
-
- public void setRelateType(Integer relateType) {
- this.relateType = relateType;
- }
-
- public Long getRelateId() {
- return relateId;
- }
-
- public void setRelateId(Long relateId) {
- this.relateId = relateId;
- }
-
- public String getRelateDesc() {
- return relateDesc;
- }
-
- public void setRelateDesc(String relateDesc) {
- this.relateDesc = relateDesc;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java
deleted file mode 100644
index 8d1e60a..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentWorkApproveInfoPageDO.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("work_approve")
-public class AccidentWorkApproveInfoPageDO {
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- private Date gmtCreate;
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java
deleted file mode 100644
index 346a08b..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/enums/ApproveStatus.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.enums;
-
-public enum ApproveStatus {
-
- NOT_APPROVE(1),
- UNDER_APPROVE(2),
- COMPLETED_APPROVE(3);
-
- private Integer status;
-
-
- public Integer getStatus() {
- return status;
- }
-
- public void setStatus(Integer status) {
- this.status = status;
- }
-
-
- ApproveStatus(Integer status) {
- this.status = status;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java
deleted file mode 100644
index bec284e..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentWorkApproveReqDTO.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.model.dto.req;
-
-public class AccidentWorkApproveReqDTO {
-
- private Long id;
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批人ID/外键
- private Long approvePersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
- //审批意见
- private Boolean approveResult;
- //审批意见
- private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
- private Integer relateType;
- //关联的审批对象表ID
- private Long relateId;
- //关联业务说明
- private String relateDesc;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
- public Long getApprovePersonId() {
- return approvePersonId;
- }
-
- public void setApprovePersonId(Long approvePersonId) {
- this.approvePersonId = approvePersonId;
- }
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
- public Boolean getApproveResult() {
- return approveResult;
- }
-
- public void setApproveResult(Boolean approveResult) {
- this.approveResult = approveResult;
- }
-
- public String getApproveMemo() {
- return approveMemo;
- }
-
- public void setApproveMemo(String approveMemo) {
- this.approveMemo = approveMemo;
- }
-
- public Integer getRelateType() {
- return relateType;
- }
-
- public void setRelateType(Integer relateType) {
- this.relateType = relateType;
- }
-
- public Long getRelateId() {
- return relateId;
- }
-
- public void setRelateId(Long relateId) {
- this.relateId = relateId;
- }
-
- public String getRelateDesc() {
- return relateDesc;
- }
-
- public void setRelateDesc(String relateDesc) {
- this.relateDesc = relateDesc;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportCountRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportCountRespDTO.java
new file mode 100644
index 0000000..a655b71
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportCountRespDTO.java
@@ -0,0 +1,67 @@
+package com.gkhy.safePlatform.incidentManage.model.dto.resp;
+
+
+import java.math.BigDecimal;
+
+public class AccidentReportCountRespDTO {
+
+ private String name ;
+
+ private Integer num ;
+
+ private int minorInjuryNum;
+
+ private int seriousInjuryNum;
+
+ private int deathNum;
+
+ private BigDecimal economicLoss;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public int getMinorInjuryNum() {
+ return minorInjuryNum;
+ }
+
+ public void setMinorInjuryNum(int minorInjuryNum) {
+ this.minorInjuryNum = minorInjuryNum;
+ }
+
+ public int getSeriousInjuryNum() {
+ return seriousInjuryNum;
+ }
+
+ public void setSeriousInjuryNum(int seriousInjuryNum) {
+ this.seriousInjuryNum = seriousInjuryNum;
+ }
+
+ public int getDeathNum() {
+ return deathNum;
+ }
+
+ public void setDeathNum(int deathNum) {
+ this.deathNum = deathNum;
+ }
+
+ public BigDecimal getEconomicLoss() {
+ return economicLoss;
+ }
+
+ public void setEconomicLoss(BigDecimal economicLoss) {
+ this.economicLoss = economicLoss;
+ }
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java
deleted file mode 100644
index 7c155f2..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApproveDetailRespDTO.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.model.dto.resp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-public class AccidentWorkApproveDetailRespDTO {
-
- private Long id;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date gmtCreate;
-
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批人ID/外键
- private Long approvePersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
- //审批意见
- private Boolean approveResult;
- //审批意见
- private String approveMemo;
- //关联业务类型 1:目标检查 2:目标上报
- private Integer relateType;
- //关联的审批对象表ID
- private Long relateId;
- //关联业务说明
- private String relateDesc;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
- public Long getApprovePersonId() {
- return approvePersonId;
- }
-
- public void setApprovePersonId(Long approvePersonId) {
- this.approvePersonId = approvePersonId;
- }
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-
- public Boolean getApproveResult() {
- return approveResult;
- }
-
- public void setApproveResult(Boolean approveResult) {
- this.approveResult = approveResult;
- }
-
- public String getApproveMemo() {
- return approveMemo;
- }
-
- public void setApproveMemo(String approveMemo) {
- this.approveMemo = approveMemo;
- }
-
- public Integer getRelateType() {
- return relateType;
- }
-
- public void setRelateType(Integer relateType) {
- this.relateType = relateType;
- }
-
- public Long getRelateId() {
- return relateId;
- }
-
- public void setRelateId(Long relateId) {
- this.relateId = relateId;
- }
-
- public String getRelateDesc() {
- return relateDesc;
- }
-
- public void setRelateDesc(String relateDesc) {
- this.relateDesc = relateDesc;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java
deleted file mode 100644
index b94f503..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentWorkApprovePageRespDTO.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.model.dto.resp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-public class AccidentWorkApprovePageRespDTO {
-
- private Long id;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date gmtCreate;
-
- //流程名称
- private String workName;
- //流程标题
- private String title;
- //提交人ID/外键
- private Long submitPersonId;
- //审批状态 1：未审批 2：审批中 3：审批完成
- private Integer approveStatus;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-
- public String getWorkName() {
- return workName;
- }
-
- public void setWorkName(String workName) {
- this.workName = workName;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public Long getSubmitPersonId() {
- return submitPersonId;
- }
-
- public void setSubmitPersonId(Long submitPersonId) {
- this.submitPersonId = submitPersonId;
- }
-
-
- public Integer getApproveStatus() {
- return approveStatus;
- }
-
- public void setApproveStatus(Integer approveStatus) {
- this.approveStatus = approveStatus;
- }
-}
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/AccidentReportRPCQuery.java
new file mode 100644
index 0000000..bc7008a
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentReportRPCQuery.java
@@ -0,0 +1,45 @@
+package com.gkhy.safePlatform.incidentManage.query;
+
+public class AccidentReportRPCQuery {
+
+ private String level;
+
+ // type=1:月 type=2:年
+ private Integer type;
+
+ private int year;
+
+ private int month;
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public int getYear() {
+ return year;
+ }
+
+ public void setYear(int year) {
+ this.year = year;
+ }
+
+ public int getMonth() {
+ return month;
+ }
+
+ public void setMonth(int month) {
+ this.month = month;
+ }
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java
deleted file mode 100644
index 83ba9e0..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/AccidentWorkApproveQuery.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.query;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-public class AccidentWorkApproveQuery {
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportRPCDBQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportRPCDBQuery.java
new file mode 100644
index 0000000..81928c2
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentReportRPCDBQuery.java
@@ -0,0 +1,34 @@
+package com.gkhy.safePlatform.incidentManage.query.db;
+
+public class AccidentReportRPCDBQuery {
+
+ private String level;
+
+ private String startTime;
+
+ private String endTime;
+
+ public String getLevel() {
+ return level;
+ }
+
+ public void setLevel(String level) {
+ this.level = level;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java
deleted file mode 100644
index 64440d6..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/query/db/AccidentWorkApproveDBQuery.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.query.db;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-public class AccidentWorkApproveDBQuery {
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentReportInfoRepository.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentReportInfoRepository.java
index b961e3e..b584a02 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentReportInfoRepository.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentReportInfoRepository.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.incidentManage.entity.AccidentReportCount;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfo;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoDetailDO;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoPageDO;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
+import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -23,4 +25,6 @@
void updateAccidentReport(AccidentReportInfo accidentReportInfo);
void deleteAccidentReportById(@Param("id") Long id);
+
+ List<AccidentReportCount> selectByTimeAndType(@Param("query")AccidentReportRPCDBQuery dbQuery);
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java
deleted file mode 100644
index 965481b..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentWorkApproveInfoRepository.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO;
-import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface AccidentWorkApproveInfoRepository extends BaseMapper<AccidentWorkApproveInfo> {
-
- List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, @Param("query") AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery);
-
- void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo);
-
- AccidentWorkApproveInfoDetailDO selectWorkApproveById(@Param("id") Long id);
-
- void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo);
-
- void deleteWorkApproveById(@Param("id") Long id);
-
-}
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 667b210..77d07de 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,9 +4,11 @@
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;
@@ -21,4 +23,6 @@
ResultVO updateAccidentReport(Long uid, AccidentReportReqDTO AccidentReportReqDTO);
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/AccidentWorkApproveService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentWorkApproveService.java
deleted file mode 100644
index 6e10ac8..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentWorkApproveService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.service;
-
-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.incidentManage.model.dto.req.AccidentWorkApproveReqDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO;
-import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery;
-
-import java.util.List;
-
-public interface AccidentWorkApproveService {
-
- SearchResultVO<List<AccidentWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<AccidentWorkApproveQuery> query);
-
- ResultVO addWorkApprove(Long valueOf, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO);
-
- ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(Long id);
-
- ResultVO updateWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO);
-
- ResultVO batchDeleteWorkApprove(String ids);
-
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java
index dd5694b..cd7a270 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.incidentManage.entity.AccidentReportCount;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfo;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoDetailDO;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoPageDO;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
+import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
import java.util.List;
@@ -21,4 +23,7 @@
void updateAccidentReport(AccidentReportInfo AccidentReportInfo);
void deleteAccidentReportById(Long teamId);
+
+ List<AccidentReportCount> selectByTimeAndType(AccidentReportRPCDBQuery dbQuery);
+
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java
deleted file mode 100644
index fb8a35e..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentWorkApproveInfoService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.service.baseService;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO;
-import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery;
-
-import java.util.List;
-
-
-public interface AccidentWorkApproveInfoService extends IService<AccidentWorkApproveInfo> {
-
- List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery);
-
- void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo);
-
- AccidentWorkApproveInfoDetailDO selectWorkApproveById(Long id);
-
- void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo);
-
- void deleteWorkApproveById(Long teamId);
-}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentReportInfoServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentReportInfoServiceImpl.java
index 3a1de57..02c760d 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentReportInfoServiceImpl.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentReportInfoServiceImpl.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.incidentManage.entity.AccidentReportCount;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfo;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoDetailDO;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoPageDO;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
+import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
import com.gkhy.safePlatform.incidentManage.repository.AccidentReportInfoRepository;
import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentReportInfoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,5 +46,9 @@
accidentReportInfoRepository.deleteAccidentReportById(teamId);
}
+ @Override
+ public List<AccidentReportCount> selectByTimeAndType(AccidentReportRPCDBQuery dbQuery) {
+ return accidentReportInfoRepository.selectByTimeAndType(dbQuery);
+ }
}
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java
deleted file mode 100644
index b63645d..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/impl/AccidentWorkApproveServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO;
-import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery;
-import com.gkhy.safePlatform.incidentManage.repository.AccidentWorkApproveInfoRepository;
-import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentWorkApproveInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("AccidentWorkApproveInfoService")
-public class AccidentWorkApproveServiceImpl extends ServiceImpl<AccidentWorkApproveInfoRepository, AccidentWorkApproveInfo> implements AccidentWorkApproveInfoService {
-
- @Autowired
- private AccidentWorkApproveInfoRepository AccidentWorkApproveInfoRepository;
-
- @Override
- public List<AccidentWorkApproveInfoPageDO> selectWorkApproveList(Page<AccidentWorkApproveInfoPageDO> page, AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery) {
- return AccidentWorkApproveInfoRepository.selectWorkApproveList(page, AccidentWorkApproveDBQuery);
- }
-
- @Override
- public void addWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo) {
- AccidentWorkApproveInfoRepository.addWorkApprove(AccidentWorkApproveInfo);
- }
-
- @Override
- public AccidentWorkApproveInfoDetailDO selectWorkApproveById(Long id) {
- return AccidentWorkApproveInfoRepository.selectWorkApproveById(id);
- }
-
- @Override
- public void updateWorkApprove(AccidentWorkApproveInfo AccidentWorkApproveInfo) {
- AccidentWorkApproveInfoRepository.updateWorkApprove(AccidentWorkApproveInfo);
- }
-
- @Override
- public void deleteWorkApproveById(Long teamId) {
- AccidentWorkApproveInfoRepository.deleteWorkApproveById(teamId);
- }
-
-
-}
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 591d9a5..c32bc28 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
@@ -14,16 +14,21 @@
import com.gkhy.safePlatform.incidentManage.exception.AccidentException;
import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentReportFileReqDTO;
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.AccidentReportFileRespDTO;
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.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.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;
@@ -219,6 +224,7 @@
}
}
+
private void deleteAccidentReport(Long id) {
//查询是否存在
AccidentReportInfoDetailDO AccidentReportInfoDetailDO = accidentReportInfoService.selectAccidentReportById(id);
@@ -297,4 +303,29 @@
}
}
+ @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/service/impl/AccidentWorkApproveServiceImpl.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentWorkApproveServiceImpl.java
deleted file mode 100644
index 38ab581..0000000
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentWorkApproveServiceImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.gkhy.safePlatform.incidentManage.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.commons.enums.ResultCodes;
-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.incidentManage.entity.AccidentWorkApproveInfo;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO;
-import com.gkhy.safePlatform.incidentManage.enums.ApproveStatus;
-import com.gkhy.safePlatform.incidentManage.model.dto.req.AccidentWorkApproveReqDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApproveDetailRespDTO;
-import com.gkhy.safePlatform.incidentManage.model.dto.resp.AccidentWorkApprovePageRespDTO;
-import com.gkhy.safePlatform.incidentManage.query.AccidentWorkApproveQuery;
-import com.gkhy.safePlatform.incidentManage.query.db.AccidentWorkApproveDBQuery;
-import com.gkhy.safePlatform.incidentManage.service.AccidentWorkApproveService;
-import com.gkhy.safePlatform.incidentManage.service.baseService.AccidentWorkApproveInfoService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service("AccidentWorkApproveService")
-public class AccidentWorkApproveServiceImpl implements AccidentWorkApproveService {
-
- @Autowired
- private AccidentWorkApproveInfoService workApproveInfoService;
-
- @Override
- public SearchResultVO<List<AccidentWorkApprovePageRespDTO>> selectWorkApproveList(PageQuery<AccidentWorkApproveQuery> query) {
- Long pageIndex = query.getPageIndex();
- Long pageSize = query.getPageSize();
- Page<AccidentWorkApproveInfoPageDO> page = new Page<>(pageIndex, pageSize);
-
- AccidentWorkApproveDBQuery AccidentWorkApproveDBQuery = new AccidentWorkApproveDBQuery();
- if (query.getSearchParams() != null) {
- BeanUtils.copyProperties(query.getSearchParams(), AccidentWorkApproveDBQuery);
- }
-
- List<AccidentWorkApproveInfoPageDO> AccidentWorkApproveInfoPageDOList = workApproveInfoService.selectWorkApproveList(page, AccidentWorkApproveDBQuery);
- List<AccidentWorkApprovePageRespDTO> respList = BeanCopyUtils.copyBeanList(AccidentWorkApproveInfoPageDOList, AccidentWorkApprovePageRespDTO.class);
-
- return new SearchResultVO<>(
- true,
- pageIndex,
- pageSize,page.getPages(),
- page.getTotal(),
- respList,
- ResultCodes.OK
- );
- }
-
- @Override
- public ResultVO addWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) {
-
- Date nowDate = new Date();
- //1.新增应急队伍
- AccidentWorkApproveInfo AccidentWorkApproveInfo = new AccidentWorkApproveInfo();
- BeanUtils.copyProperties(AccidentWorkApproveReqDTO, AccidentWorkApproveInfo);
- AccidentWorkApproveInfo.setDelFlag(false);
- AccidentWorkApproveInfo.setCreateUid(uid);
- AccidentWorkApproveInfo.setGmtCreate(nowDate);
- AccidentWorkApproveInfo.setApproveStatus(ApproveStatus.NOT_APPROVE.getStatus());
- workApproveInfoService.addWorkApprove(AccidentWorkApproveInfo);
- return new ResultVO(ResultCodes.OK);
- }
-
- @Override
- public ResultVO<AccidentWorkApproveDetailRespDTO> getWorkApproveById(Long id) {
-
- AccidentWorkApproveInfoDetailDO AccidentWorkApproveInfoDetailDO = workApproveInfoService.selectWorkApproveById(id);
- AccidentWorkApproveDetailRespDTO AccidentWorkApproveDetailRespDTO = new AccidentWorkApproveDetailRespDTO();
- BeanUtils.copyProperties(AccidentWorkApproveInfoDetailDO, AccidentWorkApproveDetailRespDTO);
-
- return new ResultVO<>(ResultCodes.OK, AccidentWorkApproveDetailRespDTO);
- }
-
- @Override
- public ResultVO updateWorkApprove(Long uid, AccidentWorkApproveReqDTO AccidentWorkApproveReqDTO) {
- Date nowDate = new Date();
- AccidentWorkApproveInfo AccidentWorkApproveInfo = new AccidentWorkApproveInfo();
- BeanUtils.copyProperties(AccidentWorkApproveReqDTO, AccidentWorkApproveInfo);
- AccidentWorkApproveInfo.setUpdateUid(uid);
- AccidentWorkApproveInfo.setGmtModitify(nowDate);
- workApproveInfoService.updateWorkApprove(AccidentWorkApproveInfo);
- return new ResultVO(ResultCodes.OK);
- }
-
- @Override
- public ResultVO batchDeleteWorkApprove(String ids) {
- if (!StringUtils.isBlank(ids)) {
- String[] idArr = ids.split(",");
- for (String id : idArr) {
- deleteWorkApprove(Long.valueOf(id));
- }
- }
- return new ResultVO(ResultCodes.OK);
- }
-
-
- private void deleteWorkApprove(Long id) {
- workApproveInfoService.deleteWorkApproveById(id);
- }
-
-
-}
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
new file mode 100644
index 0000000..70d8f9d
--- /dev/null
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/utils/TimeUtils.java
@@ -0,0 +1,80 @@
+package com.gkhy.safePlatform.incidentManage.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class TimeUtils {
+
+ public static String formatDate(Date date){
+ SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd");
+ String sDate = f.format(date);
+ return sDate;
+ }
+
+ /**
+ * 获取某年第一天日期
+ * @param year 年份
+ * @return Date
+ */
+ public static String getYearFirst(int year){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ Date currYearFirst = calendar.getTime();
+ return formatDate(currYearFirst);
+ }
+
+ /**
+ * 获取某年最后一天日期
+ * @param year 年份
+ * @return Date
+ */
+ public static String getYearLast(int year){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ calendar.roll(Calendar.DAY_OF_YEAR, -1);
+ Date currYearLast = calendar.getTime();
+
+ return formatDate(currYearLast);
+ }
+
+ /**
+ * 获取某月第一天日期
+ * @param month 年份
+ * @return Date
+ */
+ public static String getMonthFirst(int year ,int month){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ calendar.set(Calendar.MONTH, month-1);
+ Date currYearFirst = calendar.getTime();
+ return formatDate(currYearFirst);
+ }
+
+ /**
+ * 获取某月最后一天日期
+ * @param month 年份
+ * @return Date
+ */
+ public static String getMonthLast(int year ,int month){
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+ calendar.set(Calendar.MONTH, month-1);
+ calendar.roll(Calendar.DAY_OF_MONTH, -1);
+ Date currYearLast = calendar.getTime();
+
+ return formatDate(currYearLast);
+ }
+
+
+ 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));
+ }
+}
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
index e9ab493..3a9ba3d 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
@@ -190,4 +190,33 @@
<update id="deleteAccidentReportById">
update accident_report set del_flag = 1 where id = #{id}
</update>
+
+
+ <resultMap type="com.gkhy.safePlatform.incidentManage.entity.AccidentReportCount"
+ id="emergencyDrillExecuteCountChart">
+ <result column="num" property="num"/>
+ <result column="name" property="name"/>
+ <result column="minorInjuryNum" property="minorInjuryNum"/>
+ <result column="seriousInjuryNum" property="seriousInjuryNum"/>
+ <result column="deathNum" property="deathNum"/>
+ <result column="economicLoss" property="economicLoss"/>
+ </resultMap>
+ <select id="selectByTimeAndType" resultMap="emergencyDrillExecuteCountChart">
+ SELECT
+ a.accident_level AS `name`,
+ count( 0 ) AS num,
+ sum( economic_loss ) AS economicLoss,
+ sum( minor_injury_num ) AS minorInjuryNum,
+ sum( serious_injury_num ) AS seriousInjuryNum,
+ sum( death_num ) AS deathNum
+ FROM
+ `accident_report` a
+ WHERE
+ del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{query.startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{query.endTime}
+ <if test="query.level != null and query.level != ''" >and b.drill_level = #{query.level}</if>
+ GROUP BY
+ accident_level
+ </select>
</mapper>
diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentWorkApproveInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentWorkApproveInfoMapper.xml
deleted file mode 100644
index d168c06..0000000
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentWorkApproveInfoMapper.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gkhy.safePlatform.incidentManage.repository.AccidentWorkApproveInfoRepository">
-
- <resultMap type="com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoPageDO" id="accidentWorkApproveInfoPageDOResult">
- <id column="id" property="id" jdbcType="BIGINT"/>
- <result column="gmt_create" property="gmtCreate"/>
- <result column="work_name" property="workName"/>
- <result column="title" property="title"/>
- <result column="submit_person_id" property="submitPersonId"/>
- <result column="approve_status" property="approveStatus"/>
- </resultMap>
-
-
- <select id="selectWorkApproveList" resultMap="accidentWorkApproveInfoPageDOResult">
- select id,`work_name`,`title`,`submit_person_id`,`approve_status`,gmt_create from accident_work_approve where del_flag = 0
- <if test="query.startTime != null "> and gmt_create <![CDATA[ >= ]]> #{query.startTime}</if>
- <if test="query.endTime != null "> and gmt_create <![CDATA[ <= ]]> #{query.endTime}</if>
- </select>
-
- <insert id="addWorkApprove" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo"
- keyProperty="id" useGeneratedKeys="true">
- insert into accident_work_approve
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null ">id,</if>
- <if test="delFlag != null ">del_flag,</if>
- <if test="gmtCreate != null ">gmt_create,</if>
- <if test="gmtModitify != null ">gmt_moditify,</if>
- <if test="createUid != null ">create_uid,</if>
- <if test="updateUid != null ">update_uid,</if>
-
- <if test="workName != null and workName != ''">work_name,</if>
- <if test="title != null and title != ''">title,</if>
- <if test="submitPersonId != null ">submit_person_id,</if>
- <if test="approvePersonId != null ">approve_person_id,</if>
- <if test="approveStatus != null ">approve_status,</if>
- <if test="approveResult != null ">approve_result,</if>
- <if test="approveMemo != null and approveMemo != ''">approve_memo,</if>
- <if test="relateType != null ">relate_type,</if>
- <if test="relateId != null ">relate_id,</if>
- <if test="relateDesc != null and relateDesc != ''">relate_desc,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null ">#{id},</if>
- <if test="delFlag != null ">#{delFlag},</if>
- <if test="gmtCreate != null ">#{gmtCreate},</if>
- <if test="gmtModitify != null ">#{gmtModitify},</if>
- <if test="createUid != null ">#{createUid},</if>
- <if test="updateUid != null ">#{updateUid},</if>
-
- <if test="workName != null and workName != ''">#{workName},</if>
- <if test="title != null and title != ''">#{title},</if>
- <if test="submitPersonId != null ">#{submitPersonId},</if>
- <if test="approvePersonId != null ">#{approvePersonId},</if>
- <if test="approveStatus != null ">#{approveStatus},</if>
- <if test="approveResult != null ">#{approveResult},</if>
- <if test="approveMemo != null and approveMemo != ''">#{approveMemo},</if>
- <if test="relateType != null ">#{relateType},</if>
- <if test="relateId != null ">#{relateId},</if>
- <if test="relateDesc != null and relateDesc != ''">#{relateDesc},</if>
- </trim>
- </insert>
-
- <resultMap type="com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfoDetailDO"
- id="WorkApproveInfoDetailDOResult">
- <id column="id" property="id" jdbcType="BIGINT"/>
- <result column="work_name" property="workName"/>
- <result column="title" property="title"/>
- <result column="submit_person_id" property="submitPersonId"/>
- <result column="approve_person_id" property="approvePersonId"/>
- <result column="approve_status" property="approveStatus"/>
- <result column="approve_result" property="approveResult"/>
- <result column="approve_memo" property="approveMemo"/>
- <result column="relate_type" property="relateType"/>
- <result column="relate_id" property="relateId"/>
- <result column="relate_desc" property="relateDesc"/>
- </resultMap>
-
- <select id="selectWorkApproveById" resultMap="WorkApproveInfoDetailDOResult">
- select id,gmt_create ,work_name,title,`submit_person_id`,`approve_person_id`,`approve_status`,approve_result,`approve_memo`,
- `relate_type`,relate_id,`relate_desc`
- from accident_work_approve where del_flag = 0 and id = #{id}
- </select>
-
- <update id="updateWorkApprove" parameterType="com.gkhy.safePlatform.incidentManage.entity.AccidentWorkApproveInfo">
- update accident_work_approve
- <trim prefix="SET" suffixOverrides=",">
- <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
- <if test="updateUid != null ">update_uid = #{updateUid},</if>
-
- <if test="workName != null and workName != ''">work_name = #{workName},</if>
- <if test="title != null and title != ''">title = #{title},</if>
- <if test="submitPersonId != null ">submit_person_id = #{submitPersonId},</if>
- <if test="approvePersonId != null ">approve_person_id = #{approvePersonId},</if>
- <if test="approveStatus != null ">approve_status = #{approveStatus},</if>
- <if test="approveResult != null ">approve_result = #{approveResult},</if>
- <if test="approveMemo != null and approveMemo != ''">approve_memo = #{approveMemo},</if>
- <if test="relateType != null ">relate_type = #{relateType},</if>
- <if test="relateId != null ">relate_id = #{relateId},</if>
- <if test="relateDesc != null and relateDesc != ''">relate_desc = #{relateDesc},</if>
- </trim>
- where id = #{id}
- </update>
-
- <update id="deleteWorkApproveById">
- update accident_work_approve set del_flag = 1 where id = #{id}
- </update>
-
-</mapper>
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/controller/FileController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/controller/FileController.java
deleted file mode 100644
index 629a787..0000000
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/controller/FileController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.gkhy.safePlatform.minioDemo.controller;
-
-import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.minioDemo.service.FileService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-
-
-@RestController
-@RequestMapping(value = "/file")
-public class FileController {
-
- @Autowired
- private FileService fileService;
-
- @RequestMapping(value = "/upload",method = RequestMethod.POST)
- public ResultVO uploadFile(@RequestParam MultipartFile file , @RequestParam Integer moduleType){
- return fileService.uploadFile(file,moduleType);
- }
-
- @RequestMapping(value = "/download",method = RequestMethod.GET)
- public void downloadFile(String fileName,HttpServletResponse response){
- fileService.downloadFile(fileName,response);
- }
-}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/enums/ModuleTypeEnums.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/enums/ModuleTypeEnums.java
deleted file mode 100644
index d8207c1..0000000
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/enums/ModuleTypeEnums.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.gkhy.safePlatform.minioDemo.enums;
-
-public enum ModuleTypeEnums {
-
- EMERGENCY(1,"emergency"),
- EQUIPMENT(2,"equipment"),
- GOAL_MANAGE(3,"goal-manage"),
- INCIDENT_MANAGE(4,"incident-manage");
-
- private Integer moduleNo;
-
- private String moduleName;
-
- public Integer getModuleNo() {
- return moduleNo;
- }
-
- public void setModuleNo(Integer moduleNo) {
- this.moduleNo = moduleNo;
- }
-
- public String getModuleName() {
- return moduleName;
- }
-
- public void setModuleName(String moduleName) {
- this.moduleName = moduleName;
- }
-
- ModuleTypeEnums(Integer moduleNo, String moduleName) {
- this.moduleNo = moduleNo;
- this.moduleName = moduleName;
- }
-
- public static ModuleTypeEnums getReviewStatus(Integer moduleNo) {
- for (ModuleTypeEnums reviewStatus : ModuleTypeEnums.values()) {
- if (reviewStatus.getModuleNo().equals(moduleNo)) {
- return reviewStatus;
- }
- }
- return null;
- }
-}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/service/FileService.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/service/FileService.java
deleted file mode 100644
index de006c3..0000000
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/service/FileService.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.gkhy.safePlatform.minioDemo.service;
-
-import com.gkhy.safePlatform.commons.enums.ResultCodes;
-import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.minioDemo.config.MinioConfig;
-import com.gkhy.safePlatform.minioDemo.enums.ModuleTypeEnums;
-import com.gkhy.safePlatform.minioDemo.utils.FileUtil;
-import io.minio.GetPresignedObjectUrlArgs;
-import io.minio.MinioClient;
-import io.minio.errors.*;
-import io.minio.http.Method;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static com.gkhy.safePlatform.minioDemo.enums.ModuleTypeEnums.*;
-
-@Service
-public class FileService {
-
- @Resource
- private MinioConfig minioConfig;
-
- @Autowired
- private MinioClient minioClient;
-
- @Resource
- private FileUtil fileUtil;
-
- /**
- * 文件下载
- * @param fileName
- * @param response
- */
- public void downloadFile(String fileName, HttpServletResponse response) {
- fileUtil.downloadFile(fileName,response);
- }
-
- /**
- * 文件上传
- * @param file
- * @param moduleType
- * @return
- */
- public ResultVO<String> uploadFile(MultipartFile file, Integer moduleType) {
- String url = "";
- String moduleName = initModuleName(moduleType);
-
- // 文件名转换
- String time = new SimpleDateFormat("yyyyMMdd").format(new Date());
- String fileSuffixName = Objects.requireNonNull(file.getOriginalFilename()).substring(file.getOriginalFilename().lastIndexOf(".")+1);
- String fileName = moduleName + "/" + time + "_" + initUUID()+"."+fileSuffixName;
- try {
- url=fileUtil.upload(file, fileName);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return new ResultVO<>(ResultCodes.OK, url);
- }
-
- /**
- * 模块名称转换
- */
- private String initModuleName(Integer moduleType){
- String moduleName = "";
- ModuleTypeEnums moduleTypeEnums = ModuleTypeEnums.getReviewStatus(moduleType);
- assert moduleTypeEnums != null;
- switch (moduleTypeEnums) {
- case EMERGENCY:
- moduleName = EMERGENCY.getModuleName();
- break;
- case EQUIPMENT:
- moduleName = EQUIPMENT.getModuleName();
- break;
- case GOAL_MANAGE:
- moduleName = GOAL_MANAGE.getModuleName();
- break;
- case INCIDENT_MANAGE:
- moduleName = INCIDENT_MANAGE.getModuleName();
- break;
- default:
- break;
- }
- return moduleName;
- }
-
- /**
- * 生成8位UUID
- */
- private String initUUID() {
- String[] chars = new String[]{"a", "b", "c", "d", "e", "f",
- "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
- "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5",
- "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I",
- "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
- "W", "X", "Y", "Z"};
- StringBuffer shortBuffer = new StringBuffer();
- String uuid = UUID.randomUUID().toString().replace("-", "");
- for (int i = 0; i < 8; i++) {
- String str = uuid.substring(i * 4, i * 4 + 4);
- int x = Integer.parseInt(str, 16);
- shortBuffer.append(chars[x % 0x3E]);
- }
- return shortBuffer.toString();
- }
-
-
-
-
-
- public String getPutUrl(String objName) {
- String url = null;
- try {
- Map<String, String> reqParams = new HashMap<>();
- reqParams.put("response-content-type", "application/json");
- url = minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
- .method(Method.PUT)
- .bucket(minioConfig.getBucketName())
- .object(objName)
- .expiry(60 * 2)
- .extraQueryParams(reqParams)
- .build());
- } catch (ErrorResponseException e) {
- e.printStackTrace();
- } catch (InsufficientDataException e) {
- e.printStackTrace();
- } catch (InternalException e) {
- e.printStackTrace();
- } catch (InvalidKeyException e) {
- e.printStackTrace();
- } catch (InvalidResponseException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- } catch (XmlParserException e) {
- e.printStackTrace();
- } catch (ServerException e) {
- e.printStackTrace();
- }
- return url;
- }
-
-
-}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java
deleted file mode 100644
index c8d2be0..0000000
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.gkhy.safePlatform.minioDemo.utils;
-
-import com.gkhy.safePlatform.minioDemo.config.MinioConfig;
-import io.minio.*;
-import io.minio.MinioClient;
-import io.minio.errors.*;
-import io.minio.http.Method;
-import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-
-@Configuration
-public class FileUtil {
-
- @Resource
- private MinioConfig minioConfig;
-
- @Autowired
- private MinioClient minioClient;
-
-
- /**
- * 文件下载
- * @param fileName
- * @param response
- */
- public void downloadFile(String fileName, HttpServletResponse response) {
- try {
- InputStream file = minioClient.getObject(GetObjectArgs.builder()
- .bucket(minioConfig.getBucketName())
- .object(fileName)
- .build());
- String filename = new String(fileName.getBytes("ISO8859-1"), StandardCharsets.UTF_8);
- response.setHeader("Content-Disposition", "attachment;filename=" + filename);
- ServletOutputStream servletOutputStream = response.getOutputStream();
- int len;
- byte[] buffer = new byte[1024];
- while ((len = file.read(buffer)) > 0) {
- servletOutputStream.write(buffer, 0, len);
- }
- servletOutputStream.flush();
- file.close();
- servletOutputStream.close();
- } catch (ErrorResponseException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- /**
- * 文件上传
- *
- * @param file 文件
- * @param fileName 存储的文件名称
- */
- public String upload(MultipartFile file, String fileName) {
- String url;
- try {
- PutObjectArgs objectArgs = PutObjectArgs.builder()
- .bucket(minioConfig.getBucketName())
- .object(fileName)
- .stream(file.getInputStream(), file.getSize(), -1)
- .contentType(file.getContentType())
- .build();
- //文件名称相同会覆盖
- minioClient.putObject(objectArgs);
- url = getFileUrl(fileName);
- } catch (Exception e) {
- e.printStackTrace();
- url = "";
- }
- return url;
- }
-
- /**
- * 文件访问路径
- *
- * @param objectName 存储桶里的对象名称
- * expiry :链接失效时间，秒为单位
- * @return
- */
- public String getFileUrl(String objectName) {
- String url = null;
- try {
- url = minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
- .method(Method.GET)
- .bucket(minioConfig.getBucketName())
- .object(objectName)
- .expiry(60).build());
- } catch (ErrorResponseException | InsufficientDataException | InternalException | InvalidKeyException | InvalidResponseException | IOException | NoSuchAlgorithmException | XmlParserException | ServerException e) {
- e.printStackTrace();
- }
- return url;
- }
-
-
- /**
- * 检查存储桶是否存在
- *
- * @return
- */
- @SneakyThrows
- public boolean bucketCheck() {
- boolean flag = minioClient.bucketExists(BucketExistsArgs.builder()
- .bucket(minioConfig.getBucketName()).build());
- return flag;
- }
-
-}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/config/MinioConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/config/MinioConfig.java
similarity index 97%
rename from safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/config/MinioConfig.java
rename to safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/config/MinioConfig.java
index ebfc4cb..25d2621 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/config/MinioConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/config/MinioConfig.java
@@ -1,4 +1,4 @@
-package com.gkhy.safePlatform.minioDemo.config;
+package com.gkhy.safePlatform.minioFile.config;
import io.minio.MinioClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/controller/MinioController.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/controller/MinioController.java
new file mode 100644
index 0000000..d95e90b
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/controller/MinioController.java
@@ -0,0 +1,27 @@
+package com.gkhy.safePlatform.minioFile.controller;
+
+import com.gkhy.safePlatform.minioFile.service.MinioAccessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping(value = "/minio/file")
+public class MinioController {
+
+ @Autowired
+ private MinioAccessService minioAccessService;
+
+ @RequestMapping(value = "/view",method = RequestMethod.GET)
+ public Object viewFile(String obj){
+ return minioAccessService.viewFile(obj);
+ }
+
+ @RequestMapping(value = "/presign",method = RequestMethod.GET)
+ public Object getPresignUrl(String prefixName,String suffixName){
+ return minioAccessService.getPresignUrl(prefixName,suffixName);
+ }
+}
+
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java
new file mode 100644
index 0000000..2bc51f6
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/service/MinioAccessService.java
@@ -0,0 +1,97 @@
+package com.gkhy.safePlatform.minioFile.service;
+
+import com.gkhy.safePlatform.minioFile.config.MinioConfig;
+import com.gkhy.safePlatform.minioFile.utils.UUIDUtil;
+import io.minio.GetPresignedObjectUrlArgs;
+import io.minio.MinioClient;
+import io.minio.errors.*;
+import io.minio.http.Method;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+public class MinioAccessService {
+
+ @Resource
+ private MinioConfig minioConfig;
+
+ @Autowired
+ private MinioClient minioClient;
+
+ public String viewFile(String objectName){
+ String url = null;
+ try {
+ url = minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
+ .method(Method.GET)
+ .bucket(minioConfig.getBucketName())
+ .object(objectName)
+ .expiry(60).build());
+ } catch (ErrorResponseException e) {
+ e.printStackTrace();
+ } catch (InsufficientDataException e) {
+ e.printStackTrace();
+ } catch (InternalException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (InvalidResponseException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (XmlParserException e) {
+ e.printStackTrace();
+ } catch (ServerException e) {
+ e.printStackTrace();
+ }
+ return url;
+ }
+
+ public String getPresignUrl(String prefixName ,String suffixName){
+ String uuid= UUIDUtil.initUUID();
+ String objName = prefixName+uuid+suffixName;
+ String url = null;
+ try {
+ Map<String, String> reqParams = new HashMap<>();
+ reqParams.put("response-content-type", "application/json");
+ url = minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder()
+ .method(Method.PUT)
+ .bucket(minioConfig.getBucketName())
+ .object(objName)
+ .expiry(60*2)
+ .extraQueryParams(reqParams)
+ .build());
+ } catch (ErrorResponseException e) {
+ e.printStackTrace();
+ } catch (InsufficientDataException e) {
+ e.printStackTrace();
+ } catch (InternalException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (InvalidResponseException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (XmlParserException e) {
+ e.printStackTrace();
+ } catch (ServerException e) {
+ e.printStackTrace();
+ }
+ return url;
+ }
+
+
+
+}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/utils/UUIDUtil.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/utils/UUIDUtil.java
new file mode 100644
index 0000000..a8737d4
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioFile/utils/UUIDUtil.java
@@ -0,0 +1,25 @@
+package com.gkhy.safePlatform.minioFile.utils;
+
+import java.util.UUID;
+
+public class UUIDUtil {
+ /**
+ * 生成8位UUID
+ */
+ public static String initUUID() {
+ String[] chars = new String[]{"a", "b", "c", "d", "e", "f",
+ "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
+ "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5",
+ "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I",
+ "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
+ "W", "X", "Y", "Z"};
+ StringBuffer shortBuffer = new StringBuffer();
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ for (int i = 0; i < 8; i++) {
+ String str = uuid.substring(i * 4, i * 4 + 4);
+ int x = Integer.parseInt(str, 16);
+ shortBuffer.append(chars[x % 0x3E]);
+ }
+ return shortBuffer.toString();
+ }
+}
--
Gitblit v1.9.2