|
@@ -314,11 +314,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
for (int i = 1; i < envDevice1.getXiaoChuangNum() + 1; i++) {
|
|
for (int i = 1; i < envDevice1.getXiaoChuangNum() + 1; i++) {
|
|
EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
|
|
EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
|
|
fenestrulen.setDeviceCode(envDevice1.getDeviceSortCode());
|
|
fenestrulen.setDeviceCode(envDevice1.getDeviceSortCode());
|
|
- if (i < 9) {
|
|
|
|
- fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "120" + i);
|
|
|
|
- } else {
|
|
|
|
- fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);
|
|
|
|
- }
|
|
|
|
|
|
+ fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);
|
|
fenestrulen.setFarmId(envDevice1.getFarmId());
|
|
fenestrulen.setFarmId(envDevice1.getFarmId());
|
|
fenestrulen.setChipStatus(0);
|
|
fenestrulen.setChipStatus(0);
|
|
fenestrulen.setChipName("小窗" + i);
|
|
fenestrulen.setChipName("小窗" + i);
|
|
@@ -328,7 +324,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
|
|
for (int i = 1; i < 6; i++) {
|
|
for (int i = 1; i < 6; i++) {
|
|
EnvDeviceOther other = new EnvDeviceOther();
|
|
EnvDeviceOther other = new EnvDeviceOther();
|
|
other.setDeviceCode(envDevice1.getDeviceSortCode());
|
|
other.setDeviceCode(envDevice1.getDeviceSortCode());
|
|
- other.setChipCode(envDevice1.getDeviceSortCode() + "130" + i);
|
|
|
|
|
|
+ other.setChipCode(envDevice1.getDeviceSortCode() + "13" + i);
|
|
other.setFarmId(envDevice1.getFarmId());
|
|
other.setFarmId(envDevice1.getFarmId());
|
|
if (i == 1) {
|
|
if (i == 1) {
|
|
other.setChipName("照明");
|
|
other.setChipName("照明");
|