分析需求 bug xiugai

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

@@ -26,6 +26,7 @@ import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -618,13 +619,22 @@ public class BigScreenAnalyseController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "风站/光伏 右下诊断分析")
     @GetMapping("/getRiskHandleByVarDesc")
-    public ResponseModel<Map<String, String>> getRiskHandleByVarDesc(@RequestParam(value = "varDesc", required = false) String varDesc) {
+    public ResponseModel<Map<String, String>> getRiskHandleByVarDesc(@RequestParam(value = "varDesc", required = false) String varDesc,
+                                                                     @RequestParam(value = "tableName", required = true) String tableName) {
+
+
+        varDesc = idxBizFanHealthIndexMapper.getPointNameByIndexAddress(varDesc, tableName);
         FeignClientResult<List<String>> sevenEntityMcb = null;
         try {
             sevenEntityMcb = riskWarningFeign.getRiskHandleByVarDesc(varDesc);
         } catch (Exception e) {
             e.printStackTrace();
         }
+        if (ObjectUtils.isEmpty(sevenEntityMcb) || sevenEntityMcb.getStatus() != 200) {
+            HashMap<String, String> stringStringHashMap = new HashMap<>();
+            stringStringHashMap.put("content", "");
+            return ResponseHelper.buildResponse(stringStringHashMap);
+        }
         StringBuilder resultString = new StringBuilder();
         List<String> result = sevenEntityMcb.getResult();
         for (String s : result) {

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

@@ -72,4 +72,8 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 
     List<Map<String, Object>> getPvPointNameListBySumSystem(@Param("gatewayId") String gatewayId, @Param("equipmentName") String equipmentName);
 
+
+
+    String getPointNameByIndexAddress(@Param("varDesc") String varDesc,
+                                      @Param("tableName") String tableName);
 }

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

@@ -562,4 +562,12 @@
     GROUP BY
     POINT_NAME
     </select>
+
+<select id="getPointNameByIndexAddress" resultType="java.lang.String">
+    select POINT_NAME from
+        ${tableName}
+    where INDEX_ADDRESS = #{varDesc}
+    limit 1
+
+    </select>
 </mapper>