删除mongo相关代码及配置文件

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mongo/EquipCommunicationDao.java

-package com.yeejoin.amos.fas.business.dao.mongo;
-
-import org.springframework.data.mongodb.repository.MongoRepository;
-import org.springframework.stereotype.Repository;
-
-import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
-
-@Repository("equipCommunicationDao")
-public interface EquipCommunicationDao extends MongoRepository<EquipCommunicationData, String>{
-
-}
+//package com.yeejoin.amos.fas.business.dao.mongo;
+
+//import org.springframework.data.mongodb.repository.MongoRepository;
+//import org.springframework.stereotype.Repository;
+//
+//import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
+//
+//@Repository("equipCommunicationDao")
+//public interface EquipCommunicationDao extends MongoRepository<EquipCommunicationData, String>{
+//
+//}

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

@@ -25,9 +25,6 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,7 +38,6 @@ import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.FireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpAndFireEquipMapper;
 import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper;
-import com.yeejoin.amos.fas.business.dao.mongo.EquipCommunicationDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IEquipmentFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
@@ -101,11 +97,8 @@ public class EquipmentServiceImpl implements IEquipmentService {
     @Autowired
     private IFmeaEquipmentPointDao iFmeaEquipmentPointDao;
 
-    @Autowired
-    private MongoTemplate mongoTemplate;
-
-    @Autowired
-    private EquipCommunicationDao equipCommunicationDao;
+//    @Autowired
+//    private MongoTemplate mongoTemplate;
 
     @Value("${windows.img.path}")
     private String winImgPath;
@@ -469,25 +462,22 @@ public class EquipmentServiceImpl implements IEquipmentService {
 
     @Override
     public EquipCommunicationData findFireEquipmentByPointCode(String code) {
-//        EquipCommunicationData data = (EquipCommunicationData) redisTemplate.opsForHash().get("fireEquipData", code);
-//        if (ObjectUtils.isEmpty(data)) {
     	EquipCommunicationData data = fireEquipMapper.findOneByPointCode(code);
-//        }
         return data;
     }
 
     @Override
     public EquipCommunicationData findFireEquipDataByPointCode(String code) {
-        Query query = new Query();
-        query.addCriteria(Criteria.where("pointCode").is(code)).limit(1);
-        query.with(new Sort(new Order(Direction.DESC, "recDate")));
-        query.limit(1);
-        List<EquipCommunicationData> data = mongoTemplate.find(query, EquipCommunicationData.class);
-        if (data.isEmpty()) {
+//        Query query = new Query();
+//        query.addCriteria(Criteria.where("pointCode").is(code)).limit(1);
+//        query.with(new Sort(new Order(Direction.DESC, "recDate")));
+//        query.limit(1);
+//        List<EquipCommunicationData> data = mongoTemplate.find(query, EquipCommunicationData.class);
+//        if (data.isEmpty()) {
+//            return null;
+//        }
         return null;
     }
-        return data.get(0);
-    }
 
 
 	@Override

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

@@ -70,7 +70,6 @@ import com.yeejoin.amos.fas.business.dao.mapper.FmeaMapper;
 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;
 import com.yeejoin.amos.fas.business.dao.repository.IAlarmDao;
 import com.yeejoin.amos.fas.business.dao.repository.IContingencyOriginalDataDao;
 import com.yeejoin.amos.fas.business.dao.repository.IDictDao;
@@ -214,9 +213,6 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     private RemoteWebSocketServer remoteWebSocketServer;
 
     @Autowired
-    private EquipCommunicationDao equipCommunicationDao;
-
-    @Autowired
     private IEquipmentService equipmentService;
 
     @Autowired
@@ -1269,7 +1265,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
 
             return data;
         }).filter(param -> !ObjectUtils.isEmpty(param)).collect(Collectors.toList());
-        equipCommunicationDao.saveAll(list);
+//        equipCommunicationDao.saveAll(list);
     }
 
     /**

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

@@ -100,7 +100,6 @@ public interface IEquipmentService {
     EquipCommunicationData findFireEquipmentByPointCode(String code);
 
     EquipCommunicationData findFireEquipDataByPointCode(String code);
-
 	int countImpEquipByIds(String[] idArray);
 
 	int countFemaRelation(String[] idArray);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/EquipCommunicationData.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.mapping.Document;
 
-@Document(collection = "EquipCommunicationData")
+//@Document(collection = "EquipCommunicationData")
 public class EquipCommunicationData implements Serializable{
 	/**
 	 * 
@@ -16,13 +14,13 @@ public class EquipCommunicationData implements Serializable{
 	@Id
 	private String id;
 	private String informationAddress; //转发码
-	@Indexed
+//	@Indexed
 	private int soe;
 	private String state; // 值
 	private String unit;
 	private String serviceId; //服务ID
 	private int isInvalid; // 是否有效
-	@Indexed
+//	@Indexed
 	private String pointCode;
 	private String pointName;
 //	@Indexed
@@ -32,13 +30,13 @@ public class EquipCommunicationData implements Serializable{
     private String type;
     
     private String alarmType;
-    @Indexed
+//    @Indexed
     private String fireEquipmentId;
     private String fireEquipmentName;
     private String fireEquipmentCode;
     
     
-    @Indexed
+//    @Indexed
     private Date recDate;
     
 	public String getInformationAddress() {

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -21,10 +21,6 @@ spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 
-#mongodb
-spring.data.mongodb.uri = mongodb://172.16.11.33:27017/iecmonitor
-
-
 #rule
 #params.remoteRuleUrl=http://172.16.3.3:8080/
 params.remoteRuleUrl=http://magintursh.xicp.net:18080/

YeeAmosFireAutoSysStart/src/main/resources/application-docker.properties

-security.password=tw123456
-security.loginId=tw3
-security.productWeb=CONVERTER_STATION_WEB
-security.appKeyWeb=CONVERTER_STATION
+security.password=a1234560
+security.loginId=fas_autosys
+security.productWeb=STUDIO_APP_WEB
+security.appKeyWeb=studio_normalapp_2668446
  
 #environment
 #spring.profiles.active = dev
@@ -22,10 +22,6 @@ spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 
-#mongodb
-spring.data.mongodb.uri = mongodb://amos-mongo:27017/iecmonitor
-
-
 #rule
 #params.remoteRuleUrl=http://172.16.3.3:8080/
 params.remoteRuleUrl=http://station-rule:8080/

YeeAmosFireAutoSysStart/src/main/resources/application-test.properties

@@ -22,10 +22,6 @@ spring.datasource.hikari.maximum-pool-size = 10
 spring.datasource.testWhileIdle = true
 spring.datasource.validationQuery = SELECT 1
 
-#mongodb
-spring.data.mongodb.uri = mongodb://172.16.11.33:27017/iecmonitor
-
-
 #rule
 #params.remoteRuleUrl=http://172.16.3.3:8080/
 params.remoteRuleUrl=http://magintursh.xicp.net:18080/

YeeAmosFireAutoSysStart/src/main/resources/application.properties

@@ -60,7 +60,6 @@ windows.img.path = E:\\
 linux.img.path = /
 
 param.safetyIndexChange.cron = 0 0 2 * * ?
-#param.weather.url = http://t.weather.sojson.com/api/weather/city/
 param.weather.url = http://wthrcdn.etouch.cn/weather_mini?citykey=
 
 

pom.xml

@@ -177,10 +177,6 @@
        
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 		<dependency>