解决冲突

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

@@ -4,21 +4,13 @@ package com.yeejoin.amos.fas.business.service.impl;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-<<<<<<< HEAD
-=======
-import java.util.Arrays;
-import java.util.Collections;
->>>>>>> dev
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-<<<<<<< HEAD
 import java.util.Optional;
-=======
->>>>>>> dev
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
@@ -30,10 +22,6 @@ import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 
-<<<<<<< HEAD
-import org.apache.commons.lang.StringUtils;
-=======
->>>>>>> dev
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -70,30 +58,18 @@ import com.yeejoin.amos.fas.business.dao.mapper.FmeaPointInputitemMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.RiskSourceMapper;
 import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
-<<<<<<< HEAD
 import com.yeejoin.amos.fas.business.dao.repository.IAlarmDao;
-=======
->>>>>>> dev
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IDictDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEvaluationModelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentPointDao;
-import com.yeejoin.amos.fas.business.dao.repository.IFmeaDao;
-import com.yeejoin.amos.fas.business.dao.repository.IPPointDao;
 import com.yeejoin.amos.fas.business.dao.repository.IPreplanPictureDao;
-<<<<<<< HEAD
 import com.yeejoin.amos.fas.business.dao.repository.IRiskFactorDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
 import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
-=======
-import com.yeejoin.amos.fas.business.dao.repository.IRiskLevelDao;
-import com.yeejoin.amos.fas.business.dao.repository.IRiskSourceDao;
-import com.yeejoin.amos.fas.business.dao.repository.IRpnChangeLogDao;
-import com.yeejoin.amos.fas.business.dao.repository.IUserDao;
->>>>>>> dev
 import com.yeejoin.amos.fas.business.feign.RemoteRuleServer;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.feign.RemoteWebSocketServer;
@@ -107,19 +83,11 @@ import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
-<<<<<<< HEAD
-=======
-import com.yeejoin.amos.fas.business.service.intfc.Node3dVoService;
->>>>>>> dev
 import com.yeejoin.amos.fas.business.service.model.CheckInputItemRo;
 import com.yeejoin.amos.fas.business.service.model.ContingencyDeviceStatus;
 import com.yeejoin.amos.fas.business.service.model.ContingencyRo;
 import com.yeejoin.amos.fas.business.service.model.FireEquimentDataRo;
 import com.yeejoin.amos.fas.business.service.model.ProtalDataRo;
-<<<<<<< HEAD
-=======
-import com.yeejoin.amos.fas.business.service.model.RiskSourceRo;
->>>>>>> dev
 import com.yeejoin.amos.fas.business.service.model.RiskSourceRuleRo;
 import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
@@ -130,11 +98,8 @@ import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.RegionTreeResponse;
 import com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse;
-<<<<<<< HEAD
-import com.yeejoin.amos.fas.dao.entity.Alarm;
-=======
 import com.yeejoin.amos.fas.core.util.StringUtil;
->>>>>>> dev
+import com.yeejoin.amos.fas.dao.entity.Alarm;
 import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
 import com.yeejoin.amos.fas.dao.entity.Dict;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
@@ -145,7 +110,6 @@ import com.yeejoin.amos.fas.dao.entity.FireEquipmentPoint;
 import com.yeejoin.amos.fas.dao.entity.Fmea;
 import com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint;
 import com.yeejoin.amos.fas.dao.entity.FmeaPointInputitem;
-<<<<<<< HEAD
 import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
 import com.yeejoin.amos.fas.dao.entity.RiskFactor;
 import com.yeejoin.amos.fas.dao.entity.RiskLevel;
@@ -154,16 +118,6 @@ import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
-=======
-import com.yeejoin.amos.fas.dao.entity.PPoint;
-import com.yeejoin.amos.fas.dao.entity.PreplanPicture;
-import com.yeejoin.amos.fas.dao.entity.RiskLevel;
-import com.yeejoin.amos.fas.dao.entity.RiskSource;
-import com.yeejoin.amos.fas.dao.entity.RpnChangeLog;
-import com.yeejoin.amos.fas.dao.entity.SUser;
-import com.yeejoin.amos.fas.exception.YeeException;
->>>>>>> dev
-
 
 @Service("riskSourceService")
 public class RiskSourceServiceImpl implements IRiskSourceService {
@@ -186,8 +140,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired
     private AppMessagePushService appMessagePushService;
 
-    @Autowired
-    private IFmeaDao iFmeaDao;
 
     @Autowired
     private IRiskLevelDao riskLevelDao;
@@ -219,8 +171,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired
     private IRiskLevelDao iRiskLevelDao;
 
-    @Autowired
-    private IPPointDao iPPointDao;
 
     @Autowired
     private RemoteSecurityService remoteSecurityService;