Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/oms into develop

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/oms
-  newTag: b877594a07a2834db614946483e57101b2129149
+  newTag: ab651c091ed290c83cebd96a944073317144fd8f

src/main/java/com/mmc/oms/config/GlobalFormDateConvert.java

+package com.mmc.oms.config;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+//Converter<S,T> S: 代表的是源,将要转换的数据类型 T:目标类型,将会转成什么数据类型
+@Component
+public class GlobalFormDateConvert implements Converter<String, Date> {
+
+	// 静态初始化定义日期字符串参数列表（需要转换的）
+	private static final List<String> paramList = new ArrayList<>();
+
+	// 静态初始化可能初夏你的日期格式
+	private static final String param1 = "yyyy-MM";
+	private static final String param2 = "yyyy-MM-dd";
+	private static final String param3 = "yyyy-MM-dd HH:mm";
+	private static final String param4 = "yyyy-MM-dd HH:mm:ss";
+
+	// 静态代码块，将日期参数加入到列表中
+	static {
+		paramList.add(param1);
+		paramList.add(param2);
+		paramList.add(param3);
+		paramList.add(param4);
+	}
+
+	// 自定义函数，将字符串转Date 参1：传入的日期字符串 参2：格式参数
+	public Date parseDate(String source, String format) {
+		System.out.println("parseDate转换日期");
+		Date date = null;
+		try {
+			// 日期格式转换器
+			DateFormat dateFormat = new SimpleDateFormat(format);
+			date = dateFormat.parse(source);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return date;
+	}
+
+	// convert转换方法 ，s是将会传递过来的日期的字符串
+	@Override
+	public Date convert(String source) {
+
+		System.out.println("convert日期格式转换器");
+		if (StringUtils.isEmpty(source)) {
+			return null;
+		}
+		source = source.trim(); // 去除首尾空格
+
+		// 正则表达式判断是哪一种格式参数
+		if (source.matches("^\\d{4}-\\d{1,2}$")) {
+			return parseDate(source, paramList.get(0));
+		} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")) {
+			return parseDate(source, paramList.get(1));
+		} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}$")) {
+			return parseDate(source, paramList.get(2));
+		} else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")) {
+			return parseDate(source, paramList.get(3));
+		} else {
+			throw new IllegalArgumentException("还未定义该种字符串转Date的日期转换格式 --> 【日期格式】：" + source);
+		}
+	}
+}

src/main/java/com/mmc/oms/config/GlobalJsonDateConvert.java

+package com.mmc.oms.config;
+
+import com.fasterxml.jackson.databind.util.StdDateFormat;
+import org.springframework.util.StringUtils;
+
+import java.text.FieldPosition;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class GlobalJsonDateConvert extends StdDateFormat {
+	private static final long serialVersionUID = -6738131740618766141L;
+	// 静态初始化final，共享
+	public static final GlobalJsonDateConvert instance = new GlobalJsonDateConvert();
+
+	// 覆盖parse(String)这个方法即可实现
+	@Override
+	public Date parse(String dateStr, ParsePosition pos) {
+		return getDate(dateStr, pos);
+	}
+
+	@Override
+	public Date parse(String dateStr) {
+		ParsePosition pos = new ParsePosition(0);
+		return getDate(dateStr, pos);
+	}
+
+	private Date getDate(String dateStr, ParsePosition pos) {
+		SimpleDateFormat sdf = null;
+		if (StringUtils.isEmpty(dateStr)) {
+			return null;
+		} else if (dateStr.matches("^\\d{4}-\\d{1,2}$")) {
+			sdf = new SimpleDateFormat("yyyy-MM");
+			return sdf.parse(dateStr, pos);
+		} else if (dateStr.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")) {
+			sdf = new SimpleDateFormat("yyyy-MM-dd");
+			return sdf.parse(dateStr, pos);
+		} else if (dateStr.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}$")) {
+			sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			return sdf.parse(dateStr, pos);
+		} else if (dateStr.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")) {
+			sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			return sdf.parse(dateStr, pos);
+		} else if (dateStr.length() == 23) {
+			sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+			return sdf.parse(dateStr, pos);
+		}
+		return super.parse(dateStr, pos);
+	}
+
+	@Override
+	public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		return sdf.format(date, toAppendTo, fieldPosition);
+	}
+
+	@Override
+	public GlobalJsonDateConvert clone() {
+		return new GlobalJsonDateConvert();
+	}
+}

src/main/java/com/mmc/oms/config/WebConfig.java

+package com.mmc.oms.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ConversionServiceFactoryBean;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Configuration
+public class WebConfig {
+
+	// JSON格式 全局日期转换器配置
+	@Bean
+	public MappingJackson2HttpMessageConverter getMappingJackson2HttpMessageConverter() {
+		MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
+		// 设置日期格式
+		ObjectMapper objectMapper = new ObjectMapper();
+		objectMapper.setDateFormat(GlobalJsonDateConvert.instance);
+		objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
+		objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+		mappingJackson2HttpMessageConverter.setObjectMapper(objectMapper);
+		// 设置中文编码格式
+		List<MediaType> list = new ArrayList<MediaType>();
+		list.add(MediaType.APPLICATION_JSON_UTF8);
+		mappingJackson2HttpMessageConverter.setSupportedMediaTypes(list);
+		return mappingJackson2HttpMessageConverter;
+	}
+
+	// 表单格式 全局日期转换器
+
+	@Bean
+	@Autowired
+	public ConversionService getConversionService(GlobalFormDateConvert globalDateConvert) {
+		ConversionServiceFactoryBean factoryBean = new ConversionServiceFactoryBean();
+		Set<Converter> converters = new HashSet<>();
+		converters.add(globalDateConvert);
+		factoryBean.setConverters(converters);
+		return factoryBean.getObject();
+	}
+}

src/main/java/com/mmc/oms/util/HttpUtil.java

 package com.mmc.oms.util;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
@@ -77,8 +75,8 @@ public class HttpUtil {
      * @param headerMap
      * @return
      */
-    public JSONObject sendGet(String url, Map<String, String> paramMap, Map<String, String> headerMap) {
-        JSONObject jsonObject = null;
+    public String sendGet(String url, Map<String, String> paramMap, Map<String, String> headerMap) {
+        String jsonStr = null;
         // 获取连接客户端工具
         CloseableHttpClient httpClient = HttpClients.createDefault();
         CloseableHttpResponse response = null;
@@ -107,9 +105,7 @@ public class HttpUtil {
             // 使用Apache提供的工具类进行转换成字符串
             if (entity != null) {
                 // 将返回结果处理成String对象
-                String result = EntityUtils.toString(entity, "UTF-8");
-                // 转换Json对象
-                jsonObject = JSON.parseObject(result);
+                return EntityUtils.toString(entity, "UTF-8");
             }
 
         } catch (Exception e) {
@@ -126,6 +122,6 @@ public class HttpUtil {
                 }
             }
         }
-        return jsonObject;
+        return jsonStr;
     }
 }