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

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

@@ -0,0 +1,152 @@
+package com.ozs.service.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 相机台账管理表
+ * </p>
+ *
+ * @author ozs
+ * @since 2023-02-17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("相机台账管理表")
+public class BaseCameraManagementHomeVo extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 相机编码
+     */
+    @Excel(name = "相机编码")
+    private String cameraCode;
+
+    /**
+     * 通道编号
+     */
+    @Excel(name = "通道编号")
+    private String channel;
+
+    /**
+     * 所属工务段编码(单位id)
+     */
+    @Excel(name = "所属工务段编码(单位id)")
+    private Long deptId;
+
+    /**
+     * 行别(1上行2下行）
+     */
+    @Excel(name = "行别")
+    private Integer lineDir;
+
+    /**
+     * 监控相机安装里程位置
+     */
+    @Excel(name = "监控相机安装里程位置")
+    private Integer installMile;
+
+    /**
+     * 监控范围开始里程位置
+     */
+    @Excel(name = "监控范围开始里程位置")
+    private Integer beginMile;
+
+    /**
+     * 监控范围结束里程位置
+     */
+    @Excel(name = "监控范围结束里程位置")
+    private Integer endMile;
+
+    /**
+     * 监视相机经度
+     */
+    @Excel(name = "监视相机经度")
+    private String installLongitude;
+
+    /**
+     * 监视相机纬度
+     */
+    @Excel(name = "监视相机纬度")
+    private String installLatitude;
+
+    /**
+     * 线路编码
+     */
+    @Excel(name = "线路编码")
+    private String railwayCode;
+
+    /**
+     * 物联网卡号
+     */
+    @Excel(name = "物联网卡号")
+    private String cardNum;
+
+    /**
+     * 是否开启录像(1开启2不开启)
+     */
+    @Excel(name = "是否开启录像")
+    private Integer startRecording;
+
+    /**
+     * 录像接口返回的任务ID
+     */
+    @Excel(name = "录像接口返回的任务ID")
+    private String taskId;
+
+
+    /**
+     * 监控相机安装里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String installMiles;
+
+    /**
+     * 监控范围开始里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String beginMiles;
+
+    /**
+     * 监控范围结束里程位置字符串形式
+     */
+    @TableField(exist = false)
+    private String endMiles;
+
+    /**
+     *线路名称
+     */
+    @TableField(exist = false)
+    private String railwayName;
+
+    /**
+     *所属工务段名称
+     */
+    @TableField(exist = false)
+    private String deptName;
+
+    /**
+     * 报警是否解除 1已解除2未解除
+     */
+    private Integer isLock;
+}

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -32,4 +33,6 @@ public interface MsgAlarmMapper extends BaseMapper<MsgAlarm> {
 
     //报警月统计数据导出数据集合
     List<AlarmStatisticMonthDto> listDtoMonth(@Param("railwayCode") String railwayCode, @Param("startMonth") Integer startMonth, @Param("endMonth") Integer endMonth, @Param("alarmType") String alarmType, @Param("userId") String userId);
+
+    Map selectCameraCode(@Param("cameraCode") String cameraCode);
 }

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

@@ -33,4 +33,6 @@ 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/BaseCameraManagementService.java

@@ -3,6 +3,7 @@ package com.ozs.service.service;
 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 java.util.List;
 
@@ -24,7 +25,7 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
      */
     String importBaseAccountManagement(List<BaseCameraManagement> accountManageList, boolean updateSupport);
 
-    List<BaseCameraManagement> selectCameraAll(String userId);
+    List<BaseCameraManagementHomeVo> selectCameraAll(String userId);
 
     List<String> getUserIds(String userId);
 }

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

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

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

@@ -4,14 +4,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.exception.ServiceException;
 import com.ozs.common.utils.StringUtils;
+import com.ozs.common.utils.bean.BeanUtils;
 import com.ozs.common.utils.bean.BeanValidators;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.BaseUser;
+import com.ozs.service.entity.MsgAlarm;
+import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
 import com.ozs.service.mapper.BaseCameraManagementMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
 import com.ozs.service.mapper.BaseUserMapper;
+import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseUserService;
 import com.ozs.service.utils.DataPermissionUtils;
@@ -21,10 +25,7 @@ import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * <p>
@@ -46,6 +47,8 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     private BaseUserService baseUserService;
     @Resource
     private BaseUserMapper baseUserMapper;
+    @Resource
+    private MsgAlarmMapper msgAlarmMapper;
 
     /**
      * 相机台账管理表导入
@@ -117,14 +120,22 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
      * @return
      */
     @Override
-    public List<BaseCameraManagement> selectCameraAll(String userId) {
+    public List<BaseCameraManagementHomeVo> selectCameraAll(String userId) {
         List<String> userIdList = getUserIds(userId);
         LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();
-        if (!ObjectUtils.isEmpty(userIdList)) {
+        if (!StringUtils.isEmpty(userIdList)) {
             lw.in(BaseCameraManagement::getCreateBy, userIdList);
         }
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
-        return baseCameraManagementList;
+        List<BaseCameraManagementHomeVo> allListVo = BeanUtils.entityListToVOList(baseCameraManagementList, BaseCameraManagementHomeVo.class);
+        for (BaseCameraManagementHomeVo baseCameraManagementHomeVo : allListVo) {
+            Map map = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
+            if (!StringUtils.isEmpty(map) && !StringUtils.isEmpty(map.get("isLock"))) {
+                String isLock = map.get("isLock").toString();
+                baseCameraManagementHomeVo.setIsLock(Integer.valueOf(isLock));
+            }
+        }
+        return allListVo;
     }
 
     /**

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

@@ -1,6 +1,8 @@
 package com.ozs.service.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.common.utils.StringUtils;
 import com.ozs.service.entity.MsgAppPush;
 import com.ozs.service.entity.vo.MsgAppPushVo;
 import com.ozs.service.mapper.MsgAppPushMapper;
@@ -31,4 +33,10 @@ 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/resources/mapper/service/MsgAlarmMapper.xml

@@ -222,4 +222,8 @@
         group by a.alarm_id,MONTH(a.alarm_time)
 
     </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>
 </mapper>

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

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

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

@@ -22,6 +22,7 @@ import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.CameraTree;
 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.BaseCameraResVo;
 import com.ozs.service.entity.vo.MsgAlarmResp;
@@ -94,7 +95,7 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/selectCameraAll")
     public AjaxResult selectCameraAll() {
         String userId = getUserId();
-        List<BaseCameraManagement> baseCameraManagements = baseCameraManagementService.selectCameraAll(userId);
+        List<BaseCameraManagementHomeVo> baseCameraManagements = baseCameraManagementService.selectCameraAll(userId);
         return AjaxResult.success(baseCameraManagements);
     }
 

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

@@ -4,14 +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.service.MsgAppPushService;
 import com.ozs.service.service.UserRegistrationidService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -24,6 +22,19 @@ import org.springframework.web.multipart.MultipartFile;
 public class JPushAppController extends BaseController {
     @Autowired
     private UserRegistrationidService userRegistrationidService;
+    @Autowired
+    private MsgAppPushService msgAppPushService;
+
+    /**
+     * app报警推送次数
+     */
+    @GetMapping("/appAlarmNum")
+    @ApiOperation("app报警推送次数")
+    public AjaxResult appAlarmNum() {
+        String userId = getUserId();
+        Integer appAlarmNum = msgAppPushService.appAlarmNum(userId);
+        return AjaxResult.success(appAlarmNum);
+    }
 
     /**
      * 存储RegistrationID