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

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

@@ -33,6 +33,4 @@ public interface MsgAppPushMapper extends BaseMapper<MsgAppPush> {
      * @return
      */
     public int update(@Param("id") Long id, @Param("status") Integer status, @Param("updateBy") String updateBy);
-
-    Integer appAlarmNum(@Param("userId") String userId);
 }

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

@@ -46,4 +46,6 @@ public interface MsgAlarmService extends IService<MsgAlarm> {
     MsgAlarm getByAlarmId(String alarmId);
 
     Map<String, Integer> statisticsNum(MsgAlarmVo msgAlarmVo);
+
+    Integer appAlarmNum(MsgAlarmVo msgAlarmVo);
 }

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

@@ -33,9 +33,4 @@ public interface MsgAppPushService extends IService<MsgAppPush> {
      */
     int update(Long id, Integer status, String updateBy);
 
-    /**
-     * app 未读消息个数
-     * @return
-     */
-    Integer appAlarmNum(String userId);
 }

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

@@ -126,4 +126,9 @@ public class MsgAlarmServiceImpl extends ServiceImpl<MsgAlarmMapper, MsgAlarm> i
         map.put("countWJC", countWJC);
         return map;
     }
+
+    @Override
+    public Integer appAlarmNum(MsgAlarmVo msgAlarmVo) {
+        return msgAlarmMapper.countWJC(msgAlarmVo);
+    }
 }

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

@@ -44,10 +44,4 @@ public class MsgAppPushServiceImpl extends ServiceImpl<MsgAppPushMapper, MsgAppP
         int num = msgAppPushMapper.update(id, status, updateBy);
         return num;
     }
-
-    @Override
-    public Integer appAlarmNum(String userId) {
-        Integer integer = msgAppPushMapper.appAlarmNum(userId);
-        return integer;
-    }
 }

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.entity.UserRegistrationid;
 import com.ozs.service.mapper.UserRegistrationidMapper;
 import com.ozs.service.service.UserRegistrationidService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -15,6 +17,7 @@ import java.util.List;
  * @Author : sunhh
  * @create 2023/3/14 17:08
  */
+@Slf4j
 @Service
 public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationidMapper, UserRegistrationid> implements UserRegistrationidService {
     @Autowired
@@ -30,13 +33,11 @@ public class UserRegistrationidServiceImpl extends ServiceImpl<UserRegistrationi
             lw.in(UserRegistrationid::getRegistrationId, userRegistrationid.getRegistrationId());
         }
         List<UserRegistrationid> userRegistrationids = userRegistrationidMapper.selectList(lw);
-        int add = 0;
-        if (userRegistrationids.size() > 0) {
-            add = userRegistrationidMapper.updateRegistrationID(userRegistrationid);
-        } else {
-            add = userRegistrationidMapper.insert(userRegistrationid);
+        log.info("userRegistrationids:--------" + userRegistrationid);
+        if (!com.ozs.common.utils.StringUtils.isEmpty(userRegistrationids) && userRegistrationids.size() == 0) {
+            userRegistrationidMapper.insert(userRegistrationid);
         }
-        return add;
+        return 1;
     }
 
     @Override

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

@@ -77,8 +77,4 @@
         </set>
         where id = #{id}
     </update>
-
-    <select id="appAlarmNum" parameterType="java.lang.String" resultType="java.lang.Integer">
-        select count(*) from msg_app_push where status = 1 and receive_by = #{userId}
-    </select>
 </mapper>

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

@@ -27,7 +27,7 @@
         join base_camera_management AS c on b.camera_code = c.camera_code
         <where>
             <if test="userId != null and userId != ''">
-                or a.receive_by = #{userId}
+                and a.receive_by = #{userId}
             </if>
             <if test="status != null and status != ''">
                 and a.status = #{status}
@@ -60,7 +60,7 @@
         select count(1) count, SUM(CASE status WHEN '1' THEN 1 ELSE 0 end) AS 'noCount' from msg_web_push
         <where>
             <if test="userId != null and userId != ''">
-                or receive_by = #{userId}
+                and receive_by = #{userId}
             </if>
         </where>
     </select>

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

