修改分析指标项

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanWeightController.java

@@ -78,6 +78,7 @@ public class IdxBizFanWeightController extends BaseController {
 
         List<IdxBizFanWeight> formattedDates =  list.stream().map(e-> {
             e.setValue(e.getValue()!=null?Float.parseFloat(new DecimalFormat("0.000").format(e.getValue())):null);
+            e.setValueS(e.getValue()!=null?new DecimalFormat("0.000").format(e.getValue()):null);
                     switch(e.getType()){
                         case "1":
                             e.setType("片区");
@@ -95,7 +96,6 @@ public class IdxBizFanWeightController extends BaseController {
                             e.setType("变量");
                             break;
                     }
-
                     return e;
                 }
         ).collect(Collectors.toList());
@@ -313,8 +313,10 @@ public class IdxBizFanWeightController extends BaseController {
                 for (IdxBizFanWeight listdatum : listdata) {
                     for (IdxBizFanWeight idxBizPvWeight : list) {
                         listdatum.setValue(formattedNum);
+                        listdatum.setFlag(null);
                         if (idxBizPvWeight.getSequenceNbr().equals(listdatum.getSequenceNbr())) {
                             listdatum.setValue(Float.valueOf(value.get("data").toString()));
+                            listdatum.setFlag("是");
                             break;
                         }
                     }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvWeightController.java

@@ -83,6 +83,7 @@ public class IdxBizPvWeightController extends BaseController {
 
         List<IdxBizPvWeight> formattedDates =  list.stream().map(e-> {
             e.setValue(e.getValue()!=null?Float.parseFloat(new DecimalFormat("0.000").format(e.getValue())):null);
+            e.setValueS(e.getValue()!=null?new DecimalFormat("0.000").format(e.getValue()):null);
             switch(e.getType()){
                 case "1":
                     e.setType("片区");
@@ -320,8 +321,10 @@ public class IdxBizPvWeightController extends BaseController {
             for (IdxBizPvWeight listdatum : listdata) {
                 for (IdxBizPvWeight idxBizPvWeight : list) {
                     listdatum.setValue(formattedNum);
+                    listdatum.setFlag(null);
                     if (idxBizPvWeight.getSequenceNbr().equals(listdatum.getSequenceNbr())) {
                         listdatum.setValue(Float.valueOf(value.get("data").toString()));
+                        listdatum.setFlag("是");
                         break;
                     }
                 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -140,8 +140,10 @@ public class TDBigScreenAnalyseController extends BaseController {
             StationBasic stationBasic = stationBasicMapper.selectById(stationCode);
             stationCode = stationBasic.getFanGatewayId();
         } else if (StrUtil.isNotEmpty(station)) {
+        	//由于命名不统一
             StationBasic stationBasic = stationBasicMapper.selectOne(new LambdaQueryWrapper<StationBasic>()
-                    .like(StationBasic::getStationName, station.substring(0, station.length() - 1)));
+                    .eq(StationBasic::getStationName, station.substring(0, station.length() - 1)+'场')
+                    .or().eq(StationBasic::getStationName, station.substring(0, station.length() - 1)+'站'));
             stationCode = stationBasic.getFanGatewayId();
         }
         if (StrUtil.isNotEmpty(areaCode)) {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWeight.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -66,11 +68,18 @@ public class IdxBizFanWeight {
     private Float value;
     
     /**
+     * 权重值字符串
+     */
+    @TableField(exist=false)
+    private String valueS;
+
+    /**
      * orgCode
      */
     @TableField("ORG_CODE")
     private String orgCode;
 
-    @TableField(exist=false)
-    private String Symbol_key;
+    
+    @TableField(value = "FLAG", updateStrategy=FieldStrategy.IGNORED)
+    private String flag;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvWeight.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -67,11 +68,17 @@ public class IdxBizPvWeight {
     private Float value;
     
     /**
+     * 权重值字符串
+     */
+    @TableField(exist=false)
+    private String valueS;
+
+    /**
      * orgCode
      */
     @TableField("ORG_CODE")
     private String orgCode;
 
-    @TableField(exist=false)
-    private String Symbol_key;
+    @TableField(value = "FLAG", updateStrategy=FieldStrategy.IGNORED)
+    private String flag;
 }