fix: 修正sf6气体pressure为空出错，导致每日汇总任务中断，后续任务都没做无数据的问题

This reverts commit e7f06a9c36.

busi-back/busi-app-control/src/main/resources/dev/applicationContext.xml

@@ -18,8 +18,8 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>classpath:redis.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/redis.properties</value>
-				<value>classpath:application.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/application.properties</value>
 			</list>
 		</property>
 	</bean>

busi-back/busi-app-control/src/main/resources/dev/logback.xml

@@ -3,8 +3,6 @@
 	debug="false">
 	<!-- 模块名称， 影响日志配置名，日志文件名 -->
 	<property name="appName" value="busi-app-control" />
-	<!-- 日志路径，这里是相对路径 -->
-	<property name="rootPath" value="/logs" />
 
 	<!-- contextName -->
 	<contextName>${appName}</contextName>
@@ -23,10 +21,10 @@
 
 	<appender name="fileAppender"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${rootPath}/${appName}.log</file>
+		<file>${XYDL_DIR}/jkpg/logs/${appName}.log</file>
 		<rollingPolicy
 			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${rootPath}/${appName}.%i.log.zip</fileNamePattern>
+			<fileNamePattern>${XYDL_DIR}/jkpg/logs/${appName}.%i.log.zip</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>20</maxIndex>
 		</rollingPolicy>

busi-back/busi-app-control/src/main/resources/dev/spring-dubbo.xml

@@ -6,7 +6,8 @@
 	http://code.alibabatech.com/schema/dubbo 
 	http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-	<dubbo:application name="${base.name}" />
+	<!--<dubbo:application name="${base.name}" />-->
+	<dubbo:application name="busi_app_consumer" />
 	<dubbo:consumer timeout="${base.timeout}" loadbalance="${base.roundrobin}"
 		retries="${base.retries}" />
 	<!-- 使用zookeeper注册中心暴露服务地址 -->

busi-back/busi-back-common/src/main/java/com/huatek/busi/common/BusiConstant.java

@@ -255,9 +255,21 @@ public final class BusiConstant {
 
         C_O("6", "C相出线"),
 
-        IN_SIDE("7", "柜内"),
+        A_S("7" , "位置1"),
 
-        OUT_SIDE("8", "柜外测温点");
+        B_S("8" , "位置2"),
+
+        C_S("9" , "位置3"),
+
+        A_X("10" , "位置4"),
+
+        B_X("11" , "位置5"),
+
+        C_X("12" , "位置6"),
+
+        IN_SIDE("13", "柜内"),
+
+        OUT_SIDE("14", "柜外测温点");
 
         private final String value;
         private final String name;

busi-back/busi-back-common/src/main/java/com/huatek/busi/common/util/sftp/SFTPTool.java

@@ -167,7 +167,7 @@ public class SFTPTool {
             log.info("上传本地文件" + srcDirectory + srcFileName + "到远端服务器" + destDirectory + " 结束");
             return destDirectory + "/" + status;
         } catch (Exception e) {
-            log.error("<<<<<<<<<<<<<上传文件异常>>>>>>>>>>>>>>>>>>");
+            log.error("<<<<<<<<<<<<<上传文件异常>>>>>>>>>>>>>>>>>>", e);
         }
         return null;
     }
@@ -231,7 +231,7 @@ public class SFTPTool {
             outputStream.close();
             log.info("上传流" + srcFileName + "到远端服务器" + count + " 结束");
         } catch (Exception e) {
-            log.error("<<<<<<<<<<<<<<上传异常>>>>>>>>>>>>>>>>>>>");
+            log.error("<<<<<<<<<<<<<<上传异常>>>>>>>>>>>>>>>>>>>", e);
         }
         return destDirectory + File.separator + folderPath;
     }
@@ -272,7 +272,7 @@ public class SFTPTool {
             log.info("从远端服务器下载文件" + remoteDirectory + File.separator + remoteFile + "到本地" + file.getPath() + File.separator + localFile + " 结束");
             return "0";
         } catch (Exception e) {
-            log.error("<<<<<<<<<下载异常>>>>>>>>>>>>");
+            log.error("<<<<<<<<<下载异常>>>>>>>>>>>>", e);
         }
         return "1";
     }

busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/BusiSensorController.java

@@ -76,6 +76,23 @@ public class BusiSensorController {
         return ResultUtil.put(ConstantUtil.REQUEST_SUCCESS, "", "");
     }
 
+    /**
+     * 批量新增 批量生成Sensor编码
+     * @param frontCode 前置编码
+     * @param code 后面两位数编码
+     * @param number 传感器个数
+     * @return
+     */
+    @PostMapping(value = "/batchAdd", produces = {"application/json;charset=utf-8"})
+    public Map<String, Object> batchAdd(
+            @RequestBody BusiSensorVo busiSensorVo,
+            @RequestParam(value = "frontCode", required = true) String frontCode,
+            @RequestParam(value = "code", required = true) String code,
+            @RequestParam(value = "number", required = true) String number) {
+        busiSensorService.batchAdd(busiSensorVo,frontCode,code,Integer.parseInt(number));
+        return ResultUtil.put(ConstantUtil.REQUEST_SUCCESS, "", "");
+    }
+
     /**
      * @Title: update @Description: 修改传感器 @createDate: Jul 18, 2019 3:10:20 PM @param @return Map<String,Object> @throws
      */

busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/SysConfigController.java

@@ -2,6 +2,8 @@ package com.huatek.busi.controller;
 
 import java.util.Map;
 
