sss

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

@@ -11,4 +11,7 @@ public interface LzEverydayRepository extends JpaPlusRepository<LzEveryday, Inte
 
     List<LzEveryday> findAllByTreeIdAndCreateDateBetweenOrderByCreateDateAsc(Integer treeId, Date start, Date end);
 
+    @Query(value = "from  LzEveryday where createDate = '2023-03-20'")
+    List<LzEveryday> findAllByTreeIdOrderByCreateDateDesc();
+
 }

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

@@ -30,6 +30,10 @@ public class LzEverydayService extends BaseService<LzEveryday, Integer> {
     private LzTreeService lzTreeService;
 
 
+    public List<LzEveryday> findAllBy(){
+        return lzEverydayRepository.findAllByTreeIdOrderByCreateDateDesc();
+    }
+
     public List<LzEveryday> findListByTreeId(Integer treeId, Date startDate , Date endDate){
         List<LzEveryday> lzEverydayList = lzEverydayRepository.findAllByTreeIdAndCreateDateBetweenOrderByCreateDateAsc(treeId, startDate, endDate);
         lzEverydayList.forEach(lzEveryday -> {
@@ -44,12 +48,12 @@ public class LzEverydayService extends BaseService<LzEveryday, Integer> {
     public void testDataByImg() throws ParseException {
         File file = new File("E:\\BaiduNetdiskDownload\\荔枝系统数据\\iconData");
         for(File yDir : file.listFiles()){
-            String createDateStr = yDir.getName();
+            String yy = yDir.getName();
             for(File mDir : yDir.listFiles()){
-                createDateStr += "/"+mDir.getName();
+                String mm = "/"+mDir.getName();
                 for(File dDir : mDir.listFiles()){
-                    createDateStr += "/" + dDir.getName();
-
+                    String dd = "/" + dDir.getName();
+                    String createDateStr = yy + mm + dd;
                     for(File codeDir : dDir.listFiles()) {
                         LzEveryday bean = new LzEveryday();
                         LzTree lzTree = lzTreeService.findByCode(codeDir.getName());

src/main/java/com/sysu/admin/controller/lz/ns/NsActionRecordRepository.java

@@ -16,6 +16,8 @@ public interface NsActionRecordRepository extends JpaPlusRepository<NsActionReco
     @Query(value = "from NsActionRecord ar where ar.treeId = ?1 and ar.actionId = ?2 and ar.finished = ?3")
     NsActionRecord findAllByTreeIdAndActionId(Integer treeId,Integer actionId, Integer finished);
 
+    List<NsActionRecord> findAllByTaskId(Integer taskId);
+
     @Query(value = "delete from lz_ns_action_record where task_id = ?1",nativeQuery = true)
     @Transactional
     int deleteByTaskId(Integer taskId);

src/main/java/com/sysu/admin/controller/lz/ns/NsActionRecordService.java

@@ -17,11 +17,15 @@ public class NsActionRecordService extends BaseService<NsActionRecord, Integer>
     public List<NsActionRecord> findAllByTreeIds(List<Integer> treeIds,Integer finished){
         return repository.findAllByTreeIds(treeIds, finished);
     }
+    public List<NsActionRecord> findAllByTaskId(Integer taskId){
+        return repository.findAllByTaskId(taskId);
+    }
 
     public NsActionRecord findAllByTreeIdAndActionId(Integer treeId,Integer actionId, Integer finished){
         return repository.findAllByTreeIdAndActionId(treeId, actionId, finished);
     }
 
+
     public void deleteByTaskId(Integer taskId){
         if(taskId == null){
             return;

src/main/java/com/sysu/admin/controller/lz/ns/bean/NsTask.java

@@ -23,7 +23,7 @@ public class NsTask {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
-    private Integer userId;
+    private Long userId;
     private String content;
     private String title;
     private Integer nsTypeId;
@@ -32,5 +32,9 @@ public class NsTask {
     private Integer treeId;
 
     @Transient
+    private String ns;
+    @Transient
+    private String userName;
+    @Transient
     private List<NsActionRecord> recordList = new ArrayList<>();
 }

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

@@ -14,7 +14,7 @@ public class ActionRecordVo {
     private Integer source;
     private Integer typeId;
     private String title;
-    private Integer executor;
+    private Long executor;
 
 
 }

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

@@ -1,8 +1,13 @@
 package com.sysu.admin.controller.lz.ns.site;
 
+import com.sysu.admin.controller.lz.ns.NsActionRecordService;
+import com.sysu.admin.controller.lz.ns.NsActionTreeService;
 import com.sysu.admin.controller.lz.ns.NsTaskService;
 import com.sysu.admin.controller.lz.ns.NsTypeService;
+import com.sysu.admin.controller.lz.ns.bean.NsActionRecord;
+import com.sysu.admin.controller.lz.ns.bean.NsActionTree;
 import com.sysu.admin.controller.lz.ns.bean.NsTask;
+import com.sysu.admin.controller.lz.ns.bean.NsType;
 import com.sysu.admin.controller.lz.ns.site.vo.LzUserVo;
 import com.sysu.admin.site.CommonVo;
 import com.sysu.admin.support.system.user.User;
@@ -18,7 +23,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @RequestMapping("/site/ns_task")
 @RestController
@@ -30,10 +37,37 @@ public class NsTaskController {
     UserRoleService userRoleService;
     @Autowired
     UserService userService;
+    @Autowired
+    private NsActionRecordService nsActionRecordService;
+    @Autowired
+    private NsActionTreeService actionTreeService;
 
     @RequestMapping("/list")
     public BaseResult list(){
-        return R.succ(nsTaskService.findAll(Sort.by("id")));
+        List<NsActionTree> nsActionTrees = actionTreeService.findAll();
+        Map<Integer, NsActionTree> integerNsActionTreeMap =  listToMap(nsActionTrees);
+        List<NsTask> nsTaskList = nsTaskService.findAll(Sort.by("id"));
+
+        nsTaskList.forEach(nsTask -> {
+            nsTask.setRecordList(nsActionRecordService.findAllByTaskId(nsTask.getId()));
+            StringBuffer ns = new StringBuffer();
+            nsTask.getRecordList().stream().forEach(nsActionRecord -> {
+                NsActionTree a = integerNsActionTreeMap.get(nsActionRecord.getActionId());
+                ns.append(a.getName() + ",");
+                nsTask.setNs(ns.toString());
+            });
+
+            User user = userService.findOne(nsTask.getUserId().longValue());
+            nsTask.setUserName(user.getNickname());
+        });
+        return R.succ(nsTaskList);
+    }
+    public Map<Integer, NsActionTree> listToMap(List<NsActionTree> nsActionTrees){
+        Map<Integer, NsActionTree> map = new HashMap<>();
+        nsActionTrees.forEach(nsActionTree -> {
+            map.put(nsActionTree.getId(), nsActionTree);
+        });
+        return map;
     }
 
     @RequestMapping("/user_list")

src/test/java/com/sysu/admin/controller/lz/everyday/LzEverydayServiceTest.java

@@ -2,6 +2,8 @@ package com.sysu.admin.controller.lz.everyday;
 
 import com.sysu.admin.MarkApplication;
 import com.sysu.admin.api.base.BaseTest;
+import com.sysu.admin.controller.lz.tree.LzTree;
+import com.sysu.admin.controller.lz.tree.LzTreeService;
 import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -11,6 +13,7 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.text.ParseException;
+import java.util.List;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = MarkApplication.class)
@@ -19,6 +22,8 @@ public class LzEverydayServiceTest extends BaseTest {
 
     @Autowired
     LzEverydayService everydayService;
+    @Autowired
+    LzTreeService lzTreeService;
     @Test
     public void testTestDataByImg() {
         try {
@@ -27,4 +32,14 @@ public class LzEverydayServiceTest extends BaseTest {
             e.printStackTrace();
         }
     }
+
+    @Test
+    public void test2(){
+        List<LzEveryday> lzEverydays = everydayService.findAllBy();
+        lzEverydays.stream().forEach(bean -> {
+            LzTree lzTree = lzTreeService.findOne(bean.getTreeId());
+            String fileNameBase = everydayService.dateToDir(bean.getCreateDate()) + "/"+ lzTree.getCode() + "/";
+            everydayService.saveImages(bean.getId(), 1, fileNameBase);
+        });
+    }
 }