Skip to content

A
amos-boot-biz
Commit 2483254e authored by lisong's avatar lisong
Browse files
Options

电梯管理相关接口切换数据源

parent 4329da3d
Show whitespace changes
Inline Side-by-side
Showing with 163 additions and 270 deletions
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/ElevatorDto.java
View file @ 2483254e
......@@ -223,4 +223,6 @@ public class ElevatorDto extends BaseDto {
@ApiModelProperty(value = "保险信息")
private ElevatorInsureDto elevatorInsureDto;
List<String> ids;
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/dto/ElevatorDtoNew.java
View file @ 2483254e
package com.yeejoin.amos.boot.module.elevator.api.dto;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
......@@ -16,194 +17,38 @@ import java.util.Map;
@Data
public class ElevatorDtoNew {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "电梯应急救援识别码")
@ExcelProperty(value = "电梯应急救援识别码", index = 0)
private String rescueCode;
@ApiModelProperty(value = "设备注册代码")
@ExcelProperty(value = "设备注册代码", index = 8)
private String registerCode;
@ApiModelProperty(value = "所属省")
private String province;
@ApiModelProperty(value = "所属地市")
private String city;
@ApiModelProperty(value = "所属区县")
@ExcelProperty(value = "所属区县", index = 3)
private String district;
@ApiModelProperty(value = "所属区域代码")
private String regionCode;
@ApiModelProperty(value = "安装地址")
@ExcelProperty(value = "安装地址", index = 1)
private String address;
@ApiModelProperty(value = "内部编号")
@ExcelProperty(value = "内部编号", index = 2)
private String innerNum;
@ApiModelProperty(value = "电梯品牌")
private String brand;
@ApiModelProperty(value = "出厂编号")
private String factoryNum;
@ApiModelProperty(value = "电梯安装单位")
private String installationUnit;
@ApiModelProperty(value = "制造日期（出厂时间）")
private String factoryDate;
@ApiModelProperty(value = "电梯大修/改造日期")
private String overhaulDate;
@ApiModelProperty(value = "开始使用日期")
private String startUseDate;
@ApiModelProperty(value = "设备类别")
private String category;
@ApiModelProperty(value = "设备类别code")
private String categoryName;
@ApiModelProperty(value = "使用场所分类")
private String useSiteCategory;
@ApiModelProperty(value = "使用场所分类名称")
private String useSiteCategoryName;
@ApiModelProperty(value = "电梯型号")
private String model;
@ApiModelProperty(value = "电梯层数")
private String floors;
@ApiModelProperty(value = "电梯站数")
private String stations;
@ApiModelProperty(value = "电梯门数")
private String doors;
@ApiModelProperty(value = "电梯额定速度(单位：m/s)")
private Float ratedSpeed;
@ApiModelProperty(value = "电梯额定载重量(单位：kg)")
private Float ratedLoad;
@ApiModelProperty(value = "最大荷载人数")
private String maxPersonLoad;
@ApiModelProperty(value = "提升高度")
private Float raiseHeight;
@ApiModelProperty(value = "拖动方式")
private String dragMode;
@ApiModelProperty(value = "拖动方式名称")
private String dragModeName;
@ApiModelProperty(value = "电梯使用状态")
private String useStatus;
@ApiModelProperty(value = "电梯使用状态Str")
private String useStatusStr;
@ApiModelProperty(value = "使用单位")
@ExcelProperty(value = "使用单位", index = 4)
private String useUnit;
@ApiModelProperty(value = "制造单位名称")
private String manufacturerName;
@ApiModelProperty(value = "制造许可编号")
private String manufacturingLicense;
@ApiModelProperty(value = "维保类型")
private String maintainType;
@ApiModelProperty(value = "维保类型名称")
private String maintainTypeName;
@ApiModelProperty(value = "维护周期")
private String maintainPeriod;
@ApiModelProperty(value = "维护周期名称")
private String maintainPeriodName;
@ApiModelProperty(value = "维保单位")
@ExcelProperty(value = "维保单位", index = 7)
private String maintainUnit;
@ApiModelProperty(value = "维保负责人")
@ExcelProperty(value = "维保负责人", index = 5)
private String maintainLeader;
@ApiModelProperty(value = "维保负责人手机")
@ExcelProperty(value = "维保负责人手机", index = 6)
private String maintainLeaderPhone;
@ApiModelProperty(value = "主机模式")
private String hostModel;
@ApiModelProperty(value = "主机编号")
private String hostNum;
@ApiModelProperty(value = "动力类型")
private String engineType;
@ApiModelProperty(value = "动力编号")
private String engineNum;
@ApiModelProperty(value = "面板模型")
private String panelModel;
@ApiModelProperty(value = "面板编号")
private String panelNum;
@ApiModelProperty(value = "级联模型")
private String cascadeModel;
@ApiModelProperty(value = "级联线路模型")
private String cascadeLineModel;
@ApiModelProperty(value = "扶手带类型")
private String handrailType;
@ApiModelProperty(value = "扶手面板模型")
private String handrailPanelModel;
@ApiModelProperty(value = "扶手面板品牌")
private String handrailPanelBrand;
@ApiModelProperty(value = "滚转机模式")
private String rollerMode;
@ApiModelProperty(value = "倾斜的角度")
private String tiltAngle;
@ApiModelProperty(value = "横向跨度")
private String horizontalSpan;
@ApiModelProperty(value = "运行噪音")
private String runningNoise;
@ApiModelProperty(value = "运行方式")
private String runningMode;
@ApiModelProperty(value = "运行振动")
private String runningVibration;
@ApiModelProperty(value = "功率")
private String power;
@ApiModelProperty(value = "经度")
private String longitude;
@ApiModelProperty(value = "纬度")
private String latitude;
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/ElevatorMapper.java
View file @ 2483254e
......@@ -41,7 +41,7 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
Page<Map<String, Object>> selectElevators(@Param("page") Page<Map<String, Object>> page, @Param("dto") ElevatorDto dto);
List<ElevatorDtoNew> selectExportDataNew(@Param("ids") List<String> ids);
List<ElevatorDtoNew> selectExportDataNew(@Param("dto") ElevatorDto dto, @Param("ids")List<String> ids);
Map<String, Object> selectByRecord(@Param("record") String record);
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/service/IElevatorService.java
View file @ 2483254e
......@@ -36,6 +36,6 @@ public interface IElevatorService extends IService<Elevator> {
Page<Map<String, Object>> selectElevators(Page<Map<String, Object>>page, ElevatorDto dto);
List<ElevatorDtoNew> selectExportDataNew(String exportId);
List<ElevatorDtoNew> selectExportDataNew(ElevatorDto dto);
}
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/ElevatorMapper.xml
View file @ 2483254e
......@@ -103,7 +103,7 @@
ifnull(jui.PHONE, '') as maintainLeaderPhone,
(SELECT GROUP_CONCAT(ME_UNIT_NAME) FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD
) as maintainUnit,
ifnull(jri.EQU_CODE, '') as registerCode,
ifnull(joi.SUPERVISORY_CODE, '') as registerCode,
jui.RECORD as sequenceNbr
FROM idx_biz_jg_use_info jui
LEFT JOIN idx_biz_jg_other_info joi ON jui.RECORD = joi.RECORD
......@@ -136,97 +136,97 @@
</where>
</select>
<select id="selectExportDataNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew">
SELECT joi.CODE96333 AS rescueCode,
jri.EQU_CODE AS registerCode,
jui.PROVINCE_NAME AS province,
jui.CITY_NAME AS city,
jui.COUNTY_NAME AS district,
concat(jui.PROVINCE, '#', jui.CITY, '#', jui.COUNTY) AS regionCode,
jui.ADDRESS AS address,
jui.USE_INNER_CODE AS innerNum,
jri.BRAND_NAME AS brand,
jfi.FACTORY_NUM AS factoryNum,
(SELECT GROUP_CONCAT(USC_UNIT_NAME)
FROM idx_biz_jg_construction_info
WHERE RECORD = jui.RECORD
and CONSTRUCTION_TYPE = '6030') AS installationUnit,
ifnull ( CAST(jfi.PRODUCE_DATE as VARCHAR ), '' ) AS factoryDate,
ifnull ((SELECT CAST(USC_DATE as VARCHAR )
FROM idx_biz_jg_construction_info
WHERE RECORD = jui.RECORD
and CONSTRUCTION_TYPE = '6031'
ORDER BY USC_DATE DESC LIMIT 1 ), '' ) AS overhaulDate,
<!-- <select id="selectExportDataNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew">-->
<!-- SELECT joi.CODE96333 AS rescueCode,-->
<!-- jri.EQU_CODE AS registerCode,-->
<!-- jui.PROVINCE_NAME AS province,-->
<!-- jui.CITY_NAME AS city,-->
<!-- jui.COUNTY_NAME AS district,-->
<!-- concat(jui.PROVINCE, '#', jui.CITY, '#', jui.COUNTY) AS regionCode,-->
<!-- jui.ADDRESS AS address,-->
<!-- jui.USE_INNER_CODE AS innerNum,-->
<!-- jri.BRAND_NAME AS brand,-->
<!-- jfi.FACTORY_NUM AS factoryNum,-->
<!-- (SELECT GROUP_CONCAT(USC_UNIT_NAME)-->
<!-- FROM idx_biz_jg_construction_info-->
<!-- WHERE RECORD = jui.RECORD-->
<!-- and CONSTRUCTION_TYPE = '6030') AS installationUnit,-->
<!-- ifnull ( CAST(jfi.PRODUCE_DATE as VARCHAR ), '' ) AS factoryDate,-->
<!-- ifnull ((SELECT CAST(USC_DATE as VARCHAR )-->
<!-- FROM idx_biz_jg_construction_info-->
<!-- WHERE RECORD = jui.RECORD-->
<!-- and CONSTRUCTION_TYPE = '6031'-->
<!-- ORDER BY USC_DATE DESC LIMIT 1 ), '' ) AS overhaulDate,-->
ifnull ( CAST(jui.USE_DATE as VARCHAR ), '' ) AS startUseDate,
(SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS categoryName,
(SELECT name from cb_data_dictionary WHERE code = jui.USE_PLACE and type = 'ADDRESS' ) AS useSiteCategory,
jri.EQU_TYPE AS model,
tpe.STOREY AS floors,
tpe.STAND AS stations,
tpe.NUMBER_DOORS AS doors,
tpe.RATED_SPEED_UP AS ratedSpeed,
tpe.RATED_LOAD_CAPACITY AS ratedLoad,
'' AS maxPersonLoad,
tpe.LIFTING_HEIGHT AS raiseHeight,
tpe.CONTROL_MODE AS dragModeName,
<!-- ifnull ( CAST(jui.USE_DATE as VARCHAR ), '' ) AS startUseDate,-->
<!-- (SELECT name from tz_equipment_category WHERE code = jri.EQU_LIST) AS categoryName,-->
<!-- (SELECT name from cb_data_dictionary WHERE code = jui.USE_PLACE and type = 'ADDRESS' ) AS useSiteCategory,-->
<!-- jri.EQU_TYPE AS model,-->
<!-- tpe.STOREY AS floors,-->
<!-- tpe.STAND AS stations,-->
<!-- tpe.NUMBER_DOORS AS doors,-->
<!-- tpe.RATED_SPEED_UP AS ratedSpeed,-->
<!-- tpe.RATED_LOAD_CAPACITY AS ratedLoad,-->
<!-- '' AS maxPersonLoad,-->
<!-- tpe.LIFTING_HEIGHT AS raiseHeight,-->
<!-- tpe.CONTROL_MODE AS dragModeName,-->
case
WHEN jui.EQU_STATE = 0 then '未登记'
WHEN jui.EQU_STATE = 1 then '在用'
WHEN jui.EQU_STATE = 2 then '停用'
WHEN jui.EQU_STATE = 3 then '报废'
WHEN jui.EQU_STATE = 4 then '注销'
ELSE ''
END AS useStatus,
<!-- case-->
<!-- WHEN jui.EQU_STATE = 0 then '未登记'-->
<!-- WHEN jui.EQU_STATE = 1 then '在用'-->
<!-- WHEN jui.EQU_STATE = 2 then '停用'-->
<!-- WHEN jui.EQU_STATE = 3 then '报废'-->
<!-- WHEN jui.EQU_STATE = 4 then '注销'-->
<!-- ELSE ''-->
<!-- END AS useStatus,-->
jui.USE_UNIT_NAME AS useUnit,
jfi.PRODUCE_UNIT_NAME AS manufacturerName,
jfi.PRODUCE_LICENSE_NUM AS manufacturingLicense,
'' AS maintainTypeName,
'' AS maintainLeaderPhone,
'' AS hostModel,
'' AS hostNum,
'' AS engineType,
'' AS engineNum,
'' AS panelModel,
'' AS panelNum,
'' AS cascadeModel,
'' AS cascadeLineModel,
'' AS handrailType,
'' AS handrailPanelModel,
'' AS handrailPanelBrand,
'' AS rollerMode,
'' AS tiltAngle,
'' AS horizontalSpan,
'' AS runningNoise,
'' AS runningMode,
'' AS runningVibration,
'' AS power,
ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'latitude', '' ) AS latitude,
ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'longitude', '' ) AS longitude,
(SELECT ME_CYCLE FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC limit
1) as maintainPeriodName,
(SELECT ME_UNIT_NAME FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC
limit 1) as maintainUnit,
<!-- jui.USE_UNIT_NAME AS useUnit,-->
<!-- jfi.PRODUCE_UNIT_NAME AS manufacturerName,-->
<!-- jfi.PRODUCE_LICENSE_NUM AS manufacturingLicense,-->
<!-- '' AS maintainTypeName,-->
<!-- '' AS maintainLeaderPhone,-->
<!-- '' AS hostModel,-->
<!-- '' AS hostNum,-->
<!-- '' AS engineType,-->
<!-- '' AS engineNum,-->
<!-- '' AS panelModel,-->
<!-- '' AS panelNum,-->
<!-- '' AS cascadeModel,-->
<!-- '' AS cascadeLineModel,-->
<!-- '' AS handrailType,-->
<!-- '' AS handrailPanelModel,-->
<!-- '' AS handrailPanelBrand,-->
<!-- '' AS rollerMode,-->
<!-- '' AS tiltAngle,-->
<!-- '' AS horizontalSpan,-->
<!-- '' AS runningNoise,-->
<!-- '' AS runningMode,-->
<!-- '' AS runningVibration,-->
<!-- '' AS power,-->
<!-- ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'latitude', '' ) AS latitude,-->
<!-- ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'longitude', '' ) AS longitude,-->
<!-- (SELECT ME_CYCLE FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC limit-->
<!-- 1) as maintainPeriodName,-->
<!-- (SELECT ME_UNIT_NAME FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC-->
<!-- limit 1) as maintainUnit,-->
(SELECT ME_MASTER FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC limit
1) as maintainLeader,
<!-- (SELECT ME_MASTER FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD ORDER BY REC_DATE DESC limit-->
<!-- 1) as maintainLeader,-->
jui.RECORD AS sequenceNbr
FROM idx_biz_jg_register_info jri
LEFT JOIN idx_biz_jg_other_info joi ON jri.RECORD = joi.RECORD
LEFT JOIN idx_biz_jg_use_info jui ON jri.RECORD = jui.RECORD
LEFT JOIN idx_biz_jg_factory_info jfi ON jri.RECORD = jfi.RECORD
LEFT JOIN idx_biz_jg_tech_params_elevator tpe ON tpe.RECORD = jfi.RECORD
WHERE jri.EQU_LIST = '3000'
<if test="ids != null and ids.size() > 0">
and jui.RECORD in
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">#{item}
</foreach>
<!-- jui.RECORD AS sequenceNbr-->
<!-- FROM idx_biz_jg_register_info jri-->
<!-- LEFT JOIN idx_biz_jg_other_info joi ON jri.RECORD = joi.RECORD-->
<!-- LEFT JOIN idx_biz_jg_use_info jui ON jri.RECORD = jui.RECORD-->
<!-- LEFT JOIN idx_biz_jg_factory_info jfi ON jri.RECORD = jfi.RECORD-->
<!-- LEFT JOIN idx_biz_jg_tech_params_elevator tpe ON tpe.RECORD = jfi.RECORD-->
<!-- WHERE jri.EQU_LIST = '3000'-->
<!-- <if test="ids != null and ids.size() > 0">-->
<!-- and jui.RECORD in-->
<!-- <foreach item="item" collection="ids" separator="," open="(" close=")" index="">#{item}-->
<!-- </foreach>-->
</if>
</select>
<!-- </if>-->
<!-- </select>-->
<select id="selectByRecord" resultType="java.util.Map">
SELECT joi.CODE96333 AS rescueCode,
jri.EQU_CODE AS registerCode,
......@@ -372,4 +372,53 @@
ORDER BY REC_DATE DESC LIMIT 1) as inspectionFile
</select>
<select id="selectExportDataNew" resultType="com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew">
SELECT ifnull(joi.CODE96333, '') as rescueCode,
ifnull(jui.ADDRESS, '') as address,
ifnull(jui.USE_INNER_CODE, '') as innerNum,
ifnull(concat(jui.PROVINCE_NAME, jui.CITY_NAME, jui.COUNTY_NAME), '') as district,
ifnull(jui.USE_UNIT_NAME, '') as useUnit,
ifnull(jui.SAFETY_MANAGER, '') as maintainLeader,
ifnull(jui.PHONE, '') as maintainLeaderPhone,
(SELECT GROUP_CONCAT(ME_UNIT_NAME) FROM idx_biz_jg_maintenance_record_info WHERE RECORD = jui.RECORD
) as maintainUnit,
ifnull(joi.SUPERVISORY_CODE, '') as registerCode,
jui.RECORD as sequenceNbr
FROM idx_biz_jg_use_info jui
LEFT JOIN idx_biz_jg_other_info joi ON jui.RECORD = joi.RECORD
LEFT JOIN idx_biz_jg_register_info jri on jui.RECORD = jri.RECORD
LEFT JOIN idx_biz_jg_maintenance_record_info mri on jui.RECORD = mri.RECORD
<where>
jri.EQU_LIST = '3000'
<if test="dto.regionCode != null and dto.regionCode != ''">
and (jui.PROVINCE = #{dto.regionCode} or jui.CITY = #{dto.regionCode} or jui.COUNTY = #{dto.regionCode}
)
</if>
<if test="dto.rescueCode != null and dto.rescueCode != ''">
and joi.CODE96333 like concat('%',#{dto.rescueCode},'%')
</if>
<if test="dto.address != null and dto.address != ''">
and jui.ADDRESS like concat('%',#{dto.address},'%')
</if>
<if test="dto.maintainLeader != null and dto.maintainLeader != ''">
and jui.SAFETY_MANAGER like concat('%',#{dto.maintainLeader},'%')
</if>
<if test="dto.maintainLeaderPhone != null and dto.maintainLeaderPhone != ''">
and jui.PHONE like concat('%',#{dto.maintainLeaderPhone},'%')
</if>
<if test="dto.maintainUnit != null and dto.maintainUnit != ''">
and mri.ME_UNIT_NAME like concat('%',#{dto.maintainUnit},'%')
</if>
<if test="dto.useUnit != null and dto.useUnit != ''">
and jui.USE_UNIT_NAME like concat('%',#{dto.useUnit},'%')
</if>
<if test="ids != null and ids.size() > 0">
and jui.RECORD in
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">#{item}
</foreach>
</if>
</where>
limit 10
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/ElevatorController.java
View file @ 2483254e
......@@ -7,19 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorBaseInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorListDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorMaintenanceInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorNewDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorTestInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorWlInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.EsElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.*;
import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import com.yeejoin.amos.boot.module.elevator.api.entity.MaintainInfo;
import com.yeejoin.amos.boot.module.elevator.api.entity.TestInfo;
......@@ -35,6 +28,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException;
import org.slf4j.Logger;
......@@ -52,6 +46,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.*;
......@@ -331,6 +326,14 @@ public class ElevatorController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/ocp/exportData")
@ApiOperation(httpMethod = "GET", value = "设备信息导出", notes = "设备信息导出")
public void exportData(HttpServletResponse response, ElevatorDto dto) {
List<ElevatorDtoNew> equipExportData = iElevatorService.selectExportDataNew(dto);
ExcelUtil.createTemplate(response, "设备信息", "设备信息", equipExportData, ElevatorDtoNew.class, null, false);
}
/**
* 获取电梯使用单位
* @return
......
amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/ElevatorServiceImpl.java
View file @ 2483254e
......@@ -283,14 +283,8 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
}
@Override
public List<ElevatorDtoNew> selectExportDataNew(String exportId) {
List<String> ids = null;
if(StringUtils.isNotEmpty(exportId)) {
String[] idStr = exportId.split(",");
ids = Arrays.asList(idStr);
}
List<ElevatorDtoNew> list = baseMapper.selectExportDataNew(ids);
return list;
public List<ElevatorDtoNew> selectExportDataNew(ElevatorDto dto) {
return baseMapper.selectExportDataNew(dto, dto.getIds());
}
public List<ElevatorWlInfoDto> queryElevatorList(ElevatorWlInfoDto esElevatorDto) {
......
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