free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

road 标志是否删除或是否可抽查

dev
CODE 1 year ago
parent
0c147b854f
commit
2de9db1cc2
12 changed files with 1354 additions and 1190 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 378
      api/app/lib/controllers/data/road.js
  2. 11
      api/app/lib/controllers/data/task.js
  3. 6
      api/app/lib/controllers/overview/building.js
  4. 2004
      api/app/lib/controllers/report/index.js
  5. 20
      api/app/lib/models/road.js
  6. 17
      scripts/1.4.0/data/2_update_road_data_无需执行/.vscode/launch.json
  7. 11
      scripts/1.4.0/data/2_update_road_data_无需执行/Dockerfile
  8. 7
      scripts/1.4.0/data/2_update_road_data_无需执行/Dockerfilenew
  9. BIN
      scripts/1.4.0/data/2_update_road_data_无需执行/data/乡道(新)(1).xlsx
  10. 58
      scripts/1.4.0/data/2_update_road_data_无需执行/index.js
  11. 17
      scripts/1.4.0/data/2_update_road_data_无需执行/package.json
  12. 9
      scripts/1.4.0/schema/5.update_road.sql

378
api/app/lib/controllers/data/road.js
View File

@ -1,202 +1,212 @@
'use strict'; 'use strict';
const roadKeyMap = require('./road.json') const roadKeyMap = require('./road.json')
async function importIn(ctx) { async function importIn (ctx) {
// 数据导入 // 数据导入
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const { level, } = ctx.query; const { level, } = ctx.query;
const data = ctx.request.body; const data = ctx.request.body;
const roadRes = await models.Road.findAll({ const roadRes = await models.Road.findAll({
where: { where: {
level level,
} del: false
}) }
let preCreateArr = [] })
for (let d of data) { let preCreateArr = []
if (roadRes.some(r => r.routeCode + r.sectionNo == d['路线代码'] + d['路段序号'])) { for (let d of data) {
//repeat if (roadRes.some(r => r.routeCode + r.sectionNo == d['路线代码'] + d['路段序号'])) {
} else { //repeat
// await models.Road.create(d); } else {
} // await models.Road.create(d);
} }
}
ctx.status = 204
} catch (error) { ctx.status = 204
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); } catch (error) {
ctx.status = 400; ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.body = { ctx.status = 400;
message: typeof error == 'string' ? error : undefined ctx.body = {
} message: typeof error == 'string' ? error : undefined
} }
}
} }
async function get(ctx) { async function get (ctx) {
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const { codePrefix, level, road, sectionStart, sectionEnd, alterId } = ctx.query; const { codePrefix, level, road, sectionStart, sectionEnd, alterId } = ctx.query;
let findOption = { let findOption = {
where: {}, where: {
order: [['id', 'DESC']], del: false
} },
if (level == '村') { order: [['id', 'DESC']],
findOption.include = [{ model: models.Village, }] }
} if (level == '村') {
if (alterId) { findOption.include = [{ model: models.Village, }]
findOption.where.id = { $notIn: alterId } }
} if (alterId) {
findOption.where.id = { $notIn: alterId }
if (codePrefix) { }
findOption.where.routeCode = { $like: `${codePrefix}%` }
} if (codePrefix) {
findOption.where.routeCode = { $like: `${codePrefix}%` }
if (level) { }
findOption.where.level = level
} if (level) {
if (road || sectionStart || sectionEnd) { findOption.where.level = level
findOption.where['$or'] = {} }
if (road) { if (road || sectionStart || sectionEnd) {
findOption.where['$or']. findOption.where['$or'] = {}
routeName = { $like: `%${road}%` } if (road) {
} findOption.where['$or'].
if (sectionStart) { routeName = { $like: `%${road}%` }
findOption.where['$or']. }
startingPlaceName = { $like: `%${sectionStart}%` } if (sectionStart) {
findOption.where['$or'].
} startingPlaceName = { $like: `%${sectionStart}%` }
if (sectionEnd) {
findOption.where['$or']. }
stopPlaceName = { $like: `%${sectionEnd}%` } 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; const roadRes = await models.Road.findAll(findOption)
let findOption = {
where: {}, ctx.status = 200;
order: [['id', 'DESC']], ctx.body = roadRes
attributes: ['id', 'routeName', 'startingPlaceName', 'stopPlaceName', 'routeCode', 'sectionNo', 'level'] } catch (error) {
} ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
if (level) { ctx.body = {
findOption.where.level = level message: typeof error == 'string' ? error : undefined
} }
if (road || sectionStart || sectionEnd) { }
findOption.where['$or'] = {}
if (road) {
findOption.where['$or'].
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 edit(ctx) { async function getRoadSection (ctx) {
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const data = ctx.request.body; const { level, road, sectionStart, sectionEnd } = ctx.query;
let findOption = {
where: {},
order: [['id', 'DESC']],
attributes: ['id', 'routeName', 'startingPlaceName', 'stopPlaceName', 'routeCode', 'sectionNo', 'level']
}
if (level) {
findOption.where.level = level
}
if (road || sectionStart || sectionEnd) {
findOption.where['$or'] = {}
if (road) {
findOption.where['$or'].
routeName = { $like: `%${road}%` }
}
if (sectionStart) {
findOption.where['$or'].
startingPlaceName = { $like: `%${sectionStart}%` }
if (!data.roadId) {
await models.Road.create(data)
} else {
await models.Road.update(
data, {
where: {
id: data.roadId
} }
}) if (sectionEnd) {
} findOption.where['$or'].
stopPlaceName = { $like: `%${sectionEnd}%` }
ctx.status = 204 }
} catch (error) { }
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400; const roadRes = await models.Road.findAll(findOption)
ctx.body = {
message: typeof error == 'string' ? error : undefined 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 del(ctx) { async function edit (ctx) {
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const { roadId } = ctx.params; const data = ctx.request.body;
await models.Road.destroy({ if (!data.roadId) {
where: { await models.Road.create(data)
id: roadId } else {
} await models.Road.update(
}) data, {
where: {
ctx.status = 204 id: data.roadId
} catch (error) { }
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); })
ctx.status = 400; }
ctx.body = {
message: typeof error == 'string' ? error : undefined ctx.status = 204
} } catch (error) {
} ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
}
async function del (ctx) {
try {
const models = ctx.fs.dc.models;
const { roadId } = ctx.params;
// await models.Road.destroy({
// where: {
// id: roadId
// }
// })
await models.Road.update({
del: true
}, {
where: {
id: roadId
}
})
ctx.status = 204
} catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400;
ctx.body = {
message: typeof error == 'string' ? error : undefined
}
}
} }
async function getVillageList(ctx) { async function getVillageList (ctx) {
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const { } = ctx.query; const { } = ctx.query;
const res = await models.Village.findAll() const res = await models.Village.findAll()
ctx.status = 200; ctx.status = 200;
ctx.body = res ctx.body = res
} catch (error) { } catch (error) {
ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
ctx.status = 400; ctx.status = 400;
ctx.body = { ctx.body = {
message: typeof error == 'string' ? error : undefined message: typeof error == 'string' ? error : undefined
} }
} }
} }
module.exports = { module.exports = {
importIn, importIn,
getRoadSection, getRoadSection,
get, edit, del, get, edit, del,
getVillageList, getVillageList,
}; };

11
api/app/lib/controllers/data/task.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
async function getTask(ctx) { async function getTask (ctx) {
try { try {
const models = ctx.fs.dc.models const models = ctx.fs.dc.models
const query = ctx.query const query = ctx.query
@ -8,7 +8,8 @@ async function getTask(ctx) {
isdanger: query.isdanger isdanger: query.isdanger
} }
const whereRoadOpt = { const whereRoadOpt = {
id: query.id id: query.id,
del: false
} }
const taskRes = await models.TaskManage.findAndCountAll({ const taskRes = await models.TaskManage.findAndCountAll({
order: [['id', 'DESC']], order: [['id', 'DESC']],
@ -40,7 +41,7 @@ async function getTask(ctx) {
} }
//删除任务 //删除任务
async function delTask(ctx) { async function delTask (ctx) {
try { try {
const models = ctx.fs.dc.models const models = ctx.fs.dc.models
const { id } = ctx.params const { id } = ctx.params
@ -56,12 +57,12 @@ async function delTask(ctx) {
} }
//编辑任务 //编辑任务
async function editTask(ctx) { async function editTask (ctx) {
//const transaction = await ctx.fs.dc.orm.transaction(); //const transaction = await ctx.fs.dc.orm.transaction();
try { try {
const models = ctx.fs.dc.models const models = ctx.fs.dc.models
const params = ctx.request.body const params = ctx.request.body
const road = await models.Road.findOne({ where: { id: params.routeId } }) const road = await models.Road.findOne({ where: { id: params.routeId, del: false } })
const user = await models.User.findOne({ where: { id: params.userId } }) const user = await models.User.findOne({ where: { id: params.userId } })
if (!params.id) { if (!params.id) {
await models.TaskManage.create({ await models.TaskManage.create({

6
api/app/lib/controllers/overview/building.js
View File

@ -27,12 +27,14 @@ const areaCode = {
"360121572000": "良种繁殖场", "360121572000": "良种繁殖场",
} }
async function roadState(ctx) { async function roadState (ctx) {
try { try {
const models = ctx.fs.dc.models; const models = ctx.fs.dc.models;
const { userId } = ctx.fs.api; const { userId } = ctx.fs.api;
const roadRes = await models.Road.findAll({}) const roadRes = await models.Road.findAll({
del: false
})
const projectRoadRes = await models.Project.findAll({ const projectRoadRes = await models.Project.findAll({
type: 'road', type: 'road',
}) })

2004
api/app/lib/controllers/report/index.js
View File

File diff suppressed because it is too large

20
api/app/lib/models/road.js
View File

@ -784,7 +784,25 @@ module.exports = dc => {
primaryKey: false, primaryKey: false,
field: "village_id", field: "village_id",
autoIncrement: false autoIncrement: false
} },
del: {
type: DataTypes.BOOLEAN,
allowNull: true,
defaultValue: false,
comment: null,
primaryKey: false,
field: "del",
autoIncrement: false
},
spot: {
type: DataTypes.BOOLEAN,
allowNull: true,
defaultValue: true,
comment: null,
primaryKey: false,
field: "spot",
autoIncrement: false
},
}, { }, {
tableName: "road", tableName: "road",
comment: "", comment: "",

17
scripts/1.4.0/data/2_update_road_data_无需执行/.vscode/launch.json
View File

@ -0,0 +1,17 @@
{
// 使用 IntelliSense 了解相关属性。
// 悬停以查看现有属性的描述。
// 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "启动程序",
"skipFiles": [
"<node_internals>/**"
],
"program": "${workspaceFolder}\\index.js"
}
]
}

11
scripts/1.4.0/data/2_update_road_data_无需执行/Dockerfile
View File

@ -0,0 +1,11 @@
FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
COPY . /var/app
WORKDIR /var/app
RUN npm cache clean -f
RUN rm -rf package-lock.json
RUN npm install --registry http://10.8.30.22:7000
CMD ["node", "index.js"]

7
scripts/1.4.0/data/2_update_road_data_无需执行/Dockerfilenew
View File

@ -0,0 +1,7 @@
FROM repository.anxinyun.cn/base-images/nodejs12:20.10.12.2
COPY ./scripts/1.3.1/data/1_insert_report_data /var/app
WORKDIR /var/app
RUN npm cache clean -f
RUN rm -rf package-lock.json
RUN npm install --registry https://nexus.ngaiot.com/repository/fs-npm/
CMD ["node", "index.js"]

BIN
scripts/1.4.0/data/2_update_road_data_无需执行/data/乡道(新)(1).xlsx
View File

Binary file not shown.

58
scripts/1.4.0/data/2_update_road_data_无需执行/index.js
View File

@ -0,0 +1,58 @@
try {
const { Pool, Client } = require('pg')
const XLSX = require('xlsx')
const path = require('path')
const fs = require("fs");
// 测试环境
const pool = new Pool({
user: 'postgres',
host: '10.8.30.32',
database: 'highways4good',
password: '123',
port: 5432,
})
const fun = async () => {
// note: we don't try/catch this because if connecting throws an exception
// we don't need to dispose of the client (it will be undefined)
const client = await pool.connect()
try {
await client.query('BEGIN')
console.log(`开始`);
// 读取数据文件
let workbook = XLSX.readFile(path.join(__dirname, './data/乡道(新)(1).xlsx'));
let firstSheetName = workbook.SheetNames[0];
let worksheet = workbook.Sheets[firstSheetName];
let res = XLSX.utils.sheet_to_json(worksheet, {
defval: ''
});
for (let r of res) {
console.log(r);
fs.writeFileSync('AnswerOld.sql', `;\n`, 'utf-8');
// let time = generateRandomTimeString()
// console.log(time);
// await client.query(
// `INSERT INTO report (report_type, project_type, road, time,content,user_id) VALUES($1, $2, $3, $4, $5, $6) `,
// ['conserve', 'road', r['养护道路'], time, r['养护内容'], userId])
// // break
}
// await client.query('ROLLBACK')
await client.query('COMMIT')
console.log('执行完毕~')
} catch (e) {
await client.query('ROLLBACK')
console.log('执行错误~')
throw e
} finally {
client.release();
}
}
fun()
} catch (error) {
console.error(error)
}

17
scripts/1.4.0/data/2_update_road_data_无需执行/package.json
View File

@ -0,0 +1,17 @@
{
"name": "appkey-generator",
"version": "1.0.0",
"description": "tool",
"main": "index.js",
"scripts": {
"test": "mocha",
"start": "set NODE_ENV=development&&node index"
},
"author": "liu",
"license": "ISC",
"dependencies": {
"crypto-js": "^4.1.1",
"pg": "^7.18.2",
"xlsx": "^0.17.1"
}
}

9
scripts/1.4.0/schema/5.update_road.sql
View File

@ -0,0 +1,9 @@
alter table road
add del bool default false;
alter table road
add spot bool default true;
comment on column road.del is '标志道路是否被删除';
comment on column road.spot is '是否应该在抽查中被抽取';
Write Preview
Loading…
Cancel
Save