Merge remote-tracking branch 'origin/kgd' into kgd

amos-boot-biz-common/pom.xml

@@ -106,12 +106,12 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-annotation</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<!-- itext pdf相关 -->
 		<dependency>

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

 package com.yeejoin.equipmanage.common.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.equipmanage.common.entity.publics.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,24 +29,69 @@ public class Equipment extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @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 = "国别")
+    @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;
+
+
+    @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;
 
-    private String remark;
+
 
     @ApiModelProperty(value = "管理方式 单件还是批量管理模式，单件S，批量：P")
     private Long managementStyle;
@@ -62,8 +109,7 @@ public class Equipment extends BaseEntity {
     @TableField(exist = false)
     private Unit unit;
 
-    @ApiModelProperty(value = "生产源地 0国产1进口9其他")
-    private String madeIn;
+
 
     @ApiModelProperty(value = "生产厂家")
     private String manufacturer;

amos-boot-module/amos-boot-module-api/amos-boot-module-fas-api/pom.xml

@@ -26,17 +26,17 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-annotation</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>

amos-boot-module/amos-boot-module-api/amos-boot-module-latentdanger-api/pom.xml

@@ -25,17 +25,17 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-annotation</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>

amos-boot-module/amos-boot-module-api/amos-boot-module-maintenance-api/pom.xml

@@ -21,17 +21,17 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-annotation</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/pom.xml

@@ -25,17 +25,17 @@
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-base</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-web</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.afterturn</groupId>
 			<artifactId>easypoi-annotation</artifactId>
-			<version>3.0.3</version>
+			<version>4.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>

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

@@ -3,12 +3,15 @@ package com.yeejoin.equipmanage.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.dto.ImportantEquipmentListDTO;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentAppVO;
 import com.yeejoin.equipmanage.common.entity.vo.ImportantEquipmentVO;
 import com.yeejoin.equipmanage.common.enums.IndustryEnum;
 import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
+import com.yeejoin.equipmanage.common.utils.ExcelUtils;
+import com.yeejoin.equipmanage.common.utils.FileHelper;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.mapper.*;
@@ -16,11 +19,14 @@ import com.yeejoin.equipmanage.service.AbstractQRCodeFactory;
 import com.yeejoin.equipmanage.service.IEquipmentService;
 import com.yeejoin.equipmanage.service.IQRCodeService;
 import com.yeejoin.equipmanage.service.IUploadFileService;
+import com.yeejoin.equipmanage.service.impl.EquipmentDetailServiceImpl;
+import com.yeejoin.equipmanage.service.impl.EquipmentServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -29,10 +35,11 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 /**
- * 
+ *
  *
  * @author wujiang
  * @date 2020-07-07
@@ -48,6 +55,9 @@ public class EquipmentController extends AbstractBaseController {
 	private EquipmentMapper equipmentMapper;
 	@Autowired
 	private EquipmentDetailMapper equipmentDetailMapper;
+
+	@Autowired
+	private EquipmentServiceImpl equipmentService;
 	@Autowired
 	private CarMapper carMapper;
 	@Autowired
@@ -65,7 +75,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 新增
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/save", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
@@ -77,7 +87,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 根据id删除
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -105,7 +115,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 修改
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/updateById", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
@@ -118,7 +128,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 根据id查询
-	 * 
+	 *
 	 * @param id
 	 * @return
 	 */
@@ -139,7 +149,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 列表分页查询
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/list", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
@@ -157,7 +167,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 获取装备新能参数列表
-	 * 
+	 *
 	 */
 	@RequestMapping(value = "/queryPerfQuotaListByEquipId", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -174,7 +184,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 编辑指标项
-	 * 
+	 *
 	 */
 	@RequestMapping(value = "/performanceindexTemp", method = RequestMethod.PUT, produces = "application/json;charset=UTF-8")
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -323,9 +333,9 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * 导入数据接口
-	 * 
+	 *
 	 **/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST", value = "excel上传(<font color='blue'>release</font>)", notes = "上传excel同步数据库")
@@ -361,8 +371,8 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/*
-	 * 
-	 * 
+	 *
+	 *
 	 * 装备分类树
 	 **/
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -447,7 +457,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 获取子节点
-	 * 
+	 *
 	 * @param list
 	 * @param tmpMap
 	 */
@@ -533,10 +543,10 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/**
-	 * 
-	 * 
+	 *
+	 *
 	 * 获取子节点
-	 * 
+	 *
 	 **/
 	private List<CalculateUnitResponse> getUnitChildren(List<CalculateUnitResponse> list, String id) {
 		List<CalculateUnitResponse> temp = new ArrayList<>();
@@ -556,9 +566,9 @@ public class EquipmentController extends AbstractBaseController {
 	}
 
 	/***
-	 * 
+	 *
 	 * 返回结果封装
-	 * 
+	 *
 	 **/
 	public CalculateUnitResponse createCalculateUnitResponse(Unit instance) {
 
@@ -589,7 +599,7 @@ public class EquipmentController extends AbstractBaseController {
 
 	/**
 	 * 分类查询
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/list/{categoryId}", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
@@ -667,4 +677,39 @@ public class EquipmentController extends AbstractBaseController {
 	public List<Equipment> listAll() {
 		return iEquipmentService.getAll();
 	}
+
+	/**
+	 * 导出隐患清单
+	 */
+
+	/**
+	 * @ApiParam(value = "导出装备的数据") @RequestBody(required = false) List<EquipmentDate>  equipmentDate,
+	 *                                                                  @ApiParam(value = "是否全部导出" ) @RequestParam(required = false) boolean type,
+	 */
+	@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
+	@GetMapping(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();
+		String fileName = "装备清单" + new Date().getTime();
+		FileHelper.exportExcel(list, "装备清单", "装备清单", Equipment.class, fileName + ".xls", response);
+	}
+
 }

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

@@ -505,6 +505,7 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
         }
         getChildrenList(list, tmpMap);
         return list;
-    }
+
+}
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/pom.xml

@@ -78,7 +78,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-scratchpad</artifactId>
-			<version>3.15</version>
+			<version>4.0.0</version>
 		</dependency>
 
 		<dependency>