Skip to content

S
smart_gov_platform
Commit b8d43cf7 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

站点编排列表增加图标地址

parent 6c147def
Show whitespace changes
Inline Side-by-side
Showing with 908 additions and 908 deletions
portal-manager/doc/api.md
View file @ b8d43cf7
...@@ -3181,7 +3181,7 @@ data|object|数据对象 ...@@ -3181,7 +3181,7 @@ data|object|数据对象
 data|array|结果集列表|数组  data|array|结果集列表|数组
  id|Long|主键,自增长   id|Long|主键,自增长
  name|String|应用名称   name|String|应用名称
  code|String|应用编码   imgPath|String|图标地址
  url|String|连接地址   url|String|连接地址
  status|Integer|状态，0暂未开通，1已开通   status|Integer|状态，0暂未开通，1已开通
  sortNum|Integer|排序号   sortNum|Integer|排序号
...@@ -3213,7 +3213,7 @@ dict|object|字典对象 ...@@ -3213,7 +3213,7 @@ dict|object|字典对象
"siteId": null, "siteId": null,
"idList": null, "idList": null,
"name": "基础设置", "name": "基础设置",
"code": "testCode", "imgPath": "testCode",
"url": "testUrl", "url": "testUrl",
"status": 1, "status": 1,
"sortNum": 0, "sortNum": 0,
...@@ -3231,7 +3231,7 @@ dict|object|字典对象 ...@@ -3231,7 +3231,7 @@ dict|object|字典对象
"siteId": null, "siteId": null,
"idList": null, "idList": null,
"name": "预约系统", "name": "预约系统",
"code": "testCode", "imgPath": "testCode",
"url": "testUrl", "url": "testUrl",
"status": 0, "status": 0,
"sortNum": 0, "sortNum": 0,
...@@ -3249,7 +3249,7 @@ dict|object|字典对象 ...@@ -3249,7 +3249,7 @@ dict|object|字典对象
"siteId": null, "siteId": null,
"idList": null, "idList": null,
"name": "排号系统", "name": "排号系统",
"code": "testCode", "imgPath": "testCode",
"url": "testUrl", "url": "testUrl",
"status": 1, "status": 1,
"sortNum": 0, "sortNum": 0,
...@@ -3267,7 +3267,7 @@ dict|object|字典对象 ...@@ -3267,7 +3267,7 @@ dict|object|字典对象
"siteId": null, "siteId": null,
"idList": null, "idList": null,
"name": "评价系统", "name": "评价系统",
"code": "testCode", "imgPath": "testCode",
"url": "testUrl", "url": "testUrl",
"status": 0, "status": 0,
"sortNum": 0, "sortNum": 0,
......
portal-manager/src/main/java/com/mortals/xhx/module/apps/model/AppsEntity.java
View file @ b8d43cf7
...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.apps.model.vo.AppsVo; import com.mortals.xhx.module.apps.model.vo.AppsVo;
/** /**
* 系统应用列实体对象 * 系统应用列实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-22 * @date 2022-06-23
*/ */
public class AppsEntity extends AppsVo { public class AppsEntity extends AppsVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -21,9 +21,9 @@ public class AppsEntity extends AppsVo { ...@@ -21,9 +21,9 @@ public class AppsEntity extends AppsVo {
*/ */
private String name; private String name;
/** /**
* 应用编码 * 图标
*/ */
private String code; private String imgPath;
/** /**
* 连接地址 * 连接地址
*/ */
...@@ -67,18 +67,18 @@ public class AppsEntity extends AppsVo { ...@@ -67,18 +67,18 @@ public class AppsEntity extends AppsVo {
this.name = name; this.name = name;
} }
/** /**
* 获取 应用编码 * 获取 图标
* @return String * @return String
*/ */
public String getCode(){ public String getImgPath(){
return code; return imgPath;
} }
/** /**
* 设置 应用编码 * 设置 图标
* @param code * @param imgPath
*/ */
public void setCode(String code){ public void setImgPath(String imgPath){
this.code = code; this.imgPath = imgPath;
} }
/** /**
* 获取 连接地址 * 获取 连接地址
...@@ -187,7 +187,7 @@ public class AppsEntity extends AppsVo { ...@@ -187,7 +187,7 @@ public class AppsEntity extends AppsVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",name:").append(getName()); sb.append(",name:").append(getName());
sb.append(",code:").append(getCode()); sb.append(",imgPath:").append(getImgPath());
sb.append(",url:").append(getUrl()); sb.append(",url:").append(getUrl());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",sortNum:").append(getSortNum()); sb.append(",sortNum:").append(getSortNum());
...@@ -201,7 +201,7 @@ public class AppsEntity extends AppsVo { ...@@ -201,7 +201,7 @@ public class AppsEntity extends AppsVo {
this.name = ""; this.name = "";
this.code = ""; this.imgPath = "";
this.url = ""; this.url = "";
......
portal-manager/src/main/java/com/mortals/xhx/module/apps/model/AppsQuery.java
View file @ b8d43cf7
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.apps.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.apps.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.apps.model.AppsEntity; import com.mortals.xhx.module.apps.model.AppsEntity;
/** /**
* 系统应用列查询对象 * 系统应用列查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-22 * @date 2022-06-23
*/ */
public class AppsQuery extends AppsEntity { public class AppsQuery extends AppsEntity {
/** 开始 主键,自增长 */ /** 开始 主键,自增长 */
private Long idStart; private Long idStart;
...@@ -24,8 +24,8 @@ public class AppsQuery extends AppsEntity { ...@@ -24,8 +24,8 @@ public class AppsQuery extends AppsEntity {
/** 应用名称 */ /** 应用名称 */
private List<String> nameList; private List<String> nameList;
/** 应用编码 */ /** 图标 */
private List<String> codeList; private List<String> imgPathList;
/** 连接地址 */ /** 连接地址 */
private List<String> urlList; private List<String> urlList;
...@@ -187,19 +187,19 @@ public class AppsQuery extends AppsEntity { ...@@ -187,19 +187,19 @@ public class AppsQuery extends AppsEntity {
this.nameList = nameList; this.nameList = nameList;
} }
/** /**
* 获取 应用编码 * 获取 图标
* @return codeList * @return imgPathList
*/ */
public List<String> getCodeList(){ public List<String> getImgPathList(){
return this.codeList; return this.imgPathList;
} }
/** /**
* 设置 应用编码 * 设置 图标
* @param codeList * @param imgPathList
*/ */
public void setCodeList(List<String> codeList){ public void setImgPathList(List<String> imgPathList){
this.codeList = codeList; this.imgPathList = imgPathList;
} }
/** /**
* 获取 连接地址 * 获取 连接地址
...@@ -647,20 +647,20 @@ public class AppsQuery extends AppsEntity { ...@@ -647,20 +647,20 @@ public class AppsQuery extends AppsEntity {
/** /**
* 设置 应用编码 * 设置 图标
* @param code * @param imgPath
*/ */
public AppsQuery code(String code){ public AppsQuery imgPath(String imgPath){
setCode(code); setImgPath(imgPath);
return this; return this;
} }
/** /**
* 设置 应用编码 * 设置 图标
* @param codeList * @param imgPathList
*/ */
public AppsQuery codeList(List<String> codeList){ public AppsQuery imgPathList(List<String> imgPathList){
this.codeList = codeList; this.imgPathList = imgPathList;
return this; return this;
} }
......
portal-manager/src/main/resources/sqlmap/module/apps/AppsMapper.xml
View file @ b8d43cf7
<?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.apps.dao.ibatis.AppsDaoImpl"> <mapper namespace="com.mortals.xhx.module.apps.dao.ibatis.AppsDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppsEntity" id="AppsEntity-Map"> <resultMap type="AppsEntity" id="AppsEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="code" column="code" /> <result property="imgPath" column="imgPath" />
<result property="url" column="url" /> <result property="url" column="url" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="sortNum" column="sortNum" /> <result property="sortNum" column="sortNum" />
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name, a.name,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('code') or colPickMode == 1 and data.containsKey('code')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgPath') or colPickMode == 1 and data.containsKey('imgPath')))">
a.code, a.imgPath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
a.url, a.url,
...@@ -69,18 +69,18 @@ ...@@ -69,18 +69,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppsEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppsEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_apps insert into mortals_xhx_apps
(name,code,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName) (name,imgPath,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName)
VALUES VALUES
(#{name},#{code},#{url},#{status},#{sortNum},#{remark},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName}) (#{name},#{imgPath},#{url},#{status},#{sortNum},#{remark},#{createTime},#{updateTime},#{createUserId},#{createUserName},#{updateUserId},#{updateUserName})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_apps insert into mortals_xhx_apps
(name,code,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName) (name,imgPath,url,status,sortNum,remark,createTime,updateTime,createUserId,createUserName,updateUserId,updateUserName)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.code},#{item.url},#{item.status},#{item.sortNum},#{item.remark},#{item.createTime},#{item.updateTime},#{item.createUserId},#{item.createUserName},#{item.updateUserId},#{item.updateUserName}) (#{item.name},#{item.imgPath},#{item.url},#{item.status},#{item.sortNum},#{item.remark},#{item.createTime},#{item.updateTime},#{item.createUserId},#{item.createUserName},#{item.updateUserId},#{item.updateUserName})
</foreach> </foreach>
</insert> </insert>
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
<if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))"> <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
a.name=#{data.name}, a.name=#{data.name},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('code')) or (colPickMode==1 and !data.containsKey('code'))"> <if test="(colPickMode==0 and data.containsKey('imgPath')) or (colPickMode==1 and !data.containsKey('imgPath'))">
a.code=#{data.code}, a.imgPath=#{data.imgPath},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))"> <if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
a.url=#{data.url}, a.url=#{data.url},
...@@ -157,10 +157,10 @@ ...@@ -157,10 +157,10 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="code=(case" suffix="ELSE code end),"> <trim prefix="imgPath=(case" suffix="ELSE imgPath 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('code')) or (colPickMode==1 and !item.containsKey('code'))"> <if test="(colPickMode==0 and item.containsKey('imgPath')) or (colPickMode==1 and !item.containsKey('imgPath'))">
when a.id=#{item.id} then #{item.code} when a.id=#{item.id} then #{item.imgPath}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -392,17 +392,17 @@ ...@@ -392,17 +392,17 @@
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('code')"> <if test="conditionParamRef.containsKey('imgPath')">
<if test="conditionParamRef.code != null and conditionParamRef.code != ''"> <if test="conditionParamRef.imgPath != null and conditionParamRef.imgPath != ''">
${_conditionType_} a.code like #{${_conditionParam_}.code} ${_conditionType_} a.imgPath like #{${_conditionParam_}.imgPath}
</if> </if>
<if test="conditionParamRef.code == null"> <if test="conditionParamRef.imgPath == null">
${_conditionType_} a.code is null ${_conditionType_} a.imgPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('codeList')"> <if test="conditionParamRef.containsKey('imgPathList')">
${_conditionType_} a.code in ${_conditionType_} a.imgPath in
<foreach collection="conditionParamRef.codeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.imgPathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -603,9 +603,9 @@ ...@@ -603,9 +603,9 @@
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if> <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('code')"> <if test="orderCol.containsKey('imgPath')">
a.code a.imgPath
<if test='orderCol.code != null and "DESC".equalsIgnoreCase(orderCol.code)'>DESC</if> <if test='orderCol.imgPath != null and "DESC".equalsIgnoreCase(orderCol.imgPath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('url')"> <if test="orderCol.containsKey('url')">
......
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