|
@@ -181,16 +181,16 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
} else {
|
|
} else {
|
|
queryWrapper1.orderByDesc("id").last(" limit 1");
|
|
queryWrapper1.orderByDesc("id").last(" limit 1");
|
|
EnvDevice envDevice2 = envDeviceMapper.selectOne(queryWrapper1);
|
|
EnvDevice envDevice2 = envDeviceMapper.selectOne(queryWrapper1);
|
|
- envDevice.setDeviceSortCode(String.valueOf(Integer.parseInt(envDevice2.getDeviceSortCode())+1));
|
|
|
|
|
|
+ envDevice.setDeviceSortCode(String.valueOf(Integer.parseInt(envDevice2.getDeviceSortCode()) + 1));
|
|
addAll(envDevice);
|
|
addAll(envDevice);
|
|
}
|
|
}
|
|
envDeviceMapper.insert(envDevice);
|
|
envDeviceMapper.insert(envDevice);
|
|
- return new Result(ResultCode.SUCCESS, "添加成功");
|
|
|
|
|
|
+ return new Result(10000, "添加成功",true);
|
|
} else {
|
|
} else {
|
|
- return new Result(ResultCode.FAIL, "添加失败,设备名称或设备编码已存在");
|
|
|
|
|
|
+ return new Result(10001, "添加失败,设备名称或设备编码已存在",false);
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- return new Result(ResultCode.FAIL, "添加失败,该栋舍已绑定设备");
|
|
|
|
|
|
+ return new Result(10001, "添加失败,该栋舍已绑定设备",false);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -207,8 +207,29 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
}
|
|
}
|
|
data.setChipStatus(0);
|
|
data.setChipStatus(0);
|
|
data.setChipType(i);
|
|
data.setChipType(i);
|
|
- if (i < 9) {
|
|
|
|
- data.setChipName("温度" + i);
|
|
|
|
|
|
+ if (i == 1) {
|
|
|
|
+ data.setChipName("前左温度");
|
|
|
|
+ }
|
|
|
|
+ if (i == 2) {
|
|
|
|
+ data.setChipName("前右温度");
|
|
|
|
+ }
|
|
|
|
+ if (i == 3) {
|
|
|
|
+ data.setChipName("中左温度");
|
|
|
|
+ }
|
|
|
|
+ if (i == 4) {
|
|
|
|
+ data.setChipName("中右温度");
|
|
|
|
+ }
|
|
|
|
+ if (i == 5) {
|
|
|
|
+ data.setChipName("后左温度");
|
|
|
|
+ }
|
|
|
|
+ if (i == 6) {
|
|
|
|
+ data.setChipName("后右温度");
|
|
|
|
+ }
|
|
|
|
+ if (i == 7) {
|
|
|
|
+ data.setChipName("温度7");
|
|
|
|
+ }
|
|
|
|
+ if (i == 8) {
|
|
|
|
+ data.setChipName("温度8");
|
|
}
|
|
}
|
|
if (i == 9) {
|
|
if (i == 9) {
|
|
data.setChipName("室外温度");
|
|
data.setChipName("室外温度");
|
|
@@ -328,7 +349,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
fanMapper.insert(fan);
|
|
fanMapper.insert(fan);
|
|
}
|
|
}
|
|
int j = 1;
|
|
int j = 1;
|
|
- for (int i = envDevice1.getFengJiNum()+1; i < envDevice1.getFengJiNum()+envDevice1.getFengJiBianNum()+1; i++) {
|
|
|
|
|
|
+ for (int i = envDevice1.getFengJiNum() + 1; i < envDevice1.getFengJiNum() + envDevice1.getFengJiBianNum() + 1; i++) {
|
|
EnvDeviceFan fan = new EnvDeviceFan();
|
|
EnvDeviceFan fan = new EnvDeviceFan();
|
|
fan.setDeviceCode(envDevice1.getDeviceSortCode());
|
|
fan.setDeviceCode(envDevice1.getDeviceSortCode());
|
|
if (i < 10) {
|
|
if (i < 10) {
|