+import com.huatek.frame.base.util.SqlEscapeUtil;
+import com.huatek.torch.frame.exception.OwlException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -85,6 +87,26 @@ public class SysConfigController {
     @KerLog(projectName = "PROJECTNAME", modelName = "SYSCONFIG.MODELNAME", methodName = "SYSCONFIG.METHODNAME.UPDATESYSCONFIG")
     @PostMapping(value = "/updateSysConfig", produces = {"application/json;charset=utf-8"})
     public Map<String, Object> updateSysConfig(String token,@RequestBody SysConfigDTO sysConfigDTO){
+        boolean flag = SqlEscapeUtil.sqlValidate(sysConfigDTO.getParamKey());
+        if (flag) {
+            throw new OwlException("参数名包含非法字符!");
+        }
+        flag = SqlEscapeUtil.sqlValidate(sysConfigDTO.getParamValue());
+        if (flag) {
+            throw new OwlException("参数值包含非法字符!");
+        }
+        flag = SqlEscapeUtil.sqlValidate(sysConfigDTO.getRemark());
+        if (flag) {
+            throw new OwlException("备注包含非法字符!");
+        }
+        flag = SqlEscapeUtil.sqlValidate(sysConfigDTO.getId());
+        if (flag) {
+            throw new OwlException("id包含非法字符!");
+        }
+        flag = SqlEscapeUtil.sqlValidate(sysConfigDTO.getStatus());
+        if (flag) {
+            throw new OwlException("状态包含非法字符!");
+        }
         int count = sysConfigService.updateSysConfig(sysConfigDTO);
         logger.debug("updateSysConfig: {}", count);
         Map<String, Object> map = ResultUtil.put(ConstantUtil.REQUEST_SUCCESS, "", "");

busi-back/busi-back-control/src/main/java/com/huatek/busi/controller/WiringDiagramController.java

@@ -8,6 +8,7 @@ import com.huatek.busi.entity.GlobalSettingItem;
 import com.huatek.busi.entity.WiringDiagram;
 import com.huatek.busi.service.*;
 import com.huatek.busi.where.*;
+import com.huatek.torch.frame.exception.OwlException;
 import com.huatek.torch.frame.tools.ConstantUtil;
 import com.huatek.torch.frame.tools.ResultUtil;
 import io.swagger.annotations.Api;
@@ -18,10 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.util.Base64;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @Api(tags={"一次接线图管理接口"})
 @RestController
@@ -61,7 +59,28 @@ public class WiringDiagramController {
         if(globalSettingItem == null || (globalSettingItem.getFileUploadNumber() == null && globalSettingItem.getFileUploadNumber() <= 0)){
             return ResultUtil.put(ConstantUtil.REQUEST_FAIL, "BUSINESS.UPLOAD.ANNEX.NUM", "");
         }
+        // 检查文件是否为空
+        if (file.isEmpty()) {
+            throw new OwlException("文件不能为空");
+        }
+        // 获取原始文件名并校验
         String fileNamenew = file.getOriginalFilename();
+        if (fileNamenew == null || fileNamenew.isEmpty()) {
+            throw new OwlException("无效的文件名");
+        }
+        // 提取文件后缀（处理包含多个"."的情况）
+        int lastDotIndex = fileNamenew.lastIndexOf('.');
+        if (lastDotIndex == -1) {
+            throw new OwlException("文件缺少扩展名");
+        }
+        String suffix = fileNamenew.substring(lastDotIndex + 1).toLowerCase();
+        // 定义允许的后缀列表（可从配置读取）
+        List<String> allowedSuffixes = Arrays.asList("jpg", "png", "pdf", "docx", "doc", "xlsx", "xls");
+        // 校验后缀合法性
+        if (!allowedSuffixes.contains(suffix)) {
+            throw new OwlException("不支持的文件类型");
+        }
+
         // 上传根目录
         String rootPath = globalSettingItem.getRootPath();
         return iWiringDiagramService.importFile(file.getBytes(), token, "0", fileNamenew, rootPath,type,fileName);

busi-back/busi-back-control/src/main/resources/dev/applicationContext.xml

@@ -17,8 +17,8 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>classpath:redis.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/redis.properties</value>
-				<value>classpath:application.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/application.properties</value>
 			</list>
 		</property>
 		<property name="fileEncoding">

busi-back/busi-back-control/src/main/resources/dev/logback.xml

@@ -3,8 +3,6 @@
 	debug="false">
 	<!-- 模块名称， 影响日志配置名，日志文件名 -->
 	<property name="appName" value="busi-back-control" />
-	<!-- 日志路径，这里是相对路径 -->
-	<property name="rootPath" value="/logs" />
 
 	<!-- contextName -->
 	<contextName>${appName}</contextName>
@@ -23,10 +21,10 @@
 
 	<appender name="fileAppender"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${rootPath}/${appName}.log</file>
+		<file>${XYDL_DIR}/jkpg/logs/${appName}.log</file>
 		<rollingPolicy
 			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${rootPath}/${appName}.%i.log.zip</fileNamePattern>
+			<fileNamePattern>${XYDL_DIR}/jkpg/logs/${appName}.%i.log.zip</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>20</maxIndex>
 		</rollingPolicy>

busi-back/busi-back-control/src/main/resources/dev/spring-dubbo.xml

@@ -6,7 +6,7 @@
 	http://code.alibabatech.com/schema/dubbo 
 	http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-	<dubbo:application name="${base.name}" />
+	<dubbo:application name="busi_consumer" />
 	<dubbo:consumer timeout="${base.timeout}" loadbalance="${base.roundrobin}"
 		retries="${base.retries}" />
 	<!-- 使用zookeeper注册中心暴露服务地址 -->

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

@@ -95,6 +95,30 @@ public class CwzzTemperature extends Pojo implements Serializable  {
     @FieldName("tmp")
     private String tmp;
 
+    /**
+     * 最高温度
+     */
+    @FieldName("max_tmp")
+    private String maxTmp;
+
+    /**
+     * 最低温度
+     */
+    @FieldName("min_tmp")
+    private String minTmp;
+
+    /**
+     * 最高温度位置
+     */
+    @FieldName("max_location")
+    private String maxLocation;
+
+    /**
+     * 告警温度位置
+     */
+    @FieldName("alarm_location")
+    private String alarmLocation;
+
     /**
      * 主设备ID
      */

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

@@ -120,6 +120,45 @@ public class RptTemper extends Pojo implements Serializable  {
      */
     @FieldName("c_o_sensor_id")
     private String cOSensorId;
+
+
+    @FieldName("a_s_temper")
+    private BigDecimal aSTemper;
+
+    @FieldName("a_s_sensor_id")
+    private String aSSensorId;
+
+    @FieldName("b_s_temper")
+    private BigDecimal bSTemper;
+
+    @FieldName("b_s_sensor_id")
+    private String bSSensorId;
+
+    @FieldName("c_s_temper")
+    private BigDecimal cSTemper;
+
+    @FieldName("c_s_sensor_id")
+    private String cSSensorId;
+
+    @FieldName("a_x_temper")
+    private BigDecimal aXTemper;
+
+    @FieldName("a_x_sensor_id")
+    private String aXSensorId;
+
+    @FieldName("b_x_temper")
+    private BigDecimal bXTemper;
+
+    @FieldName("b_x_sensor_id")
+    private String bXSensorId;
+
+    @FieldName("c_x_temper")
+    private BigDecimal cXTemper;
+
+    @FieldName("c_x_sensor_id")
+    private String cXSensorId;
+
+
     /**
      * 创建时间
      */

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

@@ -147,6 +147,42 @@ public class RptTemperCharts extends Pojo implements Serializable {
     @FieldName("co_sensor_id")
     private String coSensorId;
 
+    @FieldName("as_temper")
+    private BigDecimal asTemper;
+
+    @FieldName("as_sensor_id")
+    private String asSensorId;
+
+    @FieldName("bs_temper")
+    private BigDecimal bsTemper;
+
+    @FieldName("bs_sensor_id")
+    private String bsSensorId;
+
+    @FieldName("cs_temper")
+    private BigDecimal csTemper;
+
+    @FieldName("cs_sensor_id")
+    private String csSensorId;
+
+    @FieldName("ax_temper")
+    private BigDecimal axTemper;
+
+    @FieldName("ax_sensor_id")
+    private String axSensorId;
+
+    @FieldName("bx_temper")
+    private BigDecimal bxTemper;
+
+    @FieldName("bx_sensor_id")
+    private String bxSensorId;
+
+    @FieldName("cx_temper")
+    private BigDecimal cxTemper;
+
+    @FieldName("cx_sensor_id")
+    private String cxSensorId;
+
     /**
      * 汇总时间时间
      */

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

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

busi-back/busi-back-service/src/main/java/com/huatek/busi/service/BusiSensorService.java

@@ -44,7 +44,12 @@ public interface BusiSensorService {
 	* @throws 
 	*/ 
 	boolean add(BusiSensorVo busiSensorVo);
-	
+
+	/**
+	 * 批量新增
+	 */
+	boolean batchAdd(BusiSensorVo busiSensorVo, String frontCode, String code, int number);
+
 	/** 
 	* @Title: update 
 	* @Description: 修改传感器 

busi-back/busi-back-service/src/main/java/com/huatek/busi/service/IRMasterDataService.java

@@ -19,4 +19,6 @@ public interface IRMasterDataService {
     int updateByIdAndEquType(String eqType, String refId);
 
     List<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType);
+
+    List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(String equType);
 }

busi-back/busi-back-serviceImpl/pom.xml

@@ -118,7 +118,76 @@
 <!--            <version>1.0</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
-
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>matlabplot</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/matlabplot.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>javabuilder</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/javabuilder.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>assess</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/assess.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>Cable_eval</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/Cable_eval.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>GISmec</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/GISmec.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>lifeassess</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/lifeassess.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>sim_oil_gas</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/sim_oil_gas.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>switchtest</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/switchtest.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>testc</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/testc.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>local</groupId>
+			<artifactId>Plosweb</artifactId>
+			<version>1</version>
+			<scope>system</scope>
+			<systemPath>${pom.basedir}/src/main/webapp/WEB-INF/lib/Plosweb.jar</systemPath>
+		</dependency>
     </dependencies>
 	<build>
 		<finalName>busi-back-serviceImpl</finalName>
@@ -154,6 +223,7 @@
 							<overWriteIfNewer>true</overWriteIfNewer>
 							<includeScope>compile</includeScope>
 							<excludeScope>provided</excludeScope>
+							<excludeArtifactIds>Plosweb,testc,switchtest,sim_oil_gas,lifeassess,GISmec,Cable_eval,assess,javabuilder,matlabplot</excludeArtifactIds>
 						</configuration>
 					</execution>
 				</executions>

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

@@ -43,7 +43,7 @@ import com.huatek.busi.vo.warning.BusiHomePageWarningVo;
      * 按类型获取最近的告警数量
      *sensorCode
      * */
-    Integer getCurrentWarningSum(@Param("sensorCode") String sensorCode, @Param("eqType") String eqType, @Param("gzType") String gzType);
+    Integer getCurrentWarningSum(@Param("mainTreeId") String mainTreeId, @Param("sensorCode") String sensorCode, @Param("eqType") String eqType, @Param("gzType") String gzType);
 
     Integer getBusiEqmWarningCount(Map<String, Object> param);
 

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/mapper/RMasterDataMapper.java

@@ -54,4 +54,6 @@ public interface RMasterDataMapper {
     int updateDlByIdAndEquType(@Param("eqType") String eqType, @Param("refId") String refId);
 
     List<DeviceSubclassOrTestItemListVo> deviceSubclassList(@Param("equType") String equType);
+
+    List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(@Param("equType") String equType);
 }

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

@@ -72,21 +72,21 @@
            t.sensor_manufactor,
            t.sensor_name, -->
         CONCAT_WS('', t_sensor.sensor_name, g_sensor.sensor_name,ge_sensor.sensor_name, a_sensor.sensor_name, o_sensor.sensor_name,
-        p_sensor.sensor_name) AS sensorName,
+        p_sensor.sensor_name, cab_sensor.sensor_name) AS sensorName,
         CONCAT_WS('', t_sensor.sensor_brand, g_sensor.sensor_brand,ge_sensor.sensor_brand, a_sensor.sensor_brand, o_sensor.sensor_brand,
-        p_sensor.sensor_brand) AS sensorBrand,
+        p_sensor.sensor_brand, cab_sensor.sensor_brand) AS sensorBrand,
         CONCAT_WS('', t_sensor.manufactor, g_sensor.manufactor,ge_sensor.manufactor, a_sensor.manufactor, o_sensor.manufactor,
-        p_sensor.manufactor) AS sensorManufactor,
+        p_sensor.manufactor, cab_sensor.manufactor) AS sensorManufactor,
         CONCAT_WS('', t_sensor.position_des, g_sensor.position_des,ge_sensor.position_des, a_sensor.position_des, o_sensor.position_des,
-        p_sensor.position_des) AS sensorInstallLocation,
+        p_sensor.position_des, cab_sensor.position_des) AS sensorInstallLocation,
-        CONCAT_WS('', t_sensor.use_date, g_sensor.use_date,ge_sensor.use_date, a_sensor.use_date, o_sensor.use_date, p_sensor.use_date) AS
+        CONCAT_WS('', t_sensor.use_date, g_sensor.use_date,ge_sensor.use_date, a_sensor.use_date, o_sensor.use_date, p_sensor.use_date,
-        sensorUseDate,
+        cab_sensor.use_date) AS sensorUseDate,
-        CONCAT_WS('',t_sensor.position,g_sensor.position,ge_sensor.position,a_sensor.position,o_sensor.position,p_sensor.position) AS
+        CONCAT_WS('',t_sensor.position,g_sensor.position,ge_sensor.position,a_sensor.position,o_sensor.position,p_sensor.position,
-        sensorPosition,
+        cab_sensor.position) AS sensorPosition,
         t.run_state as runState,
         bst.name AS mainEquipmentName,
-        CONCAT_WS('',transformer_sub.equipment_type,gis_sub.equipment_type,gen_sub.equipment_type,arrester_sub.equipment_type,other_sub.equipment_type)
+        CONCAT_WS('',transformer_sub.equipment_type,gis_sub.equipment_type,gen_sub.equipment_type,arrester_sub.equipment_type,other_sub.equipment_type,
-        as subEquipmentType
+        cab_sensor.equipment_type) as subEquipmentType
     </sql>
 
     <!-- 表关联 -->
@@ -100,7 +100,7 @@
 			LEFT JOIN busi_temper_point p_sensor ON t.sensor_id = p_sensor.sensor_code
             LEFT JOIN busi_cable_sensor cab_sensor ON t.sensor_id = cab_sensor.sensor_code
 
-			LEFT JOIN busi_external_equipment ext ON CONCAT_WS('',t_sensor.equipment_id,g_sensor.equipment_id,a_sensor.equipment_id,o_sensor.equipment_id) = ext.equipment_id
+			LEFT JOIN busi_external_equipment ext ON CONCAT_WS('',t_sensor.equipment_id,g_sensor.equipment_id,a_sensor.equipment_id,o_sensor.equipment_id,cab_sensor.equipment_id) = ext.equipment_id
 			LEFT JOIN busi_transformer_sub_tree transformer_sub ON t_sensor.equipment_id = transformer_sub.id
 			LEFT JOIN busi_gis_sub_tree gis_sub ON g_sensor.equipment_id = gis_sub.id
 			LEFT JOIN busi_generator_sub_tree gen_sub ON ge_sensor.equipment_id = gen_sub.id
@@ -389,8 +389,8 @@
             t.mainTreeId AS mainTreeId,
             t.warningId AS warningId,
             t.siteId as siteId,
-            t.sensorInstallLocation AS sensorInstallLocation,
+            t.sensorInstallLocation AS sensorInstallLocation
-            CONCAT_WS(",",t.oName,t.cableName,t.tName,t.gName,t.aName,t.genName) as sensorName
+--             CONCAT_WS(",",t.oName,t.cableName,t.tName,t.gName,t.aName,t.genName) as sensorName
         from (
             select
             warn.id AS warningId,
@@ -401,13 +401,13 @@
             warn.warning_time AS warningTime,
             warn.main_tree_id AS mainTreeId,
             warn.site_id as siteId,
-            warn.sensor_install_location AS sensorInstallLocation,
+            warn.sensor_install_location AS sensorInstallLocation
-            ( select os.sensor_name from busi_other_sensor os where os.sensor_code=warn.sensor_id and os.status= '1') as oName,
+            /*( select os.sensor_name from busi_other_sensor os where os.sensor_code=warn.sensor_id and os.status= '1') as oName,
             ( select cable.sensor_name from busi_cable_sensor cable where cable.sensor_code=warn.sensor_id and cable.status= '1') as cableName,
             ( select ts.sensor_name from busi_transformer_sensor ts where ts.sensor_code=warn.sensor_id and ts.status= '1') as tName,
             ( select gs.sensor_name from busi_gis_sensor gs where gs.sensor_code=warn.sensor_id and gs.status= '1') as gName,
             ( select asensor.sensor_name from busi_arrester_sensor asensor where asensor.sensor_code=warn.sensor_id and asensor.status= '1') as aName,
-            ( select generator.sensor_name from busi_generator_sensor generator where generator.sensor_code=warn.sensor_id and generator.status= '1') as genName
+            ( select generator.sensor_name from busi_generator_sensor generator where generator.sensor_code=warn.sensor_id and generator.status= '1') as genName*/
         from
             busi_eqm_warning warn
         <where>
@@ -419,10 +419,33 @@
                 AND warn.gz_type = #{gzType}
             </if>
         </where>
-        GROUP BY warn.sensor_id
+        GROUP BY warn.sensor_id,warn.main_tree_id
         ORDER BY
         warn.warning_time DESC
         ) t
+        <!--select
+        warn.id AS warningId,
+        warn.sensor_id AS sensorCode,
+        warn.eq_type AS eqType,
+        warn.gz_type AS gzType,
+        warn.warning_msg AS warningMsg,
+        warn.warning_time AS warningTime,
+        warn.main_tree_id AS mainTreeId,
+        warn.site_id as siteId,
+        warn.sensor_install_location AS sensorInstallLocation
+        from
+        busi_eqm_warning warn
+        <where>
+            warn.del_flag = '1' AND warn.deal_status = '0'
+            <if test="eqType != null and eqType != ''">
+                AND warn.eq_type = #{eqType}
+            </if>
+            <if test="gzType != null and gzType != ''">
+                AND warn.gz_type = #{gzType}
+            </if>
+        </where>
+        ORDER BY
+        warn.warning_time DESC-->
     </select>
 
 
@@ -441,6 +464,9 @@
         <where>
             b.del_flag = '1'
             AND b.deal_status = '0'
+            <if test="mainTreeId != null and mainTreeId != ''">
+                and b.main_tree_id = #{mainTreeId}
+            </if>
             <choose>
                 <when test="sensorCode != null and sensorCode != ''">
                     AND (b.sensor_id = #{sensorCode} OR b.sensor_id is NULL)

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

@@ -79,11 +79,11 @@
 			Cable_sub.name as subEquipmentName,
         	Cable_sub.equipment_type as subEquipmentType,
         	bew.create_time as warnTime
-		FROM busi_offline_Cable_repair t
+		FROM busi_offline_cable_repair t
-		  LEFT JOIN busi_Cable_sensor Cable ON t.sensor_code = Cable.sensor_code
+		  LEFT JOIN busi_cable_sensor Cable ON t.sensor_code = Cable.sensor_code
 		  LEFT JOIN busi_eqm_malfunction em ON t.warning_id = em.id
 		  LEFT JOIN busi_eqm_warning bew ON bew.id = em.warning_id
-		  LEFT JOIN busi_Cable_sub_tree Cable_sub ON Cable.equipment_id = Cable_sub.id
+		  LEFT JOIN busi_cable_sub_tree Cable_sub ON Cable.equipment_id = Cable_sub.id
 		  LEFT JOIN busi_site_tree bst ON Cable_sub.equipment_id = bst.id
     	<where>
     		and t.is_delete = '1'
@@ -138,13 +138,13 @@
 		SELECT
         <include refid="Base_Column_List2"/>
         FROM
-        busi_offline_Cable_repair t
+        busi_offline_cable_repair t
         WHERE t.id = #{id}
 	</select>
 
 	 <!-- 逻辑删除 -->
 	 <update id="deleteBusiOfflineCableRepair" parameterType="java.util.List">
-    	update busi_offline_Cable_repair set is_delete='2'
+    	update busi_offline_cable_repair set is_delete='2'
     	where id in
     	<foreach collection="idList" index="index" item="id" separator="," open="(" close=")">
             #{id,jdbcType=VARCHAR}
@@ -155,7 +155,7 @@
 		SELECT
 			COUNT(*)
 		FROM
-			busi_offline_Cable_repair t
+			busi_offline_cable_repair t
 		WHERE
 			t.is_delete = '1' and t.deal_status = '1'
 		<if test="subEquipmentId != null and subEquipmentId != ''">
@@ -197,7 +197,7 @@
     	SELECT
 		  	<include refid="Base_Column_List2"/>,
 		  	w.warning_code AS warningCode
-		FROM busi_offline_Cable_repair t LEFT JOIN busi_eqm_warning w ON t.warning_id = w.id
+		FROM busi_offline_cable_repair t LEFT JOIN busi_eqm_warning w ON t.warning_id = w.id
     	<where>
     		and t.is_delete = '1'
     		<if test="defectCategory != null and defectCategory != ''">
@@ -223,7 +223,7 @@
     	SELECT
 		  	<include refid="Base_Column_List2"/>,
 		  	w.warning_code AS warningCode
-		FROM busi_offline_Cable_repair t LEFT JOIN busi_eqm_warning w ON t.warning_id = w.id
+		FROM busi_offline_cable_repair t LEFT JOIN busi_eqm_warning w ON t.warning_id = w.id
     	WHERE t.main_equipment_id = #{mainTreeId}
 		AND t.site_id = #{siteId}
 		ORDER BY t.create_time DESC
@@ -235,7 +235,7 @@
 		SELECT
         <include refid="Base_Column_List"/>
         FROM
-        busi_offline_Cable_repair t
+        busi_offline_cable_repair t
         WHERE t.deal_status='0' and  is_delete='1' and t.warning_id = #{malfunctionId}
 	</select>
 

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

@@ -392,7 +392,7 @@
         t.time_stamp as timeStamp,
         CAST(t.${subType} AS decimal(20, 4)) as val
         FROM busi_cable_circulation t
-        WHERE t.sub_equipment_id = #{dto.mainTreeId}
+        WHERE t.main_tree_id = #{dto.mainTreeId}
         <if test="dto.sensorCode != null and dto.sensorCode != ''">
             AND t.sensor_id = #{dto.sensorCode}
         </if>
@@ -408,19 +408,19 @@
         count(*) as count
         FROM busi_cable_circulation t
         WHERE t.time_stamp &gt;= #{startTime} and t.time_stamp &lt; #{endTime}
-        GROUP BY t.sensor_id, t.sub_equipment_id
+        GROUP BY t.sensor_id, t.main_tree_id
     </select>
 
     <select id="getDaylyPointStatistics" resultType="com.huatek.busi.dto.curve.PointItemDto">
         SELECT
-        t.sub_equipment_id AS mainTreeId,
+        t.main_tree_id AS mainTreeId,
         t.sensor_id AS sensorCode,
         COUNT(*) AS count,
         CAST(SUM(t.${subType}) AS decimal(20, 4)) AS total,
         MAX(CAST(t.${subType} AS decimal(20, 4))) AS max,
         MIN(CAST(t.${subType} AS decimal(20, 4))) AS min
         FROM busi_cable_circulation t
-        WHERE t.sub_equipment_id = #{mainTreeId}
+        WHERE t.main_tree_id = #{mainTreeId}
         <if test="sensorCode != null and sensorCode != ''">
             AND t.sensor_id = #{sensorCode}
         </if>

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

@@ -6,6 +6,10 @@
             t.phase as phase,
             t.site_id as siteId,
             t.tmp as tmp,
+            t.max_tmp as maxTmp,
+            t.min_tmp as minTmp,
+            t.alarm_location as alarmLocation,
+            t.max_location as maxLocation,
             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/mapping/RMasterDataMapping.xml

@@ -258,4 +258,7 @@
     <select id="deviceSubclassList" resultType="com.huatek.busi.vo.DeviceSubclassOrTestItemListVo">
 		select id,sheet_name as value from x_r_master_data where deleted = 0 and equipment_type = #{equType} group by sheet_name
 	</select>
+	<select id="BLQDeviceSubclassList" resultType="com.huatek.busi.vo.DeviceSubclassOrTestItemListVo">
+		select distinct sheet_name as value from x_r_arrester_data where deleted = 0 and equipment_type = #{equType}
+	</select>
 </mapper>

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

@@ -2,16 +2,15 @@ package com.huatek.busi.service.impl;
 
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.alibaba.fastjson.JSONObject;
 import com.huatek.busi.common.BusiConstant;
 import com.huatek.busi.dto.PushAlarmsDto;
 import com.huatek.busi.entity.*;
+import com.huatek.busi.mapper.BusiSiteMapper;
+import com.huatek.busi.mapper.BusiSiteTreeMapper;
 import com.huatek.busi.service.*;
 import com.huatek.busi.service.arrester.BusiArresterSensorService;
 import com.huatek.busi.service.gis.BusiGisSensorService;
@@ -70,6 +69,12 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
     @Autowired
     private BusiEqmWarningDao busiEqmWarningDao;
 
+    @Autowired
+    private BusiSiteMapper busiSiteMapper;
+
+    @Autowired
+    private BusiSiteTreeMapper busiSiteTreeMapper;
+
     @Autowired
     private BusiEqmMalfunctionService busiEqmMalfunctionService;
 
@@ -321,10 +326,22 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
 
 
     private void setData(BusiHomePageWarningVo warning) {
-        if(BusiConstant.EqType.EQ_TYPE1.equals(warning.getEqType()))
+        if(BusiConstant.GzType.GZ_TYPE25.equals(warning.getGzType())) {
+            String siteId = busiSiteMapper.getSiteInfo().getId();
+            BusiSiteTree busiSiteTree = busiSiteTreeMapper.findByMainEquipmentIdAndSiteId(warning.getMainTreeId(), siteId);
+            if ( null != busiSiteTree ) {
+                warning.setSensorName(busiSiteTree.getName());
+                String msg = warning.getWarningMsg();
+                int i = msg.indexOf("-");
+                if (-1 != i) {
+                    warning.setWarningMsg(warning.getSensorName()+"-"+warning.getWarningMsg().substring(0,i));
+                }
+            }
+
+        } else if(BusiConstant.EqType.EQ_TYPE1.equals(warning.getEqType()))
         {
             if (BusiConstant.GzType.GZ_TYPE9.equals(warning.getGzType())) {
-                warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getSensorCode(), warning.getEqType(), warning.getGzType()));
+                warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getMainTreeId() ,warning.getSensorCode(), warning.getEqType(), warning.getGzType()));
                 return;
             }
             if(!StringUtils.isEmpty(warning.getSensorCode())){
@@ -335,8 +352,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
                 }
             }
 
-        }
+        } else if(BusiConstant.EqType.EQ_TYPE2.equals(warning.getEqType()))
-        if(BusiConstant.EqType.EQ_TYPE2.equals(warning.getEqType()))
         {   if(!StringUtils.isEmpty(warning.getSensorCode())){
             if(warning.getSensorCode().equals("GISPD")){
                 warning.setSensorName("GIS局部放电诊断");
@@ -354,8 +370,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
             }
             }
 
-        }
+        } else if(BusiConstant.EqType.EQ_TYPE3.equals(warning.getEqType()))
-        if(BusiConstant.EqType.EQ_TYPE3.equals(warning.getEqType()))
         {
             if(warning.getSensorCode().equals("switch")){
                 warning.setSensorName("开关柜机械故障诊断");
@@ -365,24 +380,21 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
                 warning.setSensorName(sensorCode.getSensorName());
                 warning.setPosition(sensorCode.getPosition());
             }
-        }
+        } else if(BusiConstant.EqType.EQ_TYPE4.equals(warning.getEqType()))
-        if(BusiConstant.EqType.EQ_TYPE4.equals(warning.getEqType()))
         {
             if(!StringUtils.isEmpty(warning.getSensorCode())) {
                 BusiTemperPoint sensorCode = busiTemperPointService.findSensorBySensorCode(warning.getSensorCode());
                 warning.setSensorName(sensorCode.getSensorName());
                 warning.setPosition(sensorCode.getPosition());
             }
-        }
+        } else if(BusiConstant.EqType.EQ_TYPE5.equals(warning.getEqType()))
-        if(BusiConstant.EqType.EQ_TYPE5.equals(warning.getEqType()))
         {
             if(!StringUtils.isEmpty(warning.getSensorCode())) {
                 BusiOtherSensor sensorCode = busiOtherSensorService.findSensorBySensorCode(warning.getSensorCode());
                 warning.setSensorName(sensorCode.getSensorName());
                 warning.setPosition(sensorCode.getPosition());
             }
-        }
+        } else if(Objects.equals(BusiConstant.EqType.EQ_TYPE6, warning.getEqType())){
-        if(Objects.equals(BusiConstant.EqType.EQ_TYPE6, warning.getEqType())){
             if(warning.getSensorCode().equals("Generator")){
                 warning.setSensorName("发电机定子绝缘状态");
                 warning.setPosition("/");
@@ -391,8 +403,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
 //                warning.setSensorName(busiGeneratorSensor.getSensorName());
 //                warning.setPosition(busiGeneratorSensor.getPosition());
             }
-        }
+        } else if(Objects.equals(BusiConstant.EqType.EQ_TYPE7, warning.getEqType())){
-        if(Objects.equals(BusiConstant.EqType.EQ_TYPE7, warning.getEqType())){
             if(warning.getSensorCode().equals("Cable")){
                 warning.setSensorName("电缆故障诊断");
                 warning.setPosition("/");
@@ -402,7 +413,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService {
                 warning.setPosition(busiCableSensor.getPosition());
             }
         }
-        warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getSensorCode(), warning.getEqType(), warning.getGzType()));
+        warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getMainTreeId() ,warning.getSensorCode(), warning.getEqType(), warning.getGzType()));
     }
 
     @Override

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

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.*;
 
