mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Resolve conflicts.
This commit is contained in:
commit
50f8716527
@ -68,4 +68,4 @@ public interface VirtualFireAlarmManagerService {
|
||||
Response generateSketchLink(@QueryParam("deviceName") String deviceName,
|
||||
@QueryParam("sketchType") String sketchType);
|
||||
|
||||
}
|
||||
}
|
||||
@ -6,6 +6,3 @@ CREATE TABLE IF NOT EXISTS `ANDROID_SENSE_DEVICE` (
|
||||
`ANDROID_DEVICE_ID` VARCHAR(45) NOT NULL ,
|
||||
`DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`ANDROID_DEVICE_ID`) );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `ANDROID_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS ANDROID_SENSE_DEVICE (
|
||||
ANDROID_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (ANDROID_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `ANDROID_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS ANDROID_SENSE_DEVICE (
|
||||
ANDROID_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (ANDROID_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `ANDROID_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS ANDROID_SENSE_DEVICE (
|
||||
ANDROID_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (ANDROID_DEVICE_ID));
|
||||
@ -6,6 +6,3 @@ CREATE TABLE IF NOT EXISTS `ARDUINO_DEVICE` (
|
||||
`ARDUINO_DEVICE_ID` VARCHAR(45) NOT NULL ,
|
||||
`DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`ARDUINO_DEVICE_ID`) );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table for `ARDUINO_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS ARDUINO_DEVICE (
|
||||
ARDUINO_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (ARDUINO_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table for `ARDUINO_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS ARDUINO_DEVICE (
|
||||
ARDUINO_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (ARDUINO_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table for `ARDUINO_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS ARDUINO_DEVICE (
|
||||
ARDUINO_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (ARDUINO_DEVICE_ID) );
|
||||
@ -6,6 +6,3 @@ CREATE TABLE IF NOT EXISTS `DIGITAL_DISPLAY_DEVICE` (
|
||||
`DIGITAL_DISPLAY_DEVICE_ID` VARCHAR(45) NOT NULL ,
|
||||
`DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`DIGITAL_DISPLAY_DEVICE_ID`) );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `DIGITAL_DISPLAY_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS DIGITAL_DISPLAY_DEVICE (
|
||||
DIGITAL_DISPLAY_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (DIGITAL_DISPLAY_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `DIGITAL_DISPLAY_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS DIGITAL_DISPLAY_DEVICE (
|
||||
DIGITAL_DISPLAY_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (DIGITAL_DISPLAY_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `DIGITAL_DISPLAY_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS DIGITAL_DISPLAY_DEVICE (
|
||||
DIGITAL_DISPLAY_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (DIGITAL_DISPLAY_DEVICE_ID) );
|
||||
@ -7,5 +7,3 @@ CREATE TABLE IF NOT EXISTS `DRONE_DEVICE` (
|
||||
`DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`DRONE_DEVICE_ID`) );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `DRONE_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS DRONE_DEVICE (
|
||||
DRONE_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (DRONE_DEVICE_ID) );
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `DRONE_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS DRONE_DEVICE (
|
||||
DRONE_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (DRONE_DEVICE_ID) );
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `DRONE_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS DRONE_DEVICE (
|
||||
DRONE_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (DRONE_DEVICE_ID) );
|
||||
|
||||
@ -7,5 +7,3 @@ CREATE TABLE IF NOT EXISTS `RASPBERRYPI_DEVICE` (
|
||||
`DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`RASPBERRYPI_DEVICE_ID`) );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `RASPBERRYPI_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS RASPBERRYPI_DEVICE (
|
||||
RASPBERRYPI_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (RASPBERRYPI_DEVICE_ID) );
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `RASPBERRYPI_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS RASPBERRYPI_DEVICE (
|
||||
RASPBERRYPI_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (RASPBERRYPI_DEVICE_ID) );
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `RASPBERRYPI_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS RASPBERRYPI_DEVICE (
|
||||
RASPBERRYPI_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (RASPBERRYPI_DEVICE_ID) );
|
||||
|
||||
@ -6,6 +6,3 @@ CREATE TABLE IF NOT EXISTS `VIRTUAL_FIREALARM_DEVICE` (
|
||||
`VIRTUAL_FIREALARM_DEVICE_ID` VARCHAR(45) NOT NULL ,
|
||||
`DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (`VIRTUAL_FIREALARM_DEVICE_ID`) );
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `FIREALARM_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE (
|
||||
VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `FIREALARM_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE (
|
||||
VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) );
|
||||
@ -0,0 +1,8 @@
|
||||
|
||||
-- -----------------------------------------------------
|
||||
-- Table `FIREALARM_DEVICE`
|
||||
-- -----------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS VIRTUAL_FIREALARM_DEVICE (
|
||||
VIRTUAL_FIREALARM_DEVICE_ID VARCHAR(45) NOT NULL ,
|
||||
DEVICE_NAME VARCHAR(100) NULL DEFAULT NULL,
|
||||
PRIMARY KEY (VIRTUAL_FIREALARM_DEVICE_ID) );
|
||||
Loading…
Reference in New Issue
Block a user