Merge remote-tracking branch 'origin/prod-5.1.3' into prod-5.1.3

hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/processflow/mapper/ProcessDictMapper.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.middle.processflow.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.middle.processflow.entity.ProcessDict;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -9,6 +10,6 @@ import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
  * @Serial 1.0
  * @Date 2023/6/5 8:49
  */
-public interface ProcessDictMapper  extends UserDataScopeBaseMapper<ProcessDict> {
+public interface ProcessDictMapper  extends BaseMapper<ProcessDict> {
 
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ProjectMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzinfo.inspect.obj.entity.ProjectEntity;
 import com.hnac.hzinfo.inspect.obj.vo.ProjectOfflineVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
 import java.util.List;
 
@@ -11,7 +13,8 @@ import java.util.List;
  * 巡检项目
  */
 @Mapper
-public interface ProjectMapper extends BaseMapper<ProjectEntity> {
+public interface ProjectMapper extends UserDataScopeBaseMapper<ProjectEntity> {
 
+	@UserDataAuth
 	List<ProjectOfflineVO> getProjectData(String tenantId);
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/web/ProjectController.java

@@ -20,10 +20,10 @@ import com.hnac.hzinfo.inspect.obj.services.impl.ProjectContentServiceImpl;
 import com.hnac.hzinfo.inspect.obj.utils.CodeUtils;
 import com.hnac.hzinfo.inspect.obj.vo.ProjectListQueryVO;
 import com.hnac.hzinfo.inspect.obj.vo.ProjectVO;
-import com.hnac.hzinfo.inspect.utils.Condition;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/HikVideoServiceImpl.java

@@ -53,6 +53,9 @@ public class HikVideoServiceImpl implements IHikVideoService {
         String contentType = "application/json";
         String resultStr = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null);
         JSONObject resultObj = JSONObject.parseObject(resultStr);
+        if(ObjectUtil.isEmpty(resultObj)){
+            throw new ServiceException("该平台信息录入有误，无法找到对应点位！");
+        }
         Assert.isTrue("0".equals(resultObj.getString("code")),()-> {
             throw new ServiceException(resultObj.getString("msg"));
         });