From 82c36e2b434fa7a1c16b0448aa4cf1483107f79c Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期二, 02 十二月 2025 16:28:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasCrnp.java | 457 +++++++++++---------------------------------------------
1 files changed, 95 insertions(+), 362 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 2ce3c36..475a448 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -1,21 +1,25 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
+import com.zy.core.model.StationObjModel;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
@TableName("asr_bas_crnp")
public class BasCrnp implements Serializable {
@@ -29,166 +33,85 @@
@TableField("crn_no")
private Integer crnNo;
- /**
- * 鍙叆
- */
- @ApiModelProperty(value= "鍙叆")
- @TableField("in_enable")
- private String inEnable;
+ @ApiModelProperty(value= "")
+ private Integer status;
- /**
- * 鍙嚭
- */
- @ApiModelProperty(value= "鍙嚭")
- @TableField("out_enable")
- private String outEnable;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty(value= "鐘舵��")
- @TableField("crn_sts")
- private Integer crnSts;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value= "")
@TableField("wrk_no")
private Integer wrkNo;
/**
- * 寮傚父鐮�
+ * 鍙叆(checkBox)
*/
- @ApiModelProperty(value= "寮傚父鐮�")
- @TableField("crn_err")
- private Long crnErr;
+ @ApiModelProperty(value= "鍙叆(checkBox)")
+ @TableField("in_enable")
+ private String inEnable;
/**
- * 婧愬簱浣�
+ * 鍙嚭(checkBox)
*/
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("frm_locno")
- private String frmLocno;
-
- /**
- * 婧愮珯
- */
- @ApiModelProperty(value= "婧愮珯")
- @TableField("frm_sta")
- private Integer frmSta;
-
- /**
- * 鐩爣绔�
- */
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("to_sta")
- private Integer toSta;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("to_locno")
- private String toLocno;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("appe_time")
- private Date appeTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
+ @ApiModelProperty(value= "鍙嚭(checkBox)")
+ @TableField("out_enable")
+ private String outEnable;
@ApiModelProperty(value= "")
- @TableField("hp_mk")
- private String hpMk;
+ @TableField("create_by")
+ private Long createBy;
@ApiModelProperty(value= "")
- @TableField("retrieve_mk")
- private String retrieveMk;
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
@ApiModelProperty(value= "")
- @TableField("ctl_hp")
- private String ctlHp;
+ @TableField("update_by")
+ private Long updateBy;
@ApiModelProperty(value= "")
- @TableField("ctl_rest")
- private String ctlRest;
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
@ApiModelProperty(value= "")
- @TableField("emp_in")
- private String empIn;
+ private String memo;
@ApiModelProperty(value= "")
- @TableField("tank_qty")
- private Integer tankQty;
+ @TableField("control_rows")
+ private String controlRows;
- @ApiModelProperty(value= "")
- @TableField("tank_qty1")
- private Integer tankQty1;
+ /**
+ * 鍏ョ珯鍒楄〃
+ */
+ @ApiModelProperty(value= "鍏ョ珯鍒楄〃")
+ @TableField("in_station_list")
+ private String inStationList;
+
+ /**
+ * 鍑虹珯鍒楄〃
+ */
+ @ApiModelProperty(value= "鍑虹珯鍒楄〃")
+ @TableField("out_station_list")
+ private String outStationList;
public BasCrnp() {}
- public BasCrnp(String inEnable,String outEnable,Integer crnSts,Integer wrkNo,Long crnErr,String frmLocno,Integer frmSta,Integer toSta,String toLocno,Long appeUser,Date appeTime,Long modiUser,Date modiTime,String hpMk,String retrieveMk,String ctlHp,String ctlRest,String empIn,Integer tankQty,Integer tankQty1) {
+ public BasCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.status = status;
+ this.wrkNo = wrkNo;
this.inEnable = inEnable;
this.outEnable = outEnable;
- this.crnSts = crnSts;
- this.wrkNo = wrkNo;
- this.crnErr = crnErr;
- this.frmLocno = frmLocno;
- this.frmSta = frmSta;
- this.toSta = toSta;
- this.toLocno = toLocno;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.hpMk = hpMk;
- this.retrieveMk = retrieveMk;
- this.ctlHp = ctlHp;
- this.ctlRest = ctlRest;
- this.empIn = empIn;
- this.tankQty = tankQty;
- this.tankQty1 = tankQty1;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
}
// BasCrnp basCrnp = new BasCrnp(
-// null, // 鍙叆
-// null, // 鍙嚭
-// null, // 鐘舵��
-// null, // 宸ヤ綔鍙�
-// null, // 寮傚父鐮�
-// null, // 婧愬簱浣�
-// null, // 婧愮珯
-// null, // 鐩爣绔�
-// null, // 鐩爣搴撲綅
-// null, // 鍒涘缓鑰�
-// null, // 鍒涘缓鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
// null, //
// null, //
+// null, // 鍙叆(checkBox)
+// null, // 鍙嚭(checkBox)
// null, //
// null, //
// null, //
@@ -196,241 +119,51 @@
// null //
// );
- public Integer getCrnNo() {
- return crnNo;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public String getInEnable() {
- return inEnable;
- }
-
- public void setInEnable(String inEnable) {
- this.inEnable = inEnable;
- }
-
- public String getOutEnable() {
- return outEnable;
- }
-
- public void setOutEnable(String outEnable) {
- this.outEnable = outEnable;
- }
-
- public Integer getCrnSts() {
- return crnSts;
- }
-
- public void setCrnSts(Integer crnSts) {
- this.crnSts = crnSts;
- }
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Long getCrnErr() {
- return crnErr;
- }
-
- public void setCrnErr(Long crnErr) {
- this.crnErr = crnErr;
- }
-
- public String getFrmLocno() {
- return frmLocno;
- }
-
- public String getFrmLocno$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.frmLocno);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public void setFrmLocno(String frmLocno) {
- this.frmLocno = frmLocno;
- }
-
- public Integer getFrmSta() {
- return frmSta;
- }
-
- public String getFrmSta$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.frmSta);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public void setFrmSta(Integer frmSta) {
- this.frmSta = frmSta;
- }
-
- public Integer getToSta() {
- return toSta;
- }
-
- public String getToSta$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.toSta);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public void setToSta(Integer toSta) {
- this.toSta = toSta;
- }
-
- public String getToLocno() {
- return toLocno;
- }
-
- public String getToLocno$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.toLocno);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public void setToLocno(String toLocno) {
- this.toLocno = toLocno;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
+ public String getStatus$(){
+ if (Cools.isEmpty(this.status)){
+ return "";
+ }
+ return this.status == 1 ? "姝ｅ父" : "绂佺敤";
}
- public String getHpMk() {
- return hpMk;
+ public List<StationObjModel> getInStationList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.inStationList)){
+ return list;
+ }
+
+ List<StationObjModel> jsonList = JSON.parseArray(this.inStationList,StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
}
- public void setHpMk(String hpMk) {
- this.hpMk = hpMk;
- }
+ public List<StationObjModel> getOutStationList$(){
+ List<StationObjModel> list = new ArrayList<>();
+ if (Cools.isEmpty(this.outStationList)){
+ return list;
+ }
- public String getRetrieveMk() {
- return retrieveMk;
+ List<StationObjModel> jsonList = JSON.parseArray(this.outStationList,StationObjModel.class);
+ for (StationObjModel json : jsonList){
+ list.add(json);
+ }
+ return list;
}
-
- public void setRetrieveMk(String retrieveMk) {
- this.retrieveMk = retrieveMk;
- }
-
- public String getCtlHp() {
- return ctlHp;
- }
-
- public void setCtlHp(String ctlHp) {
- this.ctlHp = ctlHp;
- }
-
- public String getCtlRest() {
- return ctlRest;
- }
-
- public void setCtlRest(String ctlRest) {
- this.ctlRest = ctlRest;
- }
-
- public String getEmpIn() {
- return empIn;
- }
-
- public void setEmpIn(String empIn) {
- this.empIn = empIn;
- }
-
- public Integer getTankQty() {
- return tankQty;
- }
-
- public void setTankQty(Integer tankQty) {
- this.tankQty = tankQty;
- }
-
- public Integer getTankQty1() {
- return tankQty1;
- }
-
- public void setTankQty1(Integer tankQty1) {
- this.tankQty1 = tankQty1;
- }
-
}
--
Gitblit v1.9.1