|
@@ -250,6 +250,7 @@ public class TEquipmentController {
|
|
equipmentDTO.setCandyGeneratorTm(equipmentDesc.getCandyGeneratorTm());
|
|
equipmentDTO.setCandyGeneratorTm(equipmentDesc.getCandyGeneratorTm());
|
|
equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
|
|
equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
|
|
equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
|
|
equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
|
|
|
|
+ equipmentDTO.setDiyFlowerStatus(equipmentDesc.getDiyFlowerStatus());
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|
|
@@ -277,6 +278,7 @@ public class TEquipmentController {
|
|
equipmentDTO.setCandyGeneratorTm(equipmentDesc.getCandyGeneratorTm());
|
|
equipmentDTO.setCandyGeneratorTm(equipmentDesc.getCandyGeneratorTm());
|
|
equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
|
|
equipmentDTO.setOutsideHd(equipmentDesc.getOutsideHd());
|
|
equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
|
|
equipmentDTO.setOutsideTm(equipmentDesc.getOutsideTm());
|
|
|
|
+ equipmentDTO.setDiyFlowerStatus(equipmentDesc.getDiyFlowerStatus());
|
|
}
|
|
}
|
|
String messageReceiver = equipment.getMessageReceiver();
|
|
String messageReceiver = equipment.getMessageReceiver();
|
|
if (StringUtils.isNotEmpty(messageReceiver)) {
|
|
if (StringUtils.isNotEmpty(messageReceiver)) {
|
|
@@ -1649,5 +1651,17 @@ public class TEquipmentController {
|
|
// tDiyFlowerService.updateBatchById(products);
|
|
// tDiyFlowerService.updateBatchById(products);
|
|
return R.ok(null,"修改请求发送成功");
|
|
return R.ok(null,"修改请求发送成功");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @ApiOperation(value = "查询DIY花型列表信息")
|
|
|
|
+ @GetMapping("/selectDIYFlowers")
|
|
|
|
+ public ResponseModel<?> selectDIYFlowers(String equipmentId){
|
|
|
|
+ if (StringUtils.isEmpty(equipmentId)) {
|
|
|
|
+ return R.fail(ResponseCodesEnum.A0001, "参数有空");
|
|
|
|
+ }
|
|
|
|
+ LambdaQueryWrapper<TDiyFlower> query = Wrappers.lambdaQuery();
|
|
|
|
+ query.eq(TDiyFlower::getEquipmentId,Long.valueOf(equipmentId));
|
|
|
|
+ List<TDiyFlower> list = tDiyFlowerService.list(query);
|
|
|
|
+ return R.ok(list);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|