Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-common/zd-common-core/pom.xml

@@ -64,6 +64,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
 
         <!-- Alibaba Fastjson -->
         <dependency>

zd-common/zd-common-core/src/main/java/com/zd/common/core/config/JacksonObjectMapper.java

@@ -0,0 +1,59 @@
+package com.zd.common.core.config;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES;
+
+/**
+ * @author Administrator
+ */
+public class JacksonObjectMapper extends ObjectMapper {
+
+    public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+
+    public JacksonObjectMapper() {
+        super();
+        //收到未知属性时不报异常
+        this.configure(FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+        // 忽略null值
+        this.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+        // 设置Date类型格式化
+        this.setDateFormat(new SimpleDateFormat(DEFAULT_DATE_TIME_FORMAT));
+
+        SimpleModule simpleModule = new SimpleModule()
+                // 反序列化（设置LocalDateTime等日期时间类型格式化）
+                .addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)))
+                .addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)))
+                .addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)))
+                // 将大数字类型自动转换为String类型，防止前端精度丢失（也可以直接使用@JsonFormat(shape = JsonFormat.Shape.STRING)注解）
+                .addSerializer(BigInteger.class, ToStringSerializer.instance)
+                .addSerializer(Long.class, ToStringSerializer.instance)
+                // 序列化
+                .addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)))
+                .addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)))
+                .addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+
+        //注册功能模块 例如，可以添加自定义序列化器和反序列化器
+        this.registerModule(simpleModule);
+    }
+}

zd-common/zd-common-core/src/main/java/com/zd/common/core/config/WebConfig.java

@@ -1,8 +1,6 @@
 package com.zd.common.core.config;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -21,12 +19,14 @@ public class WebConfig implements WebMvcConfigurer {
      */
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(0,mappingJackson2HttpMessageConverter());
+    }
+
+    @Bean
+    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(){
         MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter();
-        ObjectMapper objectMapper = new ObjectMapper();
-        SimpleModule simpleModule = new SimpleModule();
-        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-        objectMapper.registerModule(simpleModule);
-        jackson2HttpMessageConverter.setObjectMapper(objectMapper);
-        converters.add(0,jackson2HttpMessageConverter);
+        jackson2HttpMessageConverter.setObjectMapper(new JacksonObjectMapper());
+        return jackson2HttpMessageConverter;
     }
+
 }

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -298,21 +298,20 @@ public class HxpStockServiceImpl implements IHxpStockService {
      */
     @Override
     public boolean RFIDCheck(InventoryTag tag) {
-        boolean b = false;
         String rfidCode = tag.getEpc();
         if(StringUtils.isBlank(rfidCode)){
-            return b;
+            return false;
         }
         Date d = cacheMap.get(rfidCode);
         if(d != null && DateUtil.compare(DateUtil.offsetSecond(d, interval), DateUtils.getNowDate()) > 0){
-            return b;
+            return false;
         }
 
 
         logger.info("RFID 实时检测 RFIDCheck（标签编号）: " + rfidCode);
         HxpStock hxpStock = hxpStockMapper.selectByRfidCode(rfidCode);
         if(hxpStock == null){
-            return b;
+            return false;
         }
 
         // 查询该库存数据是否处于领用状态
@@ -425,9 +424,9 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     hxpAlarmRecordMapper.insertHxpAlarmRecord(hxpAlarmRecord);
                 }
             }
-            return b;
+            return true;
         }
-        return b;
+        return false;
     }
 
     private void sendPhoneAlarm(String subName, String chemicalName, String phones) {