Skip to content

A
amos-boot-biz
Commit 4cdd66c8 authored by 任刚's avatar 任刚
Browse files
Options

添加部件信息导出功能

parent 7b23c939
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 235 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/dto/DetailssDTO.java
View file @ 4cdd66c8
......@@ -74,89 +74,4 @@ public class DetailssDTO extends BaseDTO<EquipmentDetail> {
@ApiModelProperty(value = "判断是否导出全部")
private Integer prop;
// @Excel(name = "id",orderNum ="0")
// @ApiModelProperty(value = "id")
// private Long id;
//
// @Excel(name = "部件名称",orderNum ="1")
// @TableField("name")
// @ApiModelProperty(value = "部件名称")
// private String name;
//
// @Excel(name = "部件编码",orderNum ="2")
// @TableField("eq_code")
// @ApiModelProperty(value = "部件编码")
// private String eqcode;
//
// @Excel(name = "部件型号",orderNum ="3")
// @TableField("standard")
// @ApiModelProperty(value = "部件型号")
// private String standard;
//
// @Excel(name = "存放位置",orderNum ="4")
// @TableField("area")
// @ApiModelProperty(value = "存放位置")
// private String area;
//
// @Excel(name = "生产厂家",orderNum ="5")
// @TableField("brand")
// @ApiModelProperty(value = "生产厂家")
// private String brand;
//
// @Excel(name = "出厂时间",orderNum ="6")
// @JsonFormat(pattern = "yyyy-MM-dd")
// @TableField("open_date")
// @ApiModelProperty(value = "出厂时间")
// private Date openDate;
//
// @Excel(name = "工作时间",orderNum ="7")
// @TableField("maintenance_cycle")
// @ApiModelProperty(value = "工作时间")
// private BigDecimal maintenanceCycle;
//
//
// @Excel(name = "所属单位",orderNum ="8")
// @TableField("remark")
// @ApiModelProperty(value = "所属单位")
// private String remark;
//
// @Excel(name = "入库时间",orderNum ="9")
// @JsonFormat(pattern = "yyyy-MM-dd")
// @TableField("join_date")
// @ApiModelProperty(value = "入库时间")
// private Date joinDate;
//
// @ApiModelProperty(value = "装备类型")
// private String type;
//
// @Excel(name = "物联编码",orderNum ="10")
// @ApiModelProperty(value = "物联编码")
// private String iotCode;
//
// @TableField("status")
// @ApiModelProperty(value="状态")
// @Excel(name = "状态",orderNum = "11")
// private String status;
//
// @TableField("reason")
// @ApiModelProperty(value = "原因分析")
// @Excel(name = "原因分析",orderNum = "12")
// private String reason;
//
// @TableField("measure")
// @ApiModelProperty(value = "处置措施")
// @Excel(name = "处置措施",orderNum = "13")
// private String measure;
//
// @Excel(name = "装备定义id",orderNum ="14")
// @TableField("equipment_id")
// @ApiModelProperty(value = "装备定义id")
// private Long equipmentId;
//
//
// @Excel(name = "装备定义名称",orderNum ="15")
// @TableField("equipment_name")
// @ApiModelProperty(value = "装备定义名称")
// private String equipmentName;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/DetailssAmountVO.java
View file @ 4cdd66c8
......@@ -17,55 +17,46 @@ import java.util.Date;
@Data
public class DetailssAmountVO {
@Excel(name = "id",orderNum ="0")
@ApiModelProperty(value = "id")
private Long id;
@Excel(name = "部件名称",orderNum ="1")
@TableField("name")
@ApiModelProperty(value = "部件名称")
private String name;
@Excel(name = "部件编码",orderNum ="2")
@TableField("eq_code")
@ApiModelProperty(value = "部件编码")
private String eqcode;
@Excel(name = "部件型号",orderNum ="3")
@TableField("standard")
@ApiModelProperty(value = "部件型号")
private String standard;
@Excel(name = "存放位置",orderNum ="4")
@TableField("area")
@ApiModelProperty(value = "存放位置")
private String area;
@Excel(name = "生产厂家",orderNum ="5")
@TableField("brand")
@ApiModelProperty(value = "生产厂家")
private String brand;
@Excel(name = "出厂时间",orderNum ="6")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("open_date")
@ApiModelProperty(value = "出厂时间")
private Date openDate;
@Excel(name = "工作时间",orderNum ="7")
@TableField("maintenance_cycle")
@ApiModelProperty(value = "工作时间")
private BigDecimal maintenanceCycle;
@Excel(name = "所属单位",orderNum ="8")
@TableField("remark")
@ApiModelProperty(value = "所属单位")
private String remark;
@Excel(name = "入库时间",orderNum ="9")
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField("join_date")
@ApiModelProperty(value = "入库时间")
private Date joinDate;
......@@ -76,29 +67,26 @@ public class DetailssAmountVO {
@ApiModelProperty(value = "物联编码")
private String iotCode;
@TableField("status")
@ApiModelProperty(value="状态")
@Excel(name = "状态",orderNum = "11")
private String status;
@TableField("reason")
@ApiModelProperty(value = "原因分析")
@Excel(name = "原因分析",orderNum = "12")
private String reason;
@TableField("measure")
@ApiModelProperty(value = "处置措施")
@Excel(name = "处置措施",orderNum = "13")
private String measure;
@Excel(name = "装备定义id",orderNum ="14")
@TableField("equipment_id")
@ApiModelProperty(value = "装备定义id")
private Long equipmentId;
@Excel(name = "装备定义名称",orderNum ="15")
@TableField("equipment_name")
@ApiModelProperty(value = "装备定义名称")
private String equipmentName;
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/EquipmentPar.java deleted 100644 → 0
View file @ 7b23c939
/**
* @Time: 2022/7/20 17:41
* @Author: 任刚
* @File：EquipmentPar.class
*/
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 {
@ExcelEntity
private 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
View file @ 4cdd66c8
......@@ -704,22 +704,5 @@ public class EquipmentController extends AbstractBaseController {
return iEquipmentService.getAll();
}
/**
* 导出隐患清单
*/
// @ApiOperation(value = "导出装备清单", notes = "导出装备清单")
// @PostMapping(value = "/export")
// @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
// public void exportDangerList(@ApiParam(value = "导出装备的数据") @RequestBody(required = false) List<EquipmentPar> equipmentPars,
// @ApiParam(value = "是否全部导出" ) @RequestParam boolean type,
// HttpServletResponse response) {
// String fileName = "装备清单" + new Date().getTime();
// 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);
// }
// }
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ 4cdd66c8
......@@ -4,27 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.page.PageParams;
import com.mchange.lang.LongUtils;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.dto.TopographyNodeDetailDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.entity.vo.EquipmentDetailDownloadVO;
import com.yeejoin.equipmanage.common.enums.ExcelEnums;
import com.yeejoin.equipmanage.common.utils.*;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import com.yeejoin.equipmanage.dto.ExcelDto;
import com.yeejoin.equipmanage.fegin.JcsFeign;
import com.yeejoin.equipmanage.mapper.*;
import com.yeejoin.equipmanage.service.*;
import com.yeejoin.equipmanage.service.impl.TopographyNodeDetailService;
import com.yeejoin.equipmanage.utils.ExcelUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.bytebuddy.asm.Advice;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -41,7 +34,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
......@@ -128,14 +120,6 @@ public class EquipmentDetailController extends AbstractBaseController {
public EquipmentDate saveEquipmentDetail(@RequestBody EquipmentDate equipmentDate) {
EquipmentSpecific vo = equipmentDate.getEquipmentSpecific();
// String sysCode = vo.getCode();
//
// if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
// int code = equipmentSpecificSerivce.count(new QueryWrapper<EquipmentSpecific>().eq("code", sysCode.trim()));
// if (code != 0 ) {
// throw new BadRequest("设备编码填写重复，请重新输入！");
// }
// }
EquipmentDetail de = equipmentDate.getEquipmentDetail();
String eqcode = de.getEqcode();
......@@ -166,31 +150,6 @@ public class EquipmentDetailController extends AbstractBaseController {
return equipmentDate;
}
@RequestMapping(value = "/saveEqu", method = RequestMethod.POST)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public EquipmentPar saveEquipments(@RequestBody EquipmentPar equipmentPar) {
EquipmentDetail vo = equipmentPar.getEquipmentDetail();
EquipmentParams params = equipmentPar.getEquipmentParams();
String sysCode = vo.getCode();
if (StringUtils.isNotEmpty(sysCode) && StringUtils.isNotEmpty(sysCode.trim())){
int code = iEquipmentDetailService.count(new QueryWrapper<EquipmentDetail>().eq("code", sysCode.trim()));
if (code != 0 ) {
// throw new BadRequest("设备编码填写重复，请重新输入！");
equipmentPar.getEquipmentDetail().setEquipmentName("设备编码填写重复，请重新输入！");
return equipmentPar;
}
}
params.setCode(equipmentPar.getEquipmentDetail().getCode());
iEquipmentDetailService.saveOne(vo);
iEquipmentParamsService.saveOne(params);
return equipmentPar;
}
/***
*
......@@ -638,20 +597,14 @@ public class EquipmentDetailController extends AbstractBaseController {
@ApiOperation(value = "导出装备清单", notes = "导出装备清单")
@PostMapping(value = "/export")
@TycloudOperation(ApiLevel = UserType.AGENCY)
public void exportDangerList(@RequestBody DetailssDTO detailssDTO, HttpServletResponse response) {
// DetailssDTO detailssDTO = new DetailssDTO();
// detailssDTO.setType("equipment");
public void exportDangerList(@RequestBody List<DetailssAmountVO> detailssAmountVO,@RequestParam Integer prop, HttpServletResponse response) {
String fileName = "装备清单" + new Date().getTime();
if(detailssDTO.getProp()==1){//全部导出
if(prop==1){//全部导出
List<DetailssAmountVO> getall = iEquipmentDetailService.getall();
// IPage<DetailssAmountVO> detailsssAmountList = fireFightingSystemService.getDetailsssAmountList(0, null, detailssDTO);
// List<DetailssAmountVO> records = detailsssAmountList.getRecords();
FileHelper.exportExcel(getall, "装备清单", "装备清单", EquipmentDate.class, fileName + ".xls", response);
FileHelper.exportExcel(getall, "装备清单", "装备清单", DetailssAmountVO.class, fileName + ".xls", response);
}
else {//仅仅导出筛选结果的数据
IPage<DetailssAmountVO> detailsssAmountList = fireFightingSystemService.getDetailsssAmountList(0, null, detailssDTO);
List<DetailssAmountVO> records = detailsssAmountList.getRecords();
FileHelper.exportExcel(records, "装备清单", "装备清单", EquipmentDate.class, fileName + ".xls", response);
FileHelper.exportExcel(detailssAmountVO, "装备清单", "装备清单", DetailssAmountVO.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
View file @ 4cdd66c8
......@@ -3,10 +3,8 @@ package com.yeejoin.equipmanage.mapper;
import java.util.List;
import com.yeejoin.equipmanage.common.entity.EquProperty;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -45,4 +43,6 @@ public interface EquipmentDetailMapper extends BaseMapper<EquipmentDetail> {
List<Long> getWareId(@Param("id") Long id);
List<DetailssAmountVO> getall();
boolean save(EquipmentDetail equipmentDetail);
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentDetailService.java
View file @ 4cdd66c8
......@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yeejoin.equipmanage.common.entity.EquProperty;
import com.yeejoin.equipmanage.common.entity.EquipmentDetail;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import java.util.List;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentDetailServiceImpl.java
View file @ 4cdd66c8
......@@ -5,16 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yeejoin.equipmanage.common.entity.*;
import com.yeejoin.equipmanage.common.entity.dto.DetailssDTO;
import com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO;
import com.yeejoin.equipmanage.common.enums.BillContentEnum;
import com.yeejoin.equipmanage.common.enums.FileTypeEnum;
import com.yeejoin.equipmanage.common.vo.EquipmentDate;
import com.yeejoin.equipmanage.common.vo.EquipmentPar;
import com.yeejoin.equipmanage.mapper.*;
import com.yeejoin.equipmanage.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.Bean;
......@@ -80,11 +76,8 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
@Override
public EquipmentDetail saveOne(EquipmentDetail equipmentDetail) {
// EquipmentCategory byId = equipmentCategoryService.getById(equipmentDetail.getCode());
// equipmentDetail.setCode(byId.getCode());
equipmentDetail.setEquipmentId(equipmentDetail.getEquipmentId());
this.save(equipmentDetail);
saveFile(equipmentDetail);
return equipmentDetail;
}
......@@ -120,8 +113,6 @@ public class EquipmentDetailServiceImpl extends ServiceImpl<EquipmentDetailMappe
Map<String, Object> map2 = new HashMap<>();
map2.put("code",equipmentDetail.getCode());
EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectByMap(map2).get(0);
// equipmentDetail.setCountry(equipmentCategory.getId());
// EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectById(equipment.getCategoryId());
equipment.setEquipmentCategory(equipmentCategory);
Unit unit = iUnitService.getById(equipment.getUnitId());
equipment.setUnit(unit);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/pom.xml
View file @ 4cdd66c8
......@@ -44,7 +44,7 @@
<dependency>
<groupId>e-iceblue</groupId>
<artifactId>spire.doc</artifactId>
<version>4.9.0</version>
<version>5.1.9</version>
</dependency>
<dependency>
<groupId>com.amosframework.boot</groupId>
......@@ -53,5 +53,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
</project>
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/pom.xml
View file @ 4cdd66c8
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>amos-boot-module-biz</artifactId>
......@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>4.0.0</version>
<version>3.15</version>
</dependency>
<dependency>
......
amos-boot-system-equip/src/main/resources/mapper/EquipmentDetailMapper.xml
View file @ 4cdd66c8
<?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">
<resultMap id="EquipmentDateMap" type="com.yeejoin.equipmanage.common.vo.EquipmentDate">
<association property="equipmentDetail" javaType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
<result column="name" property="name" />
<result column="eq_code" property="eqcode" />
<result column="remark" property="remark" />
<result column="manufacturer_cycle" property="manufacturerCycle"/>
<result column="standard" property="standard" />
<result column="brand" property="brand" />
<result column="join_date" property="joinDate" />
<result column="open_date" property="openDate" />
<result column="area" property="area" />
<result column="equipment_id" property="equipmentId" />
<result column="equipment_name" property="equipmentName" />
</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>
<association property="equipmentSpecific" javaType="com.yeejoin.equipmanage.common.entity.EquipmentSpecific">
<result column="iot_code" property="iotCode"/>
</association>
<resultMap id="DetailssAmountList" type="com.yeejoin.equipmanage.common.entity.vo.DetailssAmountVO">
<result column="id" property="id"></result>
<result column="standard" property="standard"></result>
<result column="brand" property="brand"></result>
<result column="name" property="name"></result>
<result column="area" property="area"></result>
<result property="type" column="type"></result>
<result column="remark" property="remark"></result>
<result column="eq_code" property="eqcode"></result>
<result column="maintenance_cycle" property="maintenanceCycle"></result>
<result column="join_date" property="joinDate"></result>
<result column="open_date" property="openDate"></result>
<result column="reason" property="reason"></result>
<result column="STATUS" property="status"></result>
<result column="measure" property="measure"></result>
<result column="iot_code" property="iotCode"></result>
<result column="equipment_id" property="equipmentId" />
<result column="equipment_name" property="equipmentName" />
</resultMap>
<select id="page"
resultType="com.yeejoin.equipmanage.common.entity.EquipmentDetail">
SELECT
......@@ -137,7 +134,7 @@
LIMIT #{offset},#{size}
</select>
<select id="getall" resultMap="EquipmentDateMap">
<select id="getall" resultMap="DetailssAmountList">
SELECT
wles.id,
wled.standard,
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 4cdd66c8
......@@ -7,7 +7,6 @@
<result property="code" column="code"></result>
<result property="categoryName" column="category_name"></result>
</resultMap>
<resultMap id="EquipCountBySystemId" type="com.yeejoin.equipmanage.common.entity.vo.EquipCountBySystemVO">
<result property="equipmentId" column="equipment_id"></result>
<result property="equipmentName" column="equipment_name"></result>
......@@ -48,7 +47,7 @@
<result column="reason" property="reason"></result>
<result column="STATUS" property="status"></result>
<result column="measure" property="measure"></result>
<result property="iotCode" column="iotCode"></result>
<result column="iot_code" property="iotCode"></result>
</resultMap>
<select id="getEquiplistBySystemId" resultMap="EquiplistBySystemId">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment