From d3bc1cfac9d165d929e563527502d9d5136fead8 Mon Sep 17 00:00:00 2001 From: LUCAS Date: Tue, 30 Aug 2022 14:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BB=E6=8A=A4-=E4=B8=8A=E6=9C=88=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/.vscode/launch.json | 2 +- .../lib/controllers/roadMaintenance/index.js | 60 +++++++++ api/app/lib/models/road_maintenance.js | 115 ++++++++++++++++++ api/app/lib/models/road_maintenance_cost.js | 110 +++++++++++++++++ api/app/lib/routes/roadMaintenance/index.js | 13 ++ ...各管养责任单位管养汇总表.xlsx | Bin 0 -> 7415 bytes .../工具脚本（无需执行）/dataIn.js | 13 +- .../工具脚本（无需执行）/index.js | 5 + .../养护_字段对应.json | 21 ++++ .../养护_数据字段对应.json | 21 ++++ .../养护_数据库表对应.json | 21 ++++ .../养护_数据脚本对应.sql | 44 +++++++ 12 files changed, 421 insertions(+), 4 deletions(-) create mode 100644 api/app/lib/controllers/roadMaintenance/index.js create mode 100644 api/app/lib/models/road_maintenance.js create mode 100644 api/app/lib/models/road_maintenance_cost.js create mode 100644 api/app/lib/routes/roadMaintenance/index.js create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/data/养护/南昌县农村公路各管养责任单位管养汇总表.xlsx create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/养护_字段对应.json create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/养护_数据字段对应.json create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/养护_数据库表对应.json create mode 100644 scripts/0.0.1/data/工具脚本（无需执行）/养护_数据脚本对应.sql diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index d82da15e..eaa8220c 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -14,7 +14,7 @@ }, "args": [ "-p 14000", - "-f http://localhost:4000", + "-f http://localhost:14000", "-g postgres://postgres:123@10.8.30.32:5432/highways4good", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", diff --git a/api/app/lib/controllers/roadMaintenance/index.js b/api/app/lib/controllers/roadMaintenance/index.js new file mode 100644 index 00000000..fcb1720e --- /dev/null +++ b/api/app/lib/controllers/roadMaintenance/index.js @@ -0,0 +1,60 @@ +'use strict'; + +'use strict'; +const moment = require('moment'); +const { QueryTypes } = require('sequelize'); + +async function getLastMonthCost(ctx) { + let rslt = []; + try { + const startTime = new Date(moment().startOf('year')), endTime = new Date(moment().endOf('year').valueOf()); + const models = ctx.fs.dc.models; + const costList = await models.RoadMaintenanceCost.findAll({ + where: { + maintenanceDate: { '$between': [startTime, endTime] } + } + }) + if (!costList || !costList.length) { + const dataList = await models.RoadMaintenance.findAll(); + for (var i = 0; i < 12; i++) { + dataList.map(item => { + const { countyHighway, townshipRoad, villageRoad, responsibleUnitForManagementAndMaintenance } = item; + const randomNum = 0.1 * (0.8 + Math.random() / 2); + const dateTime = new Date(moment().month(i)); + + let data = { + countyName: responsibleUnitForManagementAndMaintenance, + roadLengthCounty: countyHighway ? countyHighway * randomNum : 0, + roadLengthTownship: townshipRoad ? townshipRoad * randomNum : 0, + roadLengthVillage: villageRoad ? villageRoad * randomNum : 0, + maintenanceDate: dateTime + } + data.roadCostCounty = data.roadLengthCounty * 15000 / 12, + data.roadCostTownship = data.roadLengthTownship * 7500 / 12, + data.roadCostVillage = data.roadLengthVillage * 3900 / 12; + + rslt.push(data) + + models.RoadMaintenanceCost.create(data) + }) + } + + } else { + rslt = costList + } + + + ctx.status = 200; + ctx.body = rslt; + } catch (error) { + ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); + ctx.status = 400; + ctx.body = { + message: typeof error == 'string' ? error : undefined + } + } +} + +module.exports = { + getLastMonthCost, +} \ No newline at end of file diff --git a/api/app/lib/models/road_maintenance.js b/api/app/lib/models/road_maintenance.js new file mode 100644 index 00000000..f960c576 --- /dev/null +++ b/api/app/lib/models/road_maintenance.js @@ -0,0 +1,115 @@ +/* eslint-disable*/ +'use strict'; + +module.exports = dc => { + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const RoadMaintenance = sequelize.define("roadMaintenance", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + unique: "road_maintenance_id_uindex" + }, + serialNumber: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "序号", + primaryKey: false, + field: "serial_number", + autoIncrement: false + }, + responsibleUnitForManagementAndMaintenance: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "管养责任单位", + primaryKey: false, + field: "responsible_unit_for_management_and_maintenance", + autoIncrement: false + }, + maintenanceUnit: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "养护单位", + primaryKey: false, + field: "maintenance_unit", + autoIncrement: false + }, + management: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "管理人员", + primaryKey: false, + field: "management", + autoIncrement: false + }, + worker: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "工人", + primaryKey: false, + field: "worker", + autoIncrement: false + }, + publicWelfarePost: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "公益岗位", + primaryKey: false, + field: "public_welfare_post", + autoIncrement: false + }, + countyHighway: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "县道", + primaryKey: false, + field: "county_highway", + autoIncrement: false + }, + townshipRoad: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "乡道 ", + primaryKey: false, + field: "township_road", + autoIncrement: false + }, + villageRoad: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "村道", + primaryKey: false, + field: "village_road", + autoIncrement: false + }, + bridge: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "桥梁 ", + primaryKey: false, + field: "bridge", + autoIncrement: false + } + }, { + tableName: "road_maintenance", + comment: "", + indexes: [] + }); + dc.models.RoadMaintenance = RoadMaintenance; + return RoadMaintenance; +}; \ No newline at end of file diff --git a/api/app/lib/models/road_maintenance_cost.js b/api/app/lib/models/road_maintenance_cost.js new file mode 100644 index 00000000..a17a1612 --- /dev/null +++ b/api/app/lib/models/road_maintenance_cost.js @@ -0,0 +1,110 @@ +/* eslint-disable*/ +'use strict'; + +module.exports = dc => { + const DataTypes = dc.ORM; + const sequelize = dc.orm; + const RoadMaintenanceCost = sequelize.define("roadMaintenanceCost", { + id: { + type: DataTypes.INTEGER, + allowNull: false, + defaultValue: null, + comment: null, + primaryKey: true, + field: "id", + autoIncrement: true, + }, + mId: { + type: DataTypes.INTEGER, + allowNull: true, + defaultValue: null, + comment: "养护id", + primaryKey: false, + field: "mId", + autoIncrement: false + }, + countyName: { + type: DataTypes.STRING, + allowNull: true, + defaultValue: null, + comment: "管养责任单位", + primaryKey: false, + field: "county_name", + autoIncrement: false + }, + + roadLengthCounty: { + type: DataTypes.FLOAT, + allowNull: true, + defaultValue: null, + comment: "养护长度", + primaryKey: false, + field: "road_length_county", + autoIncrement: false + }, + roadCostCounty: { + type: DataTypes.DOUBLE, + allowNull: true, + defaultValue: null, + comment: "养护费用", + primaryKey: false, + field: "road_cost_county", + autoIncrement: false + }, + + + roadLengthVillage: { + type: DataTypes.FLOAT, + allowNull: true, + defaultValue: null, + comment: "养护长度", + primaryKey: false, + field: "road_length_village", + autoIncrement: false + }, + roadCostVillage: { + type: DataTypes.DOUBLE, + allowNull: true, + defaultValue: null, + comment: "养护费用", + primaryKey: false, + field: "road_cost_village", + autoIncrement: false + }, + + + roadLengthTownship: { + type: DataTypes.FLOAT, + allowNull: true, + defaultValue: null, + comment: "养护长度", + primaryKey: false, + field: "road_length_township", + autoIncrement: false + }, + roadCostTownship: { + type: DataTypes.DOUBLE, + allowNull: true, + defaultValue: null, + comment: "养护费用", + primaryKey: false, + field: "road_cost_township", + autoIncrement: false + }, + maintenanceDate: { + type: DataTypes.DATE, + allowNull: true, + defaultValue: null, + comment: "养护日期", + primaryKey: false, + field: "maintenance_date", + autoIncrement: false + }, + }, { + tableName: "road_maintenance_cost", + comment: "", + indexes: [] + }); + dc.models.RoadMaintenanceCost = RoadMaintenanceCost; + return RoadMaintenanceCost; +}; \ No newline at end of file diff --git a/api/app/lib/routes/roadMaintenance/index.js b/api/app/lib/routes/roadMaintenance/index.js new file mode 100644 index 00000000..dfd9e7e7 --- /dev/null +++ b/api/app/lib/routes/roadMaintenance/index.js @@ -0,0 +1,13 @@ +'use strict'; + +const roadMaintenance = require('../../controllers/roadMaintenance'); + +module.exports = function (app, router, opts) { + + app.fs.api.logAttr['GET/road/maintenance/cost/query'] = { content: '获取上月道路养护费用', visible: false }; + router.get('/road/maintenance/cost/query', roadMaintenance.getLastMonthCost); + + // app.fs.api.logAttr['GET/road/maintenance/cost/query'] = { content: '获取上月道路养护费用', visible: false }; + // router.get('/road/maintenance/cost/query', roadMaintenance.getLastMonthCost); + +} \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/data/养护/南昌县农村公路各管养责任单位管养汇总表.xlsx b/scripts/0.0.1/data/工具脚本（无需执行）/data/养护/南昌县农村公路各管养责任单位管养汇总表.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..779bf8701c51ade2d98bb267728539ceaa6ad831 GIT binary patch literal 7415 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 Lu~#OP|GN7>`=i>y literal 0 HcmV?d00001 diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js b/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js index 9e5c422c..662e6e6f 100644 --- a/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js +++ b/scripts/0.0.1/data/工具脚本（无需执行）/dataIn.js @@ -12,8 +12,8 @@ try { const pool = new Pool({ user: 'postgres', host: '10.8.30.32', - // database: 'highways4good', - database: 'highways4good_initd', + database: 'highways4good', + // database: 'highways4good_initd', password: '123', port: 5432, }) @@ -26,6 +26,11 @@ try { await client.query('BEGIN') const fileList = [ + // { + // path: ['./data/养护/南昌县农村公路各管养责任单位管养汇总表.xlsx'], + // n: '养护', + // tableName: 'road_maintenance', + // }, // { // path: ['./data/道路/村道第三方.xls'], // n: '道路', @@ -139,14 +144,16 @@ try { let worksheet = workbook.Sheets[firstSheetName]; let res = XLSX.utils.sheet_to_json(worksheet); const keyMap = require(`./${f.n}_数据库表对应.json`); - console.log(keyMap); + console.log("keyMap:", keyMap); for (let d of res) { let insertStr = `INSERT INTO "${f.tableName}" (`; let insertKeys = (f.defaultKey || []).concat([]); let insertValues = (f.defaultValue || []).concat([]); + for (let k in keyMap) { // 没做判重 let v = d[k]; + console.log(v) if (v) { insertKeys.push(keyMap[k]); diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/index.js b/scripts/0.0.1/data/工具脚本（无需执行）/index.js index f4cf143f..7897c188 100644 --- a/scripts/0.0.1/data/工具脚本（无需执行）/index.js +++ b/scripts/0.0.1/data/工具脚本（无需执行）/index.js @@ -63,6 +63,11 @@ try { // 有手动更改 不要轻易再次执行脚本 const fileList = [ + // { + // path: './data/养护/南昌县农村公路各管养责任单位管养汇总表.xlsx', + // n: '养护', + // tableName: 'road_maintenance' + // }, // { // path: './data/道路/县道第三方.xls', // n: '道路', diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/养护_字段对应.json b/scripts/0.0.1/data/工具脚本（无需执行）/养护_字段对应.json new file mode 100644 index 00000000..17d39172 --- /dev/null +++ b/scripts/0.0.1/data/工具脚本（无需执行）/养护_字段对应.json @@ -0,0 +1,21 @@ +{"序号" : "serialNumber", + + "管养责任单位" : "responsibleUnitForManagementAndMaintenance", + + "养护单位" : "maintenanceUnit", + + "管理人员" : "management", + + "工人" : "worker", + + "公益岗位" : "publicWelfarePost", + + "县道" : "countyHighway", + + "乡道 " : "townshipRoad", + + "村道" : "villageRoad", + + "桥梁 " : "bridge" + + } \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据字段对应.json b/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据字段对应.json new file mode 100644 index 00000000..4f995388 --- /dev/null +++ b/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据字段对应.json @@ -0,0 +1,21 @@ +{ "serialNumber":"序号", + + "responsibleUnitForManagementAndMaintenance":"管养责任单位", + + "maintenanceUnit":"养护单位", + + "management":"管理人员", + + "worker":"工人", + + "publicWelfarePost":"公益岗位", + + "countyHighway":"县道", + + "townshipRoad":"乡道 ", + + "villageRoad":"村道", + + "bridge":"桥梁 " + + } \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据库表对应.json b/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据库表对应.json new file mode 100644 index 00000000..2891d624 --- /dev/null +++ b/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据库表对应.json @@ -0,0 +1,21 @@ +{"序号" : "serial_number", + + "管养责任单位" : "responsible_unit_for_management_and_maintenance", + + "养护单位" : "maintenance_unit", + + "管理人员" : "management", + + "工人" : "worker", + + "公益岗位" : "public_welfare_post", + + "县道" : "county_Highway", + + "乡道 " : "township_Road", + + "村道" : "village_Road", + + "桥梁 " : "bridge" + + } \ No newline at end of file diff --git a/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据脚本对应.sql b/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据脚本对应.sql new file mode 100644 index 00000000..0aef952d --- /dev/null +++ b/scripts/0.0.1/data/工具脚本（无需执行）/养护_数据脚本对应.sql @@ -0,0 +1,44 @@ + + -- 养护 + create table if not exists "road_maintenance" + ( + id serial not null + ); + + create unique index if not exists road_maintenance_id_uindex + on road_maintenance (id); + + alter table road_maintenance + add constraint road_maintenance_pk + primary key (id); + + alter table road_maintenance add Serial_Number varchar(1024); + comment on column road_maintenance.Serial_Number is '序号'; + + alter table road_maintenance add Responsible_Unit_For_Management_And_Maintenance varchar(1024); + comment on column road_maintenance.Responsible_Unit_For_Management_And_Maintenance is '管养责任单位'; + + alter table road_maintenance add Maintenance_Unit varchar(1024); + comment on column road_maintenance.Maintenance_Unit is '养护单位'; + + alter table road_maintenance add Management varchar(1024); + comment on column road_maintenance.Management is '管理人员'; + + alter table road_maintenance add Worker varchar(1024); + comment on column road_maintenance.Worker is '工人'; + + alter table road_maintenance add Public_Welfare_Post varchar(1024); + comment on column road_maintenance.Public_Welfare_Post is '公益岗位'; + + alter table road_maintenance add County_Highway varchar(1024); + comment on column road_maintenance.County_Highway is '县道'; + + alter table road_maintenance add Township_Road varchar(1024); + comment on column road_maintenance.Township_Road is '乡道 '; + + alter table road_maintenance add Village_Road varchar(1024); + comment on column road_maintenance.Village_Road is '村道'; + + alter table road_maintenance add Bridge varchar(1024); + comment on column road_maintenance.Bridge is '桥梁 '; + \ No newline at end of file