Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 3b517953 authored by 高建强's avatar 高建强
Browse files
Options

item:三维查询搜索接口新增

parent 70a6e9f7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 23 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java
View file @ 3b517953
......@@ -281,6 +281,30 @@ public class View3dController extends BaseController {
}
@Permission
@PostMapping(value = "/retrieve3/all",produces = "application/json;charset=UTF-8")
@ApiOperation(value = "右侧边栏搜索", notes = "右侧边栏搜索")
public CommonResponse retrieve3All(
@RequestBody RetrieveParams params
) {
ReginParams reginParams =getSelectedOrgInfo();
String orgCode = this.getOrgCode(reginParams);
String token = this.getToken();
String appKey = this.getAppKey();
String product = this.getProduct();
return view3dService.retrieve3All(params.getType(),
params.getRiskSourceId(),
params.getAreaId(),
params.getEquipmentId(),
params.getInputText(),
params.getCurrent(),
params.getPageSize(),
orgCode,
params.getDataLevel(),
token,appKey,product);
}
@Permission
@ApiOperation(value = "等级查询",notes = "等级查询")
@GetMapping(value = "point/level")
public CommonResponse pointLevel(@ApiParam(value = "点类型") @RequestParam String type){
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/View3dMapper.java
View file @ 3b517953
package com.yeejoin.amos.fas.business.dao.mapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.fas.business.bo.CheckErrorBo;
import com.yeejoin.amos.fas.business.bo.RiskPointRpnChangeBo;
import com.yeejoin.amos.fas.business.bo.SafetyExecuteBo;
import com.yeejoin.amos.fas.business.vo.View3dNodeVo;
import com.yeejoin.amos.fas.dao.entity.RiskSource;
import org.apache.ibatis.annotations.Param;
import com.yeejoin.amos.fas.core.common.response.Node3DVoResponse;
import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
import org.apache.ibatis.annotations.Param;
public interface View3dMapper extends BaseMapper{
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public interface View3dMapper extends BaseMapper {
/**
* 按类型查询点
*
* @param type
* @param orgCode
* @return
*/
List<RegionTreeResponse> getPointByType(@Param("type")String type,@Param("orgCode")String orgCode,@Param("channelType") String channelType);
List<RegionTreeResponse> getPointByType(@Param("type") String type, @Param("orgCode") String orgCode, @Param("channelType") String channelType);
/**
* 获取点详情
*
* @param type
* @param pointId
* @return map
*/
HashMap<String, Object> getPointDetailByTypeAndId(@Param("type")String type, @Param("pointId")Long pointId);
HashMap<String, Object> getPointDetailByTypeAndId(@Param("type") String type, @Param("pointId") Long pointId);
/**
* 统计风险上升异常数量（风险点）-日期+机构
*
* @param param:{type，orgCode}
* @return Long
*/
Long countUpperRiskPoint(Map<String,Object> param);
Long countUpperRiskPoint(Map<String, Object> param);
/**
* 统计巡检异常数量（不合格、漏检）-日期+机构
*
* @param param{}
* @return Long
*/
Long countCheckException(Map<String,Object> param);
Long countCheckException(Map<String, Object> param);
/**
* 统计故障告警数量（不合格、漏检）-日期+机构
*
* @param param
* @return
*/
Long countFireException(Map<String,Object> param);
Long countFireException(Map<String, Object> param);
/**
* 今日安全指数详情
*
* @param params orgCode,date
* @return list
*/
......@@ -61,13 +65,15 @@ public interface View3dMapper extends BaseMapper{
/**
* 一周安全指数趋势查询
*
* @param orgCode
* @return
*/
List<HashMap<String, Object>> getSafetyIndexWeek(@Param("orgCode")String orgCode);
List<HashMap<String, Object>> getSafetyIndexWeek(@Param("orgCode") String orgCode);
/**
* 今日安全指数详情
*
* @param params orgCode,date
* @return list
*/
......@@ -76,6 +82,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 今日安全指数故障告警详情
*
* @param params orgCode,date
* @return list
*/
......@@ -83,6 +90,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 今日巡检统计接口
*
* @param orgCode
* @return
*/
......@@ -90,6 +98,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 风险异常显示最新5条
*
* @param orgCode
* @return
*/
......@@ -97,6 +106,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 巡检异常示最新5条
*
* @param orgCode
* @return
*/
......@@ -104,6 +114,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 火灾告警最新5条
*
* @param orgCode
* @return
*/
......@@ -111,6 +122,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 设备状态最新5条
*
* @param orgCode
* @return
*/
......@@ -118,6 +130,7 @@ public interface View3dMapper extends BaseMapper{
/**
* 按照类型查询点
*
* @param params {orgCode,type}
* @return 列表
*/
......@@ -130,27 +143,34 @@ public interface View3dMapper extends BaseMapper{
/**
* 重点模式设备
*
* @return
*/
List<View3dNodeVo> getImpEqu3dPoints(String orgCode);
/**
* 异常点
*
* @param type
* @param orgCode
* @param riskSourceId 区域id
* @return
*/
List<View3dNodeVo> initViewErrorNode(String type,Long riskSourceId, String orgCode);
List<View3dNodeVo> initViewErrorNode(String type, Long riskSourceId, String orgCode);
List<Node3DVoResponse> findViewDataByType(@Param("type") String type, @Param("riskSourceId") Long riskSourceId, @Param("orgCode") String orgCode, @Param("abnormalStatus") Boolean abnormalStatus);
Long retrieveAllCount(String type, Long riskSourceId, String inputText, String orgCode, String dataLevel, String protectObjName);
List<Node3DVoResponse> findViewDataByType(@Param("type")String type,@Param("riskSourceId")Long riskSourceId,@Param("orgCode")String orgCode,@Param("abnormalStatus")Boolean abnormalStatus);
List<HashMap<String, Object>> retrieveAll(String type, Long riskSourceId, String inputText, long start, int length, String orgCode, String dataLevel, String protectObjName);
Long retrieveAllCount(String type, Long riskSourceId, String inputText,String orgCode,String dataLevel,String protectObjName);
Long retrieve3AllCount(String type, Long riskSourceId, Long areaId, Long equipmentId, String inputText, String orgCode, String dataLevel);
List<HashMap<String, Object>> retrieveAll(String type, Long riskSourceId, String inputText, long start, int length,String orgCode,String dataLevel,String protectObjName);
List<HashMap<String, Object>> retrieve3All(String type, Long riskSourceId, Long areaId, Long equipmentId, String inputText, long start, int length, String orgCode, String dataLevel);
/**
* 查询区域下点
*
* @param ids 区域ids
* @return list
*/
......
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/param/RetrieveParams.java
View file @ 3b517953
......@@ -9,6 +9,8 @@ public class RetrieveParams {
private String dataLevel;
private String protectObjName;
private String riskSourceId;
private Long areaId;
private Long equipmentId;
public String getRiskSourceId() {
return riskSourceId;
......@@ -55,6 +57,19 @@ public class RetrieveParams {
this.protectObjName = protectObjName;
}
public Long getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
this.areaId = areaId;
}
public Long getEquipmentId() {
return equipmentId;
}
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
}
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IView3dService.java
View file @ 3b517953
package com.yeejoin.amos.fas.business.service.intfc;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.fas.business.bo.BindPointBo;
import com.yeejoin.amos.fas.business.bo.SafetyExecuteBo;
import com.yeejoin.amos.fas.business.vo.ExceptionRegionVo;
......@@ -15,6 +11,10 @@ import com.yeejoin.amos.fas.core.common.response.Node3DVoResponse;
import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
import com.yeejoin.amos.fas.core.util.CommonResponse;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author DELL
*/
......@@ -160,11 +160,26 @@ public interface IView3dService {
CommonResponse retrieveAll(String type, String riskRourceId, String inputText, int current, int pageSize,String orgCode,String dataLevel,String protectObjName,String token,String appKey,String product);
/**
* 检索
*
* @param type 类型
* @param riskRourceId
* @param inputText 关键字
* @param dataLevel 风险等级
* @param current
* @param pageSize
* @param orgCode
* @return
*/
CommonResponse retrieve3All(String type, String riskRourceId, Long areaId, Long equipmentId, String inputText, int current, int pageSize, String orgCode, String dataLevel, String token, String appKey, String product);
/**
* 等级查询
*
* @param type
* @return
*/
List<Map<String,String>> pointLevelList(String type);
List<Map<String, String>> pointLevelList(String type);
/**
* 查询区域下的各类点
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment