规则消息推送调整

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

@@ -568,7 +568,6 @@ public class RiskSourceController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "上传巡检数据", notes = "上传巡检数据")
     @RequestMapping(value = "/data/patroldata", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
     public CommonResponse postPatrolData(@RequestBody ProtalDataRo protalData) throws Exception {
-    	riskSourceService.protalRuleMessagePush(protalData);
     	riskSourceService.processProtalData(getToken(),getProduct(),getAppKey(),protalData);
         return CommonResponseUtil.success();
     }

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

@@ -586,7 +586,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     @Async
     public void processProtalData(String toke, String product, String appKey, ProtalDataRo protalData) {
-        if (!CollectionUtils.isEmpty(protalData.getPointInputitems())) {
+        //巡检消息规则推送
+    	protalRuleMessagePush(protalData);
+    	if (!CollectionUtils.isEmpty(protalData.getPointInputitems())) {
             Long pointId = protalData.getId();
             List<Long> inputIds = Lists.newArrayList();
             Map<Long, CheckInputItemRo> map = Maps.newHashMap();
@@ -625,13 +627,13 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
      * 巡检消息规则推送
      * @param protalData
      */
-    @Override
     @Async
-    public void protalRuleMessagePush(ProtalDataRo protalData){
+    private void protalRuleMessagePush(ProtalDataRo protalData){
         String bacthNo = UUID.randomUUID().toString();
         protalData.setBatchNo(bacthNo);
         protalData.setOriginalNodeState(protalData.getNodeState());
         protalData.setUserName(protalData.getCheckUser());
+        protalData.setPointName(protalData.getName());
         try {
 			ruleTrigger.publish(protalData, "风险管控/patrol", null);
 		} catch (Exception e) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java

@@ -78,9 +78,6 @@ public interface IRiskSourceService {
 
     void processProtalData(String toke,String product,String appKey,ProtalDataRo protalData) throws Exception;
 
-    
-    void protalRuleMessagePush(ProtalDataRo protalData);
-    
     RiskSourceTreeResponse queryRiskSourceDetailById(Long id);
 
     /**