修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-command-api/src/main/java/com/yeejoin/amos/boot/module/command/api/dao/SeismometeorologyDtoDao.java

@@ -43,10 +43,9 @@ public class SeismometeorologyDtoDao {
      *
      * **/
     public   List<SeismometeorologyDto> findCarStateByWatchSn(){
-        Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
-        calendar.add(Calendar.DAY_OF_MONTH,-1);
     	 System.out.println(new Date().getTime());
-        Query query = new Query(Criteria.where("releaseTime").gte(calendar.getTimeInMillis()));
+         Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
+         		.lte(getEndTime()));
          Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
          query.with(sort);
          List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
@@ -61,8 +60,8 @@ public class SeismometeorologyDtoDao {
     public   List<SeismometeorologyDto> findDutyCarStateBy(){
        
         System.out.println(new Date().getTime());
-        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime().getTime())
-        		.lte(getEndTime().getTime()));
+        Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
+        		.lte(getEndTime()));
         Sort sort= Sort.by(Sort.Direction.DESC, "releaseTime");
         query.with(sort);
         List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);

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

@@ -41,7 +41,7 @@ public class SeismometeorologyDto {
 
     @ApiModelProperty(value = "发布时间")
     @Field("releaseTime")
-    private Long releaseTime;
+    private Date releaseTime;
 
     @ApiModelProperty(value = "发布单位")
     @Field("releaseCompany")
@@ -52,7 +52,10 @@ public class SeismometeorologyDto {
     private String content;
     
    
-    public SeismometeorologyDto(Long sequenceNbr, String type, String typeName, String grade, Long releaseTime, String releaseCompany, String content) {
+
+
+
+    public SeismometeorologyDto(Long sequenceNbr, String type, String typeName, String grade, Date releaseTime, String releaseCompany, String content) {
         this.sequenceNbr = sequenceNbr;
         this.type = type;
         this.typeName = typeName;

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

@@ -400,7 +400,7 @@ public class CommandController extends BaseController {
 
             st.append("【").append(alertCalledZhDto.getAlertType()).append("】").append(" ").append(time).append(" ").append(alertCalledZhDto.getAddress());
 
-            SeismometeorologyDto sto= new SeismometeorologyDto(alertCalledZhDto.getSequenceNbr(), "1", "警情通知", null,alertCalledZhDto.getCallTime().getTime(), null, st.toString()) ;
+            SeismometeorologyDto sto= new SeismometeorologyDto(alertCalledZhDto.getSequenceNbr(), "1", "警情通知", null,alertCalledZhDto.getCallTime(), null, st.toString()) ;
             li.add(sto);
             }
        return ResponseHelper.buildResponse(li);

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

@@ -54,7 +54,7 @@ mqtt.topic.alert.reporting=alertReporting
 mqtt.topic.command.alert.notice=alertNotice
 
 ## 跑马灯地震，天气预警信息
-mqtt.topic.command.seismometeorology.notice=seismometeorology
+mqtt.topic.command.meteorological.notice=meteorological
 
 mqtt.topic.command.power.deployment=power