修改筛选通用

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

@@ -124,8 +124,8 @@ public class IdxBizFanPointProcessVariableClassificationController extends BaseC
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/selectParams")
-	public ResponseModel<List<Map<String,Object>>> selectParams(String tableName,String column) {
-		return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.selectParams(column,tableName));
+	public ResponseModel<List<Map<String,Object>>> selectParams(String tableName,String column,@RequestParam(required = false) String isFx) {
+		return ResponseHelper.buildResponse(idxBizFanPointProcessVariableClassificationServiceImpl.selectParams(column,tableName,isFx));
 	}
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanPointProcessVariableClassificationMapper.java

@@ -18,7 +18,7 @@ public interface IdxBizFanPointProcessVariableClassificationMapper extends BaseM
     List<IdxBizFanPointProcessVariableClassificationDto> getInfluxDBData();
 
 
-    List<Map<String,Object>> selectParams(String tableName,String column);
+    List<Map<String,Object>> selectParams(String tableName,String column,String isFx);
 
     List<String> gateWayIdListFan();
 }

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

@@ -34,9 +34,9 @@ public class IdxBizFanPointProcessVariableClassificationServiceImpl extends Base
         return this.queryForList("" , false);
     }
 
-    public List<Map<String,Object>> selectParams(String column, String tableName)   {
+    public List<Map<String,Object>> selectParams(String column, String tableName,String isFx)   {
 
-        return this.getBaseMapper(). selectParams(tableName,column);
+        return this.getBaseMapper(). selectParams(tableName,column,isFx);
 
     }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.xml

@@ -93,6 +93,9 @@
 
         select ${column} as text from ${tableName}
         where ${column} is not null and ${column} != ''
+        <if test="isFx != '' and is Fx != null">
+            and TAG_CODE = '分析变量'
+        </if>
         group by ${column};
     </select>
 </mapper>