去除mongodb

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/pom.xml

@@ -12,10 +12,10 @@
 	<artifactId>amos-boot-module-command-api</artifactId>
 
 	<dependencies>
-		<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-mongodb</artifactId>-->
+<!--		</dependency>-->
 	</dependencies>
 
 </project>

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dto/SeismometeorologyDto.java

 package com.yeejoin.amos.boot.module.command.api.dto;
 
-import com.alibaba.excel.annotation.ExcelIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.core.mapping.MongoId;
+
 
 import java.util.Date;
 
@@ -19,39 +15,39 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "SeismometeorologyDto", description = "地震气象信息")
-@Document(collection = "heart_rate")
+//@Document(collection = "heart_rate")
 public class SeismometeorologyDto {
 
 
-    @MongoId
+//    @MongoId
     @ApiModelProperty(value = "主键ID")
     protected Long sequenceNbr;
 
     @ApiModelProperty(value = "预警类型 1：警情通知 0：气象通知")
-    @Field("type")
+//    @Field("type")
     private String type;
 
     @ApiModelProperty(value = "预警类型名称")
-    @Field("typeName")
+//    @Field("typeName")
     private String typeName;
 
     @ApiModelProperty(value = "预警等级")
-    @Field("grade")
+//    @Field("grade")
     private String grade;
 
     @ApiModelProperty(value = "发布时间")
-    @Field("releaseTime")
+//    @Field("releaseTime")
     private Date releaseTime;
 
     @ApiModelProperty(value = "发布单位")
-    @Field("releaseCompany")
+//    @Field("releaseCompany")
     private String releaseCompany;
 
     @ApiModelProperty(value = "发布内容")
-    @Field("content")
+//    @Field("content")
     private String content;
-    
-   
+
+
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -14,7 +14,6 @@ import com.yeejoin.amos.boot.biz.common.enums.HomePageEnum;
 import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
-import com.yeejoin.amos.boot.module.command.api.dao.SeismometeorologyDtoDao;
 import com.yeejoin.amos.boot.module.command.api.dto.CarTaskDto;
 import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
 import com.yeejoin.amos.boot.module.command.biz.service.impl.RemoteSecurityService;
@@ -81,8 +80,8 @@ public class CommandController extends BaseController {
     IFireTeamService iFireTeamService;
     @Autowired
     IWaterResourceService iWaterResourceService;
-    @Autowired
-    SeismometeorologyDtoDao seismometeorologyDtoDao;
+//    @Autowired
+//    SeismometeorologyDtoDao seismometeorologyDtoDao;
     @Autowired
     IOrgUsrService iOrgUsrService;
     @Autowired
@@ -631,7 +630,8 @@ public class CommandController extends BaseController {
         RequestData requestData = new RequestData();
         requestData.setWhether24(true);
         List<AlertCalledZhDto> list = iAlertCalledService.alertCalledListByAlertStatus(null, null, requestData);
-        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findCarStateByWatchSn();
+//        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findCarStateByWatchSn();
+        List<SeismometeorologyDto> li =new ArrayList<>();
         //数据组装
         for (AlertCalledZhDto alertCalledZhDto : list) {
 
@@ -1062,8 +1062,8 @@ public class CommandController extends BaseController {
     @RequestMapping(value = "/findDutyCarStateBy", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "当日气象预警", notes = "当日气象预警")
     public ResponseModel<Object> findDutyCarStateBy() throws Exception {
-        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findDutyCarStateBy();
-        return ResponseHelper.buildResponse(li);
+//        List<SeismometeorologyDto> li = seismometeorologyDtoDao.findDutyCarStateBy();
+        return ResponseHelper.buildResponse(null);
     }
 
     /**

amos-boot-system-jcs/src/main/resources/application-dev.properties

@@ -6,7 +6,7 @@ spring.datasource.password=root_123
 ## eureka properties:
 eureka.client.serviceUrl.defaultZone=http://172.16.3.97:10001/eureka/
 
-## redis properties:
+## redis properties:danger/list
 spring.redis.database=1
 spring.redis.host=172.16.3.35
 spring.redis.port=6379
@@ -14,7 +14,7 @@ spring.redis.password=yeejoin@2020
 
 
 ## ES properties:
-biz.elasticsearch.address=172.16.3.135
+biz.elasticsearch.address=172.16.6.60
 spring.data.elasticsearch.cluster-name=elasticsearch
 spring.data.elasticsearch.cluster-nodes=${biz.elasticsearch.address}:9300
 spring.elasticsearch.rest.uris=http://${biz.elasticsearch.address}:9200
@@ -33,7 +33,7 @@ rule.definition.default-agency=jcs
 rule.definition.localIp=172.16.3.35
 
 ## mongodb properties:
-spring.data.mongodb.uri=mongodb://172.16.3.35:27017/command_db
+#spring.data.mongodb.uri=mongodb://172.16.6.60:27017/command_db
 
 ## file properties:
 file.url=http://39.98.45.134:9000/