代码合并

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/View3dController.java

@@ -36,8 +36,9 @@ public class View3dController extends BaseController {
 	@ApiOperation(value = "区域树查询", notes = "区域树查询")
     @GetMapping(value = "/region/tree")
     public CommonResponse getRegionTree() {
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		String channelType = this.getChannelType();
         return CommonResponseUtil.success(riskSourceService.findRegionTree(channelType,orgCode));
     }
@@ -45,8 +46,9 @@ public class View3dController extends BaseController {
 	@ApiOperation(value = "区域详情查询", notes = "区域详情查询")
     @GetMapping(value = "region/detail/{riskSourceId}")
     public CommonResponse getRegionDetail(@PathVariable("riskSourceId") Long riskSourceId) {
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		String channelType = this.getChannelType();
         return CommonResponseUtil.success(riskSourceService.findRegionById(riskSourceId,orgCode,channelType));
     }
@@ -71,9 +73,10 @@ public class View3dController extends BaseController {
 	@ApiOperation(value = "按照分类查询点树", notes = "按照分类查询点树")
     @GetMapping(value = "point/tree/{type}")
     public CommonResponse getPointTreeByType(@PathVariable(value="type") String type) {
-		if(ResourceTypeDefEnum.containsTypeCode(type)) {		
-			ReginParams reginParams =getSelectedOrgInfo();
-			String orgCode = this.getOrgCode(reginParams);
+		if(ResourceTypeDefEnum.containsTypeCode(type)) {
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+			String orgCode ="1*2";
 			String channelType = this.getChannelType();
 			return CommonResponseUtil.success(view3dService.getPointTreeByType(type,orgCode,channelType));
 		}
@@ -83,32 +86,36 @@ public class View3dController extends BaseController {
 	@ApiOperation(value = "按照不同类型查询点详情", notes = "按照不同类型查询点详情")
     @GetMapping(value = "point/detail")
     public CommonResponse getPointDetail(String type,Long pointId) {
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getPointDetailByTypeAndId(type,pointId,orgCode));
     }
 	
 	@ApiOperation(value = "一周安全指数趋势查询", notes = "一周安全指数趋势查询")
     @GetMapping(value = "safetyIndex/week")
     public CommonResponse safetyIndexWeek(String type,Long pointId) {
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyIndexWeek(orgCode));
     }
 
     @ApiOperation(value = "今日安全指数查询",notes = "按照日期查询安全指数及分类数据")
 	@GetMapping(value = "/statistics/safetyIndex")
 	public CommonResponse getSafetyIndexInfoByDate(@RequestParam(name = "date",required = false) String date){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyIndexInfoByDate(orgCode,date));
 	}
 
 	@ApiOperation(value = "今日安全指数详情",notes = "今日安全指数详情")
 	@GetMapping(value = "/safetyIndex/detail/{type}")
 	public CommonResponse getSafetyIndexDetail(@ApiParam(value = "risk-风险异常,check-巡检异常,equip-设备故障") @PathVariable String type){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyIndexDetail(type,orgCode));
 	}
 
@@ -116,40 +123,45 @@ public class View3dController extends BaseController {
 	@GetMapping(value = "/online/date")
 	public CommonResponse getSystemOnlineDate(){
 		//TODO: 多机构暂时不支持
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getSystemOnlineDate(orgCode));
 	}
 	
 	@ApiOperation(value = "今日巡检统计接口",notes = "今日巡检统计接口")
 	@GetMapping(value = "statistics/check")
 	public CommonResponse getStatisticsCheck(){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getStatisticsCheck(orgCode));
 	}
 	
 	@ApiOperation(value = "异常显示最新5条",notes = "异常显示最新5条")
 	@GetMapping(value = "safetyExecute/list/{type}")
 	public CommonResponse getSafetyExecuteListTop5(@PathVariable("type")String type){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getSafetyExecuteListTop5(type,orgCode));
 	}
 	
 	@ApiOperation(value = "今日值班统计",notes = "今日值班统计")
 	@GetMapping(value = "statistics/duty")
 	public CommonResponse getStatisticsDuty(){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return view3dService.getStatisticsDuty(getAppKey(),getProduct(),orgCode);
 	}
 
 	@ApiOperation(value = "异常区域信息查询",notes = "异常区域信息查询")
 	@GetMapping(value = "region/exception/list")
 	public CommonResponse getExceptionRegion(){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		List<ExceptionRegionVo> exceptionRegionVoList = view3dService.getExceptionRegion(orgCode);
 		return CommonResponseUtil.success(exceptionRegionVoList);
 	}
