Merge remote-tracking branch 'origin/master'

business-service/src/main/java/com/ozs/entity/BaseCameraManagement.java

@@ -70,7 +70,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     private Integer installMile;
     @TableField(exist = false)
-    @Excel(name = "监控相机安装里程位置 KM")
     private BigDecimal installMileBD;
 
     /**
@@ -78,7 +77,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     private Integer beginMile;
     @TableField(exist = false)
-    @Excel(name = "监控范围开始里程位置 KM")
     private BigDecimal beginMileBD;
 
     /**
@@ -86,7 +84,6 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
      */
     private Integer endMile;
     @TableField(exist = false)
-    @Excel(name = "监控范围结束里程位置 KM")
     private BigDecimal endMileBD;
 
     /**

business-service/src/main/java/com/ozs/entity/BaseTerminal.java

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -24,6 +25,8 @@ import java.util.Date;
 public class BaseTerminal implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    @TableField(exist = false)
+    private List<Long> ids;
 
     /**
      * 主键ID

business-service/src/main/java/com/ozs/entity/BaseVehicle.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +27,9 @@ public class BaseVehicle implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableField(exist = false)
+    private List<Long> ids;
+
     /**
      * 主键ID
      */

business-service/src/main/java/com/ozs/entity/vo/BaseRailwayManagementVo.java

@@ -5,6 +5,7 @@ import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -29,4 +30,6 @@ public class BaseRailwayManagementVo extends PageVo implements Serializable {
      */
     @Excel(name = "编码")
     private String railwayCode;
+
+    private List<Long> ids;
 }

business-service/src/main/java/com/ozs/service/impl/BaseTerminalServiceImpl.java

@@ -9,6 +9,7 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.entity.BaseTerminal;
+import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.vo.BaseVehicleTerminalVo;
 import com.ozs.mapper.BaseTerminalMapper;
 import com.ozs.service.BaseTerminalService;
@@ -185,6 +186,9 @@ public class BaseTerminalServiceImpl extends ServiceImpl<BaseTerminalMapper, Bas
         if (!StringUtils.isEmptySunhh(baseVehicleTerminal) && !StringUtils.isEmptySunhh(baseVehicleTerminal.getStatus())) {
             wrapper.eq(BaseTerminal::getStatus, baseVehicleTerminal.getStatus());
         }
+        if (baseVehicleTerminal.getIds().size() > 0) {
+            wrapper.in(BaseTerminal::getId, baseVehicleTerminal.getIds());
+        }
         List<BaseTerminal> baseVehicleTerminalList = baseTerminalMapper.selectList(wrapper);
         for (BaseTerminal baseVehicleTerminal1 : baseVehicleTerminalList) {
             baseVehicleTerminal1.setStatusStr(baseVehicleTerminal1.getStatus() == 1 ? "在线" : "离线");

business-service/src/main/java/com/ozs/service/impl/BaseVehicleServiceImpl.java

@@ -9,6 +9,7 @@ import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
+import com.ozs.entity.BaseRailwayManagement;
 import com.ozs.entity.BaseVehicleTerminal;
 import com.ozs.entity.BaseVehicle;
 import com.ozs.entity.BaseTerminal;
@@ -213,6 +214,9 @@ public class BaseVehicleServiceImpl extends ServiceImpl<BaseVehicleMapper, BaseV
         if (!StringUtils.isEmptySunhh(baseVehicle) && !StringUtils.isEmptySunhh(baseVehicle.getVehicleCode())) {
             wrapper.eq(BaseVehicle::getVehicleCode, baseVehicle.getVehicleCode());
         }
+        if (baseVehicle.getIds().size() > 0) {
+            wrapper.in(BaseVehicle::getId, baseVehicle.getIds());
+        }
         List<BaseVehicle> baseVehicles = baseVehicleMapper.selectList(wrapper);
         for (BaseVehicle baseVehicle1 : baseVehicles) {
             BaseVehicleTerminal baseTerminal = baseVehicleTerminalMapper.selectTerminal(baseVehicle1.getVehicleCode());

business-service/src/main/resources/mapper/BaseCameraManagementMapper.xml

@@ -22,7 +22,7 @@
                 and end_mile <= #{endMile}
             </if>
             <if test="ids != null and ids.size>0">
-                and a.id in
+                and id in
                 <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
                     #{items}
                 </foreach>

vehicle-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseRailwayManagementController.java

@@ -256,6 +256,9 @@ public class BaseRailwayManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(baseRailwayManagementVo.getRailwayType())) {
             lw.eq(BaseRailwayManagement::getRailwayType, baseRailwayManagementVo.getRailwayType());
         }
+        if (baseRailwayManagementVo.getIds().size() > 0) {
+            lw.in(BaseRailwayManagement::getId, baseRailwayManagementVo.getIds());
+        }
         List<BaseRailwayManagement> list = baseRailwayManagementService.list(lw);
         ExcelUtil<BaseRailwayManagement> util = new ExcelUtil<>(BaseRailwayManagement.class);
         util.exportExcel(response, list, "线路台账数据");