feat: 查询活动拆分详细和简易的方法

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ActivityController.java

@@ -28,8 +28,8 @@ public class ActivityController extends BaseController {
     @GetMapping("listAll")
     @ApiOperation("查询全部列表")
     @Log(title = "查询活动全部列表", type = "查询")
-    public ResponseReult<List<MntnActivities>> listAll() {
-        List<MntnActivities> result = service.listAll(null);
+    public ResponseReult<List<MntnActivities>> listAll(@RequestParam(value = "simple", required = false) String simple) {
+        List<MntnActivities> result = service.listAll(null, simple);
         return ResponseReult.success(result);
     }
 

xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java

@@ -64,7 +64,7 @@ public class MntnCheckTask {
                     this.checkOne(termId);
                 }
 
-                List<MntnActivities> activityList = activitiesService.listAll((byte) 2);
+                List<MntnActivities> activityList = activitiesService.listAll((byte) 2, "0");
                 for (MntnActivities activity : activityList) {
                     int lostCount = 0;
                     for (Terminals term : activity.getTerms()) {

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/ActivitiesServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -32,12 +33,12 @@ public class ActivitiesServiceImpl implements ActivitiesService {
     @Resource
     TerminalExtService terminalExtService;
     @Resource
-    NewCacheService cacheService;
+    NewCacheService newCacheService;
     @Resource
     TerminalStatusDao terminalStatusDao;
 
     @Override
-    public List<MntnActivities> listAll(Byte status) {
+    public List<MntnActivities> listAll(Byte status, String simple) {
         MntnActivitiesExample example = new MntnActivitiesExample();
         MntnActivitiesExample.Criteria criteria = example.createCriteria();
         if (status != null) {
@@ -45,8 +46,12 @@ public class ActivitiesServiceImpl implements ActivitiesService {
         }
         example.setOrderByClause("id desc");
         List<MntnActivities> list = mapper.selectByExample(example);
+
+        if (!"1".equals(simple)) {
+            HashMap<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
             for (MntnActivities item : list) {
-            this.fillItem(item);
+                this.fillItem(item, terminalMap);
+            }
         }
         return list;
     }
@@ -169,20 +174,20 @@ public class ActivitiesServiceImpl implements ActivitiesService {
         return list;
     }
 
-    private void fillItem(MntnActivities item) {
+    private void fillItem(MntnActivities item, HashMap<Integer, Terminals> terminalMap) {
         MntnActivityTerminalsExample example = new MntnActivityTerminalsExample();
         MntnActivityTerminalsExample.Criteria criteria = example.createCriteria();
         criteria.andActivityIdEqualTo(item.getId());
         List<MntnActivityTerminals> list = terminalsMapper.selectByExample(example);
         List<Terminals> terms = new ArrayList<>();
         for (MntnActivityTerminals r : list) {
-            Terminals t = cacheService.getTerminal(r.getTermId());
+            Terminals t = terminalMap.get(r.getTermId());
             if (t != null) {
                 terms.add(t);
-                Towers tower = cacheService.getTower(t.getTowerId());
+                Towers tower = newCacheService.getTower(t.getTowerId());
                 if (tower != null) {
                     t.setTowerName(tower.getName());
-                    Lines line = cacheService.getLine(tower.getLineid());
+                    Lines line = newCacheService.getLine(tower.getLineid());
                     if (line != null) {
                         t.setLineName(line.getName());
                     }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/ActivitiesService.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 public interface ActivitiesService {
 
-    List<MntnActivities> listAll(Byte status);
+    List<MntnActivities> listAll(Byte status, String simple);
 
     boolean add(MntnActivities item) throws Exception;