diff --git a/xiuosiot-backend/pom.xml b/xiuosiot-backend/pom.xml index c87863f..4ee70ba 100644 --- a/xiuosiot-backend/pom.xml +++ b/xiuosiot-backend/pom.xml @@ -121,7 +121,12 @@ spring-boot-starter-aop 1.4.1.RELEASE - + + + cn.zhxu + okhttps-fastjson + 4.0.1 + org.springframework.boot @@ -129,11 +134,27 @@ - org.apache.spark - spark-core_2.12 - 3.3.1 + cn.hutool + hutool-all + 5.8.15 + + ch.qos.logback + logback-core + 1.1.7 + + + + ch.qos.logback + logback-classic + 1.1.7 + + + commons-lang + commons-lang + 2.6 + diff --git a/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml b/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml new file mode 100644 index 0000000..973a5a4 --- /dev/null +++ b/xiuosiot-backend/projectFilesBackup/.idea/workspace.xml @@ -0,0 +1,483 @@ + + + + + + + + + + + select + + from device_log_info + where device_no = #{deviceNo,jdbcType=VARCHAR} + and log_time = #{logTime,jdbcType=TIMESTAMP} + + + delete from device_log_info + where device_no = #{deviceNo,jdbcType=VARCHAR} + and log_time = #{logTime,jdbcType=TIMESTAMP} + + + insert into device_log_info (device_no, log_time, device_type, + thread_no, log_level, device_log, + org) + values (#{deviceNo,jdbcType=VARCHAR}, #{logTime,jdbcType=TIMESTAMP}, #{deviceType,jdbcType=VARCHAR}, + #{threadNo,jdbcType=VARCHAR}, #{logLevel,jdbcType=INTEGER}, #{deviceLog,jdbcType=VARCHAR}, + #{org,jdbcType=VARCHAR}) + + + insert into device_log_info + + + device_no, + + + log_time, + + + device_type, + + + thread_no, + + + log_level, + + + device_log, + + + org, + + + + + #{deviceNo,jdbcType=VARCHAR}, + + + #{logTime,jdbcType=TIMESTAMP}, + + + #{deviceType,jdbcType=VARCHAR}, + + + #{threadNo,jdbcType=VARCHAR}, + + + #{logLevel,jdbcType=INTEGER}, + + + #{deviceLog,jdbcType=VARCHAR}, + + + #{org,jdbcType=VARCHAR}, + + + + + update device_log_info + + + device_type = #{deviceType,jdbcType=VARCHAR}, + + + thread_no = #{threadNo,jdbcType=VARCHAR}, + + + log_level = #{logLevel,jdbcType=INTEGER}, + + + device_log = #{deviceLog,jdbcType=VARCHAR}, + + + org = #{org,jdbcType=VARCHAR}, + + + where device_no = #{deviceNo,jdbcType=VARCHAR} + and log_time = #{logTime,jdbcType=TIMESTAMP} + + + update device_log_info + set device_type = #{deviceType,jdbcType=VARCHAR}, + thread_no = #{threadNo,jdbcType=VARCHAR}, + log_level = #{logLevel,jdbcType=INTEGER}, + device_log = #{deviceLog,jdbcType=VARCHAR}, + org = #{org,jdbcType=VARCHAR} + where device_no = #{deviceNo,jdbcType=VARCHAR} + and log_time = #{logTime,jdbcType=TIMESTAMP} + + \ No newline at end of file diff --git a/xiuosiot-backend/xiuosiot b/xiuosiot-backend/xiuosiot deleted file mode 100644 index e69de29..0000000 diff --git a/xiuosiot-backend/xiuosiot.iml b/xiuosiot-backend/xiuosiot.iml deleted file mode 100644 index 9d165af..0000000 --- a/xiuosiot-backend/xiuosiot.iml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file