Skip to content

A
amos-boot-biz
Commit e79c3235 authored by suhuiguang's avatar suhuiguang
Browse files
Options

Merge branch 'develop_dl_plan6_temp' into main

parents 2e42bd70 4d7aa03a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 256 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/StockDetail.java
View file @ e79c3235
...@@ -24,7 +24,7 @@ import java.util.Date; ...@@ -24,7 +24,7 @@ import java.util.Date;
@Accessors(chain = true) @Accessors(chain = true)
@TableName("wl_stock_detail") @TableName("wl_stock_detail")
@ApiModel(value = "StockDetail对象", description = "库存明细") @ApiModel(value = "StockDetail对象", description = "库存明细")
public class StockDetail extends BaseEntity implements Cloneable { public class StockDetail extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -90,14 +90,4 @@ public class StockDetail extends BaseEntity implements Cloneable { ...@@ -90,14 +90,4 @@ public class StockDetail extends BaseEntity implements Cloneable {
@ApiModelProperty(value = "位置信息") @ApiModelProperty(value = "位置信息")
private String area; private String area;
@Override
public StockDetail clone() {
try {
return (StockDetail) super.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return null;
}
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/enums/PressurePumpRelateEnum.java
View file @ e79c3235
...@@ -22,8 +22,9 @@ public enum PressurePumpRelateEnum { ...@@ -22,8 +22,9 @@ public enum PressurePumpRelateEnum {
PRESSURE_PUMP_START_BEFORE_MINUTE("-5", "稳压泵启泵前分钟数"), PRESSURE_PUMP_START_BEFORE_MINUTE("-5", "稳压泵启泵前分钟数"),
PIPE_PRESSURE_NORMAL_STATUS("正常", "稳压泵管网压力正常状态"), PIPE_PRESSURE_NORMAL_STATUS("正常", "稳压泵管网压力正常状态"),
PIPE_PRESSURE_ABNORMAL_STATUS("异常", "稳压泵管网压力异常状态"), PIPE_PRESSURE_ABNORMAL_STATUS("异常", "稳压泵管网压力异常状态"),
START("1", "稳压泵启动"), START("1", "启动"),
STOP("0", "稳压泵停止"), STOP("0", "停止"),
RESET("2", "复位"),
CREATED_TIME("createdTime", "物联采集信号创建时间属性"), CREATED_TIME("createdTime", "物联采集信号创建时间属性"),
UN_CLEAN_TIME("false", "未消除"); UN_CLEAN_TIME("false", "未消除");
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/ChartsUtils.java
View file @ e79c3235
...@@ -23,12 +23,8 @@ import java.awt.image.BufferedImage; ...@@ -23,12 +23,8 @@ import java.awt.image.BufferedImage;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Base64;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.*;
import java.util.Set;
/** /**
* @author lisong * @author lisong
...@@ -76,6 +72,14 @@ public class ChartsUtils { ...@@ -76,6 +72,14 @@ public class ChartsUtils {
fis.close(); fis.close();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally {
if (fis != null) {
try {
fis.close();
} catch (IOException e) {
e.printStackTrace();
}
}
} }
return fileBytes; return fileBytes;
} }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/ExcelUtil.java
View file @ e79c3235
package com.yeejoin.equipmanage.common.utils; package com.yeejoin.equipmanage.common.utils;
import java.io.File; import org.apache.poi.hssf.usermodel.*;
import java.io.FileInputStream; import org.apache.poi.ss.usermodel.*;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFFont;
import org.apache.poi.hssf.usermodel.HSSFRichTextString;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.VerticalAlignment;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFCell; import org.apache.poi.xssf.streaming.SXSSFCell;
import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.streaming.SXSSFRow;
...@@ -36,6 +9,12 @@ import org.apache.poi.xssf.streaming.SXSSFSheet; ...@@ -36,6 +9,12 @@ import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/** /**
* *
...@@ -105,22 +84,16 @@ public class ExcelUtil ...@@ -105,22 +84,16 @@ public class ExcelUtil
} }
return workbook; return workbook;
} }
public static void createXSSFExcel(String path, String fileName, List<String> headers, List<List<String>> dataList) { public static void createXSSFExcel(String path, String fileName, List<String> headers, List<List<String>> dataList) {
try { File file = new File(path + "\\" + fileName);
File file = new File(path); if (!file.isDirectory()) {
if (!file.isDirectory()) { file.mkdirs();
file.mkdirs(); }
} try (FileInputStream inputStream = new FileInputStream(file);
FileOutputStream out = new FileOutputStream(file);
file = new File(path + "\\" + fileName); XSSFWorkbook workbook = file.exists() ? new XSSFWorkbook(inputStream) : new XSSFWorkbook();
XSSFWorkbook workbook; SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook(workbook, 2000)) {
if (!file.exists()) {
workbook = new XSSFWorkbook();
} else {
workbook = new XSSFWorkbook(new FileInputStream(file));
}
SXSSFWorkbook sxssfWorkbook = new SXSSFWorkbook(workbook, 2000);
int sheetNum = sxssfWorkbook.getNumberOfSheets(); int sheetNum = sxssfWorkbook.getNumberOfSheets();
if (sheetNum == 0) { if (sheetNum == 0) {
sxssfWorkbook.createSheet(); sxssfWorkbook.createSheet();
...@@ -150,16 +123,13 @@ public class ExcelUtil ...@@ -150,16 +123,13 @@ public class ExcelUtil
} }
fillExcelContent(sheet, sheet.getLastRowNum(), dataList); fillExcelContent(sheet, sheet.getLastRowNum(), dataList);
} }
FileOutputStream out = new FileOutputStream(file);
sxssfWorkbook.write(out); sxssfWorkbook.write(out);
out.close();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public static void fillExcelContent(SXSSFSheet sheet, int lastRowNum, List<List<String>> dataList) { public static void fillExcelContent(SXSSFSheet sheet, int lastRowNum, List<List<String>> dataList) {
for (int i = 0; i < dataList.size(); i++) { for (int i = 0; i < dataList.size(); i++) {
SXSSFRow row = sheet.createRow(lastRowNum + i + 1); SXSSFRow row = sheet.createRow(lastRowNum + i + 1);
...@@ -217,14 +187,14 @@ public class ExcelUtil ...@@ -217,14 +187,14 @@ public class ExcelUtil
public static void exportXlSXExcel( public static void exportXlSXExcel(
HttpServletResponse response, File file, String fileName) HttpServletResponse response, File file, String fileName)
{ {
try OutputStream output = null;
try (FileInputStream inputStream = new FileInputStream(file))
{ {
String name = new String(fileName.getBytes("UTF-8"), "ISO8859_1"); String name = new String(fileName.getBytes("UTF-8"), "ISO8859_1");
OutputStream output = response.getOutputStream(); output = response.getOutputStream();
response.setHeader("Content-disposition", response.setHeader("Content-disposition",
"attachment; filename=" + name); "attachment; filename=" + name);
response.setContentType("application/vnd.ms-excel;charset=utf-8"); response.setContentType("application/vnd.ms-excel;charset=utf-8");
FileInputStream inputStream = new FileInputStream(file);
int b = 0; int b = 0;
byte[] buffer = new byte[1024*10]; byte[] buffer = new byte[1024*10];
while (b != -1){ while (b != -1){
...@@ -232,14 +202,21 @@ public class ExcelUtil ...@@ -232,14 +202,21 @@ public class ExcelUtil
if (-1 != b) { if (-1 != b) {
output.write(buffer, 0, b); output.write(buffer, 0, b);
} }
} }
inputStream.close();
output.flush(); output.flush();
output.close(); output.close();
} }
catch (IOException e) catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} finally {
try {
if (output != null) {
output.close();
}
} catch (IOException e) {
e.printStackTrace();
}
} }
} }
...@@ -517,11 +494,17 @@ public class ExcelUtil ...@@ -517,11 +494,17 @@ public class ExcelUtil
cell.setCellStyle(style2); cell.setCellStyle(style2);
} }
} }
return workbook;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null; return null;
} finally {
try {
workbook.close();
} catch (IOException e) {
e.printStackTrace();
}
} }
return workbook;
} }
/** /**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/FileUtil.java
View file @ e79c3235
...@@ -31,10 +31,19 @@ public class FileUtil { ...@@ -31,10 +31,19 @@ public class FileUtil {
if (!targetFile.exists()) { if (!targetFile.exists()) {
targetFile.mkdirs(); targetFile.mkdirs();
} }
FileOutputStream out = new FileOutputStream(filePath + fileName); FileOutputStream out = null;
out.write(file); try {
out.flush(); out = new FileOutputStream(filePath + fileName);
out.close(); out.write(file);
out.flush();
out.close();
} catch (Exception e) {
e.printStackTrace();
} finally {
if (null != out) {
out.close();
}
}
} }
/** /**
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/TikaUtils.java
View file @ e79c3235
...@@ -34,8 +34,9 @@ public class TikaUtils { ...@@ -34,8 +34,9 @@ public class TikaUtils {
public static String fileToTxt(File file) { public static String fileToTxt(File file) {
Parser parser = new AutoDetectParser(); Parser parser = new AutoDetectParser();
InputStream inputStream = null;
try { try {
InputStream inputStream = new FileInputStream(file); inputStream = new FileInputStream(file);
DefaultHandler handler = new BodyContentHandler(); DefaultHandler handler = new BodyContentHandler();
Metadata metadata = new Metadata(); Metadata metadata = new Metadata();
ParseContext parseContext = new ParseContext(); ParseContext parseContext = new ParseContext();
...@@ -49,6 +50,14 @@ public class TikaUtils { ...@@ -49,6 +50,14 @@ public class TikaUtils {
return handler.toString(); return handler.toString();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally {
try {
if (null != inputStream) {
inputStream.close();
}
} catch (IOException e) {
e.printStackTrace();
}
} }
return null; return null;
} }
...@@ -73,7 +82,7 @@ public class TikaUtils { ...@@ -73,7 +82,7 @@ public class TikaUtils {
} }
return null; return "";
} }
......
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/WordTemplateUtils.java
View file @ e79c3235
...@@ -202,6 +202,12 @@ public class WordTemplateUtils { ...@@ -202,6 +202,12 @@ public class WordTemplateUtils {
in.close(); in.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} finally {
try {
in.close();
} catch (IOException e) {
e.printStackTrace();
}
} }
BASE64Encoder encoder = new BASE64Encoder(); BASE64Encoder encoder = new BASE64Encoder();
return encoder.encode(data); return encoder.encode(data);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/CarServiceImpl.java
View file @ e79c3235
...@@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -38,6 +38,7 @@ import org.apache.commons.lang3.StringUtils;
import org.gavaghan.geodesy.Ellipsoid; import org.gavaghan.geodesy.Ellipsoid;
import org.gavaghan.geodesy.GeodeticCalculator; import org.gavaghan.geodesy.GeodeticCalculator;
import org.gavaghan.geodesy.GlobalCoordinates; import org.gavaghan.geodesy.GlobalCoordinates;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
...@@ -486,12 +487,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS ...@@ -486,12 +487,13 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
stockDetailMapper.updateById(stockDetail); stockDetailMapper.updateById(stockDetail);
addStockDetailId(stockDetail.getId()); addStockDetailId(stockDetail.getId());
StockDetail stockDetail_clone = stockDetail.clone(); StockDetail stockDetailClone = new StockDetail();
stockDetail_clone.setId(null); BeanUtils.copyProperties(stockDetail, stockDetailClone);
stockDetail_clone.setAmount(lossCount); stockDetailClone.setId(null);
stockDetail_clone.setStatus(EquipStatusEnum.LOSS.getCode().toString()); stockDetailClone.setAmount(lossCount);
stockDetailMapper.insert(stockDetail_clone); stockDetailClone.setStatus(EquipStatusEnum.LOSS.getCode().toString());
addStockDetailId(stockDetail_clone.getId()); stockDetailMapper.insert(stockDetailClone);
addStockDetailId(stockDetailClone.getId());
Stock stock = stockMapper.selectById(stockDetail.getStockId()); Stock stock = stockMapper.selectById(stockDetail.getStockId());
stock.setAmount(stock.getAmount() - lossCount); stock.setAmount(stock.getAmount() - lossCount);
stockMapper.updateById(stock); stockMapper.updateById(stock);
...@@ -501,10 +503,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS ...@@ -501,10 +503,10 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
// 损耗清单详情 // 损耗清单详情
WastageBillDetail detail = new WastageBillDetail(); WastageBillDetail detail = new WastageBillDetail();
detail.setAmount(BigDecimal.valueOf(lossCount)); detail.setAmount(BigDecimal.valueOf(lossCount));
detail.setStockDetailId(stockDetail_clone.getId()); detail.setStockDetailId(stockDetailClone.getId());
detail.setWastageBillId(bill.getId()); detail.setWastageBillId(bill.getId());
wastageBillDetailMapper.insert(detail); wastageBillDetailMapper.insert(detail);
journalMapper.insert(createJournal(ex, stockDetail_clone.getId(), lossCount)); journalMapper.insert(createJournal(ex, stockDetailClone.getId(), lossCount));
return 0d; return 0d;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -604,7 +606,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS ...@@ -604,7 +606,7 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
List<SystemDic> listd = systemDicMapper.selectByMap(columnMap); List<SystemDic> listd = systemDicMapper.selectByMap(columnMap);
p.setLossStateId(listd.get(0).getId()); p.setLossStateId(listd.get(0).getId());
}); });
lossHandlers.add(p -> this.loss(p)); lossHandlers.add(this::loss);
// 同步搜索 // 同步搜索
/* /*
...@@ -624,21 +626,21 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS ...@@ -624,21 +626,21 @@ public class CarServiceImpl extends ServiceImpl<CarMapper, Car> implements ICarS
stockDetailMapper.updateById(detail); stockDetailMapper.updateById(detail);
params.addStockDetailId(r.getStockDetailId()); params.addStockDetailId(r.getStockDetailId());
StockDetail detail_onCar = null; StockDetail detailOnCar = new StockDetail();
BeanUtils.copyProperties(detail, detailOnCar);
// 新增车载记录 // 新增车载记录
detail_onCar = detail.clone(); // detail_onCar = detail.clone();
detail_onCar.setId(null); detailOnCar.setId(null);
detail_onCar.setAmount(r.getAmount()); detailOnCar.setAmount(r.getAmount());
detail_onCar.setStatus(EquipStatusEnum.ONCAR.getCode().toString()); detailOnCar.setStatus(EquipStatusEnum.ONCAR.getCode().toString());
stockDetailMapper.insert(detail_onCar); stockDetailMapper.insert(detailOnCar);
params.addStockDetailId(detail_onCar.getId()); params.addStockDetailId(detailOnCar.getId());
// 装车 // 装车
extinguishantOnCarMapper.insert(params.create(r, detail_onCar)); extinguishantOnCarMapper.insert(params.create(r, detailOnCar));
// 流水 // 流水
journalMapper.insert(params.createJournal(r, detail_onCar.getId())); journalMapper.insert(params.createJournal(r, detailOnCar.getId()));
}); });
} catch (Exception e) { } catch (Exception e) {
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SupervisionVideoServiceImpl.java
View file @ e79c3235
...@@ -144,8 +144,12 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap ...@@ -144,8 +144,12 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
time = false; time = false;
} }
} }
if(PressurePumpRelateEnum.START.getDesc().contains(stateMap.get("equipment_index_name")) && PressurePumpRelateEnum.IOT_INDEX_VALUE_FALSE.getValue().contains(stateMap.get("value"))){ if(PressurePumpRelateEnum.IOT_INDEX_VALUE_FALSE.getValue().contains(stateMap.get("value"))){
item.put("equipment_index_name", PressurePumpRelateEnum.STOP.getDesc()); if(PressurePumpRelateEnum.START.getDesc().contains(stateMap.get("equipment_index_name"))){
item.put("equipment_index_name", PressurePumpRelateEnum.STOP.getDesc());
} else {
item.put("equipment_index_name", PressurePumpRelateEnum.RESET.getDesc());
}
} else { } else {
item.put("equipment_index_name", stateMap.get("equipment_index_name")); item.put("equipment_index_name", stateMap.get("equipment_index_name"));
} }
......
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ e79c3235
...@@ -2832,41 +2832,19 @@ ...@@ -2832,41 +2832,19 @@
</select> </select>
<select id="queryPressureNowSignalBySpecificId" resultType="java.util.Map"> <select id="queryPressureNowSignalBySpecificId" resultType="java.util.Map">
( SELECT
DATE_FORMAT( i.update_date, '%Y-%m-%d %H:%i:%S' ) update_date,
i.equipment_index_name,
`value`
FROM
wl_equipment_specific_index i
WHERE
i.equipment_specific_id = #{id,jdbcType=VARCHAR}
AND
VALUE = "true"
AND i.equipment_index_key NOT IN ( 'FHS_PressurePump_Start', 'FHS_PressurePump_Stop' )
ORDER BY
i.update_date DESC
LIMIT 1
) UNION
(
SELECT SELECT
DATE_FORMAT( i.update_date, '%Y-%m-%d %H:%i:%S' ) update_date, DATE_FORMAT( i.update_date, '%Y-%m-%d %H:%i:%S' ) update_date,
i.equipment_index_name, i.equipment_index_name,
VALUE `value`
FROM FROM
wl_equipment_specific_index i wl_equipment_specific_index i
WHERE WHERE
i.equipment_specific_id = #{id,jdbcType=VARCHAR} i.equipment_specific_id = #{id,jdbcType=VARCHAR}
AND AND
VALUE VALUE in ("true","false")
<![CDATA[<>]]> ''
AND
VALUE
IS NOT NULL
AND i.equipment_index_key = 'FHS_PressurePump_Start'
)
ORDER BY ORDER BY
update_date DESC i.update_date DESC
LIMIT 1 LIMIT 1
</select> </select>
<select id="getPressurePumpInfo3Small" resultType="java.util.Map"> <select id="getPressurePumpInfo3Small" resultType="java.util.Map">
......
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