jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

新增导入信息

Browse Source
tags/yfai-mes-ext-v1.7
xiangwei.zhang 8 months ago
parent 55393e79c6
commit 7930cd4734
4 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesEquipmentVariableService.java
Unescape Escape View File

@ -16,6 +16,6 @@ import java.util.Map;
public interface IMesEquipmentVariableService extends IBaseMesService<MesEquipmentVariable> {
@ApiModelProperty("设备变量导入")
void addMesEquipmentVariable(List<Map<String, Object>> mapList, String equipmentCode, String userName, String organizeCode);
void addMesEquipmentVariable(List<Map<String, Object>> mapList, String equipmentCode, String userName, String organizeCode, String device);
}

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java
Unescape Escape View File

@ -24,7 +24,7 @@ import java.util.List;
* @CreateDate 2024/6/27 10:10
* @Modify:
**/
@ConditionalOnExpression("'${mes.aspect.repository:false}' == 'true'")
@ConditionalOnExpression("'${mes.aspect.repository:true}' == 'true'")
@Aspect
@Configuration
public class MesRepositoryAspect {

4
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesEquipmentVariableController.java
Unescape Escape View File

@ -33,7 +33,7 @@ public class MesEquipmentVariableController extends BaseMesController<MesEquipme
@PostMapping(value = "/import-csv")
@ApiOperation(value = "导入数据CSV")
public ResultBean importMesWorkOrderExcel(@RequestParam("file") MultipartFile file, @RequestParam("equipmentCode") String equipmentCode) {
public ResultBean importMesWorkOrderExcel(@RequestParam("file") MultipartFile file, @RequestParam("equipmentCode") String equipmentCode,@RequestParam("device") String device) {
try {
//导入csv文件
List<Map<String, Object>> mapList = CsvImportUtil.csvImports(file);
@ -42,7 +42,7 @@ public class MesEquipmentVariableController extends BaseMesController<MesEquipme
}
String userName = AuthUtil.getSessionUser().getUserName();
String organizeCode = AuthUtil.getOrganize().getOrganizeCode();
mesEquipmentVariableService.addMesEquipmentVariable(mapList, equipmentCode, userName, organizeCode);
mesEquipmentVariableService.addMesEquipmentVariable(mapList, equipmentCode, userName, organizeCode, device);
return ResultBean.success("导入成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException e) {

37
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesEquipmentVariableService.java
Unescape Escape View File

@ -81,7 +81,7 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
}
@Override
public void addMesEquipmentVariable(List<Map<String, Object>> mapList,String equipmentCode, String userName, String organizeCode) {
public void addMesEquipmentVariable(List<Map<String, Object>> mapList,String equipmentCode, String userName, String organizeCode, String device) {
MesEquipment mesEquipment = getMesEquipment(organizeCode,equipmentCode);
MesEquipmentChannel mesEquipmentChannel = getMesEquipmentChannel(organizeCode,equipmentCode);
@ -95,16 +95,49 @@ public class MesEquipmentVariableService extends BaseMesService<MesEquipmentVari
mesEquipmentVariable.setEquipmentCode(mesEquipment.getEquipmentCode());
mesEquipmentVariable.setTagName(String.valueOf(objectMap.get("Tag Name")));
mesEquipmentVariable.setTagAddress(String.valueOf(objectMap.get("Address")));
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.descriptionOfValue(String.valueOf(objectMap.get("Data Type"))));
if ("R/W".equals(objectMap.get("Client Access").toString())) {
mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.READ_WRITE.getValue());
} else if ("RO".equals(objectMap.get("Client Access").toString())) {
mesEquipmentVariable.setReadWriteFlag(MesExtEnumUtil.READ_WRITE_FLAG.READ.getValue());
}
String dataType = String.valueOf(objectMap.get("Data Type"));
if ("Boolean".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_40.getValue());
} else if ("Byte".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_30.getValue());
} else if ("Byte".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_30.getValue());
} else if ("Byte Array".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_30.getValue());
} else if ("Double".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_70.getValue());
} else if ("Double Array".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_70.getValue());
} else if ("DWord".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_50.getValue());
} else if ("Float".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_60.getValue());
} else if ("Float Array".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_60.getValue());
} else if ("Long".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_15.getValue());
} else if ("Long Array".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.ARIABLE_DATA_TYPE_15.getValue());
} else if ("Short".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_10.getValue());
} else if ("Short Array".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_10.getValue());
} else if ("String".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_50.getValue());
} else if ("Word".equals(dataType)) {
mesEquipmentVariable.setDataType(MesExtEnumUtil.VARIABLE_DATA_TYPE.VARIABLE_DATA_TYPE_50.getValue());
}
mesEquipmentVariable.setVariableType(Integer.parseInt(String.valueOf(objectMap.get("Respect Data Type"))));
mesEquipmentVariable.setScanInterval(Integer.valueOf(String.valueOf(objectMap.get("Scan Rate"))));
mesEquipmentVariable.setDescription(String.valueOf(objectMap.get("Description")));
mesEquipmentVariable.setOrganizeCode(organizeCode);
mesEquipmentVariable.setDevice(device);
ConvertBean.serviceModelInitialize(mesEquipmentVariable, userName);
mesEquipmentVariables.add(mesEquipmentVariable);
} catch (NumberFormatException e) {

Write Preview
Loading…
Cancel
Save