首页相机地图-解除未解除问题

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

@@ -36,7 +36,7 @@ public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
     //报警月统计数据导出数据集合
     List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("currentYear") Integer currentYear, @Param("currentMonth") Integer currentMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
 
-    Map selectCameraCode(@Param("cameraCode") String cameraCode);
+    Integer selectCameraCode(@Param("cameraCode") String cameraCode);
 
     MsgAlarm selectByCameraCode(@Param("cameraCode") String cameraCode);
 

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

@@ -191,12 +191,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectCameraManagementList(baseCameraManagementVo);
         List<BaseCameraManagementHomeVo> allListVo = BeanUtils.entityListToVOList(baseCameraManagementList, BaseCameraManagementHomeVo.class);
         for (BaseCameraManagementHomeVo baseCameraManagementHomeVo : allListVo) {
-            Map map = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
-            String isLock = "1";
-            if (!StringUtils.isEmpty(map) && !StringUtils.isEmpty(map.get("isLock"))) {
-                isLock = map.get("isLock").toString();
-            }
-            baseCameraManagementHomeVo.setIsLock(Integer.valueOf(isLock));
+            Integer isLock = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
+            baseCameraManagementHomeVo.setIsLock(isLock != null ? isLock : 1);
         }
         return allListVo;
     }

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

@@ -175,8 +175,8 @@
         group by a.alarm_id) AS p group by p.monthsta
     </select>
 
-    <select id="selectCameraCode" parameterType="java.lang.String" resultType="java.util.Map">
-        select is_lock isLock, max(alarm_time) from msg_alarm where camera_code = #{cameraCode}
+    <select id="selectCameraCode" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select is_lock from msg_alarm where camera_code = #{cameraCode} ORDER BY alarm_time DESC LIMIT 1
     </select>
 
     <select id="selectByCameraCode" parameterType="java.lang.String" resultType="com.ozs.service.entity.MsgAlarm">

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

@@ -11,7 +11,6 @@ import com.ozs.common.utils.StringUtils;
 import com.ozs.framework.web.service.TokenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ozs.common.constant.Constants;
@@ -50,9 +49,6 @@ public class SysLoginController extends BaseController {
 
     @Autowired
     private RedisCache redisCache;
-    // 令牌自定义标识
-    @Value("${token.header}")
-    private String header;
 
     /**
      * 登录方法
@@ -61,10 +57,13 @@ public class SysLoginController extends BaseController {
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody, HttpServletRequest request) {
-        // 判断账号是否在其他电脑登陆/**/
-        if (!ObjectUtils.isEmpty(request.getHeader(this.header))) {
-            request.removeAttribute(header);
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
+        // 判断账号是否在其他电脑登陆
+        String userId = loginService.getUserIdByUserName(loginBody.getUsername());
+        log.info("111111111-----" + userId);
+        if (!StringUtils.isEmpty(userId)) {
+            log.info("22222222-----" + userId);
+            redisCache.deleteObject(userId);
         }
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