|
|
@@ -10,7 +10,6 @@ import com.yunfeiyun.agmp.common.core.page.PageDomain;
|
|
|
import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
|
|
|
import com.yunfeiyun.agmp.common.core.page.TableSupport;
|
|
|
import com.yunfeiyun.agmp.common.enums.BusinessType;
|
|
|
-import com.yunfeiyun.agmp.common.enums.CommonEnums;
|
|
|
import com.yunfeiyun.agmp.common.log.LogCore;
|
|
|
import com.yunfeiyun.agmp.common.utils.StringUtils;
|
|
|
import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
|
|
|
@@ -44,8 +43,6 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.time.LocalDateTime;
|
|
|
-import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
|
@@ -237,10 +234,11 @@ public class IotDeviceCbdController extends BaseController {
|
|
|
|
|
|
for (IotCbddata iotCbddata : all) {
|
|
|
IotDeviceDataListResVo resVo = JSONObject.parseObject(iotCbddata.getCdbdataContent().toJSONString(), IotDeviceDataListResVo.class);
|
|
|
- String stamp = resVo.getStamp();
|
|
|
- DateTimeFormatter dtf = DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode());
|
|
|
- DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
|
|
- resVo.setStamp(LocalDateTime.parse(stamp, dtf2).format(dtf));
|
|
|
+// String stamp = resVo.getStamp();
|
|
|
+// DateTimeFormatter dtf = DateTimeFormatter.ofPattern(CommonEnums.PATTERN_DATETIME.getCode());
|
|
|
+// DateTimeFormatter dtf2 = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
|
|
|
+// resVo.setStamp(LocalDateTime.parse(stamp, dtf2).format(dtf));
|
|
|
+ resVo.setStamp(iotCbddata.getCbddataCreatedDate());
|
|
|
list.add(resVo);
|
|
|
}
|
|
|
|