perf: 优化TerminalMap缓存

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

@@ -31,8 +31,6 @@ public class MntnCheckTask {
     MntnRawReportsMapper rawReportsMapper;
     @Resource
     NewCacheService newCacheService;
-    @Autowired
-    private CacheService cacheService;
 
     private int shutdown = 0;
 
@@ -51,7 +49,7 @@ public class MntnCheckTask {
         if (needCheck) {
             try {
                 log.info("MntnCheckTask.checkAll 开始.");
-                Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+                Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
                 Iterator<Integer> it = terminalMap.keySet().iterator();
                 while (shutdown == 0 && it.hasNext()) {
                     Integer termId = it.next();

xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java

@@ -20,8 +20,6 @@ public class XyCache {
 
         cacheService.updateLineMap();
 
-        cacheService.updateTerminalMap();
-
         cacheService.updateTermChannelMap();
 
         cacheService.updateTowerMap();

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

@@ -119,17 +119,6 @@ public class CacheServiceImpl implements CacheService {
         return towerMap;
     }
 
-    @Override
-    @Cacheable(value = "terminalMap")
-    public Map<Integer, Terminals> getTerminalMap() {
-        Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
-        List<Terminals> termslist = terminalsDao.selectByExample(new TerminalsExample());
-        for (Terminals item : termslist) {
-            terminalMap.put(item.getId(), item);
-        }
-        return terminalMap;
-    }
-
     @Override
     @Cacheable(value = "lineMap")
     public Map<Integer, Lines> getLineMap() {
@@ -255,17 +244,6 @@ public class CacheServiceImpl implements CacheService {
         return towerMap;
     }
 
-    @Override
-    @CachePut(value = "terminalMap")
-    public Map<Integer, Terminals> updateTerminalMap() {
-        Map<Integer, Terminals> terminalMap = new HashMap<Integer, Terminals>();
-        List<Terminals> termslist = terminalsDao.selectByExample(new TerminalsExample());
-        for (Terminals item : termslist) {
-            terminalMap.put(item.getId(), item);
-        }
-        return terminalMap;
-    }
-
     @Override
     @CachePut(value = "lineMap")
     public Map<Integer, Lines> updateLineMap() {

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

@@ -20,15 +20,13 @@ import com.shxy.xymanager_common.vo.LastTowerVo;
 import com.shxy.xymanager_common.vo.LineIdVo;
 import com.shxy.xymanager_common.vo.SelectVo;
 import com.shxy.xymanager_dao.dao.*;
-import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.*;
-import com.shxy.xymanager_service.service.DyLevelService;
-import com.shxy.xymanager_service.service.RoleService;
-import com.shxy.xymanager_service.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Date;
@@ -74,6 +72,8 @@ public class DyLevelServiceImpl implements DyLevelService {
 
     @Autowired
     CacheService cacheService;
+    @Resource
+    NewCacheService newCacheService;
 
     @Autowired
     RoleService roleService;
@@ -271,7 +271,7 @@ public class DyLevelServiceImpl implements DyLevelService {
                     }
                     Map<Integer, Lines> lineMap = cacheService.getLineMap();
                     Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
-                    Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+                    Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
                     Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
                     Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
                     List<TerminalPhoto> photoList = terminalPhotoDao.selectPhotosByIdList(photolist);

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

@@ -225,10 +225,20 @@ public class NewCacheServiceImpl implements NewCacheService {
     }
 
     @Override
-    @Cacheable(value = "cacheTerminal", key = "#termId")
     public Terminals getTerminal(Integer termId) {
-        Terminals terminal = terminalsDao.selectByPrimaryKey(termId);
+        HashMap<Integer, Terminals> map = this.getTerminalMap();
-        return terminal;
+        return map.get(termId);
+    }
+
+    @Override
+    @Cacheable(value = "cacheTerminalMap")
+    public HashMap<Integer, Terminals> getTerminalMap() {
+        List<Terminals> termList = terminalsDao.selectByExample(new TerminalsExample());
+        HashMap<Integer, Terminals> map = new HashMap<>();
+        for (Terminals item : termList) {
+            map.put(item.getId(), item);
+        }
+        return map;
     }
 
     @Override

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

@@ -25,11 +25,13 @@ import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_dao.dao.RequestResultsDao;
 import com.shxy.xymanager_dao.dao.TerminalResolutionDao;
 import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.TermSetService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotEmpty;
 import java.util.ArrayList;
 import java.util.List;
@@ -50,6 +52,8 @@ public class TermSetServiceImpl implements TermSetService {
 
     @Autowired
     private CacheService cacheService;
+    @Resource
+    NewCacheService newCacheService;
 
     @Autowired
     private RequestResultsDao requestResultsDao;
@@ -88,7 +92,7 @@ public class TermSetServiceImpl implements TermSetService {
         Integer termId = vo.getTermId();
         Integer channelId = vo.getChannelId();
         Integer type = vo.getType();
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Terminals terminals = terminalMap.get(termId);
         String cmdid = null;
         if (terminals != null) {
@@ -112,7 +116,7 @@ public class TermSetServiceImpl implements TermSetService {
         CmaRequestModel model = new CmaRequestModel();
         List<TermCtrlVo.CtrlBean> list = vo.getList();
         Integer termId = vo.getTermId();
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Terminals terminals = terminalMap.get(termId);
         String cmdid = null;
         if (terminals != null) {

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

@@ -22,12 +22,14 @@ import com.shxy.xymanager_common.vo.UpdateTerminalAlarmParamsVo;
 import com.shxy.xymanager_common.vo.WeekAlarmVo;
 import com.shxy.xymanager_dao.dao.*;
 import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.TerminalAlarmService;
 import com.shxy.xymanager_service.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.math.BigInteger;
 import java.util.*;
@@ -56,6 +58,8 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
 
     @Autowired
     private CacheService cacheService;
+    @Resource
+    NewCacheService newCacheService;
 
     @Autowired
     private UserService userService;
@@ -173,7 +177,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService {
 
         if (CollectionUtil.isNotEmpty(list)) {
 
-            Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+            Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
             Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
             Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
             Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();

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

@@ -24,11 +24,13 @@ import com.shxy.xymanager_dao.dao.TerminalChannelsDao;
 import com.shxy.xymanager_dao.dao.TerminalPhotoDao;
 import com.shxy.xymanager_dao.dao.TerminalStatusDao;
 import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.TerminalChannelService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -55,6 +57,8 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
 
     @Autowired
     CacheService cacheService;
+    @Resource
+    NewCacheService newCacheService;
 
     /**
      * 新增通道列表
@@ -181,7 +185,7 @@ public class TerminalChannelServiceImpl implements TerminalChannelService {
         if (termId != null) {
             model.setTermId(termId);
         }
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
         Map<Integer, Lines> lineMap = cacheService.getLineMap();
         if (terminalMap != null) {

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

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.IOException;
@@ -78,7 +79,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @Autowired
     TerminalScheduleRuleService terminalScheduleRuleService;
 
-    @Autowired
+    @Resource
     NewCacheService newCacheService;
 
     @Autowired
@@ -512,7 +513,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
             if (empty) {
                 model.setList(new ArrayList<>());
             } else {
-                Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+                Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
                 Map<Integer, Lines> lineMap = cacheService.getLineMap();
                 Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
                 Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
@@ -650,7 +651,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         Integer channel = vo.getChannel();
         Integer preset = vo.getPreset();
         Integer captureType = vo.getCaptureType();
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Terminals terminals = terminalMap.get(termId);
         String cmdid = null;
         if (terminals != null) {
@@ -772,7 +773,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
             }
             Map<Integer, Lines> lineMap = cacheService.getLineMap();
             Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
-            Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+            Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
             Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();
             Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
             List<TerminalPhoto> photoList = new ArrayList<>();
@@ -816,7 +817,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<GetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Terminals terminals = terminalMap.get(vo.getTermId());
         String cmdid = terminals.getCmdid();
         GetModel model = new GetModel();
@@ -888,7 +889,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         if (empty) {
             model.setList(new ArrayList<>());
         } else {
-            Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+            Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
             Map<Integer, Lines> lineMap = cacheService.getLineMap();
             Map<Integer, TowerDto> towerMap = cacheService.getTowerMap();
             Map<Integer, TerminalChannels> termchannelMap = cacheService.getTermChannelMap();

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

@@ -23,6 +23,7 @@ import com.shxy.xymanager_common.util.xinyin.ScheduleListUtils;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_dao.dao.*;
 import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.NewCacheService;
 import com.shxy.xymanager_service.service.TerminalScheduleRuleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.*;
@@ -64,6 +66,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
 
     @Autowired
     CacheService cacheService;
+    @Resource
+    NewCacheService newCacheService;
 
     @Value("${cma.clientid}")
     public int clientid;
@@ -247,7 +251,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
 //            return Asserts.error("没有该拍照时间规则");
 //        }
 
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
         for (int i = 0; i < termlist.size(); i++) {
             ArrayList<TerminalSchedulesTemp> templist = new ArrayList<>();

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

@@ -28,10 +28,7 @@ import com.shxy.xymanager_common.util.StringUtils;
 import com.shxy.xymanager_common.util.xinyin.TerminalUtils;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_dao.dao.*;
-import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.*;
-import com.shxy.xymanager_service.service.TerminalService;
-import com.shxy.xymanager_service.service.TowerService;
-import com.shxy.xymanager_service.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +36,7 @@ import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -88,6 +86,8 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Autowired
     CacheService cacheService;
+    @Resource
+    NewCacheService newCacheService;
 
     @Autowired
     View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao;
@@ -250,7 +250,7 @@ public class TerminalServiceImpl implements TerminalService {
      * @return
      */
     @Override
-    @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree"}, allEntries = true)
+    @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree", "cacheTerminalMap"}, allEntries = true)
     public ServiceBody<String> addTerminal(TerminalVo vo) {
         String cmdId = vo.getCmdid();
         Terminals terminals = new Terminals();
@@ -279,7 +279,6 @@ public class TerminalServiceImpl implements TerminalService {
             }
             terminalChannelMapperDao.insertList(list);
         }
-        cacheService.updateTerminalMap();
         cacheService.updateTermAndChannelMap();
         cacheService.updateTermChannelMapMap();
         if (i != 0) {
@@ -296,7 +295,7 @@ public class TerminalServiceImpl implements TerminalService {
      * @return
      */
     @Override
-    @CacheEvict(cacheNames = {"fulltree", "cacheTerminal"}, allEntries = true)
+    @CacheEvict(cacheNames = {"fulltree", "cacheTerminalMap"}, allEntries = true)
     public ServiceBody<String> updateTerminal(UpdateTerminalVo vo) {
         Integer termid = vo.getId();
         List<UpdateTerminalVo.Item> channelId = vo.getList();
@@ -325,7 +324,6 @@ public class TerminalServiceImpl implements TerminalService {
                 terminalChannelMapperDao.insertList(list);
             }
         }
-        cacheService.updateTerminalMap();
         cacheService.updateTermAndChannelMap();
         cacheService.updateTermChannelMapMap();
         if (i != 0) {
@@ -342,7 +340,7 @@ public class TerminalServiceImpl implements TerminalService {
      * @return
      */
     @Override
-    @CacheEvict(cacheNames = {"fulltree", "cacheTerminal"}, allEntries = true)
+    @CacheEvict(cacheNames = {"fulltree", "cacheTerminalMap"}, allEntries = true)
     public ServiceBody<String> deleteTerminal(TerminalIdListVo vo) {
         List<Integer> list = vo.getList();
         if (CollectionUtil.isEmpty(list)) {
@@ -352,7 +350,6 @@ public class TerminalServiceImpl implements TerminalService {
         example.createCriteria().andIdIn(list);
         int i = terminalsDao.deleteByExample(example);
         if (i != 0) {
-            cacheService.updateTerminalMap();
             return Asserts.success("删除成功");
         } else {
             return Asserts.error("删除失败");
@@ -406,7 +403,7 @@ public class TerminalServiceImpl implements TerminalService {
         TerminalStatus bean = terminalStatusDao.selectByPrimaryKey(termId);
         Boolean hasNew = false;
         if (BeanUtil.isNotEmpty(bean)) {
-            Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+            Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
             Terminals terminals = terminalMap.get(termId);
             if (BeanUtil.isNotEmpty(terminals)) {
                 model.setCmId(terminals.getCmdid());
@@ -429,7 +426,7 @@ public class TerminalServiceImpl implements TerminalService {
     }
 
     @Override
-    @CacheEvict(value = "fulltree")
+    @CacheEvict(cacheNames = {"fulltree", "cacheTerminalMap"}, allEntries = true)
     public ServiceBody<TerminalUpdateModel> updateTerminalId(TerminalIdUpdateVo vo) {
         TerminalUpdateModel model = new TerminalUpdateModel();
         Integer termId = vo.getTermId();
@@ -448,7 +445,6 @@ public class TerminalServiceImpl implements TerminalService {
         record.setCmdid(newCmdId);
         int result = terminalsDao.updateByPrimaryKeySelective(record);
         if (result > 0) {
-            cacheService.updateTerminalMap();
             return Asserts.success(model);
         } else {
             return Asserts.error("装置ID修改失败");
@@ -608,7 +604,7 @@ public class TerminalServiceImpl implements TerminalService {
         TerminalStatusInfoModel model = new TerminalStatusInfoModel();
         TerminalStatus bean = terminalStatusDao.selectByPrimaryKey(termId);
         if (!BeanUtil.isEmpty(bean)) {
-            Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+            Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
             Terminals terminals = terminalMap.get(termId);
             if (BeanUtil.isNotEmpty(terminals)) {
                 model.setCmId(terminals.getCmdid());
@@ -845,7 +841,7 @@ public class TerminalServiceImpl implements TerminalService {
      */
     @Override
     public ServiceBody<TableDataInfo<TerminalFaults>> getTermFaults(TermFaultsVo vo) {
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Integer termid = vo.getTermid();
         Integer pageindex = vo.getPageindex();
         Integer pagesize = vo.getPagesize();
@@ -876,7 +872,7 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Override
     public ServiceBody<TableDataInfo<TerminalWorkingStatusHistory>> getWorkingStatusHistory(TermFaultsVo vo) {
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Integer termid = vo.getTermid();
         Integer pageindex = vo.getPageindex();
         Integer pagesize = vo.getPagesize();
@@ -913,7 +909,7 @@ public class TerminalServiceImpl implements TerminalService {
      */
     @Override
     public ServiceBody<TableDataInfo<TerminalRunningStatusHistory>> getTermRunningHistory(TermFaultsVo vo) {
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Integer termid = vo.getTermid();
         Integer pageindex = vo.getPageindex();
         Integer pagesize = vo.getPagesize();
@@ -944,7 +940,7 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Override
     public ServiceBody<TableDataInfo<TerminalPositionHistory>> getTermGpsHistory(TermFaultsVo vo) {
-        Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
+        Map<Integer, Terminals> terminalMap = newCacheService.getTerminalMap();
         Integer termid = vo.getTermid();
         Integer pageindex = vo.getPageindex();
         Integer pagesize = vo.getPagesize();

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

@@ -41,8 +41,6 @@ public interface CacheService {
 
     Map<Integer, TowerDto> getTowerMap();
 
-    Map<Integer, Terminals> getTerminalMap();
-
     Map<Integer, Lines> getLineMap();
 
     Map<Integer, TerminalChannels> updateTermChannelMap();
@@ -51,7 +49,5 @@ public interface CacheService {
 
     Map<Integer, TowerDto> updateTowerMap();
 
-    Map<Integer, Terminals> updateTerminalMap();
-
     Map<Integer, Lines> updateLineMap();
 }

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

@@ -8,6 +8,7 @@ import com.shxy.xymanager_common.entity.Terminals;
 import com.shxy.xymanager_common.entity.Towers;
 import com.shxy.xymanager_common.model.StatTerm;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface NewCacheService {
@@ -26,6 +27,8 @@ public interface NewCacheService {
 
     Terminals getTerminal(Integer termId);
 
+    HashMap<Integer, Terminals> getTerminalMap();
+
     StatTerm getOneDayStat(Integer termId, Long start);
 
     void clearOneDayStat();