@@ -432,20 +432,17 @@ public class BaseCameraManagementController extends BaseController {
             wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
         }
         MsgAlarm msgAlarm = msgAlarmService.getOne(wrapper1);
-        if (ObjectUtils.isEmpty(msgAlarm)) {
-            return error("报警信息表中没有该相机编码:" + baseCameraManagement.getCameraCode() + "的数据");
-        }
         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());
-        list.add(msgAlarm.getIsLock());
-        SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String format1 = dateFormat1.format(new Date());
-        list.add(format1);
-        list.add(msgAlarm.getLineDir());
+        if (ObjectUtils.isEmpty(msgAlarm)) {
+            list.add(1);
+        } else {
+            list.add(msgAlarm.getIsLock());
+        }
         return AjaxResult.success(list);
     }
 
@@ -738,40 +735,51 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("根据视频ID获取详细信息")
     @Log(title = "相机台账管理", businessType = BusinessType.MESSAGE)
     public AjaxResult getAlarm(@PathVariable String cameraCode) {
-        LambdaQueryWrapper<MsgAlarm> queryWrapper = new LambdaQueryWrapper<MsgAlarm>();
+        LambdaQueryWrapper<BaseCameraManagement> queryWrapper = new LambdaQueryWrapper<BaseCameraManagement>();
         if (!ObjectUtils.isEmpty(cameraCode)) {
-            queryWrapper.eq(MsgAlarm::getCameraCode, cameraCode);
-            queryWrapper.orderByDesc(MsgAlarm::getCreateTime);
+            queryWrapper.eq(BaseCameraManagement::getCameraCode, cameraCode);
         }
-        List<MsgAlarm> msgAlarmList = msgAlarmService.list(queryWrapper);
-        if (msgAlarmList.size() > 0) {
-            MsgAlarm msgAlarm = msgAlarmList.get(0);
-            LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-            if (!ObjectUtils.isEmpty(cameraCode)) {
-                lw.eq(BaseCameraManagement::getCameraCode, cameraCode);
-            }
-            BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(lw);
+        BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(queryWrapper);
+        if (!ObjectUtils.isEmpty(baseCameraManagement)) {
             LambdaQueryWrapper<BaseRailwayManagement> wrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
             if (!ObjectUtils.isEmpty(baseCameraManagement.getRailwayCode())) {
                 wrapper.eq(BaseRailwayManagement::getRailwayCode, baseCameraManagement.getRailwayCode());
             }
             BaseRailwayManagement baseRailwayManagement = baseRailwayManagementService.getOne(wrapper);
             MsgAlarmResp msgAlarmResp = new MsgAlarmResp();
-            BeanUtils.copyProperties(msgAlarm, msgAlarmResp);
+            LambdaQueryWrapper<MsgAlarm> wrapper1 = new LambdaQueryWrapper<MsgAlarm>();
+            if (!ObjectUtils.isEmpty(baseCameraManagement.getCameraCode())) {
+                wrapper1.eq(MsgAlarm::getCameraCode, baseCameraManagement.getCameraCode());
+                wrapper1.orderByDesc(MsgAlarm::getCreateTime);
+            }
+            List<MsgAlarm> list = msgAlarmService.list(wrapper1);
+            if (list.size()>0) {
+                MsgAlarm msgAlarm = list.get(0);
+                msgAlarmResp.setAlarmType(msgAlarm.getAlarmType());
+                msgAlarmResp.setIsLock(msgAlarm.getIsLock());
+                msgAlarmResp.setReleasedTime(msgAlarm.getReleasedTime());
+                msgAlarmResp.setAlarmTime(msgAlarm.getAlarmTime());
+                if (!StringUtils.isEmpty(msgAlarm.getImageUrl())) {
+                    String[] split = msgAlarm.getImageUrl().split(";");
+                    ArrayList<String> objects = new ArrayList<>(Arrays.asList(split));
+                    log.info("publish--------"+objects);
+                    msgAlarmResp.setImageUrls(objects);
+                }
+            }
+            BeanUtils.copyProperties(baseCameraManagement, msgAlarmResp);
             msgAlarmResp.setRailwayName(baseRailwayManagement.getRailwayName());
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = begin + end;
+            String endMile = "["+begin+"]-[" + end+"]";
             msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
-            msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
             return AjaxResult.success(msgAlarmResp);
-        } else {
-            return success("无报警信息数据");
+        }else {
+            return error("该相机编码在相机台账表中不存在");
         }
     }
 }

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

