Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

暂降事件

Browse Source
This commit is contained in:
huangzj
2023-09-11 09:02:49 +08:00
parent c92559316b
commit 38019f4f1f
17 changed files with 664 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLedgerFeignClient.java
View File

@@ -33,6 +33,5 @@ public interface CsLedgerFeignClient {
HttpResult<List<CsLedger>> queryLine(@RequestBody @Validated LineParamDTO lineParamdto);
@PostMapping("/queryDevDetail")
HttpResult<DevDetailDTO> queryDevDetail(@RequestParam("devId") String devId);
}

70
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java
View File

@@ -64,36 +64,36 @@ public class CsEquipmentDeliveryAddParm{
@NotBlank(message="装置程序版本不能为空！")
private String programVersion;
/**
* 调试人员
*/
@ApiModelProperty(value="调试人员")
@NotBlank(message="调试人员不能为空！")
private String debugPerson;
/**
* 出厂日期
*/
@ApiModelProperty(value="出厂日期")
@NotNull(message="出厂日期不能为空！")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date producteTime;
/**
* 检修日期
*/
@ApiModelProperty(value="检修日期")
@NotNull(message="检修日期不能为空！")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date checkTime;
/**
* 调试日期
*/
@ApiModelProperty(value="调试日期")
@NotNull(message="调试日期不能为空！")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date debugTime;
// /**
// * 调试人员
// */
// @ApiModelProperty(value="调试人员")
// @NotBlank(message="调试人员不能为空！")
// private String debugPerson;
//
// /**
// * 出厂日期
// */
// @ApiModelProperty(value="出厂日期")
// @NotNull(message="出厂日期不能为空！")
// @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
// private Date producteTime;
//
// /**
// * 检修日期
// */
// @ApiModelProperty(value="检修日期")
// @NotNull(message="检修日期不能为空！")
// @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
// private Date checkTime;
//
// /**
// * 调试日期
// */
// @ApiModelProperty(value="调试日期")
// @NotNull(message="调试日期不能为空！")
// @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
// private Date debugTime;
/**
* 合同号
@@ -101,11 +101,11 @@ public class CsEquipmentDeliveryAddParm{
@ApiModelProperty(value="合同号")
private String cntractNo;
/**
* 营销经理
*/
@ApiModelProperty(value="营销经理")
private String salesManager;
// /**
// * 营销经理
// */
// @ApiModelProperty(value="营销经理")
// private String salesManager;
/**
* 装置接入方式

62
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java
View File

@@ -66,32 +66,32 @@ public class CsEquipmentDeliveryAuditParm {
@ApiModelProperty(value="装置程序版本")
private String programVersion;
/**
* 调试人员
*/
@ApiModelProperty(value="调试人员")
private String debugPerson;
/**
* 出厂日期
*/
@ApiModelProperty(value="出厂日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date producteTime;
/**
* 检修日期
*/
@ApiModelProperty(value="检修日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date checkTime;
/**
* 调试日期
*/
@ApiModelProperty(value="调试日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date debugTime;
// /**
// * 调试人员
// */
// @ApiModelProperty(value="调试人员")
// private String debugPerson;
//
// /**
// * 出厂日期
// */
// @ApiModelProperty(value="出厂日期")
// @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
// private Date producteTime;
//
// /**
// * 检修日期
// */
// @ApiModelProperty(value="检修日期")
// @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
// private Date checkTime;
//
// /**
// * 调试日期
// */
// @ApiModelProperty(value="调试日期")
// @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
// private Date debugTime;
/**
* 合同号
@@ -99,11 +99,11 @@ public class CsEquipmentDeliveryAuditParm {
@ApiModelProperty(value="合同号")
private String cntractNo;
/**
* 营销经理
*/
@ApiModelProperty(value="营销经理")
private String salesManager;
// /**
// * 营销经理
// */
// @ApiModelProperty(value="营销经理")
// private String salesManager;
/**
* 状态

74
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DeviceExcelTemplete.java Normal file
View File

@@ -0,0 +1,74 @@
package com.njcn.csdevice.pojo.param;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/11/21 9:35【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class DeviceExcelTemplete implements Serializable {
/**
* 装置名称
*/
@Excel(name = "装置名称", width = 15)
private String name;
/**
* 网关识别码
*/
@Excel(name = "网关识别码", width = 15)
private String ndid;
/**
* 装置类型(直连设备、网关设备、装置)
*/
@Excel(name = "装置类型（直连设备,网关设备）", width = 30)
private String devType;
/**
* 装置型号（pqs588、pqs680...）
*/
@Excel(name = "装置型号", width = 15)
private String devModel;
/**
* 装置接入方式（mqtt、cloud）
*/
@Excel(name = "装置接入方式（mqtt、cloud）", width = 25)
private String devAccessMethod;
/**
* 合同号
*/
@Excel(name = "合同号", width = 15)
private String cntractNo;
@EqualsAndHashCode(callSuper = true)
public static class IllegalityDeviceExcelTemplete extends DeviceExcelTemplete implements Serializable {
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
@Excel(name = "错误信息描述", width = 30)
private String msg;
}
}

2
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java
View File

@@ -107,7 +107,7 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
private String qrPath;
/**
* 二维码文件路径
* 设备当前流程（1:设备登记，2：功能调试，3：出厂调试），4：设备投运)
*/
@TableField(value = "process")
private String process;

158
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/ExcelStyleUtil.java Normal file
View File

@@ -0,0 +1,158 @@
package com.njcn.csdevice.utils;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams;
import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.*;
/**
* pqs
*
* @author cdf
* @date 2022/7/4
*/
public class ExcelStyleUtil implements IExcelExportStyler {
// 数据行类型
private static final String DATA_STYLES = "dataStyles";
// 标题类型
private static final String TITLE_STYLES = "titleStyles";
//头样式
private static final String HEADER_STYLES = "headerStyles";
//数据行样式
private CellStyle styles;
// 标题样式
private CellStyle titleStyle;
// 标题样式
private CellStyle headerStyle;
public ExcelStyleUtil(Workbook workbook) {
this.init(workbook);
}
private void init(Workbook workbook) {
this.styles = initStyles(workbook);
this.titleStyle = initTitleStyle(workbook);
this.headerStyle = initTitleStyle(workbook);
}
@Override
public CellStyle getHeaderStyle(short headerColor) {
return headerStyle;
}
/**
* 标题样式
*/
@Override
public CellStyle getTitleStyle(short i) {
return titleStyle;
}
@Override
public CellStyle getStyles(boolean parity, ExcelExportEntity entity) {
return styles;
}
/**
* 获取样式方法
*
* @param dataRow 数据行
* @param obj 对象
* @param data 数据
*/
@Override
public CellStyle getStyles(Cell cell, int dataRow, ExcelExportEntity entity, Object obj, Object data) {
return getStyles(true, entity);
}
@Override
public CellStyle getTemplateStyles(boolean isSingle, ExcelForEachParams excelForEachParams) {
return null;
}
/**
* 初始化--标题行样式
* @param workbook
* @return
*/
private CellStyle initTitleStyle(Workbook workbook) {
return buildCellStyle(workbook,TITLE_STYLES);
}
/**
* 头样式
* @author cdf
* @date 2022/7/4
*/
private CellStyle initHeaderStyle(Workbook workbook) {
return buildCellStyle(workbook,HEADER_STYLES);
}
/**
* 初始化--数据行样式
* @param workbook
* @return
*/
private CellStyle initStyles(Workbook workbook) {
return buildCellStyle(workbook,DATA_STYLES);
}
/**
* 设置单元格样式
* @param workbook
* @param type 类型 用来区分是数据行样式还是标题样式
* @return
*/
private CellStyle buildCellStyle(Workbook workbook,String type) {
CellStyle style = workbook.createCellStyle();
// 字体样式
Font font = workbook.createFont();
if(TITLE_STYLES.equals(type)){
font.setFontHeightInPoints((short)12);
font.setBold(true);
// 设置水平对齐的样式为居中对齐;
style.setAlignment(HorizontalAlignment.CENTER);
}
if(HEADER_STYLES.equals(type)){
font.setFontHeightInPoints((short)12);
font.setBold(true);
// 设置水平对齐的样式为居中对齐;
style.setAlignment(HorizontalAlignment.LEFT);
}
if(DATA_STYLES.equals(type)){
font.setFontHeightInPoints((short)10);
// 设置水平对齐的样式为居中对齐;
style.setAlignment(HorizontalAlignment.CENTER);
}
font.setFontName("Courier New");
style.setFont(font);
// 设置底边框
style.setBorderBottom(BorderStyle.THIN);
// 设置左边框
style.setBorderLeft(BorderStyle.THIN);
// 设置右边框;
style.setBorderRight(BorderStyle.THIN);
// 设置顶边框;
style.setBorderTop(BorderStyle.THIN);
// 设置底边颜色
style.setBottomBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
// 设置左边框颜色;
style.setLeftBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
// 设置右边框颜色;
style.setRightBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
// 设置顶边框颜色;
style.setTopBorderColor(HSSFColor.HSSFColorPredefined.BLACK.getIndex());
// 设置自动换行;
style.setWrapText(false);
// 设置垂直对齐的样式为居中对齐;
style.setVerticalAlignment(VerticalAlignment.CENTER);
return style;
}
}