fix: 修正缓存

xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalChannelMapperListModel.java

@@ -42,6 +42,8 @@ public class TerminalChannelMapperListModel implements Serializable {
         @ApiModelProperty(value = "别名", example = "alias")
         private String alias;
 
+        private Integer type;
+
         @ApiModelProperty(value = "通道编号", example = "123456")
         private Integer channelid;
 

xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml

@@ -15,6 +15,7 @@
         <id column="id" jdbcType="INTEGER" property="id" />
         <result column="termid" jdbcType="INTEGER" property="termid" />
         <result column="alias" jdbcType="VARCHAR" property="alias" />
+        <result column="type" jdbcType="INTEGER" property="type" />
         <result column="channel_id" jdbcType="INTEGER" property="channelid" />
         <result column="channel_name" jdbcType="VARCHAR" property="channelname" />
         <result column="max_resolution_width" jdbcType="INTEGER" property="maxResolutionWidth" />
@@ -348,6 +349,7 @@
         x.id as id,
         x.term_id as termid,
         x.alias as alias,
+        x.type as type,
         x.channel_id as channel_id,
         y.channel_name as channel_name,
         y.max_resolution_width as max_resolution_width,

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

@@ -253,7 +253,7 @@ public class TerminalExtServiceImpl implements TerminalExtService {
     }
 
     @Override
-    @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree", "cacheTerminalMap"}, allEntries = true)
+    @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree", "cacheTerminalMap", "termAndchannelMap"}, allEntries = true)
     public void importTerminal(UploadModel model) {
         Lines line = newCacheService.getLine(model.getLineId());
         if (line == null) {

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

@@ -251,7 +251,7 @@ public class TerminalServiceImpl implements TerminalService {
      * @return
      */
     @Override
-    @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree", "cacheTerminalMap"}, allEntries = true)
+    @CacheEvict(cacheNames = {"permissionfull", "permissionover", "fulltree", "cacheTerminalMap", "termAndchannelMap"}, allEntries = true)
     public ServiceBody<String> addTerminal(TerminalVo vo) {
         String cmdId = vo.getCmdid();
         Terminals terminals = new Terminals();
@@ -270,7 +270,7 @@ public class TerminalServiceImpl implements TerminalService {
         if (CollectionUtil.isNotEmpty(channelId)) {
             List<TerminalChannelMapper> list = new ArrayList<>();
             for (TerminalVo.ChannelItem item : channelId) {
-                if (item.getType() == null){
+                if (item.getType() == null) {
                     item.setType(0);
                 }
                 TerminalChannelMapper record = new TerminalChannelMapper();
@@ -300,7 +300,7 @@ public class TerminalServiceImpl implements TerminalService {
      * @return
      */
     @Override
-    @CacheEvict(cacheNames = {"fulltree", "cacheTerminalMap"}, allEntries = true)
+    @CacheEvict(cacheNames = {"fulltree", "cacheTerminalMap", "termAndchannelMap"}, allEntries = true)
     public ServiceBody<String> updateTerminal(UpdateTerminalVo vo) {
         Integer termid = vo.getId();
         List<UpdateTerminalVo.Item> channelId = vo.getList();
@@ -315,7 +315,7 @@ public class TerminalServiceImpl implements TerminalService {
         if (CollectionUtil.isNotEmpty(channelId)) {
             List<TerminalChannelMapper> list = new ArrayList<>();
             for (UpdateTerminalVo.Item item : channelId) {
-                if (item.getType() == null){
+                if (item.getType() == null) {
                     item.setType(0);
                 }
                 TerminalChannelMapper record = new TerminalChannelMapper();