Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexDayMapper.java

@@ -12,8 +12,8 @@ import java.util.Map;
 public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     @Select("<script>"+
             "SELECT distinct `health_index` AS healthIndex,anomaly,rec_date as recDate, `health_index` AS `value`, substr(analysis_time,1,10) as   analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day WHERE analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +
@@ -36,8 +36,8 @@ public interface FanHealthIndexDayMapper extends BaseMapper<FanHealthIndexDay> {
     @Select("<script>"+
             "SELECT  count(1) from ( SELECT distinct  `health_index` AS healthIndex,anomaly,rec_date as recDate, `health_index` AS `value`, substr(analysis_time,1,10) as   analysisTime, station,equipment_name AS equipmentName,point_name as pointName,\n" +
             "( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_day  WHERE analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexHourMapper.java

@@ -11,8 +11,8 @@ import java.util.List;
 public interface FanHealthIndexHourMapper extends BaseMapper<FanHealthIndexHour> {
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex, anomaly, `health_index` AS `value`,  rec_date AS recDate, analysis_time AS  analysisTime, station,equipment_name AS equipmentName,point_name as pointName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_hour WHERE analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/FanHealthIndexMomentMapper.java

@@ -11,8 +11,8 @@ import java.util.List;
 public interface FanHealthIndexMomentMapper extends BaseMapper<FanHealthIndexMoment> {
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate,anomaly, analysis_time AS  analysisTime,point_name as pointName,  station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status FROM analysis_data.fan_health_index_moment WHERE analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null'> AND area = #{area} </if> " +
             "<if test='indexAddress!= null'> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null'>AND point_name = #{pointName} </if> " +

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexDayMapper.java

@@ -13,8 +13,8 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
             "SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `health_index` AS `value`, rec_date AS recDate, anomaly, substr(analysis_time,1,10) as analysisTime,station,equipment_name AS equipmentName, point_name as pointName, index_address as indexAddress, ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_day WHERE  analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
@@ -44,8 +44,8 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
             "SELECT count(1) FROM (SELECT distinct `health_index` AS healthIndex,rec_date as recDate, `health_index` AS `value`, anomaly, substr(analysis_time,1,10) as analysisTime,station,equipment_name AS equipmentName, point_name as pointName, index_address as indexAddress, ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_day WHERE  analysis_obj_type = #{analysisObjType} and org_code  is not null" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexHourMapper.java

@@ -12,8 +12,8 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex, `health_index` AS `value`, rec_date AS recDate, anomaly,  analysis_time,station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_hour WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
@@ -31,8 +31,8 @@ public interface PvHealthIndexHourMapper extends BaseMapper<PvHealthIndexHour> {
     @Select("<script>"+
             "SELECT count(1)" +
             " FROM analysis_data.pv_health_index_hour WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexMomentMapper.java

@@ -12,8 +12,8 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
     @Select("<script>"+
             "SELECT `health_index` AS healthIndex,`health_index` AS `value`, rec_date AS recDate, anomaly, analysis_time,station,equipment_name AS equipmentName,  ( CASE HEALTH_LEVEL WHEN '危险' THEN 3 WHEN '警告' THEN 2 WHEN '注意' THEN 1 ELSE 0 END ) AS status" +
             " FROM analysis_data.pv_health_index_moment WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +
@@ -32,8 +32,8 @@ public interface PvHealthIndexMomentMapper extends BaseMapper<PvHealthIndexMomen
     @Select("<script>"+
             "SELECT count(1)" +
             " FROM analysis_data.pv_health_index_moment WHERE   analysis_obj_type = #{analysisObjType}" +
-            "<if test='endTimeTop!= null'>  and ts &lt;= #{endTimeTop} </if> " +
-            "<if test='startTimeTop!= null'>  and  ts &gt;= #{startTimeTop} </if> " +
+            "<if test='endTimeTop!= null'>  and analysis_time &lt;= #{endTimeTop} </if> " +
+            "<if test='startTimeTop!= null'>  and  analysis_time &gt;= #{startTimeTop} </if> " +
             "<if test='area!= null '> AND area = #{area} </if> " +
             "<if test='indexAddress!= null '> AND index_address = #{indexAddress} </if> " +
             "<if test='pointName!= null '>AND point_name = #{pointName} </if> " +