1、维护风险点时成功返回该风险点2、修改bug

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

@@ -78,8 +78,7 @@ public class RiskModelController extends BaseController {
             map.put("org_code", user.getOrgCode());
             map.put("user_id", user.getId());
             map.put("param", param);
-            riskSourceService.editRiskSource(map);
-            return CommonResponseUtil.success();
+            return CommonResponseUtil.success(riskSourceService.editRiskSource(map));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             return CommonResponseUtil.failure("风险模型新增及维护失败：" + e.getMessage());

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

@@ -1150,7 +1150,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
                     redisTemplate.opsForHash().put("currentContingency", "alarmType", null);
 //					redisTemplate.opsForValue().set("equipmentId", null);
                 } else {
-                    if ("alarm_type_trouble".equals(fireEquipmentPointType) {
+                    if ("alarm_type_trouble".equals(fireEquipmentPointType)) {
                         notifyAlarm(fireEquipmentPoint, deviceData);
                     }
                     String alarmType = (String) redisTemplate.opsForHash().get("currentContingency", "alarmType");

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

@@ -394,7 +394,10 @@
 				rl.`name` as level,
 				rs.risk_level_id,
 				rs.rpni,
-				rs.is_region
+				rs.is_region,
+				rs.floor3d,
+				rs.is_indoor,
+				rs.position3d
 			FROM
 				`f_risk_source` rs
 			LEFT JOIN f_risk_level rl ON rl.id  = rs.risk_level_id