From 208ad1c2b01da46c629734adea2787af3d28adbf Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 13 十一月 2024 17:01:32 +0800
Subject: [PATCH] 调整语法不兼容
---
src/main/resources/mapper/LicenseMapper.xml | 23 +++++++++--
src/main/resources/mapper/CommonMapper.xml | 23 ++++++++++-
src/main/resources/mapper/PageParamMapper.xml | 16 +++++++-
src/main/resources/mapper/BattmonStandardcurveMapper.xml | 13 +++++-
4 files changed, 65 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/BattmonStandardcurveMapper.xml b/src/main/resources/mapper/BattmonStandardcurveMapper.xml
index 2b9ad14..c6d9e87 100644
--- a/src/main/resources/mapper/BattmonStandardcurveMapper.xml
+++ b/src/main/resources/mapper/BattmonStandardcurveMapper.xml
@@ -6,7 +6,7 @@
where monvolstd=#{monvolstd} and moncapstd=#{moncapstd} and battproducer=#{battproducer} and battmodel=#{battmodel} and note=#{note}
</select>
<update id="create_standard_curve">
- CREATE TABLE IF NOT EXISTS db_battinf.tb_battmon_standardcurve (
+ <!--CREATE TABLE IF NOT EXISTS db_battinf.tb_battmon_standardcurve (
num int(11) NOT NULL AUTO_INCREMENT,
monvolstd float NOT NULL DEFAULT '0',
moncapstd float NOT NULL DEFAULT '0',
@@ -14,7 +14,16 @@
battmodel varchar(64) NOT NULL DEFAULT '',
note varchar(64) NOT NULL DEFAULT '',
PRIMARY KEY (num)
- )
+ )-->
+ CREATE TABLE IF NOT EXISTS "db_battinf"."tb_battmon_standardcurve"
+ (
+ "num" INT IDENTITY(1, 1) NOT NULL,
+ "monvolstd" REAL DEFAULT 0 NOT NULL,
+ "moncapstd" REAL DEFAULT 0 NOT NULL,
+ "battproducer" VARCHAR(64) DEFAULT '' NOT NULL,
+ "battmodel" VARCHAR(64) DEFAULT '' NOT NULL,
+ "note" VARCHAR(64) DEFAULT '' NOT NULL,
+ NOT CLUSTER PRIMARY KEY("num")) STORAGE(ON "MAIN", CLUSTERBTR) ;
</update>
<insert id="add">
diff --git a/src/main/resources/mapper/CommonMapper.xml b/src/main/resources/mapper/CommonMapper.xml
index b9e6486..ebdb787 100644
--- a/src/main/resources/mapper/CommonMapper.xml
+++ b/src/main/resources/mapper/CommonMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.whyc.mapper.CommonMapper" >
<insert id="createTable4AlarmVoiceSet">
- CREATE TABLE web_site.tb_alarm_voice_set (
+ <!--CREATE TABLE web_site.tb_alarm_voice_set (
id int(11) NOT NULL AUTO_INCREMENT,
batt_group_id int(11) DEFAULT NULL,
device_id bigint(20) DEFAULT NULL,
@@ -13,7 +13,26 @@
status int(11) DEFAULT NULL COMMENT '1:鏈夋晥\n0:鏃犳晥\n',
next_timestamp bigint(20) DEFAULT NULL COMMENT '涓嬫鎾斁鐨勬椂闂存埑',
PRIMARY KEY (id)
- ) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='鍛婅璇煶璁剧疆'
+ ) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COMMENT='鍛婅璇煶璁剧疆'-->
+ CREATE TABLE "web_site"."tb_alarm_voice_set"
+ (
+ "id" INT IDENTITY(1, 1) NOT NULL,
+ "batt_group_id" INT,
+ "device_id" BIGINT,
+ "power_device_id" BIGINT,
+ "alarm_type" INT,
+ "next_time_interval" INT,
+ "user_id" INT,
+ "status" INT,
+ "next_timestamp" BIGINT,
+ NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+ COMMENT ON TABLE "web_site"."tb_alarm_voice_set" IS '鍛婅璇煶璁剧疆';
+ COMMENT ON COLUMN "web_site"."tb_alarm_voice_set"."batt_group_id" IS '鍖呭惈鐢垫睜缁刬d,璁惧';
+ COMMENT ON COLUMN "web_site"."tb_alarm_voice_set"."next_time_interval" IS '涓嬫鎾姤闂撮殧鏃堕棿,鍗曚綅/鍒嗛挓';
+ COMMENT ON COLUMN "web_site"."tb_alarm_voice_set"."next_timestamp" IS '涓嬫鎾斁鐨勬椂闂存埑';
+ COMMENT ON COLUMN "web_site"."tb_alarm_voice_set"."status" IS '1:鏈夋晥
+ 0:鏃犳晥';
</insert>
<!-- <insert id="createTable4UserLogByYear">
CREATE TABLE `tb_user_log_${year}` (
diff --git a/src/main/resources/mapper/LicenseMapper.xml b/src/main/resources/mapper/LicenseMapper.xml
index a0a8f82..2ef7f61 100644
--- a/src/main/resources/mapper/LicenseMapper.xml
+++ b/src/main/resources/mapper/LicenseMapper.xml
@@ -12,23 +12,38 @@
insert(serialNumber,duration,timeInUse) values(#{license.serialNumber},#{license.duration},#{license.timeInUse})
</insert>
<update id="createTable">
- CREATE TABLE web_site.tb_license (
+ <!--CREATE TABLE web_site.tb_license (
id int(11) NOT NULL AUTO_INCREMENT,
serialNumber varchar(255) NOT NULL DEFAULT '',
duration varchar(255) NOT NULL DEFAULT '',
timeInUse varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (id) USING BTREE
- ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ;
+ ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ;-->
+ CREATE TABLE "web_site"."tb_license"
+ (
+ "id" INT IDENTITY(1, 1) NOT NULL,
+ "serialNumber" VARCHAR(255) DEFAULT '' NOT NULL,
+ "duration" VARCHAR(255) DEFAULT '0' NOT NULL,
+ "timeInUse" VARCHAR(255) DEFAULT '0' NOT NULL,
+ NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "MAIN", CLUSTERBTR) ;
</update>
<update id="reCreateTable">
- DROP TABLE IF EXISTS web_site.tb_license;
+ <!--DROP TABLE IF EXISTS web_site.tb_license;
CREATE TABLE web_site.tb_license (
id int(11) NOT NULL AUTO_INCREMENT,
serialNumber varchar(255) NOT NULL DEFAULT '',
duration varchar(255) NOT NULL DEFAULT '',
timeInUse varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (id) USING BTREE
- ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ;
+ ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ;-->
+ DROP TABLE IF EXISTS web_site.tb_license;
+ CREATE TABLE "web_site"."tb_license"
+ (
+ "id" INT IDENTITY(1, 1) NOT NULL,
+ "serialNumber" VARCHAR(255) DEFAULT '' NOT NULL,
+ "duration" VARCHAR(255) DEFAULT '0' NOT NULL,
+ "timeInUse" VARCHAR(255) DEFAULT '0' NOT NULL,
+ NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "MAIN", CLUSTERBTR) ;
</update>
<update id="updateTimeInUse">
update web_site.tb_license set timeInUse = #{timeInUse}
diff --git a/src/main/resources/mapper/PageParamMapper.xml b/src/main/resources/mapper/PageParamMapper.xml
index 927e27e..50d53d2 100644
--- a/src/main/resources/mapper/PageParamMapper.xml
+++ b/src/main/resources/mapper/PageParamMapper.xml
@@ -21,13 +21,25 @@
select count(*) num from db_app_sys.tb_page_param
</select>
<update id="createTable" >
- CREATE TABLE db_app_sys.tb_page_param (
+ <!--CREATE TABLE db_app_sys.tb_page_param (
id int(11) NOT NULL AUTO_INCREMENT,
param varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '鍏蜂綋鍙傛暟',
status int(1) DEFAULT NULL COMMENT '鍙傛暟鏄惁椤甸潰鏄剧ず',
categoryId int(1) DEFAULT NULL COMMENT '鍙傛暟鍒嗙被,绫荤洰1,绫荤洰2',
PRIMARY KEY (id) USING BTREE
- ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci
+ ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci-->
+ CREATE TABLE "db_app_sys"."tb_page_param"
+ (
+ "id" INT IDENTITY(1, 1) NOT NULL,
+ "param" VARCHAR(255),
+ "status" INT,
+ "categoryId" INT,
+ "paramEnUs" VARCHAR(255) DEFAULT '' NOT NULL,
+ NOT CLUSTER PRIMARY KEY("id")) STORAGE(ON "MAIN", CLUSTERBTR) ;
+
+ COMMENT ON COLUMN "db_app_sys"."tb_page_param"."categoryId" IS '鍙傛暟鍒嗙被,绫荤洰1,绫荤洰2';
+ COMMENT ON COLUMN "db_app_sys"."tb_page_param"."paramEnUs" IS '鍏蜂綋鍙傛暟鍥介檯鍖栬嫳鏂�';
+ COMMENT ON COLUMN "db_app_sys"."tb_page_param"."status" IS '鍙傛暟鏄惁椤甸潰鏄剧ず';
</update>
<update id="update">
update db_app_sys.tb_page_param set status=#{status} where id=#{id}
--
Gitblit v1.9.1