设备新增

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

@@ -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.InfoMotionDto;
 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.system.api.domain.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -250,7 +252,7 @@ public class DevInfoController extends BaseController {
     @ApiOperation(value = "设备批量导入模版下载")
     @PostMapping("/downLoadDev")
     public void downLoadDev() {
-        HttpServletResponse resp = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getResponse();
+        HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
         devInfoService.downLoadDev(resp);
     }
 

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

@@ -979,7 +979,6 @@ public class DevInfoServiceImpl implements DevInfoService {
                 Map<String, List<DevTemplateVo>> map = maDevList.stream().collect(Collectors.groupingBy(DevTemplateVo::getDeviceName));
                 for (Map.Entry<String, List<DevTemplateVo>> entry : map.entrySet()) {
                     // 如果map的数量大于1，则进行遍历
-                    if (entry.getValue().size() > 1) {
                     DevTemplateVo devTemplateVo = entry.getValue().get(0);
                     DevTemplateVo dto = new DevTemplateVo();
                     List<DevTemplateVo> devTemplateVos = entry.getValue();
@@ -992,10 +991,7 @@ public class DevInfoServiceImpl implements DevInfoService {
                     }
                     devTemplateVo.setDtoList(dtoList);
                     templateVos.add(devTemplateVo);
-                    } else {
-                        DevTemplateVo devTemplateVo = entry.getValue().get(0);
-                        templateVos.add(devTemplateVo);
-                    }
+
                 }
             }
             return AjaxResult.success(templateVos);