进场时间格式标准化调整

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDivideCircleServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -81,7 +82,7 @@ public class JsDivideCircleServiceImpl extends ServiceImpl<JsDivideCircleMapper,
         }
         divideCircle.setCreateTime(new Date());
         divideCircle.setSeriesNo(
-                generateSeriesNo(animalCertNo, pigpen.getPigpenName(), entranceBatch.getEntranceTime()));
+                generateSeriesNo(animalCertNo, pigpen.getPigpenName(), Date.from(entranceBatch.getEntranceTime().atZone(ZoneId.systemDefault()).toInstant())));
         jsDivideCircleMapper.insert(divideCircle);
         pigpen.setIsUse(1);
         pigpenMapper.updatePigpen(pigpen);

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsDrugCheckServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.DecimalFormat;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -215,7 +216,7 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
 
                 drugAndProduce.setWeight(weight.toString());
                 drugAndProduce.setQualifiedAmountAfter((amount*2-number)/2.0);
-                drugAndProduce.setCreateTime(entranceBatch.getEntranceTime());
+                drugAndProduce.setCreateTime(Date.from(entranceBatch.getEntranceTime().atZone(ZoneId.systemDefault()).toInstant()));
                 drugAndProduces.add(drugAndProduce);
             }
         }
@@ -238,7 +239,7 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
                 harmlessVo.setId(id);
                 Supplier supplier = supplierMapper.selectSupplierById(entranceBatch.getSupplierId());
                 harmlessVo.setCargoOwner(supplier.getSupplierName());
-                harmlessVo.setCreateTime(entranceBatch.getEntranceTime());
+                harmlessVo.setCreateTime(Date.from(entranceBatch.getEntranceTime().atZone(ZoneId.systemDefault()).toInstant()));
                 HarmlessTreatment harmlessTreatment = harmlessTreatmentMapper.selectByEntraceBatchId(entranceBatch.getId());
                 if (ObjectUtil.isNotEmpty(harmlessTreatment)) {
                     harmlessVo.setDealReason(harmlessTreatment.getDealReason());
@@ -276,7 +277,7 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
         if (entranceBatchList.size() != 0) {
             for (EntranceBatch entranceBatch : entranceBatchList) {
                 AdmissionVo admissionVo = new AdmissionVo();
-                admissionVo.setCreateTime(entranceBatch.getEntranceTime());
+                admissionVo.setCreateTime(Date.from(entranceBatch.getEntranceTime().atZone(ZoneId.systemDefault()).toInstant()));
                 admissionVo.setNum(entranceBatch.getId());
                 Supplier supplier = supplierMapper.selectSupplierById(entranceBatch.getSupplierId());
                 admissionVo.setCargoOwner(supplier.getSupplierName());
@@ -391,7 +392,7 @@ public class JsDrugCheckServiceImpl extends ServiceImpl<JsDrugCheckMapper, JsDru
         if (entranceBatchList.size() != 0) {
             for (EntranceBatch entranceBatch : entranceBatchList) {
                 SummaryVo summaryVo = new SummaryVo();
-                summaryVo.setCreateTime(entranceBatch.getEntranceTime());
+                summaryVo.setCreateTime(Date.from(entranceBatch.getEntranceTime().atZone(ZoneId.systemDefault()).toInstant()));
                 summaryVo.setAmount(entranceBatch.getAmount());
                 QueryWrapper<JsDrugCheck> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("entrance_batch_id", entranceBatch.getId());

app-system/pom.xml

@@ -28,6 +28,16 @@
             <optional>true</optional>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

app-system/src/main/java/com/ruoyi/app/domain/EntranceBatch.java

@@ -6,10 +6,15 @@ import java.time.LocalTime;
 import java.time.ZoneId;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.*;
 
@@ -31,9 +36,12 @@ public class EntranceBatch extends BaseEntity
     private Long supplierId;
 
     /** 进场时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "进场时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date entranceTime;
+    private LocalDateTime entranceTime;
 
     /** 产地：三选一：1-本市、2-市外、3-省外，默认本市 */
     @Excel(name = "产地：三选一：1-本市、2-市外、3-省外，默认本市")
@@ -143,29 +151,29 @@ public class EntranceBatch extends BaseEntity
         return supplierId;
     }
 
-    public void setEntranceTime(Date entranceTime) 
+    public void setEntranceTime(LocalDateTime entranceTime)
     {
         this.entranceTime = entranceTime;
     }
 
     public void entranceTimeAdapter() {
         if(entranceTime != null) {
-            LocalDateTime realTime = entranceTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            LocalDateTime realTime = entranceTime;
             if((realTime.getHour() == 0) && (realTime.getMinute() == 0) && (realTime.getSecond() == 0)) {
                 LocalTime nowTime = LocalTime.now();
                 realTime = realTime.withHour(nowTime.getHour())
                         .withMinute(nowTime.getMinute())
                         .minusSeconds(nowTime.getSecond())
                         .withNano(nowTime.getNano());
-                entranceTime = Date.from(realTime.atZone(ZoneId.systemDefault()).toInstant());
+                entranceTime = realTime;
             }
         }else {
-            this.entranceTime = new Date();
+            this.entranceTime = LocalDateTime.now();
         }
     }
 
     @NotNull(message = "进场时间不能为空")
-    public Date getEntranceTime() 
+    public LocalDateTime getEntranceTime()
     {
         return entranceTime;
     }
@@ -392,11 +400,13 @@ public class EntranceBatch extends BaseEntity
         return animalEartags;
     }
 
+    @Override
     public void setRemark(String remark)
     {
         this.remark = remark;
     }
 
+    @Override
     @Size(min = 0, max = 50, message = "备注输入超出最大长度限制（50位）")
     public String getRemark()
     {