Skip to content

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

添加申请页面抓取

parent e8978962
Hide whitespace changes
Inline Side-by-side
Showing with 373 additions and 16 deletions
base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapperExt.xml
View file @ cae3efeb
...@@ -8,14 +8,16 @@ ...@@ -8,14 +8,16 @@
count( 1 ) count( 1 )
FROM FROM
mortals_sys_app_dataset a mortals_sys_app_dataset a
LEFT JOIN mortals_sys_app_info_field b ON a.id = b.datasetId LEFT JOIN mortals_sys_app_info_field b ON b.id = b.datasetId
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where 1=1 and where 1=1 and
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
<if test="condition.appId!=null and condition.appId!=''"> <if test="condition.appId!=null and condition.appId!=''">
and a.appId = #{condition.appId,jdbcType=VARCHAR} and a.appId = #{condition.appId,jdbcType=VARCHAR}
</if> </if>
<if test="condition.fieldCode!=null and condition.fieldCode!=''">
<include refid="_second_condition_"/>
<!-- <if test="condition.fieldCode!=null and condition.fieldCode!=''">
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR} and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if> </if>
<if test="condition.fieldName!=null and condition.fieldName!=''"> <if test="condition.fieldName!=null and condition.fieldName!=''">
...@@ -23,7 +25,7 @@ ...@@ -23,7 +25,7 @@
</if> </if>
<if test="condition.fieldValue != null and condition.fieldValue != ''"> <if test="condition.fieldValue != null and condition.fieldValue != ''">
and b.fieldValue like #{condition.fieldValue} and b.fieldValue like #{condition.fieldValue}
</if> </if>-->
</trim> </trim>
</trim> </trim>
...@@ -35,13 +37,16 @@ ...@@ -35,13 +37,16 @@
<include refid="_columns_sub"/> <include refid="_columns_sub"/>
FROM FROM
mortals_sys_app_dataset a mortals_sys_app_dataset a
LEFT JOIN mortals_sys_app_info_field b ON a.id = b.datasetId LEFT JOIN mortals_sys_app_info_field b ON b.id = b.datasetId
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where 1=1 and where 1=1 and
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
<if test="condition.appId!=null and condition.appId!=''"> <if test="condition.appId!=null and condition.appId!=''">
and a.appId = #{condition.appId,jdbcType=VARCHAR} and a.appId = #{condition.appId,jdbcType=VARCHAR}
</if> </if>
<include refid="_second_condition_"/>
<!--
<if test="condition.fieldCode!=null and condition.fieldCode!=''"> <if test="condition.fieldCode!=null and condition.fieldCode!=''">
and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR} and b.fieldCode = #{condition.fieldCode,jdbcType=VARCHAR}
</if> </if>
...@@ -50,8 +55,344 @@ ...@@ -50,8 +55,344 @@
</if> </if>
<if test="condition.fieldValue != null and condition.fieldValue != ''"> <if test="condition.fieldValue != null and condition.fieldValue != ''">
and b.fieldValue like #{condition.fieldValue} and b.fieldValue like #{condition.fieldValue}
</if> </if>-->
</trim> </trim>
</trim> </trim>
</select> </select>
<!-- 条件映射 -->
<sql id="_second_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_second_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} b.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} b.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} b.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} b.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_} b.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} b.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('datasetId')">
<if test="conditionParamRef.datasetId != null ">
${_conditionType_} b.datasetId = #{${_conditionParam_}.datasetId}
</if>
<if test="conditionParamRef.datasetId == null">
${_conditionType_} b.datasetId is null
</if>
</if>
<if test="conditionParamRef.containsKey('datasetIdList')">
${_conditionType_} b.datasetId in
<foreach collection="conditionParamRef.datasetIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datasetIdStart') and conditionParamRef.datasetIdStart != null">
${_conditionType_} b.datasetId <![CDATA[ >= ]]> #{${_conditionParam_}.datasetIdStart}
</if>
<if test="conditionParamRef.containsKey('datasetIdEnd') and conditionParamRef.datasetIdEnd != null">
${_conditionType_} b.datasetId <![CDATA[ <= ]]> #{${_conditionParam_}.datasetIdEnd}
</if>
<if test="conditionParamRef.containsKey('fieldCode')">
<if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''">
${_conditionType_} b.fieldCode like #{${_conditionParam_}.fieldCode}
</if>
<if test="conditionParamRef.fieldCode == null">
${_conditionType_} b.fieldCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldCodeList')">
${_conditionType_} b.fieldCode in
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldName')">
<if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
${_conditionType_} b.fieldName like #{${_conditionParam_}.fieldName}
</if>
<if test="conditionParamRef.fieldName == null">
${_conditionType_} b.fieldName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldNameList')">
${_conditionType_} b.fieldName in
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldType')">
<if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
${_conditionType_} b.fieldType like #{${_conditionParam_}.fieldType}
</if>
<if test="conditionParamRef.fieldType == null">
${_conditionType_} b.fieldType is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldTypeList')">
${_conditionType_} b.fieldType in
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dataType')">
<if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
${_conditionType_} b.dataType like #{${_conditionParam_}.dataType}
</if>
<if test="conditionParamRef.dataType == null">
${_conditionType_} b.dataType is null
</if>
</if>
<if test="conditionParamRef.containsKey('dataTypeList')">
${_conditionType_} b.dataType in
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldValue')">
<if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
${_conditionType_} b.fieldValue like #{${_conditionParam_}.fieldValue}
</if>
<if test="conditionParamRef.fieldValue == null">
${_conditionType_} b.fieldValue is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldValueList')">
${_conditionType_} b.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLen')">
<if test="conditionParamRef.fieldLen != null ">
${_conditionType_} b.fieldLen = #{${_conditionParam_}.fieldLen}
</if>
<if test="conditionParamRef.fieldLen == null">
${_conditionType_} b.fieldLen is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldLenList')">
${_conditionType_} b.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
${_conditionType_} b.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
</if>
<if test="conditionParamRef.containsKey('fieldLenEnd') and conditionParamRef.fieldLenEnd != null">
${_conditionType_} b.fieldLen <![CDATA[ <= ]]> #{${_conditionParam_}.fieldLenEnd}
</if>
<if test="conditionParamRef.containsKey('fieldNull')">
<if test="conditionParamRef.fieldNull != null ">
${_conditionType_} b.fieldNull = #{${_conditionParam_}.fieldNull}
</if>
<if test="conditionParamRef.fieldNull == null">
${_conditionType_} b.fieldNull is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldNullList')">
${_conditionType_} b.fieldNull in
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} b.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if>
<if test="conditionParamRef.containsKey('fieldNullEnd') and conditionParamRef.fieldNullEnd != null">
${_conditionType_} b.fieldNull <![CDATA[ <= ]]> #{${_conditionParam_}.fieldNullEnd}
</if>
<if test="conditionParamRef.containsKey('isList')">
<if test="conditionParamRef.isList != null ">
${_conditionType_} b.isList = #{${_conditionParam_}.isList}
</if>
<if test="conditionParamRef.isList == null">
${_conditionType_} b.isList is null
</if>
</if>
<if test="conditionParamRef.containsKey('isListList')">
${_conditionType_} b.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
${_conditionType_} b.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
</if>
<if test="conditionParamRef.containsKey('isListEnd') and conditionParamRef.isListEnd != null">
${_conditionType_} b.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNo')">
<if test="conditionParamRef.fieldOrderNo != null ">
${_conditionType_} b.fieldOrderNo = #{${_conditionParam_}.fieldOrderNo}
</if>
<if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} b.fieldOrderNo is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')">
${_conditionType_} b.fieldOrderNo in
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
${_conditionType_} b.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoEnd') and conditionParamRef.fieldOrderNoEnd != null">
${_conditionType_} b.fieldOrderNo <![CDATA[ <= ]]> #{${_conditionParam_}.fieldOrderNoEnd}
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} b.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} b.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} b.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} b.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} b.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} b.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_} b.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_} b.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} b.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} b.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} b.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} b.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null ">
${_conditionType_} b.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} b.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} b.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_} b.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} b.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} b.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} b.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} b.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} b.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
</sql>
</mapper> </mapper>
\ No newline at end of file
base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http
View file @ cae3efeb
...@@ -3,9 +3,9 @@ POST {{baseUrl}}/login/login ...@@ -3,9 +3,9 @@ POST {{baseUrl}}/login/login
Content-Type: application/json Content-Type: application/json
{ {
"loginName":"admin", "loginName": "admin",
"password":"admin", "password": "admin",
"securityCode":"8888" "securityCode": "8888"
} }
> {% > {%
...@@ -19,11 +19,28 @@ Authorization: {{authToken}} ...@@ -19,11 +19,28 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"appId":20, "appId": 20,
"fieldName": "标题", "fieldName": "标题",
"fieldValue": "管理办法", "fieldValue": "管理办法",
"page":1, "page": 1,
"size":10 "size": 10
}
###自助终端应用数据集列表1
POST {{baseUrl}}/app/dataset/list
Authorization: {{authToken}}
Content-Type: application/json
{
"appId": 20,
"andConditionList": [
{
"fieldName": "制定机关",
"fieldValue": "%四川省人民政府%"
}
],
"page": 1,
"size": 10
} }
...@@ -33,8 +50,8 @@ Authorization: {{authToken}} ...@@ -33,8 +50,8 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"appId":1, "appId": 1,
"appInfoFieldList":[ "appInfoFieldList": [
{ {
"fieldCode": "title5", "fieldCode": "title5",
"fieldName": "标题5", "fieldName": "标题5",
...@@ -60,7 +77,6 @@ Content-Type: application/json ...@@ -60,7 +77,6 @@ Content-Type: application/json
"remark": "22222222222222" "remark": "22222222222222"
} }
] ]
} }
> {% > {%
......
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