*)修改bug

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

@@ -60,7 +60,6 @@ public class SafetyController extends BaseController{
 			Object o = ruleTrigger.publish(newFact, "青海换流站消防预案/test", ArrayUtils.toArray());
 			return CommonResponseUtil.success(o);
 		} catch (Exception e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
         return CommonResponseUtil.failure();

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

@@ -189,6 +189,7 @@ public class ContingencyInstanceImpl /*extends GenericManagerImpl<ContingencyPla
             	telemetryMap.put(map.get("code") + "", Double.valueOf(ObjectUtils.isEmpty(map.get("value")) ? "0" : map.get("value").toString()));
             }
             contingencyRo.setTelemetryMap(telemetryMap);
+            contingencyRo.setEquipmentCode(equipment.getCode());
             
             ruleTrigger.publish(contingencyRo, equipment.getReservePlan(), ArrayUtils.toArray(equipment.getName()));
             

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

@@ -996,8 +996,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                 iDataRefreshService.sendRefreshDataWithArea(View3dRefreshAreaEum.monitor_data.getCode(), content);
             }
         }
-        String topic = String.format("/%s/%s/%s", serviceName, "yinan","telesignaling");
-        webMqttComponent.publish(topic, JSON.toJSONString(deviceData));
+//        String topic = String.format("/%s/%s/%s", serviceName, "yinan","telesignaling");
+//        webMqttComponent.publish(topic, JSON.toJSONString(deviceData));
         
         List<AlarmParam> list = new ArrayList<>();
         list.add(deviceData);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java

@@ -8,6 +8,9 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -15,8 +18,16 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.component.feign.config.TokenOperation;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.fas.business.vo.CompanyBo;
+import com.yeejoin.amos.fas.business.vo.ReginParams;
 import com.yeejoin.amos.fas.exception.PermissionException;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 
 @Aspect
 @Component
@@ -24,6 +35,9 @@ import com.yeejoin.amos.fas.exception.PermissionException;
 public class PermissionAspect {
 	private static final Logger logger = LoggerFactory.getLogger(PermissionAspect.class);
 	
+	 @Autowired
+	 private RedisTemplate<String, String> redisTemplate;
+	
 	// 前置通知，在方法执行之前
 	@Before(value = "@annotation(Permission)")
 	public void PermissionCheck(JoinPoint joinPoint) throws PermissionException {