songhuangfeng123
2022-08-03 6f7cde35cd3435ff1b899ca3680506a5195159a2
应急计划发布fix
已修改3个文件
18 ■■■■ 文件已修改
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillPlanService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyDrillPlanController.java
@@ -61,8 +61,8 @@
    /**
     * 应急演练计划删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteEmergencyDrillPlan(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencyDrillPlan(@RequestBody Long[] ids){
        return emergencyDrillPlanService.batchDeleteEmergencyDrillPlan(ids);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyDrillPlanService.java
@@ -20,5 +20,5 @@
    ResultVO updateEmergencyDrillPlan(Long uid, EmergencyDrillPlanReqDTO emergencyDrillPlanReqDTO);
    ResultVO batchDeleteEmergencyDrillPlan(String ids);
    ResultVO batchDeleteEmergencyDrillPlan(Long[] ids);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillPlanServiceImpl.java
@@ -267,13 +267,13 @@
    }
    @Override
    public ResultVO batchDeleteEmergencyDrillPlan(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteEmergencyDrillPlan(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyDrillPlan(Long.valueOf(id));
        }else{
            for (Long id : ids){
                deleteEmergencyDrillPlan(id);
            }
            return new ResultVO(ResultCodes.OK);
        }