I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增设备pojo，组织模型model

Browse Source
yun-zuoyi
yiming.gu 6 years ago
parent bc1b0b7e90
commit b1f513d786
9 changed files with 302 additions and 4 deletions
Show Stats Download Patch File Download Diff File

19
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java
Unescape Escape View File

@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -12,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :生产区域
@ -35,4 +39,19 @@ public class MesArea extends BaseBean {
@Column(name="AREA_NAME")
@ApiParam("区域名称")
private String areaName;
@Transient
@ApiParam(value ="子集列表")
private List<MesWorkCenter> childTreeList;
@Transient
@ApiParam(value ="名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

59
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java
Unescape Escape View File

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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.Transient;
/**
* @Description :生产区域
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_EQUIPMENT")
@Api("生产设备")
public class MesEquipment extends BaseBean {
@Column(name="EQUIPMENT_CODE")
@ApiParam("设备代码")
private String equipmentCode;
@Column(name="EQUIPMENT_NAME")
@ApiParam("设备名称")
private String equipmentName;
@Column(name="STATUS")
@ApiParam("设备状态")
private String status;
@Column(name="WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Transient
@ApiParam(value ="名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

18
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :工作单元
@ -42,4 +46,18 @@ public class MesWorkCell extends BaseBean {
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
@Transient
@ApiParam(value ="子集列表")
private List<MesEquipment> childTreeList;
@Transient
@ApiParam(value ="名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

18
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description :工作中心
@ -46,4 +50,18 @@ public class MesWorkCenter extends BaseBean {
@Column(name = "AREA_CODE")
@ApiParam("生产区域代码")
private String areaCode;
@Transient
@ApiParam(value ="子集列表")
private List<MesWorkCell> childTreeList;
@Transient
@ApiParam(value ="名称")
private String name;
// 默认值 -1
@Transient
@ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
}

63
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java
Unescape Escape View File

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.mes.model;
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.Entity;
/**
* @Description:
* @Reference:
* @Author: yiming.gu
* @CreateDate:2019-04-18-14:16
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api("生产区域")
public class ProdOrgModel extends BaseBean {
@ApiParam("区域名称")
private String areaName;
@ApiParam("区域代码")
private String areaCode;
@ApiParam("工作中心代码")
private String workCenterCode;
@ApiParam("工作中心名称")
private String workCenterName;
@ApiParam("ERP工作中心")
private String erpWorkCenter;
@ApiParam("工作版本")
private String workVer;
@ApiParam("工作单元代码")
private String workCellCode;
@ApiParam("工作单元名称")
private String workCellName;
@ApiParam("设备代码")
private String equipmentCode;
@ApiParam("设备名称")
private String equipmentName;
@ApiParam("设备状态")
private String status;
@ApiParam("当前级")
private Integer level;
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesEquipment;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jack.jia
* @CreateDate : 2019-04-02
* @Modify:
**/
@Repository
public interface MesEquipmentRepository extends BaseRepository<MesEquipment, Long> {
}

86
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -5,10 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesPart;
import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.bean.*;
import org.apache.commons.lang3.StringUtils;
/**
@ -183,4 +180,85 @@ public class MesHqlPack {
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
return packBean;
}
/**
* 通用查询条件
* @param organizeCode
* @return
*/
public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
DdlPackBean packBean = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
return packBean;
}
/**
* MES区域信息查询条件封装
* @param mesArea
* @return
*/
public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
if (StringUtils.isNotEmpty(mesArea.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
}
return packBean;
}
/**
* MES工作中心信息查询条件封装
* @param mesWorkCenter
* @return
*/
public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
}
return packBean;
}
/**
* MES工作单元信息查询条件封装
* @param mesWorkCell
* @return
*/
public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
return packBean;
}
/**
* MES设备信息查询条件封装
* @param mesEquipment
* @return
*/
public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
}
return packBean;
}
}

4
modules/i3plus-pojo-model/pom.xml
Unescape Escape View File

@ -42,6 +42,10 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-form</artifactId>
</dependency>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-mes</artifactId>
</dependency>
</dependencies>

23
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java
Unescape Escape View File

@ -0,0 +1,23 @@
package cn.estsh.i3plus.pojo.model.mes;
import cn.estsh.i3plus.pojo.mes.bean.MesArea;
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
import io.swagger.annotations.ApiParam;
import javax.persistence.Transient;
import java.util.List;
public class SysOrganizeModel extends SysOrganize{
@Transient
@ApiParam(value ="子集列表")
private List<MesArea> childTreeList;
public List<MesArea> getChildTreeList() {
return childTreeList;
}
public void setChildTreeList(List<MesArea> childTreeList) {
this.childTreeList = childTreeList;
}
}
Write Preview
Loading…
Cancel
Save