sss

src/main/java/com/sysu/admin/controller/lz/everyday/LzEveryday.java

@@ -44,7 +44,7 @@ public class LzEveryday {
     private Double whitePoint;
 
     /**
-     * 花叶比
+     * 花叶
      */
     @Column
     private Double flowerLength;

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayRepository.java

@@ -9,6 +9,6 @@ import java.util.List;
 
 public interface LzEverydayRepository extends JpaPlusRepository<LzEveryday, Integer> {
 
-    List<LzEveryday> findAllByTreeIdAndCreateDateBetweenOrderByIdAsc(Integer treeId, Date start, Date end);
+    List<LzEveryday> findAllByTreeIdAndCreateDateBetweenOrderByCreateDateAsc(Integer treeId, Date start, Date end);
 
 }

src/main/java/com/sysu/admin/controller/lz/everyday/LzEverydayService.java

@@ -31,7 +31,7 @@ public class LzEverydayService extends BaseService<LzEveryday, Integer> {
 
 
     public List<LzEveryday> findListByTreeId(Integer treeId, Date startDate , Date endDate){
-        List<LzEveryday> lzEverydayList = lzEverydayRepository.findAllByTreeIdAndCreateDateBetweenOrderByIdAsc(treeId, startDate, endDate);
+        List<LzEveryday> lzEverydayList = lzEverydayRepository.findAllByTreeIdAndCreateDateBetweenOrderByCreateDateAsc(treeId, startDate, endDate);
         lzEverydayList.forEach(lzEveryday -> {
             lzEveryday.setLzEverydayImage(lzEverydayImgService.findAllByEverydayId(lzEveryday.getId()));
         });
@@ -42,7 +42,7 @@ public class LzEverydayService extends BaseService<LzEveryday, Integer> {
      * 根据图片生产测试数据
      */
     public void testDataByImg() throws ParseException {
-        File file = new File("E:\\BaiduNetdiskDownload\\荔枝系统数据\\照片数据");
+        File file = new File("E:\\BaiduNetdiskDownload\\荔枝系统数据\\iconData");
         for(File yDir : file.listFiles()){
             String createDateStr = yDir.getName();
             for(File mDir : yDir.listFiles()){
@@ -62,9 +62,9 @@ public class LzEverydayService extends BaseService<LzEveryday, Integer> {
                         bean.setPartImgUrl(fileNameBase + "part.JPG");
                         bean.setTreeId(lzTree.getId());
                         LzPeriod lzPeriod = new LzPeriod();
-                        lzPeriod.setId((lzTree.getId() % 5) + 1);
+                        lzPeriod.setId(1);
                         bean.setLzPeriod(lzPeriod);
-                        bean.setFlowerLength(Math.random() * 1.5);
+                        bean.setFlowerLength(Math.random() * 30);
                         bean.setFlowerPercent(Math.random());
                         bean.setYield((int)(Math.random() * 500));
                         bean.setWhitePoint(Math.random());

src/main/java/com/sysu/admin/controller/lz/ns/site/NsActionRecordController.java

@@ -87,7 +87,9 @@ public class NsActionRecordController {
             String actionName = integerNsActionTreeMap.get(nsActionRecord.getActionId()).getName();
             nsActionRecord.setActionName(actionName);
             NsTask nsTask = nsTaskMap.get(nsActionRecord.getTaskId().toString());
-            nsTask.getRecordList().add(nsActionRecord);
+            if(nsTask != null){
+                nsTask.getRecordList().add(nsActionRecord);
+            }
         });
     }
 

src/main/java/com/sysu/admin/site/lz/LzTreeController.java

@@ -51,8 +51,8 @@ public class LzTreeController {
                 res.add(lzTree);
 //            }
             lzTree.setPartImgUrl(lzEveryday.getPartImgUrl());
-            lzTree.setPartImgUrl("2023/2/18/2J1/part.JPG");
-            lzTree.setWarning(warning);
+            lzTree.setPartImgUrl("slt/"+lzTree.getCode()+".jpg");
+            lzTree.setWarning(1);
             i++;
         }
         return R.succ(res);