emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyCountController.java
对比新文件 @@ -0,0 +1,43 @@ package com.gkhy.safePlatform.emergency.controller; 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.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecutePageRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery; import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery; import com.gkhy.safePlatform.emergency.service.EmergencyCountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @RequestMapping("/emergencyCount") public class EmergencyCountController { @Autowired private EmergencyCountService emergencyCountService; /** * 应急演练次数统计图 */ @RequestMapping(value = "/emergencyDrillExecute/count",method = RequestMethod.POST) public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(@RequestBody EmergencyDrillExecuteCountQuery query){ return emergencyCountService.countEmergencyDrillExecute(query); } /* *//** * 应急物资统计图 *//* @RequestMapping(value = "/emergencySupplies/count" ,method = RequestMethod.POST) private ResultVO<List<EmergencyDrillExecutePageRespDTO>> list (@RequestBody PageQuery<EmergencyDrillExecuteQuery> pageQuery){ PageUtils.checkCheck(pageQuery); return emergencyDrillExecuteService.selectEmergencyDrillExecuteList(pageQuery); }*/ } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillExecuteController.java
@@ -5,17 +5,14 @@ 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; import org.springframework.web.bind.annotation.*; import java.security.Principal; import java.util.List; @RestController @@ -66,14 +63,6 @@ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST) 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); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteCountQuery.java
对比新文件 @@ -0,0 +1,26 @@ package com.gkhy.safePlatform.emergency.query; public class EmergencyDrillExecuteCountQuery { // type=1:月 type=2:年 private Integer type; private Long deptId; public Integer getType() { return type; } public void setType(Integer type) { this.type = type; } public Long getDeptId() { return deptId; } public void setDeptId(Long deptId) { this.deptId = deptId; } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteRPCQuery.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyDrillExecuteRPCDBQuery.java
文件已删除 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyDrillExecuteInfoRepository.java
@@ -7,7 +7,6 @@ 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; @@ -30,7 +29,7 @@ Integer selectEmergencyDrillExecuteIntervalTime(); List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(@Param("query")EmergencyDrillExecuteRPCDBQuery dbQuery); List<EmergencyDrillExecuteCountData> selectByMonthAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds); List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(@Param("query")EmergencyDrillExecuteRPCDBQuery dbQuery); List<EmergencyDrillExecuteCountData> selectByYearAndDept(@Param("startTime") String startTime ,@Param("endTime")String endTime ,@Param("deptIds")List<Long> deptIds); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyCountService.java
对比新文件 @@ -0,0 +1,10 @@ package com.gkhy.safePlatform.emergency.service; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyDrillExecuteCountRespDTO; import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery; public interface EmergencyCountService { ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteCountQuery query); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillExecuteService.java
@@ -8,7 +8,7 @@ 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.query.EmergencyDrillExecuteCountQuery; import java.util.List; @@ -24,5 +24,4 @@ ResultVO batchDeleteEmergencyDrillExecute(Long[] ids); ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteRPCQuery query); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyDrillExecuteInfoService.java
@@ -7,7 +7,6 @@ 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; @@ -28,7 +27,7 @@ Integer selectEmergencyDrillExecuteIntervalTime(); List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery); List<EmergencyDrillExecuteCountData> selectByMonthAndDept(String startTime ,String endTime ,List<Long> deptIds); List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery); List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds); } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyDrillExecuteInfoServiceImpl.java
@@ -7,7 +7,6 @@ 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; @@ -57,14 +56,13 @@ } @Override public List<EmergencyDrillExecuteCountData> selectByMouthTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery) { return emergencyDrillExecuteInfoRepository.selectByMouthTimeAndType(dbQuery); public List<EmergencyDrillExecuteCountData> selectByMonthAndDept(String startTime ,String endTime ,List<Long> deptIds) { return emergencyDrillExecuteInfoRepository.selectByMonthAndDept(startTime,endTime,deptIds); } @Override public List<EmergencyDrillExecuteCountData> selectByYearTimeAndType(EmergencyDrillExecuteRPCDBQuery dbQuery) { return emergencyDrillExecuteInfoRepository.selectByYearTimeAndType(dbQuery); public List<EmergencyDrillExecuteCountData> selectByYearAndDept(String startTime ,String endTime ,List<Long> deptIds) { return emergencyDrillExecuteInfoRepository.selectByYearAndDept(startTime,endTime,deptIds); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyCountServiceImpl.java
对比新文件 @@ -0,0 +1,79 @@ package com.gkhy.safePlatform.emergency.service.impl; import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService; import com.gkhy.safePlatform.commons.enums.ResultCodes; import com.gkhy.safePlatform.commons.exception.BusinessException; import com.gkhy.safePlatform.commons.utils.BeanCopyUtils; import com.gkhy.safePlatform.commons.vo.ResultVO; import com.gkhy.safePlatform.emergency.entity.*; import com.gkhy.safePlatform.emergency.model.dto.resp.*; import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteCountQuery; import com.gkhy.safePlatform.emergency.service.EmergencyCountService; import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService; import com.gkhy.safePlatform.emergency.utils.TimeUtils; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.text.SimpleDateFormat; import java.util.*; @Service("emergencyCountService") public class EmergencyCountServiceImpl implements EmergencyCountService { @Autowired private EmergencyDrillExecuteInfoService emergencyDrillExecuteInfoService; @DubboReference(check = false) private AccountDepartmentService accountDepartmentService; @Override public ResultVO<EmergencyDrillExecuteCountRespDTO> countEmergencyDrillExecute(EmergencyDrillExecuteCountQuery query) { EmergencyDrillExecuteCountRespDTO emergencyDrillExecuteCountRespDTO = new EmergencyDrillExecuteCountRespDTO(); // 根据最新的应急演练实施的创建时间与当前时间 获取间隔天数 Integer days = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteIntervalTime(); emergencyDrillExecuteCountRespDTO.setDays(days); // 根据时间类型(年/月),部门id 获取统计结果 List<EmergencyDrillExecuteCountData> list = new ArrayList<>(); // 获取部门id集合 List<Long> deptIds = new ArrayList<>(); ResultVO<List<Long>> rpcResult = accountDepartmentService.listDepAndSubDepIds(query.getDeptId()); if (rpcResult != null && rpcResult.getCode().equals(ResultCodes.OK.getCode())) { if (rpcResult.getData() != null) { deptIds = (List<Long>) rpcResult.getData(); } }else{ throw new BusinessException(ResultCodes.CLIENT_DEP_NOT_EXIST); } // 获取时间 SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); Date date = new Date(); int year = Integer.parseInt(sdf.format(date)); if (query.getType()==1){ // 月 String startTime = TimeUtils.getYearFirst(year); String endTime = TimeUtils.getYearLast(year); list = emergencyDrillExecuteInfoService.selectByMonthAndDept(startTime,endTime,deptIds); } if (query.getType()==2){ // 年 String startTime = TimeUtils.getYearFirst(year-10); String endTime = TimeUtils.getYearLast(year); list = emergencyDrillExecuteInfoService.selectByYearAndDept(startTime,endTime,deptIds); } 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); } } emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java
@@ -13,9 +13,8 @@ import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyDrillExecuteUserReqDTO; 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.EmergencyDrillExecuteCountQuery; 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; @@ -232,42 +231,4 @@ } } @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); } } emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -131,23 +131,7 @@ <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 id="selectByMonthAndDept" resultMap="emergencyDrillExecuteCountChart"> SELECT count( 0 ) AS num, DATE_FORMAT( a.gmt_create, '%Y-%m' ) AS `name` @@ -156,10 +140,36 @@ 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> AND a.gmt_create <![CDATA[ >= ]]> #{startTime} AND a.gmt_create <![CDATA[ <= ]]> #{endTime} <if test="deptIds != null " > and b.department_id in <foreach item="id" collection="deptIds" open="(" separator="," close=")"> #{id} </foreach> </if> GROUP BY DATE_FORMAT( a.gmt_create, '%Y-%m' ) </select> <select id="selectByYearAndDept" resultMap="emergencyDrillExecuteCountChart"> SELECT count( 0 ) AS num, DATE_FORMAT( a.gmt_create, '%Y' ) 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[ >= ]]> #{startTime} AND a.gmt_create <![CDATA[ <= ]]> #{endTime} <if test="deptIds != null " > and b.department_id in <foreach item="id" collection="deptIds" open="(" separator="," close=")"> #{id} </foreach> </if> GROUP BY DATE_FORMAT( a.gmt_create, '%Y' ) </select> </mapper>