sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.jsspisoft.com/ry-das

Browse Source
This commit is contained in:
zhouhuang 2024-12-16 15:48:00 +08:00
commit c27b4a359b
7 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
das/src/main/java/com/das/modules/equipment/controller/SysIotModelController.java
View File

@ -216,7 +216,7 @@ public class SysIotModelController {
return R.success();
}
/** 物模型导出 */
/** 物模型属性导出 */
@PostMapping("/export")
public void exportSysIotModel(@RequestBody SysIotModelDto sysIotModelDto, HttpServletRequest request, HttpServletResponse response) {
@ -227,7 +227,7 @@ public class SysIotModelController {
}
/** 物模型导入 */
/** 物模型属性导入 */
@PostMapping("/import")
public R<Void> importSysIotModel(String id, @RequestParam("file") MultipartFile file) throws IOException {

2
das/src/main/java/com/das/modules/equipment/domain/dto/SysIotModelFieldDto.java
View File

@ -77,5 +77,5 @@ public class SysIotModelFieldDto implements Serializable {
private String stateDesc;
private Integer confidential;
}

2
das/src/main/java/com/das/modules/equipment/domain/vo/SysIotModelFieldVo.java
View File

@ -70,4 +70,6 @@ public class SysIotModelFieldVo {
private String stateDesc;
private Integer confidential;
}

7
das/src/main/java/com/das/modules/equipment/entity/SysIotModelField.java
View File

@ -111,4 +111,11 @@ public class SysIotModelField extends BaseEntity {
*/
@TableField("statedesc")
private String stateDesc;
/**
* 是否为敏感数据
*/
@TableField("confidential")
private Integer confidential;
}

10
das/src/main/java/com/das/modules/equipment/service/impl/SysIotModelServiceImpl.java
View File

@ -313,6 +313,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
map.put("highSpeed", "*属性频度（0低频属性，1高频属性）");
map.put("level", "离散量级别:0提示;1告警;2故障");
map.put("stateDesc", "告警级别描述");
map.put("confidential","是否为敏感数据(0：非敏感数据，1：敏感数据)");
sheetDTO.setSheetName("物模型属性");
sheetDTO.setFieldAndAlias(map);
sheetDTO.setCollection(sysIotModelFieldVoList);
@ -514,10 +515,13 @@ public class SysIotModelServiceImpl implements SysIotModelService {
private static void buildFieldInfo(String iotModelId, List<Object> row, SysIotModelField field) {
//参数校验
boolean allNotEmpty = ObjectUtil.isAllNotEmpty(row.get(3), row.get(4), row.get(5), row.get(7), row.get(9), row.get(11));
boolean allNotEmpty = ObjectUtil.isAllNotEmpty(row.get(3), row.get(4), row.get(5), row.get(7), row.get(9), row.get(11), row.get(14));
if (!allNotEmpty) {
throw new ServiceException("字段不可为空，请检查excel文件{}" + row);
}
if (!(row.get(14).toString().equals("0") || row.get(14).toString().equals("1"))){
throw new ServiceException("参数是否为敏感字段不符合规范，请输入0或者1");
}
field.setAttributeCode(row.get(3).toString());
field.setAttributeName(row.get(4).toString());
field.setAttributeType(Integer.valueOf(row.get(5).toString()));
@ -530,6 +534,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
field.setHighSpeed(Integer.valueOf(row.get(11).toString()));
field.setLevel(ObjectUtil.isEmpty(row.get(12)) ? null : Integer.valueOf(row.get(12).toString()));
field.setStateDesc(ObjectUtil.isEmpty(row.get(13)) ? null : row.get(13).toString());
field.setConfidential(Integer.valueOf(row.get(14).toString()));
field.setIotModelId(Long.valueOf(iotModelId));
}
@ -637,8 +642,7 @@ public class SysIotModelServiceImpl implements SysIotModelService {
Map<String, String> fieldCodeName = new HashMap<>();
fieldCodeName.put(sysIotModelField.getAttributeCode(), sysIotModelField.getAttributeName());
dataService.fieldCodeNameMap.put(modelCode, fieldCodeName);
}
else {
} else {
fieldCodeNameMap.put(sysIotModelField.getAttributeCode(), sysIotModelField.getAttributeName());
}
if (sysIotModelField.getLevel() != null) {

2
das/src/main/java/com/das/modules/fdr/controller/FaultRecorderController.java
View File

@ -51,7 +51,7 @@ public class FaultRecorderController {
String code = jsonObject.getString("deviceCode");
String startTime = jsonObject.getString("startTime");
String endTime = jsonObject.getString("endTime");
List<FileNode> result = faultRecorderService.getDirOrFileList("Tracelog",code,startTime,endTime);
List<FileNode> result = faultRecorderService.getDirOrFileList("Statuscode",code,startTime,endTime);
return R.success(result);
}

4
das/src/main/java/com/das/modules/plc/controller/PlcLogsController.java
View File

@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
/**
* 故障录波controller
* 运行日志controller
*/
@Slf4j
@RequestMapping("/api/plc")
@ -44,7 +44,7 @@ public class PlcLogsController {
String code = jsonObject.getString("deviceCode");
String startTime = jsonObject.getString("startTime");
String endTime = jsonObject.getString("endTime");
List<FileNode> result = plcLogService.getDirOrFileList("Statuscode",code,startTime,endTime);
List<FileNode> result = plcLogService.getDirOrFileList("Tracelog",code,startTime,endTime);
return R.success(result);
}