Browse Source

获取路段信息

release_0.0.1
巴林闲侠 3 years ago
parent
commit
4ae2855083
  1. 82
      api/app/lib/controllers/data/road.js
  2. 3
      api/app/lib/routes/data/index.js
  3. 26
      api/log/development.log

82
api/app/lib/controllers/data/road.js

@ -5,7 +5,7 @@ async function importIn (ctx) {
// 数据导入
try {
const models = ctx.fs.dc.models;
const { level } = ctx.query;
const { level, } = ctx.query;
const data = ctx.request.body;
const roadRes = await models.Road.findAll({
@ -35,14 +35,81 @@ async function importIn (ctx) {
async function get (ctx) {
try {
const models = ctx.fs.dc.models;
const { level } = ctx.query;
const { level, road, sectionStart, sectionEnd } = ctx.query;
const roadRes = await models.Road.findAll({
where: {
level
},
let findOption = {
where: {},
order: [['id', 'DESC']]
})
}
if (level) {
findOption.where.level = level
}
if (road || sectionStart || sectionEnd) {
findOption.where['$or'] = {}
if (road) {
findOption.where['$or'].push = {
routeName: { $like: `%${road}%` }
}
}
if (sectionStart) {
findOption.where['$or'].
startingPlaceName = { $like: `%${sectionStart}%` }
}
if (sectionEnd) {
findOption.where['$or'].
stopPlaceName = { $like: `%${sectionEnd}%` }
}
}
const roadRes = await models.Road.findAll(findOption)
ctx.status = 200;
ctx.body = roadRes
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
}
async function getRoadSection (ctx) {
try {
const models = ctx.fs.dc.models;
const { level, road, sectionStart, sectionEnd } = ctx.query;
let findOption = {
where: {},
order: [['id', 'DESC']],
attributes: ['id', 'routeName', 'startingPlaceName', 'stopPlaceName']
}
if (level) {
findOption.where.level = level
}
if (road || sectionStart || sectionEnd) {
findOption.where['$or'] = {}
if (road) {
findOption.where['$or'].push = {
routeName: { $like: `%${road}%` }
}
}
if (sectionStart) {
findOption.where['$or'].
startingPlaceName = { $like: `%${sectionStart}%` }
}
if (sectionEnd) {
findOption.where['$or'].
stopPlaceName = { $like: `%${sectionEnd}%` }
}
}
const roadRes = await models.Road.findAll(findOption)
ctx.status = 200;
ctx.body = roadRes
@ -104,5 +171,6 @@ async function del (ctx) {
module.exports = {
importIn,
getRoadSection,
get, edit, del,
};

3
api/app/lib/routes/data/index.js

@ -73,6 +73,9 @@ module.exports = function (app, router, opts) {
app.fs.api.logAttr['GET/road'] = { content: '获取道路数据', visible: true };
router.get('/road', road.get);
app.fs.api.logAttr['GET/road/section'] = { content: '获取道路路段数据', visible: true };
router.get('/road/section', road.getRoadSection);
app.fs.api.logAttr['put/road'] = { content: '编辑道路数据', visible: true };
router.put('/road', road.edit);

26
api/log/development.log

@ -8537,3 +8537,29 @@
2022-07-26 09:52:19.623 - debug: [FS-LOGGER] Init.
2022-07-26 09:52:19.753 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 09:52:19.753 - info: [FS-AUTH] Inject auth and api mv into router.
2022-07-26 11:33:33.533 - debug: [FS-LOGGER] Init.
2022-07-26 11:33:33.676 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 11:33:33.677 - info: [FS-AUTH] Inject auth and api mv into router.
2022-07-26 11:35:35.369 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:35:38.298 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:35:41.257 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:35:46.213 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:35:48.608 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:35:56.490 - debug: [FS-LOGGER] Init.
2022-07-26 11:35:56.606 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 11:35:56.606 - info: [FS-AUTH] Inject auth and api mv into router.
2022-07-26 11:36:00.269 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:36:31.053 - debug: [FS-LOGGER] Init.
2022-07-26 11:36:31.174 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 11:36:31.174 - info: [FS-AUTH] Inject auth and api mv into router.
2022-07-26 11:36:37.420 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:36:48.130 - error: path: /road, error: ReferenceError: stopPlaceName is not defined
2022-07-26 11:36:58.215 - debug: [FS-LOGGER] Init.
2022-07-26 11:36:58.340 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 11:36:58.340 - info: [FS-AUTH] Inject auth and api mv into router.
2022-07-26 11:38:05.804 - debug: [FS-LOGGER] Init.
2022-07-26 11:38:05.939 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 11:38:05.939 - info: [FS-AUTH] Inject auth and api mv into router.
2022-07-26 11:43:16.204 - debug: [FS-LOGGER] Init.
2022-07-26 11:43:16.335 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-26 11:43:16.335 - info: [FS-AUTH] Inject auth and api mv into router.

Loading…
Cancel
Save