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

 Conflicts:

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

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

@@ -1,11 +1,9 @@
 package com.ozs.service.entity.vo;
 
-
 import com.ozs.common.vo.PageVo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -19,7 +19,7 @@ public interface MsgWebPushService extends IService<MsgWebPush> {
 
     Map webAlarm(String userId);
 
-    IPage messageMore(String userId, MsgAlarmVo msgAlarmVo);
+    IPage<MsgAlarm> messageMore(String userId, MsgAlarmVo msgAlarmVo);
 
     Map<String, Integer> messageMoreNum(String userId, MsgAlarmVo msgAlarmVo);
 }

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

@@ -80,7 +80,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
 
                 // 摄像头
                 CameraTree build2 = CameraTree.builder()
-                        .code(o.getId())
+                        .code(o.getCameraCode())
                         .name(o.getCameraCode())
                         .flay(true)
                         .children(new ArrayList<>())

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

@@ -2,8 +2,9 @@ package com.ozs.service.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.ozs.common.utils.AppendUtils;
 import com.ozs.common.utils.PageUtils;
 import com.ozs.common.utils.StringUtils;
@@ -84,13 +85,22 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
     }
 
     @Override
-    public IPage messageMore(String userId, MsgAlarmVo msgAlarmVo) {
+    public IPage<MsgAlarm> messageMore(String userId, MsgAlarmVo msgAlarmVo) {
         List<String> userIds = baseCameraManagementService.getUserIds(userId);
         msgAlarmVo.setUserIds(userIds);
-        List<MsgAlarm> webAlarm = msgWebPushMapper.messageMore(msgAlarmVo);
-        Page<MsgAlarm> page = PageUtils.getPages(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue(), webAlarm);
-        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
-            List<MsgAlarm> dto1 = page.getRecords().stream().map(o -> {
+        // List<MsgAlarm> webAlarm = msgWebPushMapper.messageMore(msgAlarmVo);
+        Page<MsgAlarm> page = PageHelper.startPage(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue())
+                .doSelectPage(() -> msgWebPushMapper.messageMore(msgAlarmVo));
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<MsgAlarm> pageR =
+                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue());
+
+        pageR.setSize(page.size());
+        pageR.setTotal(page.getTotal());
+
+
+        // Page<MsgAlarm> page = PageUtils.getPages(msgAlarmVo.getPageNum().intValue(), msgAlarmVo.getPageSize().intValue(), webAlarm);
+        if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getResult())) {
+            List<MsgAlarm> dto1 = page.getResult().stream().map(o -> {
                 String[] split = o.getImageUrl().split(";");
                 ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
                 o.setImageUrls(objects);
@@ -115,9 +125,9 @@ public class MsgWebPushServiceImpl extends ServiceImpl<MsgWebPushMapper, MsgWebP
                 // o.setAlarmCount((int) msgAlarmFrequencyService.count()+1);
                 return o;
             }).collect(Collectors.toList());
-            page.setRecords(dto1);
+            pageR.setRecords(dto1);
         }
-        return page;
+        return pageR;
     }
 
     @Override

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

@@ -45,7 +45,7 @@
           and data_permission = 5
     </select>
 
-    <select id="getUserIdByDeptIdsBy5" resultType="java.util.List" parameterType="java.lang.Long">
+    <select id="getUserIdByDeptIdsBy5" resultType="string" parameterType="list">
         select user_id
         from sys_user
         where dept_id in

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

@@ -34,6 +34,7 @@ import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
 import com.ozs.service.service.MsgAlarmService;
+import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
 import com.ozs.web.core.config.CaneraConfig;
 import com.ozs.web.core.util.CameraUtil;
@@ -93,7 +94,8 @@ public class BaseCameraManagementController extends BaseController {
     private CaneraConfig caneraConfig;
     @Autowired
     private IdempotenceUtils idempotenceUtils;
-
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
 
     /**
      * 所有相机列表+权限
@@ -170,12 +172,8 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation(value = "相机台账管理分页")
     @PostMapping("/list")
     public AjaxResult selectBaseAccountManagement(@RequestBody BaseCameraManagementVo baseCameraManagementVo) {
-        List<String> userIds = baseCameraManagementService.getUserIdList(getUserId());
-
+        baseCameraManagementVo= (BaseCameraManagementVo) dataScoreUtil.setDataScore(getUserId(),baseCameraManagementVo);
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(userIds)) {
-            lw.in(BaseCameraManagement::getCreateBy, userIds);
-        }
         if (!ObjectUtils.isEmpty(baseCameraManagementVo.getLineDir()) && baseCameraManagementVo.getLineDir() != 0) {
             lw.eq(BaseCameraManagement::getLineDir, baseCameraManagementVo.getLineDir());
         }
@@ -195,6 +193,17 @@ public class BaseCameraManagementController extends BaseController {
             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())) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
@@ -651,7 +660,7 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
             return AjaxResult.success(msgAlarmResp);
         } else {
-            return error("该相机没有报警消息");
+            return AjaxResult.success(new  MsgAlarmResp());
         }
     }
 }

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

@@ -100,7 +100,7 @@ public class MsgAlarmController extends BaseController {
     @ApiOperation("更多消息")
     public AjaxResult messageMore(@RequestBody MsgAlarmVo msgAlarmVo) {
         String userId = getUserId();
-        IPage messageMore = msgWebPushService.messageMore(userId, msgAlarmVo);
+        IPage<MsgAlarm> messageMore = msgWebPushService.messageMore(userId, msgAlarmVo);
         return AjaxResult.success(messageMore);
     }
 

hazard-admin/src/main/java/com/ozs/web/controller/common/CaptchaController.java

@@ -46,12 +46,12 @@ public class CaptchaController
     public AjaxResult getCode(HttpServletResponse response) throws IOException
     {
         AjaxResult ajax = AjaxResult.success();
-//        boolean captchaEnabled = configService.selectCaptchaEnabled();
-//        ajax.put("captchaEnabled", captchaEnabled);
-//        if (!captchaEnabled)
-//        {
-//            return ajax;
-//        }
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
+        ajax.put("captchaEnabled", captchaEnabled);
+        if (!captchaEnabled)
+        {
+            return ajax;
+        }
 
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();

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

@@ -73,6 +73,8 @@ public class SysUserController extends BaseController {
     private ISysPostService postService;
     @Autowired
     private TokenService tokenService;
+    @Autowired
+    private ISysRoleService iSysRoleService;
 
 //    /**
 //     * 获取用户列表
@@ -116,10 +118,21 @@ public class SysUserController extends BaseController {
         IPage<SysUser> page = userService.page(new Page<>(sysUserVo.getPageNum(), sysUserVo.getPageSize()), wrapper);
         if (!ObjectUtils.isEmpty(page) && !ObjectUtils.isEmpty(page.getRecords())) {
             List<SysUser> dto1 = page.getRecords().stream().map(o -> {
+                List<Long> longs=new ArrayList<>();
                 SysDept sysDept = deptService.selectDeptById(o.getDeptId());
                 if (!ObjectUtils.isEmpty(sysDept)) {
                     o.setDeptName(sysDept.getDeptName());
                 }
+                if (SysUser.isAdmin(o.getId())) {
+                    List<SysRole> roles = roleService.selectRoleAll();
+                    for (SysRole role : roles) {
+                        longs.add(role.getRoleId());
+                    }
+                }else {
+                    longs = iSysRoleService.selectRoleListByUserId(o.getId());
+                }
+                Long[] objects = longs.toArray(new Long[]{});
+                o.setRoleIds(objects);
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);