ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整设备类型

Browse Source
This commit is contained in:
hongawen
2025-01-13 20:15:37 +08:00
parent 173aa100bd
commit 9b6543bbb6
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
detection/src/main/java/com/njcn/gather/report/service/impl/ReportServiceImpl.java
View File

@@ -17,6 +17,8 @@ import com.njcn.gather.device.script.pojo.po.PqScriptCheckData;
import com.njcn.gather.device.script.pojo.po.PqScriptDtls;
import com.njcn.gather.device.script.service.IPqScriptCheckDataService;
import com.njcn.gather.device.script.service.IPqScriptDtlsService;
import com.njcn.gather.device.type.entity.DevType;
import com.njcn.gather.device.type.service.IDevTypeService;
import com.njcn.gather.plan.pojo.po.AdPlan;
import com.njcn.gather.plan.service.IAdPlanService;
import com.njcn.gather.report.pojo.DevReportParam;
@@ -67,6 +69,8 @@ public class ReportServiceImpl implements IReportService {
private final AdHarmonicService adHarmonicService;
private final IDevTypeService devTypeService;
@Override
public void generateReport(DevReportParam devReportParam, HttpServletResponse response) {
@@ -128,8 +132,8 @@ public class ReportServiceImpl implements IReportService {
Map<String, String> baseModelMap = new HashMap<>(16);
PqDevVO pqDevVO = iPqDevService.getPqDevById(devReportParam.getDevId());
// 获取设备型号
DictData devTypeDictData = dictDataService.getDictDataById(pqDevVO.getDevType());
baseModelMap.put("${devType}", devTypeDictData.getName());
DevType devType = devTypeService.getById(pqDevVO.getDevType());
baseModelMap.put("${devType}", devType.getName());
// 调试人员，todo... 待咨询曹泽辉如何获取当前用户信息，目前先写死
baseModelMap.put("${userName}", "管理员");
// 调试日期