@@ -116,6 +117,37 @@ public class BusiSensorServiceImpl implements BusiSensorService {
         return false;
     }
 
+    @Override
+    public boolean batchAdd(BusiSensorVo busiSensorVo, String frontCode, String code, int number) {
+        String equipmentType = busiSensorVo.getEquipmentType();
+        for(int i=1; i<=number; i++) {
+            String n = "000";
+            if(i>9){
+                n = "00";
+            }else if(i>99){
+                n = "0";
+            }
+            String sensorCode = frontCode + n + i + code;
+            busiSensorVo.setSensorCode(sensorCode);
+            if (SiteConstants.ExternalTypeEnum.BYQ.getValue().equals(equipmentType)) {
+                busiTransformerSensorService.add(busiSensorVo);
+            } else if (SiteConstants.ExternalTypeEnum.GIS.getValue().equals(equipmentType)) {
+                busiGisSensorService.add(busiSensorVo);
+            } else if (SiteConstants.ExternalTypeEnum.CW.getValue().equals(equipmentType)) {
+                busiTemperPointService.add(busiSensorVo);
+            } else if (SiteConstants.ExternalTypeEnum.BLQ.getValue().equals(equipmentType)) {
+                busiArresterSensorService.add(busiSensorVo);
+            } else if (SiteConstants.ExternalTypeEnum.OTHER.getValue().equals(equipmentType)) {
+                busiOtherSensorService.add(busiSensorVo);
+            } else if (SiteConstants.ExternalTypeEnum.GEN.getValue().equals(equipmentType)) {
+                busiGeneratorSensorService.add(busiSensorVo);
+            } else if (SiteConstants.ExternalTypeEnum.DL.getValue().equals(equipmentType)) {
+                busiCableSensorService.add(busiSensorVo);
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean update(String token, BusiSensorVo busiSensorVo) {
         String equipmentType = busiSensorVo.getEquipmentType();

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

@@ -536,7 +536,8 @@ public class              LabReportBasisDataServiceImpl extends BaseDao<LabRepor
                 }
 
                 BusiSiteTreeVo equipmentInfo = null;
-                if (Objects.equals(eqType, SiteConstants.ExternalTypeEnum.GIS.getValue()) || Objects.equals(eqType, SiteConstants.ExternalTypeEnum.CW.getValue())) {
+                if (Objects.equals(eqType, SiteConstants.ExternalTypeEnum.GIS.getValue()) || Objects.equals(eqType, SiteConstants.ExternalTypeEnum.CW.getValue())
+                   || Objects.equals(eqType, SiteConstants.ExternalTypeEnum.BLQ.getValue()) ) {
                     equipmentInfo = labReportBasisDataMapper.findGisInfo(equipmentId, jgId);
                 } else {
                     equipmentInfo = labReportBasisDataMapper.findByqInfo(equipmentId);
@@ -2188,7 +2189,12 @@ public class              LabReportBasisDataServiceImpl extends BaseDao<LabRepor
 
     @Override
     public List<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType) {
-        List<DeviceSubclassOrTestItemListVo> deviceSubclassList = rMasterDataService.deviceSubclassList(equType);
+        List<DeviceSubclassOrTestItemListVo> deviceSubclassList = null;
+        if (Objects.equals(equType, SiteConstants.ExternalTypeEnum.GIS.getValue()) || Objects.equals(equType, SiteConstants.ExternalTypeEnum.BYQ.getValue())) {
+            deviceSubclassList = rMasterDataService.deviceSubclassList(equType);
+        } else if (Objects.equals(equType, SiteConstants.ExternalTypeEnum.BLQ.getValue())) {
+            deviceSubclassList = rMasterDataService.BLQDeviceSubclassList(equType);
+        }
         return deviceSubclassList;
     }
 

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

@@ -109,4 +109,8 @@ public class RMasterDataServiceImpl extends BaseDao<RMasterData, String> impleme
     public List<DeviceSubclassOrTestItemListVo> deviceSubclassList(String equType) {
         return rMasterDataMapper.deviceSubclassList(equType);
     }
+
+    public List<DeviceSubclassOrTestItemListVo> BLQDeviceSubclassList(String equType) {
+        return rMasterDataMapper.BLQDeviceSubclassList(equType);
+    }
 }

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

@@ -155,7 +155,7 @@ public class WiringDiagramImpl extends BaseDao<WiringDiagram, String> implements
                     }
                 String path = rootPath + File.separator + destDirectory;
                 SftpConnectConfig sftpConnectConfig = sftpConnectConfigService.findOne();
-                String httpPath= "http://"+ sftpConnectConfig.getHost()+":"+sftpConnectConfig.getHttpPort()+"/"+folderPath.replace(File.separator, Constants.NO_DATA)+"/"+fileNameNew;
+                String httpPath= "/"+folderPath.replace(File.separator, Constants.NO_DATA)+"/"+fileNameNew;
                 WiringDiagram wiringDiagram=new WiringDiagram();
                 wiringDiagram.setId(uUID);
                 wiringDiagram.setFileName(fileName);

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/cable/CableCirculationtemperIncreaseRateServiceImpl.java

@@ -174,7 +174,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu
                     // 保存告警
                     BusiEqmWarning busiEqmWarning =
                             busiEqmWarningService.saveBusiEqmWarning(equipmentInfoCable, eqType, gzType,
-                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate()), "1");
+                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate(), "日"), "1");
                     // 保存告警详情
                     BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo();
                     vo.setMainTreeId(busiCableThreshold.getMainTreeId());
