songhuangfeng123
2022-08-04 f3a1ffc586b88a4b8ae43e664f2cefadd3ba7d24
应急预案废止
已修改11个文件
80 ■■■■■ 文件已修改
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -65,4 +65,16 @@
    public ResultVO batchDeleteEmergencyPlan(@RequestBody Long[] ids){
        return emergencyPlanService.batchDeleteEmergencyPlan(ids);
    }
    /**
     * 应急预案废止/还原
     */
    /**
     * 应急预案详情
     */
    @RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
    public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
        return emergencyPlanService.updateAbolish(id,abolishStatus);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfo.java
@@ -9,6 +9,16 @@
@TableName("emergency_plan")
public class EmergencyPlanInfo {
    private Boolean abolishStatus;
    public Boolean getAbolishStatus() {
        return abolishStatus;
    }
    public void setAbolishStatus(Boolean abolishStatus) {
        this.abolishStatus = abolishStatus;
    }
    private String authorName;
    public String getAuthorName() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/entity/EmergencyPlanInfoPageDO.java
@@ -8,6 +8,17 @@
@TableName("emergency_plan")
public class EmergencyPlanInfoPageDO {
    private Boolean abolishStatus;
    public Boolean getAbolishStatus() {
        return abolishStatus;
    }
    public void setAbolishStatus(Boolean abolishStatus) {
        this.abolishStatus = abolishStatus;
    }
    private Long id;
    private String name ;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
@@ -2,6 +2,16 @@
public class EmergencyPlanQuery {
    private Boolean abolishStatus;
    public Boolean getAbolishStatus() {
        return abolishStatus;
    }
    public void setAbolishStatus(Boolean abolishStatus) {
        this.abolishStatus = abolishStatus;
    }
    private String name ;
    private String type ;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/db/EmergencyPlanDBQuery.java
@@ -6,6 +6,16 @@
    private String type ;
    private Boolean abolishStatus;
    public Boolean getAbolishStatus() {
        return abolishStatus;
    }
    public void setAbolishStatus(Boolean abolishStatus) {
        this.abolishStatus = abolishStatus;
    }
    public String getName() {
        return name;
    }
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/repository/EmergencyPlanInfoRepository.java
@@ -24,4 +24,6 @@
    void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);
    void deleteEmergencyPlan(@Param("id")Long id);
    void updateAbolish(@Param("id")Long id,@Param("abolishStatus") Boolean abolishStatus);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/EmergencyPlanService.java
@@ -21,4 +21,6 @@
    ResultVO updateEmergencyPlan(Long uid, EmergencyPlanReqDTO emergencyPlanReqDTO);
    ResultVO batchDeleteEmergencyPlan(Long[] ids);
    ResultVO updateAbolish(Long id, Boolean abolishStatus);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyPlanInfoService.java
@@ -21,4 +21,6 @@
    void updateEmergencyPlan(EmergencyPlanInfo emergencyPlanInfo);
    void deleteEmergencyPlan(Long planId);
    void updateAbolish(Long id, Boolean abolishStatus);
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/impl/EmergencyPlanInfoServiceImpl.java
@@ -44,5 +44,10 @@
        emergencyPlanInfoRepository.deleteEmergencyPlan(planId);
    }
    @Override
    public void updateAbolish(Long id, Boolean abolishStatus) {
        emergencyPlanInfoRepository.updateAbolish(id,abolishStatus);
    }
}
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyPlanServiceImpl.java
@@ -20,6 +20,7 @@
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
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;
@@ -417,6 +418,12 @@
        }
    }
    @Override
    public ResultVO updateAbolish(Long id, Boolean abolishStatus) {
        emergencyPlanInfoService.updateAbolish(id,abolishStatus);
        return new ResultVO(ResultCodes.OK);
    }
    private void deleteEmergencyPlan(Long id) {
        //查询是否存在
        EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id);
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
@@ -14,7 +14,8 @@
    </resultMap>
    <select id="selectEmergencyPlanList" resultMap="emergencyPlanInfoPageDOResult">
        select id,`name`,`status`,`type`,`level`,release_date from emergency_plan where del_flag = 0
        select id,`name`,`status`,`type`,`level`,release_date from emergency_plan
        where del_flag = 0 and abolish_status = #{query.abolishStatus}
        <if test="query.name != null  and query.name != ''">and `name` like concat('%', #{query.name}, '%')</if>
        <if test="query.type != null  and query.type != ''">and `type` = #{query.type}</if>
    </select>
@@ -30,6 +31,7 @@
            <if test="createUid != null ">create_uid,</if>
            <if test="updateUid != null ">update_uid,</if>
            <if test="status != null ">status,</if>
            <if test="abolishStatus != null ">abolish_status,</if>
            <if test="releaseDate != null ">release_date,</if>
            <if test="authorUid != null ">author_uid,</if>
            <if test="authorName != null and authorName != ''">`author_name`,</if>
@@ -47,6 +49,7 @@
            <if test="createUid != null ">#{createUid},</if>
            <if test="updateUid != null ">#{updateUid},</if>
            <if test="status != null ">#{status},</if>
            <if test="abolishStatus != null ">#{abolishStatus},</if>
            <if test="releaseDate != null ">#{releaseDate},</if>
            <if test="authorUid != null ">#{authorUid},</if>
            <if test="authorName != null and authorName != ''">#{authorName},</if>
@@ -83,6 +86,7 @@
            <if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
            <if test="updateUid != null ">update_uid = #{updateUid},</if>
            <if test="status != null ">status = #{status},</if>
            <if test="abolishStatus != null ">abolish_status = #{abolishStatus},</if>
            <if test="releaseDate != null ">release_date = #{releaseDate},</if>
            <if test="authorUid != null ">author_uid = #{authorUid},</if>
            <if test="authorName != null and authorName != ''">author_name =#{authorName},</if>
@@ -98,4 +102,7 @@
    <update id="deleteEmergencyPlan">
        update emergency_plan set del_flag = 1 where id = #{id}
    </update>
    <update id="updateAbolish">
        update emergency_plan set abolish_status = #{abolishStatus} where id = #{id}
    </update>
</mapper>