popovspiridon99/universal_is
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server: use isGeneral

Browse Source
This commit is contained in:
popovspiridon99
2025-10-21 11:26:07 +09:00
parent 2180afa529
commit 81562e3692
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
server/ems.db
View File

Binary file not shown.

25
server/src/general/general.service.ts
View File

@ -6,22 +6,25 @@ import { DataSource } from 'typeorm';
export class GeneralService { export class GeneralService {
constructor( constructor(
@InjectDataSource('emsConnection') @InjectDataSource('emsConnection')
private dataSource: DataSource private dataSource: DataSource,
@InjectDataSource('generalConnection')
private generalDataSource: DataSource
) { } ) { }
async getRegions(): Promise<any[]> { async getRegions(): Promise<any[]> {
const generalDatabase = 'nGeneral' const generalDatabase = '_isGeneral'
const result = await this.dataSource.query(` const result = await this.generalDataSource.query(`
SELECT * FROM ${generalDatabase}..vRegions; SELECT * FROM ${generalDatabase}..vRegions;
`) `)
return result return result
} }
async getDistricts(region_id: number): Promise<any[]> { async getDistricts(region_id: number): Promise<any[]> {
const generalDatabase = 'nGeneral' const generalDatabase = '_isGeneral'
const result = await this.dataSource.query(` const result = await this.generalDataSource.query(`
SELECT c.*, d.name AS district_name SELECT c.*, d.name AS district_name
FROM ${generalDatabase}..vCities c FROM ${generalDatabase}..vCities c
JOIN ${generalDatabase}..vDistricts d ON d.id_region = c.id_region AND d.id = c.id_district JOIN ${generalDatabase}..vDistricts d ON d.id_region = c.id_region AND d.id = c.id_district
@ -31,9 +34,9 @@ export class GeneralService {
} }
async getCities(offset?: number, limit?: number, search?: string, id?: number): Promise<any[]> { async getCities(offset?: number, limit?: number, search?: string, id?: number): Promise<any[]> {
const generalDatabase = 'nGeneral' const generalDatabase = '_isGeneral'
const result = await this.dataSource.query(` const result = await this.generalDataSource.query(`
SELECT * FROM ${generalDatabase}..Cities SELECT * FROM ${generalDatabase}..Cities
${id ? `WHERE id = ${id}` : ''} ${id ? `WHERE id = ${id}` : ''}
${search ? `WHERE name LIKE '%${search || ''}%'` : ''} ${search ? `WHERE name LIKE '%${search || ''}%'` : ''}
@ -45,19 +48,19 @@ export class GeneralService {
} }
async getTypes(): Promise<any[]> { async getTypes(): Promise<any[]> {
const generalDatabase = 'nGeneral' const generalDatabase = '_isGeneral'
const result = await this.dataSource.query(` const result = await this.dataSource.query(`
SELECT * FROM ${generalDatabase}..tTypes SELECT * FROM ${generalDatabase}..TTypes
ORDER BY id ORDER BY id
`) `)
return result return result
} }
async getObjects(offset?: number, limit?: number, city_id?: number): Promise<any[]> { async getObjects(offset?: number, limit?: number, city_id?: number): Promise<any[]> {
const generalDatabase = 'nGeneral' const generalDatabase = '_isGeneral'
const result = await this.dataSource.query(` const result = await this.generalDataSource.query(`
SELECT * FROM ${generalDatabase}..vObjects SELECT * FROM ${generalDatabase}..vObjects
${city_id ? `WHERE id_city = ${Number(city_id)}` : ''} ${city_id ? `WHERE id_city = ${Number(city_id)}` : ''}
ORDER BY id_object ORDER BY id_object

6
server/src/gis/gis.service.ts
View File

@ -22,7 +22,7 @@ export class GisService {
async getBoundsByEntityType(entity_type: 'region' | 'district' | 'city'): Promise<any[]> { async getBoundsByEntityType(entity_type: 'region' | 'district' | 'city'): Promise<any[]> {
const result = await this.dataSource.query(` const result = await this.dataSource.query(`
SELECT entity_id, entity_type, geometry FROM bounds SELECT entity_id, entity_type, geometry FROM bounds_general
WHERE entity_type = $1 WHERE entity_type = $1
`, [entity_type]) `, [entity_type])
if (Array.isArray(result)) { if (Array.isArray(result)) {
@ -49,7 +49,7 @@ export class GisService {
async getBoundsByEntityTypeAndId(entity_type: 'region' | 'district' | 'city', entity_id: number): Promise<any[]> { async getBoundsByEntityTypeAndId(entity_type: 'region' | 'district' | 'city', entity_id: number): Promise<any[]> {
const result = await this.dataSource.query(` const result = await this.dataSource.query(`
SELECT entity_id, entity_type, geometry FROM bounds SELECT entity_id, entity_type, geometry FROM bounds_general
WHERE entity_type = $1 WHERE entity_type = $1
AND entity_id = $2 AND entity_id = $2
`, [entity_type, entity_id]) `, [entity_type, entity_id])
@ -78,7 +78,7 @@ export class GisService {
const result = await this.dataSource.query( const result = await this.dataSource.query(
` `
SELECT entity_id, entity_type, geometry SELECT entity_id, entity_type, geometry
FROM bounds FROM bounds_general
WHERE entity_type = ? WHERE entity_type = ?
AND entity_id IN (${placeholders}) AND entity_id IN (${placeholders})
`, `,