* 获取轨迹 | * 获取轨迹 | ||||
*/ | */ | ||||
@RequestMapping("/getPointList") | @RequestMapping("/getPointList") | ||||
public JsonResult getInfo(Integer taskId){ | |||||
JsonResult jsonResult = airlineDataService.getList(taskId); | |||||
public JsonResult getInfo(Integer recordId){ | |||||
JsonResult jsonResult = airlineDataService.getList(recordId); | |||||
return jsonResult; | return jsonResult; | ||||
} | } | ||||
public JsonResult getList(int taskId) { | public JsonResult getList(int taskId) { | ||||
// 查询条件 | // 查询条件 | ||||
QueryWrapper<AirlineData> queryWrapper = new QueryWrapper<>(); | QueryWrapper<AirlineData> queryWrapper = new QueryWrapper<>(); | ||||
queryWrapper.eq("inspection_id", taskId); | |||||
queryWrapper.eq("record_id", taskId); | |||||
queryWrapper.eq("mark", 1); | queryWrapper.eq("mark", 1); | ||||
queryWrapper.orderByAsc("id"); | queryWrapper.orderByAsc("id"); | ||||
// 分页设置 | // 分页设置 |
* 航线id | * 航线id | ||||
*/ | */ | ||||
private int lineId; | private int lineId; | ||||
private int recordId; | |||||
} | } |
websocketurl: wss://airport.t-aaron.com/airport/socket/webSocket | |||||
websocketurl: wss://airport-test.t-aaron.com/airport/socket/webSocket |
#数据库的配置信息 | #数据库的配置信息 | ||||
spring: | spring: | ||||
datasource: | datasource: | ||||
url: jdbc:mysql://rm-uf6x76i111rb1eo48.mysql.rds.aliyuncs.com:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false | |||||
url: jdbc:mysql://rm-uf6z740323e8053pj.mysql.rds.aliyuncs.com:3306/tuoheng_airport?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2b8&useSSL=true&tinyInt1isBit=false | |||||
username: root | username: root | ||||
password: TH22#2022 | password: TH22#2022 | ||||
redis: | redis: | ||||
# 缓存库默认索引0 | # 缓存库默认索引0 | ||||
database: 9 | database: 9 | ||||
# Redis服务器地址 | # Redis服务器地址 | ||||
host: r-uf6r5lm7c7sfdv3ehb.redis.rds.aliyuncs.com | |||||
host: r-uf6cdzjifj20jszykr.redis.rds.aliyuncs.com | |||||
# Redis服务器连接端口 | # Redis服务器连接端口 | ||||
port: 6379 | port: 6379 | ||||
# Redis服务器连接密码(默认为空) | # Redis服务器连接密码(默认为空) | ||||
type-aliases-package: com.example.mybatisplus.entity #自己的实体类地址 | type-aliases-package: com.example.mybatisplus.entity #自己的实体类地址 | ||||
configuration: | configuration: | ||||
# 这个配置会将执行的sql打印出来,在开发或测试的时候可以用 | # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用 | ||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl | |||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl | |||||
interfaceUrl: https://airport-test.t-aaron.com/airport/admin/airportInterface |
<select id="getList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo"> | <select id="getList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo"> | ||||
SELECT | SELECT | ||||
i.id,i.`name`,i.type,re.create_time beginTime,re.`status`,i.airline_file_id lineId | |||||
i.id,i.`name`,i.type,re.create_time beginTime,re.`status`,i.airline_file_id lineId,re.id recordId | |||||
FROM | FROM | ||||
th_inspection i | th_inspection i | ||||
LEFT JOIN th_inspection_record re ON i.id = re.task_id | LEFT JOIN th_inspection_record re ON i.id = re.task_id | ||||
<select id="getPreList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo"> | <select id="getPreList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo"> | ||||
SELECT | SELECT | ||||
i.id,i.`name`,i.type,i.cycle_next_time beginTime,0 status,0 lineId | |||||
i.id,i.`name`,i.type,i.cycle_next_time beginTime,0 status,0 lineId,0 recordId | |||||
FROM | FROM | ||||
th_inspection i | th_inspection i | ||||
WHERE | WHERE | ||||
<select id="getRunList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo"> | <select id="getRunList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo"> | ||||
SELECT | SELECT | ||||
i.id,i.`name`,i.type,re.create_time beginTime,re.`status`,i.airline_file_id lineId | |||||
i.id,i.`name`,i.type,re.create_time beginTime,re.`status`,i.airline_file_id lineId,re.id recordId | |||||
FROM | FROM | ||||
th_inspection i | th_inspection i | ||||
LEFT JOIN th_inspection_record re ON i.id = re.task_id | LEFT JOIN th_inspection_record re ON i.id = re.task_id |