Skip to content

A
amos-boot-biz
Commit bc93c7b6 authored by tangwei's avatar tangwei
Browse files
Options

修改bug

parent caa5b1d8
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 90 deletions
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
View file @ bc93c7b6
package com.yeejoin.amos.boot.module.command.api.dao; //package com.yeejoin.amos.boot.module.command.api.dao;
//
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.Calendar; //import java.util.Calendar;
import java.util.Date; //import java.util.Date;
import java.util.List; //import java.util.List;
//
import ch.qos.logback.core.net.SyslogOutputStream; //import ch.qos.logback.core.net.SyslogOutputStream;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort; //import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate; //import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Query; //import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto; //import com.yeejoin.amos.boot.module.command.api.dto.SeismometeorologyDto;
import org.springframework.data.mongodb.core.query.Criteria; //import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
//
/** ///**
* @description: // * @description:
* @author: tw // * @author: tw
* @createDate: 2021/7/19 // * @createDate: 2021/7/19
*/ // */
@Component //@Component
public class SeismometeorologyDtoDao { //public class SeismometeorologyDtoDao {
//
//
@Autowired // @Autowired
private MongoTemplate mongoTemplate; // private MongoTemplate mongoTemplate;
//
/** // /**
* 保存对象SeismometeorologyDto // * 保存对象SeismometeorologyDto
* // *
* @param // * @param
*/ // */
public void saveObj(SeismometeorologyDto book) { // public void saveObj(SeismometeorologyDto book) {
mongoTemplate.save(book); // mongoTemplate.save(book);
} // }
//
//
/** // /**
* 24小時预警 // * 24小時预警
**/ // **/
public List<SeismometeorologyDto> findCarStateByWatchSn() { // public List<SeismometeorologyDto> findCarStateByWatchSn() {
System.out.println(new Date().getTime()); // System.out.println(new Date().getTime());
Query query = new Query(Criteria.where("releaseTime").gte(getStartTime()) // Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
.lte(getEndTime())); // .lte(getEndTime()));
Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime"); // Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
query.with(sort); // query.with(sort);
List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class); // List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
return gpsList; // return gpsList;
} // }
//
//
/** // /**
* 当天气象预警 // * 当天气象预警
**/ // **/
public List<SeismometeorologyDto> findDutyCarStateBy() { // public List<SeismometeorologyDto> findDutyCarStateBy() {
//
System.out.println(new Date().getTime()); // System.out.println(new Date().getTime());
Query query = new Query(Criteria.where("releaseTime").gte(getStartTime()) // Query query = new Query(Criteria.where("releaseTime").gte(getStartTime())
.lte(getEndTime())); // .lte(getEndTime()));
Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime"); // Sort sort = Sort.by(Sort.Direction.DESC, "releaseTime");
query.with(sort); // query.with(sort);
List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class); // List<SeismometeorologyDto> gpsList = mongoTemplate.find(query, SeismometeorologyDto.class);
return gpsList; // return gpsList;
} // }
//
//
private static Date getStartTime() { // private static Date getStartTime() {
Calendar todayStart = Calendar.getInstance(); // Calendar todayStart = Calendar.getInstance();
todayStart.set(Calendar.HOUR_OF_DAY, 0); // todayStart.set(Calendar.HOUR_OF_DAY, 0);
todayStart.set(Calendar.MINUTE, 0); // todayStart.set(Calendar.MINUTE, 0);
todayStart.set(Calendar.SECOND, 0); // todayStart.set(Calendar.SECOND, 0);
todayStart.set(Calendar.MILLISECOND, 0); // todayStart.set(Calendar.MILLISECOND, 0);
return todayStart.getTime(); // return todayStart.getTime();
} // }
//
private static Date getEndTime() { // private static Date getEndTime() {
Calendar todayEnd = Calendar.getInstance(); // Calendar todayEnd = Calendar.getInstance();
todayEnd.set(Calendar.HOUR_OF_DAY, 23); // todayEnd.set(Calendar.HOUR_OF_DAY, 23);
todayEnd.set(Calendar.MINUTE, 59); // todayEnd.set(Calendar.MINUTE, 59);
todayEnd.set(Calendar.SECOND, 59); // todayEnd.set(Calendar.SECOND, 59);
todayEnd.set(Calendar.MILLISECOND, 999); // todayEnd.set(Calendar.MILLISECOND, 999);
return todayEnd.getTime(); // return todayEnd.getTime();
} // }
//
//
} //}
//
amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml
View file @ bc93c7b6
...@@ -955,7 +955,9 @@ ...@@ -955,7 +955,9 @@
AND d.type = #{dto.type} AND d.type = #{dto.type}
</when> </when>
<otherwise> <otherwise>
AND ( d.type = 'FIREALARM' OR d.type = 'BREAKDOWN' OR d.type = 'SHIELD' OR d.type = 'NOTICE' )
and (d.type in (select type_code from wl_signal_classify where is_alarm=1))
</otherwise> </otherwise>
</choose> </choose>
<if test="dto.fireEquipmentName != null and dto.fireEquipmentName != '' "> <if test="dto.fireEquipmentName != null and dto.fireEquipmentName != '' ">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment