diff --git a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java
index c957ece..c68b7ea 100644
--- a/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java
+++ b/src/main/java/com/bonus/imgTool/task/job/ProPullTask.java
@@ -34,7 +34,7 @@ public class ProPullTask {
/**
* 拉取工程数据
*/
- @Scheduled(cron = "0 30 0 * * ?")
+ @Scheduled(initialDelay = 6000, fixedDelay = 60000 * 30)
@Async
public void getAttTempDataTask() {
log.info("--------实名制工程数据拉取定时器开启------");
@@ -64,7 +64,7 @@ public class ProPullTask {
// 如果proId存在,比较并更新数据
ProDto imgProject = imgProjectMap.get(project.getProId());
if (!project.equals(imgProject)) {
- project.update(imgProject); // 使用来自proImgList的数据更新project对象
+ imgProject.update(project);
}else{
// 相同的数据移出proImgList
imgProjectMap.remove(project.getProId());
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 84578e6..defe2a5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -44,7 +44,7 @@ zhly.aq.file.suffix=woff,js,css,html,woff2,lang,map,png,jpg
zhly.aq.file.html=login.html,index.html,pages/user/updateMyself.html,pages/user/changePassword.html
#\u6253\u5370sql
#mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-
+mybatis.configuration.mapUnderscoreToCamelCase=true
file.windwos.upload_path=L:/imgTool/files/
file.linux.upload_path=L:/imgTool/files/
diff --git a/src/main/resources/mappers/basic/ProPullMapper.xml b/src/main/resources/mappers/basic/ProPullMapper.xml
index 0ac187d..04759f1 100644
--- a/src/main/resources/mappers/basic/ProPullMapper.xml
+++ b/src/main/resources/mappers/basic/ProPullMapper.xml
@@ -56,7 +56,7 @@
company_name = #{companyName},
- project_address = #{origin},
+ origin = #{origin},
lon = #{lon},
@@ -65,7 +65,7 @@
lat = #{lat},
- status = #{status}
+ status = #{status},
update_time = #{updateTime},