Browse Source

需求修改

tags/V1.0.2
wangwei 10 months ago
parent
commit
216c734e00
6 changed files with 13 additions and 10 deletions
  1. +2
    -2
      src/main/java/com/tuoheng/airportGzdp/controller/AirLineController.java
  2. +1
    -1
      src/main/java/com/tuoheng/airportGzdp/service/impl/AirlineDataServiceImpl.java
  3. +2
    -0
      src/main/java/com/tuoheng/airportGzdp/vo/TaskListVo.java
  4. +1
    -1
      src/main/resources/application.properties
  5. +4
    -3
      src/main/resources/application.yml
  6. +3
    -3
      src/main/resources/mapper/TaskMapper.xml

+ 2
- 2
src/main/java/com/tuoheng/airportGzdp/controller/AirLineController.java View File

@@ -42,8 +42,8 @@ public class AirLineController {
* 获取轨迹
*/
@RequestMapping("/getPointList")
public JsonResult getInfo(Integer taskId){
JsonResult jsonResult = airlineDataService.getList(taskId);
public JsonResult getInfo(Integer recordId){
JsonResult jsonResult = airlineDataService.getList(recordId);
return jsonResult;
}


+ 1
- 1
src/main/java/com/tuoheng/airportGzdp/service/impl/AirlineDataServiceImpl.java View File

@@ -37,7 +37,7 @@ public class AirlineDataServiceImpl extends ServiceImpl<AirlineDataMapper, Airli
public JsonResult getList(int taskId) {
// 查询条件
QueryWrapper<AirlineData> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("inspection_id", taskId);
queryWrapper.eq("record_id", taskId);
queryWrapper.eq("mark", 1);
queryWrapper.orderByAsc("id");
// 分页设置

+ 2
- 0
src/main/java/com/tuoheng/airportGzdp/vo/TaskListVo.java View File

@@ -38,4 +38,6 @@ public class TaskListVo {
* 航线id
*/
private int lineId;

private int recordId;
}

+ 1
- 1
src/main/resources/application.properties View File

@@ -1 +1 @@
websocketurl: wss://airport.t-aaron.com/airport/socket/webSocket
websocketurl: wss://airport-test.t-aaron.com/airport/socket/webSocket

+ 4
- 3
src/main/resources/application.yml View File

@@ -7,14 +7,14 @@ server:
#数据库的配置信息
spring:
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
password: TH22#2022
redis:
# 缓存库默认索引0
database: 9
# Redis服务器地址
host: r-uf6r5lm7c7sfdv3ehb.redis.rds.aliyuncs.com
host: r-uf6cdzjifj20jszykr.redis.rds.aliyuncs.com
# Redis服务器连接端口
port: 6379
# Redis服务器连接密码(默认为空)
@@ -40,4 +40,5 @@ mybatis-plus:
type-aliases-package: com.example.mybatisplus.entity #自己的实体类地址
configuration:
# 这个配置会将执行的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

+ 3
- 3
src/main/resources/mapper/TaskMapper.xml View File

@@ -4,7 +4,7 @@

<select id="getList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo">
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
th_inspection i
LEFT JOIN th_inspection_record re ON i.id = re.task_id
@@ -15,7 +15,7 @@

<select id="getPreList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo">
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
th_inspection i
WHERE
@@ -24,7 +24,7 @@

<select id="getRunList" resultType="com.tuoheng.airportGzdp.vo.TaskListVo">
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
th_inspection i
LEFT JOIN th_inspection_record re ON i.id = re.task_id

Loading…
Cancel
Save