获取线路和新增装置接口修改

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

@@ -83,11 +83,11 @@ public class LineController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "线路杆塔通道查询", notes = "线路杆塔通道查询", httpMethod = "POST")
+    @ApiOperation(value = "电压线路杆塔通道查询", notes = "电压线路杆塔通道查询查询", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getLineAndGt")
-    @Log(title = "线路杆塔通道查询", type = "查询")
+    @Log(title = "电压线路杆塔通道查询", type = "查询")
-    public ResponseReult<LineAndGtAndChannelListModel> getLineAndGt(@RequestBody @Validated LineAndGtAndChannelVo vo) {
+    public ResponseReult<LineAndGtAndChannelListModel> getDyLineAndGt(@RequestBody @Validated LineAndGtAndChannelVo vo) {
         ServiceBody<LineAndGtAndChannelListModel> serviceBody = lineService.getLineAndGt(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
@@ -95,5 +95,4 @@ public class LineController extends BaseController {
             return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
         }
     }
-
 }

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

@@ -47,7 +47,10 @@
         select
         <include refid="Base_Column_List"/>
         from `lines`
-        where dy_level_id = #{dyid} and status = #{status}
+        where status = #{status}
+        <if test="dyid != null">
+            and dy_level_id = #{dyid}
+        </if>
     </select>
 
     <insert id="insertList" parameterType="java.util.List">

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

@@ -8,6 +8,7 @@ import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.dto.DyLineAndTerminalDto;
 import com.shxy.xymanager_common.entity.DyLevel;
 import com.shxy.xymanager_common.entity.Lines;
+import com.shxy.xymanager_common.entity.Terminals;
 import com.shxy.xymanager_common.enums.CommonStatus;
 import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.DyLineTreeListModel;
@@ -52,7 +53,10 @@ public class DyLevelServiceImpl implements DyLevelService {
                 for (int j = 0; j < beans.get(i).getList().size(); j++) {
                     for (int k = 0; k < beans.get(i).getList().get(j).getList().size(); k++) {
                         beans.get(i).getList().get(j).getList().get(k).setName(list.get(i).getList().get(j).getList().get(k).getDisplayName());
-                        Long lastheartbeat = list.get(i).getList().get(j).getList().get(k).getLastheartbeat();
+                        Terminals terminals = list.get(i).getList().get(j).getList().get(k);
+                        if (!BeanUtil.isEmpty(terminals)) {
+                            Long lastheartbeat = terminals.getLastheartbeat();
+                            if (!BeanUtil.isEmpty(lastheartbeat)) {
                                 BigInteger time = MyDateUtils.TimeSecond2MillSecond(lastheartbeat);
                                 DateTime date = MyDateUtils.date(time.longValue());
                                 long between = MyDateUtils.between(MyDateUtils.getNowDate(), date, DateUnit.MINUTE);
@@ -64,6 +68,8 @@ public class DyLevelServiceImpl implements DyLevelService {
                             }
                         }
                     }
+                }
+            }
             model.setList(beans);
         }
         return Asserts.success(model);

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

@@ -140,7 +140,7 @@ public class LineServiceImpl implements LineService {
     }
 
     /**
-     * 线路杆塔通道查询
+     * 电压线路杆塔
      *
      * @param vo
      * @return

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

@@ -44,10 +44,11 @@ public interface LineService {
     ServiceBody<String> updateLine(UpdateLineVo vo);
 
     /**
-     * 线路杆塔通道查询
+     * 电压线路杆塔通道查询
      *
      * @param vo
      * @return
      */
     ServiceBody<LineAndGtAndChannelListModel> getLineAndGt(LineAndGtAndChannelVo vo);
+
 }