@@ -274,7 +274,7 @@ public class MsgAlarmController extends BaseController {
             msgAlarmResp.setDeptId(baseCameraManagement.getDeptId());
             String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
             String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-            String endMile = begin + "-" + end;
+            String endMile = "["+begin + "]-[" + end+"]";
             msgAlarmResp.setBeginMile(endMile);
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);

hazard-admin/src/main/java/com/ozs/web/controller/app/JPushAppController.java

@@ -4,8 +4,12 @@ import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.UserRegistrationid;
+import com.ozs.service.entity.vo.BaseCameraManagementVo;
+import com.ozs.service.entity.vo.MsgAlarmVo;
+import com.ozs.service.service.MsgAlarmService;
 import com.ozs.service.service.MsgAppPushService;
 import com.ozs.service.service.UserRegistrationidService;
+import com.ozs.system.service.DataScoreUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +27,9 @@ public class JPushAppController extends BaseController {
     @Autowired
     private UserRegistrationidService userRegistrationidService;
     @Autowired
-    private MsgAppPushService msgAppPushService;
+    private MsgAlarmService msgAlarmService;
+    @Autowired
+    private DataScoreUtil dataScoreUtil;
 
     /**
      * app报警推送次数
@@ -31,8 +37,8 @@ public class JPushAppController extends BaseController {
     @GetMapping("/appAlarmNum")
     @ApiOperation("app报警推送次数")
     public AjaxResult appAlarmNum() {
-        String userId = getUserId();
-        Integer appAlarmNum = msgAppPushService.appAlarmNum(userId);
+        MsgAlarmVo msgAlarmVo = (MsgAlarmVo) dataScoreUtil.setDataScore(getUserId(), new MsgAlarmVo());
+        Integer appAlarmNum = msgAlarmService.appAlarmNum(msgAlarmVo);
         return AjaxResult.success(appAlarmNum);
     }
 

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

@@ -4,14 +4,17 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 
 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.ozs.common.core.domain.entity.SysMenu;
 import com.ozs.common.core.domain.vo.SysRoleRequestVo;
 import com.ozs.common.core.domain.vo.SysUserVo;
+import com.ozs.system.domain.SysRoleMenu;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysMenuService;
 import io.swagger.annotations.ApiOperation;
@@ -118,9 +121,16 @@ public class SysRoleController extends BaseController
     {
 //        roleService.checkRoleDataScope(roleId);
         SysRole sysRole = roleService.selectRoleById(roleId);
-        List<Long> rolePerms = menuService.selectMenu(sysRole.getRoleId());
-        Long[] strArr = rolePerms.toArray(new Long[rolePerms.size()]);
-        sysRole.setMenuIds(strArr);
+        if (sysRole.getRoleName().equals(("超级管理员"))){
+            List<SysMenu> list = menuService.list();
+            List<Long> collect = list.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
+            Long[] strArr = collect.toArray(new Long[collect.size()]);
+            sysRole.setMenuIds(strArr);
+        }else {
+            List<Long> rolePerms = menuService.selectMenu(sysRole.getRoleId());
+            Long[] strArr = rolePerms.toArray(new Long[rolePerms.size()]);
+            sysRole.setMenuIds(strArr);
+        }
         return success(sysRole);
     }
 

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

@@ -119,9 +119,8 @@ public class SysUserController extends BaseController {
                 }
                 if (SysUser.isAdmin(o.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 = iSysRoleService.selectRoleListByUserId(o.getId());
                 }
@@ -209,7 +208,8 @@ public class SysUserController extends BaseController {
             SysUser sysUser = userService.selectUserById(id);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             if (SysUser.isAdmin(id)){
-                ajax.put("roleIds", roles.stream().map(SysRole::getRoleId).collect(Collectors.toList())); 
+                List<SysRole> roLe = roles.stream().filter(r -> r.getRoleName().equals("超级管理员")).collect(Collectors.toList());
+                ajax.put("roleIds", roLe.stream().map(SysRole::getRoleId).collect(Collectors.toList())); 
             }else {
                 ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
             }