导出功能修改

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/Equipment.java

@@ -30,31 +30,25 @@ public class Equipment extends BaseEntity {
 
     @ApiModelProperty(value = "装备名称")
     @TableField("name")
-    @Excel(name = "装备名称", width = 20, orderNum = "1")
     private String name;
 
     @ApiModelProperty(value = "装备编码")
     @TableField("code")
-    @Excel(name = "装备编码", width = 20, orderNum = "2")
     private String code;
 
     @ApiModelProperty(value = "装备分类id")
     @TableField("category_id")
-    @Excel(name = "装备分类id", width = 20, orderNum = "3")
     private Long categoryId;
 
     @ApiModelProperty(value = "装备型号")
-    @Excel(name = "装备型号", width = 20, orderNum = "4")
     @TableField("country")
     private String country;
 
     @ApiModelProperty(value = "存放位置")
-    @Excel(name = "存放位置", width = 20, orderNum = "5")
     @TableField("area")
     private String area;
 
     @ApiModelProperty(value = "生产厂家")
-    @Excel(name = "生产厂家", width = 20, orderNum = "6")
     @TableField("made_in")
     private String madeIn;
 
@@ -62,37 +56,28 @@ public class Equipment extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("open_time")
     @ApiModelProperty(value = "出厂时间")
-    @Excel(name = "出厂时间", width = 20, orderNum = "7")
     private Date openTime;
 
 
     @ApiModelProperty(value = "工作时间")
-    @Excel(name = "工作时间", width = 20, orderNum = "8")
     @TableField("remark")
     private String remark;
 
     @ApiModelProperty(value = "所属单位")
     @TableField("company_name")
-    @Excel(name = "所属单位", width = 20, orderNum = "9")
     private String companyName;
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     @TableField("join_time")
     @ApiModelProperty(value = "入库时间")
-    @Excel(name = "入库时间", width = 20, orderNum = "10")
     private Date joinTime;
 
-
-
-
     @ApiModelProperty(value = "保养周期")
     private Short maintenanceCycle;
 
     @ApiModelProperty(value = "检查周期（天）")
     private Short checkCycle;
 
-
-
     @ApiModelProperty(value = "管理方式 单件还是批量管理模式，单件S，批量：P")
     private Long managementStyle;
 
@@ -109,8 +94,6 @@ public class Equipment extends BaseEntity {
     @TableField(exist = false)
     private Unit unit;
 
-
-
     @ApiModelProperty(value = "生产厂家")
     private String manufacturer;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentDetail.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -32,48 +33,57 @@ public class EquipmentDetail extends BaseEntity {
 
 	@TableField("name")
 	@ApiModelProperty(value = "名称")
+	@Excel(name = "名称", orderNum = "1")
 	private String name;
 
 	@TableField("code")
 	@ApiModelProperty(value = "编码")
+	@Excel(name = "编码", orderNum = "2")
 	private String code;
 
 
 	@TableField("remark")
 	@ApiModelProperty(value = "生产厂家")
+	@Excel(name = "生产厂家", orderNum = "3")
 	private String remark;
 
 	@TableField("manufacturer_id")
 	@ApiModelProperty(value = "所属分系统id")
+	@Excel(name = "所属分系统id", orderNum = "4")
 	private Long manufacturerId;
 
 	@TableField("maintenance_cycle")
 	@ApiModelProperty(value = "工作时间")
+	//@Excel(name = "工作时间", orderNum = "5")
 	private BigDecimal maintenanceCycle;
 
 	@TableField("standard")
 	@ApiModelProperty(value = "部件型号")
+	@Excel(name = "部件型号", orderNum = "6")
 	private String standard;
 
 	@TableField("brand")
 	@ApiModelProperty(value = "所属单位")
+	@Excel(name = "所属单位", orderNum = "7")
 	private String brand;
 
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("production_date")
 	@ApiModelProperty(value = "出厂日期")
+	//@Excel(name = "出厂日期", orderNum = "8")
 	private Date productionDate;
 
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@TableField("update_date")
 	@ApiModelProperty(value = "入库时间")
+//	@Excel(name = "入库时间", orderNum = "9")
 	private Date updateDate;
 
 	@TableField("area")
 	@ApiModelProperty(value = "存放位置")
+	@Excel(name = "存放位置", orderNum = "10")
 	private String area;
 
-
 	@TableField("agent")
 	@ApiModelProperty(value = "代理商")
 	private String agent;
@@ -96,12 +106,17 @@ public class EquipmentDetail extends BaseEntity {
 	private String categoryName;
 
 	@TableField(exist = false)
+	private String manufacturerName;
+
+	@TableField(exist = false)
 	private ManufacturerInfo manufacturerInfo;
 
 	@TableField("contract_code")
 	@ApiModelProperty(value = "合同编号")
 	private String contractCode;
 
+
+
 	@TableField("perf_quota_str")
 	@ApiModelProperty(value = "核心参数")
 	private String perfQuotaStr;
@@ -163,12 +178,4 @@ public class EquipmentDetail extends BaseEntity {
 	@TableField(exist = false)
 	private String unitName;
 
-	@TableField(exist = false)
-	private String manufacturerName;
-
-
-
-
-
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentParams.java

@@ -5,6 +5,7 @@
  */
 package com.yeejoin.equipmanage.common.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
@@ -25,14 +26,17 @@ public class EquipmentParams extends BaseEntity {
 
     @TableField("status")
     @ApiModelProperty(value="状态")
+    @Excel(name = "状态",orderNum = "11")
     private int status;
 
     @TableField("reason")
     @ApiModelProperty(value = "原因分析")
+    @Excel(name = "原因分析",orderNum = "12")
     private String reason;
 
     @TableField("measure")
     @ApiModelProperty(value = "处置措施")
+    @Excel(name = "处置措施",orderNum = "13")
     private String measure;
 
     @TableField("code")

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecific.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.common.entity;
 
 import java.util.Date;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentPar.java

@@ -5,33 +5,19 @@
  */
 package com.yeejoin.equipmanage.common.vo;
 
+import cn.afterturn.easypoi.excel.annotation.ExcelEntity;
 import com.yeejoin.equipmanage.common.entity.Equipment;
 import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
 import com.yeejoin.equipmanage.common.entity.EquipmentParams;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecific;
+import lombok.Data;
 
+@Data
 public class EquipmentPar {
-
-
-    private EquipmentParams equipmentParams;
-
+    @ExcelEntity
     private EquipmentDetail equipmentDetail;
 
-
-    public EquipmentParams getEquipmentParams() {
-        return equipmentParams;
-    }
-
-    public void setEquipmentParams(EquipmentParams equipmentParams) {
-        this.equipmentParams = equipmentParams;
-    }
-
-    public EquipmentDetail getEquipmentDetail() {
-        return equipmentDetail;
-    }
-
-    public void setEquipmentDetail(EquipmentDetail equipmentDetail) {
-        this.equipmentDetail = equipmentDetail;
-    }
+    @ExcelEntity
+    private EquipmentParams equipmentParams;
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentController.java

@@ -35,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import ucar.ma2.ArrayLong;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -62,9 +63,6 @@ public class EquipmentController extends AbstractBaseController {
 	private EquipmentMapper equipmentMapper;
 	@Autowired
 	private EquipmentDetailMapper equipmentDetailMapper;
-
-	@Autowired
-	private EquipmentServiceImpl equipmentService;
 	@Autowired
 	private CarMapper carMapper;
 	@Autowired
@@ -710,34 +708,39 @@ public class EquipmentController extends AbstractBaseController {
 	 * 导出隐患清单
 	 */
 
-	/**
-	 * @ApiParam(value = "导出装备的数据") @RequestBody(required = false) List<EquipmentDate>  equipmentDate,
-	 *                                                                  @ApiParam(value = "是否全部导出" ) @RequestParam(required = false) boolean type,
-	 */
 	@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
-	@GetMapping(value = "/export")
+	@PostMapping(value = "/export")
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	public void exportDangerList(HttpServletResponse response) {
-	/*	AgencyUserModel user = getUserInfo();
-		if (ObjectUtils.isEmpty(user)) {
-			throw new RuntimeException("用户session过期");
-		}*/
-//		pageParam.setPageSize(Integer.MAX_VALUE);
-//		List<DangerListResponse> list = iLatentDangerService.export(pageParam);
-
-		/*List<TestEntity> testEntities = new ArrayList<>();
-	TestEntity testEntity = new TestEntity();
-		testEntity.setName("1111");
-		testEntity.setSex("222");
-		testEntities.add(testEntity);
-
-		TestEntity testEntity2 = new TestEntity();
-		testEntity2.setName("1111");
-		testEntity2.setSex("2222");
-		testEntities.add(testEntity2);*/
-		List<Equipment> list = equipmentService.list();
+	public void exportDangerList(@ApiParam(value = "导出装备的数据") @RequestBody(required = false) List<EquipmentPar>  equipmentPars,
+								 @ApiParam(value = "是否全部导出" ) @RequestParam boolean type,
+								 HttpServletResponse response) {
 		String fileName = "装备清单" + new Date().getTime();
-		FileHelper.exportExcel(list, "装备清单", "装备清单", Equipment.class, fileName + ".xls", response);
+		if(type==true){//全部导出
+			List<EquipmentPar> equpar = equipmentDetailMapper.equpar();
+			FileHelper.exportExcel(equpar, "装备清单", "装备清单", EquipmentPar.class, fileName + ".xls", response);
+		}else {//仅仅导出筛选结果的数据
+			FileHelper.exportExcel(equipmentPars, "装备清单", "装备清单", Equipment.class, fileName + ".xls", response);
+		}
 	}
 
+
+	@ApiOperation(value = "测试", notes = "测试")
+	@GetMapping(value = "/export1111")
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	public void exportDangerList(HttpServletResponse response) {
+		String fileName = "装备清单" + new Date().getTime();
+		ArrayList<Test01> list = new ArrayList<>();
+		Test01 test01 = new Test01();
+		Test02 test02 = new Test02();
+		Test03 test03 = new Test03();
+		test02.setName("tjk");
+		test02.setAge("100岁");
+		test03.setGread("100");
+		test03.setHigh("150cm");
+		test01.setTest02(test02);
+		test01.setTest03(test03);
+		list.add(test01);
+		FileHelper.exportExcel(list, "装备清单", "装备清单", Test01.class, fileName + ".xls", response);
+
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentDetailMapper.java

@@ -31,7 +31,7 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
 	int countCategory(@Param("offset") long offset, @Param("size") long size,
 			@Param("list") List<EquipmentCategory> list);
 
-	EquipmentPar equpar();
+	List<EquipmentPar> equpar();
 
 	int quotaUpdate(EquProperty e);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentDetailService.java

@@ -35,5 +35,5 @@ public interface IEquipmentDetailService extends IService<EquipmentDetail> {
 
 	String checkDelete( List<Long> ids);
 
-	EquipmentPar getEqur();
+	List<EquipmentPar> getEqur();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java

@@ -259,7 +259,7 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
 
 
     @Override
-    public EquipmentPar getEqur() {
+    public List<EquipmentPar> getEqur() {
         return equipmentDetailMapper.equpar();
     }
 

amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper
-	namespace="com.yeejoin.equipmanage.mapper.EquipmentDetailMapper">
+<mapper namespace="com.yeejoin.equipmanage.mapper.EquipmentDetailMapper">
+	<resultMap id="EquipmentDetailMap" type="com.yeejoin.equipmanage.common.vo.EquipmentPar">
+		<association property="equipmentDetail" javaType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
+			<result column="name" property="name" />
+			<result column="code" property="code" />
+			<result column="remark" property="remark" />
+			<result column="manufacturer_id" property="manufacturerId" />
+			<result column="supplier_id" property="supplierId" />
+			<result column="standard" property="standard" />
+			<result column="brand" property="brand" />
+			<result column="production_date" property="productionDate" />
+			<result column="update_date" property="updateDate" />
+			<result column="create_date" property="createDate" />
+			<result column="area" property="area" />
+		</association>
+		<association property="equipmentParams" javaType="com.yeejoin.equipmanage.common.entity.EquipmentParams">
+			<result column="status" property="status"/>
+			<result column="reason" property="reason"/>
+			<result column="measure" property="measure"/>
+		</association>
+	</resultMap>
 
 	<select id="page"
 			resultType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
@@ -49,7 +68,7 @@
 		LIMIT #{offset},#{size}
 	</select>
 
-	<select id="equpar" resultType="com.yeejoin.equipmanage.common.vo.EquipmentPar">
+	<select id="equpar" resultMap="EquipmentDetailMap">
 	SELECT
 	wled.name,
 	wled.code,