相机分页和用户分页修改

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

@@ -43,9 +43,4 @@ public class BaseCameraManagementVo extends PageVo implements Serializable {
      * 监控范围结束里程位置
      */
     private Integer endMile;
-
-    /**
-     * 监控相机安装里程位置字符串形式
-     */
-    private String installMiles;
 }

business-service/src/main/java/com/ozs/service/mapper/BaseCameraManagementMapper.java

@@ -2,8 +2,12 @@ package com.ozs.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.BaseCameraManagement;
+import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 相机台账管理表 Mapper 接口
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BaseCameraManagementMapper extends BaseMapper<BaseCameraManagement> {
 
+    List<BaseCameraManagement> selectCameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
 }

business-service/src/main/java/com/ozs/service/service/BaseCameraManagementService.java

@@ -1,9 +1,11 @@
 package com.ozs.service.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.core.domain.AjaxResult;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVos;
 
 import java.util.List;
@@ -31,4 +33,6 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
     List<String> getUserIds(String userId);
 
     List<String> getUserIdList(String userId);
+
+    IPage<BaseCameraManagement> queryPage(BaseCameraManagementVo baseCameraManagementVo);
 }

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

@@ -1,6 +1,8 @@
 package com.ozs.service.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.exception.base.BaseException;
@@ -14,6 +16,7 @@ import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.BaseCameraManagementVos;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -283,4 +286,17 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<String> list = new ArrayList<>(set);
         return list;
     }
+
+    @Override
+    public IPage<BaseCameraManagement> queryPage(BaseCameraManagementVo baseCameraManagementVo) {
+        int pageNum = Integer.parseInt(baseCameraManagementVo.getPageNum().toString());
+        int pageSize = Integer.parseInt(baseCameraManagementVo.getPageSize().toString());
+        com.github.pagehelper.Page<BaseCameraManagement> page = PageHelper.startPage(pageNum, pageSize)
+                .doSelectPage(() -> baseCameraManagementMapper.selectCameraManagementList(baseCameraManagementVo));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<BaseCameraManagement> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize);
+        pageR.setRecords(page.getResult());
+        pageR.setTotal(page.getTotal());
+        return pageR;
+    }
 }

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

@@ -3,4 +3,57 @@
 <mapper namespace="com.ozs.service.mapper.BaseCameraManagementMapper">
 
 
