feat(ys-应急):应急预案管理

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/dto/YsEmergencyPlanDto.java

 package com.yeejoin.amos.boot.module.ys.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,7 +25,7 @@ public class YsEmergencyPlanDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "关联对象id")
-    private Integer businessId;
+    private String businessId;
 
     @ApiModelProperty(value = "关联对象类型")
     private String type;
@@ -38,12 +40,13 @@ public class YsEmergencyPlanDto  extends BaseDto {
     private String planName;
 
     @ApiModelProperty(value = "预案文件")
-    private String planFile;
+    private JSONArray planFile;
 
     @ApiModelProperty(value = "预案类别id")
-    private Integer planCategoryId;
+    private String planCategoryId;
 
     @ApiModelProperty(value = "预案时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planTime;
 
     @ApiModelProperty(value = "创建时间")

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/entity/YsEmergencyPlan.java

@@ -27,7 +27,7 @@ public class YsEmergencyPlan extends BaseEntity {
      * 关联对象id
      */
 	@TableField("business_id")
-    private Integer businessId;
+    private String businessId;
 
     /**
      * 关联对象类型
@@ -63,7 +63,7 @@ public class YsEmergencyPlan extends BaseEntity {
      * 预案类别id
      */
 	@TableField("plan_category_id")
-    private Integer planCategoryId;
+    private String planCategoryId;
 
     /**
      * 预案时间

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/mapper/YsEmergencyPlanMapper.java

 package com.yeejoin.amos.boot.module.ys.api.mapper;
 
-import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
+import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
+import org.springframework.data.repository.query.Param;
 
 /**
  * 应急预案管理 Mapper 接口
@@ -11,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface YsEmergencyPlanMapper extends BaseMapper<YsEmergencyPlan> {
 
+    Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(@Param(value = "page") Page<YsEmergencyPlanDto> page,
+                                                         @Param(value = "dto") YsEmergencyPlanDto dto);
+
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyPlanService.java

 package com.yeejoin.amos.boot.module.ys.api.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 /**
  * 应急预案管理接口类
  *
  * @author system_generator
  * @date 2024-09-24
  */
-public interface IYsEmergencyPlanService {}
+public interface IYsEmergencyPlanService {
+
+    Page<YsEmergencyPlanDto>  queryForYsEmergencyPlanPage(Page<YsEmergencyPlanDto> page,YsEmergencyPlanDto dto);
+
+    Boolean  saveOrUpdate(YsEmergencyPlanDto dto, AgencyUserModel userModel);
+
+    YsEmergencyPlanDto  detailBySeq(String sequenceNbr);
+
+    Boolean  deleteBySeq(String sequenceNbr);
+}

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/resources/mapper/YsEmergencyPlanMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ys.api.mapper.YsEmergencyPlanMapper">
 
+    <select id="queryForYsEmergencyPlanPage" resultType="com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto">
+        select
+        *
+        FROM tzs_ys_emergency_plan tyep 
+        <where>
+            tyep.is_delete = 0
+            <if test="dto != null ">
+                <if test="dto.planName != null and dto.planName != ''">
+                    AND tyep.plan_name LIKE CONCAT('%', #{dto.planName}, '%')
+                </if>
+                <if test="dto.planCategory != null and dto.planCategory != ''">
+                    AND tyep.plan_category LIKE CONCAT('%', #{dto.planCategory}, '%')
+                </if>
+                <if test="dto.planType != null and dto.planType != ''">
+                    AND tyep.plan_type LIKE CONCAT('%', #{dto.planType}, '%')
+                </if>
+            </if>
+        </where>
+        ORDER BY
+        tyep.create_date DESC
+    </select>
+
 </mapper>

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyPlanController.java

@@ -3,7 +3,9 @@ package com.yeejoin.amos.boot.module.ys.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
+import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyPlanService;
 import com.yeejoin.amos.boot.module.ys.biz.service.impl.YsEmergencyPlanServiceImpl;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +15,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -27,19 +28,22 @@ import java.util.List;
 public class YsEmergencyPlanController extends BaseController {
 
 	@Autowired
+	IYsEmergencyPlanService iYsEmergencyPlanService;
+
+    @Autowired
     YsEmergencyPlanServiceImpl ysEmergencyPlanServiceImpl;
 
     /**
-     * 新增
+     * 新增或者更新接口
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-	public ResponseModel<YsEmergencyPlanDto> save(@RequestBody YsEmergencyPlanDto model) {
-	    model = ysEmergencyPlanServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+	@PostMapping(value = "/saveOrUpdate")
+	@ApiOperation(httpMethod = "POST", value = "新增或者更新接口", notes = "新增或者更新接口")
+	public ResponseModel<Boolean> saveOrUpdate(@RequestBody YsEmergencyPlanDto model) {
+		AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
+		return ResponseHelper.buildResponse(iYsEmergencyPlanService.saveOrUpdate(model,userModel));
 	}
 
 	/**
@@ -63,10 +67,10 @@ public class YsEmergencyPlanController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @DeleteMapping(value = "/{sequenceNbr}")
+    @DeleteMapping(value = "/deleteBySeq")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        return ResponseHelper.buildResponse(ysEmergencyPlanServiceImpl.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySeq(@RequestParam (value = "sequenceNbr") String sequenceNbr){
+        return ResponseHelper.buildResponse(iYsEmergencyPlanService.deleteBySeq(sequenceNbr));
     }
 
     /**
@@ -76,10 +80,10 @@ public class YsEmergencyPlanController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
+	@GetMapping(value = "/detailBySeq")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<YsEmergencyPlanDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(ysEmergencyPlanServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<YsEmergencyPlanDto> detailBySeq(@RequestParam(value = "sequenceNbr") String  sequenceNbr) {
+	    return ResponseHelper.buildResponse(iYsEmergencyPlanService.detailBySeq(sequenceNbr));
 	}
 
 	/**
@@ -92,12 +96,13 @@ public class YsEmergencyPlanController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-	public ResponseModel<Page<YsEmergencyPlanDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
+	public ResponseModel<Page<YsEmergencyPlanDto>> queryForPage(@RequestParam(value = "current") int current,
+																@RequestParam(value = "size") int size,
+																YsEmergencyPlanDto dto) {
 	    Page<YsEmergencyPlanDto> page = new Page<YsEmergencyPlanDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(ysEmergencyPlanServiceImpl.queryForYsEmergencyPlanPage(page));
+	    return ResponseHelper.buildResponse(iYsEmergencyPlanService.queryForYsEmergencyPlanPage(page,dto));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyPlanServiceImpl.java

 package com.yeejoin.amos.boot.module.ys.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
 import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyPlan;
 import com.yeejoin.amos.boot.module.ys.api.mapper.YsEmergencyPlanMapper;
 import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyPlanService;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,7 +24,11 @@ import java.util.List;
  * @date 2024-09-24
  */
 @Service
-public class YsEmergencyPlanServiceImpl extends BaseService<YsEmergencyPlanDto,YsEmergencyPlan,YsEmergencyPlanMapper> implements IYsEmergencyPlanService {
+public class YsEmergencyPlanServiceImpl extends BaseService<YsEmergencyPlanDto, YsEmergencyPlan, YsEmergencyPlanMapper> implements IYsEmergencyPlanService {
+
+    @Autowired
+    private YsEmergencyPlanMapper ysEmergencyPlanMapper;
+
     /**
      * 分页查询
      */
@@ -29,6 +40,42 @@ public class YsEmergencyPlanServiceImpl extends BaseService<YsEmergencyPlanDto,Y
      * 列表查询 示例
      */
     public List<YsEmergencyPlanDto> queryForYsEmergencyPlanList() {
-        return this.queryForList("" , false);
+        return this.queryForList("", false);
+    }
+
+    @Override
+    public Page<YsEmergencyPlanDto> queryForYsEmergencyPlanPage(Page<YsEmergencyPlanDto> page, YsEmergencyPlanDto dto) {
+        return ysEmergencyPlanMapper.queryForYsEmergencyPlanPage(page, dto);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean saveOrUpdate(YsEmergencyPlanDto dto, AgencyUserModel userModel) {
+        YsEmergencyPlan emergencyPlan = new YsEmergencyPlan();
+        if (ValidationUtil.isEmpty(dto.getSequenceNbr())) {//新增
+            dto.setCreateDate(new Date());
+            dto.setCreateUserId(userModel.getUserId());
+            dto.setCreateUserName(userModel.getUserName());
+        }
+        emergencyPlan.setPlanFile(JSON.toJSONString(dto.getPlanFile()));
+        BeanUtils.copyProperties(dto, emergencyPlan);
+        return this.saveOrUpdate(emergencyPlan);
+    }
+
+    @Override
+    public YsEmergencyPlanDto detailBySeq(String sequenceNbr) {
+        YsEmergencyPlanDto emergencyPlanDto = new YsEmergencyPlanDto();
+        YsEmergencyPlan emergencyPlan = this.baseMapper.selectById(sequenceNbr);
+        BeanUtils.copyProperties(emergencyPlan, emergencyPlanDto);
+        emergencyPlanDto.setPlanFile(JSON.parseArray(emergencyPlan.getPlanFile()));
+        return emergencyPlanDto;
+    }
+
+    @Override
+    public Boolean deleteBySeq(String sequenceNbr) {
+        YsEmergencyPlan emergencyPlan = new YsEmergencyPlan();
+        emergencyPlan.setSequenceNbr(Long.valueOf(sequenceNbr));
+        emergencyPlan.setIsDelete(Boolean.TRUE);
+        return this.baseMapper.updateById(emergencyPlan) > 0;
     }
 }
\ No newline at end of file