From 8fc760985596b0199e172e4d2fd366d2c0c6c5fa Mon Sep 17 00:00:00 2001
From: wty <419034340@qq.com>
Date: Thu, 23 Mar 2023 10:43:12 +0800
Subject: [PATCH 1/2] add logback to generate log
---
xiuosiot-backend/pom.xml | 29 +-
.../projectFilesBackup/.idea/workspace.xml | 483 ++++++++++++++++++
.../java/com/aiit/xiuos/XiuosApplication.java | 1 -
.../src/main/resources/application-local.yml | 4 -
.../src/main/resources/application-prod.yml | 4 +-
.../src/main/resources/application.yml | 4 +-
.../src/main/resources/logback.xml | 39 ++
xiuosiot-backend/xiuosiot | 0
xiuosiot-backend/xiuosiot.iml | 113 ----
9 files changed, 551 insertions(+), 126 deletions(-)
create mode 100644 xiuosiot-backend/projectFilesBackup/.idea/workspace.xml
create mode 100644 xiuosiot-backend/src/main/resources/logback.xml
delete mode 100644 xiuosiot-backend/xiuosiot
delete mode 100644 xiuosiot-backend/xiuosiot.iml
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C:\Users\XIOS\AppData\Roaming\Subversion
+
+
+
+
+ 1661333758208
+
+
+ 1661333758208
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1661504382339
+
+
+
+ 1661504382340
+
+
+ 1661505205169
+
+
+
+ 1661505205169
+
+
+ 1663209401377
+
+
+
+ 1663209401377
+
+
+ 1663925693595
+
+
+
+ 1663925693595
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/Utils/GenerateIdUtil.java
+ 27
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/controller/DeviceController.java
+ 65
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/impl/RequestLogInfoServiceImpl.java
+ 36
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java
+ 7
+
+
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/DataForwardService.java
+ 8
+
+
+
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/aiit/xiuos/service/AlarmInfoService.java
+ 15
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
index d825f75..6025855 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/XiuosApplication.java
@@ -3,7 +3,6 @@ package com.aiit.xiuos;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/xiuosiot-backend/src/main/resources/application-local.yml b/xiuosiot-backend/src/main/resources/application-local.yml
index 321a6f0..e9b6596 100644
--- a/xiuosiot-backend/src/main/resources/application-local.yml
+++ b/xiuosiot-backend/src/main/resources/application-local.yml
@@ -79,10 +79,6 @@ mqtt:
tdengine:
url: jdbc:TAOS://taosnode1:6030/xiuosiot?user=root&password=taosdata
-logging:
- file:
- name: xiuosiot.log
-
diff --git a/xiuosiot-backend/src/main/resources/application-prod.yml b/xiuosiot-backend/src/main/resources/application-prod.yml
index 8327905..5d9ebca 100644
--- a/xiuosiot-backend/src/main/resources/application-prod.yml
+++ b/xiuosiot-backend/src/main/resources/application-prod.yml
@@ -71,9 +71,7 @@ mqtt:
default-topic: xiuosiot/#
tdengine:
url: jdbc:TAOS://xiuosiot.taosnode1:6030/xiuosiot?user=root&password=taosdata
-logging:
- file:
- name: xiuosiot.log
+
diff --git a/xiuosiot-backend/src/main/resources/application.yml b/xiuosiot-backend/src/main/resources/application.yml
index bf63079..60e4e57 100644
--- a/xiuosiot-backend/src/main/resources/application.yml
+++ b/xiuosiot-backend/src/main/resources/application.yml
@@ -7,7 +7,9 @@ spring:
profiles:
active: {spring.profiles.active}
-
+logging:
+ config:
+ classpath: logback.xml
diff --git a/xiuosiot-backend/src/main/resources/logback.xml b/xiuosiot-backend/src/main/resources/logback.xml
new file mode 100644
index 0000000..f981884
--- /dev/null
+++ b/xiuosiot-backend/src/main/resources/logback.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+ %d [%thread] %-5level %logger{50} -[%file:%line]- %msg%n
+ UTF-8
+
+
+
+
+
+ ${logFile}.log
+
+
+ %d [%thread] %-5level -[%file:%line]- %msg%n
+ UTF-8
+
+
+ ${logFile}.%d{yyyy-MM-dd}.%i.log
+ ${maxFileSize}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
From 61f2f2be9fcc5f8a7f231965d3a91b1db78c8411 Mon Sep 17 00:00:00 2001
From: wty <419034340@qq.com>
Date: Tue, 4 Apr 2023 17:36:33 +0800
Subject: [PATCH 2/2] add haier data to xiuosiot
---
.../controller/FzDeviceManageController.java | 12 ++
.../xiuos/dao/mappers/HaierDataMapper.java | 17 +++
.../java/com/aiit/xiuos/model/HaierData.java | 83 ++++++++++++
.../scheduled/HaierDataTaskScheduled.java | 117 +++++++++++++++++
.../xiuos/service/FzDeviceInfoService.java | 1 +
.../com/aiit/xiuos/service/HaierService.java | 8 ++
.../service/impl/FzDeviceInfoServiceImpl.java | 5 +
.../xiuos/service/impl/HaierServiceImpl.java | 22 ++++
.../com/aiit/xiuos/socket/SocketServer.java | 4 -
.../resources/mappers/DeviceLogInfoMapper.xml | 119 ++++++++++++++++++
10 files changed, 384 insertions(+), 4 deletions(-)
create mode 100644 xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/HaierDataMapper.java
create mode 100644 xiuosiot-backend/src/main/java/com/aiit/xiuos/model/HaierData.java
create mode 100644 xiuosiot-backend/src/main/java/com/aiit/xiuos/scheduled/HaierDataTaskScheduled.java
create mode 100644 xiuosiot-backend/src/main/java/com/aiit/xiuos/service/HaierService.java
create mode 100644 xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/HaierServiceImpl.java
delete mode 100644 xiuosiot-backend/src/main/java/com/aiit/xiuos/socket/SocketServer.java
create mode 100644 xiuosiot-backend/src/main/resources/mappers/DeviceLogInfoMapper.xml
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java
index 37fd310..929a5a5 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/controller/FzDeviceManageController.java
@@ -56,6 +56,18 @@ public class FzDeviceManageController {
return new ResultRespons(Constant.SUCCESS_CODE,"查询设备成功！",fzDeviceInfos);
}
+ @GetMapping("/selectByNo")
+ public ResultRespons selectDeviceByNo(@RequestParam("device_no") String id, HttpServletRequest request){
+ FzDeviceInfo fzDeviceInfos = fzDeviceInfoService.selectById(id);
+ if(fzDeviceInfos!=null){
+ return new ResultRespons(Constant.SUCCESS_CODE,"查询设备成功！",fzDeviceInfos);
+ }else
+ {
+ return new ResultRespons(Constant.SUCCESS_CODE,"设备不存在！");
+ }
+
+ }
+
@GetMapping("/selectAll")
public ResultRespons selectDevice(){
List fzDeviceInfos = fzDeviceInfoService.selectAll();
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/HaierDataMapper.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/HaierDataMapper.java
new file mode 100644
index 0000000..b39d9f0
--- /dev/null
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/dao/mappers/HaierDataMapper.java
@@ -0,0 +1,17 @@
+package com.aiit.xiuos.dao.mappers;
+
+import com.aiit.xiuos.model.HaierData;
+
+public interface HaierDataMapper {
+ int deleteByPrimaryKey(Integer id);
+
+ int insert(HaierData record);
+
+ int insertSelective(HaierData record);
+
+ HaierData selectByPrimaryKey(Integer id);
+
+ int updateByPrimaryKeySelective(HaierData record);
+
+ int updateByPrimaryKey(HaierData record);
+}
\ No newline at end of file
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/model/HaierData.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/model/HaierData.java
new file mode 100644
index 0000000..d914d15
--- /dev/null
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/model/HaierData.java
@@ -0,0 +1,83 @@
+package com.aiit.xiuos.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class HaierData {
+ private Integer id;
+
+ private BigDecimal o3;
+
+ private BigDecimal co2;
+
+ private BigDecimal so2;
+
+ private BigDecimal no2;
+
+ private BigDecimal nh3;
+
+ private BigDecimal tvoc;
+
+ private BigDecimal ch2o;
+
+ private BigDecimal c2h5oh;
+
+ private BigDecimal ch4;
+
+ private BigDecimal o2;
+
+ private BigDecimal aqs;
+
+ private BigDecimal humidness;
+
+ private BigDecimal temperature;
+
+ private BigDecimal pm1d0;
+
+ private BigDecimal pm2d5;
+
+ private BigDecimal pm10;
+
+ private BigDecimal windspeed;
+
+ private BigDecimal winddirection;
+
+ private BigDecimal airpressure;
+
+ private Date time;
+
+ private BigDecimal noise;
+
+ public HaierData(Integer id, BigDecimal o3, BigDecimal co2, BigDecimal so2, BigDecimal no2, BigDecimal nh3, BigDecimal tvoc, BigDecimal ch2o, BigDecimal c2h5oh, BigDecimal ch4, BigDecimal o2, BigDecimal aqs, BigDecimal humidness, BigDecimal temperature, BigDecimal pm1d0, BigDecimal pm2d5, BigDecimal pm10, BigDecimal windspeed, BigDecimal winddirection, BigDecimal airpressure, Date time, BigDecimal noise) {
+ this.id = id;
+ this.o3 = o3;
+ this.co2 = co2;
+ this.so2 = so2;
+ this.no2 = no2;
+ this.nh3 = nh3;
+ this.tvoc = tvoc;
+ this.ch2o = ch2o;
+ this.c2h5oh = c2h5oh;
+ this.ch4 = ch4;
+ this.o2 = o2;
+ this.aqs = aqs;
+ this.humidness = humidness;
+ this.temperature = temperature;
+ this.pm1d0 = pm1d0;
+ this.pm2d5 = pm2d5;
+ this.pm10 = pm10;
+ this.windspeed = windspeed;
+ this.winddirection = winddirection;
+ this.airpressure = airpressure;
+ this.time = time;
+ this.noise = noise;
+ }
+
+ public HaierData() {
+ super();
+ }
+}
\ No newline at end of file
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/scheduled/HaierDataTaskScheduled.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/scheduled/HaierDataTaskScheduled.java
new file mode 100644
index 0000000..55081e5
--- /dev/null
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/scheduled/HaierDataTaskScheduled.java
@@ -0,0 +1,117 @@
+package com.aiit.xiuos.scheduled;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.aiit.xiuos.Utils.MyUtils;
+import com.aiit.xiuos.model.HaierData;
+import com.aiit.xiuos.service.HaierService;
+import com.aiit.xiuos.socket.HaiErWebSocketServer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+@Slf4j
+@Component
+public class HaierDataTaskScheduled {
+ @Autowired
+ HaiErWebSocketServer haiErWebSocketServer;
+
+ @Autowired
+ HaierService haierService;
+
+ @Scheduled(cron = "0 0 */1 * * ?")//every hour
+ public void insertHaierData() throws ParseException {
+ HaierData haierData =mockData();
+ haierService.insertData(haierData);
+
+ }
+
+ @Scheduled(cron = "*/1 * * * * ?")//every hour
+ public void sendWebsocket() throws ParseException, IOException {
+ HaierData haierData = mockData();
+ JSONObject jsonObject = JSONUtil.parseObj(haierData,false,true);
+ haiErWebSocketServer.sendInfo(jsonObject.toString());
+ }
+
+ public HaierData mockData() throws ParseException {
+ HaierData haierData =new HaierData();
+ Random rand = new Random();
+ DecimalFormat df = new DecimalFormat("#.00"); //保留两位数，若数据库已截取，java可不作保留
+ //生成在max与min之间的随机数
+ // int randNumber = rand.nextInt(MAX - MIN + 1) + MIN;
+
+ double o3 =rand.nextInt(10)+30+Math.random(); //O3
+ haierData.setO3(new BigDecimal(df.format(o3)));
+
+ double co2 =rand.nextInt(100)+200+Math.random(); //co2
+ haierData.setCo2(new BigDecimal(df.format(co2)));
+
+ double so2=0.0; //so2
+ haierData.setSo2(new BigDecimal(df.format(so2)));
+
+ double no2=0.0; //no2
+ haierData.setNo2(new BigDecimal(df.format(no2)));
+
+ double nh3=0.0; //nh3
+ haierData.setNh3(new BigDecimal(df.format(nh3)));
+
+ double tvoc = rand.nextInt(1)+Math.random(); //tvoc
+ haierData.setTvoc(new BigDecimal(df.format(tvoc)));
+
+ double ch2o =0.0; //ch2o
+ haierData.setCh2o(new BigDecimal(df.format(ch2o)));
+
+ double c2h5oh = rand.nextInt(10)+Math.random(); //c2h5oh
+ haierData.setC2h5oh(new BigDecimal(df.format(c2h5oh)));
+
+ double ch4 = 0.0; //ch4
+ haierData.setCh4(new BigDecimal(df.format(ch4)));
+
+ double o2 = rand.nextInt(10)+20+Math.random(); //o2
+ haierData.setO2(new BigDecimal(df.format(o2)));
+
+ double aqs = rand.nextInt(30)+200+Math.random(); //aqs
+ haierData.setAqs(new BigDecimal(df.format(aqs)));
+
+ double humidness = rand.nextInt(30)+30+Math.random(); //湿度
+ haierData.setHumidness(new BigDecimal(df.format(humidness)));
+
+ double temperature =rand.nextInt(10)+15+Math.random(); //温度
+ haierData.setTemperature(new BigDecimal(df.format(temperature)));
+
+ double pm1_0=rand.nextInt(20)+Math.random(); //pm1.0 ug/m3
+ haierData.setPm1d0(new BigDecimal(df.format(pm1_0)));
+
+ double pm2_5=rand.nextInt(20)+30+Math.random(); //pm2.5 ug/m3
+ haierData.setPm2d5(new BigDecimal(df.format(pm2_5)));
+
+ double pm10=rand.nextInt(20)+50+Math.random(); //pm10 ug/m3
+ haierData.setPm10(new BigDecimal(df.format(pm10)));
+
+ double windspeed = Math.random(); //风速m/s
+ haierData.setWindspeed(new BigDecimal(df.format(windspeed)));
+
+ double winddirection = rand.nextInt(30)+200; //风向
+ haierData.setWinddirection(new BigDecimal(df.format(winddirection)));
+
+ double airpressure=rand.nextInt(100)+900+Math.random(); //气压
+ haierData.setAirpressure(new BigDecimal(df.format(airpressure)));
+
+ double noise =rand.nextInt(71)+30+Math.random(); //噪音 pd
+ haierData.setNoise(new BigDecimal(df.format(noise)));
+
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = sdf.parse(MyUtils.getTime());
+ haierData.setTime(date);
+ return haierData;
+ }
+}
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java
index 90aaa4f..30db78d 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/FzDeviceInfoService.java
@@ -7,6 +7,7 @@ import java.util.List;
public interface FzDeviceInfoService {
List selectAll();
List selectByType(String type);
+ FzDeviceInfo selectById(String id);
int addDevice(FzDeviceInfo fzDeviceInfo);
int updateDevice(FzDeviceInfo fzDeviceInfo);
int deleteDevice(String deviceNo);
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/HaierService.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/HaierService.java
new file mode 100644
index 0000000..d640f31
--- /dev/null
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/HaierService.java
@@ -0,0 +1,8 @@
+package com.aiit.xiuos.service;
+
+import com.aiit.xiuos.model.HaierData;
+
+public interface HaierService {
+ int insertData(HaierData data);
+ HaierData selectData();
+}
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java
index b4fa91e..306b44b 100644
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/FzDeviceInfoServiceImpl.java
@@ -21,6 +21,11 @@ public class FzDeviceInfoServiceImpl implements FzDeviceInfoService {
return fzDeviceInfoMapper.selectByType(type);
}
+ @Override
+ public FzDeviceInfo selectById(String deviceNo) {
+ return fzDeviceInfoMapper.selectByPrimaryKey( deviceNo);
+ }
+
@Override
public int addDevice(FzDeviceInfo fzDeviceInfo) {
return fzDeviceInfoMapper.insert(fzDeviceInfo);
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/HaierServiceImpl.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/HaierServiceImpl.java
new file mode 100644
index 0000000..71ce9c5
--- /dev/null
+++ b/xiuosiot-backend/src/main/java/com/aiit/xiuos/service/impl/HaierServiceImpl.java
@@ -0,0 +1,22 @@
+package com.aiit.xiuos.service.impl;
+
+import com.aiit.xiuos.dao.mappers.HaierDataMapper;
+import com.aiit.xiuos.model.HaierData;
+import com.aiit.xiuos.service.HaierService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class HaierServiceImpl implements HaierService {
+ @Autowired
+ HaierDataMapper haierDataMapper;
+ @Override
+ public int insertData(HaierData data) {
+ return haierDataMapper.insertSelective(data);
+ }
+
+ @Override
+ public HaierData selectData() {
+ return haierDataMapper.selectData();
+ }
+}
diff --git a/xiuosiot-backend/src/main/java/com/aiit/xiuos/socket/SocketServer.java b/xiuosiot-backend/src/main/java/com/aiit/xiuos/socket/SocketServer.java
deleted file mode 100644
index 7cb5ed5..0000000
--- a/xiuosiot-backend/src/main/java/com/aiit/xiuos/socket/SocketServer.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.aiit.xiuos.socket;
-
-public class SocketServer {
-}
diff --git a/xiuosiot-backend/src/main/resources/mappers/DeviceLogInfoMapper.xml b/xiuosiot-backend/src/main/resources/mappers/DeviceLogInfoMapper.xml
new file mode 100644
index 0000000..40254f6
--- /dev/null
+++ b/xiuosiot-backend/src/main/resources/mappers/DeviceLogInfoMapper.xml
@@ -0,0 +1,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ device_no, log_time, device_type, thread_no, log_level, device_log, org
+
+
+
+ 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