Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -35,4 +35,6 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
     List<String> getUserIdList(String userId);
 
     IPage<BaseCameraManagement> queryPage(BaseCameraManagementVo baseCameraManagementVo);
+
+    List<BaseCameraManagement> baseCameraManagementList(BaseCameraManagementVo baseCameraManagementVo);
 }

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

@@ -300,4 +300,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         pageR.setTotal(page.getTotal());
         return pageR;
     }
+
+    @Override
+    public List<BaseCameraManagement> baseCameraManagementList(BaseCameraManagementVo baseCameraManagementVo) {
+        return baseCameraManagementMapper.selectCameraManagementList(baseCameraManagementVo);
+    }
 }

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

@@ -32,9 +32,11 @@ public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationi
         if (!ObjectUtils.isEmpty(userRegistrationid.getRegistrationId())) {
             lw.in(UserRegistrationid::getRegistrationId, userRegistrationid.getRegistrationId());
         }
+        log.info("userRegistrationids111111111111111:--------" + userRegistrationid.getUserId());
+        log.info("userRegistrationids222222222222222:--------" + userRegistrationid.getRegistrationId());
         List<UserRegistrationid> userRegistrationids = userRegistrationidMapper.selectList(lw);
-        log.info("userRegistrationids:--------" + userRegistrationid);
-        if (!com.ozs.common.utils.StringUtils.isEmpty(userRegistrationids) && userRegistrationids.size() == 0) {
+        log.info("userRegistrationids333333333333333:--------" + userRegistrationids.size());
+        if (com.ozs.common.utils.StringUtils.isEmpty(userRegistrationids) && userRegistrationids.size() == 0) {
             userRegistrationidMapper.insert(userRegistrationid);
         }
         return 1;

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

@@ -430,17 +430,19 @@ public class BaseCameraManagementController extends BaseController {
         LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
         if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
             wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+            wrapper1.orderByDesc(  MsgAlarm::getAlarmTime);
         }
-        MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper1);
+        List<MsgAlarm> list1 = msgAlarmService.list(wrapper1);
         List<Object> list = new ArrayList<>();
         list.add(baseRailwayManagement.getRailwayName());
         list.add(AppendUtils.stringAppend(baseCameraManagement.getInstallMile()));
         list.add(baseCameraManagement.getLineDir());
         list.add(baseCameraManagement.getCameraCode());
         list.add(baseDeviceDynamicManagement.getElectricity());
-        if (ObjectUtils.isEmpty(msgAlarm)) {
+        if (list1.size()<=0) {
             list.add(1);
         } else {
+            MsgAlarm msgAlarm = list1.get(0);
             list.add(msgAlarm.getIsLock());
         }
         return AjaxResult.success(list);
@@ -472,25 +474,10 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("导出相机台账管理信息")
     @PostMapping("/exportBaseAccountManagement")
     @Log(title = "相机台账管理", businessType = BusinessType.EXPORT)
-    public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseAccountManagementVo) {
-        LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getLineDir())) {
-            lw.eq(BaseCameraManagement::getLineDir, baseAccountManagementVo.getLineDir());
-        }
-        if (!StringUtils.isBlank(baseAccountManagementVo.getRailwayCode())) {
-            lw.eq(BaseCameraManagement::getRailwayCode, baseAccountManagementVo.getRailwayCode());
-        }
-        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getDeptId())) {
-            lw.eq(BaseCameraManagement::getDeptId, baseAccountManagementVo.getDeptId());
-        }
-        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getBeginMile())) {
-            lw.ge(BaseCameraManagement::getBeginMile, baseAccountManagementVo.getBeginMile());
-        }
-        if (!ObjectUtils.isEmpty(baseAccountManagementVo.getEndMile())) {
-            lw.le(BaseCameraManagement::getEndMile, baseAccountManagementVo.getEndMile());
-        }
-        List<BaseCameraManagement> list = baseCameraManagementService.list(lw);
-        for (BaseCameraManagement baseCameraManagement : list) {
+    public void exportBaseAccountManagement(HttpServletResponse response, @RequestBody BaseCameraManagementVo baseCameraManagementVo) {
+        baseCameraManagementVo = (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(), baseCameraManagementVo);
+        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementService.baseCameraManagementList(baseCameraManagementVo);
+        for (BaseCameraManagement baseCameraManagement : baseCameraManagementList) {
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             baseCameraManagement.setDeptName(sysDept.getDeptName());
             LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -507,7 +494,7 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setBeginMiles(begin);
         }
         ExcelUtil<BaseCameraManagement> util = new ExcelUtil<>(BaseCameraManagement.class);
-        util.exportExcel(response, list, "台账管理相机数据");
+        util.exportExcel(response, baseCameraManagementList, "台账管理相机数据");
     }
 
 

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

@@ -136,16 +136,16 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:user:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysUser user) {
+    public void export(HttpServletResponse response, SysUserVo sysUserVo) {
         List<Long> longs = new ArrayList<>();
-        List<SysUser> list = userService.selectUserList(user);
-        for (SysUser sysUser : list) {
+        sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
+        List<SysUser> usetList = userService.usetList(sysUserVo);
+        for (SysUser sysUser : usetList) {
             StringBuilder stringBuilder = new StringBuilder();
             if (SysUser.isAdmin(sysUser.getId())) {
                 List<SysRole> roles = roleService.selectRoleAll();
-                for (SysRole role : roles) {
-                    longs.add(role.getRoleId());
-                }
+                List<SysRole> roLe = roles.stream().filter(r -> r.getRoleName().equals("超级管理员")).collect(Collectors.toList());
+                longs.add(roLe.get(0).getRoleId());
             } else {
                 longs = roleService.selectRoleListByUserId(sysUser.getId());
             }
@@ -158,7 +158,7 @@ public class SysUserController extends BaseController {
             }
         }
         ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
-        util.exportExcel(response, list, "用户数据");
+        util.exportExcel(response, usetList, "用户数据");
     }
 
     @Log(title = "用户管理", businessType = BusinessType.IMPORT)