linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改配方库读取

Browse Source
plp
HuangHuiKang 1 month ago
parent b1a5f45b15
commit 1a33190acb
7 changed files with 68 additions and 35 deletions
Show Stats Download Patch File Download Diff File

8
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedeviceattribute/RecipeDeviceAttributeController.java
Unescape Escape View File

@ -95,6 +95,14 @@ public class RecipeDeviceAttributeController {
return success(pageResult);
}
@GetMapping("/getList")
@Operation(summary = "查询配方配置列表")
public CommonResult<List<RecipeDeviceAttributePageRespDTO>> getList(RecipeDeviceAttributePageReqVO reqVO) {
// 替换为关联查询方法
List<RecipeDeviceAttributePageRespDTO> recipeDeviceAttributeServiceList = recipeDeviceAttributeService.getList(reqVO);
return success(recipeDeviceAttributeServiceList);
}
@GetMapping("/list")
@Operation(summary = "查询配方配置列表")
public CommonResult<PageResult<RecipeDeviceAttributePageRespDTO>> list(RecipeDeviceAttributePageReqVO reqVO) {

76
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java
Unescape Escape View File

@ -156,16 +156,17 @@ public class RecipeDeviceRecordController {
@Operation(summary = "批量创建设备点位采集记录和配方点位记录")
@PreAuthorize("@ss.hasPermission('iot:recipe-device-record:create')")
public CommonResult<Boolean> batchCreateRecipeDeviceRecord(
@RequestParam("id") Long recipeId) {
@RequestParam("id") Long id) {
RecipePlanDetailDO recipePlanDetailDO = recipePlanDetailService.getRecipePlanDetail(recipeId);
RecipePlanDetailDO recipePlanDetailDO = recipePlanDetailService.getRecipePlanDetail(id);
Long recipeId = recipePlanDetailDO.getRecipeId();
// ========== 第一步：查询配方关联的点位属性信息 ==========
// 1.1 根据recipeId查询iot_recipe_device_attribute表记录
recipePlanDetailDO.setRecipeId(recipeId);
List<RecipeDeviceAttributeDO> attributeList = recipeDeviceAttributeService.getByRecipeId(recipePlanDetailDO.getRecipeId());
// recipePlanDetailDO.setRecipeId(recipeId);
List<RecipeDeviceAttributeDO> attributeList = recipeDeviceAttributeService.getByRecipeId(recipeId);
//先删除在添加
List<RecipeDeviceRecordDO> recipeDeviceRecordDOS = recipeDeviceRecordService.getListByRecipeId(recipeId);
@ -178,42 +179,53 @@ public class RecipeDeviceRecordController {
}
DeviceRespVO device = deviceService.getDevice(recipe.getMachineId());
if (device== null ){
throw exception(DEVICE_NOT_EXISTS);
}
try {
if (device != null) {
// throw exception(DEVICE_NOT_EXISTS);
Map<Long, DeviceContactModelDO> deviceContactModelMap = new HashMap<>();
List<DeviceContactModelDO> deviceContactModelDOS = deviceContactModelService.selectListByDeviceId(device.getId());
if (!deviceContactModelDOS.isEmpty()){
deviceContactModelMap = deviceContactModelDOS.stream()
.collect(Collectors.toMap(
DeviceContactModelDO::getId,
Function.identity()
));
}
OpcUtils.connect(device.getId(),device.getUrl(),device.getUsername(),device.getPassword(),10);
try {
for (RecipeDeviceAttributeDO attributeDO : attributeList) {
DeviceContactModelDO deviceContactModelDO = deviceContactModelMap.get(attributeDO.getAttributeId());
if (deviceContactModelDO == null){
continue;
Map<Long, DeviceContactModelDO> deviceContactModelMap = new HashMap<>();
List<DeviceContactModelDO> deviceContactModelDOS = deviceContactModelService.selectListByDeviceId(device.getId());
if (!deviceContactModelDOS.isEmpty()) {
deviceContactModelMap = deviceContactModelDOS.stream()
.collect(Collectors.toMap(
DeviceContactModelDO::getId,
Function.identity()
));
}
// 创建
RecipeDeviceRecordDO recipeDeviceRecordDO = new RecipeDeviceRecordDO();
recipeDeviceRecordDO.setRecipeId(recipeId);
recipeDeviceRecordDO.setAttributeCode(deviceContactModelDO.getAttributeName());
recipeDeviceRecordDO.setDataType(deviceContactModelDO.getDataType());
recipeDeviceRecordDO.setDataUnit(deviceContactModelDO.getDataUnit());
Map<Long, Map<String, Object>> deviceDataMap = deviceService.createDeviceDataMap(device.getId());//recipeRespVO.getDeviceId()
// OpcUtils.connect(device.getId(),device.getUrl(),device.getUsername(),device.getPassword(),10);
for (RecipeDeviceAttributeDO attributeDO : attributeList) {
Map<String, Object> data = deviceDataMap.get(attributeDO.getAttributeId());
DeviceContactModelDO deviceContactModelDO = deviceContactModelMap.get(attributeDO.getAttributeId());
if (deviceContactModelDO == null) {
continue;
}
// 创建
RecipeDeviceRecordDO recipeDeviceRecordDO = new RecipeDeviceRecordDO();
recipeDeviceRecordDO.setRecipeId(recipeId);
recipeDeviceRecordDO.setAttributeCode(deviceContactModelDO.getAttributeCode());
recipeDeviceRecordDO.setAttributeName(deviceContactModelDO.getAttributeName());
recipeDeviceRecordDO.setDataType(deviceContactModelDO.getDataType());
recipeDeviceRecordDO.setDeviceId(deviceContactModelDO.getDeviceId());
recipeDeviceRecordDO.setDataUnit(deviceContactModelDO.getDataUnit());
// recipeDeviceRecordDO.setValue((String) OpcUtils.readValues(device.getId(),deviceContactModelDO.getAddress()));
if (data.get("addressValue") != null && data.get("addressValue").toString() != null) {
recipeDeviceRecordDO.setValue(data.get("addressValue").toString());
}
recipeDeviceRecordService.createRecipeDeviceRecord(BeanUtils.toBean(recipeDeviceRecordDO, RecipeDeviceRecordSaveReqVO.class));
recipeDeviceRecordService.createRecipeDeviceRecord(BeanUtils.toBean(recipeDeviceRecordDO, RecipeDeviceRecordSaveReqVO.class));
}
} catch (Exception e) {
throw new RuntimeException(e);
}
} catch (Exception e) {
throw new RuntimeException(e);
}
return success(true);

6
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/recipedeviceattribute/RecipeDeviceAttributeMapper.java
Unescape Escape View File

@ -98,6 +98,12 @@ public interface RecipeDeviceAttributeMapper extends BaseMapperX<RecipeDeviceAtt
return new PageResult<>(list, page.getTotal());
}
default List<RecipeDeviceAttributePageRespDTO> getList(RecipeDeviceAttributePageReqVO reqVO) {
List<RecipeDeviceAttributePageRespDTO> list = selectPageWithAttribute(null, reqVO);
return list;
}
/**
* 根据配方ID查询设备属性记录
* @param recipeId 配方ID

4
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/recipeplandetail/RecipePlanDetailMapper.java
Unescape Escape View File

@ -41,9 +41,9 @@ public interface RecipePlanDetailMapper extends BaseMapperX<RecipePlanDetailDO>
" p.code AS planCode, ", // 关联mes_plan表的编码
" d.id AS deviceId ", // 新增：关联iot_device表的id作为deviceId
"FROM iot_recipe_plan_detail rpd",
"LEFT JOIN iot_recipe r ON rpd.recipe_id = r.id ", // 左关联配方表（避免配方ID不存在时数据丢失）
"LEFT JOIN iot_recipe r ON rpd.recipe_id = r.id ", // 左关联配方表（避免配方ID不存在时数据丢失）
"LEFT JOIN mes_plan p ON rpd.plan_id = p.id ", // 左关联计划表
"LEFT JOIN iot_device d ON r.machine_name = d.device_name ", // 新增：左关联设备表，通过machine_name匹配device_name
"LEFT JOIN iot_device d ON r.machine_id = d.id ", // 新增：左关联设备表，通过machine_name匹配device_name
"WHERE rpd.deleted = 0 ", // 过滤已删除数据
"<if test='reqVO.code != null and reqVO.code != \"\"'>",
" AND rpd.code LIKE CONCAT('%', #{reqVO.code}, '%')",

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipedeviceattribute/RecipeDeviceAttributeService.java
Unescape Escape View File

@ -84,4 +84,5 @@ public interface RecipeDeviceAttributeService {
*/
PageResult<RecipeDeviceAttributePageRespDTO> selectPageWithAttribute(RecipeDeviceAttributePageReqVO reqVO);
List<RecipeDeviceAttributePageRespDTO> getList(RecipeDeviceAttributePageReqVO reqVO);
}

7
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipedeviceattribute/RecipeDeviceAttributeServiceImpl.java
Unescape Escape View File

@ -156,6 +156,13 @@ public class RecipeDeviceAttributeServiceImpl implements RecipeDeviceAttributeSe
return recipeDeviceAttributeMapper.selectPageWithAttributeWrap(reqVO);
}
@Override
public List<RecipeDeviceAttributePageRespDTO> getList(RecipeDeviceAttributePageReqVO reqVO) {
return recipeDeviceAttributeMapper.getList(reqVO);
}
// @Override
// public List<Map<String, Object>> operationAnalysisDetails(Long deviceId, String collectionStartTime, String collectionEndTime) {

1
yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/recipepointrecord/RecipePointRecordServiceImpl.java
Unescape Escape View File

@ -37,7 +37,6 @@ public class RecipePointRecordServiceImpl implements RecipePointRecordService {
recipePointRecordMapper.deleteByIds(recipePointRecordDOS);
}
// 插入
RecipePointRecordDO recipePointRecord = BeanUtils.toBean(createReqVO, RecipePointRecordDO.class);
recipePointRecordMapper.insert(recipePointRecord);

Write Preview
Loading…
Cancel
Save