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

business-service/src/main/java/com/ozs/service/entity/BaseCameraManagement.java

@@ -146,4 +146,10 @@ public class BaseCameraManagement extends BaseEntity implements Serializable {
     @TableField(exist = false)
     @Excel(name = "所属工务段名称")
     private String deptName;
+
+    /**
+     *是否显示启用录像按钮(1显示2不显示)
+     */
+    @TableField(exist = false)
+    private Integer isStartRecording;
 }

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

@@ -35,4 +35,6 @@ public interface BaseUserMapper extends BaseMapper<BaseUser> {
     BaseUser getUser(@Param("userId") String userId);
     
     BaseUser getUserName(@Param("userName") String userName);
+    
+    List<String> getRoleName(@Param("userId")String userId);
 }

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

@@ -5,6 +5,7 @@ import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseUser;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -16,5 +17,7 @@ public interface BaseUserService extends IService<BaseUser> {
 
     BaseUser getUser(String userId);
 
-    BaseUser getUserName(@Param("userName") String userName);;
+    BaseUser getUserName(@Param("userName") String userName);
+
+    List<String> getRoleName(@Param("userId")String userId);
 }

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

@@ -63,4 +63,9 @@ public class BaseUserServiceImpl extends ServiceImpl<BaseUserMapper, BaseUser> i
     public BaseUser getUserName(String userName) {
         return baseUserMapper.getUserName(userName);
     }
+
+    @Override
+    public List<String> getRoleName(String userId) {
+        return baseUserMapper.getRoleName(userId);
+    }
 }

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

@@ -62,7 +62,7 @@
     </select>
 
     <select id="getUser" resultType="com.ozs.service.entity.BaseUser" parameterType="java.lang.String">
-        select user_id userId, dept_id deptId, data_permission dataPermission,nick_name nickName from sys_user where user_id = #{userId}
+        select user_id userId, dept_id deptId, data_permission dataPermission,nick_name nickName,user_name userName from sys_user where user_id = #{userId}
     </select>
     <select id="getUserName" resultType="com.ozs.service.entity.BaseUser" parameterType="java.lang.String">
         select user_id userId, dept_id deptId, data_permission dataPermission from sys_user where user_name = #{userName}
@@ -71,4 +71,8 @@
         select user_id
         from sys_user
     </select>
+    <select id="getRoleName" resultType="java.lang.String" parameterType="java.lang.String">
+        SELECT  r.role_name FROM `sys_user` u JOIN sys_user_role ur ON u.id=ur.user_id JOIN sys_role r 
+         ON ur.role_id=r.role_id WHERE u.user_id=#{userId}
+    </select>
 </mapper>

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

@@ -25,6 +25,7 @@ import com.ozs.framework.config.ServerConfig;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
@@ -35,6 +36,7 @@ import com.ozs.service.entity.vo.MsgAlarmResp;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
+import com.ozs.service.service.BaseUserService;
 import com.ozs.service.service.MsgAlarmService;
 import com.ozs.system.service.DataScoreUtil;
 import com.ozs.system.service.ISysDeptService;
