perf: 增加告警温度位置

busi-back/busi-back-model/src/main/java/com/huatek/busi/entity/CwzzTemperature.java

@@ -107,6 +107,12 @@ public class CwzzTemperature extends Pojo implements Serializable  {
     @FieldName("min_tmp")
     private String minTmp;
 
+    /**
+     * 告警温度位置
+     */
+    @FieldName("alarm_location")
+    private String alarmLocation;
+
     /**
      * 主设备ID
      */

busi-back/busi-back-model/src/main/java/com/huatek/busi/vo/CwzzTemperatureVo.java

@@ -106,6 +106,12 @@ public class CwzzTemperatureVo implements Serializable {
     @ExcelAnnotation(exportName = "最低温度（℃）")
     private String minTmp;
 
+    /**
+     * 告警温度位置
+     */
+    @ExcelAnnotation(exportName = "告警温度位置")
+    private String alarmLocation;
+
     /**
      * CAC 的唯一标识（17 位码）
      */

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/CwzzTemperatureMapper.java

@@ -32,7 +32,7 @@ public interface CwzzTemperatureMapper extends BaseCurveSensorMapper, BaseMonito
 	 * @param transformerInfraredTemperatureDto 变压器/电抗器——红外测温：021010、022002、023002、024007Dto
 	 * @return Page 变压器/电抗器——红外测温：021010、022002、023002、024007List
 	 */
-	Page<TransformerInfraredTemperatureVo> selectTransformerInfraredTemperaturePage(TransformerInfraredTemperatureDto transformerInfraredTemperatureDto);
+//	Page<TransformerInfraredTemperatureVo> selectTransformerInfraredTemperaturePage(TransformerInfraredTemperatureDto transformerInfraredTemperatureDto);
 	
 	/**
 	 * 查询CAC红外原始数据

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/CwzzTemperatureMapping.xml

@@ -8,6 +8,7 @@
             t.tmp as tmp,
             t.max_tmp as maxTmp,
             t.min_tmp as minTmp,
+            t.alarm_location as alarmLocation,
             t.sensor_id as sensorId,
             t.time_stamp as timeStamp,
             t.main_tree_id as mainTreeId,

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/job/CustomJobBean.java

@@ -49,7 +49,7 @@ public class CustomJobBean extends QuartzJobBean {
 		//获取spring bean
 	    ScheduleJobLogService scheduleJobLogService = SpringContextUtils.getBean(ScheduleJobLogService.class);
 	    
-		logger.info("任务准备执行，任务ID：" + scheduleJob.getId());
+		logger.info("任务准备执行，任务：" + scheduleJob.getBeanName());
 		 //数据库保存执行记录
         ScheduleJobLog log = new ScheduleJobLog();
         log.setId(Uuid.getUUID());
@@ -71,9 +71,9 @@ public class CustomJobBean extends QuartzJobBean {
 			log.setTimes((int)times);
 			//任务状态    0：成功    1：失败
 			log.setStatus(0);
-			logger.info("任务执行完毕，任务ID：" + scheduleJob.getId() + "  总共耗时：" + times + "毫秒");
+			logger.info("任务执行完毕，任务：" + scheduleJob.getBeanName() + "  总共耗时：" + times + "毫秒");
 		} catch (Exception e) {
-			logger.error("任务执行失败，任务ID：" + scheduleJob.getId(), e);
+			logger.error("任务执行失败，任务：" + scheduleJob.getBeanName(), e);
 			//任务执行总时长
 			long times = System.currentTimeMillis() - startTime;
 			log.setTimes((int)times);