Skip to content

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

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

parents 5d8ae8d9 883197c3
Show whitespace changes
Inline Side-by-side
Showing with 639 additions and 340 deletions
base-manager/db/add.sql
View file @ debf7335
......@@ -192,3 +192,8 @@ PRIMARY KEY (`id`)
ALTER TABLE mortals_sys_app_category ADD COLUMN `cover` varchar(256) DEFAULT '' COMMENT '封面' AFTER sort;
ALTER TABLE mortals_sys_app_category ADD COLUMN `remark` varchar(256) DEFAULT '' COMMENT '备注' AFTER cover;
-- ----------------------------
2023-08-29
-- ----------------------------
ALTER TABLE `mortals_sys_model` ADD COLUMN `type` tinyint(2) DEFAULT '1' COMMENT '模块分类' AFTER `sort`;
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/model/model/ModelEntity.java
View file @ debf7335
package com.mortals.xhx.module.model.model;
import java.util.List;
import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.model.model.vo.ModelVo;
/**
* 模块实体对象
......@@ -45,7 +38,10 @@ public class ModelEntity extends ModelVo {
@JSONField(serialize = false)
private Integer sort;
/**
* 模块分类
*/
private Integer type;
public ModelEntity(){}
/**
......@@ -133,8 +129,20 @@ public class ModelEntity extends ModelVo {
this.sort = sort;
}
/**
* 获取 模块分类
* @return Integer
*/
public Integer getType() {
return type;
}
/**
* 设置 模块分类
* @param type
*/
public void setType(Integer type) {
this.type = type;
}
@Override
public int hashCode() {
......@@ -160,6 +168,7 @@ public class ModelEntity extends ModelVo {
sb.append(",modelUrl:").append(getModelUrl());
sb.append(",remark:").append(getRemark());
sb.append(",sort:").append(getSort());
sb.append(",type:").append(getType());
return sb.toString();
}
......@@ -176,5 +185,7 @@ public class ModelEntity extends ModelVo {
this.remark = null;
this.sort = 0;
this.type = 1;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/model/model/ModelQuery.java
View file @ debf7335
package com.mortals.xhx.module.model.model;
import java.util.List;
import com.mortals.xhx.module.model.model.ModelEntity;
/**
* 模块查询对象
*
......@@ -72,6 +71,21 @@ public class ModelQuery extends ModelEntity {
/** 结束 修改时间 */
private String updateTimeEnd;
/** 开始 模块分类 */
private Integer typeStart;
/** 结束 模块分类 */
private Integer typeEnd;
/** 增加 模块分类 */
private Integer typeIncrement;
/** 模块分类列表 */
private List <Integer> typeList;
/** 模块分类排除列表 */
private List <Integer> typeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ModelQuery> orConditionList;
......@@ -551,6 +565,86 @@ public class ModelQuery extends ModelEntity {
return this;
}
/**
* 获取 开始 模块分类
* @return typeStart
*/
public Integer getTypeStart(){
return this.typeStart;
}
/**
* 设置 开始 模块分类
* @param typeStart
*/
public void setTypeStart(Integer typeStart){
this.typeStart = typeStart;
}
/**
* 获取 结束 模块分类
* @return $typeEnd
*/
public Integer getTypeEnd(){
return this.typeEnd;
}
/**
* 设置 结束 模块分类
* @param typeEnd
*/
public void setTypeEnd(Integer typeEnd){
this.typeEnd = typeEnd;
}
/**
* 获取 增加 模块分类
* @return typeIncrement
*/
public Integer getTypeIncrement(){
return this.typeIncrement;
}
/**
* 设置 增加 模块分类
* @param typeIncrement
*/
public void setTypeIncrement(Integer typeIncrement){
this.typeIncrement = typeIncrement;
}
/**
* 获取 模块分类
* @return typeList
*/
public List<Integer> getTypeList(){
return this.typeList;
}
/**
* 设置 模块分类
* @param typeList
*/
public void setTypeList(List<Integer> typeList){
this.typeList = typeList;
}
/**
* 获取 模块分类
* @return typeNotList
*/
public List<Integer> getTypeNotList(){
return this.typeNotList;
}
/**
* 设置 模块分类
* @param typeNotList
*/
public void setTypeNotList(List<Integer> typeNotList){
this.typeNotList = typeNotList;
}
/**
* 设置 排序
* @param sort
......
base-manager/src/main/java/com/mortals/xhx/module/model/web/ModelController.java
View file @ debf7335
package com.mortals.xhx.module.model.web;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.ModelTypeEnum;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.model.model.ModelQuery;
import com.mortals.xhx.module.model.service.ModelService;
import com.mortals.xhx.module.window.model.WindowMatterEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -55,6 +53,7 @@ public class ModelController extends BaseCRUDJsonBodyMappingController<ModelServ
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "type", IBaseEnum.getEnumMap(ModelTypeEnum.class));
super.init(model, context);
}
......
base-manager/src/main/resources/sqlmap/module/model/ModelMapper.xml
View file @ debf7335
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.model.dao.ibatis.ModelDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="ModelEntity" id="ModelEntity-Map">
<id property="id" column="id" />
<result property="modelName" column="modelName" />
<result property="modelCode" column="modelCode" />
<result property="modelIcon" column="modelIcon" />
<result property="modelUrl" column="modelUrl" />
<result property="remark" column="remark" />
<result property="sort" column="sort" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="modelCode" column="modelCode" />
<result property="modelIcon" column="modelIcon" />
<result property="modelUrl" column="modelUrl" />
<result property="remark" column="remark" />
<result property="type" column="type" />
</resultMap>
......@@ -23,52 +24,55 @@
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id,
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelName') or colPickMode == 1 and data.containsKey('modelName')))">
a.modelName as modelName,
a.modelName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
a.sort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelCode') or colPickMode == 1 and data.containsKey('modelCode')))">
a.modelCode as modelCode,
a.modelCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIcon') or colPickMode == 1 and data.containsKey('modelIcon')))">
a.modelIcon as modelIcon,
a.modelIcon,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelUrl') or colPickMode == 1 and data.containsKey('modelUrl')))">
a.modelUrl as modelUrl,
a.modelUrl,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark as remark,
a.remark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
a.sort as sort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime,
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
a.type,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ModelEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_model
(modelName,modelCode,modelIcon,modelUrl,remark,sort,createTime,createUserId,updateTime)
(modelName,sort,createTime,createUserId,updateTime,modelCode,modelIcon,modelUrl,remark,type)
VALUES
(#{modelName},#{modelCode},#{modelIcon},#{modelUrl},#{remark},#{sort},#{createTime},#{createUserId},#{updateTime})
(#{modelName},#{sort},#{createTime},#{createUserId},#{updateTime},#{modelCode},#{modelIcon},#{modelUrl},#{remark},#{type})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_model
(modelName,modelCode,modelIcon,modelUrl,remark,sort,createTime,createUserId,updateTime)
(modelName,sort,createTime,createUserId,updateTime,modelCode,modelIcon,modelUrl,remark,type)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.modelName},#{item.modelCode},#{item.modelIcon},#{item.modelUrl},#{item.remark},#{item.sort},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.modelName},#{item.sort},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.modelCode},#{item.modelIcon},#{item.modelUrl},#{item.remark},#{item.type})
</foreach>
</insert>
......@@ -81,18 +85,6 @@
<if test="(colPickMode==0 and data.containsKey('modelName')) or (colPickMode==1 and !data.containsKey('modelName'))">
a.modelName=#{data.modelName},
</if>
<if test="(colPickMode==0 and data.containsKey('modelCode')) or (colPickMode==1 and !data.containsKey('modelCode'))">
a.modelCode=#{data.modelCode},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIcon')) or (colPickMode==1 and !data.containsKey('modelIcon'))">
a.modelIcon=#{data.modelIcon},
</if>
<if test="(colPickMode==0 and data.containsKey('modelUrl')) or (colPickMode==1 and !data.containsKey('modelUrl'))">
a.modelUrl=#{data.modelUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('sort')) or (colPickMode==1 and !data.containsKey('sort'))">
a.sort=#{data.sort},
</if>
......@@ -111,6 +103,24 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('modelCode')) or (colPickMode==1 and !data.containsKey('modelCode'))">
a.modelCode=#{data.modelCode},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIcon')) or (colPickMode==1 and !data.containsKey('modelIcon'))">
a.modelIcon=#{data.modelIcon},
</if>
<if test="(colPickMode==0 and data.containsKey('modelUrl')) or (colPickMode==1 and !data.containsKey('modelUrl'))">
a.modelUrl=#{data.modelUrl},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
<if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
a.type=#{data.type},
</if>
<if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
a.type=ifnull(a.type,0) + #{data.typeIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -129,34 +139,6 @@
when a.id=#{item.id} then #{item.modelName}
</if>
</foreach>
</trim>
<trim prefix="modelCode=(case" suffix="ELSE modelCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelCode')) or (colPickMode==1 and !item.containsKey('modelCode'))">
when a.id=#{item.id} then #{item.modelCode}
</if>
</foreach>
</trim>
<trim prefix="modelIcon=(case" suffix="ELSE modelIcon end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIcon')) or (colPickMode==1 and !item.containsKey('modelIcon'))">
when a.id=#{item.id} then #{item.modelIcon}
</if>
</foreach>
</trim>
<trim prefix="modelUrl=(case" suffix="ELSE modelUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelUrl')) or (colPickMode==1 and !item.containsKey('modelUrl'))">
when a.id=#{item.id} then #{item.modelUrl}
</if>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="sort=(case" suffix="ELSE sort end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
......@@ -196,6 +178,46 @@
</if>
</foreach>
</trim>
<trim prefix="modelCode=(case" suffix="ELSE modelCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelCode')) or (colPickMode==1 and !item.containsKey('modelCode'))">
when a.id=#{item.id} then #{item.modelCode}
</if>
</foreach>
</trim>
<trim prefix="modelIcon=(case" suffix="ELSE modelIcon end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIcon')) or (colPickMode==1 and !item.containsKey('modelIcon'))">
when a.id=#{item.id} then #{item.modelIcon}
</if>
</foreach>
</trim>
<trim prefix="modelUrl=(case" suffix="ELSE modelUrl end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelUrl')) or (colPickMode==1 and !item.containsKey('modelUrl'))">
when a.id=#{item.id} then #{item.modelUrl}
</if>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
<trim prefix="type=(case" suffix="ELSE type end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('type')) or (colPickMode==1 and !item.containsKey('type'))">
when a.id=#{item.id} then #{item.type}
</when>
<when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))">
when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -219,6 +241,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_sys_model where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_sys_model where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_model as a
......@@ -311,6 +348,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList')">
${_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>
......@@ -333,63 +376,9 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelCode')">
<if test="conditionParamRef.modelCode != null and conditionParamRef.modelCode != ''">
${_conditionType_} a.modelCode like #{${_conditionParam_}.modelCode}
</if>
<if test="conditionParamRef.modelCode == null">
${_conditionType_} a.modelCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelCodeList')">
${_conditionType_} a.modelCode in
<foreach collection="conditionParamRef.modelCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelIcon')">
<if test="conditionParamRef.modelIcon != null and conditionParamRef.modelIcon != ''">
${_conditionType_} a.modelIcon like #{${_conditionParam_}.modelIcon}
</if>
<if test="conditionParamRef.modelIcon == null">
${_conditionType_} a.modelIcon is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelIconList')">
${_conditionType_} a.modelIcon in
<foreach collection="conditionParamRef.modelIconList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelUrl')">
<if test="conditionParamRef.modelUrl != null and conditionParamRef.modelUrl != ''">
${_conditionType_} a.modelUrl like #{${_conditionParam_}.modelUrl}
</if>
<if test="conditionParamRef.modelUrl == null">
${_conditionType_} a.modelUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelUrlList')">
${_conditionType_} a.modelUrl in
<foreach collection="conditionParamRef.modelUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.containsKey('modelNameNotList')">
${_conditionType_} a.modelName not in
<foreach collection="conditionParamRef.modelNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
......@@ -407,6 +396,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortNotList')">
${_conditionType_} a.sort not in
<foreach collection="conditionParamRef.sortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sortStart') and conditionParamRef.sortStart != null">
${_conditionType_} a.sort <![CDATA[ >= ]]> #{${_conditionParam_}.sortStart}
</if>
......@@ -443,6 +438,12 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList')">
${_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>
......@@ -465,6 +466,117 @@
<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('modelCode')">
<if test="conditionParamRef.modelCode != null and conditionParamRef.modelCode != ''">
${_conditionType_} a.modelCode like #{${_conditionParam_}.modelCode}
</if>
<if test="conditionParamRef.modelCode == null">
${_conditionType_} a.modelCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelCodeList')">
${_conditionType_} a.modelCode in
<foreach collection="conditionParamRef.modelCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelCodeNotList')">
${_conditionType_} a.modelCode not in
<foreach collection="conditionParamRef.modelCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelIcon')">
<if test="conditionParamRef.modelIcon != null and conditionParamRef.modelIcon != ''">
${_conditionType_} a.modelIcon like #{${_conditionParam_}.modelIcon}
</if>
<if test="conditionParamRef.modelIcon == null">
${_conditionType_} a.modelIcon is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelIconList')">
${_conditionType_} a.modelIcon in
<foreach collection="conditionParamRef.modelIconList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelIconNotList')">
${_conditionType_} a.modelIcon not in
<foreach collection="conditionParamRef.modelIconNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelUrl')">
<if test="conditionParamRef.modelUrl != null and conditionParamRef.modelUrl != ''">
${_conditionType_} a.modelUrl like #{${_conditionParam_}.modelUrl}
</if>
<if test="conditionParamRef.modelUrl == null">
${_conditionType_} a.modelUrl is null
</if>
</if>
<if test="conditionParamRef.containsKey('modelUrlList')">
${_conditionType_} a.modelUrl in
<foreach collection="conditionParamRef.modelUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelUrlNotList')">
${_conditionType_} a.modelUrl not in
<foreach collection="conditionParamRef.modelUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remarkNotList')">
${_conditionType_} a.remark not in
<foreach collection="conditionParamRef.remarkNotList" 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}
</if>
<if test="conditionParamRef.type == null">
${_conditionType_} a.type is null
</if>
</if>
<if test="conditionParamRef.containsKey('typeList')">
${_conditionType_} a.type in
<foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeNotList')">
${_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>
<if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null">
${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -488,6 +600,26 @@
<if test='orderCol.modelName != null and "DESC".equalsIgnoreCase(orderCol.modelName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sort')">
a.sort
<if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelCode')">
a.modelCode
<if test='orderCol.modelCode != null and "DESC".equalsIgnoreCase(orderCol.modelCode)'>DESC</if>
......@@ -508,24 +640,9 @@
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('sort')">
a.sort
<if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
<if test="orderCol.containsKey('type')">
a.type
<if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
,
</if>
</trim>
......
common-lib/src/main/java/com/mortals/xhx/common/code/ModelTypeEnum.java 0 → 100644
View file @ debf7335
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
public enum ModelTypeEnum implements IBaseEnum {
JC(1,"平台基础能力",SysConstains.STYLE_DEFAULT),
G2G(2,"G2G:政府面向政府", SysConstains.STYLE_DEFAULT),
G2C(3,"G2C:政府面向公民", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
ModelTypeEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static ModelTypeEnum getByValue(int value) {
for (ModelTypeEnum e : ModelTypeEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (ModelTypeEnum item : ModelTypeEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
\ No newline at end of file
common-lib/src/main/java/com/mortals/xhx/feign/model/vo/ModelFeignVO.java
View file @ debf7335
......@@ -38,6 +38,11 @@ public class ModelFeignVO implements Serializable {
@JSONField(serialize = false)
private Integer sort;
/**
* 模块分类
*/
private Integer type;
/** 模块下包含的数据统计 */
private List<ModelCensusFeignVO> censusList;
}
portal-manager-ui/admin/src/views/thePlatformIsSet/setPlatformes.vue
View file @ debf7335
......@@ -83,7 +83,7 @@ export default {
.platform {
width: 100%;
height: 100%;
background: url("~@/assets/images/pingtaibg.png") center no-repeat;
background: url("~@/assets/images/siteArrange/bg-pintai.jpg") center no-repeat;
background-size: cover;
padding-top: @headerH;
......@@ -104,7 +104,8 @@ export default {
width: 1200px;
height: 440px;
margin: auto;
background-color: #ffffff;
// background-color: #ffffff;
background: rgba(5, 30, 75, 0.66);
display: flex;
flex-wrap: wrap;
.ant-card {
......
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