Skip to content

S
smart_gov_platform
Commit 26150078 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents 4c530552 8e840f29
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 543 deletions
base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java
View file @ 26150078
......@@ -111,7 +111,7 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
return userEntity;
}
} catch (Exception e) {
log.error("解析jwt token异常！", e);
log.error("解析jwt token异常！,token:{}",token, e);
return null;
}
}
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ 26150078
......@@ -74,7 +74,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
//判断是否存在设备编码。存在 查询设备编码应用黑名单
checkDeviceBlackApp(params, list);
//根据指定的idlist顺序进行排序
sortAppByIdList(params, list);
//sortAppByIdList(params, list);
String domainUrl = "";
if (!ObjectUtils.isEmpty(params.getServerName()) && Validator.isIpv4(params.getServerName())) {
domainUrl = String.format("http://%s:%d", params.getServerName(), params.getServerPort() > 0 ? params.getServerPort() : 11078);
......@@ -116,6 +116,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
private void sortAppByIdList(AppEntity params, List<AppEntity> list) {
if (!ObjectUtils.isEmpty(params.getIdList())) {
log.info("请求的排序id列表:{}", JSON.toJSONString(params.getIdList()));
try {
//去除idlist中不存在的
......
base-manager/src/main/java/com/mortals/xhx/module/business/service/impl/BusinessServiceImpl.java
View file @ 26150078
......@@ -181,14 +181,6 @@ public class BusinessServiceImpl extends AbstractCRUDCacheServiceImpl<BusinessDa
Long[] idList = windowBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
windowBusinessService.remove(idList, context);
}
/* SiteBusinessQuery siteBusinessQuery = new SiteBusinessQuery();
siteBusinessQuery.setBusinessIdList(Arrays.asList(ids));
List<SiteBusinessEntity> siteBusinessEntities = siteBusinessService.find(siteBusinessQuery);
log.info("remove siteBusinessEntities size:{}", siteBusinessEntities.size());
if (!ObjectUtils.isEmpty(siteBusinessEntities)) {
Long[] idList = siteBusinessEntities.stream().map(item -> item.getId()).toArray(Long[]::new);
siteBusinessService.remove(idList, context);
}*/
}
}
......
base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowServiceImpl.java
View file @ 26150078
......@@ -221,7 +221,6 @@ public class WindowServiceImpl extends AbstractCRUDCacheServiceImpl<WindowDao, W
}
private void pushChangeMsg(Long windowId) {
// log.info("pushChangeMsg:{}", JSON.toJSONString(windowId));
String phpUrl = GlobalSysInfo.getParamValue(PARAM_SERVER_PHP_HTTP_URL, "http://172.15.28.116:8090");
phpUrl += "/api/window/winNameChange";
HashMap<String, Object> paramsMap = new HashMap<>();
......
base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
View file @ 26150078
......@@ -80,9 +80,6 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
} else {
entity.setLoginPwd(null);
}
//判断党员是否其它选项，如果
}
@Override
......@@ -111,9 +108,6 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
} catch (Exception e) {
throw new AppException("密码验认出错！", e);
}
// WorkmanEntity update = new WorkmanEntity();
// update.setId(workmanEntity.getId());
// this.dao.update(update);
return workmanEntity;
}
......
base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml
View file @ 26150078
......@@ -593,12 +593,18 @@
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
<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>
......@@ -614,12 +620,18 @@
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList')">
<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>
......@@ -636,12 +648,18 @@
${_conditionType_} a.siteName is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteNameList')">
<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('appCode')">
<if test="conditionParamRef.appCode != null and conditionParamRef.appCode != ''">
......@@ -651,12 +669,18 @@
${_conditionType_} a.appCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('appCodeList')">
<if test="conditionParamRef.containsKey('appCodeList') and conditionParamRef.appCodeList.size() > 0">
${_conditionType_} a.appCode in
<foreach collection="conditionParamRef.appCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appCodeNotList') and conditionParamRef.appCodeNotList.size() > 0">
${_conditionType_} a.appCode not in
<foreach collection="conditionParamRef.appCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appName')">
<if test="conditionParamRef.appName != null and conditionParamRef.appName != ''">
......@@ -666,12 +690,18 @@
${_conditionType_} a.appName is null
</if>
</if>
<if test="conditionParamRef.containsKey('appNameList')">
<if test="conditionParamRef.containsKey('appNameList') and conditionParamRef.appNameList.size() > 0">
${_conditionType_} a.appName in
<foreach collection="conditionParamRef.appNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appNameNotList') and conditionParamRef.appNameNotList.size() > 0">
${_conditionType_} a.appName not in
<foreach collection="conditionParamRef.appNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appIconPath')">
<if test="conditionParamRef.appIconPath != null and conditionParamRef.appIconPath != ''">
......@@ -681,12 +711,18 @@
${_conditionType_} a.appIconPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('appIconPathList')">
<if test="conditionParamRef.containsKey('appIconPathList') and conditionParamRef.appIconPathList.size() > 0">
${_conditionType_} a.appIconPath in
<foreach collection="conditionParamRef.appIconPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appIconPathNotList') and conditionParamRef.appIconPathNotList.size() > 0">
${_conditionType_} a.appIconPath not in
<foreach collection="conditionParamRef.appIconPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appThemeName')">
<if test="conditionParamRef.appThemeName != null and conditionParamRef.appThemeName != ''">
......@@ -696,12 +732,18 @@
${_conditionType_} a.appThemeName is null
</if>
</if>
<if test="conditionParamRef.containsKey('appThemeNameList')">
<if test="conditionParamRef.containsKey('appThemeNameList') and conditionParamRef.appThemeNameList.size() > 0">
${_conditionType_} a.appThemeName in
<foreach collection="conditionParamRef.appThemeNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appThemeNameNotList') and conditionParamRef.appThemeNameNotList.size() > 0">
${_conditionType_} a.appThemeName not in
<foreach collection="conditionParamRef.appThemeNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('type')">
<if test="conditionParamRef.type != null ">
${_conditionType_} a.type = #{${_conditionParam_}.type}
......@@ -710,12 +752,18 @@
${_conditionType_} a.type is null
</if>
</if>
<if test="conditionParamRef.containsKey('typeList')">
<if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0">
${_conditionType_} a.type in
<foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeNotList') and conditionParamRef.typeNotList.size() > 0">
${_conditionType_} a.type not in
<foreach collection="conditionParamRef.typeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
</if>
......@@ -732,12 +780,18 @@
${_conditionType_} a.url is null
</if>
</if>
<if test="conditionParamRef.containsKey('urlList')">
<if test="conditionParamRef.containsKey('urlList') and conditionParamRef.urlList.size() > 0">
${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('urlNotList') and conditionParamRef.urlNotList.size() > 0">
${_conditionType_} a.url not in
<foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceApi')">
<if test="conditionParamRef.serviceApi != null and conditionParamRef.serviceApi != ''">
......@@ -747,12 +801,18 @@
${_conditionType_} a.serviceApi is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceApiList')">
<if test="conditionParamRef.containsKey('serviceApiList') and conditionParamRef.serviceApiList.size() > 0">
${_conditionType_} a.serviceApi in
<foreach collection="conditionParamRef.serviceApiList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('serviceApiNotList') and conditionParamRef.serviceApiNotList.size() > 0">
${_conditionType_} a.serviceApi not in
<foreach collection="conditionParamRef.serviceApiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('downDevCount')">
<if test="conditionParamRef.downDevCount != null ">
${_conditionType_} a.downDevCount = #{${_conditionParam_}.downDevCount}
......@@ -761,12 +821,18 @@
${_conditionType_} a.downDevCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('downDevCountList')">
<if test="conditionParamRef.containsKey('downDevCountList') and conditionParamRef.downDevCountList.size() > 0">
${_conditionType_} a.downDevCount in
<foreach collection="conditionParamRef.downDevCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('downDevCountNotList') and conditionParamRef.downDevCountNotList.size() > 0">
${_conditionType_} a.downDevCount not in
<foreach collection="conditionParamRef.downDevCountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('downDevCountStart') and conditionParamRef.downDevCountStart != null">
${_conditionType_} a.downDevCount <![CDATA[ >= ]]> #{${_conditionParam_}.downDevCountStart}
</if>
......@@ -782,12 +848,18 @@
${_conditionType_} a.shelves is null
</if>
</if>
<if test="conditionParamRef.containsKey('shelvesList')">
<if test="conditionParamRef.containsKey('shelvesList') and conditionParamRef.shelvesList.size() > 0">
${_conditionType_} a.shelves in
<foreach collection="conditionParamRef.shelvesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shelvesNotList') and conditionParamRef.shelvesNotList.size() > 0">
${_conditionType_} a.shelves not in
<foreach collection="conditionParamRef.shelvesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shelvesStart') and conditionParamRef.shelvesStart != null">
${_conditionType_} a.shelves <![CDATA[ >= ]]> #{${_conditionParam_}.shelvesStart}
</if>
......@@ -803,12 +875,18 @@
${_conditionType_} a.appType is null
</if>
</if>
<if test="conditionParamRef.containsKey('appTypeList')">
<if test="conditionParamRef.containsKey('appTypeList') and conditionParamRef.appTypeList.size() > 0">
${_conditionType_} a.appType in
<foreach collection="conditionParamRef.appTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appTypeNotList') and conditionParamRef.appTypeNotList.size() > 0">
${_conditionType_} a.appType not in
<foreach collection="conditionParamRef.appTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appTypeStart') and conditionParamRef.appTypeStart != null">
${_conditionType_} a.appType <![CDATA[ >= ]]> #{${_conditionParam_}.appTypeStart}
</if>
......@@ -825,12 +903,18 @@
${_conditionType_} a.fileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNameList')">
<if test="conditionParamRef.containsKey('fileNameList') and conditionParamRef.fileNameList.size() > 0">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fileNameNotList') and conditionParamRef.fileNameNotList.size() > 0">
${_conditionType_} a.fileName not in
<foreach collection="conditionParamRef.fileNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePath')">
<if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
......@@ -840,12 +924,18 @@
${_conditionType_} a.filePath is null
</if>
</if>
<if test="conditionParamRef.containsKey('filePathList')">
<if test="conditionParamRef.containsKey('filePathList') and conditionParamRef.filePathList.size() > 0">
${_conditionType_} a.filePath in
<foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePathNotList') and conditionParamRef.filePathNotList.size() > 0">
${_conditionType_} a.filePath not in
<foreach collection="conditionParamRef.filePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeFilePath')">
<if test="conditionParamRef.distributeFilePath != null and conditionParamRef.distributeFilePath != ''">
......@@ -855,12 +945,18 @@
${_conditionType_} a.distributeFilePath is null
</if>
</if>
<if test="conditionParamRef.containsKey('distributeFilePathList')">
<if test="conditionParamRef.containsKey('distributeFilePathList') and conditionParamRef.distributeFilePathList.size() > 0">
${_conditionType_} a.distributeFilePath in
<foreach collection="conditionParamRef.distributeFilePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeFilePathNotList') and conditionParamRef.distributeFilePathNotList.size() > 0">
${_conditionType_} a.distributeFilePath not in
<foreach collection="conditionParamRef.distributeFilePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('version')">
<if test="conditionParamRef.version != null ">
${_conditionType_} a.version = #{${_conditionParam_}.version}
......@@ -869,12 +965,18 @@
${_conditionType_} a.version is null
</if>
</if>
<if test="conditionParamRef.containsKey('versionList')">
<if test="conditionParamRef.containsKey('versionList') and conditionParamRef.versionList.size() > 0">
${_conditionType_} a.version in
<foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('versionNotList') and conditionParamRef.versionNotList.size() > 0">
${_conditionType_} a.version not in
<foreach collection="conditionParamRef.versionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('versionStart') and conditionParamRef.versionStart != null">
${_conditionType_} a.version <![CDATA[ >= ]]> #{${_conditionParam_}.versionStart}
</if>
......@@ -891,12 +993,18 @@
${_conditionType_} a.summary is null
</if>
</if>
<if test="conditionParamRef.containsKey('summaryList')">
<if test="conditionParamRef.containsKey('summaryList') and conditionParamRef.summaryList.size() > 0">
${_conditionType_} a.summary in
<foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('summaryNotList') and conditionParamRef.summaryNotList.size() > 0">
${_conditionType_} a.summary not in
<foreach collection="conditionParamRef.summaryNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('notes')">
<if test="conditionParamRef.notes != null and conditionParamRef.notes != ''">
......@@ -906,12 +1014,18 @@
${_conditionType_} a.notes is null
</if>
</if>
<if test="conditionParamRef.containsKey('notesList')">
<if test="conditionParamRef.containsKey('notesList') and conditionParamRef.notesList.size() > 0">
${_conditionType_} a.notes in
<foreach collection="conditionParamRef.notesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('notesNotList') and conditionParamRef.notesNotList.size() > 0">
${_conditionType_} a.notes not in
<foreach collection="conditionParamRef.notesNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distribute')">
<if test="conditionParamRef.distribute != null ">
${_conditionType_} a.distribute = #{${_conditionParam_}.distribute}
......@@ -920,12 +1034,18 @@
${_conditionType_} a.distribute is null
</if>
</if>
<if test="conditionParamRef.containsKey('distributeList')">
<if test="conditionParamRef.containsKey('distributeList') and conditionParamRef.distributeList.size() > 0">
${_conditionType_} a.distribute in
<foreach collection="conditionParamRef.distributeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeNotList') and conditionParamRef.distributeNotList.size() > 0">
${_conditionType_} a.distribute not in
<foreach collection="conditionParamRef.distributeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeStart') and conditionParamRef.distributeStart != null">
${_conditionType_} a.distribute <![CDATA[ >= ]]> #{${_conditionParam_}.distributeStart}
</if>
......@@ -941,12 +1061,18 @@
${_conditionType_} a.dataUpdate is null
</if>
</if>
<if test="conditionParamRef.containsKey('dataUpdateList')">
<if test="conditionParamRef.containsKey('dataUpdateList') and conditionParamRef.dataUpdateList.size() > 0">
${_conditionType_} a.dataUpdate in
<foreach collection="conditionParamRef.dataUpdateList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dataUpdateNotList') and conditionParamRef.dataUpdateNotList.size() > 0">
${_conditionType_} a.dataUpdate not in
<foreach collection="conditionParamRef.dataUpdateNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dataUpdateStart') and conditionParamRef.dataUpdateStart != null">
${_conditionType_} a.dataUpdate <![CDATA[ >= ]]> #{${_conditionParam_}.dataUpdateStart}
</if>
......@@ -977,12 +1103,18 @@
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
......@@ -1009,14 +1141,154 @@
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0">
field(a.type,
<foreach collection="conditionParamRef.typeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('downDevCountList') and conditionParamRef.downDevCountList.size() > 0">
field(a.downDevCount,
<foreach collection="conditionParamRef.downDevCountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('shelvesList') and conditionParamRef.shelvesList.size() > 0">
field(a.shelves,
<foreach collection="conditionParamRef.shelvesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('appTypeList') and conditionParamRef.appTypeList.size() > 0">
field(a.appType,
<foreach collection="conditionParamRef.appTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('versionList') and conditionParamRef.versionList.size() > 0">
field(a.version,
<foreach collection="conditionParamRef.versionList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('distributeList') and conditionParamRef.distributeList.size() > 0">
field(a.distribute,
<foreach collection="conditionParamRef.distributeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('dataUpdateList') and conditionParamRef.dataUpdateList.size() > 0">
field(a.dataUpdate,
<foreach collection="conditionParamRef.dataUpdateList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
a.${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
field(a.id,
<foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
field(a.siteId,
<foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('typeList') and conditionParamRef.typeList.size() > 0">
field(a.type,
<foreach collection="conditionParamRef.typeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('downDevCountList') and conditionParamRef.downDevCountList.size() > 0">
field(a.downDevCount,
<foreach collection="conditionParamRef.downDevCountList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('shelvesList') and conditionParamRef.shelvesList.size() > 0">
field(a.shelves,
<foreach collection="conditionParamRef.shelvesList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('appTypeList') and conditionParamRef.appTypeList.size() > 0">
field(a.appType,
<foreach collection="conditionParamRef.appTypeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('versionList') and conditionParamRef.versionList.size() > 0">
field(a.version,
<foreach collection="conditionParamRef.versionList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('distributeList') and conditionParamRef.distributeList.size() > 0">
field(a.distribute,
<foreach collection="conditionParamRef.distributeList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('dataUpdateList') and conditionParamRef.dataUpdateList.size() > 0">
field(a.dataUpdate,
<foreach collection="conditionParamRef.dataUpdateList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
field(a.updateUserId,
<foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
,
</if>
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
......@@ -1140,6 +1412,8 @@
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
......
portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserModelCollectQuery.java
View file @ 26150078
package com.mortals.xhx.module.user.model;
import java.util.List;
import com.mortals.xhx.module.user.model.UserModelCollectEntity;
/**
* 用户模块收藏查询对象
*
* @author zxfei
* @date 2023-08-29
*/
public class UserModelCollectQuery extends UserModelCollectEntity {
/** 开始 主键，自增长 */
private Long idStart;
/** 结束 主键，自增长 */
private Long idEnd;
/** 增加 主键，自增长 */
private Long idIncrement;
/** 主键，自增长列表 */
private List <Long> idList;
/** 主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 用户ID，主键，自增长 */
private Long userIdStart;
/** 结束 用户ID，主键，自增长 */
private Long userIdEnd;
/** 增加 用户ID，主键，自增长 */
private Long userIdIncrement;
/** 用户ID，主键，自增长列表 */
private List <Long> userIdList;
/** 用户ID，主键，自增长排除列表 */
private List <Long> userIdNotList;
/** 登录名 */
private List<String> realNameList;
/** 登录名排除列表 */
private List <String> realNameNotList;
/** 收藏模块 */
private List<String> modelIdsList;
/** 收藏模块排除列表 */
private List <String> modelIdsNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<UserModelCollectQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<UserModelCollectQuery> andConditionList;
public UserModelCollectQuery(){}
/**
* 获取 开始 主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 用户ID，主键，自增长
* @return userIdStart
*/
public Long getUserIdStart(){
return this.userIdStart;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param userIdStart
*/
public void setUserIdStart(Long userIdStart){
this.userIdStart = userIdStart;
}
/**
* 获取 结束 用户ID，主键，自增长
* @return $userIdEnd
*/
public Long getUserIdEnd(){
return this.userIdEnd;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param userIdEnd
*/
public void setUserIdEnd(Long userIdEnd){
this.userIdEnd = userIdEnd;
}
/**
* 获取 增加 用户ID，主键，自增长
* @return userIdIncrement
*/
public Long getUserIdIncrement(){
return this.userIdIncrement;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param userIdIncrement
*/
public void setUserIdIncrement(Long userIdIncrement){
this.userIdIncrement = userIdIncrement;
}
/**
* 获取 用户ID，主键，自增长
* @return userIdList
*/
public List<Long> getUserIdList(){
return this.userIdList;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdList
*/
public void setUserIdList(List<Long> userIdList){
this.userIdList = userIdList;
}
/**
* 获取 用户ID，主键，自增长
* @return userIdNotList
*/
public List<Long> getUserIdNotList(){
return this.userIdNotList;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdNotList
*/
public void setUserIdNotList(List<Long> userIdNotList){
this.userIdNotList = userIdNotList;
}
/**
* 获取 登录名
* @return realNameList
*/
public List<String> getRealNameList(){
return this.realNameList;
}
/**
* 设置 登录名
* @param realNameList
*/
public void setRealNameList(List<String> realNameList){
this.realNameList = realNameList;
}
/**
* 获取 登录名
* @return realNameNotList
*/
public List<String> getRealNameNotList(){
return this.realNameNotList;
}
/**
* 设置 登录名
* @param realNameNotList
*/
public void setRealNameNotList(List<String> realNameNotList){
this.realNameNotList = realNameNotList;
}
/**
* 获取 收藏模块
* @return modelIdsList
*/
public List<String> getModelIdsList(){
return this.modelIdsList;
}
/**
* 设置 收藏模块
* @param modelIdsList
*/
public void setModelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
}
/**
* 获取 收藏模块
* @return modelIdsNotList
*/
public List<String> getModelIdsNotList(){
return this.modelIdsNotList;
}
/**
* 设置 收藏模块
* @param modelIdsNotList
*/
public void setModelIdsNotList(List<String> modelIdsNotList){
this.modelIdsNotList = modelIdsNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 设置 主键，自增长
* @param id
*/
public UserModelCollectQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public UserModelCollectQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public UserModelCollectQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public UserModelCollectQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public UserModelCollectQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public UserModelCollectQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userId
*/
public UserModelCollectQuery userId(Long userId){
setUserId(userId);
return this;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param userIdStart
*/
public UserModelCollectQuery userIdStart(Long userIdStart){
this.userIdStart = userIdStart;
return this;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param userIdEnd
*/
public UserModelCollectQuery userIdEnd(Long userIdEnd){
this.userIdEnd = userIdEnd;
return this;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param userIdIncrement
*/
public UserModelCollectQuery userIdIncrement(Long userIdIncrement){
this.userIdIncrement = userIdIncrement;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdList
*/
public UserModelCollectQuery userIdList(List<Long> userIdList){
this.userIdList = userIdList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdNotList
*/
public UserModelCollectQuery userIdNotList(List<Long> userIdNotList){
this.userIdNotList = userIdNotList;
return this;
}
/**
* 设置 登录名
* @param realName
*/
public UserModelCollectQuery realName(String realName){
setRealName(realName);
return this;
}
/**
* 设置 登录名
* @param realNameList
*/
public UserModelCollectQuery realNameList(List<String> realNameList){
this.realNameList = realNameList;
return this;
}
/**
* 设置 收藏模块
* @param modelIds
*/
public UserModelCollectQuery modelIds(String modelIds){
setModelIds(modelIds);
return this;
}
/**
* 设置 收藏模块
* @param modelIdsList
*/
public UserModelCollectQuery modelIdsList(List<String> modelIdsList){
this.modelIdsList = modelIdsList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<UserModelCollectQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<UserModelCollectQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<UserModelCollectQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<UserModelCollectQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
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