Commit 15f15504 authored by lisong's avatar lisong

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

parent afd945e4
package com.yeejoin.amos.boot.module.elevator.api.dto;
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;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Data
public class ElevatorDtoNew {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "电梯应急救援识别码")
private String rescueCode;
@ApiModelProperty(value = "设备注册代码")
private String registerCode;
@ApiModelProperty(value = "所属省")
private String province;
@ApiModelProperty(value = "所属地市")
private String city;
@ApiModelProperty(value = "所属区县")
private String district;
@ApiModelProperty(value = "所属区域代码")
private String regionCode;
@ApiModelProperty(value = "安装地址")
private String address;
@ApiModelProperty(value = "内部编号")
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 = "使用单位")
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 = "维保单位")
private String maintainUnit;
@ApiModelProperty(value = "维保负责人")
private String maintainLeader;
@ApiModelProperty(value = "维保负责人手机")
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;
}
package com.yeejoin.amos.boot.module.elevator.api.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorWlInfoDto;
import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import org.apache.ibatis.annotations.Param;
......@@ -36,5 +38,19 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
@Select("select * from tcb_elevator where address like concat('%',#{address},'%')")
List<ElevatorDto> getAddressList(String address);
Page<Map<String, Object>> selectElevators(@Param("page") Page<Map<String, Object>> page, @Param("dto") ElevatorDto dto);
List<ElevatorDtoNew> selectExportDataNew(@Param("ids") List<String> ids);
Map<String, Object> selectByRecord(@Param("record") String record);
Map<String, Object> selectFiles(@Param("record") String record);
Map<String, Object> selectRegisterFiles(@Param("record") String record);
Map<String, Object> selectMaintenanceInspectionFiles(@Param("record") String record);
Map<String,Object> selectElevatorList(@Param("elevator") Elevator elevator);
}
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.MaintenanceUnit;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* Mapper 接口
......@@ -16,4 +17,6 @@ import java.util.List;
public interface MaintenanceUnitMapper extends BaseMapper<MaintenanceUnit> {
List<MaintenanceUnitDto> selectExportData(@Param("ids") List<String> ids);
Map<String, Object> selectMessage(@Param("record")String record);
}
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.elevator.api.entity.UseUnit;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* Mapper 接口
......@@ -16,4 +17,6 @@ import java.util.List;
public interface UseUnitMapper extends BaseMapper<UseUnit> {
List<UseUnitDto> selectExportData(@Param("ids") List<String> ids);
Map<String, Object> selectMessage(@Param("record") String record);
}
package com.yeejoin.amos.boot.module.elevator.api.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDtoNew;
import com.yeejoin.amos.boot.module.elevator.api.entity.Elevator;
import java.util.List;
......@@ -31,4 +33,9 @@ public interface IElevatorService extends IService<Elevator> {
List<ElevatorDto> selectExportData(String exportId);
Map<String,Object> selectElevatorList(Elevator elevator);
Page<Map<String, Object>> selectElevators(Page<Map<String, Object>>page, ElevatorDto dto);
List<ElevatorDtoNew> selectExportDataNew(String exportId);
}
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.MaintenanceUnitDto;
import com.yeejoin.amos.boot.module.elevator.api.entity.MaintenanceUnit;
import java.util.List;
import java.util.Map;
/**
* 服务类
......@@ -15,4 +16,6 @@ import java.util.List;
public interface IMaintenanceUnitService extends IService<MaintenanceUnit> {
List<MaintenanceUnitDto> selectExportData(String exportId);
Map<String, Object> selectMessage(String record);
}
......@@ -5,6 +5,7 @@ import com.yeejoin.amos.boot.module.elevator.api.dto.UseUnitDto;
import com.yeejoin.amos.boot.module.elevator.api.entity.UseUnit;
import java.util.List;
import java.util.Map;
/**
* 服务类
......@@ -15,4 +16,6 @@ import java.util.List;
public interface IUseUnitService extends IService<UseUnit> {
List<UseUnitDto> selectExportData(String exportId);
Map<String, Object> selectMessage(String record);
}
......@@ -12,5 +12,29 @@
</if>
</select>
<select id="selectMessage" resultType="java.util.Map">
SELECT address,
province,
city,
district,
use_unit as unitName,
use_code as socialCreditCode,
legal_person as legalPerson,
legal_phone as legalPersonPhone,
longitude,
latitude,
safety_one as principalFirst,
safety_one_id as principalFirstId,
safety_one_phone as principalFirstPhone,
safety_two as principalSecond,
safety_two_id as principalSecondId,
safety_two_phone as principalSecondPhone,
sequence_nbr as id
FROM tz_base_enterprise_info
WHERE use_code = (SELECT ME_UNIT_CREDIT_CODE
FROM idx_biz_jg_maintenance_record_info
WHERE record = #{record}
ORDER BY REC_DATE DESC LIMIT 1 )
</select>
</mapper>
......@@ -29,5 +29,27 @@
</if>
</select>
<select id="selectMessage" resultType="java.util.Map">
SELECT address,
province,
city,
district,
use_unit as useUnitName,
use_code as socialCreditCode,
legal_person as manager,
legal_phone as managerPhone,
longitude,
latitude,
safety_one as principal,
safety_one_id as principalId,
safety_one_phone as principalPhone,
sequence_nbr as id
FROM tz_base_enterprise_info
WHERE use_code = (SELECT USE_UNIT_CREDIT_CODE FROM idx_biz_jg_use_info WHERE record = #{record})
</select>
</mapper>
......@@ -155,6 +155,15 @@ public class ElevatorController extends BaseController {
return ResponseHelper.buildResponse(elevatorService.selectBySeq(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/ocp/{sequenceNbr}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel<Map<String, Object>> selectByRecord(@PathVariable String sequenceNbr) {
return ResponseHelper.buildResponse(elevatorService.selectByRecord(sequenceNbr));
}
/**
* 列表分页查询
*
......@@ -312,6 +321,16 @@ public class ElevatorController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/ocp/query_elevator_list", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "分页查询电梯信息(数据源切换)", notes = "分页查询电梯信息(数据源切换)")
public ResponseModel<Page<Map<String, Object>>> selectElevatorList(Long pageNum, Long pageSize,ElevatorDto dto) {
Page<Map<String, Object>> mapPage = new Page<>(pageNum, pageSize);
Page<Map<String, Object>> list = iElevatorService.selectElevators(mapPage, dto);
return ResponseHelper.buildResponse(list);
}
/**
* 获取电梯使用单位
* @return
......
......@@ -34,6 +34,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
......@@ -113,6 +114,13 @@ public class MaintenanceUnitController extends BaseController {
return ResponseHelper.buildResponse(maintenanceUnitDto);
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/ocp/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel<Map<String, Object>> selectMessage(@PathVariable String id) {
Map<String, Object> objectMap = iMaintenanceUnitService.selectMessage(id);
return ResponseHelper.buildResponse(objectMap);
}
/**
* 列表分页查询
*
......
......@@ -207,7 +207,7 @@ public class TemplateExportController extends BaseController {
}
String fileName = exportDto.getFileName();
if("ELEVATOR".equals(exportDto.getExportType())) { // 查询电梯数据
list = elevatorServiceImpl.selectExportData(exportDto.getExportId());
list = elevatorServiceImpl.selectExportDataNew(exportDto.getExportId());
sheetName = "电梯信息";
} else if("MAINTENANCE_COMPANY".equals(exportDto.getExportType())) { // 查询维保单位数据
list = iMaintenanceUnitService.selectExportData(exportDto.getExportId());
......
......@@ -35,6 +35,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
//import com.yeejoin.amos.boot.module.elevator.api.service.EquipFeignService;
......@@ -132,6 +133,15 @@ public class UseUnitController extends BaseController {
return ResponseHelper.buildResponse(useUnitDto);
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/ocp/{id}", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
public ResponseModel< Map<String, Object>> selectMessage(@PathVariable String id) {
Map<String, Object> objectMap = iUseUnitService.selectMessage(id);
return ResponseHelper.buildResponse(objectMap);
}
/**
* 获取平台字典
*
......
package com.yeejoin.amos.boot.module.elevator.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
import com.yeejoin.amos.boot.module.elevator.api.dto.AlertCalledDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorInsureDto;
import com.yeejoin.amos.boot.module.elevator.api.dto.ElevatorWlInfoDto;
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.ElevatorInsure;
import com.yeejoin.amos.boot.module.elevator.api.entity.ElevatorInsureRelation;
......@@ -28,6 +28,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
......@@ -166,6 +167,47 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
return elevatorDto;
}
public Map<String, Object> selectByRecord(String sequenceNbr) {
Map<String, Object> map = baseMapper.selectByRecord(sequenceNbr);
Map<String, Object> designFiles = baseMapper.selectFiles(sequenceNbr);
ArrayList<Map<String, Object>> designFilesList = new ArrayList<>();
changeData(designFiles, "DESIGN_DOC", designFilesList);
changeData(designFiles, "DESIGN_STANDARD", designFilesList);
changeData(designFiles, "FACTORY_STANDARD", designFilesList);
changeData(designFiles, "TYPE_TEST_CREDENTIAL", designFilesList);
changeData(designFiles, "PRODUCT_QUALITY_YIELD_PROVE", designFilesList);
changeData(designFiles, "INS_USE_MAINTAIN_EXPLAIN", designFilesList);
changeData(designFiles, "SUPERVISION_AGENCY_CREDENTIAL", designFilesList);
map.put("designFiles", designFilesList);
Map<String, Object> registerFiles = baseMapper.selectRegisterFiles(sequenceNbr);
ArrayList<Map<String, Object>> registerFilesList = new ArrayList<>();
changeData(registerFiles, "USE_REGISTRATION_CERTIFICATE", registerFilesList);
changeData(registerFiles, "USE_SIGN", registerFilesList);
changeData(registerFiles, "PRODUCT_PHOTO", registerFilesList);
map.put("registerFiles", registerFilesList);
Map<String, Object> maintenanceInspectionFiles = baseMapper.selectMaintenanceInspectionFiles(sequenceNbr);
ArrayList<Map<String, Object>> maintenance = new ArrayList<>();
ArrayList<Map<String, Object>> inspection = new ArrayList<>();
changeData(maintenanceInspectionFiles, "maintenanceFile", maintenance);
map.put("maintenanceFile", maintenance);
changeData(maintenanceInspectionFiles, "inspectionFile", inspection);
map.put("inspectionFile", inspection);
return map;
}
private void changeData(Map<String, Object> data, String column, ArrayList<Map<String, Object>> maps) {
if (!ObjectUtils.isEmpty(data) && data.containsKey(column)) {
JSONArray list = JSON.parseArray(String.valueOf(data.get(column)));
for (Object o : list) {
Map<String, Object> objectMap = (Map<String, Object>) o;
maps.add(objectMap);
}
}
}
@Override
public Elevator selectByAlertId(Long alertId) {
AlertCalledDto alertCalledDto = alertCalledServiceImpl.queryBySeq(alertId);
......@@ -235,6 +277,21 @@ public class ElevatorServiceImpl extends BaseService<ElevatorDto, Elevator, Elev
return elevatorMapper.selectElevatorList(elevator);
}
@Override
public Page<Map<String, Object>> selectElevators(Page<Map<String, Object>> page, ElevatorDto dto) {
return elevatorMapper.selectElevators(page, dto);
}
@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<ElevatorWlInfoDto> queryElevatorList(ElevatorWlInfoDto esElevatorDto) {
return elevatorMapper.queryElevatorList(esElevatorDto.getAddress(),
......
......@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 服务实现类
......@@ -29,4 +30,9 @@ public class MaintenanceUnitServiceImpl extends ServiceImpl<MaintenanceUnitMappe
}
return baseMapper.selectExportData(ids);
}
@Override
public Map<String, Object> selectMessage(String record) {
return baseMapper.selectMessage(record);
}
}
......@@ -10,6 +10,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 服务实现类return null;
......@@ -29,4 +30,9 @@ public class UseUnitServiceImpl extends BaseService<UseUnitDto, UseUnit, UseUnit
}
return baseMapper.selectExportData(ids);
}
@Override
public Map<String, Object> selectMessage(String record) {
return baseMapper.selectMessage(record);
}
}
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