From ea78c6b897611959994d3b422d7cefc320db3c70 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Tue, 22 Apr 2025 14:35:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=8B=E8=A1=A8JSON?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-profile.json5 | 4 +- entry/src/main/ets/api/index.ets | 1 + entry/src/main/ets/model/api.ets | 52 +++---- entry/src/main/ets/utils/Request.ets | 9 +- entry/src/main/ets/utils/table/Operation.ets | 35 ++--- .../src/main/ets/utils/table/TableMessage.ets | 128 +++++++++++++----- 6 files changed, 146 insertions(+), 83 deletions(-) diff --git a/build-profile.json5 b/build-profile.json5 index 6d35b66..2557f5d 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,9 +5,9 @@ "name": "default", "material": { "certpath": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.cer", - "storePassword": "0000001B69B6F927C1A8A9C2E65B309DCE5BAA4B1498D997D8BE4F04A3E9A739B4C9FADB2811D9CB2EAA93", + "storePassword": "0000001BC64885799C5237EE8F4A1DD2F6A02E9E9ECDF000224536FC73A97B0762A9DE3DA53E12989713A5", "keyAlias": "debugKey", - "keyPassword": "0000001BE240E3D5E0916E6FB737EBE3B7C7CED5870FCD2660699C961E1A4EC3969F036EB5EE138DC4B7FD", + "keyPassword": "0000001B4C1141AC4B73DF3FB5112EDFA2017F07BD680B5ACEC3FAA37E9C84DD4B8DA0C9EBBB4605A7DAD4", "profile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p7b", "signAlg": "SHA256withECDSA", "storeFile": "/Users/wangzhongjie/.ohos/config/openharmony/default_car_next_xIuD6UMCLxZgyeiH-w2XdDck6DewIfdHAvOk_FUbNZo=.p12" diff --git a/entry/src/main/ets/api/index.ets b/entry/src/main/ets/api/index.ets index 9cf0c5d..c456c52 100644 --- a/entry/src/main/ets/api/index.ets +++ b/entry/src/main/ets/api/index.ets @@ -131,6 +131,7 @@ export async function initialization(params: InitializeTheCentralTableType) { data: `${params.carId}${params.examinationRoomId}${params.shellVersion}${params.judgeVersion}${params.videoVersion}`, method: http.RequestMethod.POST, host: params.host, + accept: true, xml: true, timeout: 1000 * 60 }) diff --git a/entry/src/main/ets/model/api.ets b/entry/src/main/ets/model/api.ets index 05c2433..dc4a833 100644 --- a/entry/src/main/ets/model/api.ets +++ b/entry/src/main/ets/model/api.ets @@ -162,14 +162,14 @@ interface ImageCompareRsp { } interface ImageCompareRspBodyType { - GunCameraInfo: GunCameraInfo, - Sysset: Sysset, - SystemParm: SystemParm, - MarkRule: MarkRuleType, - MarkRuleSet: MarkRuleSet, - Cdsbinfo: Cdsbinfo, - CarInfo: CarInfo, - ItemInfo: ItemInfoType + GunCameraInfo: PublicInfoType, + Sysset: PublicInfoType, + SystemParm: PublicInfoType, + MarkRule: PublicInfoType, + MarkRuleSet: PublicInfoType, + Cdsbinfo: PublicInfoType, + CarInfo: PublicInfoType, + ItemInfo: PublicInfoType } //-----开始 初始化表结构--- @@ -177,23 +177,23 @@ interface RecordContainer { record: Array | T; } -export type PublicInfoType = RecordContainer; +export type PublicInfoType = Array | RecordType; -export type GunCameraInfo = RecordContainer; - -export type Sysset = RecordContainer; - -export type SystemParm = RecordContainer; - -export type MarkRuleType = RecordContainer; - -export type MarkRuleSet = RecordContainer; - -export type Cdsbinfo = RecordContainer; - -export type CarInfo = RecordContainer; - -export type ItemInfoType = RecordContainer; +// export type GunCameraInfo = RecordContainer; +// +// export type Sysset = RecordContainer; +// +// export type SystemParm = RecordContainer; +// +// export type MarkRuleType = RecordContainer; +// +// export type MarkRuleSet = RecordContainer; +// +// export type Cdsbinfo = RecordContainer; +// +// export type CarInfo = RecordContainer; +// +// export type ItemInfoType = RecordContainer; export interface RecordType extends User, MA_SYSTEMPARMType, ES_CARINFOType, MA_SYSTEMPARMType, MA_CDSBINFOType, MA_ITEMINFOType, MA_MAP_POINTType, MA_MAP_POINT_ITEMType, MA_MARKRULEType {} @@ -211,7 +211,9 @@ export interface FaceCompareResp { } export interface ResponseDataType { - initializationRsp?: ImageCompareRsp + // initializationRsp?: ImageCompareRsp + head: Head + body: ImageCompareRspBodyType } diff --git a/entry/src/main/ets/utils/Request.ets b/entry/src/main/ets/utils/Request.ets index a13a548..41f62c8 100644 --- a/entry/src/main/ets/utils/Request.ets +++ b/entry/src/main/ets/utils/Request.ets @@ -12,6 +12,7 @@ interface RequestOption { host?: string isNewCenter?: boolean timeout?: number + accept?: boolean } @@ -126,13 +127,15 @@ export default function Request(options: RequestOption) instance.request(baseURL + options.url, { method: options.method, header: { - "Content-Type": options.xml ? "text/xml" : 'application/json' + "Content-Type": options.xml ? "text/xml" : 'application/json', + "Accept": options.accept ? "application/json" : "*/*", }, extraData: options.xml ? options.data : JSON.stringify(options.data), readTimeout: options.timeout || 30 * 1000 }).then(async data => { console.log(RequestTag, options.url, "返回的数据", JSON.stringify(data)) - let result = options.xml ? xmlToJSON(data.result as string) : data.result + // let result = options.xml ? xmlToJSON(data.result as string) : data.result + let result = options.xml ? (options.accept ? data.result : xmlToJSON(data.result as string)) : data.result; console.log("结束xml解析") let resObj: object = new Object() if (typeof result === 'string') { @@ -143,7 +146,7 @@ export default function Request(options: RequestOption) resolve(dealCenterCode(msgXml, options.isNewCenter) as T) return } - if (!options.xml) { + if (!options.xml || (options.xml && options.accept)) { if (result['head']['resultCode'] === '0') { resolve(result as T) return diff --git a/entry/src/main/ets/utils/table/Operation.ets b/entry/src/main/ets/utils/table/Operation.ets index 4d5f6c5..2ef2497 100644 --- a/entry/src/main/ets/utils/table/Operation.ets +++ b/entry/src/main/ets/utils/table/Operation.ets @@ -35,8 +35,8 @@ export function SqlInsertTable(tableName: string, data: Array, delFl const value = columnsData?.filter(column => column !== "id") .map((column) => `'${Reflect.get(item, column) || ""}'`) .join(",") - return value - }) + return `(${value})` + }).join(",") let INSERT_SQL = "INSERT INTO " + tableName + " (" + columns + ") VALUES " + values console.log('表插入语句,', INSERT_SQL, 'tableName', tableName) @@ -132,30 +132,31 @@ export async function InitializeTheCentralTable(params: InitializeTheCentralTabl } const res: ResponseDataType = await initialization(str) console.log("解析完成") - if (!res || !res.initializationRsp || res.initializationRsp.head.resultCode === "1") { + if (!res || !res.head || res.head.resultCode === "1") { resolve(false); } - if (res.initializationRsp && res.initializationRsp.body) { - for (const key of Object.keys(res.initializationRsp.body)) { - let isExit = CenterMap.has(key) - console.log("表名", key, isExit) + if (res && res.body) { + for (const key of Object.keys(res.body)) { + let newKey = key.charAt(0).toUpperCase() + key.slice(1) + let isExit = CenterMap.has(newKey) + console.log("-------------------表名-----------------------", newKey, isExit) if (isExit) { - console.log("可以插入的表", key, CenterMap.get(key)) + console.log("可以插入的表", newKey, CenterMap.get(newKey)) let arrList: Array | RecordType = [] - let value: PublicInfoType = Reflect.get(res.initializationRsp.body, key) - if (value.record instanceof Array) { - arrList = value.record + let value: PublicInfoType = Reflect.get(res.body, key) + if (value instanceof Array) { + arrList = value } else { - arrList.push(value.record) + arrList.push(value) } const folderPath = await fileUtil.initFolder(`/config/tableList`); - fileUtil.addFile(`${folderPath}/${RemappingTableName.get(key)}.txt`, JSON.stringify(arrList)) + fileUtil.addFile(`${folderPath}/${RemappingTableName.get(newKey)}.txt`, JSON.stringify(arrList)) try { - console.log("插入表操作", key) - console.log("插入表别名", RemappingTableName.get(key)) + console.log("插入表操作", newKey) + console.log("插入表别名", RemappingTableName.get(newKey)) console.log("插入表长度", arrList.length) - const result = await SqlInsertTable(RemappingTableName.get(key)!, arrList); - console.log("插入表结果,表", key, "结果", result) + const result = await SqlInsertTable(RemappingTableName.get(newKey)!, arrList); + console.log("插入表结果,表", newKey, "结果", result) if (!result) { Prompt.showToast({ message: '初始化数据库失败' diff --git a/entry/src/main/ets/utils/table/TableMessage.ets b/entry/src/main/ets/utils/table/TableMessage.ets index 2963e06..2d7ed7a 100644 --- a/entry/src/main/ets/utils/table/TableMessage.ets +++ b/entry/src/main/ets/utils/table/TableMessage.ets @@ -3,8 +3,26 @@ import { TableDefinition } from '../../model' export const MA_MARKRULE: TableDefinition = { tableName: 'MA_MARKRULE', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MARKRULE(id TEXT,itemno TEXT,markserial TEXT, markdepend TEXT, ' + - 'markcatalog TEXT, markstandard TEXT,markreal TEXT,markshow TEXT,car_sid TEXT,gyro_sid TEXT,gps_sid TEXT,magnet_sid TEXT,simu_sid TEXT,close_sid TEXT,notes TEXT,onlyoneid TEXT,nocancelid TEXT,kfxh TEXT)', + sqlCreate: `CREATE TABLE IF NOT EXISTS MA_MARKRULE( + id INTEGER PRIMARY KEY AUTOINCREMENT, + itemno TEXT, + markserial TEXT, + markdepend TEXT, + markcatalog TEXT, + markstandard TEXT, + markreal TEXT, + markshow TEXT, + car_sid TEXT, + gyro_sid TEXT, + gps_sid TEXT, + magnet_sid TEXT, + simu_sid TEXT, + close_sid TEXT, + notes TEXT, + onlyoneid TEXT, + nocancelid TEXT, + kfxh TEXT + )`, columns: ['id', 'itemno', 'markserial', 'markdepend', 'markcatalog', 'markstandard', 'markreal', 'markshow', 'car_sid', 'gyro_sid', 'gps_sid', 'magnet_sid', 'simu_sid', 'close_sid', 'notes', 'onlyoneid', 'nocancelid', 'kfxh'] @@ -12,20 +30,71 @@ export const MA_MARKRULE: TableDefinition = { export const accountTable: TableDefinition = { tableName: 'accountTable', - sqlCreate: 'CREATE TABLE IF NOT EXISTS accountTable(sfzmhm TEXT,lsh TEXT, xm TEXT)', + sqlCreate: `CREATE TABLE IF NOT EXISTS accountTable( + id INTEGER PRIMARY KEY AUTOINCREMENT, + sfzmhm TEXT, + lsh TEXT, + xm TEXT + )`, columns: ['sfzmhm', 'xm', 'lsh'] } export const DeviceInfoTable: TableDefinition = { tableName: 'DeviceInfoTable', - sqlCreate: 'CREATE TABLE IF NOT EXISTS DeviceInfoTable(id TEXT,deviceId TEXT)', + sqlCreate: `CREATE TABLE IF NOT EXISTS DeviceInfoTable( + id INTEGER PRIMARY KEY AUTOINCREMENT, + deviceId TEXT + )`, columns: ['id', 'deviceId'] } export const ES_CAR_VIDEO_PARAMETER: TableDefinition = { tableName: 'ES_CAR_VIDEO_PARAMETER', - sqlCreate: 'CREATE TABLE IF NOT EXISTS ES_CAR_VIDEO_PARAMETER(id TEXT,video_mode TEXT,video_channel TEXT, first_channel TEXT, ' + - 'second_port TEXT, first_port TEXT,third_ip TEXT,photo_overlay_text_size TEXT,second_ip TEXT,photo_overlay_text_content3 TEXT,video_range TEXT,fourth_port TEXT,line_type TEXT,third_port TEXT,fourth_channel TEXT,process_face_comparion_mode TEXT,second_password TEXT,first_username TEXT,third_username TEXT,photo_overlay_text_content2 TEXT,photo_overlay_text_content1 TEXT,process_face_comparion_enable TEXT,third_password TEXT,fourth_username TEXT,fourth_ip TEXT,first_password TEXT,second_username TEXT,video_synthesis_system_ip TEXT,photo_overlay_text_position TEXT,video_synthesis_server_port TEXT,car_mac TEXT,photo_overlay_text_enable TEXT,video_synthesis_system_port TEXT,second_channel TEXT,video_occlusion_range TEXT,fourth_password TEXT,photo_channel TEXT,video_synthesis_server_ip TEXT,photo_overlay_text_split TEXT,equipment_type TEXT,video_occlusion TEXT,third_channel TEXT,first_ip TEXT)', + sqlCreate: `CREATE TABLE IF NOT EXISTS ES_CAR_VIDEO_PARAMETER( + id INTEGER PRIMARY KEY AUTOINCREMENT, + video_mode TEXT, + video_channel TEXT, + first_channel TEXT, + second_port TEXT, + first_port TEXT, + third_ip TEXT, + photo_overlay_text_size TEXT, + second_ip TEXT, + photo_overlay_text_content3 TEXT, + video_range TEXT, + fourth_port TEXT, + line_type TEXT, + third_port TEXT, + fourth_channel TEXT, + process_face_comparion_mode TEXT, + second_password TEXT, + first_username TEXT, + third_username TEXT, + photo_overlay_text_content2 TEXT, + photo_overlay_text_content1 TEXT, + process_face_comparion_enable TEXT, + third_password TEXT, + fourth_username TEXT, + fourth_ip TEXT, + first_password TEXT, + second_username TEXT, + video_synthesis_system_ip TEXT, + photo_overlay_text_position TEXT, + video_synthesis_server_port TEXT, + car_mac TEXT, + photo_overlay_text_enable TEXT, + video_synthesis_system_port TEXT, + second_channel TEXT, + video_occlusion_range TEXT, + fourth_password TEXT, + photo_channel TEXT, + video_synthesis_server_ip TEXT, + photo_overlay_text_split TEXT, + equipment_type TEXT, + video_occlusion TEXT, + third_channel TEXT, + first_ip TEXT + )`, columns: ['id', 'video_mode', 'video_channel', 'first_channel', 'second_port', 'first_port', 'third_ip', 'photo_overlay_text_size', 'second_ip', 'photo_overlay_text_content3', 'video_range', 'fourth_port', 'line_type', 'third_port', 'fourth_channel', 'process_face_comparion_mode', 'second_password', 'first_username', @@ -39,7 +108,7 @@ export const ES_CAR_VIDEO_PARAMETER: TableDefinition = { export const ES_CARINFO: TableDefinition = { tableName: 'ES_CARINFO', - sqlCreate: 'CREATE TABLE IF NOT EXISTS ES_CARINFO(id TEXT,car_mac TEXT,status TEXT, voiceip TEXT, ' + + sqlCreate: 'CREATE TABLE IF NOT EXISTS ES_CARINFO(id INTEGER PRIMARY KEY AUTOINCREMENT,car_mac TEXT,status TEXT, voiceip TEXT, ' + 'carno TEXT, carcode TEXT,cartype TEXT,device_status TEXT,carip TEXT,pulse1 TEXT,pulse2 TEXT,isface TEXT,bk1 TEXT,ismapcollect TEXT,bk2 TEXT,exampointcode TEXT,software_version TEXT,typename TEXT,vin TEXT,voicetype TEXT,em TEXT,carclass TEXT,carid TEXT,flag TEXT,kscx TEXT,x_mch TEXT)', columns: ['id', 'car_mac', 'status', 'voiceip', 'carno', 'carcode', 'cartype', 'device_status', 'carip', 'pulse1', 'pulse2', 'isface', 'bk1', 'ismapcollect', 'bk2', 'exampointcode', 'software_version', 'typename', 'vin', @@ -48,15 +117,14 @@ export const ES_CARINFO: TableDefinition = { export const ES_EXAMPOINTDETAIL: TableDefinition = { tableName: 'ES_EXAMPOINTDETAIL', - sqlCreate: 'CREATE TABLE IF NOT EXISTS ES_EXAMPOINTDETAIL(id TEXT,code TEXT,type TEXT, name TEXT, ' + - 'status TEXT, udpip TEXT,udpcommandport TEXT,udpvoiceport TEXT,udpdataport TEXT,fullname TEXT,exam_status TEXT,is_motor TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS ES_EXAMPOINTDETAIL(id INTEGER PRIMARY KEY AUTOINCREMENT,code TEXT,type TEXT, name TEXT, status TEXT, udpip TEXT,udpcommandport TEXT,udpvoiceport TEXT,udpdataport TEXT,fullname TEXT,exam_status TEXT,is_motor TEXT)', columns: ['id', 'code', 'type', 'name', 'status', 'udpip', 'udpcommandport', 'udpvoiceport', 'udpdataport', 'fullname', 'exam_status', 'is_motor'] } export const IpConfigTable: TableDefinition = { tableName: 'IpConfigTable', - sqlCreate: 'CREATE TABLE IF NOT EXISTS IpConfigTable(id TEXT,udplocalIp TEXT,udplocalIpPort TEXT, udpOppositeIp TEXT, udpOppositeIpPort TEXT,tcplocalIp TEXT,tcplocalIpPort TEXT,tcpOppositeIp TEXT,tcpOppositePort TEXT,gateway TEXT,netMask TEXT,dnsServers TEXT,centerPort TEXT,centerIp TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS IpConfigTable(id INTEGER PRIMARY KEY AUTOINCREMENT,udplocalIp TEXT,udplocalIpPort TEXT, udpOppositeIp TEXT, udpOppositeIpPort TEXT,tcplocalIp TEXT,tcplocalIpPort TEXT,tcpOppositeIp TEXT,tcpOppositePort TEXT,gateway TEXT,netMask TEXT,dnsServers TEXT,centerPort TEXT,centerIp TEXT)', columns: ['id', 'udplocalIp', 'udplocalIpPort', 'udpOppositeIp', 'udpOppositeIpPort', 'tcplocalIp', 'tcplocalIpPort', 'tcpOppositeIp', 'tcpOppositePort', 'gateway', 'netMask', 'dnsServers', 'centerPort', 'centerIp'] @@ -64,58 +132,52 @@ export const IpConfigTable: TableDefinition = { export const MA_CDSBINFO: TableDefinition = { tableName: 'MA_CDSBINFO', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_CDSBINFO(id TEXT,sbbm TEXT,itemsno TEXT, sbbh TEXT, kdid TEXT, bk3 TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_CDSBINFO(id INTEGER PRIMARY KEY AUTOINCREMENT,sbbm TEXT,itemsno TEXT, sbbh TEXT, kdid TEXT, bk3 TEXT)', columns: ['id', 'sbbm', 'itemsno', 'sbbh', 'kdid', 'bk3'] } export const MA_ITEMINFO: TableDefinition = { tableName: 'MA_ITEMINFO', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_ITEMINFO(id TEXT,cininfo TEXT,setup9 TEXT, nextinfo TEXT, ' + - 'setup7 TEXT, setup8 TEXT,setup5 TEXT,carlist TEXT,setup6 TEXT,setup3 TEXT,setup4 TEXT,setup1 TEXT,setup2 TEXT,itemsno TEXT,end_cardsno TEXT,freqinfo TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_ITEMINFO(id INTEGER PRIMARY KEY AUTOINCREMENT,cininfo TEXT,setup9 TEXT, nextinfo TEXT, setup7 TEXT, setup8 TEXT,setup5 TEXT,carlist TEXT,setup6 TEXT,setup3 TEXT,setup4 TEXT,setup1 TEXT,setup2 TEXT,itemsno TEXT,end_cardsno TEXT,freqinfo TEXT)', columns: ['id', 'cininfo', 'setup9', 'nextinfo', 'setup7', 'setup8', 'setup5', 'carlist', 'setup6', 'setup3', 'setup4', 'setup1', 'setup2', 'itemsno', 'end_cardsno', 'freqinfo'] } export const MA_MAP_COLLECT: TableDefinition = { tableName: 'MA_MAP_COLLECT', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_COLLECT(id TEXT,l_no TEXT,s_no TEXT, s_no1 TEXT, ' + - 'road_code TEXT, gps_e TEXT,gps_n TEXT,posx TEXT,posy TEXT,l_type TEXT,line_type TEXT,next_s_no TEXT,next_s_no1 TEXT,lane_attr TEXT,gps_h TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_COLLECT(id INTEGER PRIMARY KEY AUTOINCREMENT,l_no TEXT,s_no TEXT, s_no1 TEXT, road_code TEXT, gps_e TEXT,gps_n TEXT,posx TEXT,posy TEXT,l_type TEXT,line_type TEXT,next_s_no TEXT,next_s_no1 TEXT,lane_attr TEXT,gps_h TEXT)', columns: ['id', 'l_no', 's_no', 's_no1', 'road_code', 'gps_e', 'gps_n', 'posx', 'posy', 'l_type', 'line_type', 'next_s_no', 'next_s_no1', 'lane_attr', 'gps_h'] } export const MA_MAP_COLLECT_SHAPE: TableDefinition = { tableName: 'MA_MAP_COLLECT_SHAPE', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_COLLECT_SHAPE(id TEXT,serial_no TEXT,l_no1 TEXT, l_no2 TEXT, ' + - 'l_no3 TEXT, l_no4 TEXT,attr_str TEXT,subtype TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_COLLECT_SHAPE(id INTEGER PRIMARY KEY AUTOINCREMENT,serial_no TEXT,l_no1 TEXT, l_no2 TEXT,l_no3 TEXT, l_no4 TEXT,attr_str TEXT,subtype TEXT)', columns: ['id', 'serial_no', 'l_no1', 'l_no2', 'l_no3', 'l_no4', 'attr_str', 'subtype'] } export const MA_MAP_ITEMCLASS: TableDefinition = { tableName: 'MA_MAP_ITEMCLASS', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_ITEMCLASS(id TEXT,itemno TEXT,itemno1 TEXT, itemname TEXT, ' + - 'itemname1 TEXT, item_type TEXT,enabled TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_ITEMCLASS(id INTEGER PRIMARY KEY AUTOINCREMENT,itemno TEXT,itemno1 TEXT, itemname TEXT, itemname1 TEXT, item_type TEXT,enabled TEXT)', columns: ['id', 'itemno', 'itemno1', 'itemname', 'itemname', 'itemname1', 'item_type', 'enabled'] } export const MA_MAP_POINT: TableDefinition = { tableName: 'MA_MAP_POINT', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_POINT(id TEXT,point_no TEXT,point_no_f TEXT, gps_e TEXT,' + - 'gps_e_location TEXT,gps_n TEXT,gps_n_location TEXT,f_gps_e TEXT,f_gps_n TEXT,point_type TEXT,road_code TEXT,visible TEXT,passed TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_POINT(id INTEGER PRIMARY KEY AUTOINCREMENT,point_no TEXT,point_no_f TEXT, gps_e TEXT,gps_e_location TEXT,gps_n TEXT,gps_n_location TEXT,f_gps_e TEXT,f_gps_n TEXT,point_type TEXT,road_code TEXT,visible TEXT,passed TEXT)', columns: ['id', 'point_no', 'point_no_f', 'gps_e', 'gps_e_location', 'gps_n', 'gps_n_location', 'f_gps_e', 'f_gps_n', 'point_type', 'road_code', 'visible', 'passed'] } export const MA_MAP_POINT_ITEM: TableDefinition = { tableName: 'MA_MAP_POINT_ITEM', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_POINT_ITEM(id TEXT,point_no TEXT,itemno TEXT,itemno1 TEXT,' + - 'subname TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_POINT_ITEM(id INTEGER PRIMARY KEY AUTOINCREMENT,point_no TEXT,itemno TEXT,itemno1 TEXT,subname TEXT)', columns: ['id', 'point_no', 'itemno', 'itemno1', 'subname'] } export const MA_MAP_ROAD: TableDefinition = { tableName: 'MA_MAP_ROAD', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_ROAD(id TEXT,road_code TEXT,road_code_no TEXT,lane_no TEXT,' + + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_ROAD(id INTEGER PRIMARY KEY AUTOINCREMENT,road_code TEXT,road_code_no TEXT,lane_no TEXT,' + 'point1y TEXT,point1x TEXT,point2y TEXT,point2x TEXT,pointmy TEXT,pointmx TEXT,point3y TEXT,point3x TEXT,point4y TEXT,point4x TEXT,pointny TEXT,pointnx TEXT)', columns: ['id', 'road_code', 'road_code_no', 'lane_no', 'point1y', 'point1x', 'point2y', 'point2x', 'pointmy', 'pointmx', 'point3y', 'point3x', 'point4y', 'point4x', 'pointny', 'pointnx'] @@ -123,22 +185,19 @@ export const MA_MAP_ROAD: TableDefinition = { export const MA_MAP_ROAD_LANE: TableDefinition = { tableName: 'MA_MAP_ROAD_LANE', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_ROAD_LANE(id TEXT,road_code TEXT,road_code_no TEXT,lane_no TEXT,' + - 'line_type TEXT,lane_attr TEXT,line_width TEXT,rightline TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MAP_ROAD_LANE(id INTEGER PRIMARY KEY AUTOINCREMENT,road_code TEXT,road_code_no TEXT,lane_no TEXT,line_type TEXT,lane_attr TEXT,line_width TEXT,rightline TEXT)', columns: ['id', 'road_code', 'road_code_no', 'lane_no', 'line_type', 'lane_attr', 'line_width', 'rightline'] } export const MAP_SUBITEM: TableDefinition = { tableName: 'MAP_SUBITEM', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MAP_SUBITEM(id TEXT,itemno TEXT,posx1 TEXT, posx2 TEXT, ' + - 'posx3 TEXT, posx4 TEXT,posy1 TEXT,posy2 TEXT,posy3 TEXT,posy4 TEXT,sno TEXT,subname TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MAP_SUBITEM(id INTEGER PRIMARY KEY AUTOINCREMENT,itemno TEXT,posx1 TEXT, posx2 TEXT,posx3 TEXT, posx4 TEXT,posy1 TEXT,posy2 TEXT,posy3 TEXT,posy4 TEXT,sno TEXT,subname TEXT)', columns: ['id', 'itemno', 'posx1', 'posx2', 'posx3', 'posx4', 'posy1', 'posy2', 'posy3', 'posy4', 'sno', 'subname'] } export const MA_MARKRULESET: TableDefinition = { tableName: 'MA_MARKRULESET', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MARKRULESET(id TEXT,itemno TEXT,markserial TEXT, markdepend TEXT, ' + - 'markcatalog TEXT, markstandard TEXT,markreal TEXT,markshow TEXT,txt1 TEXT,kfxh TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_MARKRULESET(id INTEGER PRIMARY KEY AUTOINCREMENT,itemno TEXT,markserial TEXT, markdepend TEXT,markcatalog TEXT, markstandard TEXT,markreal TEXT,markshow TEXT,txt1 TEXT,kfxh TEXT)', columns: ['id', 'itemno', 'markserial', 'markdepend', 'markcatalog', 'markstandard', 'markreal', 'markshow', 'txt1', 'kfxh'] } @@ -151,15 +210,13 @@ export const MA_SYSSET: TableDefinition = { export const MA_SYSTEMPARM: TableDefinition = { tableName: 'MA_SYSTEMPARM', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_SYSTEMPARM(id TEXT,no1 TEXT,no2 TEXT, no3 TEXT, ' + - 'txt1 TEXT, txt2 TEXT,txt3 TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_SYSTEMPARM(id TEXT,no1 TEXT,no2 TEXT, no3 TEXT,txt1 TEXT, txt2 TEXT,txt3 TEXT)', columns: ['id', 'no1', 'no2', 'no3', 'txt1', 'txt2', 'txt3'] } export const MA_T_CARPARMSET: TableDefinition = { tableName: 'MA_T_CARPARMSET', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_T_CARPARMSET(id TEXT,carid TEXT,itemname TEXT, parmdesc TEXT, ' + - 'parmname TEXT, pdefault TEXT,pvalue TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MA_T_CARPARMSET(id TEXT,carid TEXT,itemname TEXT, parmdesc TEXT,parmname TEXT, pdefault TEXT,pvalue TEXT)', columns: ['id', 'carid', 'itemname', 'parmdesc', 'parmname', 'pdefault', 'pvalue'] } @@ -179,7 +236,6 @@ export const USERLIST: TableDefinition = { export const MA_MAP_SUBITEM: TableDefinition = { tableName: 'MAP_SUBITEM', - sqlCreate: 'CREATE TABLE IF NOT EXISTS MAP_SUBITEM(id TEXT,itemno TEXT,posx1 TEXT, posx2 TEXT, ' + - 'posx3 TEXT, posx4 TEXT,posy1 TEXT,posy2 TEXT,posy3 TEXT,posy4 TEXT,sno TEXT,subname TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS MAP_SUBITEM(id TEXT,itemno TEXT,posx1 TEXT, posx2 TEXT, posx3 TEXT, posx4 TEXT,posy1 TEXT,posy2 TEXT,posy3 TEXT,posy4 TEXT,sno TEXT,subname TEXT)', columns: ['id', 'itemno', 'posx1', 'posx2', 'posx3', 'posx4', 'posy1', 'posy2', 'posy3', 'posy4', 'sno', 'subname'] } \ No newline at end of file