Skip to content

A
amos-boot-biz
Commit d970c695 authored by taabe's avatar taabe
Browse files
Options

删除vo

parent 8ca07d33
Show whitespace changes
Inline Side-by-side
Showing with 192 additions and 341 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertSubmittedDto.java
View file @ d970c695
...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -18,7 +19,7 @@ import java.util.List; ...@@ -18,7 +19,7 @@ import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="AlertSubmittedDto", description="警情报送记录") @ApiModel(value="AlertSubmittedDto", description="警情报送记录")
public class AlertSubmittedDto extends BaseDto{ public class AlertSubmittedDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键id") @ApiModelProperty(value = "主键id")
...@@ -27,38 +28,48 @@ public class AlertSubmittedDto extends BaseDto{ ...@@ -27,38 +28,48 @@ public class AlertSubmittedDto extends BaseDto{
@ApiModelProperty(value = "警情id") @ApiModelProperty(value = "警情id")
private Long alertCalledId; private Long alertCalledId;
@ApiModelProperty(value = "业务类型code(警情续报、非警情确认、警情结案)") @ApiModelProperty(value = "业务类型(警情续报、非警情确认、警情结案)")
private String businessType;
@ApiModelProperty(value = "业务类型code")
private String businessTypeCode; private String businessTypeCode;
@ApiModelProperty(value = "调度类型(融合调度、外部协调)")
private String schedulingType;
@ApiModelProperty(value = "调度类型code")
private String schedulingTypeCode;
@ApiModelProperty(value = "报送时间")
private Date submissionTime;
@ApiModelProperty(value = "通话记录id") @ApiModelProperty(value = "通话记录id")
private String callLogId; private String callLogId;
@ApiModelProperty(value = "调度类型code(融合调度、外部协调)") @ApiModelProperty(value = "发送人")
private String schedulingTypeCode; private String sender;
/** @ApiModelProperty(value = "报送方式(电话、短信)")
* 区分是警情报送还是融合调度 private String submissionMethod;
* 电话：融合调度
* 短信：警情报送 @ApiModelProperty(value = "报送方式code")
*/
@ApiModelProperty(value = "报送方式code(电话、短信)")
private String submissionMethodCode; private String submissionMethodCode;
/** @ApiModelProperty(value = "报送内容")
* 报送对象 private String submissionContent;
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
@ApiModelProperty(value = "报送对象") @ApiModelProperty(value = "报送对象")
private List<SubmitTargetCompanyDto> submitCompanyList; private List<SubmitTargetCompanyDto> submitCompanyList;
/**
* 报送内容
*/
@ApiModelProperty(value = "报送内容") @ApiModelProperty(value = "报送内容")
private JSONObject submitContent; private JSONObject submitContent;
/**
* 发送对象类型（0：人员，1：单位）
*/
@ApiModelProperty(value = "报送对象类型0：人员，1：单位") @ApiModelProperty(value = "报送对象类型0：人员，1：单位")
private String type; private String type;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedExtVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertSubmittedExtDto.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -8,7 +8,7 @@ import lombok.Data; ...@@ -8,7 +8,7 @@ import lombok.Data;
* @author DELL * @author DELL
*/ */
@Data @Data
public class AlertSubmittedExtVo extends AlertSubmittedVo { public class AlertSubmittedExtDto extends AlertSubmittedDto {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private Long sequenceNbr; private Long sequenceNbr;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedSMSVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertSubmittedSMSDto.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -15,8 +15,8 @@ import java.util.Date; ...@@ -15,8 +15,8 @@ import java.util.Date;
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "AlertSubmittedSMSVo", description = "融合调度记录短信详情") @ApiModel(value = "AlertSubmittedSMSDto", description = "融合调度记录短信详情")
public class AlertSubmittedSMSVo { public class AlertSubmittedSMSDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersData.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersDataDto.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
public class FirefightersData { /**
* @author DELL
*/
public class FirefightersDataDto {
private FirefightersWorkexperience firefightersWorkexperience; private FirefightersWorkexperience firefightersWorkexperience;
private FirefightersEducation firefightersEducation; private FirefightersEducation firefightersEducation;
...@@ -29,14 +32,14 @@ public class FirefightersData { ...@@ -29,14 +32,14 @@ public class FirefightersData {
this.firefightersPost = firefightersPost; this.firefightersPost = firefightersPost;
} }
public FirefightersData(FirefightersWorkexperience firefightersWorkexperience, public FirefightersDataDto(FirefightersWorkexperience firefightersWorkexperience,
FirefightersEducation firefightersEducation, FirefightersPost firefightersPost) { FirefightersEducation firefightersEducation, FirefightersPost firefightersPost) {
super(); super();
this.firefightersWorkexperience = firefightersWorkexperience; this.firefightersWorkexperience = firefightersWorkexperience;
this.firefightersEducation = firefightersEducation; this.firefightersEducation = firefightersEducation;
this.firefightersPost = firefightersPost; this.firefightersPost = firefightersPost;
} }
public FirefightersData() { public FirefightersDataDto() {
super(); super();
} }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/FirefightersVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/FirefightersInfoDto.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters; import com.yeejoin.amos.boot.module.jcs.api.entity.Firefighters;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersContacts;
...@@ -13,10 +13,8 @@ import lombok.Data; ...@@ -13,10 +13,8 @@ import lombok.Data;
* @date 2021-06-07 * @date 2021-06-07
*/ */
@Data @Data
@ApiModel(value="FirefightersVo", description="消防队员") @ApiModel(value="FirefightersInfoDto", description="消防队员")
public class FirefightersVo{ public class FirefightersInfoDto {
@ApiModelProperty(value = "基本信息") @ApiModelProperty(value = "基本信息")
private Firefighters firefighters; private Firefighters firefighters;
...@@ -24,18 +22,9 @@ public class FirefightersVo{ ...@@ -24,18 +22,9 @@ public class FirefightersVo{
@ApiModelProperty(value = "联系人信息") @ApiModelProperty(value = "联系人信息")
private FirefightersContacts firefightersContacts; private FirefightersContacts firefightersContacts;
public FirefightersVo(Firefighters firefighters, FirefightersContacts firefightersContacts) { public FirefightersInfoDto(Firefighters firefighters, FirefightersContacts firefightersContacts) {
super(); super();
this.firefighters = firefighters; this.firefighters = firefighters;
this.firefightersContacts = firefightersContacts; this.firefightersContacts = firefightersContacts;
} }
public FirefightersVo() {
super();
}
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyDto.java
View file @ d970c695
...@@ -39,6 +39,12 @@ public class PowerTransferCompanyDto extends BaseDto { ...@@ -39,6 +39,12 @@ public class PowerTransferCompanyDto extends BaseDto {
@ApiModelProperty(value = "操作人名称") @ApiModelProperty(value = "操作人名称")
private String recUserName; private String recUserName;
@ApiModelProperty(value = "资源类型")
private String type;
@ApiModelProperty(value = "资源数量")
private Integer resourcesCount;
@ApiModelProperty(value = "调派单位资源列表") @ApiModelProperty(value = "调派单位资源列表")
private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList; private List<PowerTransferCompanyResourcesDto> powerTransferCompanyResourcesDtoList;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyResourcesDto.java
View file @ d970c695
...@@ -17,6 +17,8 @@ import lombok.EqualsAndHashCode; ...@@ -17,6 +17,8 @@ import lombok.EqualsAndHashCode;
public class PowerTransferCompanyResourcesDto extends BaseDto { public class PowerTransferCompanyResourcesDto extends BaseDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "所属队伍")
private String companyName;
@ApiModelProperty(value = "资源类型") @ApiModelProperty(value = "资源类型")
private String type; private String type;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferSimpleDto.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.dto;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -17,8 +18,8 @@ import java.util.List; ...@@ -17,8 +18,8 @@ import java.util.List;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@TableName("jc_power_transfer") @TableName("jc_power_transfer")
@ApiModel(value = "PowerTransferVo", description = "力量调派") @ApiModel(value = "PowerTransferSimpleDto", description = "力量调派")
public class PowerTransferVo { public class PowerTransferSimpleDto {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -32,6 +33,6 @@ public class PowerTransferVo { ...@@ -32,6 +33,6 @@ public class PowerTransferVo {
private Integer evacuateCount; private Integer evacuateCount;
@ApiModelProperty(value = "调派资源列表") @ApiModelProperty(value = "调派资源列表")
private List<PowerTransferCompanyResourcesVo> resourcesList; private List<PowerTransferCompanyResourcesDto> resourcesList;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/SchedulingReportingVo.java → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/SchedulingReportingDto.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.vo; package com.yeejoin.amos.boot.module.jcs.api.dto;
import lombok.Data; import lombok.Data;
...@@ -9,7 +9,7 @@ import java.util.List; ...@@ -9,7 +9,7 @@ import java.util.List;
* @author DELL * @author DELL
*/ */
@Data @Data
public class SchedulingReportingVo { public class SchedulingReportingDto {
/** /**
* 额外信息（统计） * 额外信息（统计）
*/ */
...@@ -18,5 +18,5 @@ public class SchedulingReportingVo { ...@@ -18,5 +18,5 @@ public class SchedulingReportingVo {
/** /**
* 警情报送/融合调度列表 * 警情报送/融合调度列表
*/ */
List<AlertSubmittedExtVo> schedulingReportingList; List<AlertSubmittedExtDto> schedulingReportingList;
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/AlertSubmittedMapper.java
View file @ d970c695
...@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper; ...@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted; import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -22,7 +22,7 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> { ...@@ -22,7 +22,7 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
* @param alertSubmittedDto * @param alertSubmittedDto
* @return * @return
*/ */
List<AlertSubmittedExtVo> listSchedulingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto); List<AlertSubmittedExtDto> listSchedulingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
/** /**
* 根据参数获取警情报送列表 * 根据参数获取警情报送列表
...@@ -30,14 +30,14 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> { ...@@ -30,14 +30,14 @@ public interface AlertSubmittedMapper extends BaseMapper<AlertSubmitted> {
* @param alertSubmittedDto * @param alertSubmittedDto
* @return * @return
*/ */
List<AlertSubmittedExtVo> listReportingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto); List<AlertSubmittedExtDto> listReportingByParam(@Param("alertSubmittedDto") AlertSubmittedDto alertSubmittedDto);
/** /**
* 获取融合调度短信内容 * 获取融合调度短信内容
* @param id id * @param id id
* @return 返回结果 * @return 返回结果
*/ */
AlertSubmittedSMSVo getSchedulingContent(@Param("id") Long id); AlertSubmittedSMSDto getSchedulingContent(@Param("id") Long id);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/PowerTransferMapper.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.api.mapper; package com.yeejoin.amos.boot.module.jcs.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer; import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
import java.util.List; import java.util.List;
...@@ -14,7 +14,7 @@ import java.util.List; ...@@ -14,7 +14,7 @@ import java.util.List;
* @date 2021-06-17 * @date 2021-06-17
*/ */
public interface PowerTransferMapper extends BaseMapper<PowerTransfer> { public interface PowerTransferMapper extends BaseMapper<PowerTransfer> {
List<PowerTransferCompanyResourcesVo> getPowerTransferList(Long alertCalledId); List<PowerTransferCompanyResourcesDto> getPowerTransferList(Long alertCalledId);
List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId); List<PowerTransferCompanyDto> getLastPowerTransferCompany(Long alertCalledId);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IAlertSubmittedService.java
View file @ d970c695
...@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.service; ...@@ -3,8 +3,8 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted; import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo; import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
/** /**
* 警情报送记录 服务类 * 警情报送记录 服务类
...@@ -18,17 +18,17 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> { ...@@ -18,17 +18,17 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> {
* 根据参数查询融合调度记录 * 根据参数查询融合调度记录
* *
* @param queryParam * @param queryParam
* @return SchedulingReportingVo * @return SchedulingReportingDto
*/ */
SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam); SchedulingReportingDto listSchedulingByParam(AlertSubmittedDto queryParam);
/** /**
* 根据参数查询警情报送记录 * 根据参数查询警情报送记录
* *
* @param queryParam * @param queryParam
* @return SchedulingReportingVo * @return SchedulingReportingDto
*/ */
SchedulingReportingVo listReportingByParam(AlertSubmittedDto queryParam); SchedulingReportingDto listReportingByParam(AlertSubmittedDto queryParam);
/** /**
* 警情报送保存 * 警情报送保存
...@@ -39,5 +39,5 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> { ...@@ -39,5 +39,5 @@ public interface IAlertSubmittedService extends IService<AlertSubmitted> {
*/ */
Boolean save(AlertSubmittedDto alertSubmittedDto, String userName) throws Exception; Boolean save(AlertSubmittedDto alertSubmittedDto, String userName) throws Exception;
AlertSubmittedSMSVo getSchedulingContent(Long id); AlertSubmittedSMSDto getSchedulingContent(Long id);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferService.java
View file @ d970c695
...@@ -2,10 +2,10 @@ package com.yeejoin.amos.boot.module.jcs.api.service; ...@@ -2,10 +2,10 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto; import com.yeejoin.amos.boot.module.jcs.api.dto.FireBrigadeResourceDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto; import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer; import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo; import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
import java.util.List; import java.util.List;
...@@ -17,11 +17,11 @@ import java.util.List; ...@@ -17,11 +17,11 @@ import java.util.List;
*/ */
public interface IPowerTransferService extends IService<PowerTransfer> { public interface IPowerTransferService extends IService<PowerTransfer> {
PowerTransferVo getPowerTransferList(Long alertCalledId); PowerTransferSimpleDto getPowerTransferList(Long alertCalledId);
boolean createPowerTransfer(PowerTransferDto powerTransferDto); boolean createPowerTransfer(PowerTransferDto powerTransferDto);
List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId); List<PowerTransferCompanyDto> getLastPowerTransferCompany(Long alertCalledId);
/** /**
* 获取力量调派资源树 * 获取力量调派资源树
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/AlertSubmittedVo.java deleted 100644 → 0
View file @ 8ca07d33
package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 警情报送记录
*
* @author tb
* @date 2021-06-17
*/
@Data
@Accessors(chain = true)
@TableName("jc_alert_submitted")
@ApiModel(value="AlertSubmittedVo", description="警情报送记录")
public class AlertSubmittedVo{
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "警情id")
private Long alertCalledId;
@ApiModelProperty(value = "业务类型(警情续报、非警情确认、警情结案)")
private String businessType;
@ApiModelProperty(value = "业务类型code")
private String businessTypeCode;
@ApiModelProperty(value = "调度类型(融合调度、外部协调)")
private String schedulingType;
@ApiModelProperty(value = "调度类型code")
private String schedulingTypeCode;
@ApiModelProperty(value = "报送时间")
private Date submissionTime;
@ApiModelProperty(value = "通话记录id")
private String callLogId;
@ApiModelProperty(value = "发送人")
private String sender;
@ApiModelProperty(value = "报送方式(电话、短信)")
private String submissionMethod;
@ApiModelProperty(value = "报送方式code")
private String submissionMethodCode;
@ApiModelProperty(value = "报送内容")
private String submissionContent;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferCompanyResourcesVo.java deleted 100644 → 0
View file @ 8ca07d33
package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
* 调派单位资源
*
* @author tb
* @date 2021-06-17
*/
@Data
@Accessors(chain = true)
@TableName("jc_power_transfer_company_resources")
@ApiModel(value = "PowerTransferCompanyResourcesVo", description = "调派单位资源")
public class PowerTransferCompanyResourcesVo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "编号")
private Long sequenceNbr;
@ApiModelProperty(value = "所属队伍")
private String companyName;
@ApiModelProperty(value = "资源类型")
private String type;
@ApiModelProperty(value = "资源id")
private String resourcesId;
@ApiModelProperty(value = "资源名称")
private String resourcesName;
@ApiModelProperty(value = "资源编号（如车牌号）")
private String resourcesNum;
@ApiModelProperty(value = "操作人名称")
private String recUserName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/PowerTransferCompanyVo.java deleted 100644 → 0
View file @ 8ca07d33
package com.yeejoin.amos.boot.module.jcs.api.vo;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 调派单位
*
* @author tb
* @date 2021-06-17
*/
@Data
@Accessors(chain = true)
@TableName("jc_power_transfer_company")
@ApiModel(value = "PowerTransferCompanyVo", description = "调派单位")
public class PowerTransferCompanyVo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = " 单位名称")
private String companyName;
@ApiModelProperty(value = "资源类型")
private String type;
@ApiModelProperty(value = "资源数量")
private Integer resourcesCount;
@ApiModelProperty(value = "时间")
private Date recDate;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertSubmittedMapper.xml
View file @ d970c695
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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.jcs.api.mapper.AlertSubmittedMapper"> <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper">
<select id="listSchedulingByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo"> <select id="listSchedulingByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto">
select select
jas.sequence_nbr alertSubmittedId, jas.sequence_nbr alertSubmittedId,
jas.alert_called_id, jas.alert_called_id,
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</if> </if>
order by jas.submission_time desc order by jas.submission_time desc
</select> </select>
<select id="listReportingByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo"> <select id="listReportingByParam" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto">
select select
jas.sequence_nbr alertSubmittedId, jas.sequence_nbr alertSubmittedId,
jas.alert_called_id, jas.alert_called_id,
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
order by jas.submission_time desc order by jas.submission_time desc
</select> </select>
<select id="getSchedulingContent" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo"> <select id="getSchedulingContent" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto">
SELECT SELECT
s.sequence_nbr, s.sequence_nbr,
s.submission_time, s.submission_time,
......
amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml
View file @ d970c695
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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.jcs.api.mapper.PowerTransferMapper"> <mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper">
<select id="getPowerTransferList" <select id="getPowerTransferList"
resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo"> resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto">
select sequence_nbr, company_name, type, resources_num select sequence_nbr, company_name, type, resources_num
from ( from (
select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</select> </select>
<select id="getLastPowerTransferCompany" <select id="getLastPowerTransferCompany"
resultType="com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo"> resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto">
select company_name, type, count(resources_num) resourcesCount, rec_date select company_name, type, count(resources_num) resourcesCount, rec_date
from (select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date from (select ptcr.sequence_nbr, ptc.company_name, ptcr.type, ptcr.resources_num, ptcr.rec_date
from jc_power_transfer_company ptc from jc_power_transfer_company ptc
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java
View file @ d970c695
...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller; ...@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -24,8 +25,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto; ...@@ -24,8 +25,7 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto; import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted; import com.yeejoin.amos.boot.module.jcs.api.entity.AlertSubmitted;
import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum; import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertCalledServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertSubmittedServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.DataDictionaryServiceImpl;
...@@ -118,7 +118,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -118,7 +118,7 @@ public class AlertSubmittedController extends BaseController {
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/scheduling/list", method = RequestMethod.POST) @RequestMapping(value = "/scheduling/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度列表", notes = "根据警情id查询融合调度列表") @ApiOperation(httpMethod = "POST", value = "根据警情id查询融合调度列表", notes = "根据警情id查询融合调度列表")
public ResponseModel<SchedulingReportingVo> listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) { public ResponseModel<SchedulingReportingDto> listSchedulingByParam(@RequestBody AlertSubmittedDto queryParam) {
return ResponseHelper.buildResponse(alertSubmittedService.listSchedulingByParam(queryParam)); return ResponseHelper.buildResponse(alertSubmittedService.listSchedulingByParam(queryParam));
} }
...@@ -126,7 +126,7 @@ public class AlertSubmittedController extends BaseController { ...@@ -126,7 +126,7 @@ public class AlertSubmittedController extends BaseController {
@RequestMapping(value = "/reporting/list", method = RequestMethod.POST) @RequestMapping(value = "/reporting/list", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表") @ApiOperation(httpMethod = "POST", value = "根据警情id查询警情报送列表", notes = "根据警情id查询警情报送列表")
public ResponseModel<SchedulingReportingVo> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) { public ResponseModel<SchedulingReportingDto> listReportingByParam(@RequestBody AlertSubmittedDto queryParam) {
queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode()); queryParam.setSubmissionMethodCode(SubmissionMethodEnum.SMS.getCode());
return ResponseHelper.buildResponse(alertSubmittedService.listReportingByParam(queryParam)); return ResponseHelper.buildResponse(alertSubmittedService.listReportingByParam(queryParam));
} }
...@@ -212,9 +212,9 @@ public class AlertSubmittedController extends BaseController { ...@@ -212,9 +212,9 @@ public class AlertSubmittedController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}/scheduling_content", method = RequestMethod.GET) @RequestMapping(value = "/{id}/scheduling_content", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容") @ApiOperation(httpMethod = "GET", value = "获取融合调度短信内容", notes = "获取融合调度短信内容")
public ResponseModel<AlertSubmittedSMSVo> getSchedulingContent(@PathVariable Long id) { public ResponseModel<AlertSubmittedSMSDto> getSchedulingContent(@PathVariable Long id) {
// 获取报送内容 // 获取报送内容
AlertSubmittedSMSVo schedulingContent = alertSubmittedService.getSchedulingContent(id); AlertSubmittedSMSDto schedulingContent = alertSubmittedService.getSchedulingContent(id);
return ResponseHelper.buildResponse(schedulingContent); return ResponseHelper.buildResponse(schedulingContent);
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java
View file @ d970c695
...@@ -6,6 +6,7 @@ import java.util.Map; ...@@ -6,6 +6,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersInfoDto;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -37,7 +38,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation; ...@@ -37,7 +38,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersJacket;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersThought;
import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersVo;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContractServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
...@@ -88,7 +88,7 @@ public class FirefightersController extends BaseController { ...@@ -88,7 +88,7 @@ public class FirefightersController extends BaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增消防队员", notes = "新增消防队员") @ApiOperation(httpMethod = "POST", value = "新增消防队员", notes = "新增消防队员")
@Transactional @Transactional
public ResponseModel<Firefighters> saveFirefighters(@RequestBody FirefightersVo firefighters){ public ResponseModel<Firefighters> saveFirefighters(@RequestBody FirefightersInfoDto firefighters){
try { try {
Firefighters firefighter= firefighters.getFirefighters(); Firefighters firefighter= firefighters.getFirefighters();
...@@ -151,7 +151,7 @@ public class FirefightersController extends BaseController { ...@@ -151,7 +151,7 @@ public class FirefightersController extends BaseController {
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改消防队员", notes = "修改消防队员") @ApiOperation(httpMethod = "PUT", value = "修改消防队员", notes = "修改消防队员")
@Transactional @Transactional
public ResponseModel<Object> updateByIdFirefighters(HttpServletRequest request, @RequestBody FirefightersVo firefighters){ public ResponseModel<Object> updateByIdFirefighters(HttpServletRequest request, @RequestBody FirefightersInfoDto firefighters){
try { try {
Firefighters firefighter= firefighters.getFirefighters(); Firefighters firefighter= firefighters.getFirefighters();
iFirefightersService.updateById(firefighter); iFirefightersService.updateById(firefighter);
...@@ -185,9 +185,9 @@ public class FirefightersController extends BaseController { ...@@ -185,9 +185,9 @@ public class FirefightersController extends BaseController {
QueryWrapper<FirefightersContacts> queryWrapper=new QueryWrapper<>(); QueryWrapper<FirefightersContacts> queryWrapper=new QueryWrapper<>();
queryWrapper.eq("firefighters_id", id); queryWrapper.eq("firefighters_id", id);
FirefightersContacts firefightersContacts= ifirefightersContactsService.getOne(queryWrapper); FirefightersContacts firefightersContacts= ifirefightersContactsService.getOne(queryWrapper);
FirefightersVo firefightersVo=new FirefightersVo(firefighters, firefightersContacts); FirefightersInfoDto firefightersInfoDto =new FirefightersInfoDto(firefighters, firefightersContacts);
redisUtils.set(RedisKey.FIREFIGHTERS_ID+id, JSON.toJSON(firefightersVo),time); redisUtils.set(RedisKey.FIREFIGHTERS_ID+id, JSON.toJSON(firefightersInfoDto),time);
return ResponseHelper.buildResponse(firefightersVo); return ResponseHelper.buildResponse(firefightersInfoDto);
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersPostController.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.biz.controller; package com.yeejoin.amos.boot.module.jcs.biz.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -26,17 +8,32 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController; ...@@ -26,17 +8,32 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey; import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jcs.api.dto.FirefightersDataDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersEducation;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersPost;
import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience; import com.yeejoin.amos.boot.module.jcs.api.entity.FirefightersWorkexperience;
import com.yeejoin.amos.boot.module.jcs.api.vo.FirefightersData;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersContactsServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersEducationServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersPostServiceImpl;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.FirefightersWorkexperienceServiceImpl;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
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.Arrays;
/** /**
...@@ -70,11 +67,11 @@ public class FirefightersPostController extends BaseController { ...@@ -70,11 +67,11 @@ public class FirefightersPostController extends BaseController {
@RequestMapping(value = "/save", method = RequestMethod.POST) @RequestMapping(value = "/save", method = RequestMethod.POST)
@ApiOperation(httpMethod = "POST", value = "新增岗位信息", notes = "新增岗位信息") @ApiOperation(httpMethod = "POST", value = "新增岗位信息", notes = "新增岗位信息")
@Transactional @Transactional
public ResponseModel<Object> saveFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){ public ResponseModel<Object> saveFirefightersPost(@RequestBody FirefightersDataDto firefightersDataDto) {
try { try {
iFirefightersPostService.save(firefightersData.getFirefightersPost()); iFirefightersPostService.save(firefightersDataDto.getFirefightersPost());
ifirefightersWorkexperienceService.save(firefightersData.getFirefightersWorkexperience()); ifirefightersWorkexperienceService.save(firefightersDataDto.getFirefightersWorkexperience());
ifirefightersEducationService.save(firefightersData.getFirefightersEducation()) ; ifirefightersEducationService.save(firefightersDataDto.getFirefightersEducation());
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
} catch (Exception e) { } catch (Exception e) {
...@@ -91,7 +88,7 @@ public class FirefightersPostController extends BaseController { ...@@ -91,7 +88,7 @@ public class FirefightersPostController extends BaseController {
@RequestMapping(value = "/{id}", method = RequestMethod.DELETE) @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
@ApiOperation(httpMethod = "DELETE", value = "根据消防人员id删除岗位和学历信息", notes = "根据 id删除") @ApiOperation(httpMethod = "DELETE", value = "根据消防人员id删除岗位和学历信息", notes = "根据 id删除")
@Transactional @Transactional
public ResponseModel<Object> deleteById(HttpServletRequest request, @PathVariable Long id){ public ResponseModel<Object> deleteById(@PathVariable Long id){
try { try {
iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1)); iFirefightersPostService.update(new UpdateWrapper<FirefightersPost>().eq("firefighters_id", id).set("is_delete", 1));
ifirefightersWorkexperienceService.update(new UpdateWrapper<FirefightersWorkexperience>().eq("firefighters_id", id).set("is_delete", 1)); ifirefightersWorkexperienceService.update(new UpdateWrapper<FirefightersWorkexperience>().eq("firefighters_id", id).set("is_delete", 1));
...@@ -105,9 +102,6 @@ public class FirefightersPostController extends BaseController { ...@@ -105,9 +102,6 @@ public class FirefightersPostController extends BaseController {
} }
} }
/** /**
* 修改岗位信息 * 修改岗位信息
* @return * @return
...@@ -116,14 +110,14 @@ public class FirefightersPostController extends BaseController { ...@@ -116,14 +110,14 @@ public class FirefightersPostController extends BaseController {
@RequestMapping(value = "/updateById", method = RequestMethod.PUT) @RequestMapping(value = "/updateById", method = RequestMethod.PUT)
@ApiOperation(httpMethod = "PUT", value = "修改岗位信息", notes = "修改岗位信息") @ApiOperation(httpMethod = "PUT", value = "修改岗位信息", notes = "修改岗位信息")
@Transactional @Transactional
public ResponseModel<Object> updateByIdFirefightersPost(HttpServletRequest request, @RequestBody FirefightersData firefightersData){ public ResponseModel<Object> updateByIdFirefightersPost(@RequestBody FirefightersDataDto firefightersDataDto) {
try { try {
FirefightersPost firefightersPost= firefightersData.getFirefightersPost(); FirefightersPost firefightersPost = firefightersDataDto.getFirefightersPost();
iFirefightersPostService.updateById(firefightersPost); iFirefightersPostService.updateById(firefightersPost);
ifirefightersWorkexperienceService.updateById(firefightersData.getFirefightersWorkexperience()); ifirefightersWorkexperienceService.updateById(firefightersDataDto.getFirefightersWorkexperience());
ifirefightersEducationService.updateById(firefightersData.getFirefightersEducation()); ifirefightersEducationService.updateById(firefightersDataDto.getFirefightersEducation());
//删除缓存 //删除缓存
redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+firefightersPost.getSequenceNbr()); redisUtils.del(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID + firefightersPost.getSequenceNbr());
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
} catch (Exception e) { } catch (Exception e) {
...@@ -142,19 +136,12 @@ public class FirefightersPostController extends BaseController { ...@@ -142,19 +136,12 @@ public class FirefightersPostController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询") @ApiOperation(httpMethod = "GET", value = "根据消防员id查询", notes = "根据消防员id查询")
public ResponseModel<Object> selectById(HttpServletRequest request, @PathVariable Long id){ public ResponseModel<Object> selectById(@PathVariable Long id){
// if(redisUtils.hasKey(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id)){
// Object obj= redisUtils.get(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id);
// return ResponseHelper.buildResponse(obj);
// }else{
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
QueryWrapper queryWrapper=new QueryWrapper<>(); QueryWrapper queryWrapper=new QueryWrapper<>();
queryWrapper.eq("firefighters_id", id); queryWrapper.eq("firefighters_id", id);
FirefightersData firefightersData=new FirefightersData( ifirefightersWorkexperienceService.getOne(queryWrapper), ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper)); FirefightersDataDto firefightersDataDto = new FirefightersDataDto(ifirefightersWorkexperienceService.getOne(queryWrapper), ifirefightersEducationService.getOne(queryWrapper), iFirefightersPostService.getOne(queryWrapper));
return ResponseHelper.buildResponse(firefightersDataDto);
// redisUtils.set(RedisKey.EDUCATION_POST_EXPERIENCE_FIREFIGHTERS_ID+id, JSON.toJSON(firefightersData),time);
return ResponseHelper.buildResponse(firefightersData);
// }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/PowerTransferController.java
View file @ d970c695
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
import java.util.Arrays; import java.util.Arrays;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -22,7 +23,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController; ...@@ -22,7 +23,6 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto; import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer; import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransfer;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl; import com.yeejoin.amos.boot.module.jcs.biz.service.impl.PowerTransferServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
...@@ -152,9 +152,9 @@ public class PowerTransferController extends BaseController { ...@@ -152,9 +152,9 @@ public class PowerTransferController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET) @RequestMapping(value = "/list/{alert_called_id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表") @ApiOperation(httpMethod = "GET", value = "根据警情id获取力量调派列表", notes = "根据警情id获取力量调派列表")
public ResponseModel<PowerTransferVo> list(@PathVariable String alert_called_id) { public ResponseModel<PowerTransferSimpleDto> list(@PathVariable String alert_called_id) {
PowerTransferVo powerTransferVo = powerTransferService.getPowerTransferList(Long.parseLong(alert_called_id)); PowerTransferSimpleDto powerTransferSimpleDto = powerTransferService.getPowerTransferList(Long.parseLong(alert_called_id));
return ResponseHelper.buildResponse(powerTransferVo); return ResponseHelper.buildResponse(powerTransferSimpleDto);
} }
/** /**
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertSubmittedServiceImpl.java
View file @ d970c695
package com.yeejoin.amos.boot.module.jcs.biz.service.impl; package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.StringUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
...@@ -31,7 +10,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; ...@@ -31,7 +10,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto; import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedExtDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertSubmittedSMSDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue; import com.yeejoin.amos.boot.module.jcs.api.dto.FormValue;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.SchedulingReportingDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto; import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto; import com.yeejoin.amos.boot.module.jcs.api.dto.TemplateExtendDto;
import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled; import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
...@@ -47,12 +30,28 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum; ...@@ -47,12 +30,28 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.SubmissionMethodEnum;
import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper; import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertSubmittedMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService; import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedObjectService;
import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService; import com.yeejoin.amos.boot.module.jcs.api.service.IAlertSubmittedService;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedExtVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.AlertSubmittedSMSVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.SchedulingReportingVo;
import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction; import com.yeejoin.amos.boot.module.jcs.biz.rule.action.AlertCalledAction;
import com.yeejoin.amos.component.rule.config.RuleConfig; import com.yeejoin.amos.component.rule.config.RuleConfig;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.StringUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 警情报送记录 服务实现类 * 警情报送记录 服务实现类
...@@ -91,12 +90,12 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -91,12 +90,12 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
private String topic; private String topic;
@Override @Override
public SchedulingReportingVo listSchedulingByParam(AlertSubmittedDto queryParam) { public SchedulingReportingDto listSchedulingByParam(AlertSubmittedDto queryParam) {
SchedulingReportingVo schedulingReportingVo = new SchedulingReportingVo(); SchedulingReportingDto schedulingReportingDto = new SchedulingReportingDto();
List<AlertSubmittedExtVo> alertSubmittedExtVoList = this.baseMapper.listSchedulingByParam(queryParam); List<AlertSubmittedExtDto> alertSubmittedExtDtoList = this.baseMapper.listSchedulingByParam(queryParam);
schedulingReportingVo.setSchedulingReportingList(alertSubmittedExtVoList); schedulingReportingDto.setSchedulingReportingList(alertSubmittedExtDtoList);
Map<String, List<AlertSubmittedExtVo>> groupMap = Map<String, List<AlertSubmittedExtDto>> groupMap =
alertSubmittedExtVoList.stream().collect(Collectors.groupingBy(AlertSubmittedExtVo::getSubmissionMethodCode)); alertSubmittedExtDtoList.stream().collect(Collectors.groupingBy(AlertSubmittedExtDto::getSubmissionMethodCode));
int phoneSize = 0; int phoneSize = 0;
int smsSize = 0; int smsSize = 0;
if (ObjectUtils.isNotEmpty(groupMap.get(SubmissionMethodEnum.PHONE.getCode()))) { if (ObjectUtils.isNotEmpty(groupMap.get(SubmissionMethodEnum.PHONE.getCode()))) {
...@@ -106,31 +105,31 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -106,31 +105,31 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
smsSize = groupMap.get(SubmissionMethodEnum.SMS.getCode()).size(); smsSize = groupMap.get(SubmissionMethodEnum.SMS.getCode()).size();
} }
String extraInfo = String.format("已调度电话%s起，短信%d批", phoneSize, smsSize); String extraInfo = String.format("已调度电话%s起，短信%d批", phoneSize, smsSize);
schedulingReportingVo.setExtraInfo(extraInfo); schedulingReportingDto.setExtraInfo(extraInfo);
return schedulingReportingVo; return schedulingReportingDto;
} }
@Override @Override
public SchedulingReportingVo listReportingByParam(AlertSubmittedDto queryParam) { public SchedulingReportingDto listReportingByParam(AlertSubmittedDto queryParam) {
SchedulingReportingVo schedulingReportingVo = new SchedulingReportingVo(); SchedulingReportingDto schedulingReportingDto = new SchedulingReportingDto();
List<AlertSubmittedExtVo> alertSubmittedExtVoList = this.baseMapper.listReportingByParam(queryParam); List<AlertSubmittedExtDto> alertSubmittedExtDtoList = this.baseMapper.listReportingByParam(queryParam);
if (ObjectUtils.isNotEmpty(alertSubmittedExtVoList)) { if (ObjectUtils.isNotEmpty(alertSubmittedExtDtoList)) {
// 组装额外信息 // 组装额外信息
String _extraInfo = "报送给%s、%s"; String _extraInfo = "报送给%s、%s";
alertSubmittedExtVoList.forEach(alertSubmittedExtVo -> { alertSubmittedExtDtoList.forEach(alertSubmittedExtDto -> {
alertSubmittedExtVo.setExtraInfo(String.format(_extraInfo, alertSubmittedExtVo.getCompanyName(), alertSubmittedExtDto.setExtraInfo(String.format(_extraInfo, alertSubmittedExtDto.getCompanyName(),
alertSubmittedExtVo.getUserName())); alertSubmittedExtDto.getUserName()));
TemplateExtendDto template = templateService.getByType(alertSubmittedExtVo.getBusinessTypeCode()); TemplateExtendDto template = templateService.getByType(alertSubmittedExtDto.getBusinessTypeCode());
String richContent = template.getRichContent(); String richContent = template.getRichContent();
alertSubmittedExtVo.setSubmissionContentValue(JSONObject.parseObject(alertSubmittedExtVo.getSubmissionContent())); alertSubmittedExtDto.setSubmissionContentValue(JSONObject.parseObject(alertSubmittedExtDto.getSubmissionContent()));
alertSubmittedExtVo.setSubmissionContent(richContent); alertSubmittedExtDto.setSubmissionContent(richContent);
}); });
schedulingReportingVo.setSchedulingReportingList(alertSubmittedExtVoList); schedulingReportingDto.setSchedulingReportingList(alertSubmittedExtDtoList);
String extraInfo = String.format("已报送%d条", alertSubmittedExtVoList.size()); String extraInfo = String.format("已报送%d条", alertSubmittedExtDtoList.size());
schedulingReportingVo.setExtraInfo(extraInfo); schedulingReportingDto.setExtraInfo(extraInfo);
} }
return schedulingReportingVo; return schedulingReportingDto;
} }
@Override @Override
...@@ -360,16 +359,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -360,16 +359,16 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
for (DataDictionary dataDictionary : dataDictionaries) { for (DataDictionary dataDictionary : dataDictionaries) {
Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code", Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
dataDictionary.getCode())); dataDictionary.getCode()));
List<PowerTransferCompanyVo> lastPowerTransferCompany; List<PowerTransferCompanyDto> lastPowerTransferCompany;
if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany = if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany =
powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) { powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) {
map.put("businessType", template.getType()); map.put("businessType", template.getType());
// 获取力量调派内容 // 获取力量调派内容
StringBuilder companyNames = new StringBuilder(); StringBuilder companyNames = new StringBuilder();
StringBuilder resourcesInfo = new StringBuilder(); StringBuilder resourcesInfo = new StringBuilder();
for (PowerTransferCompanyVo powerTransferCompanyVo : lastPowerTransferCompany) { for (PowerTransferCompanyDto powerTransferCompanyDto : lastPowerTransferCompany) {
companyNames.append(powerTransferCompanyVo.getCompanyName()).append("、"); companyNames.append(powerTransferCompanyDto.getCompanyName()).append("、");
resourcesInfo.append(powerTransferCompanyVo.getType()).append(powerTransferCompanyVo.getResourcesCount()).append("辆、"); resourcesInfo.append(powerTransferCompanyDto.getType()).append(powerTransferCompanyDto.getResourcesCount()).append("辆、");
} }
map.put("companyNames", companyNames.deleteCharAt(companyNames.length() - 1).toString()); map.put("companyNames", companyNames.deleteCharAt(companyNames.length() - 1).toString());
map.put("resourcesInfo", resourcesInfo.deleteCharAt(resourcesInfo.length() - 1).toString()); map.put("resourcesInfo", resourcesInfo.deleteCharAt(resourcesInfo.length() - 1).toString());
...@@ -383,7 +382,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al ...@@ -383,7 +382,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
} }
@Override @Override
public AlertSubmittedSMSVo getSchedulingContent(Long id) { public AlertSubmittedSMSDto getSchedulingContent(Long id) {
return this.baseMapper.getSchedulingContent(id); return this.baseMapper.getSchedulingContent(id);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java
View file @ d970c695
...@@ -18,9 +18,7 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum; ...@@ -18,9 +18,7 @@ import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient; import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper; import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferMapper;
import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService; import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferService;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyResourcesVo; import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferSimpleDto;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferCompanyVo;
import com.yeejoin.amos.boot.module.jcs.api.vo.PowerTransferVo;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -70,14 +68,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe ...@@ -70,14 +68,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
FireTeamServiceImpl fireTeamService; FireTeamServiceImpl fireTeamService;
@Override @Override
public PowerTransferVo getPowerTransferList(Long alertCalledId) { public PowerTransferSimpleDto getPowerTransferList(Long alertCalledId) {
List<PowerTransferCompanyResourcesVo> powerTransferList = List<PowerTransferCompanyResourcesDto> powerTransferList =
this.baseMapper.getPowerTransferList(alertCalledId); this.baseMapper.getPowerTransferList(alertCalledId);
PowerTransferVo powerTransferVo = new PowerTransferVo(); PowerTransferSimpleDto powerTransferSimpleDto = new PowerTransferSimpleDto();
int resourcesCount = powerTransferList.size(); int resourcesCount = powerTransferList.size();
powerTransferVo.setResourcesCount(resourcesCount); powerTransferSimpleDto.setResourcesCount(resourcesCount);
powerTransferVo.setResourcesList(powerTransferList); powerTransferSimpleDto.setResourcesList(powerTransferList);
return powerTransferVo; return powerTransferSimpleDto;
} }
@Override @Override
...@@ -251,7 +249,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe ...@@ -251,7 +249,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
} }
@Override @Override
public List<PowerTransferCompanyVo> getLastPowerTransferCompany(Long alertCalledId) { public List<PowerTransferCompanyDto> getLastPowerTransferCompany(Long alertCalledId) {
return this.baseMapper.getLastPowerTransferCompany(alertCalledId); return this.baseMapper.getLastPowerTransferCompany(alertCalledId);
} }
} }
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