leon 5 năm trước cách đây
mục cha
commit
fc23622064

+ 9 - 6
src/main/java/com/mokamrp/privates/tast/pangu/SyncFosterwxTask.java

@@ -22,7 +22,9 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -45,10 +47,10 @@ public class SyncFosterwxTask {
         Date nowDate = new Date();
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         List<FosterwxStation> fosterwxStationList = fosterwxStationService.list();
-        for (FosterwxStation fosterwxStation : fosterwxStationList){
-            for (Integer i =0;i<=60;i++){
+        for (FosterwxStation fosterwxStation : fosterwxStationList) {
+            for (Integer i = 0; i <= 60; i++) {
                 String nextDate = df.format(nowDate);
-                if (!i.equals(0)){
+                if (!i.equals(0)) {
                     nextDate = df.format(new Date(nowDate.getTime() + 1000 * 60 * 60 * 24 * i));
                 }
                 Integer stationId = fosterwxStation.getId();
@@ -59,18 +61,19 @@ public class SyncFosterwxTask {
                 fosterwxTaskScheduleHandle.setPagesize(99999);
                 ResHandle<List<FosterwxTaskSchedule>> resHandle = fosterwxTaskScheduleService.getList(fosterwxTaskScheduleHandle);
                 List<FosterwxTaskSchedule> fosterwxTaskScheduleList = resHandle.getList();
-                for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList){
+                for (FosterwxTaskSchedule fosterwxTaskSchedule : fosterwxTaskScheduleList) {
                     FosterwxTaskScheduleHandle handle = new FosterwxTaskScheduleHandle();
                     handle.setTaskId(fosterwxTaskSchedule.getTaskId());
                     handle.setStationId(fosterwxTaskSchedule.getStationId());
+                    handle.setSendDate(fosterwxTaskSchedule.getSendDate());
                     FosterwxTaskSchedule taskInfo = fosterwxTaskScheduleService.getInfo(handle);
-                    if(taskInfo == null){
+                    if (taskInfo == null) {
                         continue;
                     }
                     fosterwxTaskSchedule.setMobileCount(taskInfo.getMobileCount());
                     fosterwxTaskSchedule.setComment(taskInfo.getComment());
                 }
-                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask+stationId,nextDate, JSON.toJSONString(fosterwxTaskScheduleList));
+                stringRedisTemplate.opsForHash().put(RedisKey.PanWxfosterTask + stationId, nextDate, JSON.toJSONString(fosterwxTaskScheduleList));
             }
         }
     }

+ 6 - 1
src/main/java/com/mokamrp/privates/tast/pangu/SyncFosterwxTaskEdit.java

@@ -57,8 +57,13 @@ public class SyncFosterwxTaskEdit {
                 if (fosterwxTaskSchedule.getStationId().equals(0)) {
                     continue;
                 }
+                FosterwxTaskSchedule save = new FosterwxTaskSchedule();
+                save.setErrMsg(fosterwxTaskSchedule.getErrMsg());
+                if (!fosterwxTaskSchedule.getTaskStatus().equals(0)){
+                    save.setTaskStatus(fosterwxTaskSchedule.getTaskStatus());
+                }
                 //.更新
-                fosterwxTaskScheduleService.update(fosterwxTaskSchedule, new QueryWrapper<FosterwxTaskSchedule>()
+                fosterwxTaskScheduleService.update(save, new QueryWrapper<FosterwxTaskSchedule>()
                         .eq("station_id", fosterwxTaskSchedule.getStationId())
                         .eq("task_id", fosterwxTaskSchedule.getTaskId())
                 );