告警详情新增工单处置详情数据

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TdHygfJpInverterWarnDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -87,4 +90,140 @@ public class TdHygfJpInverterWarnDto {
     private String name;
     private String handlerStatus;
     private List<String>  listHandlerStatus;
+
+
+	/**
+	 * 场站id
+	 */
+	@TableField("station_id")
+	private String stationId;
+
+	/**
+	 * 业主名称
+	 */
+	@TableField("owner_name")
+	private String ownerName;
+
+	/**
+	 * 逆变器sn编码
+	 */
+	@TableField("inverter_sn")
+	private String inverterSn;
+	/**
+	 * 告警等级
+	 */
+	@TableField("warning_level")
+	private String warningLevel;
+	/**
+	 * 告警状态
+	 */
+	@TableField("warning_status")
+	private String warningStatus;
+	/**
+	 * 告警内容
+	 */
+	@TableField("warning_content")
+	private String warningContent;
+	/**
+	 * 告警开始时间
+	 */
+	@TableField("warning_start_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date warningStartTime;
+	/**
+	 * 告警开始时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("warning_end_time")
+	private Date warningEndTime;
+	/**
+	 * 告警时长
+	 */
+	@TableField("warning_duration")
+	private String warningDuration;
+
+	/**
+	 * 场站联系人电话
+	 */
+	@TableField("station_contact_phone")
+	private String stationContactPhone;
+	/**
+	 * 场站地址
+	 */
+	@TableField("station_address")
+	private String stationAddress;
+	/**
+	 * 处理附件
+	 */
+	@TableField(value = "handler_content_attachment",typeHandler = FastjsonTypeHandler.class)
+	private List<Object> hanlerContentAttachment;
+	/**
+	 * 处理方式
+	 */
+	@TableField("handler_method")
+	private String handlerMethod;
+	/**
+	 * 是否替换备件
+	 */
+	@TableField("is_repleace_spare_parts")
+	private Boolean isReplaceSpareParts =false;
+	/**
+	 * 运维人员附件
+	 */
+	@TableField(value = "spare_parts_attchment",typeHandler = FastjsonTypeHandler.class)
+	private List<Object> sparePartsAttchment;
+	/**
+	 * 场站运维人员id
+	 */
+	@TableField("maintenance_person_id")
+	private String maintenancePersonId;
+	/**
+	 * 场站经度
+	 */
+	@TableField("station_longitude")
+	private String stationLongitude;
+	/**
+	 * 场站纬度
+	 */
+	@TableField("station_latitude")
+	private String stationLatitude;
+	/**
+	 * 运维人员名称
+	 */
+	@TableField("maintenance_person_name")
+	private String maintenancePersonName;
+	/**
+	 * 运维人员手机号
+	 */
+	@TableField("maintenance_person_phone")
+	private String maintenancePersonPhone;
+	/**
+	 * tdengine告警id
+	 */
+	@TableField("warning_id")
+	private Long warningId;
+	/**
+	 * 区域公司orgCode
+	 */
+	@TableField("regional_companies_code")
+	private String regionalCompaniesCode;
+
+	/**
+	 * 经销商orgcode
+	 */
+	@TableField("amos_company_code")
+	private String amosCompanyCode;
+	@TableField("ticket_type")
+	private String ticketType;
+
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("task_start_time")
+	private Date taskStartTime;
+	/**
+	 * 告警开始时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("task_end_time")
+	private Date taskEndTime;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -112,7 +112,7 @@ public class TdHygfJpInverterWarnController extends BaseController {
 	 * @param sequenceNbr 主键
 	 * @return
 	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "time/{createdTime}")
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器报警表")
 	public ResponseModel<TdHygfJpInverterWarnDto> selectCreatedTime(@PathVariable Long createdTime) {

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.dto.HYGFMaintenanceTicketsDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HYGFMaintenanceTickets;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HYGFMaintenanceTicketsMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.ITdHygfJpInverterWarnService;
 import com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.TdHygfJpInverterWarnMapper;
 import com.yeejoin.amos.boot.module.hygf.api.util.TimeUtil;
@@ -32,6 +37,9 @@ public class TdHygfJpInverterWarnServiceImpl
 	@Autowired
 	JpStationServiceImpl jpStationServiceImpl;
 
+	@Autowired
+	HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
+
 	/**
 	 * 分页查询
 	 */
@@ -59,9 +67,9 @@ public class TdHygfJpInverterWarnServiceImpl
 			tdHygfJpInverterWarnDto.setListHandlerStatus(Arrays.asList(s));
 		}
 		List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
-//		if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
-//
-//		} else {
+		if (tdHygfJpInverterWarnDto.getStationIds().isEmpty()) {
+
+		} else {
 
 			list = this.baseMapper.list(tdHygfJpInverterWarnDto);
 
@@ -79,7 +87,7 @@ public class TdHygfJpInverterWarnServiceImpl
 					}
 				});
 			}
-//		}
+		}
 		PageInfo<TdHygfJpInverterWarnDto> page = new PageInfo(list);
 		com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<TdHygfJpInverterWarnDto>();
 		pagenew.setCurrent(pageNum);
@@ -102,6 +110,10 @@ public class TdHygfJpInverterWarnServiceImpl
 		TdHygfJpInverterWarnDto tdHygfJpInverterWarnDto = this.baseMapper.getByTime(createdTime);
 		JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
 				.eq(JpStation::getThirdStationId, tdHygfJpInverterWarnDto.getThirdStationId()));
+		List<HYGFMaintenanceTickets> hygfMaintenanceTickets = hygfMaintenanceTicketsMapper.
+				selectList(new QueryWrapper<HYGFMaintenanceTickets>()
+						.eq("warning_id",String.valueOf(tdHygfJpInverterWarnDto.getCreatedTime()))
+						.eq("inverter_sn",String.valueOf(tdHygfJpInverterWarnDto.getSnCode())));
 		if (jpStation != null) {
 			tdHygfJpInverterWarnDto.setStationName(jpStation.getName());
 			tdHygfJpInverterWarnDto.setStationContact(jpStation.getStationContact());
@@ -120,7 +132,10 @@ public class TdHygfJpInverterWarnServiceImpl
 				tdHygfJpInverterWarnDto.setStartTimeFormat(TimeUtil.dateFormat(tdHygfJpInverterWarnDto.getStartTime()));
 			}
 		}
-
+		if(hygfMaintenanceTickets.size()>0){
+			HYGFMaintenanceTickets hygfMaintenanceTickets1 =hygfMaintenanceTickets.get(0);
+			BeanUtil.copyProperties(hygfMaintenanceTickets1,tdHygfJpInverterWarnDto);
+		}
 		return tdHygfJpInverterWarnDto;
 	}