diff --git a/ruoyi-modules/hw-data-process/src/main/java/com/ruoyi/dataprocess/service/impl/DataProcessServiceImpl.java b/ruoyi-modules/hw-data-process/src/main/java/com/ruoyi/dataprocess/service/impl/DataProcessServiceImpl.java index 50d0ef6..622567a 100644 --- a/ruoyi-modules/hw-data-process/src/main/java/com/ruoyi/dataprocess/service/impl/DataProcessServiceImpl.java +++ b/ruoyi-modules/hw-data-process/src/main/java/com/ruoyi/dataprocess/service/impl/DataProcessServiceImpl.java @@ -141,7 +141,9 @@ public class DataProcessServiceImpl extends CommanHandleService implements IData //添加timestamp字段,默认字段名称是ts,协议上传的key是timestamp TdField firstTdField = new TdField(); firstTdField.setFieldName(TdEngineConstants.DEFAULT_FIRST_FIELD_NAME); - firstTdField.setFieldValue(ts); + long currentTimeMillis = System.currentTimeMillis(); + firstTdField.setFieldValue(currentTimeMillis); +// firstTdField.setFieldValue(ts); schemaFields.add(firstTdField); Object longitude = null; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 30a4fbf..065a41e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -13,6 +13,8 @@ import com.ruoyi.common.core.utils.file.FileUtils; import com.ruoyi.file.service.ISysFileService; import com.ruoyi.system.api.domain.SysFile; +import javax.annotation.Resource; + /** * 文件请求处理 * @@ -22,6 +24,7 @@ import com.ruoyi.system.api.domain.SysFile; public class SysFileController { private static final Logger log = LoggerFactory.getLogger(SysFileController.class); +// @Resource(name = "LocalSysFileService") @Autowired private ISysFileService sysFileService;