@@ -193,7 +193,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu
                     // 保存告警
                     BusiEqmWarning busiEqmWarning =
                             busiEqmWarningService.saveBusiEqmWarning(equipmentInfoCable, eqType, gzType,
-                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate()), "1");
+                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate(), "月"), "1");
                     // 保存告警详情
                     BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo();
                     vo.setMainTreeId(busiCableThreshold.getMainTreeId());
@@ -223,7 +223,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu
                     // 保存告警
                     BusiEqmWarning busiEqmWarning =
                             busiEqmWarningService.saveBusiEqmWarning(equipmentInfo, eqType, gzType,
-                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate()), "1");
+                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate(), "日"), "1");
                     // 保存告警详情
                     BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo();
                     vo.setMainTreeId(busiOtherThreshold.getMainTreeId());
@@ -242,7 +242,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu
                     // 保存告警
                     BusiEqmWarning busiEqmWarning =
                             busiEqmWarningService.saveBusiEqmWarning(equipmentInfo, eqType, gzType,
-                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate()), "1");
+                                    cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate(), "月"), "1");
                     // 保存告警详情
                     BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo();
                     vo.setMainTreeId(busiOtherThreshold.getMainTreeId());
@@ -262,8 +262,8 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu
         return growthRate.compareTo(thresholdValue) > 0;
     }
 
