修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -6,6 +6,8 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Enumeration;
@@ -168,20 +170,17 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         Page result = new Page<>(param.getPageNumber(), param.getPageSize());
         Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
         if (resultPage.getTotal() > 0) {
-            resultPage.getRecords().forEach(x -> {
+            for (Map<String, Object> x : resultPage.getRecords()) {
                 Object type = x.get("type");
                 if (AlarmTypeEnum.HZGJ.getCode().equals(type) || AlarmTypeEnum.GZGJ.getCode().equals(type)) {
                     x.put("typeCode", type);
                     x.put("type", AlarmTypeEnum.getTypeByCode(String.valueOf(type)));
                 }
-                try {
-					x.put("createDate", DateUtils.dateParse(String.valueOf(x.get("createDate")),DateUtils.DATE_TIME_T_PATTERN));
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
+                LocalDateTime createDate = (LocalDateTime) x.get("createDate");
+                x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
                 x.put("handleType", ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType"))));
                 x.put("fireEquipmentName", x.get("fireEquipmentName"));
-            });
+            }
         }
         return resultPage;
     }