Skip to content
GitLab
Commit 7a436d1c authored by 季圣华's avatar 季圣华
Browse files

!14 格式化代码，看着有点别扭 

Merge pull request !14 from SmkfGao/master
parents 8f304964 6bc92ec9
Hide whitespace changes
Inline Side-by-side
src/main/java/com/jsh/model/po/UserBusiness.java
View file @ 7a436d1c
package com.jsh.model.po; package com.jsh.model.po;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class UserBusiness implements java.io.Serializable public class UserBusiness implements java.io.Serializable {
{ private Long Id;
private Long Id; private String Type;
private String Type; private String KeyId;
private String KeyId; private String Value;
private String Value; private String BtnStr;
private String BtnStr;
public UserBusiness() {
public UserBusiness()
{ }
} public Long getId() {
return Id;
public Long getId() { }
return Id;
} public void setId(Long id) {
Id = id;
public void setId(Long id) { }
Id = id;
} public String getType() {
return Type;
public String getType() { }
return Type;
} public void setType(String type) {
Type = type;
public void setType(String type) { }
Type = type;
} public String getKeyId() {
return KeyId;
public String getKeyId() { }
return KeyId;
} public void setKeyId(String keyId) {
KeyId = keyId;
public void setKeyId(String keyId) { }
KeyId = keyId;
} public String getValue() {
return Value;
public String getValue() { }
return Value;
} public void setValue(String value) {
Value = value;
public void setValue(String value) { }
Value = value;
} public String getBtnStr() {
return BtnStr;
public String getBtnStr() { }
return BtnStr;
} public void setBtnStr(String btnStr) {
BtnStr = btnStr;
public void setBtnStr(String btnStr) { }
BtnStr = btnStr;
}
} }
\ No newline at end of file
src/main/java/com/jsh/model/vo/asset/AssetModel.java
View file @ 7a436d1c
...@@ -5,425 +5,368 @@ import java.io.InputStream; ...@@ -5,425 +5,368 @@ import java.io.InputStream;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AssetModel implements Serializable public class AssetModel implements Serializable {
{
private AssetShowModel showModel = new AssetShowModel(); private AssetShowModel showModel = new AssetShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
/** /**
* 资产名称ID * 资产名称ID
*/ */
private Long assetNameID ; private Long assetNameID;
/** /**
* 资产类型ID * 资产类型ID
*/ */
private Long assetCategoryID ; private Long assetCategoryID;
/** /**
* 位置属性 * 位置属性
*/ */
private String location = ""; private String location = "";
/** /**
* 状态属性 * 状态属性
*/ */
private Short status ; private Short status;
/** /**
* 用户ID * 用户ID
*/ */
private Long userID ; private Long userID;
/** /**
* 资产单价 * 资产单价
*/ */
private double price = 0; private double price = 0;
/** /**
* 购买日期 * 购买日期
*/ */
private String purchasedate = ""; private String purchasedate = "";
/** /**
* 有效日期 * 有效日期
*/ */
private String periodofvalidity = ""; private String periodofvalidity = "";
/** /**
* 保修日期 * 保修日期
*/ */
private String warrantydate = ""; private String warrantydate = "";
/** /**
* 资产编号 * 资产编号
*/ */
private String assetnum = ""; private String assetnum = "";
/** /**
* 资产序列号 * 资产序列号
*/ */
private String serialnum = ""; private String serialnum = "";
/** /**
* 标签 * 标签
*/ */
private String labels = ""; private String labels = "";
/** /**
* 资产ID * 资产ID
*/ */
private Long supplierID; private Long supplierID;
/** /**
* 描述信息 * 描述信息
*/ */
private String description = ""; private String description = "";
/** /**
* 资产ID * 资产ID
*/ */
private Long assetID; private Long assetID;
/** /**
* 资产IDs 批量操作使用 * 资产IDs 批量操作使用
*/ */
private String assetIDs = ""; private String assetIDs = "";
/** /**
* 每页显示的个数 * 每页显示的个数
*/ */
private int pageSize = 10; private int pageSize = 10;
/** /**
* 当前页码 * 当前页码
*/ */
private int pageNo = 1; private int pageNo = 1;
/** /**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
/** /**
* 输入流，导出excel文件 * 输入流，导出excel文件
*/ */
private InputStream excelStream; private InputStream excelStream;
/** /**
* 文件名称 * 文件名称
*/ */
private String fileName = ""; private String fileName = "";
/** /**
* 是否全部数据--根据搜索条件 * 是否全部数据--根据搜索条件
*/ */
private String isAllData = ""; private String isAllData = "";
/** /**
* 浏览器类型--中文字符乱码问题解决，火狐和IE下字符类型不一样 * 浏览器类型--中文字符乱码问题解决，火狐和IE下字符类型不一样
*/ */
private String browserType = ""; private String browserType = "";
/** /**
* 导入excel文件 * 导入excel文件
*/ */
private File assetFile; private File assetFile;
/** /**
* 文件类型 * 文件类型
*/ */
private String assetFileContentType; private String assetFileContentType;
/** /**
* 文件名称 * 文件名称
*/ */
private String assetFileFileName; private String assetFileFileName;
/** /**
* 是否只手工检查数据 0==检查 1==不检查直接导入数据库中 * 是否只手工检查数据 0==检查 1==不检查直接导入数据库中
*/ */
private Integer isCheck; private Integer isCheck;
public AssetShowModel getShowModel() public AssetShowModel getShowModel() {
{
return showModel; return showModel;
} }
public void setShowModel(AssetShowModel showModel) public void setShowModel(AssetShowModel showModel) {
{
this.showModel = showModel; this.showModel = showModel;
} }
public String getDescription() public String getDescription() {
{
return description; return description;
} }
public void setDescription(String description) public void setDescription(String description) {
{
this.description = description; this.description = description;
} }
public Long getAssetID() public Long getAssetID() {
{
return assetID; return assetID;
} }
public void setAssetID(Long assetID) public void setAssetID(Long assetID) {
{
this.assetID = assetID; this.assetID = assetID;
} }
public String getAssetIDs() public String getAssetIDs() {
{
return assetIDs; return assetIDs;
} }
public void setAssetIDs(String assetIDs) public void setAssetIDs(String assetIDs) {
{
this.assetIDs = assetIDs; this.assetIDs = assetIDs;
} }
public int getPageSize() public int getPageSize() {
{
return pageSize; return pageSize;
} }
public void setPageSize(int pageSize) public void setPageSize(int pageSize) {
{
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public int getPageNo() public int getPageNo() {
{
return pageNo; return pageNo;
} }
public void setPageNo(int pageNo) public void setPageNo(int pageNo) {
{
this.pageNo = pageNo; this.pageNo = pageNo;
} }
public String getClientIp() public String getClientIp() {
{
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) public void setClientIp(String clientIp) {
{
this.clientIp = clientIp; this.clientIp = clientIp;
} }
public Long getAssetNameID() public Long getAssetNameID() {
{
return assetNameID; return assetNameID;
} }
public void setAssetNameID(Long assetNameID) public void setAssetNameID(Long assetNameID) {
{
this.assetNameID = assetNameID; this.assetNameID = assetNameID;
} }
public Long getAssetCategoryID() public Long getAssetCategoryID() {
{
return assetCategoryID; return assetCategoryID;
} }
public void setAssetCategoryID(Long assetCategoryID) public void setAssetCategoryID(Long assetCategoryID) {
{
this.assetCategoryID = assetCategoryID; this.assetCategoryID = assetCategoryID;
} }
public String getLocation() public String getLocation() {
{
return location; return location;
} }
public void setLocation(String location) public void setLocation(String location) {
{
this.location = location; this.location = location;
} }
public Short getStatus() public Short getStatus() {
{
return status; return status;
} }
public void setStatus(Short status) public void setStatus(Short status) {
{
this.status = status; this.status = status;
} }
public Long getUserID() public Long getUserID() {
{
return userID; return userID;
} }
public void setUserID(Long userID) public void setUserID(Long userID) {
{
this.userID = userID; this.userID = userID;
} }
public double getPrice() public double getPrice() {
{
return price; return price;
} }
public void setPrice(double price) public void setPrice(double price) {
{
this.price = price; this.price = price;
} }
public String getPurchasedate() public String getPurchasedate() {
{
return purchasedate; return purchasedate;
} }
public void setPurchasedate(String purchasedate) public void setPurchasedate(String purchasedate) {
{
this.purchasedate = purchasedate; this.purchasedate = purchasedate;
} }
public String getPeriodofvalidity() public String getPeriodofvalidity() {
{
return periodofvalidity; return periodofvalidity;
} }
public void setPeriodofvalidity(String periodofvalidity) public void setPeriodofvalidity(String periodofvalidity) {
{
this.periodofvalidity = periodofvalidity; this.periodofvalidity = periodofvalidity;
} }
public String getWarrantydate() public String getWarrantydate() {
{
return warrantydate; return warrantydate;
} }
public void setWarrantydate(String warrantydate) public void setWarrantydate(String warrantydate) {
{
this.warrantydate = warrantydate; this.warrantydate = warrantydate;
} }
public String getLabels() public String getLabels() {
{
return labels; return labels;
} }
public void setLabels(String labels) public void setLabels(String labels) {
{
this.labels = labels; this.labels = labels;
} }
public Long getSupplierID() public Long getSupplierID() {
{
return supplierID; return supplierID;
} }
public void setSupplierID(Long supplierID) public void setSupplierID(Long supplierID) {
{
this.supplierID = supplierID; this.supplierID = supplierID;
} }
public String getAssetnum() public String getAssetnum() {
{
return assetnum; return assetnum;
} }
public void setAssetnum(String assetnum) public void setAssetnum(String assetnum) {
{
this.assetnum = assetnum; this.assetnum = assetnum;
} }
public String getSerialnum() public String getSerialnum() {
{
return serialnum; return serialnum;
} }
public void setSerialnum(String serialnum) public void setSerialnum(String serialnum) {
{
this.serialnum = serialnum; this.serialnum = serialnum;
} }
public InputStream getExcelStream() public InputStream getExcelStream() {
{ return excelStream;
return excelStream; }
}
public void setExcelStream(InputStream excelStream) {
public void setExcelStream(InputStream excelStream) this.excelStream = excelStream;
{ }
this.excelStream = excelStream;
} public String getFileName() {
return fileName;
public String getFileName() }
{
return fileName; public void setFileName(String fileName) {
} this.fileName = fileName;
}
public void setFileName(String fileName)
{ public String getIsAllData() {
this.fileName = fileName; return isAllData;
} }
public String getIsAllData() public void setIsAllData(String isAllData) {
{ this.isAllData = isAllData;
return isAllData; }
}
public String getBrowserType() {
public void setIsAllData(String isAllData) return browserType;
{ }
this.isAllData = isAllData;
} public void setBrowserType(String browserType) {
this.browserType = browserType;
public String getBrowserType() }
{
return browserType; public File getAssetFile() {
} return assetFile;
}
public void setBrowserType(String browserType)
{ public void setAssetFile(File assetFile) {
this.browserType = browserType; this.assetFile = assetFile;
} }
public File getAssetFile() public Integer getIsCheck() {
{
return assetFile;
}
public void setAssetFile(File assetFile)
{
this.assetFile = assetFile;
}
public Integer getIsCheck()
{
return isCheck; return isCheck;
} }
public void setIsCheck(Integer isCheck) public void setIsCheck(Integer isCheck) {
{
this.isCheck = isCheck; this.isCheck = isCheck;
} }
public String getAssetFileContentType() public String getAssetFileContentType() {
{ return assetFileContentType;
return assetFileContentType; }
}
public void setAssetFileContentType(String assetFileContentType) public void setAssetFileContentType(String assetFileContentType) {
{ this.assetFileContentType = assetFileContentType;
this.assetFileContentType = assetFileContentType; }
}
public String getAssetFileFileName() public String getAssetFileFileName() {
{ return assetFileFileName;
return assetFileFileName; }
}
public void setAssetFileFileName(String assetFileFileName) public void setAssetFileFileName(String assetFileFileName) {
{ this.assetFileFileName = assetFileFileName;
this.assetFileFileName = assetFileFileName; }
}
} }
src/main/java/com/jsh/model/vo/asset/AssetShowModel.java
View file @ 7a436d1c
...@@ -5,39 +5,34 @@ import java.util.HashMap; ...@@ -5,39 +5,34 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@SuppressWarnings({ "serial" }) @SuppressWarnings({"serial"})
public class AssetShowModel implements Serializable public class AssetShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
private String msgTip = ""; private String msgTip = "";
/** /**
* 系统数据 * 系统数据
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>(); private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public Map<String, List> getMap() public Map<String, List> getMap() {
{
return map; return map;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public void setMap(Map<String, List> map) public void setMap(Map<String, List> map) {
{
this.map = map; this.map = map;
} }
} }
src/main/java/com/jsh/model/vo/asset/ReportModel.java
View file @ 7a436d1c
...@@ -3,319 +3,276 @@ package com.jsh.model.vo.asset; ...@@ -3,319 +3,276 @@ package com.jsh.model.vo.asset;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class ReportModel implements Serializable public class ReportModel implements Serializable {
{
private ReportShowModel showModel = new ReportShowModel(); private ReportShowModel showModel = new ReportShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
/** /**
* 资产名称ID * 资产名称ID
*/ */
private Long assetNameID ; private Long assetNameID;
/** /**
* 资产类型ID * 资产类型ID
*/ */
private Long assetCategoryID ; private Long assetCategoryID;
/** /**
* 位置属性 * 位置属性
*/ */
private String location = ""; private String location = "";
/** /**
* 状态属性 * 状态属性
*/ */
private Short status ; private Short status;
/** /**
* 用户ID * 用户ID
*/ */
private Long usernameID ; private Long usernameID;
/** /**
* 资产单价 * 资产单价
*/ */
private float price = 0; private float price = 0;
/** /**
* 购买日期 * 购买日期
*/ */
private String purchasedate = ""; private String purchasedate = "";
/** /**
* 有效日期 * 有效日期
*/ */
private String periodofvalidity = ""; private String periodofvalidity = "";
/** /**
* 保修日期 * 保修日期
*/ */
private String warrantydate = ""; private String warrantydate = "";
/** /**
* 资产编号 * 资产编号
*/ */
private String assetnum = ""; private String assetnum = "";
/** /**
* 资产序列号 * 资产序列号
*/ */
private String serialnum = ""; private String serialnum = "";
/** /**
* 标签 * 标签
*/ */
private String labels = ""; private String labels = "";
/** /**
* 资产ID * 资产ID
*/ */
private Long supplierID; private Long supplierID;
/** /**
* 描述信息 * 描述信息
*/ */
private String description = ""; private String description = "";
/** /**
* 资产ID * 资产ID
*/ */
private Long assetID; private Long assetID;
/** /**
* 资产IDs 批量操作使用 * 资产IDs 批量操作使用
*/ */
private String assetIDs = ""; private String assetIDs = "";
/** /**
* 每页显示的个数 * 每页显示的个数
*/ */
private int pageSize = 10; private int pageSize = 10;
/** /**
* 当前页码 * 当前页码
*/ */
private int pageNo = 1; private int pageNo = 1;
/** /**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
/** /**
* 报表类型 * 报表类型
*/ */
private Integer reportType; private Integer reportType;
public ReportShowModel getShowModel() public ReportShowModel getShowModel() {
{
return showModel; return showModel;
} }
public void setShowModel(ReportShowModel showModel) public void setShowModel(ReportShowModel showModel) {
{
this.showModel = showModel; this.showModel = showModel;
} }
public Long getAssetNameID() public Long getAssetNameID() {
{
return assetNameID; return assetNameID;
} }
public void setAssetNameID(Long assetNameID) public void setAssetNameID(Long assetNameID) {
{
this.assetNameID = assetNameID; this.assetNameID = assetNameID;
} }
public Long getAssetCategoryID() public Long getAssetCategoryID() {
{
return assetCategoryID; return assetCategoryID;
} }
public void setAssetCategoryID(Long assetCategoryID) public void setAssetCategoryID(Long assetCategoryID) {
{
this.assetCategoryID = assetCategoryID; this.assetCategoryID = assetCategoryID;
} }
public String getLocation() public String getLocation() {
{
return location; return location;
} }
public void setLocation(String location) public void setLocation(String location) {
{
this.location = location; this.location = location;
} }
public Short getStatus() public Short getStatus() {
{
return status; return status;
} }
public void setStatus(Short status) public void setStatus(Short status) {
{
this.status = status; this.status = status;
} }
public Long getUsernameID() public Long getUsernameID() {
{
return usernameID; return usernameID;
} }
public void setUsernameID(Long usernameID) public void setUsernameID(Long usernameID) {
{
this.usernameID = usernameID; this.usernameID = usernameID;
} }
public float getPrice() public float getPrice() {
{
return price; return price;
} }
public void setPrice(float price) public void setPrice(float price) {
{
this.price = price; this.price = price;
} }
public String getPurchasedate() public String getPurchasedate() {
{
return purchasedate; return purchasedate;
} }
public void setPurchasedate(String purchasedate) public void setPurchasedate(String purchasedate) {
{
this.purchasedate = purchasedate; this.purchasedate = purchasedate;
} }
public String getPeriodofvalidity() public String getPeriodofvalidity() {
{
return periodofvalidity; return periodofvalidity;
} }
public void setPeriodofvalidity(String periodofvalidity) public void setPeriodofvalidity(String periodofvalidity) {
{
this.periodofvalidity = periodofvalidity; this.periodofvalidity = periodofvalidity;
} }
public String getWarrantydate() public String getWarrantydate() {
{
return warrantydate; return warrantydate;
} }
public void setWarrantydate(String warrantydate) public void setWarrantydate(String warrantydate) {
{
this.warrantydate = warrantydate; this.warrantydate = warrantydate;
} }
public String getAssetnum() public String getAssetnum() {
{
return assetnum; return assetnum;
} }
public void setAssetnum(String assetnum) public void setAssetnum(String assetnum) {
{
this.assetnum = assetnum; this.assetnum = assetnum;
} }
public String getSerialnum() public String getSerialnum() {
{
return serialnum; return serialnum;
} }
public void setSerialnum(String serialnum) public void setSerialnum(String serialnum) {
{
this.serialnum = serialnum; this.serialnum = serialnum;
} }
public String getLabels() public String getLabels() {
{
return labels; return labels;
} }
public void setLabels(String labels) public void setLabels(String labels) {
{
this.labels = labels; this.labels = labels;
} }
public Long getSupplierID() public Long getSupplierID() {
{
return supplierID; return supplierID;
} }
public void setSupplierID(Long supplierID) public void setSupplierID(Long supplierID) {
{
this.supplierID = supplierID; this.supplierID = supplierID;
} }
public String getDescription() public String getDescription() {
{
return description; return description;
} }
public void setDescription(String description) public void setDescription(String description) {
{
this.description = description; this.description = description;
} }
public Long getAssetID() public Long getAssetID() {
{
return assetID; return assetID;
} }
public void setAssetID(Long assetID) public void setAssetID(Long assetID) {
{
this.assetID = assetID; this.assetID = assetID;
} }
public String getAssetIDs() public String getAssetIDs() {
{
return assetIDs; return assetIDs;
} }
public void setAssetIDs(String assetIDs) public void setAssetIDs(String assetIDs) {
{
this.assetIDs = assetIDs; this.assetIDs = assetIDs;
} }
public int getPageSize() public int getPageSize() {
{
return pageSize; return pageSize;
} }
public void setPageSize(int pageSize) public void setPageSize(int pageSize) {
{
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public int getPageNo() public int getPageNo() {
{
return pageNo; return pageNo;
} }
public void setPageNo(int pageNo) public void setPageNo(int pageNo) {
{
this.pageNo = pageNo; this.pageNo = pageNo;
} }
public String getClientIp() public String getClientIp() {
{
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) public void setClientIp(String clientIp) {
{
this.clientIp = clientIp; this.clientIp = clientIp;
} }
public Integer getReportType() public Integer getReportType() {
{
return reportType; return reportType;
} }
public void setReportType(Integer reportType) public void setReportType(Integer reportType) {
{
this.reportType = reportType; this.reportType = reportType;
} }
} }
src/main/java/com/jsh/model/vo/asset/ReportShowModel.java
View file @ 7a436d1c
...@@ -4,31 +4,26 @@ import java.io.Serializable; ...@@ -4,31 +4,26 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@SuppressWarnings({"serial","rawtypes"}) @SuppressWarnings({"serial", "rawtypes"})
public class ReportShowModel implements Serializable public class ReportShowModel implements Serializable {
{
//保存报表数据 //保存报表数据
private List reportData = new ArrayList(); private List reportData = new ArrayList();
//保存提示信息 //保存提示信息
private String msgTip = ""; private String msgTip = "";
public List getReportData() public List getReportData() {
{
return reportData; return reportData;
} }
public void setReportData(List reportData) public void setReportData(List reportData) {
{
this.reportData = reportData; this.reportData = reportData;
} }
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
} }
src/main/java/com/jsh/model/vo/basic/AccountModel.java
View file @ 7a436d1c
...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic; ...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AccountModel implements Serializable public class AccountModel implements Serializable {
{
private AccountShowModel showModel = new AccountShowModel(); private AccountShowModel showModel = new AccountShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
...@@ -17,12 +16,12 @@ public class AccountModel implements Serializable ...@@ -17,12 +16,12 @@ public class AccountModel implements Serializable
* 编号 * 编号
*/ */
private String serialNo = ""; private String serialNo = "";
/** /**
* 期初金额 * 期初金额
*/ */
private Double initialAmount; private Double initialAmount;
/** /**
* 当前余额 * 当前余额
*/ */
...@@ -63,56 +62,46 @@ public class AccountModel implements Serializable ...@@ -63,56 +62,46 @@ public class AccountModel implements Serializable
*/ */
private String clientIp = ""; private String clientIp = "";
public void setShowModel(AccountShowModel showModel) public AccountShowModel getShowModel() {
{
this.showModel = showModel;
}
public AccountShowModel getShowModel()
{
return showModel; return showModel;
} }
public void setName(String name) public void setShowModel(AccountShowModel showModel) {
{ this.showModel = showModel;
this.name = name;
} }
public String getName() public String getName() {
{
return name; return name;
} }
public void setSerialNo(String serialNo) public void setName(String name) {
{ this.name = name;
this.serialNo = serialNo;
} }
public String getSerialNo() public String getSerialNo() {
{
return serialNo; return serialNo;
} }
public void setInitialAmount(Double initialAmount) public void setSerialNo(String serialNo) {
{ this.serialNo = serialNo;
this.initialAmount = initialAmount;
} }
public Double getInitialAmount() public Double getInitialAmount() {
{
return initialAmount; return initialAmount;
} }
public void setCurrentAmount(Double currentAmount) public void setInitialAmount(Double initialAmount) {
{ this.initialAmount = initialAmount;
this.currentAmount = currentAmount;
} }
public Double getCurrentAmount() public Double getCurrentAmount() {
{
return currentAmount; return currentAmount;
} }
public void setCurrentAmount(Double currentAmount) {
this.currentAmount = currentAmount;
}
public Boolean getIsDefault() { public Boolean getIsDefault() {
return isDefault; return isDefault;
} }
...@@ -121,63 +110,51 @@ public class AccountModel implements Serializable ...@@ -121,63 +110,51 @@ public class AccountModel implements Serializable
this.isDefault = isDefault; this.isDefault = isDefault;
} }
public void setRemark(String remark) public String getRemark() {
{
this.remark = remark;
}
public String getRemark()
{
return remark; return remark;
} }
public void setAccountID(Long accountID) public void setRemark(String remark) {
{ this.remark = remark;
this.accountID = accountID;
} }
public Long getAccountID() public Long getAccountID() {
{
return accountID; return accountID;
} }
public void setAccountIDs(String accountIDs) public void setAccountID(Long accountID) {
{ this.accountID = accountID;
this.accountIDs = accountIDs;
} }
public String getAccountIDs() public String getAccountIDs() {
{
return accountIDs; return accountIDs;
} }
public void setPageSize(int pageSize) public void setAccountIDs(String accountIDs) {
{ this.accountIDs = accountIDs;
this.pageSize = pageSize;
} }
public int getPageSize() public int getPageSize() {
{
return pageSize; return pageSize;
} }
public void setPageNo(int pageNo) public void setPageSize(int pageSize) {
{ this.pageSize = pageSize;
this.pageNo = pageNo;
} }
public int getPageNo() public int getPageNo() {
{
return pageNo; return pageNo;
} }
public void setClientIp(String clientIp) public void setPageNo(int pageNo) {
{ this.pageNo = pageNo;
this.clientIp = clientIp;
} }
public String getClientIp() public String getClientIp() {
{
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
} }
src/main/java/com/jsh/model/vo/basic/AccountShowModel.java
View file @ 7a436d1c
...@@ -6,8 +6,7 @@ import java.util.List; ...@@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AccountShowModel implements Serializable public class AccountShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
...@@ -17,15 +16,13 @@ public class AccountShowModel implements Serializable ...@@ -17,15 +16,13 @@ public class AccountShowModel implements Serializable
* 系统数据 * 系统数据
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>(); private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
......
src/main/java/com/jsh/model/vo/basic/AppModel.java
View file @ 7a436d1c
package com.jsh.model.vo.basic; package com.jsh.model.vo.basic;
import org.springframework.web.multipart.MultipartFile;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AppModel implements Serializable public class AppModel implements Serializable {
{
private AppShowModel showModel = new AppShowModel(); private AppShowModel showModel = new AppShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
...@@ -20,54 +17,54 @@ public class AppModel implements Serializable ...@@ -20,54 +17,54 @@ public class AppModel implements Serializable
* 名称 * 名称
*/ */
private String Name = ""; private String Name = "";
/** /**
* 类型 * 类型
*/ */
private String Type = ""; private String Type = "";
/** /**
* 图标 * 图标
*/ */
private String Icon = ""; private String Icon = "";
private File fileInfo; private File fileInfo;
private String fileInfoName; //图片名称 private String fileInfoName; //图片名称
/** /**
* 链接 * 链接
*/ */
private String URL = ""; private String URL = "";
/** /**
* 宽度 * 宽度
*/ */
private String Width = ""; private String Width = "";
/** /**
* 高度 * 高度
*/ */
private String Height = ""; private String Height = "";
/** /**
* 拉伸 * 拉伸
*/ */
private Boolean ReSize = false; private Boolean ReSize = false;
/** /**
* 最大化 * 最大化
*/ */
private Boolean OpenMax = false; private Boolean OpenMax = false;
/** /**
* Flash * Flash
*/ */
private Boolean Flash = false; private Boolean Flash = false;
/** /**
* 种类 * 种类
*/ */
private String ZL = ""; private String ZL = "";
/** /**
* 排序号 * 排序号
*/ */
...@@ -77,238 +74,238 @@ public class AppModel implements Serializable ...@@ -77,238 +74,238 @@ public class AppModel implements Serializable
* 备注 * 备注
*/ */
private String Remark = ""; private String Remark = "";
/** /**
* 启用 * 启用
*/ */
private Boolean Enabled = false; private Boolean Enabled = false;
/** /**
* 分类ID * 分类ID
*/ */
private Long appID = 0l; private Long appID = 0l;
/** /**
* 分类IDs 批量操作使用 * 分类IDs 批量操作使用
*/ */
private String appIDs = ""; private String appIDs = "";
/** /**
* 每页显示的个数 * 每页显示的个数
*/ */
private int pageSize = 10; private int pageSize = 10;
/** /**
* 当前页码 * 当前页码
*/ */
private int pageNo = 1; private int pageNo = 1;
/** /**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
/** /**
* UBType，UserBusiness类型 * UBType，UserBusiness类型
*/ */
private String UBType = ""; private String UBType = "";
/** /**
* UBKeyId，UserBusiness关键id * UBKeyId，UserBusiness关键id
*/ */
private String UBKeyId = ""; private String UBKeyId = "";
public AppShowModel getShowModel() {
return showModel;
}
public void setShowModel(AppShowModel showModel) { public AppShowModel getShowModel() {
this.showModel = showModel; return showModel;
} }
public void setShowModel(AppShowModel showModel) {
this.showModel = showModel;
}
public String getNumber() { public String getNumber() {
return Number; return Number;
} }
public void setNumber(String number) { public void setNumber(String number) {
Number = number; Number = number;
} }
public String getName() { public String getName() {
return Name; return Name;
} }
public void setName(String name) { public void setName(String name) {
Name = name; Name = name;
} }
public File getFileInfo() { public File getFileInfo() {
return fileInfo; return fileInfo;
} }
public void setFileInfo(File fileInfo) { public void setFileInfo(File fileInfo) {
this.fileInfo = fileInfo; this.fileInfo = fileInfo;
} }
public String getFileInfoName() { public String getFileInfoName() {
return fileInfoName; return fileInfoName;
} }
public void setFileInfoName(String fileInfoName) { public void setFileInfoName(String fileInfoName) {
this.fileInfoName = fileInfoName; this.fileInfoName = fileInfoName;
} }
public String getType() { public String getType() {
return Type; return Type;
} }
public void setType(String type) { public void setType(String type) {
Type = type; Type = type;
} }
public String getIcon() { public String getIcon() {
return Icon; return Icon;
} }
public void setIcon(String icon) { public void setIcon(String icon) {
Icon = icon; Icon = icon;
} }
public String getURL() { public String getURL() {
return URL; return URL;
} }
public void setURL(String uRL) { public void setURL(String uRL) {
URL = uRL; URL = uRL;
} }
public String getWidth() { public String getWidth() {
return Width; return Width;
} }
public void setWidth(String width) { public void setWidth(String width) {
Width = width; Width = width;
} }
public String getHeight() { public String getHeight() {
return Height; return Height;
} }
public void setHeight(String height) { public void setHeight(String height) {
Height = height; Height = height;
} }
public Boolean getReSize() { public Boolean getReSize() {
return ReSize; return ReSize;
} }
public void setReSize(Boolean reSize) { public void setReSize(Boolean reSize) {
ReSize = reSize; ReSize = reSize;
} }
public Boolean getOpenMax() { public Boolean getOpenMax() {
return OpenMax; return OpenMax;
} }
public void setOpenMax(Boolean openMax) { public void setOpenMax(Boolean openMax) {
OpenMax = openMax; OpenMax = openMax;
} }
public Boolean getFlash() { public Boolean getFlash() {
return Flash; return Flash;
} }
public void setFlash(Boolean flash) { public void setFlash(Boolean flash) {
Flash = flash; Flash = flash;
} }
public String getZL() { public String getZL() {
return ZL; return ZL;
} }
public void setZL(String zL) { public void setZL(String zL) {
ZL = zL; ZL = zL;
} }
public String getSort() { public String getSort() {
return Sort; return Sort;
} }
public void setSort(String sort) { public void setSort(String sort) {
Sort = sort; Sort = sort;
} }
public String getRemark() { public String getRemark() {
return Remark; return Remark;
} }
public void setRemark(String remark) { public void setRemark(String remark) {
Remark = remark; Remark = remark;
} }
public Boolean getEnabled() { public Boolean getEnabled() {
return Enabled; return Enabled;
} }
public void setEnabled(Boolean enabled) { public void setEnabled(Boolean enabled) {
Enabled = enabled; Enabled = enabled;
} }
public Long getAppID() { public Long getAppID() {
return appID; return appID;
} }
public void setAppID(Long appID) { public void setAppID(Long appID) {
this.appID = appID; this.appID = appID;
} }
public String getAppIDs() { public String getAppIDs() {
return appIDs; return appIDs;
} }
public void setAppIDs(String appIDs) { public void setAppIDs(String appIDs) {
this.appIDs = appIDs; this.appIDs = appIDs;
} }
public int getPageSize() { public int getPageSize() {
return pageSize; return pageSize;
} }
public void setPageSize(int pageSize) { public void setPageSize(int pageSize) {
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public int getPageNo() { public int getPageNo() {
return pageNo; return pageNo;
} }
public void setPageNo(int pageNo) { public void setPageNo(int pageNo) {
this.pageNo = pageNo; this.pageNo = pageNo;
} }
public String getClientIp() { public String getClientIp() {
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) { public void setClientIp(String clientIp) {
this.clientIp = clientIp; this.clientIp = clientIp;
} }
public String getUBType() { public String getUBType() {
return UBType; return UBType;
} }
public void setUBType(String uBType) { public void setUBType(String uBType) {
UBType = uBType; UBType = uBType;
} }
public String getUBKeyId() { public String getUBKeyId() {
return UBKeyId; return UBKeyId;
} }
public void setUBKeyId(String uBKeyId) { public void setUBKeyId(String uBKeyId) {
UBKeyId = uBKeyId; UBKeyId = uBKeyId;
} }
} }
src/main/java/com/jsh/model/vo/basic/AppShowModel.java
View file @ 7a436d1c
...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic; ...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AppShowModel implements Serializable public class AppShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
private String msgTip = ""; private String msgTip = "";
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
} }
src/main/java/com/jsh/model/vo/basic/AssetNameModel.java
View file @ 7a436d1c
...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic; ...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AssetNameModel implements Serializable public class AssetNameModel implements Serializable {
{
private AssetNameShowModel showModel = new AssetNameShowModel(); private AssetNameShowModel showModel = new AssetNameShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
/** /**
...@@ -16,139 +15,119 @@ public class AssetNameModel implements Serializable ...@@ -16,139 +15,119 @@ public class AssetNameModel implements Serializable
* 是否易耗品 * 是否易耗品
*/ */
private Short consumable; private Short consumable;
/** /**
* 描述信息 * 描述信息
*/ */
private String description = ""; private String description = "";
/** /**
* 分类ID * 分类ID
*/ */
private Long categoryID; private Long categoryID;
/** /**
* ID * ID
*/ */
private Long assetNameID = 0l; private Long assetNameID = 0l;
/** /**
* IDs 批量操作使用 * IDs 批量操作使用
*/ */
private String assetNameIDs = ""; private String assetNameIDs = "";
/** /**
* 每页显示的个数 * 每页显示的个数
*/ */
private int pageSize = 10; private int pageSize = 10;
/** /**
* 当前页码 * 当前页码
*/ */
private int pageNo = 1; private int pageNo = 1;
/** /**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
public AssetNameShowModel getShowModel() public AssetNameShowModel getShowModel() {
{
return showModel; return showModel;
} }
public void setShowModel(AssetNameShowModel showModel) public void setShowModel(AssetNameShowModel showModel) {
{
this.showModel = showModel; this.showModel = showModel;
} }
public String getAssetName() public String getAssetName() {
{
return assetName; return assetName;
} }
public void setAssetName(String assetName) public void setAssetName(String assetName) {
{
this.assetName = assetName; this.assetName = assetName;
} }
public String getDescription() public String getDescription() {
{
return description; return description;
} }
public void setDescription(String description) public void setDescription(String description) {
{
this.description = description; this.description = description;
} }
public Long getAssetNameID() public Long getAssetNameID() {
{
return assetNameID; return assetNameID;
} }
public void setAssetNameID(Long assetNameID) public void setAssetNameID(Long assetNameID) {
{
this.assetNameID = assetNameID; this.assetNameID = assetNameID;
} }
public String getAssetNameIDs() public String getAssetNameIDs() {
{
return assetNameIDs; return assetNameIDs;
} }
public void setAssetNameIDs(String assetNameIDs) public void setAssetNameIDs(String assetNameIDs) {
{
this.assetNameIDs = assetNameIDs; this.assetNameIDs = assetNameIDs;
} }
public int getPageSize() public int getPageSize() {
{
return pageSize; return pageSize;
} }
public void setPageSize(int pageSize) public void setPageSize(int pageSize) {
{
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public int getPageNo() public int getPageNo() {
{
return pageNo; return pageNo;
} }
public void setPageNo(int pageNo) public void setPageNo(int pageNo) {
{
this.pageNo = pageNo; this.pageNo = pageNo;
} }
public String getClientIp() public String getClientIp() {
{
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) public void setClientIp(String clientIp) {
{
this.clientIp = clientIp; this.clientIp = clientIp;
} }
public Short getConsumable() public Short getConsumable() {
{
return consumable; return consumable;
} }
public void setConsumable(Short consumable) public void setConsumable(Short consumable) {
{
this.consumable = consumable; this.consumable = consumable;
} }
public Long getCategoryID() public Long getCategoryID() {
{
return categoryID; return categoryID;
} }
public void setCategoryID(Long categoryID) public void setCategoryID(Long categoryID) {
{
this.categoryID = categoryID; this.categoryID = categoryID;
} }
} }
src/main/java/com/jsh/model/vo/basic/AssetNameShowModel.java
View file @ 7a436d1c
...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic; ...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class AssetNameShowModel implements Serializable public class AssetNameShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
private String msgTip = ""; private String msgTip = "";
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
} }
src/main/java/com/jsh/model/vo/basic/CategoryModel.java
View file @ 7a436d1c
...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic; ...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class CategoryModel implements Serializable public class CategoryModel implements Serializable {
{
private CategoryShowModel showModel = new CategoryShowModel(); private CategoryShowModel showModel = new CategoryShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
...@@ -17,109 +16,93 @@ public class CategoryModel implements Serializable ...@@ -17,109 +16,93 @@ public class CategoryModel implements Serializable
* 描述信息 * 描述信息
*/ */
private String description = ""; private String description = "";
/** /**
* 分类ID * 分类ID
*/ */
private Long categoryID = 0l; private Long categoryID = 0l;
/** /**
* 分类IDs 批量操作使用 * 分类IDs 批量操作使用
*/ */
private String categoryIDs = ""; private String categoryIDs = "";
/** /**
* 每页显示的个数 * 每页显示的个数
*/ */
private int pageSize = 10; private int pageSize = 10;
/** /**
* 当前页码 * 当前页码
*/ */
private int pageNo = 1; private int pageNo = 1;
/** /**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
public CategoryShowModel getShowModel() public CategoryShowModel getShowModel() {
{
return showModel; return showModel;
} }
public void setShowModel(CategoryShowModel showModel) public void setShowModel(CategoryShowModel showModel) {
{
this.showModel = showModel; this.showModel = showModel;
} }
public String getCategoryName() public String getCategoryName() {
{
return categoryName; return categoryName;
} }
public void setCategoryName(String categoryName) public void setCategoryName(String categoryName) {
{
this.categoryName = categoryName; this.categoryName = categoryName;
} }
public String getDescription() public String getDescription() {
{
return description; return description;
} }
public void setDescription(String description) public void setDescription(String description) {
{
this.description = description; this.description = description;
} }
public Long getCategoryID() public Long getCategoryID() {
{
return categoryID; return categoryID;
} }
public void setCategoryID(Long categoryID) public void setCategoryID(Long categoryID) {
{
this.categoryID = categoryID; this.categoryID = categoryID;
} }
public String getCategoryIDs() public String getCategoryIDs() {
{
return categoryIDs; return categoryIDs;
} }
public void setCategoryIDs(String categoryIDs) public void setCategoryIDs(String categoryIDs) {
{
this.categoryIDs = categoryIDs; this.categoryIDs = categoryIDs;
} }
public int getPageSize() public int getPageSize() {
{
return pageSize; return pageSize;
} }
public void setPageSize(int pageSize) public void setPageSize(int pageSize) {
{
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public int getPageNo() public int getPageNo() {
{
return pageNo; return pageNo;
} }
public void setPageNo(int pageNo) public void setPageNo(int pageNo) {
{
this.pageNo = pageNo; this.pageNo = pageNo;
} }
public String getClientIp() public String getClientIp() {
{
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) public void setClientIp(String clientIp) {
{
this.clientIp = clientIp; this.clientIp = clientIp;
} }
} }
src/main/java/com/jsh/model/vo/basic/CategoryShowModel.java
View file @ 7a436d1c
...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic; ...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class CategoryShowModel implements Serializable public class CategoryShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
private String msgTip = ""; private String msgTip = "";
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
} }
src/main/java/com/jsh/model/vo/basic/DepotModel.java
View file @ 7a436d1c
...@@ -3,189 +3,188 @@ package com.jsh.model.vo.basic; ...@@ -3,189 +3,188 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class DepotModel implements Serializable public class DepotModel implements Serializable {
{ private DepotShowModel showModel = new DepotShowModel();
private DepotShowModel showModel = new DepotShowModel();
/**======开始接受页面参数=================**/
/**======开始接受页面参数=================**/ /**
/** * 仓库名称
* 仓库名称 */
*/ private String name = "";
private String name = "";
private String address = ""; //仓库地址
private String address = ""; //仓库地址 private Double warehousing; //仓储费
private Double warehousing; //仓储费 private Double truckage; //搬运费
private Double truckage; //搬运费
/**
/** * 排序
* 排序 */
*/ private String sort = "";
private String sort = "";
/**
/** * 类型
* 类型 */
*/ private Integer type = 0;
private Integer type = 0;
/**
/** * 描述
* 描述 */
*/ private String remark = "";
private String remark = "";
/**
/** * 分类ID
* 分类ID */
*/ private Long depotID = 0l;
private Long depotID = 0l;
/**
/** * 分类IDs 批量操作使用
* 分类IDs 批量操作使用 */
*/ private String depotIDs = "";
private String depotIDs = "";
/**
/** * 每页显示的个数
* 每页显示的个数 */
*/ private int pageSize = 10;
private int pageSize = 10;
/**
/** * 当前页码
* 当前页码 */
*/ private int pageNo = 1;
private int pageNo = 1;
/**
/** * 用户IP，用户记录操作日志
* 用户IP，用户记录操作日志 */
*/ private String clientIp = "";
private String clientIp = "";
/**
/** * UBType，UserBusiness类型
* UBType，UserBusiness类型 */
*/ private String UBType = "";
private String UBType = "";
/**
/** * UBKeyId，UserBusiness关键id
* UBKeyId，UserBusiness关键id */
*/ private String UBKeyId = "";
private String UBKeyId = "";
public DepotShowModel getShowModel() {
public DepotShowModel getShowModel() { return showModel;
return showModel; }
}
public void setShowModel(DepotShowModel showModel) {
public void setShowModel(DepotShowModel showModel) { this.showModel = showModel;
this.showModel = showModel; }
}
public String getName() {
public String getName() { return name;
return name; }
}
public void setName(String name) {
public void setName(String name) { this.name = name;
this.name = name; }
}
public String getAddress() {
public String getAddress() { return address;
return address; }
}
public void setAddress(String address) {
public void setAddress(String address) { this.address = address;
this.address = address; }
}
public Double getWarehousing() {
public Double getWarehousing() { return warehousing;
return warehousing; }
}
public void setWarehousing(Double warehousing) {
public void setWarehousing(Double warehousing) { this.warehousing = warehousing;
this.warehousing = warehousing; }
}
public Double getTruckage() {
public Double getTruckage() { return truckage;
return truckage; }
}
public void setTruckage(Double truckage) {
public void setTruckage(Double truckage) { this.truckage = truckage;
this.truckage = truckage; }
}
public Integer getType() {
public Integer getType() { return type;
return type; }
}
public void setType(Integer type) {
public void setType(Integer type) { this.type = type;
this.type = type; }
}
public String getSort() {
public String getSort() { return sort;
return sort; }
}
public void setSort(String sort) {
public void setSort(String sort) { this.sort = sort;
this.sort = sort; }
}
public String getRemark() {
public String getRemark() { return remark;
return remark; }
}
public void setRemark(String remark) {
public void setRemark(String remark) { this.remark = remark;
this.remark = remark; }
}
public Long getDepotID() {
public Long getDepotID() { return depotID;
return depotID; }
}
public void setDepotID(Long depotID) {
public void setDepotID(Long depotID) { this.depotID = depotID;
this.depotID = depotID; }
}
public String getDepotIDs() {
public String getDepotIDs() { return depotIDs;
return depotIDs; }
}
public void setDepotIDs(String depotIDs) {
public void setDepotIDs(String depotIDs) { this.depotIDs = depotIDs;
this.depotIDs = depotIDs; }
}
public int getPageSize() {
public int getPageSize() { return pageSize;
return pageSize; }
}
public void setPageSize(int pageSize) {
public void setPageSize(int pageSize) { this.pageSize = pageSize;
this.pageSize = pageSize; }
}
public int getPageNo() {
public int getPageNo() { return pageNo;
return pageNo; }
}
public void setPageNo(int pageNo) {
public void setPageNo(int pageNo) { this.pageNo = pageNo;
this.pageNo = pageNo; }
}
public String getClientIp() {
public String getClientIp() { return clientIp;
return clientIp; }
}
public void setClientIp(String clientIp) { public void setClientIp(String clientIp) {
this.clientIp = clientIp; this.clientIp = clientIp;
} }
public String getUBType() { public String getUBType() {
return UBType; return UBType;
} }
public void setUBType(String uBType) { public void setUBType(String uBType) {
UBType = uBType; UBType = uBType;
} }
public String getUBKeyId() { public String getUBKeyId() {
return UBKeyId; return UBKeyId;
} }
public void setUBKeyId(String uBKeyId) { public void setUBKeyId(String uBKeyId) {
UBKeyId = uBKeyId; UBKeyId = uBKeyId;
} }
} }
src/main/java/com/jsh/model/vo/basic/DepotShowModel.java
View file @ 7a436d1c
...@@ -6,38 +6,35 @@ import java.util.List; ...@@ -6,38 +6,35 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class DepotShowModel implements Serializable public class DepotShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
private String msgTip = ""; private String msgTip = "";
/** /**
* 系统数据 * 系统数据
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>(); private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public Map<String, List> getMap() { public Map<String, List> getMap() {
return map; return map;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
public void setMap(Map<String, List> map) { public void setMap(Map<String, List> map) {
this.map = map; this.map = map;
} }
} }
src/main/java/com/jsh/model/vo/basic/FunctionsModel.java
View file @ 7a436d1c
...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic; ...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class FunctionsModel implements Serializable public class FunctionsModel implements Serializable {
{
private FunctionsShowModel showModel = new FunctionsShowModel(); private FunctionsShowModel showModel = new FunctionsShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
...@@ -40,190 +39,190 @@ public class FunctionsModel implements Serializable ...@@ -40,190 +39,190 @@ public class FunctionsModel implements Serializable
* 类型 * 类型
*/ */
private String Type = ""; private String Type = "";
/** /**
* 功能按钮 * 功能按钮
*/ */
private String PushBtn = ""; private String PushBtn = "";
/** /**
* 拥有的功能列表 * 拥有的功能列表
*/ */
private String hasFunctions= ""; private String hasFunctions = "";
/** /**
* 分类ID * 分类ID
*/ */
private Long functionsID = 0l; private Long functionsID = 0l;
/** /**
* 分类IDs 批量操作使用 * 分类IDs 批量操作使用
*/ */
private String functionsIDs = ""; private String functionsIDs = "";
/** /**
* 每页显示的个数 * 每页显示的个数
*/ */
private int pageSize = 10; private int pageSize = 10;
/** /**
* 当前页码 * 当前页码
*/ */
private int pageNo = 1; private int pageNo = 1;
/** /**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
/** /**
* UBType，UserBusiness类型 * UBType，UserBusiness类型
*/ */
private String UBType = ""; private String UBType = "";
/** /**
* UBKeyId，UserBusiness关键id * UBKeyId，UserBusiness关键id
*/ */
private String UBKeyId = ""; private String UBKeyId = "";
public FunctionsShowModel getShowModel() { public FunctionsShowModel getShowModel() {
return showModel; return showModel;
} }
public void setShowModel(FunctionsShowModel showModel) { public void setShowModel(FunctionsShowModel showModel) {
this.showModel = showModel; this.showModel = showModel;
} }
public String getNumber() { public String getNumber() {
return Number; return Number;
} }
public void setNumber(String number) { public void setNumber(String number) {
Number = number; Number = number;
} }
public String getName() { public String getName() {
return Name; return Name;
} }
public void setName(String name) { public void setName(String name) {
Name = name; Name = name;
} }
public String getPNumber() { public String getPNumber() {
return PNumber; return PNumber;
} }
public void setPNumber(String pNumber) { public void setPNumber(String pNumber) {
PNumber = pNumber; PNumber = pNumber;
} }
public String getURL() { public String getURL() {
return URL; return URL;
} }
public void setURL(String uRL) { public void setURL(String uRL) {
URL = uRL; URL = uRL;
} }
public Boolean getState() { public Boolean getState() {
return State; return State;
} }
public void setState(Boolean state) { public void setState(Boolean state) {
State = state; State = state;
} }
public String getSort() { public String getSort() {
return Sort; return Sort;
} }
public void setSort(String sort) { public void setSort(String sort) {
Sort = sort; Sort = sort;
} }
public Boolean getEnabled() { public Boolean getEnabled() {
return Enabled; return Enabled;
} }
public void setEnabled(Boolean enabled) { public void setEnabled(Boolean enabled) {
Enabled = enabled; Enabled = enabled;
} }
public String getType() { public String getType() {
return Type; return Type;
} }
public void setType(String type) { public void setType(String type) {
Type = type; Type = type;
} }
public Long getFunctionsID() { public Long getFunctionsID() {
return functionsID; return functionsID;
} }
public void setFunctionsID(Long functionsID) { public void setFunctionsID(Long functionsID) {
this.functionsID = functionsID; this.functionsID = functionsID;
} }
public String getFunctionsIDs() { public String getFunctionsIDs() {
return functionsIDs; return functionsIDs;
} }
public void setFunctionsIDs(String functionsIDs) { public void setFunctionsIDs(String functionsIDs) {
this.functionsIDs = functionsIDs; this.functionsIDs = functionsIDs;
} }
public int getPageSize() { public int getPageSize() {
return pageSize; return pageSize;
} }
public void setPageSize(int pageSize) { public void setPageSize(int pageSize) {
this.pageSize = pageSize; this.pageSize = pageSize;
} }
public int getPageNo() { public int getPageNo() {
return pageNo; return pageNo;
} }
public void setPageNo(int pageNo) { public void setPageNo(int pageNo) {
this.pageNo = pageNo; this.pageNo = pageNo;
} }
public String getClientIp() { public String getClientIp() {
return clientIp; return clientIp;
} }
public void setClientIp(String clientIp) { public void setClientIp(String clientIp) {
this.clientIp = clientIp; this.clientIp = clientIp;
} }
public String getUBType() { public String getUBType() {
return UBType; return UBType;
} }
public void setUBType(String uBType) { public void setUBType(String uBType) {
UBType = uBType; UBType = uBType;
} }
public String getUBKeyId() { public String getUBKeyId() {
return UBKeyId; return UBKeyId;
} }
public void setUBKeyId(String uBKeyId) { public void setUBKeyId(String uBKeyId) {
UBKeyId = uBKeyId; UBKeyId = uBKeyId;
} }
public String getHasFunctions() { public String getHasFunctions() {
return hasFunctions; return hasFunctions;
} }
public void setHasFunctions(String hasFunctions) { public void setHasFunctions(String hasFunctions) {
this.hasFunctions = hasFunctions; this.hasFunctions = hasFunctions;
} }
public String getPushBtn() { public String getPushBtn() {
return PushBtn; return PushBtn;
} }
public void setPushBtn(String pushBtn) { public void setPushBtn(String pushBtn) {
PushBtn = pushBtn; PushBtn = pushBtn;
} }
} }
src/main/java/com/jsh/model/vo/basic/FunctionsShowModel.java
View file @ 7a436d1c
...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic; ...@@ -3,20 +3,17 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class FunctionsShowModel implements Serializable public class FunctionsShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
private String msgTip = ""; private String msgTip = "";
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
} }
src/main/java/com/jsh/model/vo/basic/InOutItemModel.java
View file @ 7a436d1c
...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic; ...@@ -3,8 +3,7 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class InOutItemModel implements Serializable public class InOutItemModel implements Serializable {
{
private InOutItemShowModel showModel = new InOutItemShowModel(); private InOutItemShowModel showModel = new InOutItemShowModel();
/**======开始接受页面参数=================**/ /**======开始接受页面参数=================**/
...@@ -48,93 +47,75 @@ public class InOutItemModel implements Serializable ...@@ -48,93 +47,75 @@ public class InOutItemModel implements Serializable
*/ */
private String clientIp = ""; private String clientIp = "";
public void setShowModel(InOutItemShowModel showModel) public InOutItemShowModel getShowModel() {
{
this.showModel = showModel;
}
public InOutItemShowModel getShowModel()
{
return showModel; return showModel;
} }
public void setName(String name) public void setShowModel(InOutItemShowModel showModel) {
{ this.showModel = showModel;
this.name = name;
} }
public String getName() public String getName() {
{
return name; return name;
} }
public void setType(String type) public void setName(String name) {
{ this.name = name;
this.type = type;
} }
public String getType() public String getType() {
{
return type; return type;
} }
public void setRemark(String remark) public void setType(String type) {
{ this.type = type;
this.remark = remark;
} }
public String getRemark() public String getRemark() {
{
return remark; return remark;
} }
public void setInOutItemID(Long inOutItemID) public void setRemark(String remark) {
{ this.remark = remark;
this.inOutItemID = inOutItemID;
} }
public Long getInOutItemID() public Long getInOutItemID() {
{
return inOutItemID; return inOutItemID;
} }
public void setInOutItemIDs(String inOutItemIDs) public void setInOutItemID(Long inOutItemID) {
{ this.inOutItemID = inOutItemID;
this.inOutItemIDs = inOutItemIDs;
} }
public String getInOutItemIDs() public String getInOutItemIDs() {
{
return inOutItemIDs; return inOutItemIDs;
} }
public void setPageSize(int pageSize) public void setInOutItemIDs(String inOutItemIDs) {
{ this.inOutItemIDs = inOutItemIDs;
this.pageSize = pageSize;
} }
public int getPageSize() public int getPageSize() {
{
return pageSize; return pageSize;
} }
public void setPageNo(int pageNo) public void setPageSize(int pageSize) {
{ this.pageSize = pageSize;
this.pageNo = pageNo;
} }
public int getPageNo() public int getPageNo() {
{
return pageNo; return pageNo;
} }
public void setClientIp(String clientIp) public void setPageNo(int pageNo) {
{ this.pageNo = pageNo;
this.clientIp = clientIp;
} }
public String getClientIp() public String getClientIp() {
{
return clientIp; return clientIp;
} }
}
public void setClientIp(String clientIp) {
this.clientIp = clientIp;
}
}
src/main/java/com/jsh/model/vo/basic/InOutItemShowModel.java
View file @ 7a436d1c
...@@ -6,8 +6,7 @@ import java.util.List; ...@@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class InOutItemShowModel implements Serializable public class InOutItemShowModel implements Serializable {
{
/** /**
* 提示信息 * 提示信息
*/ */
...@@ -17,15 +16,13 @@ public class InOutItemShowModel implements Serializable ...@@ -17,15 +16,13 @@ public class InOutItemShowModel implements Serializable
* 系统数据 * 系统数据
*/ */
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
private Map<String,List> map = new HashMap<String,List>(); private Map<String, List> map = new HashMap<String, List>();
public String getMsgTip() public String getMsgTip() {
{
return msgTip; return msgTip;
} }
public void setMsgTip(String msgTip) public void setMsgTip(String msgTip) {
{
this.msgTip = msgTip; this.msgTip = msgTip;
} }
......
src/main/java/com/jsh/model/vo/basic/LogModel.java
View file @ 7a436d1c
...@@ -3,198 +3,174 @@ package com.jsh.model.vo.basic; ...@@ -3,198 +3,174 @@ package com.jsh.model.vo.basic;
import java.io.Serializable; import java.io.Serializable;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class LogModel implements Serializable public class LogModel implements Serializable {
{ private LogShowModel showModel = new LogShowModel();
private LogShowModel showModel = new LogShowModel(); /**======开始接受页面参数=================**/
/**======开始接受页面参数=================**/ /**
/** * 用户ID
* 用户ID */
*/ private Long usernameID;
private Long usernameID ;
/**
/** * 操作
* 操作 */
*/ private String operation;
private String operation;
/**
/** * 开始时间
* 开始时间 */
*/ private String beginTime;
private String beginTime;
/**
/** * 结束时间
* 结束时间 */
*/ private String endTime;
private String endTime;
/**
/** * 是否成功 0==成功 1==失败
* 是否成功 0==成功 1==失败 */
*/ private Short status;
private Short status;
/**
/** * 操作具体内容
* 操作具体内容 */
*/ private String contentdetails;
private String contentdetails;
/**
/** * 描述信息
* 描述信息 */
*/ private String remark = "";
private String remark = "";
/**
/** * 日志ID
* 日志ID */
*/ private Long logID = 0l;
private Long logID = 0l;
/**
/** * 日志IDs 批量操作使用
* 日志IDs 批量操作使用 */
*/ private String logIDs = "";
private String logIDs = "";
/**
/** * 每页显示的个数
* 每页显示的个数 */
*/ private int pageSize = 10;
private int pageSize = 10;
/**
/** * 当前页码
* 当前页码 */
*/ private int pageNo = 1;
private int pageNo = 1;
/**
/**
* 用户IP，用户记录操作日志 * 用户IP，用户记录操作日志
*/ */
private String clientIp = ""; private String clientIp = "";
public LogShowModel getShowModel() {
return showModel; public LogShowModel getShowModel() {
} return showModel;
}
public void setShowModel(LogShowModel showModel) {
this.showModel = showModel; public void setShowModel(LogShowModel showModel) {
} this.showModel = showModel;
}
public Long getLogID()
{ public Long getLogID() {
return logID; return logID;
} }
public void setLogID(Long logID) public void setLogID(Long logID) {
{ this.logID = logID;
this.logID = logID; }
}
public String getLogIDs() {
public String getLogIDs() return logIDs;
{ }
return logIDs;
} public void setLogIDs(String logIDs) {
this.logIDs = logIDs;
public void setLogIDs(String logIDs) }
{
this.logIDs = logIDs; public int getPageSize() {
} return pageSize;
}
public int getPageSize()
{ public void setPageSize(int pageSize) {
return pageSize; this.pageSize = pageSize;
} }
public void setPageSize(int pageSize) public int getPageNo() {
{ return pageNo;
this.pageSize = pageSize; }
}
public void setPageNo(int pageNo) {
public int getPageNo() this.pageNo = pageNo;
{ }
return pageNo;
} public String getClientIp() {
return clientIp;
public void setPageNo(int pageNo) }
{
this.pageNo = pageNo; public void setClientIp(String clientIp) {
} this.clientIp = clientIp;
}
public String getClientIp()
{ public Long getUsernameID() {
return clientIp; return usernameID;
} }
public void setClientIp(String clientIp) public void setUsernameID(Long usernameID) {
{ this.usernameID = usernameID;
this.clientIp = clientIp; }
}
public String getOperation() {
public Long getUsernameID() return operation;
{ }
return usernameID;
} public void setOperation(String operation) {
this.operation = operation;
public void setUsernameID(Long usernameID) }
{
this.usernameID = usernameID; public String getBeginTime() {
} if (null == beginTime || beginTime.length() == 0)
return beginTime;
public String getOperation() return beginTime + " 00:00:00";
{ }
return operation;
} public void setBeginTime(String beginTime) {
this.beginTime = beginTime;
public void setOperation(String operation) }
{
this.operation = operation; public String getEndTime() {
} if (null == endTime || endTime.length() == 0)
return endTime;
public String getBeginTime() return endTime + " 23:59:59";
{ }
if(null == beginTime || beginTime.length() == 0)
return beginTime; public void setEndTime(String endTime) {
return beginTime + " 00:00:00"; this.endTime = endTime;
} }
public void setBeginTime(String beginTime) public Short getStatus() {
{ return status;
this.beginTime = beginTime; }
}
public void setStatus(Short status) {
public String getEndTime() this.status = status;
{ }
if(null == endTime || endTime.length() ==0)
return endTime; public String getContentdetails() {
return endTime + " 23:59:59"; return contentdetails;
} }
public void setEndTime(String endTime) public void setContentdetails(String contentdetails) {
{ this.contentdetails = contentdetails;
this.endTime = endTime; }
}
public String getRemark() {
public Short getStatus() return remark;
{ }
return status;
} public void setRemark(String remark) {
this.remark = remark;
public void setStatus(Short status) }
{
this.status = status;
}
public String getContentdetails()
{
return contentdetails;
}
public void setContentdetails(String contentdetails)
{
this.contentdetails = contentdetails;
}
public String getRemark()
{
return remark;
}
public void setRemark(String remark)
{
this.remark = remark;
}
} }
Supports Markdown
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