diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java index 7bf33ca1..b589974a 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/controller/DeviceManagerController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; +import com.nu.modules.manager.entity.DeviceManagerHz; import com.nu.modules.manager.service.IDeviceManagerService; import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tq.electricity.entity.ElectricityMeter; @@ -177,49 +178,33 @@ public class DeviceManagerController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(DeviceManager, request.getParameterMap()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - queryWrapper.in("id",selectionList); - } - // Step.2 获取导出数据 - List exportList = service.list(queryWrapper); - - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.FILE_NAME, "物联设备清单"); - mv.addObject(NormalExcelConstants.CLASS, DeviceManager.class); - //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- - ExportParams exportParams=new ExportParams("物联设备清单", "导出人:" + sysUser.getRealname(), "物联设备清单"); - exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); - //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - - Map result = new HashMap<>(); - for (DeviceManager device : exportList) { - String name = device.getDeviceName(); - result.put(name, result.getOrDefault(name, 0) + 1); - } - - for (Map.Entry entry : result.entrySet()) { - String deviceName = entry.getKey(); - Integer count = entry.getValue(); - DeviceManager dm = new DeviceManager(); - dm.setDeviceName(deviceName + ", 数量: " + count); - exportList.add(dm); - } - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - return mv; -// return super.exportXls(request, DeviceManager, DeviceManager.class, "物联设备清单"); + return super.exportXls(request, DeviceManager, DeviceManager.class, "物联设备清单"); } + /** + * 导出excel + * + * @param request + * @param deviceManager + */ + @RequestMapping(value = "/exportDeviceHzExcel") + public ModelAndView exportDeviceHzExcel(HttpServletRequest request, DeviceManagerHz deviceManager) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + List exportList = service.exportDeviceHzExcel(deviceManager); + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "物联设备清单汇总"); + mv.addObject(NormalExcelConstants.CLASS, DeviceManagerHz.class); + //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- + ExportParams exportParams=new ExportParams("物联设备清单汇总", "导出人:" + sysUser.getRealname(), "物联设备清单汇总"); + exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); + //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- + mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + return mv; + } + /** * 通过excel导入数据 * diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java index 00abb133..a96c609f 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManager.java @@ -26,6 +26,7 @@ public class DeviceManager implements Serializable { private String nuId; @TableField(exist = false) private String nuName; + @Excel(name = "批次", width = 15) private String batchNo;//批次号 @Excel(name = "设备名称", width = 15) private String deviceName; diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManagerHz.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManagerHz.java new file mode 100644 index 00000000..fa8e5928 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/entity/DeviceManagerHz.java @@ -0,0 +1,58 @@ +package com.nu.modules.manager.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("nu_iot_device_preview") +public class DeviceManagerHz implements Serializable { + + private static final long serialVersionUID = 1L; + /**ID*/ + @TableId(type = IdType.AUTO) + @ApiModelProperty(value = "ID") + private Integer id; + private String nuId; + @TableField(exist = false) + private String nuName; + @Excel(name = "批次", width = 15) + private String batchNo;//批次号 + @Excel(name = "设备名称", width = 15) + private String deviceName; + @Excel(name = "设备类型", width = 15, dicCode = "tplink_device_type") + @Dict(dicCode = "tplink_device_type") + private String deviceType; + @Excel(name = "规格型号", width = 15) + private String deviceModel; + @Excel(name = "生产厂家", width = 15) + private String factory; + @Excel(name = "设备维度", width = 15) + private String dimension; + private String sn; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + private String remarks; + @TableField(exist = false) + private String onlineStatus;//在线状态 + private String deviceStatus;//设备状态 + private Integer ywId;//运维ID + @TableField(exist = false) + @Excel(name = "数量", width = 15) + private Integer hz; + +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java index f78b4b4a..4451bde3 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/DeviceManagerMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.manager.entity.DeviceBindLog; import com.nu.modules.manager.entity.DeviceManager; +import com.nu.modules.manager.entity.DeviceManagerHz; import com.nu.modules.tplink.camera.entity.CameraInfo; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import com.nu.modules.tq.water.entity.WaterMeter; @@ -26,6 +27,7 @@ public interface DeviceManagerMapper extends BaseMapper { IPage findBingLogPage(Page page, @Param("params") DeviceBindLog deviceBindLog); void addLog(DeviceBindLog deviceBindLog); List queryNuList(DeviceManager deviceManager); + List exportDeviceHzExcel(DeviceManagerHz deviceManager); List cameraInfoList(DeviceManager deviceManager); IPage findCameraInfoUnbindPage(Page page, @Param("params") DeviceManager deviceManager); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml index f6c38450..39f126ae 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/manager/mapper/xml/DeviceManagerMapper.xml @@ -5,6 +5,7 @@ + +