解决冲突

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/SimpleTipAction.java

@@ -2,31 +2,21 @@ package com.yeejoin.amos.fas.business.action;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import com.yeejoin.amos.fas.business.action.el.ELEvaluationContext;
-import com.yeejoin.amos.fas.business.action.model.RiskSourceRuleRo;
 import com.yeejoin.amos.fas.business.action.mq.StationEnum;
 import com.yeejoin.amos.fas.business.action.mq.WebMqttComponent;
-import com.yeejoin.amos.fas.business.action.result.AbstractActionResult;
 import com.yeejoin.amos.fas.business.action.result.ActionResult;
 import com.yeejoin.amos.fas.business.action.result.TipResult;
 import com.yeejoin.amos.fas.business.action.result.message.AbstractActionResultMessage;
-import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
 import com.yeejoin.amos.fas.business.action.util.DataItemUtil;
 import com.yeejoin.amos.fas.business.service.intfc.IMessageService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
-import com.yeejoin.amos.fas.core.common.request.DateUtil;
-import com.yeejoin.amos.fas.core.util.StringUtil;
-import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
-import com.yeejoin.amos.fas.dao.entity.Message;
-import com.yeejoin.amos.fas.dao.entity.MessageRo;
 
 /**
  * 
@@ -54,7 +44,7 @@ public class SimpleTipAction implements CustomerAction
     private String serviceName;
     
 	//@ExposeAction("消息提示")
-	public void sendMessageTip(Object bizobj, String title, String content,String type)
+	public void sendMessageTip(Object bizobj, String title, String content, String type)
 	{
 		try
 		{
@@ -90,7 +80,7 @@ public class SimpleTipAction implements CustomerAction
 			e.printStackTrace();
 		}
 	}
-//	
+	
 //	@SuppressWarnings("unchecked")
 //	private void saveMessageAction(AbstractActionResult abstractActionResult,String type)
 //	{
@@ -106,6 +96,9 @@ public class SimpleTipAction implements CustomerAction
 //						message.setTitle(map.get("title").toString());
 //					}
 //			}
+//			if(!StringUtil.isNotEmpty(message.getContent())){
+//				continue;
+//			}
 //			if (abstractActionResult.getToipResponse().getBizObj() instanceof MessageRo) {
 //				MessageRo messageRo = (MessageRo)abstractActionResult.getToipResponse().getBizObj();
 //				message.setTime(messageRo.getDateTime());
@@ -117,6 +110,16 @@ public class SimpleTipAction implements CustomerAction
 //				message.setBizId(StringUtil.isNotEmpty(riskSourceRuleRo.getId()) ?
 //				String.valueOf(riskSourceRuleRo.getId()) : "");
 //			}
+//			if (abstractActionResult.getToipResponse().getBizObj() instanceof ProtalDataRo) {
+//				ProtalDataRo protalDataRo = (ProtalDataRo) abstractActionResult.getToipResponse().getBizObj();
+//				message.setTime(DateUtil.getNow());
+//				message.setBizId(StringUtil.isNotEmpty(protalDataRo.getId()) ? String.valueOf(protalDataRo.getId()) : "");
+//			}
+//			if (abstractActionResult.getToipResponse().getBizObj() instanceof FireEquimentDataRo) {
+//				FireEquimentDataRo fireEquimentDataRo = (FireEquimentDataRo) abstractActionResult.getToipResponse().getBizObj();
+//				message.setTime(DateUtil.getNow());
+//				message.setBizId(StringUtil.isNotEmpty(fireEquimentDataRo.getId()) ? String.valueOf(fireEquimentDataRo.getId()) : "");
+//			}
 //			message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString());
 //			message.setType(type);
 //			message.setId(UUID.randomUUID().toString());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/result/AbstractActionResult.java

@@ -5,25 +5,25 @@ import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
 
 public abstract class AbstractActionResult implements ActionResult{
 	
-//	public ToipResponse toipResponse;
+	public ToipResponse toipResponse;
 	/**
 	 * 智能体业务对象
 	 */