@@ -67,6 +69,7 @@ import java.text.Collator;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -99,6 +102,8 @@ public class BaseCameraManagementController extends BaseController {
     private IdempotenceUtils idempotenceUtils;
     @Autowired
     private DataScoreUtil dataScoreUtil;
+    @Resource
+    private BaseUserService baseUserService;
 
     /**
      * 所有相机列表+权限
@@ -183,6 +188,7 @@ public class BaseCameraManagementController extends BaseController {
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());
         page.setPages(page.getPages());
+        List<String> roleName = baseUserService.getRoleName(getUserId());
         if (!ObjectUtils.isEmpty(page) && page.getRecords().size() > 0) {
             List<BaseCameraManagement> dto1 = page.getRecords().stream().map(o -> {
                 LambdaQueryWrapper<BaseRailwayManagement> queryWrapper = new LambdaQueryWrapper<BaseRailwayManagement>();
@@ -199,6 +205,13 @@ public class BaseCameraManagementController extends BaseController {
                 o.setEndMiles(end);
                 String begin = AppendUtils.stringAppend(o.getBeginMile());
                 o.setBeginMiles(begin);
+                if (roleName.size()>0){
+                    for (String s : roleName) {
+                        if ("超级管理员".equals(s)){
+                            o.setIsStartRecording(1);
+                        }
+                    }
+                }
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -688,7 +701,7 @@ public class BaseCameraManagementController extends BaseController {
             baseCameraManagement.setTaskId(start);
             baseCameraManagement.setUpdateBy(getUserId());
         } else {
-            return error("开启视频录制失败");
+            return success("开启视频录制失败:请确认流是否存在或流是否开启");
         }
         if (baseCameraManagementService.updateById(baseCameraManagement)) {
             return success();

hazard-admin/src/main/java/com/ozs/web/core/config/CaneraConfig.java

@@ -28,7 +28,7 @@ public class CaneraConfig {
     /**
      * 录制视频存放路径
      */
-    @Value("${base.transcribeFilePath:/opt/streams/record/flv/}")
+    @Value("${base.transcribeFilePath:/opt/streams/record/flv}")
     private String transcribeFilePath;
 
 

hazard-admin/src/main/java/com/ozs/web/core/util/CameraUtil.java

@@ -384,6 +384,7 @@ public class CameraUtil {
     public void deleteFlvExceed() throws IOException, InterruptedException {
         //字典中设置的值
         List<SysDictData> sysCameraRecordTime = dictDataMapper.selectDictDataByType("sys_camera_record_time");
+        log.info("sysCameraRecordTime======================================" + sysCameraRecordTime.get(0).getDictValue());
         //开启流
         List<String> rspList = new ArrayList<String>();
         Process proc = Runtime.getRuntime().exec(transcribeFilePath, null, null);
@@ -405,6 +406,8 @@ public class CameraUtil {
         date = calendar.getTime();
         //时间格式化为字符串
         String formatD = sdf.format(date);
+        log.info("formatD======================================" + formatD);
+
         //遍历每个进行视频录制的摄像头
         File file = new File(transcribeFilePath);
         if (file.exists()) {
@@ -417,15 +420,17 @@ public class CameraUtil {
                 List<String> commands = new ArrayList<>();
                 for (Map<String, Object> map : maps) {
                     Object path = map.get("Path");
-                    ////查出符合条件的视频文件，删掉
-                    //if (!ObjectUtils.isEmpty(path)) {
-                    //    String commit = " rm -rf  " + transcribeFilePath + formatD + "*";
-                    //    commands.add(commit);
-                    //}
+                    log.info("path======================================" + path.toString());
+                    //查出符合条件的视频文件，删掉
+                    if (!ObjectUtils.isEmpty(path)) {
+                        String commit = " rm -rf  " + transcribeFilePath + "/" + path.toString() + "/" + formatD + "*";
+                        commands.add(commit);
+                    }
                 }
                 // 删除
                 for (String line : commands) {
                     out.println(line);
+                    log.info("line======================================" + line);
                 }
             }
         }

hazard-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -42,7 +42,7 @@ import java.util.*;
 @RestController
 @Slf4j
 public class GeoHazardMonitorTokenController {
-
+    public static final String PATTERN = "^([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)$";
     @Resource
     private ApiTokenUtils apiTokenUtils;
     @Resource
@@ -128,6 +128,12 @@ public class GeoHazardMonitorTokenController {
         if (StringUtils.isNotEmpty(token)) {
             String s = SM4Utils.decryptData_ECB(parameter, "4370780c9a8c43e5");
             ReqMsgAlarmVo reqMsgAlarmVo = JSON.parseObject(s, ReqMsgAlarmVo.class);
+            if (!reqMsgAlarmVo.getAlarmAttr().matches(PATTERN)) {
+                jsonObject.put("resultCode", 2);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "你填写的报警病害属性不符合规则!!!");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
             log.info("reqMsgAlarmVo:{}", reqMsgAlarmVo);
             RespMsgAlarmVo respMsgAlarmVo = new RespMsgAlarmVo();
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<BaseCameraManagement>();
@@ -136,6 +142,12 @@ public class GeoHazardMonitorTokenController {
             }
             BaseCameraManagement baseCameraManagement = baseCameraManagementService.getOne(wrapper);
             log.info("baseCameraManagement:{}", baseCameraManagement);
+            if (ObjectUtils.isEmpty(baseCameraManagement)){
+                jsonObject.put("resultCode", 2);
+                jsonObject.put("message", "失败");
+                jsonObject.put("data", "你填写的相机编码不存在!!!");
+                return SM4Utils.encryptData_ECB(JSONObject.toJSONString(jsonObject), "4370780c9a8c43e5");
+            }
             if (ObjectUtils.isEmpty(reqMsgAlarmVo.getLineDir())) {
                 reqMsgAlarmVo.setLineDir(baseCameraManagement.getLineDir());
             }