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