@@ -157,24 +169,27 @@ public class View3dController extends BaseController {
 	@ApiOperation(value = "设备状态信息查询",notes = "设备状态信息查询")
 	@GetMapping(value = "equipStatus/list")
 	public CommonResponse getEquipStatusList(){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.getEquipStatusList(orgCode));
 	}
 	
 	@ApiOperation(value = "3d视图点显示",notes = "3d视图点显示")
 	@GetMapping(value = "initViewNode")
 	public CommonResponse initViewNode(String type,Long riskSourceId){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return CommonResponseUtil.success(view3dService.initViewErrorNode(type,riskSourceId,orgCode));
 	}
 
 	@ApiOperation(value = "按照点类型查询点列表",notes = "按照点类型查询点列表")
 	@GetMapping(value = "point/list")
 	public CommonResponse get3dPointsByType(@RequestParam(required = false,defaultValue = "grain") String model){
-		ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		return view3dService.get3dPointsByModel(orgCode,model);
 	}
 	
@@ -201,8 +216,9 @@ public class View3dController extends BaseController {
     public CommonResponse init3dViewNode(
             @ApiParam(value = "节点类型", required = false) @RequestParam(required = false) String type,
             @ApiParam(value = "区域ID", required = false) @RequestParam(required = false) Long riskSourceId) {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
         return CommonResponseUtil.success(view3dService.find3dViewDataByType(type,riskSourceId,orgCode));
     }
     
@@ -216,8 +232,9 @@ public class View3dController extends BaseController {
 			@RequestParam(required = false) String dataLevel,
 			@RequestParam(required = false) String protectObjName
 			) {
-    	ReginParams reginParams =getSelectedOrgInfo();
-		String orgCode = this.getOrgCode(reginParams);
+//		ReginParams reginParams =getSelectedOrgInfo();
+//		String orgCode = this.getOrgCode(reginParams);
+		String orgCode ="1*2";
 		String token = this.getToken();
 		String appKey = this.getAppKey();
 		String product = this.getProduct();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

@@ -723,7 +723,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             //保存实时数据
             saveFireEquipmentData(fireEquipmentPoint, fireEquipment, deviceData, fireEquipmentPointType);
             equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(fireEquipmentPoint.getFireEquipmentId());
-            if (equipment != null) {
+            if (equipment != null && "alarm_type_fire".equals(fireEquipmentPointType)) {
             	//动态预案执行
             	dynamicPlan(deviceData, equipment, fireEquipment, fireEquipmentPointType);
             }
@@ -829,10 +829,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     		if(alarm != null){
 				if ("alarm_type_trouble".equals(fireEquipmentPointType)) {
                     //通知刷新3d页面相关故障数据
-					if(alarm.getFrequency()==1 || alarm.getStatus() == false){
 					 notifyAlarm(fireEquipmentPoint, deviceData);
                      iDataRefreshService.refreshViewData(DataRefreshTypeEum.trouble.getCode());
-					}
                 }else{
                 	 //通知刷新3d页面告警数据
                     iDataRefreshService.refreshViewData(DataRefreshTypeEum.alarm.getCode());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/client/invoke/RsDataQueue.java

@@ -115,7 +115,7 @@ public class RsDataQueue {
                         String userName = fmeaMessage.getUserName();
                         String relationName = fmeaMessage.getRelationName();
                         String checkStatus =null;
-                        if(fmeaMessage.getCheckStatus()!=null){
+                        if(fmeaMessage.getCheckStatus()!=null && fmeaMessage.getCheckStatus()!=""){
                             checkStatus =(fmeaMessage.getCheckStatus().equals("1"))?"合格":"不合格";
                         }
                         if (from.equals(TriggerRpnChangeTypeEum.patrol.getCode())) {