Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -195,7 +195,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "测点运行趋势图",   notes = "测点运行趋势图")
     @GetMapping(value = "/getqyt")
     public ResponseModel<Object> getqyt(
-            int type,
+            String type,
             String address,
             String statioName,
             String equipmentName,

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

@@ -66,12 +66,12 @@ public class IdxBizFanHealthIndexServiceImpl extends BaseService<IdxBizFanHealth
 
 
 
-    public  Object getqyt(int type,String address,String statioName,String equipmentName, String  arae,String startTime,String endTime){
+    public  Object getqyt(String type,String address,String statioName,String equipmentName, String  arae,String startTime,String endTime){
         Map<String, Object> map = new HashMap<>();
         try {
            //获取场站网关
         String tdid=null;
-     if(type==1){
+     if(type.equals("1")){
          IdxBizPvPointProcessVariableClassification      idxBizPvPointProcessVariableClassification=  idxBizPvPointProcessVariableClassificationMapper.selectOne(
                  new QueryWrapper<IdxBizPvPointProcessVariableClassification>()
                          .eq("INDEX_ADDRESS", address)