-    private String formateCableWarningMsg(String phase, String tmp) {
+    private String formateCableWarningMsg(String sensorName, String growthRate, String type) {
-        return String.format("%s电缆环流：%s%%增长率告警", phase, tmp);
+        return String.format("%s电缆环流：%s%%%s增长率告警", sensorName, growthRate, type);
     }
 
     // 获取月增长率

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/dataoutput/helper/DataOutputUtil.java

@@ -239,7 +239,7 @@ public class DataOutputUtil {
                     Files.deleteIfExists(file);
                     log.debug("删除文件：{}", file.getFileName());
                 } catch (IOException e1) {
-                    log.error("删除文件：{}", file.getFileName());
+                    log.error("删除文件：{}", file.getFileName(), e1);
                 }
             });
             //删除文件夹

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/gis/GisSf6PressureServiceImpl.java

@@ -104,6 +104,18 @@ public class GisSf6PressureServiceImpl extends AbstractCacEtlService<GisSf6Press
 
     @Override
     protected void saveHistoryData(GisSf6Pressure cacEntity, EquipmentInfoDto equipmentInfo) {
+        try {
+            if (cacEntity.getAbsolutePressure() != null && cacEntity.getPressure20c() == null) {
+                int absolutePressureInt = Integer.parseInt(cacEntity.getAbsolutePressure()) - 100;
+                cacEntity.setPressure20c(absolutePressureInt+"");
+            }
+            if (cacEntity.getPressure20c() != null && cacEntity.getAbsolutePressure() == null) {
+                int pressure20cInt = Integer.parseInt(cacEntity.getPressure20c()) + 100;
+                cacEntity.setAbsolutePressure(pressure20cInt+"");
+            }
+        } catch (Exception ignore) {
+        }
+
         String equipmentSensitivity = "--";
         BusiGisSensor sensorInfo = this.getSensorInfo(cacEntity.getSensorId());
         if (null != sensorInfo) {
@@ -133,7 +145,7 @@ public class GisSf6PressureServiceImpl extends AbstractCacEtlService<GisSf6Press
         }
         if (!"".equals(standardPressure) && standardPressure != null) {
             cacEntity.setDailyLeakLate(CalcUtil.calcLoseRate(new BigDecimal(standardPressure.trim()),
-                new BigDecimal(cacEntity.getTemperature()), new BigDecimal(cacEntity.getAbsolutePressure())).toString());
+                new BigDecimal(cacEntity.getTemperature()), new BigDecimal(cacEntity.getPressure20c())).toString());
         }
         if(StringUtils.isNotEmpty(cacEntity.getPressure20c())){
             //折合20度的压力值
@@ -503,7 +515,10 @@ public class GisSf6PressureServiceImpl extends AbstractCacEtlService<GisSf6Press
 	                    {
 	                    	if(mapObj.get("pressure") != null)
 	                    	{
-	                    		listRes.add(new BigDecimal(mapObj.get("pressure").toString()));
+                                String str = mapObj.get("pressure").toString();
+                                if (!StringUtils.isBlank(str)) {
+                                    listRes.add(new BigDecimal(str));
+                                }
 	                    	}
 	                    }
 	                    if(!listRes.isEmpty())
@@ -524,7 +539,10 @@ public class GisSf6PressureServiceImpl extends AbstractCacEtlService<GisSf6Press
 	                    {
 	                    	if(mapObj1.get("pressure") != null)
 	                    	{
-	                    		listRes1.add(new BigDecimal(mapObj1.get("pressure").toString()));
+                                String str = mapObj1.get("pressure").toString();
+                                if (!StringUtils.isBlank(str)) {
+                                    listRes1.add(new BigDecimal(str));
+                                }
 	                    	}
 	                    }
 	                    if(!listRes1.isEmpty())

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);

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperChartsServiceImpl.java

