token 认证

src/main/java/com/cn/esermis/config/CorsConfig.java

@@ -1,6 +1,10 @@
 package com.cn.esermis.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
@@ -15,4 +19,15 @@ public class CorsConfig implements WebMvcConfigurer {
                 .allowedHeaders("*") // 允许的请求头
                 .allowCredentials(true); // 是否允许证书（cookies）
     }
+
+    @Bean
+    public CorsConfigurationSource corsConfigurationSource() {
+        CorsConfiguration configuration = new CorsConfiguration();
+        configuration.addAllowedOrigin("*"); // 允许所有域名访问，也可以指定特定的域名
+        configuration.addAllowedMethod("*"); // 允许所有HTTP方法
+        configuration.addAllowedHeader("*"); // 允许所有请求头
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", configuration);
+        return source;
+    }
 }

src/main/java/com/cn/esermis/config/MyBatisPlusConfig.java

@@ -11,5 +11,4 @@ public class MyBatisPlusConfig {
         PaginationInterceptor page = new PaginationInterceptor();
         return page;
     }
-
 }

src/main/java/com/cn/esermis/config/MyInterceptor.java

@@ -21,6 +21,9 @@ public class MyInterceptor  implements HandlerInterceptor  {
     DataAcquisitionInstrumentMapper dataAcquisitionInstrumentMapper;
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        // 获取 header 中的 Authorization 信息
+//        String token = request.getHeader("Authorization");
+
         String token = extractToken(request);
         if (token != null) {
             BaseUser userInfo = TokenUtils.getUserInfo(token);

src/main/java/com/cn/esermis/dpld/entity/DataAcquisitionInstrument.java

@@ -4,7 +4,9 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -42,6 +44,8 @@ public class DataAcquisitionInstrument {
      *建设投用日期
      */
     @TableField(value = "use_data")
+    @DateTimeFormat(pattern = "yyyy")
+    @JsonFormat(pattern = "yyyy",timezone = "GMT+8")
     private Date useData;
     /**
      * 是否完成验收备案(0否 1是)

src/main/java/com/cn/esermis/dpld/entity/DetectMonitoringFactor.java

@@ -73,9 +73,14 @@ public class DetectMonitoringFactor {
     /**
      * 量程单位
      */
-    @TableField(value = "rangeUnit")
+    @TableField(value = "range_unit")
     private String rangeUnit;
     /**
+     * 量程单位
+     */
+    @TableField(value = "factor_name")
+    private String factorName;
+    /**
      * 数据采集仪主键ID
      */
     @TableField(value = "data_acquisition_instrument_id")

src/main/java/com/cn/esermis/dpld/model/AnalyticalInstrumentsVo.java

@@ -5,6 +5,7 @@ import com.cn.esermis.dpld.entity.DetectMonitoringFactor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -12,6 +13,6 @@ import java.util.List;
 
 public class AnalyticalInstrumentsVo extends AnalyticalInstruments {
 
-    private List<DetectMonitoringFactor> detectMonitoringFactors;
+    private List<DetectMonitoringFactor> detectMonitoringFactors = new ArrayList<>();
 
 }