添加单选框代码

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

@@ -4,6 +4,7 @@ import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 统计管理页面强求参数
@@ -33,4 +34,6 @@ public class AlarmStatisticResVo extends PageVo implements Serializable {
      * 灾害类型
      */
     private String alarmType;
+
+    private List<Long> ids;
 }

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

@@ -5,6 +5,7 @@ import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -56,4 +57,6 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      * 监控范围结束里程位置字符串形式
      */
     private String endMiles;
+
+    private List<Long> ids;
 }

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

@@ -5,6 +5,7 @@ import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -30,4 +31,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/service/impl/BaseCameraManagementServiceImpl.java

@@ -336,53 +336,14 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
             wrapper.like(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
-//        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
-////            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-//            // 判断
-//            wrapper.and((wp) -> {
-//                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
-//            });
-//        }
-        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
-        List<BaseCameraManagement> baseCameraManagementList = new ArrayList<>();
-        for (BaseCameraManagement baseCameraManagement1 : baseCameraManagements) {
-            if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getVersionId())) {
-                if (baseCameraManagement1.getVersionId().equals(baseCameraManagement.getVersionId())) {
-                    LambdaQueryWrapper<CameraUpdateLog> wrapperCameraUpdateLog = new LambdaQueryWrapper<>();
-                    wrapperCameraUpdateLog.eq(CameraUpdateLog::getVersionId, baseCameraManagement1.getVersionId());
-                    wrapperCameraUpdateLog.orderByDesc(CameraUpdateLog::getCreateTime);
-                    List<CameraUpdateLog> cameraUpdateLogs = cameraUpdateLogMapper.selectList(wrapperCameraUpdateLog);
-                    if (!StringUtils.isEmptySunhh(cameraUpdateLogs) && cameraUpdateLogs.size() > 0) {
-                        CameraUpdateLog cameraUpdateLog = cameraUpdateLogs.get(0);
-                        if (!StringUtils.isEmptySunhh(cameraUpdateLog) && !StringUtils.isEmptySunhh(cameraUpdateLog.getId())) {
-                            LambdaQueryWrapper<CameraLogDetail> wrapperCameraLogDetail = new LambdaQueryWrapper<>();
-                            wrapperCameraLogDetail.eq(CameraLogDetail::getLogId, cameraUpdateLog.getId());
-                            if (!StringUtils.isEmptySunhh(baseCameraManagement1) && !StringUtils.isEmptySunhh(baseCameraManagement1.getCameraCode())) {
-                                wrapperCameraLogDetail.eq(CameraLogDetail::getCameraCode, baseCameraManagement1.getCameraCode());
-                            }
-                            wrapperCameraLogDetail.orderByDesc(CameraLogDetail::getUpdateTime);
-                            List<CameraLogDetail> cameraLogDetails = cameraLogDetailMapper.selectList(wrapperCameraLogDetail);
-                            if (!StringUtils.isEmptySunhh(cameraLogDetails) && cameraLogDetails.size() > 0) {
-                                CameraLogDetail cameraLogDetail = cameraLogDetails.get(0);
-                                if (!StringUtils.isEmptySunhh(cameraLogDetail) && !StringUtils.isEmptySunhh(cameraLogDetail.getStatus())) {
-                                    if (3 == cameraLogDetail.getStatus()) {
-                                        baseCameraManagementList.add(baseCameraManagement1);
-                                    }
-                                }
-                            } else {
-                                baseCameraManagementList.add(baseCameraManagement1);
-                            }
-                        }
-                    } else {
-                        baseCameraManagementList.add(baseCameraManagement1);
-                    }
-                } else {
-                    baseCameraManagementList.add(baseCameraManagement1);
-                }
-            } else {
-                baseCameraManagementList.add(baseCameraManagement1);
-            }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+//            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            // 判断
+            wrapper.and((wp) -> {
+                wp.isNull(BaseCameraManagement::getVersionId).or().ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+            });
         }
-        return baseCameraManagementList;
+        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
+        return baseCameraManagements;
     }
 }

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

@@ -49,6 +49,12 @@
             <if test="installMile != null and installMile != 0">
                 and a.install_mile =#{installMile}
             </if>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">

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

@@ -143,6 +143,12 @@
             <if test="alarmType != null and alarmType != ''">
                 and UPPER(a.alarm_type) like UPPER(CONCAT('%',#{alarmType},'%'))
             </if>
+            <if test="ids != null and ids.size>0">
+                and a.id in
+                <foreach item="items" collection="ids" separator="," open="(" close=")" index="">
+                    #{items}
+                </foreach>
+            </if>
             <if test="!dsFlay">
                 and
                 <trim prefix="(" prefixOverrides="or" suffix=")">

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

@@ -270,6 +270,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, "线路台账数据");

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -151,7 +151,7 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUserVo sysUserVo) {
+    public void export(HttpServletResponse response, @RequestBody SysUserVo sysUserVo) {
         List<Long> longs = new ArrayList<>();
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
         List<SysUser> usetList = userService.usetList(sysUserVo);