电压修改和线路查询 杆塔查询

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

@@ -1,18 +1,27 @@
 package com.shxy.xymanager_admin.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.shxy.xymanager_common.annotation.Log;
 import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
 import com.shxy.xymanager_common.entity.DyLevel;
+import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals;
+import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_TerminalsExample;
+import com.shxy.xymanager_common.enums.CommonStatus;
 import com.shxy.xymanager_common.model.DyLineTreeListModel;
 import com.shxy.xymanager_common.model.TerminalPhotosModel;
+import com.shxy.xymanager_common.page.PageUtils;
+import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
-import com.shxy.xymanager_common.vo.DyListVo;
+import com.shxy.xymanager_common.vo.*;
-import com.shxy.xymanager_common.vo.DyTreeListVo;
+import com.shxy.xymanager_dao.dao.View_Dy_Line_Tower_TerminalsDao;
-import com.shxy.xymanager_common.vo.LastTowerVo;
 import com.shxy.xymanager_service.service.DyLevelService;
+import com.shxy.xymanager_service.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -39,6 +48,12 @@ public class DyLevelController extends BaseController {
     @Autowired
     DyLevelService dyLevelService;
 
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao;
+
     @ApiOperation(value = "增加电压", notes = "增加电压", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/add")
@@ -56,7 +71,7 @@ public class DyLevelController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/delete")
     @Log(title = "删除电压", type = "查询")
-    public ResponseReult<String> deleteDy(@Validated @NotNull(message = "id不能为空!") Integer vo) {
+    public ResponseReult<String> deleteDy(@RequestBody @Validated LineIdVo vo) {
         ServiceBody<String> serviceBody = dyLevelService.delete(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
@@ -82,8 +97,8 @@ public class DyLevelController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/listAll")
     @Log(title = "查询电压", type = "查询")
-    public ResponseReult<List<DyLevel>> listAll() {
+    public ResponseReult<TableDataInfo<DyLevel>> listAll(@RequestBody @Validated SelectVo vo) {
-        ServiceBody<List<DyLevel>> serviceBody = dyLevelService.listAll();
+        ServiceBody<TableDataInfo<DyLevel>> serviceBody = dyLevelService.listAll(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

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

@@ -55,6 +55,20 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
+//    @ApiOperation(value = "告警划线", notes = "告警划线", httpMethod = "POST")
+//    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+//    @RequestMapping("/takeAlarm")
+//    @Log(title = "告警划线", type = "查询")
+//    public ResponseReult<TakePIcModel> takeAlarm(@Validated TerminalPhotoVo vo) {
+//        ServiceBody<TakePIcModel> serviceBody = terminalPhotoService.takeAlarm(vo);
+//        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+//            return ResponseReult.success(serviceBody.getData());
+//        } else {
+//            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+//        }
+//    }
+
+
     @ApiOperation(value = "主动拍照下发状态查询", notes = "主动拍照下发状态查询接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getTakePicStatus")

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelCoordinateDto.java

@@ -8,7 +8,6 @@ import lombok.Data;
 @Data
 public class TermChannelCoordinateDto {
 
-
     private float x1;
 
     private float x2;
@@ -17,5 +16,4 @@ public class TermChannelCoordinateDto {
 
     private float y1;
 
-
 }

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

@@ -28,6 +28,10 @@ public class View_Dy_Line_Tower_Terminals implements Serializable {
     @ApiModelProperty(value = "电压编号", example = "123456")
     private String dyName;
 
+    private Date dyCreateTime;
+
+    private Date dyUpdateTime;
+
     @ApiModelProperty(value = "线路编号", example = "123456")
     private Integer lineId;
 

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

@@ -331,6 +331,126 @@ public class View_Dy_Line_Tower_TerminalsExample {
             return (Criteria) this;
         }
 
+        public Criteria andDyCreateTimeIsNull() {
+            addCriterion("dy_create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeIsNotNull() {
+            addCriterion("dy_create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeEqualTo(Date value) {
+            addCriterion("dy_create_time =", value, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeNotEqualTo(Date value) {
+            addCriterion("dy_create_time <>", value, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeGreaterThan(Date value) {
+            addCriterion("dy_create_time >", value, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("dy_create_time >=", value, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeLessThan(Date value) {
+            addCriterion("dy_create_time <", value, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("dy_create_time <=", value, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeIn(List<Date> values) {
+            addCriterion("dy_create_time in", values, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeNotIn(List<Date> values) {
+            addCriterion("dy_create_time not in", values, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("dy_create_time between", value1, value2, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("dy_create_time not between", value1, value2, "dyCreateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeIsNull() {
+            addCriterion("dy_update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeIsNotNull() {
+            addCriterion("dy_update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeEqualTo(Date value) {
+            addCriterion("dy_update_time =", value, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeNotEqualTo(Date value) {
+            addCriterion("dy_update_time <>", value, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeGreaterThan(Date value) {
+            addCriterion("dy_update_time >", value, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("dy_update_time >=", value, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeLessThan(Date value) {
+            addCriterion("dy_update_time <", value, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("dy_update_time <=", value, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeIn(List<Date> values) {
+            addCriterion("dy_update_time in", values, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeNotIn(List<Date> values) {
+            addCriterion("dy_update_time not in", values, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("dy_update_time between", value1, value2, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("dy_update_time not between", value1, value2, "dyUpdateTime");
+            return (Criteria) this;
+        }
+
         public Criteria andLineIdIsNull() {
             addCriterion("line_id is null");
             return (Criteria) this;

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

@@ -28,6 +28,11 @@ public class TowerListModel implements Serializable {
 
     @Data
     public static class TowerBean {
+        @ApiModelProperty(value = "电压编号", example = "123456")
+        private Integer dyid;
+
+        @ApiModelProperty(value = "电压名称", example = "123456")
+        private String dyname;
 
         @ApiModelProperty(value = "杆塔编号", example = "123456")
         private Integer id;

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/SelectVo.java

@@ -12,6 +12,12 @@ import javax.validation.constraints.Min;
 @ApiModel(value = "杆塔和线路模糊查询对象", description = "杆塔和线路模糊查询对象")
 public class SelectVo {
 
+    @ApiModelProperty(value = "电压id", example = "电压id")
+    private Integer dyId;
+
+    @ApiModelProperty(value = "线路id", example = "线路id")
+    private Integer lineId;
+
     @ApiModelProperty(value = "搜索内容", example = "搜索内容字段")
     private String search;
 
@@ -22,4 +28,5 @@ public class SelectVo {
     @Min(value = 1, message = "分页大小最小为1")
     @ApiModelProperty(value = "分页大小", required = true, example = "1")
     private int pagesize;
+
 }

xymanager_dao/src/main/resources/generatorConfig.xml

@@ -122,12 +122,12 @@
 <!--                    &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
 <!--                </table>-->
 
-<!--        <table tableName="v_dy_line_tower_terminals"-->
+        <table tableName="v_dy_line_tower_terminals"
-<!--               domainObjectName="View_Dy_Line_Tower_Terminals"-->
+               domainObjectName="View_Dy_Line_Tower_Terminals"
-<!--               mapperName="View_Dy_Line_Tower_TerminalsDao"-->
+               mapperName="View_Dy_Line_Tower_TerminalsDao"
-<!--        >-->
+        >
-<!--            &lt;!&ndash;            <property name="useActualColumnNames" value="false"/>&ndash;&gt;-->
+            <!--            <property name="useActualColumnNames" value="false"/>-->
-<!--        </table>-->
+        </table>
 
 
 <!--        <table tableName="terminal_channel_mapper"-->

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

@@ -1,6 +1,8 @@
 package com.shxy.xymanager_service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceBody;
@@ -11,9 +13,12 @@ import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.DyLineTreeListModel;
 import com.shxy.xymanager_common.model.TerminalPhotosModel;
 import com.shxy.xymanager_common.page.PageUtils;
+import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.util.xinyin.TerminalUtils;
 import com.shxy.xymanager_common.vo.DyTreeListVo;
 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.DyLevelService;
@@ -25,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -304,13 +310,21 @@ public class DyLevelServiceImpl implements DyLevelService {
 
     @Override
     public ServiceBody<String> add(DyLevel vo) {
+        vo.setCreateTime(new Date());
         dyLevelDao.insertSelective(vo);
         return Asserts.success("success");
     }
 
     @Override
-    public ServiceBody<String> delete(Integer vo) {
+    public ServiceBody<String> delete(LineIdVo vo) {
-        dyLevelDao.deleteByPrimaryKey(vo);
+        List<Integer> list = vo.getList();
+        if (CollectionUtil.isNotEmpty(list)) {
+            DyLevelExample example = new DyLevelExample();
+            example.createCriteria().andIdIn(list);
+            dyLevelDao.deleteByExample(example);
+        } else {
+            Asserts.fail("删除编号不能缺少");
+        }
         return Asserts.success("success");
     }
 
@@ -321,10 +335,76 @@ public class DyLevelServiceImpl implements DyLevelService {
     }
 
     @Override
-    public ServiceBody<List<DyLevel>> listAll() {
+    public ServiceBody<TableDataInfo<DyLevel>> listAll(SelectVo vo) {
-        DyLevelExample example = new DyLevelExample();
+        TableDataInfo<DyLevel> model = new TableDataInfo<>();
-        List<DyLevel> dyLevels = dyLevelDao.selectByExample(example);
+        String search = vo.getSearch();
-        return Asserts.success(dyLevels);
+        int pageindex = vo.getPageindex();
+        int pagesize = vo.getPagesize();
+        Integer dyid = vo.getDyId();
+
+        PermissionDetail permissionListOver = userService.getPermissionList();
+        List<Integer> dypList = permissionListOver.getDypList();
+        List<Integer> linepList = permissionListOver.getLinepList();
+        List<Integer> towerpList = permissionListOver.getTowerpList();
+        List<Integer> termpList = permissionListOver.getTermpList();
+
+        View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
+        example.setGroupByClause("dy_id");
+        example.setOrderByClause("dy_id desc");
+        if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
+            View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+            if (CollectionUtil.isNotEmpty(dypList)) {
+                criteria.andDyIdIn(dypList);
+            }
+            if (CollectionUtil.isNotEmpty(linepList)) {
+                criteria.andLineIdIn(linepList);
+            }
+            if (CollectionUtil.isNotEmpty(towerpList)) {
+                criteria.andTowerIdIn(towerpList);
+            }
+            if (CollectionUtil.isNotEmpty(termpList)) {
+                criteria.andLineIdIn(termpList);
+            }
+        }
+        if (StrUtil.isEmpty(search)) {
+            search = null;
+        } else {
+            search = "%" + search + "%";
+        }
+        if (StrUtil.isNotEmpty(search)) {
+            View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
+            or.andDyNameLike(search);
+        }
+        if (BeanUtil.isNotEmpty(dyid) && dyid.intValue() != -1) {
+            View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
+            or2.andDyIdEqualTo(dyid);
+        }
+
+        PageUtils.SetPage(pageindex, pagesize);
+        List<View_Dy_Line_Tower_Terminals> list = view_dy_line_tower_terminalsDao.selectByPermission(example);
+        ArrayList<DyLevel> dylist = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(list)) {
+            for (View_Dy_Line_Tower_Terminals item : list) {
+                DyLevel bean = new DyLevel();
+                bean.setId(item.getDyId());
+                bean.setName(item.getDyName());
+                bean.setCreateTime(item.getDyCreateTime());
+                bean.setUpdateTime(item.getDyUpdateTime());
+                dylist.add(bean);
+            }
+        }
+        model.setList(dylist);
+        TableDataInfo pageData = PageUtils.getDataTable(list);
+        int currentpage = pageData.getCurrentpage();
+        model.setCurrentpage(currentpage);
+        long total = pageData.getTotal();
+        model.setTotal(total);
+
+        int pageSize = pageData.getPagesize();
+        model.setPagesize(pageSize);
+        int pages = pageData.getTotalpage();
+        model.setTotalpage(pages);
+        return Asserts.success(model);
     }
 
 }

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

@@ -72,9 +72,10 @@ public class LineServiceImpl implements LineService {
     @Override
     public ServiceBody<TableDataInfo<Lines>> getLineList(SelectVo vo) {
         TableDataInfo model = new TableDataInfo();
+        String search = vo.getSearch();
+        Integer dyid = vo.getDyId();
         PermissionDetail permissionListOver = userService.getPermissionListOver();
         List<Integer> pList = permissionListOver.getLinepList();
-        String search = vo.getSearch();
         if (StrUtil.isEmpty(search)) {
             search = null;
         } else {
@@ -91,6 +92,12 @@ public class LineServiceImpl implements LineService {
                 criteria.andLineIdIn(pList);
             }
         }
+
+        if (BeanUtil.isNotEmpty(dyid) && dyid.intValue() != -1) {
+            View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
+            or2.andDyIdEqualTo(dyid);
+        }
+
         if (StrUtil.isNotBlank(search)) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
             or.andLineNameLike(search);

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

@@ -68,29 +68,59 @@ public class TowerServiceImpl implements TowerService {
     @Override
     public ServiceBody<TowerListModel> getTowerList(SelectVo vo) {
         TowerListModel model = new TowerListModel();
-        PermissionDetail permissionListOver = userService.getPermissionListOver();
-        List<Integer> towerpList = permissionListOver.getTowerpList();
         String search = vo.getSearch();
+        Integer dyid = vo.getDyId();
+        Integer lineId = vo.getLineId();
+        int pageindex = vo.getPageindex();
+        int pagesize = vo.getPagesize();
         if (StrUtil.isEmpty(search)) {
             search = null;
         } else {
             search = "%" + search + "%";
         }
-        int pageindex = vo.getPageindex();
+        PermissionDetail permissionListOver = userService.getPermissionList();
-        int pagesize = vo.getPagesize();
+        List<Integer> dypList = permissionListOver.getDypList();
+        List<Integer> linepList = permissionListOver.getLinepList();
+        List<Integer> towerpList = permissionListOver.getTowerpList();
+        List<Integer> termpList = permissionListOver.getTermpList();
+
         View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
         example.setGroupByClause("tower_id");
-        example.setOrderByClause("id desc");
+        example.setOrderByClause("tower_id desc");
-        View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
         if (CommonStatus.DELETE.value().equals(permissionListOver.getIsSuper())) {
-            criteria.andTowerIdIn(towerpList);
+            View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+            if (CollectionUtil.isNotEmpty(dypList)) {
+                criteria.andDyIdIn(dypList);
+            }
+            if (CollectionUtil.isNotEmpty(linepList)) {
+                criteria.andLineIdIn(linepList);
+            }
+            if (CollectionUtil.isNotEmpty(towerpList)) {
+                criteria.andTowerIdIn(towerpList);
+            }
+            if (CollectionUtil.isNotEmpty(termpList)) {
+                criteria.andLineIdIn(termpList);
+            }
         }
-        if (StrUtil.isNotBlank(search)) {
+        if (StrUtil.isEmpty(search)) {
+            search = null;
+        } else {
+            search = "%" + search + "%";
+        }
+        if (StrUtil.isNotEmpty(search)) {
             View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
             or.andTowerNameLike(search);
-            or.andLineNameLike(search);
             or.andAddressLike(search);
         }
+        if (BeanUtil.isNotEmpty(dyid) && dyid.intValue() != -1) {
+            View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
+            or2.andDyIdEqualTo(dyid);
+        }
+
+        if (BeanUtil.isNotEmpty(lineId) && lineId.intValue() != -1) {
+            View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or();
+            or2.andLineIdEqualTo(lineId);
+        }
         PageUtils.SetPage(pageindex, pagesize);
         List<View_Dy_Line_Tower_Terminals> list = view_dy_line_tower_terminalsDao.selectByPermission(example);
         boolean empty = CollectionUtil.isEmpty(list);
@@ -100,6 +130,8 @@ public class TowerServiceImpl implements TowerService {
             ArrayList<TowerListModel.TowerBean> list1 = new ArrayList<>();
             for (View_Dy_Line_Tower_Terminals item : list) {
                 TowerListModel.TowerBean towerBean = new TowerListModel.TowerBean();
+                towerBean.setDyid(item.getDyId());
+                towerBean.setDyname(item.getDyName());
                 towerBean.setId(item.getTowerId());
                 towerBean.setLineId(item.getLineId());
                 towerBean.setLineName(item.getLineName());

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

@@ -74,7 +74,9 @@ public class UploadServiceImpl implements UploadService {
         int pageindex = vo.getPageindex();
         int pagesize = vo.getPagesize();
         PageUtils.SetPage(pageindex, pagesize);
-        List<TerminalUpload> list = terminalUploadDao.selectByExample(new TerminalUploadExample());
+        TerminalUploadExample example = new TerminalUploadExample();
+        example.setOrderByClause("id desc");
+        List<TerminalUpload> list = terminalUploadDao.selectByExample(example);
         if (CollectionUtil.isNotEmpty(list)) {
             for (TerminalUpload item : list) {
                 item.setPath(path+item.getPath());

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

@@ -4,8 +4,11 @@ import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.entity.DyLevel;
 import com.shxy.xymanager_common.model.DyLineTreeListModel;
 import com.shxy.xymanager_common.model.TerminalPhotosModel;
+import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.vo.DyTreeListVo;
 import com.shxy.xymanager_common.vo.LastTowerVo;
+import com.shxy.xymanager_common.vo.LineIdVo;
+import com.shxy.xymanager_common.vo.SelectVo;
 
 import java.util.List;
 
@@ -48,10 +51,10 @@ public interface DyLevelService {
 
     ServiceBody<String> add(DyLevel vo);
 
-    ServiceBody<String> delete(Integer vo);
+    ServiceBody<String> delete(LineIdVo vo);
 
     ServiceBody<String> update(DyLevel vo);
 
-    ServiceBody<List<DyLevel>> listAll();
+    ServiceBody<TableDataInfo<DyLevel>> listAll(SelectVo vo);
 
 }