@@ -104,6 +104,30 @@ public class RptTemperChartsServiceImpl implements RptTemperChartsService {
                     rptTemperCharts.setCoTemper(item.getTmp());
                     rptTemperCharts.setCoSensorId(item.getSensorCode());
                     break;
+                case A_S:
+                    rptTemperCharts.setAsTemper(item.getTmp());
+                    rptTemperCharts.setAsSensorId(item.getSensorCode());
+                    break;
+                case B_S:
+                    rptTemperCharts.setBsTemper(item.getTmp());
+                    rptTemperCharts.setBsSensorId(item.getSensorCode());
+                    break;
+                case C_S:
+                    rptTemperCharts.setCsTemper(item.getTmp());
+                    rptTemperCharts.setCsSensorId(item.getSensorCode());
+                    break;
+                case A_X:
+                    rptTemperCharts.setAxTemper(item.getTmp());
+                    rptTemperCharts.setAxSensorId(item.getSensorCode());
+                    break;
+                case B_X:
+                    rptTemperCharts.setBxTemper(item.getTmp());
+                    rptTemperCharts.setBxSensorId(item.getSensorCode());
+                    break;
+                case C_X:
+                    rptTemperCharts.setCxTemper(item.getTmp());
+                    rptTemperCharts.setCxSensorId(item.getSensorCode());
+                    break;
                 case IN_SIDE:
                     rptTemperCharts.setBoxTemper(item.getTmp());
                     rptTemperCharts.setBoxSensorId(item.getSensorCode());

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperServiceImpl.java

@@ -97,6 +97,30 @@ public class RptTemperServiceImpl implements RptTemperService {
                 rptTemper.setCOTemper(transData(cacEntity.getTmp()));
                 rptTemper.setCOSensorId(cacEntity.getSensorId());
                 break;
+            case A_S:
+                rptTemper.setASTemper(transData(cacEntity.getTmp()));
+                rptTemper.setASSensorId(cacEntity.getSensorId());
+                break;
+            case B_S:
+                rptTemper.setBSTemper(transData(cacEntity.getTmp()));
+                rptTemper.setBSSensorId(cacEntity.getSensorId());
+                break;
+            case C_S:
+                rptTemper.setCSTemper(transData(cacEntity.getTmp()));
+                rptTemper.setCSSensorId(cacEntity.getSensorId());
+                break;
+            case A_X:
+                rptTemper.setAXTemper(transData(cacEntity.getTmp()));
+                rptTemper.setAXSensorId(cacEntity.getSensorId());
+                break;
+            case B_X:
+                rptTemper.setBXTemper(transData(cacEntity.getTmp()));
+                rptTemper.setBXSensorId(cacEntity.getSensorId());
+                break;
+            case C_X:
+                rptTemper.setCXTemper(transData(cacEntity.getTmp()));
+                rptTemper.setCXSensorId(cacEntity.getSensorId());
+                break;
             case IN_SIDE:
                 rptTemper.setBoxTemper(transData(cacEntity.getTmp()));
                 rptTemper.setBoxSensorId(cacEntity.getSensorId());

busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/transformerCalUtils/AgingHealthIndexUtil.java

@@ -54,6 +54,9 @@ public class AgingHealthIndexUtil {
         log.info("--->  变压器:{}, 初始老化系数：{}", name, B0);
 
         log.info("--->  变压器:{}, 投运时间：{}", name, deliveryTime);
+        if (deliveryTime == null){
+            throw new OwlException("变压器:" + name + ",缺少投运时间");
+        }
         long dayDiff = instance.calcDateDifference(deliveryTime, LocalDate.now(), "YEARS");
         log.info("--->  变压器:{}, 运行时间：{}", name, dayDiff);
 

busi-back/busi-back-serviceImpl/src/main/resources/dev/logback.xml

@@ -3,8 +3,6 @@
 	debug="false">
 	<!-- 模块名称， 影响日志配置名，日志文件名 -->
 	<property name="appName" value="busi-back-serviceImpl" />
-	<!-- 日志路径，这里是相对路径 -->
-	<property name="rootPath" value="/logs" />
 
 	<!-- contextName -->
 	<contextName>${appName}</contextName>
@@ -16,6 +14,9 @@
 	<!--控制台输出 -->
 	<appender name="consoleAppender"
 		class="ch.qos.logback.core.ConsoleAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>info</level>
+		</filter>
 		<encoder>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
@@ -23,16 +24,16 @@
 
 	<appender name="fileAppender"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${rootPath}/${appName}.log</file>
+		<file>${XYDL_DIR}/jkpg/logs/${appName}.log</file>
 		<rollingPolicy
 			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${rootPath}/${appName}.%i.log.zip</fileNamePattern>
+			<fileNamePattern>${XYDL_DIR}/jkpg/logs/${appName}.%i.log.zip</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>20</maxIndex>
 		</rollingPolicy>
 		<triggeringPolicy
 			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>20MB</maxFileSize>
+			<maxFileSize>200MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
 			<pattern>${LOG_PATTERN}</pattern>

busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-database.xml

@@ -61,7 +61,8 @@
 		scope="prototype">
 		<property name="patterns">
 			<list>
-				<value>${base.service.package}</value>
+				<!-- <value>${base.service.package}</value> -->
+				<value>com.huatek.busi.service.*</value>
 			</list>
 		</property>
 	</bean>
@@ -85,8 +86,9 @@
 
 		<property name="mapperLocations">
           <array>
-              <value>${base.mapper.path}</value> 
+              <!-- <value>${base.mapper.path}</value>  -->
-              <value>classpath:com/huatek/torch/sql/mapping/*Mapper.xml</value> 
+			  <value>classpath:com/huatek/busi/mapping/*Mapping.xml</value>
+			  <value>classpath:com/huatek/torch/sql/mapping/*Mapper.xml</value>
           </array>
       </property>
 

busi-back/busi-back-serviceImpl/src/main/resources/dev/spring-dubbo.xml

@@ -10,9 +10,9 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>classpath:jdbc.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/jdbc.properties</value>
-				<value>classpath:application.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/application.properties</value>
-				<value>classpath:redis.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/redis.properties</value>
 			</list>
 		</property>
 	</bean>
@@ -22,15 +22,17 @@
 	<import resource="spring-redis.xml" />
 	<import resource="spring-quartz.xml" />
 
-	<dubbo:application name="${base.name}" />
+	<dubbo:application name="busi_provider" />
 	<!-- 使用zookeeper注册中心暴露服务地址 -->
 	<dubbo:registry address="${base.zookeepr}" />
 
 	<!-- 用dubbo协议在28080端口暴露服务 -->
-	<dubbo:protocol name="dubbo" port="${base.port}"/>
+	<!-- <dubbo:protocol name="dubbo" port="${base.port}"/> -->
+	<dubbo:protocol name="dubbo" port="10100"/>
 	<dubbo:provider timeout="${base.timeout}" threadpool="${base.threadpool}"
 		threads="${base.threads}" accepts="${base.accepts}" retries="${base.retries}" 
 		filter="busiExceptionFilter,-exception" payload="21557050"/>
 		<!-- filter="busiExceptionFilter,-exception" -->
-	<dubbo:annotation package="${base.service.impl.package}" />
+	<!-- <dubbo:annotation package="${base.service.impl.package}" /> -->
+	<dubbo:annotation package="com.huatek.busi.service.impl" />
 </beans>

busi-back/busi-back-serviceImpl/src/main/resources/test/logback.xml

@@ -16,6 +16,9 @@
 	<!--控制台输出 -->
 	<appender name="consoleAppender"
 		class="ch.qos.logback.core.ConsoleAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>info</level>
+		</filter>
 		<encoder>
 			<pattern>${LOG_PATTERN}</pattern>
 		</encoder>
@@ -32,7 +35,7 @@
 		</rollingPolicy>
 		<triggeringPolicy
 			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>20MB</maxFileSize>
+			<maxFileSize>200MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
 			<pattern>${LOG_PATTERN}</pattern>

busi-back/busi-back-ws/src/main/resources/dev/applicationContext.xml

@@ -20,7 +20,7 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>classpath:application.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/application.properties</value>
 			</list>
 		</property>
 	</bean>

busi-back/busi-back-ws/src/main/resources/dev/logback.xml

@@ -2,8 +2,6 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
 	<!-- 模块名称， 影响日志配置名，日志文件名 -->
 	<property name="appName" value="busi-back-ws" />
-	<!-- 日志路径，这里是相对路径 -->
-	<property name="rootPath" value="/logs" />
 
 	<!-- contextName -->
 	<contextName>${appName}</contextName>
@@ -23,10 +21,10 @@
 
 	<appender name="fileAppender"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${rootPath}/${appName}.log</file>
+		<file>${XYDL_DIR}/jkpg/logs/${appName}.log</file>
 		<rollingPolicy
 			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${rootPath}/${appName}.%i.log.zip</fileNamePattern>
+			<fileNamePattern>${XYDL_DIR}/jkpg/logs/${appName}.%i.log.zip</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>20</maxIndex>
 		</rollingPolicy>

busi-back/busi-back-ws/src/main/resources/dev/spring-dubbo.xml

@@ -6,7 +6,7 @@
 	http://code.alibabatech.com/schema/dubbo 
 	http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-	<dubbo:application name="${base.name}" />
+	<dubbo:application name="base_ws_consumer" />
 	<dubbo:consumer timeout="${base.timeout}" loadbalance="${base.roundrobin}"
 		retries="${base.retries}" />
 	<!-- 使用zookeeper注册中心暴露服务地址 -->

frame-base/frame-base-common/src/main/java/com/huatek/frame/base/util/SqlEscapeUtil.java

@@ -0,0 +1,61 @@
+package com.huatek.frame.base.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+
+public class SqlEscapeUtil {
+
+    /**
+     * 转义字符
+     **/
+    public static final String ESCAPE = "/";
+
+    /**
+     * 转义方法
+     *
+     * @param param 待转义字符串
+     * @return String
+     */
+    public static String escape(String param) {
+        if (StringUtils.isNotEmpty(param)) {
+            String temp = param.replaceAll("/", ESCAPE + "/");
+            temp = temp.replaceAll("%", ESCAPE + "%");
+            temp = temp.replaceAll("_", ESCAPE + "_");
+            temp = temp.replaceAll("'", "''");
+            return temp.trim();
+        }
+        return null;
+    }
+
+//    public static void main (String[] args) {
+//        StringBuilder stringBuilder = new StringBuilder();
+//        stringBuilder.append("asd").deleteCharAt(stringBuilder.length() - 1);
+//        System.out.println(stringBuilder.toString());
+//    }
+
+    /**
+     * @param @param  str
+     * @param @return
+     * @return boolean 有true，无false
+     * @author ampsycho.hw
+     * @Title: sqlValidate
+     * @Description: 验证sql是否为违法关键字
+     */
+    public static boolean sqlValidate(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        str = str.toLowerCase();// 统一转为小写
+        String badStr = "'|exec|and|or|execute|insert|select|delete|update|drop|%|master|truncate|"
+                + "declare|sitename|net user|xp_cmdshell|like'|exec|execute|insert|create|drop|"
+                + "table|grant|use|group_concat|column_name|information_schema.columns|table_schema|"
+                + "select|delete|update|master|truncate|declare|-- |like|//|%";// 过滤掉的sql关键字，可以手动添加
+        String[] badStrs = badStr.split("\\|");
+        for (int i = 0; i < badStrs.length; i++) {
+            if (str.contains(badStrs[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

frame-base/frame-base-control/src/main/java/com/huatek/frame/base/model/controller/ModelController.java

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON;
 import com.huatek.frame.base.dto.ModelComponentDataDTO;
 import com.huatek.frame.base.dto.ModelDTO;
 import com.huatek.frame.base.service.ModelService;
+import com.huatek.frame.base.util.SqlEscapeUtil;
+import com.huatek.torch.frame.exception.OwlException;
 import com.huatek.torch.frame.tools.ConstantUtil;
 import com.huatek.torch.frame.tools.ResultUtil;
 import io.swagger.annotations.Api;
@@ -123,6 +125,14 @@ public class ModelController {
 	@ApiOperation(value = "部件管理-查询主设备列表")
 	@GetMapping(value="/selectMainEquipmentListByModelType")
 	public  Map<String, Object> selectMainEquipmentListByModelType(@RequestParam(value = "siteId") String siteId, @RequestParam(value = "modelType")  String modelType) {
+		boolean flag = SqlEscapeUtil.sqlValidate(siteId);
+		if (flag) {
+			throw new OwlException("siteId包含非法字符!");
+		}
+		flag = SqlEscapeUtil.sqlValidate(modelType);
+		if (flag) {
+			throw new OwlException("modelType包含非法字符!");
+		}
 		Map<String, Object> map = modelService.selectMainEquipmentListByModelType(siteId, modelType);
 		return map;
 	}

frame-base/frame-base-control/src/main/resources/dev/applicationContext.xml

@@ -18,8 +18,8 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>classpath:redis.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/redis.properties</value>
-				<value>classpath:application.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/application.properties</value>
 			</list>
 		</property>
 	</bean>

frame-base/frame-base-control/src/main/resources/dev/logback.xml

@@ -3,8 +3,6 @@
 	debug="false">
 	<!-- 模块名称， 影响日志配置名，日志文件名 -->
 	<property name="appName" value="frame-base-control" />
-	<!-- 日志路径，这里是相对路径 -->
-	<property name="rootPath" value="/logs" />
 
 	<!-- contextName -->
 	<contextName>${appName}</contextName>
@@ -23,10 +21,10 @@
 
 	<appender name="fileAppender"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${rootPath}/${appName}.log</file>
+		<file>${XYDL_DIR}/jkpg/logs/${appName}.log</file>
 		<rollingPolicy
 			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${rootPath}/${appName}.%i.log.zip</fileNamePattern>
+			<fileNamePattern>${XYDL_DIR}/jkpg/logs/${appName}.%i.log.zip</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>20</maxIndex>
 		</rollingPolicy>

frame-base/frame-base-control/src/main/resources/dev/spring-dubbo.xml

@@ -6,7 +6,7 @@
 	http://code.alibabatech.com/schema/dubbo 
 	http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-	<dubbo:application name="${base.name}" />
+	<dubbo:application name="base_consumer" />
 	<dubbo:consumer timeout="${base.timeout}" loadbalance="${base.roundrobin}"
 		retries="${base.retries}" />
 	<!-- 使用zookeeper注册中心暴露服务地址 -->

frame-base/frame-base-serviceImpl/src/main/resources/dev/logback.xml

@@ -3,8 +3,6 @@
 	debug="false">
 	<!-- 模块名称， 影响日志配置名，日志文件名 -->
 	 <property name="appName" value="frame-base-serviceImpl" />
-	<!-- 日志路径，这里是相对路径 -->
-	<property name="rootPath" value="/logs" />
 
 	<!-- contextName -->
 	 <contextName>${appName}</contextName>
@@ -22,10 +20,10 @@
 
 	<appender name="fileAppender"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${rootPath}/${appName}.log</file>
+		<file>${XYDL_DIR}/jkpg/logs/${appName}.log</file>
 		<rollingPolicy
 			class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${rootPath}/${appName}.%i.log.zip</fileNamePattern>
+			<fileNamePattern>${XYDL_DIR}/jkpg/logs/${appName}.%i.log.zip</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>20</maxIndex>
 		</rollingPolicy>

frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-database.xml

@@ -57,7 +57,7 @@
 		scope="prototype">
 		<property name="patterns">
 			<list>
-				<value>${base.service.package}</value>
+				<value>com.huatek.frame.base.service.*</value>
 			</list>
 		</property>
 	</bean>
@@ -81,7 +81,7 @@
 
 		<property name="mapperLocations">
           <array>
-              <value>${base.mapper.path}</value> 
+              <value>classpath:com/huatek/frame/base/mapping/*Mapper.xml</value>
               <value>classpath:com/huatek/torch/sql/mapping/*Mapper.xml</value> 
           </array>
       </property>

frame-base/frame-base-serviceImpl/src/main/resources/dev/spring-dubbo.xml

@@ -10,9 +10,9 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="locations">
 			<list>
-				<value>classpath:jdbc.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/jdbc.properties</value>
-				<value>classpath:application.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/application.properties</value>
-				<value>classpath:redis.properties</value>
+				<value>file:${XYDL_DIR}/jkpg/redis.properties</value>
 			</list>
 		</property>
 	</bean>
@@ -21,13 +21,13 @@
 	<import resource="spring-database.xml" />
 	<import resource="spring-redis.xml" />
 
-	<dubbo:application name="${base.name}" />
+	<dubbo:application name="base_provider" />
 	<!-- 使用zookeeper注册中心暴露服务地址 -->
 	<dubbo:registry address="${base.zookeepr}" />
 
 	<!-- 用dubbo协议在28080端口暴露服务 -->
-	<dubbo:protocol name="dubbo" port="${base.port}" />
+	<dubbo:protocol name="dubbo" port="10001" />
 	<dubbo:provider timeout="${base.timeout}" threadpool="${base.threadpool}"
 		threads="${base.threads}" accepts="${base.accepts}" retries="${base.retries}" />
-	<dubbo:annotation package="${base.service.impl.package}" /> 
+	<dubbo:annotation package="com.huatek.frame.base.service.impl" />
 </beans>

update.sql

@@ -263,3 +263,33 @@ ALTER TABLE iec_points_conf MODIFY COLUMN unit varchar(10) CHARACTER SET utf8 CO
 1:kV(千伏) 2:V(伏) 3:kA(千安) 4:A(安) 5:mA(毫安) 6:℃(度) 7:Pa(帕) 8:KPa(千帕) 9:MPa(兆帕) 10:pF(皮法)
 11:pC(皮库仑) 12:dB(分贝) 13:μL(微升) 14:mL(毫升) 15:L(升) 16:m/s(米/秒) 17:rpm&r/min(转/分钟)';
 ALTER TABLE iec_points_conf MODIFY COLUMN sysunit varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '0: 无效，暂留未用，指运行评测表中的字段值单位，系统定义单位,参见字段unit的定义';
+
+
+/*新增6个位置 测温实时数据表(rpt_temper)和测温曲线表(rpt_temper_charts)*/
+ALTER TABLE `rpt_temper`
+ADD COLUMN `a_s_temper` DECIMAL(10,2) NULL AFTER `create_time`,
+ADD COLUMN `a_s_sensor_id` VARCHAR(50) NULL AFTER `a_s_temper`,
+ADD COLUMN `b_s_temper` DECIMAL(10,2) NULL AFTER `a_s_sensor_id`,
+ADD COLUMN `b_s_sensor_id` VARCHAR(50) NULL AFTER `b_s_temper`,
+ADD COLUMN `c_s_temper` DECIMAL(10,2) NULL AFTER `b_s_sensor_id`,
+ADD COLUMN `c_s_sensor_id` VARCHAR(50) NULL AFTER `c_s_temper`,
+ADD COLUMN `a_x_temper` DECIMAL(10,2) NULL AFTER `c_s_sensor_id`,
+ADD COLUMN `a_x_sensor_id` VARCHAR(50) NULL AFTER `a_x_temper`,
+ADD COLUMN `b_x_temper` DECIMAL(10,2) NULL AFTER `a_x_sensor_id`,
+ADD COLUMN `b_x_sensor_id` VARCHAR(50) NULL AFTER `b_x_temper`,
+ADD COLUMN `c_x_temper` DECIMAL(10,2) NULL AFTER `b_x_sensor_id`,
+ADD COLUMN `c_x_sensor_id` VARCHAR(50) NULL AFTER `c_x_temper`;
+
+ALTER TABLE `rpt_temper_charts`
+ADD COLUMN `as_temper` DECIMAL(20,4) NULL AFTER `create_time`,
+ADD COLUMN `as_sensor_id` VARCHAR(50) NULL AFTER `as_temper`,
+ADD COLUMN `bs_temper` DECIMAL(20,4) NULL AFTER `as_sensor_id`,
+ADD COLUMN `bs_sensor_id` VARCHAR(50) NULL AFTER `bs_temper`,
+ADD COLUMN `cs_temper` DECIMAL(20,4) NULL AFTER `bs_sensor_id`,
+ADD COLUMN `cs_sensor_id` VARCHAR(50) NULL AFTER `cs_temper`,
+ADD COLUMN `ax_temper` DECIMAL(20,4) NULL AFTER `cs_sensor_id`,
+ADD COLUMN `ax_sensor_id` VARCHAR(50) NULL AFTER `ax_temper`,
+ADD COLUMN `bx_temper` DECIMAL(20,4) NULL AFTER `ax_sensor_id`,
+ADD COLUMN `bx_sensor_id` VARCHAR(50) NULL AFTER `bx_temper`,
+ADD COLUMN `cx_temper` DECIMAL(20,4) NULL AFTER `bx_sensor_id`,
+ADD COLUMN `cx_sensor_id` VARCHAR(50) NULL AFTER `cx_temper`;