Merge branch 'dev'
crish
6 years ago
commit
9027b22af8
@ -0,0 +1,89 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 安灯主界面Model
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-22-13:44
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class AndonMenuInterfaceModel{
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@ApiParam("产线运行状态")
|
||||
private String workCenterStatus;
|
||||
|
||||
@ApiParam("安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String alarmName;
|
||||
|
||||
@ApiParam("故障总时长 单位：分钟")
|
||||
private Long exceptionTime = 0L;
|
||||
|
||||
@ApiParam("当前安灯类型故障时长 单位：分钟")
|
||||
private Long currentExceptionTime = 0L;
|
||||
|
||||
@ApiParam("当前安灯类型故障比例")
|
||||
private Double proportion = 0D;
|
||||
|
||||
@ApiParam("当前工厂的产线故障统计")
|
||||
private List<AndonMenuInterfaceModel> andonWorkcenterList;
|
||||
|
||||
@ApiParam("当前产线的所有故障统计")
|
||||
private List<AndonBoardModel> alarmBrokenInfoList;
|
||||
|
||||
@ApiParam("当前产线的未解决故障统计")
|
||||
private List<AndonBoardModel> pendingSolveBrokenInfoList;
|
||||
|
||||
@ApiParam("当前产线的响应时长top10")
|
||||
private List<AndonBoardModel> responseInfoList;
|
||||
|
||||
@ApiParam("当前产线的解决时长top10")
|
||||
private List<AndonBoardModel> solveInfoList;
|
||||
|
||||
@ApiParam("当前产线的异常时长top10")
|
||||
private List<AndonBoardModel> exceptionInfoList;
|
||||
|
||||
@ApiParam("当前产线的站点状态统计")
|
||||
private List<CellGroupStatusModel> andonCellGroupStatusList;
|
||||
|
||||
public double getExceptionTimeVal() {
|
||||
return exceptionTime == null ? 0 : exceptionTime;
|
||||
}
|
||||
|
||||
public double getCurrentExceptionTimeVal() {
|
||||
return currentExceptionTime == null ? 0 : currentExceptionTime;
|
||||
}
|
||||
|
||||
public double getProportionVal() {
|
||||
return proportion == null ? 0 : proportion;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "AndonMenuInterfaceModel{" +
|
||||
"workCenterCode='" + workCenterCode + '\'' +
|
||||
", workCenterName='" + workCenterName + '\'' +
|
||||
", workCenterStatus='" + workCenterStatus + '\'' +
|
||||
", alarmCode='" + alarmCode + '\'' +
|
||||
", alarmName='" + alarmName + '\'' +
|
||||
", exceptionTime=" + exceptionTime +
|
||||
", currentExceptionTime=" + currentExceptionTime +
|
||||
", proportion=" + proportion +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
/**
|
||||
* @Description: 站点统计分组model
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-11-22-16:02
|
||||
* @Modify:
|
||||
**/
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 工位分组配置model
|
||||
*/
|
||||
@Data
|
||||
public class CellGroupStatusModel{
|
||||
|
||||
@ApiParam("工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("安灯类型")
|
||||
private String groupCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String groupName;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam("安灯类型名称")
|
||||
private String workCellName;
|
||||
|
||||
@ApiParam("站点运行状态")
|
||||
private String cellGroupStatus;
|
||||
|
||||
@ApiParam(value = "横坐标")
|
||||
private Float horizontalAxis = 0f;
|
||||
|
||||
@ApiParam(value = "纵坐标")
|
||||
private Float verticalAxis = 0f;
|
||||
|
||||
@ApiParam(value = "异常图片")
|
||||
private String abnormalSrc;
|
||||
|
||||
@ApiParam(value = "正常图片")
|
||||
private String normalSrc;
|
||||
|
||||
@ApiParam("当前站点下的工位故障统计")
|
||||
private List<AndonBoardModel> andonBoardModelList;
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Data
|
||||
public class StatisticReportReponse {
|
||||
private List<String> headers = new ArrayList<>();
|
||||
private List<Map<String, String>> datas = new ArrayList<>();
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesPartObject;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\25 15:07
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IMesPartObjectRepository extends BaseRepository<MesPartObject, Long> {
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package cn.estsh.i3plus.pojo.wms.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import javax.persistence.UniqueConstraint;
|
||||
|
||||
/**
|
||||
* @Description : 附件表
|
||||
* @Reference :
|
||||
* @Author : jessica.chen
|
||||
* @CreateDate : 2019-11-26 14:21
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="WMS_FILE",
|
||||
uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})})
|
||||
@Api("附件信息")
|
||||
public class WmsFile extends BaseBean{
|
||||
|
||||
private static final long serialVersionUID = 9214639813072592712L;
|
||||
@Column(name="FILE_NAME")
|
||||
@ApiParam("文件名称")
|
||||
private String fileName;
|
||||
|
||||
@Column(name="FILE_SIZE")
|
||||
@ApiParam(value = "文件大小(KB)", example = "0")
|
||||
private Integer fileSize = 0;
|
||||
|
||||
@Column(name="FILE_TYPE")
|
||||
@ApiParam("文件类型")
|
||||
private String fileType;
|
||||
|
||||
@Column(name="RESOURCE_ID")
|
||||
@ApiParam("资源编号")
|
||||
private String resourceId;
|
||||
|
||||
@Column(name="FILE_URL")
|
||||
@ApiParam("下载地址")
|
||||
private String fileUrl;
|
||||
|
||||
@Column(name="REF_SRC")
|
||||
@ApiParam("关联单据编号")
|
||||
private String refSrc;
|
||||
|
||||
@Column(name = "REF_TYPE")
|
||||
@ApiParam(value = "关联单据类型")
|
||||
private String refType;
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.wms.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.wms.bean.WmsFile;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jessica,chen
|
||||
* @CreateDate : 2019-11-27 14:49
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface WmsFileRepository extends BaseRepository<WmsFile, Long> {
|
||||
}
|
||||
Loading…
Reference in New Issue