Skip to content

A
amos-boot-biz
Commit 202322c7 authored by hekaiwen's avatar hekaiwen
Browse files
Options

增加save or update接口

parent 5ca71e70
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 9 deletions
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/dto/YsEmergencyCaseDto.java
View file @ 202322c7
package com.yeejoin.amos.boot.module.ys.api.dto;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.annotation.TableField;
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;
......@@ -45,28 +47,30 @@ public class YsEmergencyCaseDto extends BaseDto {
private Integer disasterTypeId;
@ApiModelProperty(value = "灾情结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date disasterEndTime;
@ApiModelProperty(value = "灾情开始时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date disasterStartTime;
@ApiModelProperty(value = "灾情细分类型id")
private Integer disasterSubdivideId;
@ApiModelProperty(value = "视频信息")
private String videoInfo;
private JSONArray videoInfo;
@ApiModelProperty(value = "图片信息")
private String picInfo;
private JSONArray picInfo;
@ApiModelProperty(value = "文档信息")
private String fileInfo;
private JSONArray fileInfo;
@ApiModelProperty(value = "音频信息")
@TableField("Audio_info")
private String audioInfo;
private JSONArray audioInfo;
@ApiModelProperty(value = "立案时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date filingTime;
@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/YsEmergencyCase.java
View file @ 202322c7
......@@ -104,7 +104,7 @@ public class YsEmergencyCase extends BaseEntity {
/**
* 音频信息
*/
@TableField("Audio_info")
@TableField("audio_info")
private String audioInfo;
/**
......
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyCaseService.java
View file @ 202322c7
......@@ -3,6 +3,9 @@ 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.YsEmergencyCaseDto;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyExpertsDto;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyRehearsalDto;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.transaction.annotation.Transactional;
/**
* 救援案例管理接口类
......@@ -12,7 +15,11 @@ import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyExpertsDto;
*/
public interface IYsEmergencyCaseService {
@Transactional(rollbackFor = Exception.class)
Boolean saveOrUpdate(YsEmergencyCaseDto dto, AgencyUserModel userModel);
Page<YsEmergencyCaseDto> queryForYsEmergencyCasePage(Page<YsEmergencyCaseDto> page, YsEmergencyCaseDto dto);
YsEmergencyCaseDto queryBySequenceNbr (String sequenceNbr);
}
amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyCaseController.java
View file @ 202322c7
......@@ -5,9 +5,12 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyCaseDto;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyExpertsDto;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyPlanDto;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyRehearsalDto;
import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyExpertsService;
import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyCaseService;
import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyRehearsalService;
import com.yeejoin.amos.boot.module.ys.biz.service.impl.YsEmergencyCaseServiceImpl;
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;
......@@ -49,6 +52,20 @@ public class YsEmergencyCaseController extends BaseController {
}
/**
* 新增或者更新
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/saveOrUpdate")
@ApiOperation(httpMethod = "POST", value = "新增或者更新", notes = "新增或者更新")
public ResponseModel<Boolean> saveOrUpdate(@RequestBody YsEmergencyCaseDto model) {
AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
return ResponseHelper.buildResponse(iYsEmergencyCaseService.saveOrUpdate(model, userModel));
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
......@@ -88,6 +105,8 @@ public class YsEmergencyCaseController extends BaseController {
return ResponseHelper.buildResponse(iYsEmergencyCaseService.queryBySequenceNbr(sequenceNbr));
}
/**
* 列表分页查询
*
......
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/YsEmergencyCaseServiceImpl.java
View file @ 202322c7
......@@ -5,15 +5,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyCaseDto;
import com.yeejoin.amos.boot.module.ys.api.dto.YsEmergencyRehearsalDto;
import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyCase;
import com.yeejoin.amos.boot.module.ys.api.entity.YsEmergencyRehearsal;
import com.yeejoin.amos.boot.module.ys.api.mapper.YsEmergencyCaseMapper;
import com.yeejoin.amos.boot.module.ys.api.service.IYsEmergencyCaseService;
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;
/**
......@@ -42,6 +47,24 @@ public class YsEmergencyCaseServiceImpl extends BaseService<YsEmergencyCaseDto,Y
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveOrUpdate(YsEmergencyCaseDto dto, AgencyUserModel userModel) {
YsEmergencyCase emergencyCase = new YsEmergencyCase();
if (ValidationUtil.isEmpty(dto.getSequenceNbr())) {//新增
dto.setCreateDate(new Date());
dto.setCreateUserId(userModel.getUserId());
dto.setCreateUserName(userModel.getUserName());
}
emergencyCase.setVideoInfo(JSON.toJSONString(dto.getVideoInfo()));
emergencyCase.setPicInfo(JSON.toJSONString(dto.getPicInfo()));
emergencyCase.setFileInfo(JSON.toJSONString(dto.getFileInfo()));
emergencyCase.setAudioInfo(JSON.toJSONString(dto.getAudioInfo()));
BeanUtils.copyProperties(dto, emergencyCase);
return this.saveOrUpdate(emergencyCase);
}
@Override
public Page<YsEmergencyCaseDto> queryForYsEmergencyCasePage(Page<YsEmergencyCaseDto> page, YsEmergencyCaseDto dto) {
return ysEmergencyCaseMapper.queryForYsEmergencyCasePage(page, dto);
}
......@@ -55,11 +78,21 @@ public class YsEmergencyCaseServiceImpl extends BaseService<YsEmergencyCaseDto,Y
if (emergencyCase != null) {
BeanUtils.copyProperties(emergencyCase, caseDto);
// 如果案例有相关的图片或者其他特殊处理字段，可以在此进行处理
// if (!ValidationUtil.isEmpty(emergencyCase.getPicInfo())) {
// caseDto.setPicInfo(JSON.parseArray(emergencyCase.getPicInfo()));
// }
if (!ValidationUtil.isEmpty(emergencyCase.getPicInfo())) {
caseDto.setPicInfo(JSON.parseArray(emergencyCase.getPicInfo()));
}
if (!ValidationUtil.isEmpty(emergencyCase.getVideoInfo())) {
caseDto.setVideoInfo(JSON.parseArray(emergencyCase.getVideoInfo()));
}
if (!ValidationUtil.isEmpty(emergencyCase.getFileInfo())) {
caseDto.setFileInfo(JSON.parseArray(emergencyCase.getFileInfo()));
}
if (!ValidationUtil.isEmpty(emergencyCase.getAudioInfo())) {
caseDto.setAudioInfo(JSON.parseArray(emergencyCase.getAudioInfo()));
}
}
return caseDto;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment