Skip to content

S
smart_gov_platform
Commit 020cb085 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加文档接口设备统计

parent e09aecae
Hide whitespace changes
Inline Side-by-side
Showing with 1783 additions and 1014 deletions
base-manager/db/add.sql
View file @ 020cb085
...@@ -39,4 +39,10 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '应用主题 ', 'App', 'appThemeN ...@@ -39,4 +39,10 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '应用主题 ', 'App', 'appThemeN
2023-4-12 2023-4-12
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_sys_site_matter ADD COLUMN `hot` tinyint(2) DEFAULT '0' COMMENT '热门(0.否,1.是)' AFTER eventTypeShow; ALTER TABLE mortals_sys_site_matter ADD COLUMN `hot` tinyint(2) DEFAULT '0' COMMENT '热门(0.否,1.是)' AFTER eventTypeShow;
ALTER TABLE mortals_sys_site_matter ADD COLUMN `display` tinyint(2) DEFAULT '0' COMMENT '显示(0.否,1.是)' AFTER hot; ALTER TABLE mortals_sys_site_matter ADD COLUMN `display` tinyint(2) DEFAULT '1' COMMENT '显示(0.否,1.是)' AFTER hot;
-- ----------------------------
2023-4-23
-- ----------------------------
ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN `hot` tinyint(2) DEFAULT '0' COMMENT '热门(0.否,1.是)' AFTER userType;
ALTER TABLE mortals_sys_site_theme_matter ADD COLUMN `display` tinyint(2) DEFAULT '1' COMMENT '显示(0.否,1.是)' AFTER hot;
base-manager/pom.xml
View file @ 020cb085
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<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>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>debug</profiles.log.level>
<package.environment>test</package.environment> <package.environment>test</package.environment>
<skipUi>false</skipUi> <skipUi>false</skipUi>
</properties> </properties>
...@@ -119,6 +119,11 @@ ...@@ -119,6 +119,11 @@
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.1.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
......
base-manager/src/main/java/com/mortals/xhx/base/framework/filter/SampleFilter.java 0 → 100644
View file @ 020cb085
package com.mortals.xhx.base.framework.filter;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SampleFilter extends Filter<ILoggingEvent> {
@Override
public FilterReply decide(ILoggingEvent event) {
System.out.println("message==>"+event.getMessage());
if (event.getMessage().contains("sample")) {
return FilterReply.ACCEPT;
} else {
return FilterReply.NEUTRAL;
}
}
}
base-manager/src/main/java/com/mortals/xhx/base/system/resource/dao/ResourceDao.java
View file @ 020cb085
/** /**
* 文件：ResourceDao.java * 文件：ResourceDao.java
* 版本：1.0.0 * 版本：1.0.0
* 日期： * 日期：
* Copyright &reg; * Copyright &reg;
* All right reserved. * All right reserved.
*/ */
package com.mortals.xhx.base.system.resource.dao; package com.mortals.xhx.base.system.resource.dao;
import com.mortals.framework.dao.ICRUDDao; import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.base.system.resource.model.ResourceEntity; import com.mortals.xhx.base.system.resource.model.ResourceEntity;
import com.mortals.xhx.module.matter.model.MatterEntity;
import java.util.List; import java.util.List;
...@@ -19,12 +20,13 @@ import java.util.List; ...@@ -19,12 +20,13 @@ import java.util.List;
* <p>Description: ResourceDao DAO接口 </p> * <p>Description: ResourceDao DAO接口 </p>
* <p>Copyright: Copyright &reg; </p> * <p>Copyright: Copyright &reg; </p>
* <p>Company: </p> * <p>Company: </p>
* @author * @author
* @version 1.0.0 * @version 1.0.0
*/ */
public interface ResourceDao extends ICRUDDao<ResourceEntity,Long> { public interface ResourceDao extends ICRUDDao<ResourceEntity, Long> {
public List<ResourceEntity> getListByUserId(Long userId); List<ResourceEntity> getListByUserId(Long userId);
List<ResourceEntity> getAll(int userType); List<ResourceEntity> getAll(int userType);
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/common/utils/SyncGovMatterDetailThread.java
View file @ 020cb085
...@@ -70,7 +70,7 @@ public class SyncGovMatterDetailThread implements Runnable { ...@@ -70,7 +70,7 @@ public class SyncGovMatterDetailThread implements Runnable {
@Override @Override
public void run() { public void run() {
log.info("同步站点事项开始....."); log.info("同步站点事项开始.....");
Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, context); // Rest<String> deptRest = deptService.syncDeptBySiteId(siteEntity, context);
//log.info("同步站点部门:" + JSON.toJSONString(deptRest)); //log.info("同步站点部门:" + JSON.toJSONString(deptRest));
Rest<String> rest = siteService.syncMatterBySiteId(siteEntity, context); Rest<String> rest = siteService.syncMatterBySiteId(siteEntity, context);
//Rest<String> rest = Rest.ok(); //Rest<String> rest = Rest.ok();
......
base-manager/src/main/java/com/mortals/xhx/module/dept/service/impl/DeptServiceImpl.java
View file @ 020cb085
...@@ -125,7 +125,9 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE ...@@ -125,7 +125,9 @@ public class DeptServiceImpl extends AbstractCRUDCacheServiceImpl<DeptDao, DeptE
for (Map.Entry<String, String> item : data.entrySet()) { for (Map.Entry<String, String> item : data.entrySet()) {
String deptCode = item.getKey(); String deptCode = item.getKey();
String deptName = item.getValue(); String deptName = item.getValue();
DeptEntity deptEntity = deptService.selectOne(new DeptQuery().siteId(siteId).deptNumber(deptCode), context); DeptEntity deptEntity = deptService.getExtCache(deptCode);
// DeptEntity deptEntity = deptService.selectOne(new DeptQuery().siteId(siteId).deptNumber(deptCode), context);
if (ObjectUtils.isEmpty(deptEntity)) { if (ObjectUtils.isEmpty(deptEntity)) {
deptEntity = new DeptEntity(); deptEntity = new DeptEntity();
deptEntity.initAttrValue(); deptEntity.initAttrValue();
......
base-manager/src/main/java/com/mortals/xhx/module/matter/dao/MatterDao.java
View file @ 020cb085
...@@ -20,5 +20,8 @@ public interface MatterDao extends ICRUDDao<MatterEntity, Long> { ...@@ -20,5 +20,8 @@ public interface MatterDao extends ICRUDDao<MatterEntity, Long> {
String SQLID_SUB_LIST = "getSubList"; String SQLID_SUB_LIST = "getSubList";
String SQLID_SUB_COUNT = "getSubListCount"; String SQLID_SUB_COUNT = "getSubListCount";
Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo); Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo);
List<MatterEntity> getMatterListByAreaCode(MatterEntity matterQuery);
} }
base-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterDaoImpl.java
View file @ 020cb085
...@@ -26,6 +26,7 @@ import java.util.List; ...@@ -26,6 +26,7 @@ import java.util.List;
public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implements MatterDao { public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implements MatterDao {
@Override @Override
public Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo) { public Result<MatterEntity> getSubList(MatterEntity matterQuery, PageInfo pageInfo) {
Result<MatterEntity> result = new Result(); Result<MatterEntity> result = new Result();
...@@ -49,4 +50,13 @@ public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implem ...@@ -49,4 +50,13 @@ public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implem
public int getSubCount(ParamDto paramDto) { public int getSubCount(ParamDto paramDto) {
return this.getSqlSession().selectOne(this.getSqlId(SQLID_SUB_COUNT), this.cpyQueryParamDto(paramDto)); return this.getSqlSession().selectOne(this.getSqlId(SQLID_SUB_COUNT), this.cpyQueryParamDto(paramDto));
} }
@Override
public List<MatterEntity> getMatterListByAreaCode(MatterEntity matterQuery) {
ParamDto param = new ParamDto();
param.getCondition().put("areaCode", matterQuery.getAreaCode());
return this.getSqlSession().selectList(this.getSqlId("getMatterListByAreaCode"), param);
}
} }
base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
View file @ 020cb085
...@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context; ...@@ -6,6 +6,7 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.matter.dao.MatterDao;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery; import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.model.vo.MatterInfo; import com.mortals.xhx.module.matter.model.vo.MatterInfo;
...@@ -25,6 +26,7 @@ import java.util.Map; ...@@ -25,6 +26,7 @@ import java.util.Map;
public interface MatterService extends ICRUDService<MatterEntity, Long> { public interface MatterService extends ICRUDService<MatterEntity, Long> {
MatterDao getDao();
/** /**
* 添加业务到站点 * 添加业务到站点
* *
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteThemeMatterEntity.java
View file @ 020cb085
package com.mortals.xhx.module.site.model; package com.mortals.xhx.module.site.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; 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.framework.model.BaseEntityLong;
import com.mortals.xhx.module.site.model.vo.SiteThemeMatterVo; import com.mortals.xhx.module.site.model.vo.SiteThemeMatterVo;
import lombok.Data;
/** /**
* 站点主题事项实体对象 * 站点主题事项实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-23 * @date 2023-04-23
*/ */
@Data
public class SiteThemeMatterEntity extends SiteThemeMatterVo { public class SiteThemeMatterEntity extends SiteThemeMatterVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 站点ID * 站点ID
*/ */
private Long siteId; private Long siteId;
/** /**
* 站点名称 * 站点名称
*/ */
private String siteName; private String siteName;
/** /**
* 事项ID * 事项ID
*/ */
private Long matterId; private Long matterId;
/** /**
* 事项名称 * 事项名称
*/ */
private String matterName; private String matterName;
/** /**
* 事项编码 * 事项编码
*/ */
private String matterCode; private String matterCode;
/** /**
* 服务类型（1.公共服务，2.个人服务，3.法人服务） * 服务类型（1.公共服务，2.个人服务，3.法人服务）
*/ */
private String userType; private String userType;
/** /**
* 主题编码 * 主题编码
*/ */
private String themeCode; private String themeCode;
/** /**
* 主题名称 * 主题名称
*/ */
private String themeName; private String themeName;
/** /**
* 事项来源 * 事项来源
*/ */
private Integer source; private Integer source;
public SiteThemeMatterEntity(){}
/**
* 获取 站点ID
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点ID
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 站点名称
* @return String
*/
public String getSiteName(){
return siteName;
}
/**
* 设置 站点名称
* @param siteName
*/
public void setSiteName(String siteName){
this.siteName = siteName;
}
/**
* 获取 事项ID
* @return Long
*/
public Long getMatterId(){
return matterId;
}
/**
* 设置 事项ID
* @param matterId
*/
public void setMatterId(Long matterId){
this.matterId = matterId;
}
/**
* 获取 事项名称
* @return String
*/
public String getMatterName(){
return matterName;
}
/**
* 设置 事项名称
* @param matterName
*/
public void setMatterName(String matterName){
this.matterName = matterName;
}
/** /**
* 获取 事项编码 * 热门(0.否,1.是)
* @return String */
*/ private Integer hot;
public String getMatterCode(){
return matterCode;
}
/**
* 设置 事项编码
* @param matterCode
*/
public void setMatterCode(String matterCode){
this.matterCode = matterCode;
}
/** /**
* 获取 服务类型（1.公共服务，2.个人服务，3.法人服务） * 显示(0.否,1.是)
* @return String */
*/ private Integer display;
public String getUserType(){
return userType;
}
/**
* 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @param userType
*/
public void setUserType(String userType){
this.userType = userType;
}
/**
* 获取 主题编码
* @return String
*/
public String getThemeCode(){
return themeCode;
}
/**
* 设置 主题编码
* @param themeCode
*/
public void setThemeCode(String themeCode){
this.themeCode = themeCode;
}
/**
* 获取 主题名称
* @return String
*/
public String getThemeName(){
return themeName;
}
/**
* 设置 主题名称
* @param themeName
*/
public void setThemeName(String themeName){
this.themeName = themeName;
}
/**
* 获取 事项来源
* @return Integer
*/
public Integer getSource(){
return source;
}
/**
* 设置 事项来源
* @param source
*/
public void setSource(Integer source){
this.source = source;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -196,44 +70,34 @@ public class SiteThemeMatterEntity extends SiteThemeMatterVo { ...@@ -196,44 +70,34 @@ public class SiteThemeMatterEntity extends SiteThemeMatterVo {
if (obj instanceof SiteThemeMatterEntity) { if (obj instanceof SiteThemeMatterEntity) {
SiteThemeMatterEntity tmp = (SiteThemeMatterEntity) obj; SiteThemeMatterEntity tmp = (SiteThemeMatterEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",siteName:").append(getSiteName());
sb.append(",matterId:").append(getMatterId());
sb.append(",matterName:").append(getMatterName());
sb.append(",matterCode:").append(getMatterCode());
sb.append(",userType:").append(getUserType());
sb.append(",themeCode:").append(getThemeCode());
sb.append(",themeName:").append(getThemeName());
sb.append(",source:").append(getSource());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.siteId = null; this.siteId = null;
this.siteName = "";
this.matterId = null;
this.siteName = null; this.matterName = "";
this.matterId = null; this.matterCode = null;
this.matterName = null; this.userType = null;
this.matterCode = null; this.themeCode = "";
this.userType = null; this.themeName = "";
this.themeCode = null; this.source = 1;
this.themeName = null; this.hot = 0;
this.source = null; this.display = 1;
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteThemeMatterQuery.java
View file @ 020cb085
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.site.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.site.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.site.model.SiteThemeMatterEntity; import com.mortals.xhx.module.site.model.SiteThemeMatterEntity;
/** /**
* 站点主题事项查询对象 * 站点主题事项查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-23 * @date 2023-04-23
*/ */
public class SiteThemeMatterQuery extends SiteThemeMatterEntity { public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity { ...@@ -21,6 +21,9 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点ID */ /** 开始 站点ID */
private Long siteIdStart; private Long siteIdStart;
...@@ -33,9 +36,14 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity { ...@@ -33,9 +36,14 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
/** 站点ID列表 */ /** 站点ID列表 */
private List <Long> siteIdList; private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 站点名称 */ /** 站点名称 */
private List<String> siteNameList; private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** 开始 事项ID */ /** 开始 事项ID */
private Long matterIdStart; private Long matterIdStart;
...@@ -48,21 +56,34 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity { ...@@ -48,21 +56,34 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
/** 事项ID列表 */ /** 事项ID列表 */
private List <Long> matterIdList; private List <Long> matterIdList;
/** 事项ID排除列表 */
private List <Long> matterIdNotList;
/** 事项名称 */ /** 事项名称 */
private List<String> matterNameList; private List<String> matterNameList;
/** 事项名称排除列表 */
private List <String> matterNameNotList;
/** 事项编码 */ /** 事项编码 */
private List<String> matterCodeList; private List<String> matterCodeList;
/** 事项编码排除列表 */
private List <String> matterCodeNotList;
/** 服务类型（1.公共服务，2.个人服务，3.法人服务） */ /** 服务类型（1.公共服务，2.个人服务，3.法人服务） */
private List<String> userTypeList; private List<String> userTypeList;
/** 服务类型（1.公共服务，2.个人服务，3.法人服务）排除列表 */
private List <String> userTypeNotList;
/** 主题编码 */ /** 主题编码 */
private List<String> themeCodeList; private List<String> themeCodeList;
/** 主题编码排除列表 */
private List <String> themeCodeNotList;
/** 主题名称 */ /** 主题名称 */
private List<String> themeNameList; private List<String> themeNameList;
/** 主题名称排除列表 */
private List <String> themeNameNotList;
/** 开始 事项来源 */ /** 开始 事项来源 */
private Integer sourceStart; private Integer sourceStart;
...@@ -75,6 +96,9 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity { ...@@ -75,6 +96,9 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
/** 事项来源列表 */ /** 事项来源列表 */
private List <Integer> sourceList; private List <Integer> sourceList;
/** 事项来源排除列表 */
private List <Integer> sourceNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -93,12 +117,45 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity { ...@@ -93,12 +117,45 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 修改时间 */ /** 开始 修改时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 热门(0.否,1.是) */
private Integer hotStart;
/** 结束 热门(0.否,1.是) */
private Integer hotEnd;
/** 增加 热门(0.否,1.是) */
private Integer hotIncrement;
/** 热门(0.否,1.是)列表 */
private List <Integer> hotList;
/** 热门(0.否,1.是)排除列表 */
private List <Integer> hotNotList;
/** 开始 显示(0.否,1.是) */
private Integer displayStart;
/** 结束 显示(0.否,1.是) */
private Integer displayEnd;
/** 增加 显示(0.否,1.是) */
private Integer displayIncrement;
/** 显示(0.否,1.是)列表 */
private List <Integer> displayList;
/** 显示(0.否,1.是)排除列表 */
private List <Integer> displayNotList;
/** 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<SiteThemeMatterQuery> orConditionList; private List<SiteThemeMatterQuery> orConditionList;
...@@ -108,848 +165,1350 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity { ...@@ -108,848 +165,1350 @@ public class SiteThemeMatterQuery extends SiteThemeMatterEntity {
public SiteThemeMatterQuery(){} public SiteThemeMatterQuery(){}
/** /**
* 获取 开始 序号，主键，自增长 * 获取 开始 序号，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号，主键，自增长 * 获取 结束 序号，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号，主键，自增长 * 获取 增加 序号，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号，主键，自增长 * 获取 序号，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 开始 站点ID * 获取 序号，主键，自增长
* @return siteIdStart * @return idNotList
*/ */
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 站点ID
* @return siteIdStart
*/
public Long getSiteIdStart(){ public Long getSiteIdStart(){
return this.siteIdStart; return this.siteIdStart;
} }
/** /**
* 设置 开始 站点ID * 设置 开始 站点ID
* @param siteIdStart * @param siteIdStart
*/ */
public void setSiteIdStart(Long siteIdStart){ public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart; this.siteIdStart = siteIdStart;
} }
/** /**
* 获取 结束 站点ID * 获取 结束 站点ID
* @return $siteIdEnd * @return $siteIdEnd
*/ */
public Long getSiteIdEnd(){ public Long getSiteIdEnd(){
return this.siteIdEnd; return this.siteIdEnd;
} }
/** /**
* 设置 结束 站点ID * 设置 结束 站点ID
* @param siteIdEnd * @param siteIdEnd
*/ */
public void setSiteIdEnd(Long siteIdEnd){ public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd; this.siteIdEnd = siteIdEnd;
} }
/** /**
* 获取 增加 站点ID * 获取 增加 站点ID
* @return siteIdIncrement * @return siteIdIncrement
*/ */
public Long getSiteIdIncrement(){ public Long getSiteIdIncrement(){
return this.siteIdIncrement; return this.siteIdIncrement;
} }
/** /**
* 设置 增加 站点ID * 设置 增加 站点ID
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public void setSiteIdIncrement(Long siteIdIncrement){ public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement; this.siteIdIncrement = siteIdIncrement;
} }
/** /**
* 获取 站点ID * 获取 站点ID
* @return siteIdList * @return siteIdList
*/ */
public List<Long> getSiteIdList(){ public List<Long> getSiteIdList(){
return this.siteIdList; return this.siteIdList;
} }
/** /**
* 设置 站点ID * 设置 站点ID
* @param siteIdList * @param siteIdList
*/ */
public void setSiteIdList(List<Long> siteIdList){ public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
} }
/** /**
* 获取 站点名称 * 获取 站点ID
* @return siteNameList * @return siteIdNotList
*/ */
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 站点名称
* @return siteNameList
*/
public List<String> getSiteNameList(){ public List<String> getSiteNameList(){
return this.siteNameList; return this.siteNameList;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameList * @param siteNameList
*/ */
public void setSiteNameList(List<String> siteNameList){ public void setSiteNameList(List<String> siteNameList){
this.siteNameList = 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
* @return matterIdStart * @return matterIdStart
*/ */
public Long getMatterIdStart(){ public Long getMatterIdStart(){
return this.matterIdStart; return this.matterIdStart;
} }
/** /**
* 设置 开始 事项ID * 设置 开始 事项ID
* @param matterIdStart * @param matterIdStart
*/ */
public void setMatterIdStart(Long matterIdStart){ public void setMatterIdStart(Long matterIdStart){
this.matterIdStart = matterIdStart; this.matterIdStart = matterIdStart;
} }
/** /**
* 获取 结束 事项ID * 获取 结束 事项ID
* @return $matterIdEnd * @return $matterIdEnd
*/ */
public Long getMatterIdEnd(){ public Long getMatterIdEnd(){
return this.matterIdEnd; return this.matterIdEnd;
} }
/** /**
* 设置 结束 事项ID * 设置 结束 事项ID
* @param matterIdEnd * @param matterIdEnd
*/ */
public void setMatterIdEnd(Long matterIdEnd){ public void setMatterIdEnd(Long matterIdEnd){
this.matterIdEnd = matterIdEnd; this.matterIdEnd = matterIdEnd;
} }
/** /**
* 获取 增加 事项ID * 获取 增加 事项ID
* @return matterIdIncrement * @return matterIdIncrement
*/ */
public Long getMatterIdIncrement(){ public Long getMatterIdIncrement(){
return this.matterIdIncrement; return this.matterIdIncrement;
} }
/** /**
* 设置 增加 事项ID * 设置 增加 事项ID
* @param matterIdIncrement * @param matterIdIncrement
*/ */
public void setMatterIdIncrement(Long matterIdIncrement){ public void setMatterIdIncrement(Long matterIdIncrement){
this.matterIdIncrement = matterIdIncrement; this.matterIdIncrement = matterIdIncrement;
} }
/** /**
* 获取 事项ID * 获取 事项ID
* @return matterIdList * @return matterIdList
*/ */
public List<Long> getMatterIdList(){ public List<Long> getMatterIdList(){
return this.matterIdList; return this.matterIdList;
} }
/** /**
* 设置 事项ID * 设置 事项ID
* @param matterIdList * @param matterIdList
*/ */
public void setMatterIdList(List<Long> matterIdList){ public void setMatterIdList(List<Long> matterIdList){
this.matterIdList = matterIdList; this.matterIdList = matterIdList;
} }
/** /**
* 获取 事项名称 * 获取 事项ID
* @return matterNameList * @return matterIdNotList
*/ */
public List<Long> getMatterIdNotList(){
return this.matterIdNotList;
}
/**
* 设置 事项ID
* @param matterIdNotList
*/
public void setMatterIdNotList(List<Long> matterIdNotList){
this.matterIdNotList = matterIdNotList;
}
/**
* 获取 事项名称
* @return matterNameList
*/
public List<String> getMatterNameList(){ public List<String> getMatterNameList(){
return this.matterNameList; return this.matterNameList;
} }
/** /**
* 设置 事项名称 * 设置 事项名称
* @param matterNameList * @param matterNameList
*/ */
public void setMatterNameList(List<String> matterNameList){ public void setMatterNameList(List<String> matterNameList){
this.matterNameList = matterNameList; this.matterNameList = matterNameList;
} }
/**
* 获取 事项名称
* @return matterNameNotList
*/
public List<String> getMatterNameNotList(){
return this.matterNameNotList;
}
/** /**
* 获取 事项编码 * 设置 事项名称
* @return matterCodeList * @param matterNameNotList
*/ */
public void setMatterNameNotList(List<String> matterNameNotList){
this.matterNameNotList = matterNameNotList;
}
/**
* 获取 事项编码
* @return matterCodeList
*/
public List<String> getMatterCodeList(){ public List<String> getMatterCodeList(){
return this.matterCodeList; return this.matterCodeList;
} }
/** /**
* 设置 事项编码 * 设置 事项编码
* @param matterCodeList * @param matterCodeList
*/ */
public void setMatterCodeList(List<String> matterCodeList){ public void setMatterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList; this.matterCodeList = matterCodeList;
} }
/**
* 获取 事项编码
* @return matterCodeNotList
*/
public List<String> getMatterCodeNotList(){
return this.matterCodeNotList;
}
/** /**
* 获取 服务类型（1.公共服务，2.个人服务，3.法人服务） * 设置 事项编码
* @return userTypeList * @param matterCodeNotList
*/ */
public void setMatterCodeNotList(List<String> matterCodeNotList){
this.matterCodeNotList = matterCodeNotList;
}
/**
* 获取 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @return userTypeList
*/
public List<String> getUserTypeList(){ public List<String> getUserTypeList(){
return this.userTypeList; return this.userTypeList;
} }
/** /**
* 设置 服务类型（1.公共服务，2.个人服务，3.法人服务） * 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @param userTypeList * @param userTypeList
*/ */
public void setUserTypeList(List<String> userTypeList){ public void setUserTypeList(List<String> userTypeList){
this.userTypeList = userTypeList; this.userTypeList = userTypeList;
} }
/** /**
* 获取 主题编码 * 获取 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @return themeCodeList * @return userTypeNotList
*/ */
public List<String> getUserTypeNotList(){
return this.userTypeNotList;
}
/**
* 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @param userTypeNotList
*/
public void setUserTypeNotList(List<String> userTypeNotList){
this.userTypeNotList = userTypeNotList;
}
/**
* 获取 主题编码
* @return themeCodeList
*/
public List<String> getThemeCodeList(){ public List<String> getThemeCodeList(){
return this.themeCodeList; return this.themeCodeList;
} }
/** /**
* 设置 主题编码 * 设置 主题编码
* @param themeCodeList * @param themeCodeList
*/ */
public void setThemeCodeList(List<String> themeCodeList){ public void setThemeCodeList(List<String> themeCodeList){
this.themeCodeList = themeCodeList; this.themeCodeList = themeCodeList;
} }
/**
* 获取 主题编码
* @return themeCodeNotList
*/
public List<String> getThemeCodeNotList(){
return this.themeCodeNotList;
}
/**
* 设置 主题编码
* @param themeCodeNotList
*/
public void setThemeCodeNotList(List<String> themeCodeNotList){
this.themeCodeNotList = themeCodeNotList;
}
/** /**
* 获取 主题名称 * 获取 主题名称
* @return themeNameList * @return themeNameList
*/ */
public List<String> getThemeNameList(){ public List<String> getThemeNameList(){
return this.themeNameList; return this.themeNameList;
} }
/** /**
* 设置 主题名称 * 设置 主题名称
* @param themeNameList * @param themeNameList
*/ */
public void setThemeNameList(List<String> themeNameList){ public void setThemeNameList(List<String> themeNameList){
this.themeNameList = themeNameList; this.themeNameList = themeNameList;
} }
/**
* 获取 主题名称
* @return themeNameNotList
*/
public List<String> getThemeNameNotList(){
return this.themeNameNotList;
}
/**
* 设置 主题名称
* @param themeNameNotList
*/
public void setThemeNameNotList(List<String> themeNameNotList){
this.themeNameNotList = themeNameNotList;
}
/** /**
* 获取 开始 事项来源 * 获取 开始 事项来源
* @return sourceStart * @return sourceStart
*/ */
public Integer getSourceStart(){ public Integer getSourceStart(){
return this.sourceStart; return this.sourceStart;
} }
/** /**
* 设置 开始 事项来源 * 设置 开始 事项来源
* @param sourceStart * @param sourceStart
*/ */
public void setSourceStart(Integer sourceStart){ public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart; this.sourceStart = sourceStart;
} }
/** /**
* 获取 结束 事项来源 * 获取 结束 事项来源
* @return $sourceEnd * @return $sourceEnd
*/ */
public Integer getSourceEnd(){ public Integer getSourceEnd(){
return this.sourceEnd; return this.sourceEnd;
} }
/** /**
* 设置 结束 事项来源 * 设置 结束 事项来源
* @param sourceEnd * @param sourceEnd
*/ */
public void setSourceEnd(Integer sourceEnd){ public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd; this.sourceEnd = sourceEnd;
} }
/** /**
* 获取 增加 事项来源 * 获取 增加 事项来源
* @return sourceIncrement * @return sourceIncrement
*/ */
public Integer getSourceIncrement(){ public Integer getSourceIncrement(){
return this.sourceIncrement; return this.sourceIncrement;
} }
/** /**
* 设置 增加 事项来源 * 设置 增加 事项来源
* @param sourceIncrement * @param sourceIncrement
*/ */
public void setSourceIncrement(Integer sourceIncrement){ public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement; this.sourceIncrement = sourceIncrement;
} }
/** /**
* 获取 事项来源 * 获取 事项来源
* @return sourceList * @return sourceList
*/ */
public List<Integer> getSourceList(){ public List<Integer> getSourceList(){
return this.sourceList; return this.sourceList;
} }
/** /**
* 设置 事项来源 * 设置 事项来源
* @param sourceList * @param sourceList
*/ */
public void setSourceList(List<Integer> sourceList){ public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList; this.sourceList = sourceList;
} }
/** /**
* 获取 开始 创建时间 * 获取 事项来源
* @return createTimeStart * @return sourceNotList
*/ */
public List<Integer> getSourceNotList(){
return this.sourceNotList;
}
/**
* 设置 事项来源
* @param sourceNotList
*/
public void setSourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 开始 修改时间 * 获取 创建用户
* @return updateTimeStart * @return createUserIdNotList
*/ */
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 获取 开始 修改时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 修改时间 * 设置 开始 修改时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 修改时间 * 获取 结束 修改时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 修改时间 * 设置 结束 修改时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 序号，主键，自增长 * 获取 开始 热门(0.否,1.是)
* @param id * @return hotStart
*/ */
public Integer getHotStart(){
return this.hotStart;
}
/**
* 设置 开始 热门(0.否,1.是)
* @param hotStart
*/
public void setHotStart(Integer hotStart){
this.hotStart = hotStart;
}
/**
* 获取 结束 热门(0.否,1.是)
* @return $hotEnd
*/
public Integer getHotEnd(){
return this.hotEnd;
}
/**
* 设置 结束 热门(0.否,1.是)
* @param hotEnd
*/
public void setHotEnd(Integer hotEnd){
this.hotEnd = hotEnd;
}
/**
* 获取 增加 热门(0.否,1.是)
* @return hotIncrement
*/
public Integer getHotIncrement(){
return this.hotIncrement;
}
/**
* 设置 增加 热门(0.否,1.是)
* @param hotIncrement
*/
public void setHotIncrement(Integer hotIncrement){
this.hotIncrement = hotIncrement;
}
/**
* 获取 热门(0.否,1.是)
* @return hotList
*/
public List<Integer> getHotList(){
return this.hotList;
}
/**
* 设置 热门(0.否,1.是)
* @param hotList
*/
public void setHotList(List<Integer> hotList){
this.hotList = hotList;
}
/**
* 获取 热门(0.否,1.是)
* @return hotNotList
*/
public List<Integer> getHotNotList(){
return this.hotNotList;
}
/**
* 设置 热门(0.否,1.是)
* @param hotNotList
*/
public void setHotNotList(List<Integer> hotNotList){
this.hotNotList = hotNotList;
}
/**
* 获取 开始 显示(0.否,1.是)
* @return displayStart
*/
public Integer getDisplayStart(){
return this.displayStart;
}
/**
* 设置 开始 显示(0.否,1.是)
* @param displayStart
*/
public void setDisplayStart(Integer displayStart){
this.displayStart = displayStart;
}
/**
* 获取 结束 显示(0.否,1.是)
* @return $displayEnd
*/
public Integer getDisplayEnd(){
return this.displayEnd;
}
/**
* 设置 结束 显示(0.否,1.是)
* @param displayEnd
*/
public void setDisplayEnd(Integer displayEnd){
this.displayEnd = displayEnd;
}
/**
* 获取 增加 显示(0.否,1.是)
* @return displayIncrement
*/
public Integer getDisplayIncrement(){
return this.displayIncrement;
}
/**
* 设置 增加 显示(0.否,1.是)
* @param displayIncrement
*/
public void setDisplayIncrement(Integer displayIncrement){
this.displayIncrement = displayIncrement;
}
/**
* 获取 显示(0.否,1.是)
* @return displayList
*/
public List<Integer> getDisplayList(){
return this.displayList;
}
/**
* 设置 显示(0.否,1.是)
* @param displayList
*/
public void setDisplayList(List<Integer> displayList){
this.displayList = displayList;
}
/**
* 获取 显示(0.否,1.是)
* @return displayNotList
*/
public List<Integer> getDisplayNotList(){
return this.displayNotList;
}
/**
* 设置 显示(0.否,1.是)
* @param displayNotList
*/
public void setDisplayNotList(List<Integer> displayNotList){
this.displayNotList = displayNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public SiteThemeMatterQuery id(Long id){ public SiteThemeMatterQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public SiteThemeMatterQuery idStart(Long idStart){ public SiteThemeMatterQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public SiteThemeMatterQuery idEnd(Long idEnd){ public SiteThemeMatterQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public SiteThemeMatterQuery idIncrement(Long idIncrement){ public SiteThemeMatterQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public SiteThemeMatterQuery idList(List<Long> idList){ public SiteThemeMatterQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public SiteThemeMatterQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 站点ID * 设置 站点ID
* @param siteId * @param siteId
*/ */
public SiteThemeMatterQuery siteId(Long siteId){ public SiteThemeMatterQuery siteId(Long siteId){
setSiteId(siteId); setSiteId(siteId);
return this; return this;
} }
/** /**
* 设置 开始 站点ID * 设置 开始 站点ID
* @param siteIdStart * @param siteIdStart
*/ */
public SiteThemeMatterQuery siteIdStart(Long siteIdStart){ public SiteThemeMatterQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart; this.siteIdStart = siteIdStart;
return this; return this;
} }
/** /**
* 设置 结束 站点ID * 设置 结束 站点ID
* @param siteIdEnd * @param siteIdEnd
*/ */
public SiteThemeMatterQuery siteIdEnd(Long siteIdEnd){ public SiteThemeMatterQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd; this.siteIdEnd = siteIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 站点ID * 设置 增加 站点ID
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public SiteThemeMatterQuery siteIdIncrement(Long siteIdIncrement){ public SiteThemeMatterQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement; this.siteIdIncrement = siteIdIncrement;
return this; return this;
} }
/** /**
* 设置 站点ID * 设置 站点ID
* @param siteIdList * @param siteIdList
*/ */
public SiteThemeMatterQuery siteIdList(List<Long> siteIdList){ public SiteThemeMatterQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
return this; return this;
} }
/**
* 设置 站点ID
* @param siteIdNotList
*/
public SiteThemeMatterQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteName * @param siteName
*/ */
public SiteThemeMatterQuery siteName(String siteName){ public SiteThemeMatterQuery siteName(String siteName){
setSiteName(siteName); setSiteName(siteName);
return this; return this;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameList * @param siteNameList
*/ */
public SiteThemeMatterQuery siteNameList(List<String> siteNameList){ public SiteThemeMatterQuery siteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
return this; return this;
} }
/** /**
* 设置 事项ID * 设置 事项ID
* @param matterId * @param matterId
*/ */
public SiteThemeMatterQuery matterId(Long matterId){ public SiteThemeMatterQuery matterId(Long matterId){
setMatterId(matterId); setMatterId(matterId);
return this; return this;
} }
/** /**
* 设置 开始 事项ID * 设置 开始 事项ID
* @param matterIdStart * @param matterIdStart
*/ */
public SiteThemeMatterQuery matterIdStart(Long matterIdStart){ public SiteThemeMatterQuery matterIdStart(Long matterIdStart){
this.matterIdStart = matterIdStart; this.matterIdStart = matterIdStart;
return this; return this;
} }
/** /**
* 设置 结束 事项ID * 设置 结束 事项ID
* @param matterIdEnd * @param matterIdEnd
*/ */
public SiteThemeMatterQuery matterIdEnd(Long matterIdEnd){ public SiteThemeMatterQuery matterIdEnd(Long matterIdEnd){
this.matterIdEnd = matterIdEnd; this.matterIdEnd = matterIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 事项ID * 设置 增加 事项ID
* @param matterIdIncrement * @param matterIdIncrement
*/ */
public SiteThemeMatterQuery matterIdIncrement(Long matterIdIncrement){ public SiteThemeMatterQuery matterIdIncrement(Long matterIdIncrement){
this.matterIdIncrement = matterIdIncrement; this.matterIdIncrement = matterIdIncrement;
return this; return this;
} }
/** /**
* 设置 事项ID * 设置 事项ID
* @param matterIdList * @param matterIdList
*/ */
public SiteThemeMatterQuery matterIdList(List<Long> matterIdList){ public SiteThemeMatterQuery matterIdList(List<Long> matterIdList){
this.matterIdList = matterIdList; this.matterIdList = matterIdList;
return this; return this;
} }
/**
* 设置 事项ID
* @param matterIdNotList
*/
public SiteThemeMatterQuery matterIdNotList(List<Long> matterIdNotList){
this.matterIdNotList = matterIdNotList;
return this;
}
/** /**
* 设置 事项名称 * 设置 事项名称
* @param matterName * @param matterName
*/ */
public SiteThemeMatterQuery matterName(String matterName){ public SiteThemeMatterQuery matterName(String matterName){
setMatterName(matterName); setMatterName(matterName);
return this; return this;
} }
/** /**
* 设置 事项名称 * 设置 事项名称
* @param matterNameList * @param matterNameList
*/ */
public SiteThemeMatterQuery matterNameList(List<String> matterNameList){ public SiteThemeMatterQuery matterNameList(List<String> matterNameList){
this.matterNameList = matterNameList; this.matterNameList = matterNameList;
return this; return this;
} }
/** /**
* 设置 事项编码 * 设置 事项编码
* @param matterCode * @param matterCode
*/ */
public SiteThemeMatterQuery matterCode(String matterCode){ public SiteThemeMatterQuery matterCode(String matterCode){
setMatterCode(matterCode); setMatterCode(matterCode);
return this; return this;
} }
/** /**
* 设置 事项编码 * 设置 事项编码
* @param matterCodeList * @param matterCodeList
*/ */
public SiteThemeMatterQuery matterCodeList(List<String> matterCodeList){ public SiteThemeMatterQuery matterCodeList(List<String> matterCodeList){
this.matterCodeList = matterCodeList; this.matterCodeList = matterCodeList;
return this; return this;
} }
/** /**
* 设置 服务类型（1.公共服务，2.个人服务，3.法人服务） * 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @param userType * @param userType
*/ */
public SiteThemeMatterQuery userType(String userType){ public SiteThemeMatterQuery userType(String userType){
setUserType(userType); setUserType(userType);
return this; return this;
} }
/** /**
* 设置 服务类型（1.公共服务，2.个人服务，3.法人服务） * 设置 服务类型（1.公共服务，2.个人服务，3.法人服务）
* @param userTypeList * @param userTypeList
*/ */
public SiteThemeMatterQuery userTypeList(List<String> userTypeList){ public SiteThemeMatterQuery userTypeList(List<String> userTypeList){
this.userTypeList = userTypeList; this.userTypeList = userTypeList;
return this; return this;
} }
/** /**
* 设置 主题编码 * 设置 主题编码
* @param themeCode * @param themeCode
*/ */
public SiteThemeMatterQuery themeCode(String themeCode){ public SiteThemeMatterQuery themeCode(String themeCode){
setThemeCode(themeCode); setThemeCode(themeCode);
return this; return this;
} }
/** /**
* 设置 主题编码 * 设置 主题编码
* @param themeCodeList * @param themeCodeList
*/ */
public SiteThemeMatterQuery themeCodeList(List<String> themeCodeList){ public SiteThemeMatterQuery themeCodeList(List<String> themeCodeList){
this.themeCodeList = themeCodeList; this.themeCodeList = themeCodeList;
return this; return this;
} }
/** /**
* 设置 主题名称 * 设置 主题名称
* @param themeName * @param themeName
*/ */
public SiteThemeMatterQuery themeName(String themeName){ public SiteThemeMatterQuery themeName(String themeName){
setThemeName(themeName); setThemeName(themeName);
return this; return this;
} }
/** /**
* 设置 主题名称 * 设置 主题名称
* @param themeNameList * @param themeNameList
*/ */
public SiteThemeMatterQuery themeNameList(List<String> themeNameList){ public SiteThemeMatterQuery themeNameList(List<String> themeNameList){
this.themeNameList = themeNameList; this.themeNameList = themeNameList;
return this; return this;
} }
/** /**
* 设置 事项来源 * 设置 事项来源
* @param source * @param source
*/ */
public SiteThemeMatterQuery source(Integer source){ public SiteThemeMatterQuery source(Integer source){
setSource(source); setSource(source);
return this; return this;
} }
/** /**
* 设置 开始 事项来源 * 设置 开始 事项来源
* @param sourceStart * @param sourceStart
*/ */
public SiteThemeMatterQuery sourceStart(Integer sourceStart){ public SiteThemeMatterQuery sourceStart(Integer sourceStart){
this.sourceStart = sourceStart; this.sourceStart = sourceStart;
return this; return this;
} }
/** /**
* 设置 结束 事项来源 * 设置 结束 事项来源
* @param sourceEnd * @param sourceEnd
*/ */
public SiteThemeMatterQuery sourceEnd(Integer sourceEnd){ public SiteThemeMatterQuery sourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd; this.sourceEnd = sourceEnd;
return this; return this;
} }
/** /**
* 设置 增加 事项来源 * 设置 增加 事项来源
* @param sourceIncrement * @param sourceIncrement
*/ */
public SiteThemeMatterQuery sourceIncrement(Integer sourceIncrement){ public SiteThemeMatterQuery sourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement; this.sourceIncrement = sourceIncrement;
return this; return this;
} }
/** /**
* 设置 事项来源 * 设置 事项来源
* @param sourceList * @param sourceList
*/ */
public SiteThemeMatterQuery sourceList(List<Integer> sourceList){ public SiteThemeMatterQuery sourceList(List<Integer> sourceList){
this.sourceList = sourceList; this.sourceList = sourceList;
return this; return this;
} }
/**
* 设置 事项来源
* @param sourceNotList
*/
public SiteThemeMatterQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public SiteThemeMatterQuery createUserId(Long createUserId){ public SiteThemeMatterQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public SiteThemeMatterQuery createUserIdStart(Long createUserIdStart){ public SiteThemeMatterQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public SiteThemeMatterQuery createUserIdEnd(Long createUserIdEnd){ public SiteThemeMatterQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public SiteThemeMatterQuery createUserIdIncrement(Long createUserIdIncrement){ public SiteThemeMatterQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public SiteThemeMatterQuery createUserIdList(List<Long> createUserIdList){ public SiteThemeMatterQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SiteThemeMatterQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 设置 热门(0.否,1.是)
* @param hot
*/
public SiteThemeMatterQuery hot(Integer hot){
setHot(hot);
return this;
}
/**
* 设置 开始 热门(0.否,1.是)
* @param hotStart
*/
public SiteThemeMatterQuery hotStart(Integer hotStart){
this.hotStart = hotStart;
return this;
}
/**
* 设置 结束 热门(0.否,1.是)
* @param hotEnd
*/
public SiteThemeMatterQuery hotEnd(Integer hotEnd){
this.hotEnd = hotEnd;
return this;
}
/**
* 设置 增加 热门(0.否,1.是)
* @param hotIncrement
*/
public SiteThemeMatterQuery hotIncrement(Integer hotIncrement){
this.hotIncrement = hotIncrement;
return this;
}
/**
* 设置 热门(0.否,1.是)
* @param hotList
*/
public SiteThemeMatterQuery hotList(List<Integer> hotList){
this.hotList = hotList;
return this;
}
/**
* 设置 热门(0.否,1.是)
* @param hotNotList
*/
public SiteThemeMatterQuery hotNotList(List<Integer> hotNotList){
this.hotNotList = hotNotList;
return this;
}
/**
* 设置 显示(0.否,1.是)
* @param display
*/
public SiteThemeMatterQuery display(Integer display){
setDisplay(display);
return this;
}
/**
* 设置 开始 显示(0.否,1.是)
* @param displayStart
*/
public SiteThemeMatterQuery displayStart(Integer displayStart){
this.displayStart = displayStart;
return this;
}
/**
* 设置 结束 显示(0.否,1.是)
* @param displayEnd
*/
public SiteThemeMatterQuery displayEnd(Integer displayEnd){
this.displayEnd = displayEnd;
return this;
}
/**
* 设置 增加 显示(0.否,1.是)
* @param displayIncrement
*/
public SiteThemeMatterQuery displayIncrement(Integer displayIncrement){
this.displayIncrement = displayIncrement;
return this;
}
/**
* 设置 显示(0.否,1.是)
* @param displayList
*/
public SiteThemeMatterQuery displayList(List<Integer> displayList){
this.displayList = displayList;
return this;
}
/**
* 设置 显示(0.否,1.是)
* @param displayNotList
*/
public SiteThemeMatterQuery displayNotList(List<Integer> displayNotList){
this.displayNotList = displayNotList;
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)
* @return orConditionList * @return orConditionList
*/ */
public List<SiteThemeMatterQuery> getOrConditionList(){ public List<SiteThemeMatterQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<SiteThemeMatterQuery> orConditionList){ public void setOrConditionList(List<SiteThemeMatterQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<SiteThemeMatterQuery> getAndConditionList(){ public List<SiteThemeMatterQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<SiteThemeMatterQuery> andConditionList){ public void setAndConditionList(List<SiteThemeMatterQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
View file @ 020cb085
...@@ -6,6 +6,10 @@ import com.mortals.framework.model.PageInfo; ...@@ -6,6 +6,10 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.module.matter.model.MatterEntity; import com.mortals.xhx.module.matter.model.MatterEntity;
import com.mortals.xhx.module.matter.model.MatterQuery; import com.mortals.xhx.module.matter.model.MatterQuery;
import com.mortals.xhx.module.matter.service.MatterService; import com.mortals.xhx.module.matter.service.MatterService;
import com.mortals.xhx.module.site.model.SiteThemeMatterEntity;
import com.mortals.xhx.module.site.model.SiteThemeMatterQuery;
import com.mortals.xhx.module.site.service.SiteThemeMatterService;
import com.mortals.xhx.module.site.service.SiteThemeService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
...@@ -31,10 +35,12 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao ...@@ -31,10 +35,12 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
@Autowired @Autowired
private MatterService matterService; private MatterService matterService;
@Autowired
private SiteThemeMatterService siteThemeMatterService;
@Override @Override
protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException { protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
// List<Long> matterIdlist = list.parallelStream().map(item -> item.getMatterId()).collect(Collectors.toList()); // List<Long> matterIdlist = list.parallelStream().map(item -> item.getMatterId()).collect(Collectors.toList());
//Map<Long, MatterEntity> matterEntityMap = matterService.find(new MatterQuery().idList(matterIdlist)).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n)); //Map<Long, MatterEntity> matterEntityMap = matterService.find(new MatterQuery().idList(matterIdlist)).parallelStream().collect(Collectors.toMap(x -> x.getId(), y -> y, (o, n) -> n));
list.forEach(item -> { list.forEach(item -> {
if (!ObjectUtils.isEmpty(item.getMatterId())) { if (!ObjectUtils.isEmpty(item.getMatterId())) {
...@@ -69,6 +75,28 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao ...@@ -69,6 +75,28 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
matterService.update(matterEntity, context); matterService.update(matterEntity, context);
} }
} }
SiteThemeMatterEntity siteThemeMatterEntity = siteThemeMatterService.selectOne(new SiteThemeMatterQuery().matterId(entity.getMatterId()));
if (!ObjectUtils.isEmpty(siteThemeMatterEntity)) {
siteThemeMatterEntity.setHot(entity.getHot());
siteThemeMatterEntity.setDisplay(entity.getDisplay());
}
}
/**
* @param entity
* @param context
* @throws AppException
*/
@Override
protected void saveBefore(SiteMatterEntity entity, Context context) throws AppException {
super.saveBefore(entity, context);
SiteThemeMatterEntity siteThemeMatterEntity = siteThemeMatterService.selectOne(new SiteThemeMatterQuery().matterId(entity.getMatterId()));
if (!ObjectUtils.isEmpty(siteThemeMatterEntity)) {
siteThemeMatterEntity.setHot(entity.getHot());
siteThemeMatterEntity.setDisplay(entity.getDisplay());
}
} }
@Override @Override
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ 020cb085
...@@ -403,7 +403,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -403,7 +403,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
PageInfo pageInfo = new PageInfo(); PageInfo pageInfo = new PageInfo();
pageInfo.setCurrPage(1); pageInfo.setCurrPage(1);
pageInfo.setPrePageResult(10); pageInfo.setPrePageResult(10);
return siteEntities; return siteEntities;
...@@ -466,7 +465,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -466,7 +465,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
areaQuery.setPid(areaEntity.getIid()); areaQuery.setPid(areaEntity.getIid());
List<AreaEntity> childList = areaService.find(areaQuery, context); List<AreaEntity> childList = areaService.find(areaQuery, context);
for (AreaEntity child : childList) { for (AreaEntity child : childList) {
siteAreaVo = new SiteAreaVo(); siteAreaVo = new SiteAreaVo();
siteAreaVo.setAreaCode(child.getAreaCode()); siteAreaVo.setAreaCode(child.getAreaCode());
siteAreaVo.setAreaName(child.getName()); siteAreaVo.setAreaName(child.getName());
...@@ -480,7 +479,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -480,7 +479,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
if (!ObjectUtils.isEmpty(siteEntities)) { if (!ObjectUtils.isEmpty(siteEntities)) {
siteAreaVo.setSiteList(siteEntities); siteAreaVo.setSiteList(siteEntities);
//map.put(child.getName(), siteEntities); //map.put(child.getName(), siteEntities);
}else{ } else {
//没有站点 //没有站点
siteAreaVo.setSiteList(Collections.EMPTY_LIST); siteAreaVo.setSiteList(Collections.EMPTY_LIST);
} }
...@@ -502,14 +501,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -502,14 +501,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
query.setAreaLevel(siteEntity.getAreaLevel()); query.setAreaLevel(siteEntity.getAreaLevel());
} }
} }
//获取所有层级的区域 //获取所有层级的区域
List<AreaEntity> areaEntities = areaService.find(new AreaQuery().areaLevel(query.getAreaLevel())); List<AreaEntity> areaEntities = areaService.find(new AreaQuery().areaLevel(query.getAreaLevel()));
List<SiteEntity> list = new ArrayList<>(); List<SiteEntity> list = new ArrayList<>();
for (AreaEntity areaEntity : areaEntities) { for (AreaEntity areaEntity : areaEntities) {
List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode())); List<SiteEntity> siteEntityList = this.find(new SiteQuery().areaCode(areaEntity.getAreaCode()));
if(!ObjectUtils.isEmpty(siteEntityList)){ if (!ObjectUtils.isEmpty(siteEntityList)) {
list.addAll(siteEntityList); list.addAll(siteEntityList);
} }
} }
...@@ -628,6 +627,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -628,6 +627,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
//String dxType = AreaLevelDxTypeEnum.getByValue(areaEntity == null ? 2 : areaEntity.getAreaLevel()).getDesc(); //String dxType = AreaLevelDxTypeEnum.getByValue(areaEntity == null ? 2 : areaEntity.getAreaLevel()).getDesc();
// String dxType="2"; // String dxType="2";
//String dxType = "3"; //String dxType = "3";
log.info("抓取事项开始");
List<MatterEntity> govMatterList = new ArrayList<>(); List<MatterEntity> govMatterList = new ArrayList<>();
List<DeptEntity> deptEntities = deptService.find(new DeptQuery().siteId(siteEntity.getId()).source(0)); List<DeptEntity> deptEntities = deptService.find(new DeptQuery().siteId(siteEntity.getId()).source(0));
for (DeptEntity deptEntity : deptEntities) { for (DeptEntity deptEntity : deptEntities) {
...@@ -643,6 +643,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -643,6 +643,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
govMatterList.addAll(deptMatterList); govMatterList.addAll(deptMatterList);
} }
} }
log.info("抓取事项结束");
/* HashMap<String, String> params = new HashMap<>(); /* HashMap<String, String> params = new HashMap<>();
params.put("dxType", dxType); params.put("dxType", dxType);
params.put("areaCode", siteEntity.getAreaCode()); params.put("areaCode", siteEntity.getAreaCode());
...@@ -666,11 +667,40 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -666,11 +667,40 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
List<MatterEntity> mattersTwo = this.getMatters(params, context); List<MatterEntity> mattersTwo = this.getMatters(params, context);
govMatterList.addAll(mattersTwo);*/ govMatterList.addAll(mattersTwo);*/
List<MatterEntity> localMatterList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode())); // new MatterQuery().setMatterNoNotList();
List<MatterEntity> subList = this.subList(govMatterList, localMatterList);
// List<MatterEntity> localMatterList = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()));
//HashSet<String> matterNoSet = new HashSet<>();
Set<String> matterNoSet = matterService.getDao().getMatterListByAreaCode(new MatterQuery().areaCode(siteEntity.getAreaCode())).parallelStream().map(i->i.getMatterNo()).collect(Collectors.toSet());
/* Integer page = 1;
Integer size = 200;
PageInfo pageInfo = new PageInfo();
pageInfo.setCountPage(false);
while (true) {
pageInfo.setCurrPage(page);
pageInfo.setPrePageResult(size);
Result<MatterEntity> matterEntityResult = matterService.find(new MatterQuery().areaCode(siteEntity.getAreaCode()), pageInfo, context);
if (ObjectUtils.isEmpty(matterEntityResult.getList())) {
break;
}
Set<String> collect = matterEntityResult.getList().parallelStream().map(i -> i.getMatterNo()).collect(Collectors.toSet());
matterNoSet.addAll(collect);
page++;
log.info("page:{},size:{}", page, collect.size());
}*/
log.info("计算差集");
// List<MatterEntity> subList = this.subList(govMatterList, localMatterList);
List<MatterEntity> subList = this.subListSet(govMatterList, matterNoSet);
log.info("抓取事项总数：{}需要添加事项数量：{}", govMatterList.size(), subList.size()); log.info("抓取事项总数：{}需要添加事项数量：{}", govMatterList.size(), subList.size());
subList = subList.stream().distinct().collect(Collectors.toList()); subList = subList.stream().distinct().collect(Collectors.toList());
log.info("需要添加事项过滤后数量：{}" , subList.size()); log.info("需要添加事项过滤后数量：{}", subList.size());
//差集进行插入并更新详细数据 //差集进行插入并更新详细数据
if (!ObjectUtils.isEmpty(subList)) { if (!ObjectUtils.isEmpty(subList)) {
for (MatterEntity matterEntity : subList) { for (MatterEntity matterEntity : subList) {
...@@ -736,5 +766,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -736,5 +766,10 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList()); return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList());
} }
public List<MatterEntity> subListSet(List<MatterEntity> firstList, Set<String> secondSet) {
// Set<String> secondSet = secondList.parallelStream().map(e -> e.getMatterNo()).collect(Collectors.toSet());
return firstList.parallelStream().filter(item -> !secondSet.contains(item.getMatterNo())).collect(Collectors.toList());
}
} }
\ No newline at end of file
base-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @ 020cb085
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<setting name="useGeneratedKeys" value="false" /> <setting name="useGeneratedKeys" value="false" />
<setting name="defaultExecutorType" value="REUSE" /> <setting name="defaultExecutorType" value="REUSE" />
<!-- 是否开始sql日志控制台打印 --> <!-- 是否开始sql日志控制台打印 -->
<!-- <setting name="logImpl" value="STDOUT_LOGGING" />--> <setting name="logPrefix" value="com.mapper"/>
<!-- <setting name="logImpl" value="SLF4J" />-->
</settings> </settings>
<plugins> <plugins>
<plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin"> <plugin interceptor="com.mortals.framework.thirty.mybatis.MortalsPagePlugin">
......
base-manager/src/main/resources/logback-spring.xml
View file @ 020cb085
...@@ -9,13 +9,47 @@ ...@@ -9,13 +9,47 @@
<!-- appender用来格式化日志输出节点，有俩个属性name和class，class用来指定哪种输出策略，常用就是控制台输出策略和文件输出策略 --> <!-- appender用来格式化日志输出节点，有俩个属性name和class，class用来指定哪种输出策略，常用就是控制台输出策略和文件输出策略 -->
<!-- 控制台输出策略--> <!-- 控制台输出策略-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<!-- 添加过滤器 -->
<!-- <filter class="com.mortals.xhx.base.framework.filter.SampleFilter" />-->
<!-- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>
<expression>
return false;
</expression>
</evaluator>
<OnMatch>ACCEPT</OnMatch>
<OnMismatch>DENY</OnMismatch>
</filter>-->
<encoder> <encoder>
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符--> <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>
<!-- 文件输出策略--> <!-- 文件输出策略-->
<appender name="fileInfo" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="fileInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 添加过滤器 -->
<!--<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>
<expression>
// 判断 SQL 语句是否包含 "&lt;!&ndash; no log &ndash;&gt;" 注释
return !message.contains("&lt;!&ndash; no log &ndash;&gt;");
</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
</filter>-->
<!-- 添加过滤器 -->
<!-- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
<evaluator>
<expression>
return false;
</expression>
</evaluator>
<OnMatch>ACCEPT</OnMatch>
<OnMismatch>DENY</OnMismatch>
</filter>-->
<encoder> <encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern> <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
</encoder> </encoder>
...@@ -27,6 +61,7 @@ ...@@ -27,6 +61,7 @@
<!--日志文件保留天数--> <!--日志文件保留天数-->
<MaxHistory>15</MaxHistory> <MaxHistory>15</MaxHistory>
</rollingPolicy> </rollingPolicy>
</appender> </appender>
<!-- 异常文件输出策略--> <!-- 异常文件输出策略-->
<appender name="fileError" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="fileError" class="ch.qos.logback.core.rolling.RollingFileAppender">
...@@ -57,6 +92,10 @@ ...@@ -57,6 +92,10 @@
<!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别--> <!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别-->
<!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。--> <!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。-->
<logger name="com.mapper" level="debug" additivity="false">
<appender-ref ref="console"/>
</logger>
<logger name="com.mortals" level="${logLevel}" additivity="false"> <logger name="com.mortals" level="${logLevel}" additivity="false">
<appender-ref ref="console"/> <appender-ref ref="console"/>
<appender-ref ref="fileInfo"/> <appender-ref ref="fileInfo"/>
......
base-manager/src/main/resources/sqlmap/base/system/task.xml
View file @ 020cb085
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
<!-- 根据主健查询 --> <!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="TaskEntity-Map"> <select id="getByKey" parameterType="paramDto" resultMap="TaskEntity-Map">
<!-- no log -->
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_xhx_task as a from mortals_xhx_task as a
where a.id=#{condition.id} where a.id=#{condition.id}
...@@ -216,6 +217,7 @@ ...@@ -216,6 +217,7 @@
</delete> </delete>
<!-- 获取列表 --> <!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="TaskEntity-Map"> <select id="getList" parameterType="paramDto" resultMap="TaskEntity-Map">
<!-- no log -->
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_xhx_task as a from mortals_xhx_task as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
......
base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml
View file @ 020cb085
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
<if test="condition.siteId!=null and condition.siteId!=''"> <if test="condition.siteId!=null and condition.siteId!=''">
where siteId = #{condition.siteId} where siteId = #{condition.siteId}
</if> </if>
</trim> </trim>
)AS b ON a.matterNo = b.matterCode )AS b ON a.matterNo = b.matterCode
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where b.matterCode IS NULL and where b.matterCode IS NULL and
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter LEFT JOIN ( SELECT matterCode FROM mortals_sys_site_matter
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
<if test="condition.siteId!=null and condition.siteId!=''"> <if test="condition.siteId!=null and condition.siteId!=''">
where siteId = #{condition.siteId,jdbcType=VARCHAR} where siteId = #{condition.siteId,jdbcType=VARCHAR}
</if> </if>
</trim> </trim>
) AS b ON a.matterNo = b.matterCode ) AS b ON a.matterNo = b.matterCode
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR} and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
</if> </if>
<if test="condition.matterName != null and condition.matterName != ''"> <if test="condition.matterName != null and condition.matterName != ''">
and a.matterName like #{condition.matterName} and a.matterName like #{condition.matterName}
</if> </if>
<if test="condition.source!=null"> <if test="condition.source!=null">
and a.source = #{condition.source,jdbcType=INTEGER} and a.source = #{condition.source,jdbcType=INTEGER}
...@@ -64,4 +64,18 @@ ...@@ -64,4 +64,18 @@
</trim> </trim>
</trim> </trim>
</select> </select>
<select id="getMatterListByAreaCode" parameterType="paramDto" resultMap="MatterEntity-Map">
select
a.matterNo
FROM
mortals_sys_matter AS a
where
<trim prefixOverrides="and" prefix="">
<if test="condition.areaCode!=null and condition.areaCode!=''">
and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
</if>
</trim>
</select>
</mapper> </mapper>
\ No newline at end of file
base-manager/src/main/resources/sqlmap/module/site/SiteThemeMatterMapper.xml
View file @ 020cb085
<?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.site.dao.ibatis.SiteThemeMatterDaoImpl"> <mapper namespace="com.mortals.xhx.module.site.dao.ibatis.SiteThemeMatterDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="SiteThemeMatterEntity" id="SiteThemeMatterEntity-Map"> <resultMap type="SiteThemeMatterEntity" id="SiteThemeMatterEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteId" column="siteId" /> <result property="siteId" column="siteId" />
<result property="siteName" column="siteName" /> <result property="siteName" column="siteName" />
<result property="matterId" column="matterId" /> <result property="matterId" column="matterId" />
<result property="matterName" column="matterName" /> <result property="matterName" column="matterName" />
<result property="matterCode" column="matterCode" /> <result property="matterCode" column="matterCode" />
<result property="userType" column="userType" /> <result property="userType" column="userType" />
<result property="themeCode" column="themeCode" /> <result property="themeCode" column="themeCode" />
<result property="themeName" column="themeName" /> <result property="themeName" column="themeName" />
<result property="source" column="source" /> <result property="source" column="source" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="hot" column="hot" />
<result property="display" column="display" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId, a.siteId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName, a.siteName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
a.matterId, a.matterId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterName') or colPickMode == 1 and data.containsKey('matterName')))">
a.matterName, a.matterName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterCode') or colPickMode == 1 and data.containsKey('matterCode')))">
a.matterCode, a.matterCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userType') or colPickMode == 1 and data.containsKey('userType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userType') or colPickMode == 1 and data.containsKey('userType')))">
a.userType, a.userType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('themeCode') or colPickMode == 1 and data.containsKey('themeCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('themeCode') or colPickMode == 1 and data.containsKey('themeCode')))">
a.themeCode, a.themeCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('themeName') or colPickMode == 1 and data.containsKey('themeName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('themeName') or colPickMode == 1 and data.containsKey('themeName')))">
a.themeName, a.themeName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
a.source, a.source,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<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('hot') or colPickMode == 1 and data.containsKey('hot')))">
a.hot,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('display') or colPickMode == 1 and data.containsKey('display')))">
a.display,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteThemeMatterEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SiteThemeMatterEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site_theme_matter insert into mortals_sys_site_theme_matter
(siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime) (siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime,hot,display)
VALUES VALUES
(#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{userType},#{themeCode},#{themeName},#{source},#{createTime},#{createUserId},#{updateTime}) (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{userType},#{themeCode},#{themeName},#{source},#{createTime},#{createUserId},#{updateTime},#{hot},#{display})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site_theme_matter insert into mortals_sys_site_theme_matter
(siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime) (siteId,siteName,matterId,matterName,matterCode,userType,themeCode,themeName,source,createTime,createUserId,updateTime,hot,display)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.userType},#{item.themeCode},#{item.themeName},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.userType},#{item.themeCode},#{item.themeName},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.hot},#{item.display})
</foreach> </foreach>
</insert> </insert>
...@@ -138,6 +146,18 @@ ...@@ -138,6 +146,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('hot')) or (colPickMode==1 and !data.containsKey('hot'))">
a.hot=#{data.hot},
</if>
<if test="(colPickMode==0 and data.containsKey('hotIncrement')) or (colPickMode==1 and !data.containsKey('hotIncrement'))">
a.hot=ifnull(a.hot,0) + #{data.hotIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('display')) or (colPickMode==1 and !data.containsKey('display'))">
a.display=#{data.display},
</if>
<if test="(colPickMode==0 and data.containsKey('displayIncrement')) or (colPickMode==1 and !data.containsKey('displayIncrement'))">
a.display=ifnull(a.display,0) + #{data.displayIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -150,110 +170,134 @@ ...@@ -150,110 +170,134 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_site_theme_matter as a update mortals_sys_site_theme_matter as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),"> <trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))"> <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId} when a.id=#{item.id} then #{item.siteId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))"> <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 a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteName=(case" suffix="ELSE siteName end),"> <trim prefix="siteName=(case" suffix="ELSE siteName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))"> <if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
when a.id=#{item.id} then #{item.siteName} when a.id=#{item.id} then #{item.siteName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="matterId=(case" suffix="ELSE matterId end),"> <trim prefix="matterId=(case" suffix="ELSE matterId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))"> <when test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
when a.id=#{item.id} then #{item.matterId} when a.id=#{item.id} then #{item.matterId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement} when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="matterName=(case" suffix="ELSE matterName end),"> <trim prefix="matterName=(case" suffix="ELSE matterName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))"> <if test="(colPickMode==0 and item.containsKey('matterName')) or (colPickMode==1 and !item.containsKey('matterName'))">
when a.id=#{item.id} then #{item.matterName} when a.id=#{item.id} then #{item.matterName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="matterCode=(case" suffix="ELSE matterCode end),"> <trim prefix="matterCode=(case" suffix="ELSE matterCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))"> <if test="(colPickMode==0 and item.containsKey('matterCode')) or (colPickMode==1 and !item.containsKey('matterCode'))">
when a.id=#{item.id} then #{item.matterCode} when a.id=#{item.id} then #{item.matterCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="userType=(case" suffix="ELSE userType end),"> <trim prefix="userType=(case" suffix="ELSE userType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('userType')) or (colPickMode==1 and !item.containsKey('userType'))"> <if test="(colPickMode==0 and item.containsKey('userType')) or (colPickMode==1 and !item.containsKey('userType'))">
when a.id=#{item.id} then #{item.userType} when a.id=#{item.id} then #{item.userType}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="themeCode=(case" suffix="ELSE themeCode end),"> <trim prefix="themeCode=(case" suffix="ELSE themeCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('themeCode')) or (colPickMode==1 and !item.containsKey('themeCode'))"> <if test="(colPickMode==0 and item.containsKey('themeCode')) or (colPickMode==1 and !item.containsKey('themeCode'))">
when a.id=#{item.id} then #{item.themeCode} when a.id=#{item.id} then #{item.themeCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="themeName=(case" suffix="ELSE themeName end),"> <trim prefix="themeName=(case" suffix="ELSE themeName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('themeName')) or (colPickMode==1 and !item.containsKey('themeName'))"> <if test="(colPickMode==0 and item.containsKey('themeName')) or (colPickMode==1 and !item.containsKey('themeName'))">
when a.id=#{item.id} then #{item.themeName} when a.id=#{item.id} then #{item.themeName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="source=(case" suffix="ELSE source end),"> <trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))"> <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.source} when a.id=#{item.id} then #{item.source}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))"> <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement} when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime} when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="hot=(case" suffix="ELSE hot end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('hot')) or (colPickMode==1 and !item.containsKey('hot'))">
when a.id=#{item.id} then #{item.hot}
</when>
<when test="(colPickMode==0 and item.containsKey('hotIncrement')) or (colPickMode==1 and !item.containsKey('hotIncrement'))">
when a.id=#{item.id} then ifnull(a.hot,0) + #{item.hotIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="display=(case" suffix="ELSE display end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('display')) or (colPickMode==1 and !item.containsKey('display'))">
when a.id=#{item.id} then #{item.display}
</when>
<when test="(colPickMode==0 and item.containsKey('displayIncrement')) or (colPickMode==1 and !item.containsKey('displayIncrement'))">
when a.id=#{item.id} then ifnull(a.display,0) + #{item.displayIncrement}
</when>
</choose>
</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=")">
...@@ -370,309 +414,439 @@ ...@@ -370,309 +414,439 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')"> <if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null "> <if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId} ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList')">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" 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>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null"> <if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd} ${_conditionType_} a.siteId is null
</if> </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('siteName')"> <if test="conditionParamRef.containsKey('siteName')">
<if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''"> <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
${_conditionType_} a.siteName like #{${_conditionParam_}.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')">
${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterId')">
<if test="conditionParamRef.matterId != null ">
${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
</if>
<if test="conditionParamRef.matterId == null">
${_conditionType_} a.matterId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('matterIdList')"> <if test="conditionParamRef.siteName == null">
${_conditionType_} a.matterId in ${_conditionType_} a.siteName is null
<foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null"> </if>
${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart} <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>
<if test="conditionParamRef.containsKey('matterId')">
<if test="conditionParamRef.matterId != null ">
${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
</if> </if>
<if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null"> <if test="conditionParamRef.matterId == null">
${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd} ${_conditionType_} a.matterId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('matterIdList') and conditionParamRef.matterIdList.size() > 0">
${_conditionType_} a.matterId in
<foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterIdNotList') and conditionParamRef.matterIdNotList.size() > 0">
${_conditionType_} a.matterId not in
<foreach collection="conditionParamRef.matterIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
</if>
<if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
</if>
<if test="conditionParamRef.containsKey('matterName')"> <if test="conditionParamRef.containsKey('matterName')">
<if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''"> <if test="conditionParamRef.matterName != null and conditionParamRef.matterName != ''">
${_conditionType_} a.matterName like #{${_conditionParam_}.matterName} ${_conditionType_} a.matterName like #{${_conditionParam_}.matterName}
</if>
<if test="conditionParamRef.matterName == null">
${_conditionType_} a.matterName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('matterNameList')"> <if test="conditionParamRef.matterName == null">
${_conditionType_} a.matterName in ${_conditionType_} a.matterName is null
<foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('matterNameList') and conditionParamRef.matterNameList.size() > 0">
${_conditionType_} a.matterName in
<foreach collection="conditionParamRef.matterNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterNameNotList') and conditionParamRef.matterNameNotList.size() > 0">
${_conditionType_} a.matterName not in
<foreach collection="conditionParamRef.matterNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterCode')"> <if test="conditionParamRef.containsKey('matterCode')">
<if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''"> <if test="conditionParamRef.matterCode != null and conditionParamRef.matterCode != ''">
${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode} ${_conditionType_} a.matterCode like #{${_conditionParam_}.matterCode}
</if>
<if test="conditionParamRef.matterCode == null">
${_conditionType_} a.matterCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('matterCodeList')"> <if test="conditionParamRef.matterCode == null">
${_conditionType_} a.matterCode in ${_conditionType_} a.matterCode is null
<foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('matterCodeList') and conditionParamRef.matterCodeList.size() > 0">
${_conditionType_} a.matterCode in
<foreach collection="conditionParamRef.matterCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('matterCodeNotList') and conditionParamRef.matterCodeNotList.size() > 0">
${_conditionType_} a.matterCode not in
<foreach collection="conditionParamRef.matterCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userType')"> <if test="conditionParamRef.containsKey('userType')">
<if test="conditionParamRef.userType != null and conditionParamRef.userType != ''"> <if test="conditionParamRef.userType != null and conditionParamRef.userType != ''">
${_conditionType_} a.userType like #{${_conditionParam_}.userType} ${_conditionType_} a.userType like #{${_conditionParam_}.userType}
</if>
<if test="conditionParamRef.userType == null">
${_conditionType_} a.userType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('userTypeList')"> <if test="conditionParamRef.userType == null">
${_conditionType_} a.userType in ${_conditionType_} a.userType is null
<foreach collection="conditionParamRef.userTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('userTypeList') and conditionParamRef.userTypeList.size() > 0">
${_conditionType_} a.userType in
<foreach collection="conditionParamRef.userTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userTypeNotList') and conditionParamRef.userTypeNotList.size() > 0">
${_conditionType_} a.userType not in
<foreach collection="conditionParamRef.userTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('themeCode')"> <if test="conditionParamRef.containsKey('themeCode')">
<if test="conditionParamRef.themeCode != null and conditionParamRef.themeCode != ''"> <if test="conditionParamRef.themeCode != null and conditionParamRef.themeCode != ''">
${_conditionType_} a.themeCode like #{${_conditionParam_}.themeCode} ${_conditionType_} a.themeCode like #{${_conditionParam_}.themeCode}
</if>
<if test="conditionParamRef.themeCode == null">
${_conditionType_} a.themeCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('themeCodeList')"> <if test="conditionParamRef.themeCode == null">
${_conditionType_} a.themeCode in ${_conditionType_} a.themeCode is null
<foreach collection="conditionParamRef.themeCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('themeCodeList') and conditionParamRef.themeCodeList.size() > 0">
${_conditionType_} a.themeCode in
<foreach collection="conditionParamRef.themeCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('themeCodeNotList') and conditionParamRef.themeCodeNotList.size() > 0">
${_conditionType_} a.themeCode not in
<foreach collection="conditionParamRef.themeCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('themeName')"> <if test="conditionParamRef.containsKey('themeName')">
<if test="conditionParamRef.themeName != null and conditionParamRef.themeName != ''"> <if test="conditionParamRef.themeName != null and conditionParamRef.themeName != ''">
${_conditionType_} a.themeName like #{${_conditionParam_}.themeName} ${_conditionType_} a.themeName like #{${_conditionParam_}.themeName}
</if>
<if test="conditionParamRef.themeName == null">
${_conditionType_} a.themeName is null
</if>
</if>
<if test="conditionParamRef.containsKey('themeNameList')">
${_conditionType_} a.themeName in
<foreach collection="conditionParamRef.themeNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('source')"> <if test="conditionParamRef.themeName == null">
<if test="conditionParamRef.source != null "> ${_conditionType_} a.themeName is null
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList')">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null"> </if>
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart} <if test="conditionParamRef.containsKey('themeNameList') and conditionParamRef.themeNameList.size() > 0">
${_conditionType_} a.themeName in
<foreach collection="conditionParamRef.themeNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('themeNameNotList') and conditionParamRef.themeNameNotList.size() > 0">
${_conditionType_} a.themeName not in
<foreach collection="conditionParamRef.themeNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if> </if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null"> <if test="conditionParamRef.source == null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd} ${_conditionType_} a.source is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime is null
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> </if>
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.createUserId == null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.createUserId is null
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> </if>
${_conditionType_} a.createUserId in <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.createUserId in
#{item} <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
</foreach> #{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.updateTime is null
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<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')
</if>
<if test="conditionParamRef.containsKey('hot')">
<if test="conditionParamRef.hot != null ">
${_conditionType_} a.hot = #{${_conditionParam_}.hot}
</if> </if>
<if test="conditionParamRef.hot == null">
${_conditionType_} a.hot is null
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> </if>
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('hotList') and conditionParamRef.hotList.size() > 0">
${_conditionType_} a.hot in
<foreach collection="conditionParamRef.hotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hotNotList') and conditionParamRef.hotNotList.size() > 0">
${_conditionType_} a.hot not in
<foreach collection="conditionParamRef.hotNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hotStart') and conditionParamRef.hotStart != null">
${_conditionType_} a.hot <![CDATA[ >= ]]> #{${_conditionParam_}.hotStart}
</if>
<if test="conditionParamRef.containsKey('hotEnd') and conditionParamRef.hotEnd != null">
${_conditionType_} a.hot <![CDATA[ <= ]]> #{${_conditionParam_}.hotEnd}
</if>
<if test="conditionParamRef.containsKey('display')">
<if test="conditionParamRef.display != null ">
${_conditionType_} a.display = #{${_conditionParam_}.display}
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.display == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.display is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('displayList') and conditionParamRef.displayList.size() > 0">
${_conditionType_} a.display in
<foreach collection="conditionParamRef.displayList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('displayNotList') and conditionParamRef.displayNotList.size() > 0">
${_conditionType_} a.display not in
<foreach collection="conditionParamRef.displayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('displayStart') and conditionParamRef.displayStart != null">
${_conditionType_} a.display <![CDATA[ >= ]]> #{${_conditionParam_}.displayStart}
</if>
<if test="conditionParamRef.containsKey('displayEnd') and conditionParamRef.displayEnd != null">
${_conditionType_} a.display <![CDATA[ <= ]]> #{${_conditionParam_}.displayEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')"> <if test="orderCol.containsKey('siteId')">
a.siteId a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if> <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteName')"> <if test="orderCol.containsKey('siteName')">
a.siteName a.siteName
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if> <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('matterId')"> <if test="orderCol.containsKey('matterId')">
a.matterId a.matterId
<if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if> <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('matterName')"> <if test="orderCol.containsKey('matterName')">
a.matterName a.matterName
<if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if> <if test='orderCol.matterName != null and "DESC".equalsIgnoreCase(orderCol.matterName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('matterCode')"> <if test="orderCol.containsKey('matterCode')">
a.matterCode a.matterCode
<if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if> <if test='orderCol.matterCode != null and "DESC".equalsIgnoreCase(orderCol.matterCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('userType')"> <if test="orderCol.containsKey('userType')">
a.userType a.userType
<if test='orderCol.userType != null and "DESC".equalsIgnoreCase(orderCol.userType)'>DESC</if> <if test='orderCol.userType != null and "DESC".equalsIgnoreCase(orderCol.userType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('themeCode')"> <if test="orderCol.containsKey('themeCode')">
a.themeCode a.themeCode
<if test='orderCol.themeCode != null and "DESC".equalsIgnoreCase(orderCol.themeCode)'>DESC</if> <if test='orderCol.themeCode != null and "DESC".equalsIgnoreCase(orderCol.themeCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('themeName')"> <if test="orderCol.containsKey('themeName')">
a.themeName a.themeName
<if test='orderCol.themeName != null and "DESC".equalsIgnoreCase(orderCol.themeName)'>DESC</if> <if test='orderCol.themeName != null and "DESC".equalsIgnoreCase(orderCol.themeName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('source')"> <if test="orderCol.containsKey('source')">
a.source a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if> <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<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('hot')">
a.hot
<if test='orderCol.hot != null and "DESC".equalsIgnoreCase(orderCol.hot)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('display')">
a.display
<if test='orderCol.display != null and "DESC".equalsIgnoreCase(orderCol.display)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @ 020cb085
...@@ -104,7 +104,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId ...@@ -104,7 +104,7 @@ POST {{baseUrl}}/site/syncGovMatterBySiteId
Content-Type: application/json Content-Type: application/json
{ {
"id":3 "id":1
} }
......
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