1.删除MyJsonConfig.bak

2.删除MyStringSerializer
3.诊断报告，以及预警分析相关接口统一使用windturbinecode不再使用windturbineid

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/config/MyJsonConfig.bak

@@ -1,69 +0,0 @@
-package com.gyee.wisdom.alarm.sharding.config;
-
-import com.alibaba.fastjson.serializer.NameFilter;
-import com.alibaba.fastjson.serializer.SerializeConfig;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import org.springdoc.webmvc.ui.SwaggerWelcomeWebMvc;
-import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.TimeZone;
-
-/**
- * @description:
- * @auther: Wanghs
- * @date: 2022-04-06
- */
-@Configuration
-public class MyJsonConfig {
-    //springboot 默认通过jackson来转化json,@JSONField(....)是fastjson的注解,因此要添加如下配置
-    //Long类型在前端js中会丢失精度
-    @Bean
-    public HttpMessageConverters fastJsonHttpMessageConverters() {
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
-        FastJsonHttpMessageConverter fastConverter = new FastJsonHttpMessageConverter();
-        FastJsonConfig fastJsonConfig = new FastJsonConfig();
-        SerializeConfig serializeConfig = fastJsonConfig.getSerializeConfig();
-        //serializeConfig.put(String.class,MyStringSerializer.instance);
-        fastJsonConfig.setSerializeConfig(serializeConfig);
-
-        fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");    //自定义时间格式
-        fastJsonConfig.setSerializerFeatures(
-                SerializerFeature.DisableCircularReferenceDetect
-                ,SerializerFeature.WriteMapNullValue
-                ,SerializerFeature.WriteDateUseDateFormat
-        );  //关闭循环引用,正常转换null值，格式化
-
-        fastConverter.setFastJsonConfig(fastJsonConfig);
-        List<MediaType> fastMediaTypes = new ArrayList<>();
-        fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
-        fastConverter.setSupportedMediaTypes(fastMediaTypes);
-        HttpMessageConverter<?> converter = fastConverter;
-        StringHttpMessageConverter stringConverter = new StringHttpMessageConverter(
-                Charset.forName("UTF-8"));
-        HttpMessageConverters httpMessageConverters = new HttpMessageConverters(stringConverter,fastConverter);
-//        Optional<HttpMessageConverter<?>> first = httpMessageConverters.getConverters().stream().filter(s -> s instanceof StringHttpMessageConverter).findFirst();
-//        if(first.isPresent())
-//        {
-//            StringHttpMessageConverter s=(StringHttpMessageConverter)first.get();
-//            s.setDefaultCharset(Charset.forName("UTF-8"));
-//        }
-
-
-        return httpMessageConverters;
-    }
-
-
-}

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/config/MyJsonConfig.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
  * @date: 2022-04-06
  */
 @Configuration
-public class MyJsonConfig extends WebMvcConfigurerAdapter {
+public class MyJsonConfig implements WebMvcConfigurer {
     //springboot 默认通过jackson来转化json,@JSONField(....)是fastjson的注解,因此要添加如下配置
     //Long类型在前端js中会丢失精度
 

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/config/MyStringSerializer.java

@@ -1,22 +0,0 @@
-package com.gyee.wisdom.alarm.sharding.config;
-
-import com.alibaba.fastjson.serializer.JSONSerializer;
-import com.alibaba.fastjson.serializer.ObjectSerializer;
-import com.alibaba.fastjson.serializer.SerializeWriter;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-
-/**
- * @description:
- * @auther: Wanghs
- * @date: 2022-06-01
- */
-public class MyStringSerializer implements ObjectSerializer {
-    public static final MyStringSerializer instance = new MyStringSerializer();
-    @Override
-    public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException {
-        SerializeWriter out = serializer.getWriter();
-        out.write(object.toString());
-    }
-}

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/EarlyWarnScore.java

@@ -47,6 +47,10 @@ public class EarlyWarnScore implements Serializable{
     @TableField(exist = false)
     private String windturbineName;
     @TableField(exist = false)
+    private String windturbineCode;
+    @TableField(exist = false)
+    private String stationName;
+    @TableField(exist = false)
     private String stationId;
     @TableField(exist = false)
     private String model;

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/Windturbine.java

@@ -21,4 +21,8 @@ public class Windturbine implements Serializable {
     private String photo;
     private String name;
     private String standardid;
+
+    public String getWindturbineCode(){
+        return this.code;
+    }
 }

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/EarlyWarnScoreService.java

@@ -1,6 +1,7 @@
 package com.gyee.wisdom.alarm.sharding.service;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gyee.wisdom.alarm.sharding.cache.StationCache;
 import com.gyee.wisdom.alarm.sharding.cache.WindturbineCache;
 import com.gyee.wisdom.alarm.sharding.entity.DeviceStructure;
 import com.gyee.wisdom.alarm.sharding.entity.EarlyWarnScore;
@@ -30,9 +31,12 @@ public class EarlyWarnScoreService  {
         for (int i = 0; i < earlyWarnScores.size(); i++) {
             Windturbine windturbine = windturbineCache.getWindturbine(earlyWarnScores.get(i).getWindturbineid());
             if(windturbine!=null){
+                String stationName = StationCache.getStationName(windturbine.getWindpowerstationid());
                 earlyWarnScores.get(i).setWindturbineName(windturbine.getName());
                 earlyWarnScores.get(i).setStationId(windturbine.getWindpowerstationid());
                 earlyWarnScores.get(i).setModel(windturbine.getModelid());
+                earlyWarnScores.get(i).setWindturbineCode(windturbine.getCode());
+                earlyWarnScores.get(i).setStationName(stationName.replace("风电场",""));
             }
 
         }