装置通道线路和删除装置修改

xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java

@@ -1,9 +1,7 @@
 package com.shxy.xymanager_admin;
 
-import com.shxy.xymanager_service.service.DyLevelService;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

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

@@ -18,10 +18,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestBody;

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Terminals.java

@@ -41,6 +41,9 @@ public class Terminals implements Serializable {
 
     private Date updateTime;
 
+    /*展示名字   等价与displayname  用于方便*/
+    private String name;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -62,7 +62,7 @@ public class DyLineAndTermModel implements Serializable {
         private String cmdid;
 
         @ApiModelProperty(value = "显示名", example = "名称名称")
-        private String displayName;
+        private String name;
 
     }
 }

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

@@ -44,7 +44,7 @@
                 <result column="term_id" jdbcType="INTEGER" property="id"/>
                 <result column="tower_id" jdbcType="INTEGER" property="towerid"/>
                 <result column="cmdid" jdbcType="VARCHAR" property="cmdid"/>
-                <result column="display_name" jdbcType="VARCHAR" property="displayName"/>
+                <result column="display_name" jdbcType="VARCHAR" property="name"/>
             </collection>
         </collection>
     </resultMap>

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

@@ -104,10 +104,11 @@
         e.id as channel_id,
         e.channel_name as channel_name
         from
-        ((((terminals a left join `lines` b on a.line_id = b.id and a.status = #{status})
+        ((((terminals a left join `lines` b on a.line_id = b.id )
         left join tower c on a.tower_id = c.id)
         left join terminal_channel_mapper d on a.id = d.term_id)
         left join terminal_channels  e on d.channel_id = e.id)
+        WHERE  a.status = 1
         order by a.create_time desc
     </select>
 

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

@@ -281,6 +281,7 @@ public class TerminalServiceImpl implements TerminalService {
             model.setList(new ArrayList<>());
         } else {
             List<DyLineAndTermModel.DyListBean> beans = BeanUtil.copyToList(list, DyLineAndTermModel.DyListBean.class, CopyOptions.create().ignoreCase());
+
             model.setList(beans);
         }
         return Asserts.success(model);