bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备新增

This commit is contained in:
mashuai 2025-03-18 08:46:10 +08:00
parent ae452f8598
commit 893f67f82a
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/controller/DevInfoController.java
View File

@ -13,7 +13,9 @@ import com.bonus.material.device.domain.DevInfo;
import com.bonus.material.device.domain.dto.DevInfoImpDto; import com.bonus.material.device.domain.dto.DevInfoImpDto;
import com.bonus.material.device.domain.dto.InfoMotionDto; import com.bonus.material.device.domain.dto.InfoMotionDto;
import com.bonus.material.device.domain.vo.DevInfoVo; import com.bonus.material.device.domain.vo.DevInfoVo;
import com.bonus.material.device.domain.vo.DevTemplateVo;
import com.bonus.material.device.service.DevInfoService; import com.bonus.material.device.service.DevInfoService;
import com.bonus.system.api.domain.SysUser;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -249,8 +251,8 @@ public class DevInfoController extends BaseController {
*/ */
@ApiOperation(value = "设备批量导入模版下载") @ApiOperation(value = "设备批量导入模版下载")
@PostMapping("/downLoadDev") @PostMapping("/downLoadDev")
public void downLoadDev(){ public void downLoadDev() {
HttpServletResponse resp = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getResponse(); HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
devInfoService.downLoadDev(resp); devInfoService.downLoadDev(resp);
} }

28
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
View File

@ -979,23 +979,19 @@ public class DevInfoServiceImpl implements DevInfoService {
Map<String, List<DevTemplateVo>> map = maDevList.stream().collect(Collectors.groupingBy(DevTemplateVo::getDeviceName)); Map<String, List<DevTemplateVo>> map = maDevList.stream().collect(Collectors.groupingBy(DevTemplateVo::getDeviceName));
for (Map.Entry<String, List<DevTemplateVo>> entry : map.entrySet()) { for (Map.Entry<String, List<DevTemplateVo>> entry : map.entrySet()) {
// 如果map的数量大于1，则进行遍历 // 如果map的数量大于1，则进行遍历
if (entry.getValue().size() > 1) { DevTemplateVo devTemplateVo = entry.getValue().get(0);
DevTemplateVo devTemplateVo = entry.getValue().get(0); DevTemplateVo dto = new DevTemplateVo();
DevTemplateVo dto = new DevTemplateVo(); List<DevTemplateVo> devTemplateVos = entry.getValue();
List<DevTemplateVo> devTemplateVos = entry.getValue(); for (DevTemplateVo templateVo : devTemplateVos) {
for (DevTemplateVo templateVo : devTemplateVos) { dto.setIdentifyCode(StringUtils.isNotBlank(templateVo.getIdentifyCode()) ? templateVo.getIdentifyCode() : null);
dto.setIdentifyCode(StringUtils.isNotBlank(templateVo.getIdentifyCode()) ? templateVo.getIdentifyCode() : null); dto.setCheckMan(StringUtils.isNotBlank(templateVo.getCheckMan()) ? templateVo.getCheckMan() : null);
dto.setCheckMan(StringUtils.isNotBlank(templateVo.getCheckMan()) ? templateVo.getCheckMan() : null); dto.setCheckDate(StringUtils.isNotBlank(templateVo.getCheckDate()) ? templateVo.getCheckDate() : null);
dto.setCheckDate(StringUtils.isNotBlank(templateVo.getCheckDate()) ? templateVo.getCheckDate() : null); dto.setNextCheckDate(StringUtils.isNotBlank(templateVo.getNextCheckDate()) ? templateVo.getNextCheckDate() : null);
dto.setNextCheckDate(StringUtils.isNotBlank(templateVo.getNextCheckDate()) ? templateVo.getNextCheckDate() : null); dtoList.add(dto);
dtoList.add(dto);
}
devTemplateVo.setDtoList(dtoList);
templateVos.add(devTemplateVo);
} else {
DevTemplateVo devTemplateVo = entry.getValue().get(0);
templateVos.add(devTemplateVo);
} }
devTemplateVo.setDtoList(dtoList);
templateVos.add(devTemplateVo);
} }
} }
return AjaxResult.success(templateVos); return AjaxResult.success(templateVos);

BIN
bonus-modules/bonus-material-mall/src/main/resources/template/MaDevTemplate.xlsx
View File

Binary file not shown.