+    <select id="selectCameraManagementList" resultType="com.ozs.service.entity.BaseCameraManagement" parameterType="com.ozs.service.entity.vo.BaseCameraManagementVo">
+        SELECT
+        a.id  AS id,
+        a.camera_code AS cameraCode,
+        a.railway_code AS railwayCode,
+        a.channel AS channel,
+        a.dept_id AS deptId,
+        a.line_dir AS lineDir,
+        a.install_mile AS installMile,
+        a.begin_mile AS beginMile,
+        a.end_mile AS endMile,
+        a.install_longitude AS installLongitude,
+        a.install_latitude AS installLatitude,
+        a.card_num AS cardNum,
+        a.start_recording AS startRecording,
+        a.task_id AS taskId,
+        a.create_time AS createTime
+        FROM
+        base_camera_management a
+        <where>
+            <if test="railwayCode != null and railwayCode != ''">
+                and a.railway_code=#{railwayCode}
+            </if>
+            <if test="lineDir != null and lineDir != 0">
+                and a.line_dir =#{lineDir}
+            </if>
+            <if test="deptId != null and deptId != 0">
+                and a.dept_id =#{deptId}
+            </if>
+            <if test="beginMile != null and beginMile != 0">
+                and a.begin_mile &gt;=#{beginMile}
+            </if>
+            <if test="endMile != null and endMile != 0">
+                and a.end_mile &lt;=#{endMile}
+            </if>
+            <if test="!dsFlay">
+                and (
+                <if test="dsUserId != null and dsUserId != ''">
+                    a.create_by=#{dsUserId}  or
+                </if>
+                <if test="dsDeptId != null and dsDeptId != 0">
+                    a.dept_id=#{dsDeptId}  or
+                </if>
+                <if test="dsDeptIds != null">
+                    a.dept_id in
+                    <foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+                        #{item}
+                    </foreach>
+                </if>
+                )
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -172,40 +172,12 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation(value = "相机台账管理分页")
     @PostMapping("/list")
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
-        baseCameraManagementVo= (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(),baseCameraManagementVo);
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getLineDir()) && baseCameraManagementVo.getLineDir() != 0) {
-            lw.eq(BaseCameraManagement::getLineDir, baseCameraManagementVo.getLineDir());
-        }
-        if (!StringUtils.isBlank(baseCameraManagementVo.getRailwayCode())) {
-            lw.eq(BaseCameraManagement::getRailwayCode, baseCameraManagementVo.getRailwayCode());
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDeptId())) {
-            lw.eq(BaseCameraManagement::getDeptId, baseCameraManagementVo.getDeptId());
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getBeginMile())) {
-            lw.ge(BaseCameraManagement::getBeginMile, baseCameraManagementVo.getBeginMile());
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getEndMile())) {
-            lw.le(BaseCameraManagement::getEndMile, baseCameraManagementVo.getEndMile());
-        }
-        if (!ObjectUtils.isEmpty(baseCameraManagementVo.getInstallMiles())) {
-            int miles = AppendUtils.stringSplit(baseCameraManagementVo.getInstallMiles());
-            lw.eq(BaseCameraManagement::getInstallMile, miles);
-        }
-        if(!baseCameraManagementVo.getDsFlay()){
-         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsUserId())){
-             lw.eq(BaseCameraManagement::getCreateBy, baseCameraManagementVo.getDsUserId()).or();
-         }
-         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsDeptId())){
-             lw.eq(BaseCameraManagement::getDeptId,baseCameraManagementVo.getDsDeptId()).or();
-         }
-         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getDsDeptIds())){
-             lw.in(BaseCameraManagement::getDeptId,baseCameraManagementVo.getDsDeptIds());
-         }
-        }
-        IPage<BaseCameraManagement> page = baseCameraManagementService.page(new Page<>(baseCameraManagementVo.getPageNum(), baseCameraManagementVo.getPageSize()), lw);
-        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+        baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
+        IPage<BaseCameraManagement> page = baseCameraManagementService.queryPage(baseCameraManagementVo);
+        page.setTotal(page.getTotal());
+        page.setCurrent(page.getCurrent());
+        page.setPages(page.getPages());
+        if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
                 if (!ObjectUtils.isEmpty(o.getRailwayCode())) {
@@ -370,16 +342,16 @@ public class BaseCameraManagementController extends BaseController {
             wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
         }
         BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
-        if (ObjectUtils.isEmpty(baseRailwayManagement)){
-            return error("线路表中没有该线路编码:"+baseCameraManagement.getRailwayCode()+"的数据");
+        if (ObjectUtils.isEmpty(baseRailwayManagement)) {
+            return error("线路表中没有该线路编码:" + baseCameraManagement.getRailwayCode() + "的数据");
         }
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseDeviceDynamicManagement baseDeviceDynamicManagement = baseDeviceDynamicManagementService.getOne(queryWrapper);
-        if (ObjectUtils.isEmpty(baseRailwayManagement)){
-            return error("设备动态管理表中没有该相机编码:"+baseCameraManagement.getCameraCode()+"的数据");
+        if (ObjectUtils.isEmpty(baseRailwayManagement)) {
+            return error("设备动态管理表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
         }
         List<Object> list = new ArrayList<>();
         list.add(baseRailwayManagement.getRailwayName());

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

@@ -22,7 +22,6 @@ import com.ozs.framework.web.service.TokenService;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.MsgAlarmVo;
 import com.ozs.system.service.DataScoreUtil;
 import io.swagger.annotations.ApiOperation;
@@ -106,34 +105,12 @@ public class SysUserController extends BaseController {
     public AjaxResult list(@RequestBody SysUserVo sysUserVo) {
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<SysUser>();
-        if (!ObjectUtils.isEmpty(sysUserVo.getUserName())) {
-            wrapper.like(SysUser::getUserName, sysUserVo.getUserName());
-        }
-        if (!ObjectUtils.isEmpty(sysUserVo.getNickName())) {
-            wrapper.like(SysUser::getNickName, sysUserVo.getNickName());
-        }
-        if (!ObjectUtils.isEmpty(sysUserVo.getPhoneNum())) {
-            wrapper.like(SysUser::getPhoneNum, sysUserVo.getPhoneNum());
-        }
-        if (!ObjectUtils.isEmpty(sysUserVo.getDeptId())) {
-            wrapper.eq(SysUser::getDeptId, sysUserVo.getDeptId());
-        }
-        if (!ObjectUtils.isEmpty(sysUserVo.getStatus())) {
-            wrapper.eq(SysUser::getStatus, sysUserVo.getStatus());
-        }
-        if (!sysUserVo.getDsFlay()) {
-            if (!ObjectUtils.isEmpty(sysUserVo.getDsUserId())) {
-                wrapper.eq(SysUser::getCreateBy, sysUserVo.getDsUserId()).or();
-            }
-            if (!ObjectUtils.isEmpty(sysUserVo.getDsDeptId())) {
-                wrapper.eq(SysUser::getDeptId, sysUserVo.getDsDeptId()).or();
-            }
-            if (!ObjectUtils.isEmpty(sysUserVo.getDsDeptIds())) {
-                wrapper.in(SysUser::getDeptId, sysUserVo.getDsDeptIds());
-            }
-        }
-        IPage<SysUser> page = userService.page(new Page<>(sysUserVo.getPageNum(), sysUserVo.getPageSize()), wrapper);
-        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
+        IPage<SysUser> page = userService.queryPage(sysUserVo);
+        page.setTotal(page.getTotal());
+        page.setCurrent(page.getCurrent());
+        page.setPages(page.getPages());
+
+        if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<SysUser> dto1 = page.getRecords().stream().map(o -> {
                 List<Long> longs = new ArrayList<>();
                 SysDept sysDept = deptService.selectDeptById(o.getDeptId());
@@ -359,8 +336,8 @@ public class SysUserController extends BaseController {
      * 修改密码
      */
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(@RequestBody SysUser user) {
+    @PutMapping("/updatePassWord")
+    public AjaxResult updatePassWord(@RequestBody SysUser user) {
         LoginUser loginUser = getLoginUser();
         if (!SecurityUtils.matchesPassword(user.getPassword(), loginUser.getPassword())) {
             return error("修改密码失败，旧密码错误");