-//	private BusinessEntity bizObj;
-//	
-//	public ToipResponse getToipResponse() {
-//		return toipResponse;
-//	}
-//
-//	public void setToipResponse(ToipResponse toipResponse) {
-//		this.toipResponse = toipResponse;
-//	}
+	private BusinessEntity bizObj;
+	
+	public ToipResponse getToipResponse() {
+		return toipResponse;
+	}
+
+	public void setToipResponse(ToipResponse toipResponse) {
+		this.toipResponse = toipResponse;
+	}
+
+	public BusinessEntity getBizObj() {
+		return bizObj;
+		}
 
-//	public BusinessEntity getBizObj() {
-//		return bizObj;
-//	}
-//
-//	public void setBizObj(BusinessEntity bizObj) {
-//		this.bizObj = bizObj;
-//	}
+	public void setBizObj(BusinessEntity bizObj) {
+		this.bizObj = bizObj;
+	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IFmeaEquipmentPointDao.java

+package com.yeejoin.amos.fas.business.dao.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
+
+
+@Repository("iFmeaEquipmentPointDao")
+public interface IFmeaEquipmentPointDao extends BaseDao<FmeaEquipmentPoint, Long>{
+
+	@Modifying
+	@Query(value="DELETE fmep FROM `f_fmea_equipment_point` fmep"+
+			"LEFT JOIN f_fire_equipment_point fep ON fep.id = fmep.equipment_point_id"+
+			"WHERE fep.fire_equipment_id = ?1 AND fmep.important_equipment_id = ?2", nativeQuery = true)
+	void removeByFireEquipIdAndEquipId(Long fire_equipment_id,Long importantEquipmentId);
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IRiskSourcePointInputitemDao.java

-//package com.yeejoin.amos.fas.business.dao.repository;
-//
-//import java.util.List;
-//
-//import org.springframework.data.jpa.repository.Modifying;
-//import org.springframework.data.jpa.repository.Query;
-//import org.springframework.stereotype.Repository;
-//
-//import com.yeejoin.amos.fas.dao.entity.RiskSourcePointInputitem;
-//
-//@Repository("iRiskSourcePointInputitemDao")
-//public interface IRiskSourcePointInputitemDao extends BaseDao<RiskSourcePointInputitem, Long>{
-//
-//	List<RiskSourcePointInputitem> findAllByRiskSourceIdAndPointId(Long riskSourceId, Long pointId);
-//	RiskSourcePointInputitem  findAllByRiskSourceIdAndPointIdAndPointInputitemId(Long riskSourceId, Long pointId,Long pointInputitemId);
-//
-//	@Modifying
-//	@Query(value="delete from f_risk_source_point_inputitem where risk_source_id = (?1) and point_id = (?2)", nativeQuery = true)
-//	void removeByRSIdAndPId(String riskSourceId,String pointId);
-//}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/feign/RemoteWebSocketServer.java

@@ -24,7 +24,7 @@ public class RemoteWebSocketServer {
     private ApplicationConfig applicationConfig;*/
 	
 	@Value("${params.remoteWebsocketUrl}")
-    private String remoteRuleUrl;
+    private String remoteWebsocketUrl;
 	
     private final RestTemplate restTemplate;
 
@@ -41,9 +41,7 @@ public class RemoteWebSocketServer {
         map.put("filter", null);
         map.put("message", message);
         map.put("path", path);
-        //String url = applicationConfig.getParamValueStr("params.remoteWebsocketUrl");
-        String url =remoteRuleUrl;
-        
+        String url =remoteWebsocketUrl;
         HttpHeaders headers = new HttpHeaders();
         MediaType type = MediaType
                 .parseMediaType("application/json; charset=UTF-8");

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/param/AlarmParam.java

@@ -16,6 +16,9 @@ public class AlarmParam extends BasicsRo{
     private String monitor;
     private String equimentId;
 	private String code;
+	
+	private String id;
+	private String name;
 	/**
 	 * 是否模拟数据
 	 */
@@ -99,6 +102,18 @@ public class AlarmParam extends BasicsRo{
 	}
 	public void setOldState(String oldState) {
 		this.oldState = oldState;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
 	}	
 	
 	public String toJsonStr() {

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

@@ -40,6 +40,7 @@ import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
+import com.yeejoin.amos.fas.business.dao.repository.IFmeaEquipmentPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.param.ImgParam;
@@ -89,6 +90,9 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
     @Autowired
     private RedisTemplate redisTemplate;
+    
+    @Autowired
+    private IFmeaEquipmentPointDao iFmeaEquipmentPointDao;
 
     @Autowired
     private MongoTemplate mongoTemplate;
@@ -224,10 +228,11 @@ public class EquipmentServiceImpl implements IEquipmentService {
         for (String id : fireEquipmentIds) {
             long result = 0;
             EquipmentFireEquipment equipmentFireEquipment = impAndFireEquipMapper.queryForOne(String.valueOf(id), String.valueOf(equipmentId));
-
+           
             if (equipmentFireEquipment != null) {
                 result = equipmentFireEquipment.getId();
                 this.equipmentFireEquipmentDao.deleteById(equipmentFireEquipment.getId());
+                iFmeaEquipmentPointDao.removeByFireEquipIdAndEquipId(Long.valueOf(id), equipmentId);
             }
             ids.add(result);
         }

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

@@ -24,6 +24,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.*;
 
 @Service("fireStationService")
@@ -196,7 +198,15 @@ public class FireStationServiceImpl implements IFireStationService {
 				} catch (IOException e) {
 					throw new YeeException("上传图片失败");
 				}
-				String photoFile = path + fileName;
+
+				String photoFile = "";
+				try{
+					photoFile = FasConstant.UPLOAD_ROOT_PATH + File.separator + FasConstant.UPLOAD_FIRESTATION_PATH +
+							File.separator + URLEncoder.encode(fireStation.getName(), "utf-8") + fileName;
+				} catch (UnsupportedEncodingException e){
+					throw new YeeException("字符转义失败 ");
+				}
+
 				if ( picture != null && picture != "") {
 					picture += "," + photoFile;
 				} else {

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

@@ -544,44 +544,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
     }
 
-    @Override
-    @Async
-    public String processFireEqumtData(FireEquimentDataRo deviceData) throws Exception {
-        //处理设备和巡检数据
-        deviceData.setNodeState(deviceData.getValue());
-        String batchNo = UUID.randomUUID().toString();
-        deviceData.setBatchNo(batchNo);
-        Optional<FireEquipment> fireEquipment1 = this.iFireEquipmentDao.findById(deviceData.getFireEquimentId());
-        FireEquipment fireEquipment = null;
-
-        if (fireEquipment1.isPresent()) {
-            fireEquipment = fireEquipment1.get();
-        }
-        Equipment equipment = null;
-        if (fireEquipment != null) {
-            deviceData.setCode(fireEquipment.getCode());
-            equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(deviceData.getFireEquimentId());
-            if (equipment != null) {
-                deviceData.setMonitor(equipment.getName());
-                deviceData.setEquimentId(String.valueOf(equipment.getId()));
-
-                //Object result = remoteRuleServer.fireRule(deviceData, "风险管控/fireEquiment");
-                //处理返回结果
-
-                List<RiskSource> riskSources = this.riskSourceMapper.queryByFireEqument(deviceData.getFireEquimentId());
-                //asymbleWithParent(batchNo, riskSources, FireEquimentDataRo.class.getSimpleName(), deviceData.getFireEquimentId(), deviceData.getNodeState(), null, null);
-
-                try {
-                    alermContingency(deviceData.getBatchNo(), fireEquipment, equipment);
-                } catch (Exception e) {
-                    log.error("调用规则失败", e);
-                }
-            }
-        }
-
-
-        return "SUCCESS";
-    }
+    
+    
 
 
     public void alermContingency(String batchNo, FireEquipment fireEquipment, Equipment equipment) throws Exception {
@@ -803,6 +767,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         String topicFour = String.format("/%s/%s/%s/%s", serviceName, "yinan","data/refresh","todayCheckStatus");
         webMqttComponent.publish(topicThree, JSON.toJSONString(view3dService.getStatisticsCheck(orgCode)));
     }
+    
+    
+    
 
     /**
      * 巡检消息规则推送
@@ -825,6 +792,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             log.error(e.getMessage(),e);
         }
     }
+    
+    
+   
 
     @Override
     public RiskSourceTreeResponse queryRiskSourceDetailById(Long id) {
@@ -927,19 +897,19 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         
         Equipment equipment = null;
         if (fireEquipment != null) {
-            deviceData.setCode(fireEquipment.getCode());
+            
             //保存实时数据
-            saveFireEquipmentData(fireEquipmentPoint, fireEquipment, deviceData, fireEquipmentPointType);
             // 根据监测点设备信息获取保护的重点装备
             equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(fireEquipmentPoint.getFireEquipmentId());
-            
+            deviceData.setMonitor(equipment != null?equipment.getName():"");
+            deviceData.setId(String.valueOf(fireEquipment.getId()));
+            deviceData.setCode(fireEquipment.getCode());
+            saveFireEquipmentData(fireEquipmentPoint, fireEquipment, deviceData, fireEquipmentPointType, toke);
             DeviceRo deviceRo = new DeviceRo();
 			deviceRo.setEquipmentId(equipment.getId());
 			deviceRo.setPointCode(deviceData.getPointCode());
 			deviceRo.setValue(deviceData.getState());
 			triggerPlanDevice(deviceRo, equipment, toke);
-            
-//            Boolean have = equipmentGroupedPointDao.existsByEqpPointIdAndEquipId(fireEquipmentPoint.getId(), equipment.getId());
             Boolean have = impAndFireEquipMapper.existsAlarmPointByEqpPointIdAndEquipId(fireEquipmentPoint.getId(), equipment.getId());
             if (!ObjectUtils.isEmpty(have) && have) {
                 //动态预案执行
@@ -1014,7 +984,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             map.put("id", param.getPointCode());
             Map<String, Map<String, Object>> riskSourceMap = new HashMap();
             riskSourceMap.put("equipments", map);
-
             remoteWebSocketServer.sendMessage("equipmentMode", JSON.toJSONString(riskSourceMap));
 
             // 推送设备状态信息
@@ -1025,9 +994,69 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             log.error("推送前端数据失败-->"+JSON.toJSONString(param));
         }
     }
+    
+    
+    @Override
+    @Async
+    public String processFireEqumtData(FireEquimentDataRo deviceData) throws Exception {
+        //处理设备和巡检数据
+        deviceData.setNodeState(deviceData.getValue());
+        String batchNo = UUID.randomUUID().toString();
+        deviceData.setBatchNo(batchNo);
+        Optional<FireEquipment> fireEquipment1 = this.iFireEquipmentDao.findById(deviceData.getFireEquimentId());
+        FireEquipment fireEquipment = null;
+
+        if (fireEquipment1.isPresent()) {
+            fireEquipment = fireEquipment1.get();
+        }
+        Equipment equipment = null;
+        if (fireEquipment != null) {
+            deviceData.setCode(fireEquipment.getCode());
+            equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(deviceData.getFireEquimentId());
+            if (equipment != null) {
+                deviceData.setMonitor(equipment.getName());
+                deviceData.setEquimentId(String.valueOf(equipment.getId()));
+
+                //Object result = remoteRuleServer.fireRule(deviceData, "风险管控/fireEquiment");
+                //处理返回结果
+
+                List<RiskSource> riskSources = this.riskSourceMapper.queryByFireEqument(deviceData.getFireEquimentId());
+                //asymbleWithParent(batchNo, riskSources, FireEquimentDataRo.class.getSimpleName(), deviceData.getFireEquimentId(), deviceData.getNodeState(), null, null);
+
+                try {
+                    alermContingency(deviceData.getBatchNo(), fireEquipment, equipment);
+                } catch (Exception e) {
+                    log.error("调用规则失败", e);
+                }
+            }
+        }
+        return "SUCCESS";
+    }
+
+    /**
+     * 设备消息规则推送
+     *
+     * @param protalData
+     */
+    @Async
+    void fireEquipRuleMessagePush(AlarmParam deviceData, Toke toke) {
+        
+    	String bacthNo = UUID.randomUUID().toString();
+    	FireEquimentDataRo fireEquimentDataRo = new FireEquimentDataRo();
+    	deviceData.setBatchNo(bacthNo);
+    	BeanUtils.copyProperties(deviceData, fireEquimentDataRo);
+        try {
+            RequestContext.setToken(toke.getToke());
+            RequestContext.setProduct(toke.getProduct());
+            log.info("设备消息规则推送" + JSONObject.toJSONString(deviceData));
+            ruleTrigger.publish(fireEquimentDataRo, "风险管控/fireEquiment", null);
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+        }
+    }
 
 
-    private void saveFireEquipmentData(FireEquipmentPoint fireEquipmentPoint, FireEquipment fireEquipment, AlarmParam deviceData, String fireEquipmentPointType) {
+    private void saveFireEquipmentData(FireEquipmentPoint fireEquipmentPoint, FireEquipment fireEquipment, AlarmParam deviceData, String fireEquipmentPointType, Toke toke) {
         if ("alarm_type_fire".equals(fireEquipmentPointType) || "alarm_type_trouble".equals(fireEquipmentPointType)) {
             Alarm alarm = iAlarmDao.findByStatusTrueAndFireEquipmentPointCode(deviceData.getPointCode());
             if (alarm != null) {
@@ -1059,6 +1088,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 if ("alarm_type_trouble".equals(fireEquipmentPointType)) {
                     //通知刷新3d页面相关故障数据
                     notifyAlarm(fireEquipmentPoint, deviceData);
+                    fireEquipRuleMessagePush(deviceData, toke);
                 } else {
                     //通知刷新3d页面告警数据
                     iDataRefreshService.refreshViewData(DataRefreshTypeEum.alarm.getCode());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/model/ToipResponse.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
+import com.yeejoin.amos.fas.dao.entity.MessageRo;
 
 import lombok.Data;
 
@@ -59,4 +60,5 @@ public class ToipResponse implements Serializable
 	public String toJsonStr() {
 		return JSON.toJSONString(this,SerializerFeature.WriteMapNullValue,SerializerFeature.DisableCircularReferenceDetect,SerializerFeature.SkipTransientField);
 	}
+
 }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_view3d.xml

@@ -958,7 +958,7 @@
 				<if test="abnormalStatus != false">
 					AND p.status in ('0','2','3')
 				</if>
-				AND p.coordinates != '' AND p.coordinates is not null
+				AND p.coordinates != '' AND p.coordinates is not null AND p.is_delete = 0
 			UNION ALL
 				select
 					fe.code,
@@ -1243,7 +1243,7 @@
 	
 	<select id="retrieveAll" resultType="java.util.HashMap">
 		select *,'{ "x": 0, "y": 0, "z": 0 }' rotationDTO,'{ "x": 1, "y": 1, "z": 1 }' scaleDTO
-from (select concat('riskSource',r.id) as id,r.id as originId,r.name,r.code,r.ue4_location as ue4Location,r.ue4_rotation as ue4Rotation ,'riskSource' as type,r.org_code as orgCode,
+from (select concat('riskSource-',r.id) as id,r.id as originId,r.name,r.code,r.ue4_location as ue4Location,r.ue4_rotation as ue4Rotation ,'riskSource' as type,r.org_code as orgCode,
 			rl.level as level,rl.name as levelStr,r.is_indoor as isIndoor,'风险点' as typeName,'riskSource' as typeCode,
 			CASE
 				WHEN (

pom.xml

@@ -35,7 +35,8 @@
 	      <groupId>com.yeejoin</groupId>
 	      <artifactId>amos-component-rule</artifactId>
 	      <version>1.2.0-SNAPSHOT</version>
-       </dependency>
+       </dependency> 
+
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>