Merge branch 'develop' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into develop

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

@@ -44,7 +44,6 @@ public class FireEquimtPointController extends BaseController {
 
         if (fireEquipmentPoint == null
                 || StringUtils.isEmpty(fireEquipmentPoint.getName())
-                || StringUtils.isEmpty(fireEquipmentPoint.getFireEquipmentId())
                 || StringUtils.isEmpty(fireEquipmentPoint.getType())
                 || StringUtils.isEmpty(fireEquipmentPoint.getCode()))
             throw new Exception("数据校验失败.");

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

@@ -11,4 +11,6 @@ public interface IFireEquipmentPointDao extends BaseDao<FireEquipmentPoint, Long
 
 	FireEquipmentPoint findOneByCode(String pointCode);
 	
+	int countByCode(String code);
+
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/entity/mybatis/FireEquipmentPointEntity.java

@@ -30,6 +30,8 @@ public class FireEquipmentPointEntity extends FireEquipmentPointExtend {
 
     private Long alarmType;
     
+    private String alarmTypeName;
+
     private String fireEquipmentCode;
 
     public Long getId() {
@@ -135,4 +137,12 @@ public class FireEquipmentPointEntity extends FireEquipmentPointExtend {
     public void setFireEquipmentCode(String fireEquipmentCode) {
         this.fireEquipmentCode = fireEquipmentCode;
     }
+
+	public String getAlarmTypeName() {
+		return alarmTypeName;
+	}
+
+	public void setAlarmTypeName(String alarmTypeName) {
+		this.alarmTypeName = alarmTypeName;
+	}
 }

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

@@ -29,7 +29,7 @@ public class FireEquipmentPointParam {
     @Excel(name = "单位", orderNum = "7", width = 12)
     private String unit;
 
-    @Excel(name = "告警类型", replace = {"火灾告警_1", "电源开关_2", "换流变_6", "液位_3", "流量_4", "容量_5"}, orderNum = "8")
+    @Excel(name = "告警类型", replace = {"火灾告警_1", "电源开关_2", "换流变_6", "液位_3", "流量_4", "容量_5", "故障告警_7"}, orderNum = "8")
     private Long alarmType;
 
     public Long getId() {

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.fas.business.service.intfc.IFireEquipPontService;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
+import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.op.core.common.response.CommonResponse;
 import com.yeejoin.amos.op.core.util.CommonResponseUtil;
 import com.yeejoin.amos.op.core.util.StringUtil;
@@ -19,6 +20,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +41,17 @@ public class FireEquipPointServiceImpl implements IFireEquipPontService {
 
 
     public FireEquipmentPoint savePoint(FireEquipmentPoint fireEquipmentPoint) {
+    	if(fireEquipmentPoint.getId() != 0){
+    		FireEquipmentPoint fEqPoint = fireEquipmentPointDao.findOneByCode(fireEquipmentPoint.getCode());
+        	if(fEqPoint !=null){
+        		 throw new YeeException("该编码已存在");
+        	}
+    	}else{
+    		FireEquipmentPoint fEqPoint = fireEquipmentPointDao.findOneByCode(fireEquipmentPoint.getCode());
+        	if(fEqPoint.getId() != fireEquipmentPoint.getId()){
+        		 throw new YeeException("该编码已存在");
+        	}
+    	}
         return fireEquipmentPointDao.save(fireEquipmentPoint);
     }
 
@@ -48,15 +61,14 @@ public class FireEquipPointServiceImpl implements IFireEquipPontService {
     }
 
     public String[] deletePoint(String[] idArray) throws Exception {
+    	List<FireEquipmentPoint> list = new ArrayList<FireEquipmentPoint>();
         for (String id : idArray) {
             FireEquipmentPoint fireEquipmentPoint = fireEquipmentPointDao.findById(Long.parseLong(id));
             if (fireEquipmentPoint != null) {
-                this.fireEquipmentPointDao.delete(Long.parseLong(id));
-            } else {
-                throw new Exception("找不到指定的监测点:" + id);
+            	list.add(fireEquipmentPoint);
             }
         }
-
+        fireEquipmentPointDao.delete(list);
         return idArray;
     }
 

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

@@ -1306,7 +1306,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         node3dVoService.updateByRiskSourceId(riskSourceRuleRo.getId(), frequency);
         try {
-//            remoteRuleServer.fireRule(riskSourceRuleRo, "风险管控/riskSource");
+            remoteRuleServer.fireRule(riskSourceRuleRo, "风险管控/riskSource");
         } catch (Exception e) {
             log.error("调用规则异常", e);
         }

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

@@ -132,12 +132,14 @@
 			a.unit,
 			a.org_code as orgCode,
 			a.alarm_type as alarmType,
+			fd.dict_name as alarmTypeName,
 			b.name as fireEquipmentName,
 			b.code as fireEquipmentCode
 		from
 			f_fire_equipment_point as a
 		left join
 			f_fire_equipment as b on a.fire_equipment_id = b.id
+		left join f_dict fd on fd.id = a.alarm_type
 		<where>
 			<if test="searchValue!=null and searchValue.trim() != ''">
 				and (a.name like concat('%',#{searchValue},'%') or a.code like concat('%',#{searchValue},'%'))