Skip to content

D
device-new-platform
Commit 9ed47a85 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加资源部署站点字段

parent 612535ac
Show whitespace changes
Inline Side-by-side
Showing with 2868 additions and 1719 deletions
device-manager-ui/admin/src/views/device/module/distribute/list.vue
View file @ 9ed47a85
...@@ -11,13 +11,18 @@ ...@@ -11,13 +11,18 @@
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
import session from "@/assets/utils/session";
export default { export default {
name: "DeviceModuleDistributeList", name: "DeviceModuleDistributeList",
components: { components: {
dialogShow, dialogShow,
}, },
mixins: [table], mixins: [table],
created() {}, created() {
const siteid = session.getSession("siteid");
console.log("siteId:"+siteid)
this.query["siteId"]=1;
},
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
......
device-manager/db/add.sql
View file @ 9ed47a85
...@@ -49,3 +49,16 @@ ADD COLUMN `push` tinyint(2) DEFAULT '0' COMMENT '是否推送', ...@@ -49,3 +49,16 @@ ADD COLUMN `push` tinyint(2) DEFAULT '0' COMMENT '是否推送',
ADD COLUMN `productId` bigint(20) DEFAULT '0' COMMENT '产品Id', ADD COLUMN `productId` bigint(20) DEFAULT '0' COMMENT '产品Id',
ADD COLUMN `productCode` varchar(256) DEFAULT '' COMMENT '产品编码', ADD COLUMN `productCode` varchar(256) DEFAULT '' COMMENT '产品编码',
ADD COLUMN `productName` varchar(256) DEFAULT '' COMMENT '产品名称' ADD COLUMN `productName` varchar(256) DEFAULT '' COMMENT '产品名称'
-- ----------------------------
2023-08-17
-- ----------------------------
ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN `siteId` bigint(20) COMMENT '站点Id，来源基础服务平台';
ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN `siteCode` varchar(256) default '' COMMENT '站点编号，来源基础服务平台';
ALTER TABLE mortals_xhx_device_module_distribute ADD COLUMN `siteName` varchar(256) default '' COMMENT '站点名称';
ALTER TABLE mortals_xhx_product_version ADD COLUMN `siteId` bigint(20) COMMENT '站点Id，来源基础服务平台';
ALTER TABLE mortals_xhx_product_version ADD COLUMN `siteCode` varchar(256) default '' COMMENT '站点编号，来源基础服务平台';
ALTER TABLE mortals_xhx_product_version ADD COLUMN `siteName` varchar(256) default '' COMMENT '站点名称';
device-manager/pom.xml
View file @ 9ed47a85
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://127.0.0.1:3306/device-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://127.0.0.1:3306/device-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>xhx@2022</profiles.datasource.password> <profiles.datasource.password>root</profiles.datasource.password>
<profiles.redis.uri>127.0.0.1</profiles.redis.uri> <profiles.redis.uri>127.0.0.1</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
...@@ -186,8 +186,8 @@ ...@@ -186,8 +186,8 @@
<profiles.redis.database>6</profiles.redis.database> <profiles.redis.database>6</profiles.redis.database>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host> <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username> <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password> <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost> <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.rabbitmq.exchange>amp.direct</profiles.rabbitmq.exchange> <profiles.rabbitmq.exchange>amp.direct</profiles.rabbitmq.exchange>
<profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl> <profiles.sms.smsSendUrl>http://127.0.0.1:8089/api/index/index</profiles.sms.smsSendUrl>
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<package.environment>build:prod</package.environment> <package.environment>build:prod</package.environment>
<skipDeploy>false</skipDeploy> <skipDeploy>false</skipDeploy>
</properties> </properties>
......
device-manager/src/main/bin/start.cmd
View file @ 9ed47a85
...@@ -29,7 +29,7 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.port=%PORT% ...@@ -29,7 +29,7 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.port=%PORT%
set JVM_CONFIG=%JVM_CONFIG% -Djava.io.tmpdir=%TEMP_PATH% set JVM_CONFIG=%JVM_CONFIG% -Djava.io.tmpdir=%TEMP_PATH%
set JVM_CONFIG=%JVM_CONFIG% -Dbasedir=%BASEDIR% set JVM_CONFIG=%JVM_CONFIG% -Dbasedir=%BASEDIR%
set JVM_CONFIG=%JVM_CONFIG% -Dloader.path=file://%BASEDIR%/conf,file://%BASEDIR%/lib set JVM_CONFIG=%JVM_CONFIG% -Dloader.path=file://%BASEDIR%/conf,file://%BASEDIR%/lib
set JVM_CONFIG=%JVM_CONFIG% -Dfile.encoding=utf-8
set DEBUG_OPTS= set DEBUG_OPTS=
if ""%1"" == ""debug"" ( if ""%1"" == ""debug"" (
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleDistributeEntity.java
View file @ 9ed47a85
package com.mortals.xhx.module.device.model; package com.mortals.xhx.module.device.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceModuleDistributeVo; import com.mortals.xhx.module.device.model.vo.DeviceModuleDistributeVo;
import lombok.Data;
/** /**
* 设备前端模块部署实体对象 * 设备前端模块部署实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-08-02 * @date 2023-08-18
*/ */
@Data
public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo { public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -57,140 +54,18 @@ public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo { ...@@ -57,140 +54,18 @@ public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo {
*/ */
@Excel(name = "是否部署", readConverterExp = "0=否,1=是") @Excel(name = "是否部署", readConverterExp = "0=否,1=是")
private Integer distribute; private Integer distribute;
public DeviceModuleDistributeEntity(){}
/**
* 获取 产品Id
* @return Long
*/
public Long getProductId(){
return productId;
}
/**
* 设置 产品Id
* @param productId
*/
public void setProductId(Long productId){
this.productId = productId;
}
/**
* 获取 产品编码
* @return String
*/
public String getProductCode(){
return productCode;
}
/**
* 设置 产品编码
* @param productCode
*/
public void setProductCode(String productCode){
this.productCode = productCode;
}
/**
* 获取 产品名称
* @return String
*/
public String getProductName(){
return productName;
}
/**
* 设置 产品名称
* @param productName
*/
public void setProductName(String productName){
this.productName = productName;
}
/**
* 获取 分辨率
* @return String
*/
public String getImageResolution(){
return imageResolution;
}
/**
* 设置 分辨率
* @param imageResolution
*/
public void setImageResolution(String imageResolution){
this.imageResolution = imageResolution;
}
/**
* 获取 分辨率值
* @return String
*/
public String getImageResolutionValue(){
return imageResolutionValue;
}
/**
* 设置 分辨率值
* @param imageResolutionValue
*/
public void setImageResolutionValue(String imageResolutionValue){
this.imageResolutionValue = imageResolutionValue;
}
/** /**
* 获取 文件相对路径地址 * 站点Id，来源基础服务平台
* @return String
*/ */
public String getFilePath(){ private Long siteId;
return filePath;
}
/**
* 设置 文件相对路径地址
* @param filePath
*/
public void setFilePath(String filePath){
this.filePath = filePath;
}
/**
* 获取 文件部署路径地址
* @return String
*/
public String getDistributeFilePath(){
return distributeFilePath;
}
/**
* 设置 文件部署路径地址
* @param distributeFilePath
*/
public void setDistributeFilePath(String distributeFilePath){
this.distributeFilePath = distributeFilePath;
}
/**
* 获取 版本号
* @return String
*/
public String getVersion(){
return version;
}
/**
* 设置 版本号
* @param version
*/
public void setVersion(String version){
this.version = version;
}
/** /**
* 获取 是否部署(0.否，1.是) * 站点编号，来源基础服务平台
* @return Integer
*/ */
public Integer getDistribute(){ private String siteCode;
return distribute;
}
/** /**
* 设置 是否部署(0.否，1.是) * 站点名称
* @param distribute
*/ */
public void setDistribute(Integer distribute){ private String siteName;
this.distribute = distribute;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -207,38 +82,18 @@ public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo { ...@@ -207,38 +82,18 @@ public class DeviceModuleDistributeEntity extends DeviceModuleDistributeVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",productId:").append(getProductId());
sb.append(",productCode:").append(getProductCode());
sb.append(",productName:").append(getProductName());
sb.append(",imageResolution:").append(getImageResolution());
sb.append(",imageResolutionValue:").append(getImageResolutionValue());
sb.append(",filePath:").append(getFilePath());
sb.append(",distributeFilePath:").append(getDistributeFilePath());
sb.append(",version:").append(getVersion());
sb.append(",distribute:").append(getDistribute());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.productId = 0L;
this.productId = null;
this.productCode = ""; this.productCode = "";
this.productName = ""; this.productName = "";
this.imageResolution = "";
this.imageResolution = "0";
this.imageResolutionValue = ""; this.imageResolutionValue = "";
this.filePath = ""; this.filePath = "";
this.distributeFilePath = ""; this.distributeFilePath = "";
this.version = ""; this.version = "";
this.distribute = 0; this.distribute = 0;
this.siteId = 0L;
this.siteCode = "";
this.siteName = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceModuleDistributeQuery.java
View file @ 9ed47a85
package com.mortals.xhx.module.device.model; package com.mortals.xhx.module.device.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
/** /**
* 设备前端模块部署查询对象 * 设备前端模块部署查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-08-02 * @date 2023-08-18
*/ */
public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +20,9 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -21,6 +20,9 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 产品Id */ /** 开始 产品Id */
private Long productIdStart; private Long productIdStart;
...@@ -33,27 +35,44 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -33,27 +35,44 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
/** 产品Id列表 */ /** 产品Id列表 */
private List <Long> productIdList; private List <Long> productIdList;
/** 产品Id排除列表 */
private List <Long> productIdNotList;
/** 产品编码 */ /** 产品编码 */
private List<String> productCodeList; private List<String> productCodeList;
/** 产品编码排除列表 */
private List <String> productCodeNotList;
/** 产品名称 */ /** 产品名称 */
private List<String> productNameList; private List<String> productNameList;
/** 产品名称排除列表 */
private List <String> productNameNotList;
/** 分辨率 */ /** 分辨率 */
private List<String> imageResolutionList; private List<String> imageResolutionList;
/** 分辨率排除列表 */
private List <String> imageResolutionNotList;
/** 分辨率值 */ /** 分辨率值 */
private List<String> imageResolutionValueList; private List<String> imageResolutionValueList;
/** 分辨率值排除列表 */
private List <String> imageResolutionValueNotList;
/** 文件相对路径地址 */ /** 文件相对路径地址 */
private List<String> filePathList; private List<String> filePathList;
/** 文件相对路径地址排除列表 */
private List <String> filePathNotList;
/** 文件部署路径地址 */ /** 文件部署路径地址 */
private List<String> distributeFilePathList; private List<String> distributeFilePathList;
/** 文件部署路径地址排除列表 */
private List <String> distributeFilePathNotList;
/** 版本号 */ /** 版本号 */
private List<String> versionList; private List<String> versionList;
/** 版本号排除列表 */
private List <String> versionNotList;
/** 开始 是否部署(0.否，1.是) */ /** 开始 是否部署(0.否，1.是) */
private Integer distributeStart; private Integer distributeStart;
...@@ -66,6 +85,9 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -66,6 +85,9 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
/** 是否部署(0.否，1.是)列表 */ /** 是否部署(0.否，1.是)列表 */
private List <Integer> distributeList; private List <Integer> distributeList;
/** 是否部署(0.否，1.是)排除列表 */
private List <Integer> distributeNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -84,12 +106,40 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -84,12 +106,40 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 站点Id，来源基础服务平台 */
private Long siteIdStart;
/** 结束 站点Id，来源基础服务平台 */
private Long siteIdEnd;
/** 增加 站点Id，来源基础服务平台 */
private Long siteIdIncrement;
/** 站点Id，来源基础服务平台列表 */
private List <Long> siteIdList;
/** 站点Id，来源基础服务平台排除列表 */
private List <Long> siteIdNotList;
/** 站点编号，来源基础服务平台 */
private List<String> siteCodeList;
/** 站点编号，来源基础服务平台排除列表 */
private List <String> siteCodeNotList;
/** 站点名称 */
private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<DeviceModuleDistributeQuery> orConditionList; private List<DeviceModuleDistributeQuery> orConditionList;
...@@ -162,6 +212,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -162,6 +212,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 产品Id * 获取 开始 产品Id
* @return productIdStart * @return productIdStart
...@@ -226,6 +293,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -226,6 +293,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
this.productIdList = productIdList; this.productIdList = productIdList;
} }
/**
* 获取 产品Id
* @return productIdNotList
*/
public List<Long> getProductIdNotList(){
return this.productIdNotList;
}
/**
* 设置 产品Id
* @param productIdNotList
*/
public void setProductIdNotList(List<Long> productIdNotList){
this.productIdNotList = productIdNotList;
}
/** /**
* 获取 产品编码 * 获取 产品编码
* @return productCodeList * @return productCodeList
...@@ -241,6 +325,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -241,6 +325,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setProductCodeList(List<String> productCodeList){ public void setProductCodeList(List<String> productCodeList){
this.productCodeList = productCodeList; this.productCodeList = productCodeList;
} }
/**
* 获取 产品编码
* @return productCodeNotList
*/
public List<String> getProductCodeNotList(){
return this.productCodeNotList;
}
/**
* 设置 产品编码
* @param productCodeNotList
*/
public void setProductCodeNotList(List<String> productCodeNotList){
this.productCodeNotList = productCodeNotList;
}
/** /**
* 获取 产品名称 * 获取 产品名称
* @return productNameList * @return productNameList
...@@ -256,6 +357,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -256,6 +357,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setProductNameList(List<String> productNameList){ public void setProductNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
} }
/**
* 获取 产品名称
* @return productNameNotList
*/
public List<String> getProductNameNotList(){
return this.productNameNotList;
}
/**
* 设置 产品名称
* @param productNameNotList
*/
public void setProductNameNotList(List<String> productNameNotList){
this.productNameNotList = productNameNotList;
}
/** /**
* 获取 分辨率 * 获取 分辨率
* @return imageResolutionList * @return imageResolutionList
...@@ -271,6 +389,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -271,6 +389,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setImageResolutionList(List<String> imageResolutionList){ public void setImageResolutionList(List<String> imageResolutionList){
this.imageResolutionList = imageResolutionList; this.imageResolutionList = imageResolutionList;
} }
/**
* 获取 分辨率
* @return imageResolutionNotList
*/
public List<String> getImageResolutionNotList(){
return this.imageResolutionNotList;
}
/**
* 设置 分辨率
* @param imageResolutionNotList
*/
public void setImageResolutionNotList(List<String> imageResolutionNotList){
this.imageResolutionNotList = imageResolutionNotList;
}
/** /**
* 获取 分辨率值 * 获取 分辨率值
* @return imageResolutionValueList * @return imageResolutionValueList
...@@ -286,6 +421,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -286,6 +421,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setImageResolutionValueList(List<String> imageResolutionValueList){ public void setImageResolutionValueList(List<String> imageResolutionValueList){
this.imageResolutionValueList = imageResolutionValueList; this.imageResolutionValueList = imageResolutionValueList;
} }
/**
* 获取 分辨率值
* @return imageResolutionValueNotList
*/
public List<String> getImageResolutionValueNotList(){
return this.imageResolutionValueNotList;
}
/**
* 设置 分辨率值
* @param imageResolutionValueNotList
*/
public void setImageResolutionValueNotList(List<String> imageResolutionValueNotList){
this.imageResolutionValueNotList = imageResolutionValueNotList;
}
/** /**
* 获取 文件相对路径地址 * 获取 文件相对路径地址
* @return filePathList * @return filePathList
...@@ -301,6 +453,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -301,6 +453,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setFilePathList(List<String> filePathList){ public void setFilePathList(List<String> filePathList){
this.filePathList = filePathList; this.filePathList = filePathList;
} }
/**
* 获取 文件相对路径地址
* @return filePathNotList
*/
public List<String> getFilePathNotList(){
return this.filePathNotList;
}
/**
* 设置 文件相对路径地址
* @param filePathNotList
*/
public void setFilePathNotList(List<String> filePathNotList){
this.filePathNotList = filePathNotList;
}
/** /**
* 获取 文件部署路径地址 * 获取 文件部署路径地址
* @return distributeFilePathList * @return distributeFilePathList
...@@ -316,6 +485,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -316,6 +485,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setDistributeFilePathList(List<String> distributeFilePathList){ public void setDistributeFilePathList(List<String> distributeFilePathList){
this.distributeFilePathList = distributeFilePathList; this.distributeFilePathList = distributeFilePathList;
} }
/**
* 获取 文件部署路径地址
* @return distributeFilePathNotList
*/
public List<String> getDistributeFilePathNotList(){
return this.distributeFilePathNotList;
}
/**
* 设置 文件部署路径地址
* @param distributeFilePathNotList
*/
public void setDistributeFilePathNotList(List<String> distributeFilePathNotList){
this.distributeFilePathNotList = distributeFilePathNotList;
}
/** /**
* 获取 版本号 * 获取 版本号
* @return versionList * @return versionList
...@@ -331,6 +517,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -331,6 +517,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
public void setVersionList(List<String> versionList){ public void setVersionList(List<String> versionList){
this.versionList = versionList; this.versionList = versionList;
} }
/**
* 获取 版本号
* @return versionNotList
*/
public List<String> getVersionNotList(){
return this.versionNotList;
}
/**
* 设置 版本号
* @param versionNotList
*/
public void setVersionNotList(List<String> versionNotList){
this.versionNotList = versionNotList;
}
/** /**
* 获取 开始 是否部署(0.否，1.是) * 获取 开始 是否部署(0.否，1.是)
* @return distributeStart * @return distributeStart
...@@ -395,6 +598,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -395,6 +598,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
this.distributeList = distributeList; this.distributeList = distributeList;
} }
/**
* 获取 是否部署(0.否，1.是)
* @return distributeNotList
*/
public List<Integer> getDistributeNotList(){
return this.distributeNotList;
}
/**
* 设置 是否部署(0.否，1.是)
* @param distributeNotList
*/
public void setDistributeNotList(List<Integer> distributeNotList){
this.distributeNotList = distributeNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -491,6 +711,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -491,6 +711,23 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -523,6 +760,151 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -523,6 +760,151 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点Id，来源基础服务平台
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点Id，来源基础服务平台
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点Id，来源基础服务平台
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点编号，来源基础服务平台
* @return siteCodeList
*/
public List<String> getSiteCodeList(){
return this.siteCodeList;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeList
*/
public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
}
/**
* 获取 站点编号，来源基础服务平台
* @return siteCodeNotList
*/
public List<String> getSiteCodeNotList(){
return this.siteCodeNotList;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeNotList
*/
public void setSiteCodeNotList(List<String> siteCodeNotList){
this.siteCodeNotList = siteCodeNotList;
}
/**
* 获取 站点名称
* @return siteNameList
*/
public List<String> getSiteNameList(){
return this.siteNameList;
}
/**
* 设置 站点名称
* @param siteNameList
*/
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -568,6 +950,15 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -568,6 +950,15 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public DeviceModuleDistributeQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 产品Id * 设置 产品Id
* @param productId * @param productId
...@@ -613,6 +1004,15 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -613,6 +1004,15 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
return this; return this;
} }
/**
* 设置 产品Id
* @param productIdNotList
*/
public DeviceModuleDistributeQuery productIdNotList(List<Long> productIdNotList){
this.productIdNotList = productIdNotList;
return this;
}
/** /**
* 设置 产品编码 * 设置 产品编码
...@@ -791,6 +1191,15 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -791,6 +1191,15 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
return this; return this;
} }
/**
* 设置 是否部署(0.否，1.是)
* @param distributeNotList
*/
public DeviceModuleDistributeQuery distributeNotList(List<Integer> distributeNotList){
this.distributeNotList = distributeNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -837,6 +1246,107 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity { ...@@ -837,6 +1246,107 @@ public class DeviceModuleDistributeQuery extends DeviceModuleDistributeEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public DeviceModuleDistributeQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteId
*/
public DeviceModuleDistributeQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public DeviceModuleDistributeQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public DeviceModuleDistributeQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public DeviceModuleDistributeQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public DeviceModuleDistributeQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public DeviceModuleDistributeQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCode
*/
public DeviceModuleDistributeQuery siteCode(String siteCode){
setSiteCode(siteCode);
return this;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeList
*/
public DeviceModuleDistributeQuery siteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
return this;
}
/**
* 设置 站点名称
* @param siteName
*/
public DeviceModuleDistributeQuery siteName(String siteName){
setSiteName(siteName);
return this;
}
/**
* 设置 站点名称
* @param siteNameList
*/
public DeviceModuleDistributeQuery siteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceModuleDistributeServiceImpl.java
View file @ 9ed47a85
...@@ -42,9 +42,7 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D ...@@ -42,9 +42,7 @@ public class DeviceModuleDistributeServiceImpl extends AbstractCRUDServiceImpl<D
ProductEntity productEntity = productService.get(entity.getProductId(), context); ProductEntity productEntity = productService.get(entity.getProductId(), context);
entity.setProductCode(productEntity.getProductCode()); entity.setProductCode(productEntity.getProductCode());
entity.setProductName(productEntity.getProductName()); entity.setProductName(productEntity.getProductName());
entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc()); entity.setImageResolutionValue(ImageReEnum.getByValue(Integer.parseInt(entity.getImageResolution())).getDesc());
super.saveBefore(entity, context); super.saveBefore(entity, context);
} }
......
device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductVersionEntity.java
View file @ 9ed47a85
package com.mortals.xhx.module.product.model; package com.mortals.xhx.module.product.model;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.product.model.vo.ProductVersionVo; import com.mortals.xhx.module.product.model.vo.ProductVersionVo;
import lombok.Data;
/** /**
* 产品客户端版本实体对象 * 产品客户端版本实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-08-22 * @date 2023-08-18
*/ */
@Data
public class ProductVersionEntity extends ProductVersionVo { public class ProductVersionEntity extends ProductVersionVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -43,98 +40,18 @@ public class ProductVersionEntity extends ProductVersionVo { ...@@ -43,98 +40,18 @@ public class ProductVersionEntity extends ProductVersionVo {
*/ */
@Excel(name = "备注信息") @Excel(name = "备注信息")
private String remark; private String remark;
public ProductVersionEntity(){}
/**
* 获取 产品Id
* @return Long
*/
public Long getProductId(){
return productId;
}
/**
* 设置 产品Id
* @param productId
*/
public void setProductId(Long productId){
this.productId = productId;
}
/**
* 获取 产品编码
* @return String
*/
public String getProductCode(){
return productCode;
}
/**
* 设置 产品编码
* @param productCode
*/
public void setProductCode(String productCode){
this.productCode = productCode;
}
/**
* 获取 产品名称
* @return String
*/
public String getProductName(){
return productName;
}
/** /**
* 设置 产品名称 * 站点Id，来源基础服务平台
* @param productName
*/ */
public void setProductName(String productName){ private Long siteId;
this.productName = productName;
}
/** /**
* 获取 文件相对路径地址 * 站点编号，来源基础服务平台
* @return String
*/ */
public String getFilePath(){ private String siteCode;
return filePath;
}
/** /**
* 设置 文件相对路径地址 * 站点名称
* @param filePath
*/ */
public void setFilePath(String filePath){ private String siteName;
this.filePath = filePath;
}
/**
* 获取 版本号
* @return Integer
*/
public Integer getVersion(){
return version;
}
/**
* 设置 版本号
* @param version
*/
public void setVersion(Integer version){
this.version = version;
}
/**
* 获取 备注信息
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 备注信息
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -151,29 +68,15 @@ public class ProductVersionEntity extends ProductVersionVo { ...@@ -151,29 +68,15 @@ public class ProductVersionEntity extends ProductVersionVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",productId:").append(getProductId());
sb.append(",productCode:").append(getProductCode());
sb.append(",productName:").append(getProductName());
sb.append(",filePath:").append(getFilePath());
sb.append(",version:").append(getVersion());
sb.append(",remark:").append(getRemark());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.productId = 0L;
this.productId = null;
this.productCode = ""; this.productCode = "";
this.productName = ""; this.productName = "";
this.filePath = ""; this.filePath = "";
this.version = 0;
this.version = null;
this.remark = ""; this.remark = "";
this.siteId = 0L;
this.siteCode = "";
this.siteName = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductVersionQuery.java
View file @ 9ed47a85
package com.mortals.xhx.module.product.model; package com.mortals.xhx.module.product.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.product.model.ProductVersionEntity;
/** /**
* 产品客户端版本查询对象 * 产品客户端版本查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-08-22 * @date 2023-08-18
*/ */
public class ProductVersionQuery extends ProductVersionEntity { public class ProductVersionQuery extends ProductVersionEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +20,9 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -21,6 +20,9 @@ public class ProductVersionQuery extends ProductVersionEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 产品Id */ /** 开始 产品Id */
private Long productIdStart; private Long productIdStart;
...@@ -33,15 +35,24 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -33,15 +35,24 @@ public class ProductVersionQuery extends ProductVersionEntity {
/** 产品Id列表 */ /** 产品Id列表 */
private List <Long> productIdList; private List <Long> productIdList;
/** 产品Id排除列表 */
private List <Long> productIdNotList;
/** 产品编码 */ /** 产品编码 */
private List<String> productCodeList; private List<String> productCodeList;
/** 产品编码排除列表 */
private List <String> productCodeNotList;
/** 产品名称 */ /** 产品名称 */
private List<String> productNameList; private List<String> productNameList;
/** 产品名称排除列表 */
private List <String> productNameNotList;
/** 文件相对路径地址 */ /** 文件相对路径地址 */
private List<String> filePathList; private List<String> filePathList;
/** 文件相对路径地址排除列表 */
private List <String> filePathNotList;
/** 开始 版本号 */ /** 开始 版本号 */
private Integer versionStart; private Integer versionStart;
...@@ -54,9 +65,14 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -54,9 +65,14 @@ public class ProductVersionQuery extends ProductVersionEntity {
/** 版本号列表 */ /** 版本号列表 */
private List <Integer> versionList; private List <Integer> versionList;
/** 版本号排除列表 */
private List <Integer> versionNotList;
/** 备注信息 */ /** 备注信息 */
private List<String> remarkList; private List<String> remarkList;
/** 备注信息排除列表 */
private List <String> remarkNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -75,12 +91,40 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -75,12 +91,40 @@ public class ProductVersionQuery extends ProductVersionEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 站点Id，来源基础服务平台 */
private Long siteIdStart;
/** 结束 站点Id，来源基础服务平台 */
private Long siteIdEnd;
/** 增加 站点Id，来源基础服务平台 */
private Long siteIdIncrement;
/** 站点Id，来源基础服务平台列表 */
private List <Long> siteIdList;
/** 站点Id，来源基础服务平台排除列表 */
private List <Long> siteIdNotList;
/** 站点编号，来源基础服务平台 */
private List<String> siteCodeList;
/** 站点编号，来源基础服务平台排除列表 */
private List <String> siteCodeNotList;
/** 站点名称 */
private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ProductVersionQuery> orConditionList; private List<ProductVersionQuery> orConditionList;
...@@ -153,6 +197,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -153,6 +197,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 产品Id * 获取 开始 产品Id
* @return productIdStart * @return productIdStart
...@@ -217,6 +278,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -217,6 +278,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
this.productIdList = productIdList; this.productIdList = productIdList;
} }
/**
* 获取 产品Id
* @return productIdNotList
*/
public List<Long> getProductIdNotList(){
return this.productIdNotList;
}
/**
* 设置 产品Id
* @param productIdNotList
*/
public void setProductIdNotList(List<Long> productIdNotList){
this.productIdNotList = productIdNotList;
}
/** /**
* 获取 产品编码 * 获取 产品编码
* @return productCodeList * @return productCodeList
...@@ -232,6 +310,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -232,6 +310,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
public void setProductCodeList(List<String> productCodeList){ public void setProductCodeList(List<String> productCodeList){
this.productCodeList = productCodeList; this.productCodeList = productCodeList;
} }
/**
* 获取 产品编码
* @return productCodeNotList
*/
public List<String> getProductCodeNotList(){
return this.productCodeNotList;
}
/**
* 设置 产品编码
* @param productCodeNotList
*/
public void setProductCodeNotList(List<String> productCodeNotList){
this.productCodeNotList = productCodeNotList;
}
/** /**
* 获取 产品名称 * 获取 产品名称
* @return productNameList * @return productNameList
...@@ -247,6 +342,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -247,6 +342,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
public void setProductNameList(List<String> productNameList){ public void setProductNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
} }
/**
* 获取 产品名称
* @return productNameNotList
*/
public List<String> getProductNameNotList(){
return this.productNameNotList;
}
/**
* 设置 产品名称
* @param productNameNotList
*/
public void setProductNameNotList(List<String> productNameNotList){
this.productNameNotList = productNameNotList;
}
/** /**
* 获取 文件相对路径地址 * 获取 文件相对路径地址
* @return filePathList * @return filePathList
...@@ -262,6 +374,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -262,6 +374,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
public void setFilePathList(List<String> filePathList){ public void setFilePathList(List<String> filePathList){
this.filePathList = filePathList; this.filePathList = filePathList;
} }
/**
* 获取 文件相对路径地址
* @return filePathNotList
*/
public List<String> getFilePathNotList(){
return this.filePathNotList;
}
/**
* 设置 文件相对路径地址
* @param filePathNotList
*/
public void setFilePathNotList(List<String> filePathNotList){
this.filePathNotList = filePathNotList;
}
/** /**
* 获取 开始 版本号 * 获取 开始 版本号
* @return versionStart * @return versionStart
...@@ -326,6 +455,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -326,6 +455,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
this.versionList = versionList; this.versionList = versionList;
} }
/**
* 获取 版本号
* @return versionNotList
*/
public List<Integer> getVersionNotList(){
return this.versionNotList;
}
/**
* 设置 版本号
* @param versionNotList
*/
public void setVersionNotList(List<Integer> versionNotList){
this.versionNotList = versionNotList;
}
/** /**
* 获取 备注信息 * 获取 备注信息
* @return remarkList * @return remarkList
...@@ -341,6 +487,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -341,6 +487,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/**
* 获取 备注信息
* @return remarkNotList
*/
public List<String> getRemarkNotList(){
return this.remarkNotList;
}
/**
* 设置 备注信息
* @param remarkNotList
*/
public void setRemarkNotList(List<String> remarkNotList){
this.remarkNotList = remarkNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -437,6 +600,23 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -437,6 +600,23 @@ public class ProductVersionQuery extends ProductVersionEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -469,6 +649,151 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -469,6 +649,151 @@ public class ProductVersionQuery extends ProductVersionEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 站点Id，来源基础服务平台
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点Id，来源基础服务平台
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点Id，来源基础服务平台
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点编号，来源基础服务平台
* @return siteCodeList
*/
public List<String> getSiteCodeList(){
return this.siteCodeList;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeList
*/
public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
}
/**
* 获取 站点编号，来源基础服务平台
* @return siteCodeNotList
*/
public List<String> getSiteCodeNotList(){
return this.siteCodeNotList;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeNotList
*/
public void setSiteCodeNotList(List<String> siteCodeNotList){
this.siteCodeNotList = siteCodeNotList;
}
/**
* 获取 站点名称
* @return siteNameList
*/
public List<String> getSiteNameList(){
return this.siteNameList;
}
/**
* 设置 站点名称
* @param siteNameList
*/
public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
}
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -514,6 +839,15 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -514,6 +839,15 @@ public class ProductVersionQuery extends ProductVersionEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public ProductVersionQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 产品Id * 设置 产品Id
* @param productId * @param productId
...@@ -559,6 +893,15 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -559,6 +893,15 @@ public class ProductVersionQuery extends ProductVersionEntity {
return this; return this;
} }
/**
* 设置 产品Id
* @param productIdNotList
*/
public ProductVersionQuery productIdNotList(List<Long> productIdNotList){
this.productIdNotList = productIdNotList;
return this;
}
/** /**
* 设置 产品编码 * 设置 产品编码
...@@ -661,6 +1004,15 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -661,6 +1004,15 @@ public class ProductVersionQuery extends ProductVersionEntity {
return this; return this;
} }
/**
* 设置 版本号
* @param versionNotList
*/
public ProductVersionQuery versionNotList(List<Integer> versionNotList){
this.versionNotList = versionNotList;
return this;
}
/** /**
* 设置 备注信息 * 设置 备注信息
...@@ -726,6 +1078,107 @@ public class ProductVersionQuery extends ProductVersionEntity { ...@@ -726,6 +1078,107 @@ public class ProductVersionQuery extends ProductVersionEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public ProductVersionQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteId
*/
public ProductVersionQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public ProductVersionQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public ProductVersionQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public ProductVersionQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public ProductVersionQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public ProductVersionQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCode
*/
public ProductVersionQuery siteCode(String siteCode){
setSiteCode(siteCode);
return this;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeList
*/
public ProductVersionQuery siteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList;
return this;
}
/**
* 设置 站点名称
* @param siteName
*/
public ProductVersionQuery siteName(String siteName){
setSiteName(siteName);
return this;
}
/**
* 设置 站点名称
* @param siteNameList
*/
public ProductVersionQuery siteNameList(List<String> siteNameList){
this.siteNameList = siteNameList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
device-manager/src/main/resources/sqlmap/module/device/DeviceModuleDistributeMapper.xml
View file @ 9ed47a85
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceModuleDistributeDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceModuleDistributeDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="siteId" column="siteId" />
<result property="siteCode" column="siteCode" />
<result property="siteName" column="siteName" />
</resultMap> </resultMap>
...@@ -64,23 +67,32 @@ ...@@ -64,23 +67,32 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
a.siteCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceModuleDistributeEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceModuleDistributeEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_module_distribute insert into mortals_xhx_device_module_distribute
(productId,productCode,productName,imageResolution,imageResolutionValue,filePath,distributeFilePath,version,distribute,createTime,updateUserId,updateTime) (productId,productCode,productName,imageResolution,imageResolutionValue,filePath,distributeFilePath,version,distribute,createTime,updateUserId,updateTime,siteId,siteCode,siteName)
VALUES VALUES
(#{productId},#{productCode},#{productName},#{imageResolution},#{imageResolutionValue},#{filePath},#{distributeFilePath},#{version},#{distribute},#{createTime},#{updateUserId},#{updateTime}) (#{productId},#{productCode},#{productName},#{imageResolution},#{imageResolutionValue},#{filePath},#{distributeFilePath},#{version},#{distribute},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{siteCode},#{siteName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_module_distribute insert into mortals_xhx_device_module_distribute
(productId,productCode,productName,imageResolution,imageResolutionValue,filePath,distributeFilePath,version,distribute,createTime,updateUserId,updateTime) (productId,productCode,productName,imageResolution,imageResolutionValue,filePath,distributeFilePath,version,distribute,createTime,updateUserId,updateTime,siteId,siteCode,siteName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.productId},#{item.productCode},#{item.productName},#{item.imageResolution},#{item.imageResolutionValue},#{item.filePath},#{item.distributeFilePath},#{item.version},#{item.distribute},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.productId},#{item.productCode},#{item.productName},#{item.imageResolution},#{item.imageResolutionValue},#{item.filePath},#{item.distributeFilePath},#{item.version},#{item.distribute},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.siteCode},#{item.siteName})
</foreach> </foreach>
</insert> </insert>
...@@ -135,6 +147,18 @@ ...@@ -135,6 +147,18 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
a.siteCode=#{data.siteCode},
</if>
<if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
a.siteName=#{data.siteName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -246,6 +270,32 @@ ...@@ -246,6 +270,32 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
when a.id=#{item.id} then #{item.siteCode}
</if>
</foreach>
</trim>
<trim prefix="siteName=(case" suffix="ELSE siteName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
when a.id=#{item.id} then #{item.siteName}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -269,6 +319,21 @@ ...@@ -269,6 +319,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_device_module_distribute where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_device_module_distribute where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_device_module_distribute as a delete a.* from mortals_xhx_device_module_distribute as a
...@@ -355,12 +420,18 @@ ...@@ -355,12 +420,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -376,12 +447,18 @@ ...@@ -376,12 +447,18 @@
${_conditionType_} a.productId is null ${_conditionType_} a.productId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productIdList')"> <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
${_conditionType_} a.productId in ${_conditionType_} a.productId in
<foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
${_conditionType_} a.productId not in
<foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null"> <if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart} ${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
</if> </if>
...@@ -398,12 +475,18 @@ ...@@ -398,12 +475,18 @@
${_conditionType_} a.productCode is null ${_conditionType_} a.productCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productCodeList')"> <if test="conditionParamRef.containsKey('productCodeList') and conditionParamRef.productCodeList.size() > 0">
${_conditionType_} a.productCode in ${_conditionType_} a.productCode in
<foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productCodeNotList') and conditionParamRef.productCodeNotList.size() > 0">
${_conditionType_} a.productCode not in
<foreach collection="conditionParamRef.productCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productName')"> <if test="conditionParamRef.containsKey('productName')">
<if test="conditionParamRef.productName != null and conditionParamRef.productName != ''"> <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
...@@ -413,12 +496,18 @@ ...@@ -413,12 +496,18 @@
${_conditionType_} a.productName is null ${_conditionType_} a.productName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productNameList')"> <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
${_conditionType_} a.productName in ${_conditionType_} a.productName in
<foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
${_conditionType_} a.productName not in
<foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('imageResolution')"> <if test="conditionParamRef.containsKey('imageResolution')">
<if test="conditionParamRef.imageResolution != null and conditionParamRef.imageResolution != ''"> <if test="conditionParamRef.imageResolution != null and conditionParamRef.imageResolution != ''">
...@@ -428,12 +517,18 @@ ...@@ -428,12 +517,18 @@
${_conditionType_} a.imageResolution is null ${_conditionType_} a.imageResolution is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('imageResolutionList')"> <if test="conditionParamRef.containsKey('imageResolutionList') and conditionParamRef.imageResolutionList.size() > 0">
${_conditionType_} a.imageResolution in ${_conditionType_} a.imageResolution in
<foreach collection="conditionParamRef.imageResolutionList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.imageResolutionList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('imageResolutionNotList') and conditionParamRef.imageResolutionNotList.size() > 0">
${_conditionType_} a.imageResolution not in
<foreach collection="conditionParamRef.imageResolutionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('imageResolutionValue')"> <if test="conditionParamRef.containsKey('imageResolutionValue')">
<if test="conditionParamRef.imageResolutionValue != null and conditionParamRef.imageResolutionValue != ''"> <if test="conditionParamRef.imageResolutionValue != null and conditionParamRef.imageResolutionValue != ''">
...@@ -443,12 +538,18 @@ ...@@ -443,12 +538,18 @@
${_conditionType_} a.imageResolutionValue is null ${_conditionType_} a.imageResolutionValue is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('imageResolutionValueList')"> <if test="conditionParamRef.containsKey('imageResolutionValueList') and conditionParamRef.imageResolutionValueList.size() > 0">
${_conditionType_} a.imageResolutionValue in ${_conditionType_} a.imageResolutionValue in
<foreach collection="conditionParamRef.imageResolutionValueList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.imageResolutionValueList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('imageResolutionValueNotList') and conditionParamRef.imageResolutionValueNotList.size() > 0">
${_conditionType_} a.imageResolutionValue not in
<foreach collection="conditionParamRef.imageResolutionValueNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePath')"> <if test="conditionParamRef.containsKey('filePath')">
<if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''"> <if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
...@@ -458,12 +559,18 @@ ...@@ -458,12 +559,18 @@
${_conditionType_} a.filePath is null ${_conditionType_} a.filePath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('filePathList')"> <if test="conditionParamRef.containsKey('filePathList') and conditionParamRef.filePathList.size() > 0">
${_conditionType_} a.filePath in ${_conditionType_} a.filePath in
<foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('filePathNotList') and conditionParamRef.filePathNotList.size() > 0">
${_conditionType_} a.filePath not in
<foreach collection="conditionParamRef.filePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeFilePath')"> <if test="conditionParamRef.containsKey('distributeFilePath')">
<if test="conditionParamRef.distributeFilePath != null and conditionParamRef.distributeFilePath != ''"> <if test="conditionParamRef.distributeFilePath != null and conditionParamRef.distributeFilePath != ''">
...@@ -473,12 +580,18 @@ ...@@ -473,12 +580,18 @@
${_conditionType_} a.distributeFilePath is null ${_conditionType_} a.distributeFilePath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('distributeFilePathList')"> <if test="conditionParamRef.containsKey('distributeFilePathList') and conditionParamRef.distributeFilePathList.size() > 0">
${_conditionType_} a.distributeFilePath in ${_conditionType_} a.distributeFilePath in
<foreach collection="conditionParamRef.distributeFilePathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.distributeFilePathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('distributeFilePathNotList') and conditionParamRef.distributeFilePathNotList.size() > 0">
${_conditionType_} a.distributeFilePath not in
<foreach collection="conditionParamRef.distributeFilePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('version')"> <if test="conditionParamRef.containsKey('version')">
<if test="conditionParamRef.version != null and conditionParamRef.version != ''"> <if test="conditionParamRef.version != null and conditionParamRef.version != ''">
...@@ -488,12 +601,18 @@ ...@@ -488,12 +601,18 @@
${_conditionType_} a.version is null ${_conditionType_} a.version is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('versionList')"> <if test="conditionParamRef.containsKey('versionList') and conditionParamRef.versionList.size() > 0">
${_conditionType_} a.version in ${_conditionType_} a.version in
<foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('versionNotList') and conditionParamRef.versionNotList.size() > 0">
${_conditionType_} a.version not in
<foreach collection="conditionParamRef.versionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distribute')"> <if test="conditionParamRef.containsKey('distribute')">
<if test="conditionParamRef.distribute != null "> <if test="conditionParamRef.distribute != null ">
${_conditionType_} a.distribute = #{${_conditionParam_}.distribute} ${_conditionType_} a.distribute = #{${_conditionParam_}.distribute}
...@@ -502,12 +621,18 @@ ...@@ -502,12 +621,18 @@
${_conditionType_} a.distribute is null ${_conditionType_} a.distribute is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('distributeList')"> <if test="conditionParamRef.containsKey('distributeList') and conditionParamRef.distributeList.size() > 0">
${_conditionType_} a.distribute in ${_conditionType_} a.distribute in
<foreach collection="conditionParamRef.distributeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.distributeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('distributeNotList') and conditionParamRef.distributeNotList.size() > 0">
${_conditionType_} a.distribute not in
<foreach collection="conditionParamRef.distributeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeStart') and conditionParamRef.distributeStart != null"> <if test="conditionParamRef.containsKey('distributeStart') and conditionParamRef.distributeStart != null">
${_conditionType_} a.distribute <![CDATA[ >= ]]> #{${_conditionParam_}.distributeStart} ${_conditionType_} a.distribute <![CDATA[ >= ]]> #{${_conditionParam_}.distributeStart}
</if> </if>
...@@ -538,12 +663,18 @@ ...@@ -538,12 +663,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -566,6 +697,75 @@ ...@@ -566,6 +697,75 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
</if>
<if test="conditionParamRef.siteCode == null">
${_conditionType_} a.siteCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
${_conditionType_} a.siteCode not in
<foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteName')">
<if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
</if>
<if test="conditionParamRef.siteName == null">
${_conditionType_} a.siteName is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -644,6 +844,21 @@ ...@@ -644,6 +844,21 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteCode')">
a.siteCode
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteName')">
a.siteName
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
device-manager/src/main/resources/sqlmap/module/product/ProductVersionMapper.xml
View file @ 9ed47a85
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.product.dao.ibatis.ProductVersionDaoImpl"> <mapper namespace="com.mortals.xhx.module.product.dao.ibatis.ProductVersionDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="siteId" column="siteId" />
<result property="siteCode" column="siteCode" />
<result property="siteName" column="siteName" />
</resultMap> </resultMap>
...@@ -52,23 +55,32 @@ ...@@ -52,23 +55,32 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
a.siteCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ProductVersionEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ProductVersionEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_product_version insert into mortals_xhx_product_version
(productId,productCode,productName,filePath,version,remark,createTime,updateUserId,updateTime) (productId,productCode,productName,filePath,version,remark,createTime,updateUserId,updateTime,siteId,siteCode,siteName)
VALUES VALUES
(#{productId},#{productCode},#{productName},#{filePath},#{version},#{remark},#{createTime},#{updateUserId},#{updateTime}) (#{productId},#{productCode},#{productName},#{filePath},#{version},#{remark},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{siteCode},#{siteName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_product_version insert into mortals_xhx_product_version
(productId,productCode,productName,filePath,version,remark,createTime,updateUserId,updateTime) (productId,productCode,productName,filePath,version,remark,createTime,updateUserId,updateTime,siteId,siteCode,siteName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.productId},#{item.productCode},#{item.productName},#{item.filePath},#{item.version},#{item.remark},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.productId},#{item.productCode},#{item.productName},#{item.filePath},#{item.version},#{item.remark},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.siteCode},#{item.siteName})
</foreach> </foreach>
</insert> </insert>
...@@ -114,6 +126,18 @@ ...@@ -114,6 +126,18 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteCode')) or (colPickMode==1 and !data.containsKey('siteCode'))">
a.siteCode=#{data.siteCode},
</if>
<if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
a.siteName=#{data.siteName},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -204,6 +228,32 @@ ...@@ -204,6 +228,32 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="siteCode=(case" suffix="ELSE siteCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteCode')) or (colPickMode==1 and !item.containsKey('siteCode'))">
when a.id=#{item.id} then #{item.siteCode}
</if>
</foreach>
</trim>
<trim prefix="siteName=(case" suffix="ELSE siteName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
when a.id=#{item.id} then #{item.siteName}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -227,6 +277,21 @@ ...@@ -227,6 +277,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_product_version where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_product_version where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_product_version as a delete a.* from mortals_xhx_product_version as a
...@@ -313,12 +378,18 @@ ...@@ -313,12 +378,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -334,12 +405,18 @@ ...@@ -334,12 +405,18 @@
${_conditionType_} a.productId is null ${_conditionType_} a.productId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productIdList')"> <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
${_conditionType_} a.productId in ${_conditionType_} a.productId in
<foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
${_conditionType_} a.productId not in
<foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null"> <if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart} ${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
</if> </if>
...@@ -356,12 +433,18 @@ ...@@ -356,12 +433,18 @@
${_conditionType_} a.productCode is null ${_conditionType_} a.productCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productCodeList')"> <if test="conditionParamRef.containsKey('productCodeList') and conditionParamRef.productCodeList.size() > 0">
${_conditionType_} a.productCode in ${_conditionType_} a.productCode in
<foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productCodeNotList') and conditionParamRef.productCodeNotList.size() > 0">
${_conditionType_} a.productCode not in
<foreach collection="conditionParamRef.productCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productName')"> <if test="conditionParamRef.containsKey('productName')">
<if test="conditionParamRef.productName != null and conditionParamRef.productName != ''"> <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
...@@ -371,12 +454,18 @@ ...@@ -371,12 +454,18 @@
${_conditionType_} a.productName is null ${_conditionType_} a.productName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productNameList')"> <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
${_conditionType_} a.productName in ${_conditionType_} a.productName in
<foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
${_conditionType_} a.productName not in
<foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePath')"> <if test="conditionParamRef.containsKey('filePath')">
<if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''"> <if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
...@@ -386,12 +475,18 @@ ...@@ -386,12 +475,18 @@
${_conditionType_} a.filePath is null ${_conditionType_} a.filePath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('filePathList')"> <if test="conditionParamRef.containsKey('filePathList') and conditionParamRef.filePathList.size() > 0">
${_conditionType_} a.filePath in ${_conditionType_} a.filePath in
<foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('filePathNotList') and conditionParamRef.filePathNotList.size() > 0">
${_conditionType_} a.filePath not in
<foreach collection="conditionParamRef.filePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('version')"> <if test="conditionParamRef.containsKey('version')">
<if test="conditionParamRef.version != null "> <if test="conditionParamRef.version != null ">
${_conditionType_} a.version = #{${_conditionParam_}.version} ${_conditionType_} a.version = #{${_conditionParam_}.version}
...@@ -400,12 +495,18 @@ ...@@ -400,12 +495,18 @@
${_conditionType_} a.version is null ${_conditionType_} a.version is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('versionList')"> <if test="conditionParamRef.containsKey('versionList') and conditionParamRef.versionList.size() > 0">
${_conditionType_} a.version in ${_conditionType_} a.version in
<foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('versionNotList') and conditionParamRef.versionNotList.size() > 0">
${_conditionType_} a.version not in
<foreach collection="conditionParamRef.versionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('versionStart') and conditionParamRef.versionStart != null"> <if test="conditionParamRef.containsKey('versionStart') and conditionParamRef.versionStart != null">
${_conditionType_} a.version <![CDATA[ >= ]]> #{${_conditionParam_}.versionStart} ${_conditionType_} a.version <![CDATA[ >= ]]> #{${_conditionParam_}.versionStart}
</if> </if>
...@@ -422,12 +523,18 @@ ...@@ -422,12 +523,18 @@
${_conditionType_} a.remark is null ${_conditionType_} a.remark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('remarkList')"> <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
${_conditionType_} a.remark in ${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -451,12 +558,18 @@ ...@@ -451,12 +558,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -479,6 +592,75 @@ ...@@ -479,6 +592,75 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('siteCode')">
<if test="conditionParamRef.siteCode != null and conditionParamRef.siteCode != ''">
${_conditionType_} a.siteCode like #{${_conditionParam_}.siteCode}
</if>
<if test="conditionParamRef.siteCode == null">
${_conditionType_} a.siteCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
${_conditionType_} a.siteCode not in
<foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteName')">
<if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
</if>
<if test="conditionParamRef.siteName == null">
${_conditionType_} a.siteName is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -542,6 +724,21 @@ ...@@ -542,6 +724,21 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteCode')">
a.siteCode
<if test='orderCol.siteCode != null and "DESC".equalsIgnoreCase(orderCol.siteCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteName')">
a.siteName
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
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