添加皮肤管理

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

base-manager/doc/skin.css

+/* 变量 */
+:root {
+    /* 标题颜色 */
+    --main-h1-color: brown;
+    /* 时间颜色 */
+    --main-time-color: red;
+    /* 数据颜色 */
+    --main-info-color: brown;
+    /* 备案颜色 */
+}
+/* 背景颜色 */
+.main-bg-img{
+    background: url(./img/bg.png) no-repeat;
+}
+/* 现场取号 */
+.main-xc-img{
+    background: url(./img/bg.png) no-repeat;
+}
+/* 预约取号 */
+.main-yy-img{
+    background: url(./img/bg.png) no-repeat;
+}
+/* vip取号 */
+.main-big-img{
+    background: url(./img/bg.png) no-repeat;
+}
+/* 重打小票 */
+.main-cd-img{
+    background: url(./img/bg.png) no-repeat;
+}
+/* 现场签到 */
+.main-qd-img{
+    background: url(./img/bg.png) no-repeat;
+}
+/* 政务网取号 */
+.main-zwfw-img{
+    background: url(./img/bg.png) no-repeat;
+}
\ No newline at end of file

base-manager/doc/后端框架使用说明.txt

+框架说明
+1、已内置基本的系统管理模块(用户，角色，菜单，资源，参数，任务，区域，操作日志)
+2、本基础项目基于springboot+ mybatis + mysql + vue 
+3、依赖外部环境有：redis，mysql，node.js,kafka等
+
+
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+后端说明
+1.拷贝maven_jar文件夹下面的包到本地maven仓库（当前框架包需手动复制到本地仓库，后期搭建maven私服仓库则可略过）
+
+2.Mysql导入数据库，sql脚本在db目录下,导入顺序：
+	base.sql （必须）
+	base-area.sql(可选，如不要区域模块,可不导入此脚本)
+3、配置本地hosts:
+	#编辑C:\Windows\System32\drivers\etc\hosts，添加下面本地域名映射
+	127.0.0.1 base.testnew.com   
+4、启动项目，顺序：
+	4.4 启动管理前台：需安装node.js环境，命令行进入iot-manager-ui目录，依次执行yarn->yarn dev
+	4.5 启动业务后台：(可选)运行iot-handler下HandlerApplication.java
+5、浏览器访问：
+	http://base.testnew.com:8081/
+	登录：admin/admin
+
+前端说明 
+....
+
+
+代码生成器说明:
+1.本地启动codegen.jar 启动命令（java -jar codegen.jar）
+2.浏览器访问本地http://localhost:8089/codegen
+3.上传文档或者链接本地数据库自动构建源码包
+4.生成代码结构，
+（1）结构化代码 分为web,model,service,dao,拷贝到指定工程目录
+（2）sql映射文件，拷贝到resources\sqlmap目录下
+（3）db,根据文档自动生成的sql脚本文件
+
+文档例子：当前目录下的 说明文档.docx
+
+
+远程代码生成器地址 http://192.168.0.251:1023/
+
+

base-manager/src/main/java/com/mortals/xhx/common/code/DeviceTypeEnum.java

@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)枚举类
+* 产品类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)枚举类
 *
 * @author zxfei
 */

base-manager/src/main/java/com/mortals/xhx/common/code/FieldTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 数据类型（1.颜色，2.图片地址）枚举类
+*
+* @author zxfei
+*/
+public enum FieldTypeEnum {
+    颜色("1", "颜色"),
+    图片地址("2", "图片地址");
+    private String value;
+    private String desc;
+
+    FieldTypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static FieldTypeEnum getByValue(String value) {
+        for (FieldTypeEnum fieldTypeEnum : FieldTypeEnum.values()) {
+            if (fieldTypeEnum.getValue() == value) {
+                return fieldTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (FieldTypeEnum item : FieldTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String 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

base-manager/src/main/java/com/mortals/xhx/common/code/ImageResolutionEnum.java

@@ -9,9 +9,9 @@ import java.util.Map;
 * @author zxfei
 */
 public enum ImageResolutionEnum {
-    R1920_1080("1", "1920*1080"),
-    R1080_1920("2", "1080*1920"),
-    R1280_1280("3", "1280*1280");
+    1920*1080("1", "1920*1080"),
+    1080*1920("2", "1080*1920"),
+    1280*1280("3", "1280*1280");
     private String value;
     private String desc;
 

base-manager/src/main/java/com/mortals/xhx/module/product/dao/ProductDao.java

+package com.mortals.xhx.module.product.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import java.util.List;
+/**
+* 产品Dao
+* 产品 DAO接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public interface  ProductDao extends ICRUDDao<ProductEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/product/dao/ibatis/ProductDaoImpl.java

+package com.mortals.xhx.module.product.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.product.dao.ProductDao;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 产品DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Repository("productDao")
+public class ProductDaoImpl extends BaseCRUDDaoMybatis<ProductEntity,Long> implements ProductDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/product/model/ProductEntity.java

+package com.mortals.xhx.module.product.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.product.model.vo.ProductVo;
+/**
+* 产品实体对象
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+
+public class ProductEntity extends ProductVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 产品名称
+    */
+    @Excel(name = "产品名称")
+    private String productName;
+    /**
+    * 产品编码
+    */
+    private String productCode;
+    /**
+    * 备注
+    */
+    private String productRemark;
+
+
+
+    public ProductEntity(){}
+    /**
+    * 获取 产品名称
+    * @return String
+    */
+    public String getProductName(){
+        return productName;
+    }
+    /**
+    * 设置 产品名称
+    * @param productName
+    */
+    public void setProductName(String productName){
+        this.productName = productName;
+    }
+    /**
+    * 获取 产品编码
+    * @return String
+    */
+    public String getProductCode(){
+        return productCode;
+    }
+    /**
+    * 设置 产品编码
+    * @param productCode
+    */
+    public void setProductCode(String productCode){
+        this.productCode = productCode;
+    }
+    /**
+    * 获取 备注
+    * @return String
+    */
+    public String getProductRemark(){
+        return productRemark;
+    }
+    /**
+    * 设置 备注
+    * @param productRemark
+    */
+    public void setProductRemark(String productRemark){
+        this.productRemark = productRemark;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof ProductEntity) {
+            ProductEntity tmp = (ProductEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",productName:").append(getProductName());
+        sb.append(",productCode:").append(getProductCode());
+        sb.append(",productRemark:").append(getProductRemark());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.productName = "";
+
+            this.productCode = "";
+
+            this.productRemark = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/model/vo/ProductVo.java

+package com.mortals.xhx.module.product.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 产品视图对象
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Data
+public class ProductVo extends BaseEntityLong {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/service/ProductService.java

+package com.mortals.xhx.module.product.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.product.model.ProductEntity;
+/**
+* ProductService
+*
+* 产品 service接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public interface ProductService extends ICRUDService<ProductEntity,Long>{
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java

+package com.mortals.xhx.module.product.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.product.dao.ProductDao;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.service.ProductService;
+/**
+* ProductService
+* 产品 service实现
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Service("productService")
+public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, ProductEntity, Long> implements ProductService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java

+package com.mortals.xhx.module.product.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.model.ProductQuery;
+import com.mortals.xhx.module.product.service.ProductService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 产品
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@RestController
+@RequestMapping("product")
+public class ProductController extends BaseCRUDJsonBodyMappingController<ProductService,ProductEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ProductController(){
+        super.setFormClass(ProductForm.class);
+        super.setModuleDesc( "产品");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/product/web/ProductForm.java

+package com.mortals.xhx.module.product.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.product.model.ProductEntity;
+import com.mortals.xhx.module.product.model.ProductQuery;
+
+/**
+* Product
+*
+* 产品 Form
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public class ProductForm extends BaseCRUDFormLong<ProductEntity> {
+    private ProductEntity entity = new ProductEntity();
+    private ProductQuery query = new ProductQuery();
+    public ProductForm(){
+    }
+
+    @Override
+    public ProductEntity getEntity() {
+        return entity;
+    }
+
+    public void setProduct(ProductEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public ProductQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(ProductQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/SkinBaseDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 系统基础皮肤 DAO接口
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public interface  SkinBaseDao extends ICRUDDao<SkinBaseEntity,Long>{
 

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/SkinCategoryDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 系统皮肤分类 DAO接口
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public interface  SkinCategoryDao extends ICRUDDao<SkinCategoryEntity,Long>{
 

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/SkinFieldDao.java

+package com.mortals.xhx.module.skin.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+import java.util.List;
+/**
+* 皮肤属性字段配置Dao
+* 皮肤属性字段配置 DAO接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public interface  SkinFieldDao extends ICRUDDao<SkinFieldEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/SkinTemplateDao.java

+package com.mortals.xhx.module.skin.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+import java.util.List;
+/**
+* 系统皮肤模板Dao
+* 系统皮肤模板 DAO接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public interface  SkinTemplateDao extends ICRUDDao<SkinTemplateEntity,Long>{
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/ibatis/SkinBaseDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 系统基础皮肤DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @Repository("skinBaseDao")
 public class SkinBaseDaoImpl extends BaseCRUDDaoMybatis<SkinBaseEntity,Long> implements SkinBaseDao {

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/ibatis/SkinCategoryDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 系统皮肤分类DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @Repository("skinCategoryDao")
 public class SkinCategoryDaoImpl extends BaseCRUDDaoMybatis<SkinCategoryEntity,Long> implements SkinCategoryDao {

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/ibatis/SkinFieldDaoImpl.java

+package com.mortals.xhx.module.skin.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.skin.dao.SkinFieldDao;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 皮肤属性字段配置DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Repository("skinFieldDao")
+public class SkinFieldDaoImpl extends BaseCRUDDaoMybatis<SkinFieldEntity,Long> implements SkinFieldDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/dao/ibatis/SkinTemplateDaoImpl.java

+package com.mortals.xhx.module.skin.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.skin.dao.SkinTemplateDao;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 系统皮肤模板DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Repository("skinTemplateDao")
+public class SkinTemplateDaoImpl extends BaseCRUDDaoMybatis<SkinTemplateEntity,Long> implements SkinTemplateDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinCategoryEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.skin.model.vo.SkinCategoryVo;
 * 系统皮肤分类实体对象
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 
 public class SkinCategoryEntity extends SkinCategoryVo {

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinCategoryQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
 * 系统皮肤分类查询对象
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public class SkinCategoryQuery extends SkinCategoryEntity {
     /** 开始 序号，主键，自增长 */

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinFieldEntity.java

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.vo.SkinFieldVo;
+/**
+* 皮肤属性字段配置实体对象
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+
+public class SkinFieldEntity extends SkinFieldVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 皮肤id
+    */
+    private Long skinId;
+    /**
+    * 模板id,不为空时为模板配置属性
+    */
+    private Long templateId;
+    /**
+    * 字段编码
+    */
+    private String fieldCode;
+    /**
+    * 字段名称
+    */
+    private String fieldName;
+    /**
+    * 数据类型（1.颜色，2.图片地址）
+    */
+    private String fieldType;
+    /**
+    * 字段值
+    */
+    private String fieldValue;
+    /**
+    * 数据长度，默认100
+    */
+    private Integer fieldLen;
+    /**
+    * 是否允许为空，0否1是
+    */
+    private Integer fieldNull;
+    /**
+    * 排序号
+    */
+    private String fieldOrderNo;
+    /**
+    * 备注
+    */
+    private String remark;
+    /**
+    * 是否启用，0否1是
+    */
+    private Integer enabled;
+
+
+
+    public SkinFieldEntity(){}
+    /**
+    * 获取 皮肤id
+    * @return Long
+    */
+    public Long getSkinId(){
+        return skinId;
+    }
+    /**
+    * 设置 皮肤id
+    * @param skinId
+    */
+    public void setSkinId(Long skinId){
+        this.skinId = skinId;
+    }
+    /**
+    * 获取 模板id,不为空时为模板配置属性
+    * @return Long
+    */
+    public Long getTemplateId(){
+        return templateId;
+    }
+    /**
+    * 设置 模板id,不为空时为模板配置属性
+    * @param templateId
+    */
+    public void setTemplateId(Long templateId){
+        this.templateId = templateId;
+    }
+    /**
+    * 获取 字段编码
+    * @return String
+    */
+    public String getFieldCode(){
+        return fieldCode;
+    }
+    /**
+    * 设置 字段编码
+    * @param fieldCode
+    */
+    public void setFieldCode(String fieldCode){
+        this.fieldCode = fieldCode;
+    }
+    /**
+    * 获取 字段名称
+    * @return String
+    */
+    public String getFieldName(){
+        return fieldName;
+    }
+    /**
+    * 设置 字段名称
+    * @param fieldName
+    */
+    public void setFieldName(String fieldName){
+        this.fieldName = fieldName;
+    }
+    /**
+    * 获取 数据类型（1.颜色，2.图片地址）
+    * @return String
+    */
+    public String getFieldType(){
+        return fieldType;
+    }
+    /**
+    * 设置 数据类型（1.颜色，2.图片地址）
+    * @param fieldType
+    */
+    public void setFieldType(String fieldType){
+        this.fieldType = fieldType;
+    }
+    /**
+    * 获取 字段值
+    * @return String
+    */
+    public String getFieldValue(){
+        return fieldValue;
+    }
+    /**
+    * 设置 字段值
+    * @param fieldValue
+    */
+    public void setFieldValue(String fieldValue){
+        this.fieldValue = fieldValue;
+    }
+    /**
+    * 获取 数据长度，默认100
+    * @return Integer
+    */
+    public Integer getFieldLen(){
+        return fieldLen;
+    }
+    /**
+    * 设置 数据长度，默认100
+    * @param fieldLen
+    */
+    public void setFieldLen(Integer fieldLen){
+        this.fieldLen = fieldLen;
+    }
+    /**
+    * 获取 是否允许为空，0否1是
+    * @return Integer
+    */
+    public Integer getFieldNull(){
+        return fieldNull;
+    }
+    /**
+    * 设置 是否允许为空，0否1是
+    * @param fieldNull
+    */
+    public void setFieldNull(Integer fieldNull){
+        this.fieldNull = fieldNull;
+    }
+    /**
+    * 获取 排序号
+    * @return String
+    */
+    public String getFieldOrderNo(){
+        return fieldOrderNo;
+    }
+    /**
+    * 设置 排序号
+    * @param fieldOrderNo
+    */
+    public void setFieldOrderNo(String fieldOrderNo){
+        this.fieldOrderNo = fieldOrderNo;
+    }
+    /**
+    * 获取 备注
+    * @return String
+    */
+    public String getRemark(){
+        return remark;
+    }
+    /**
+    * 设置 备注
+    * @param remark
+    */
+    public void setRemark(String remark){
+        this.remark = remark;
+    }
+    /**
+    * 获取 是否启用，0否1是
+    * @return Integer
+    */
+    public Integer getEnabled(){
+        return enabled;
+    }
+    /**
+    * 设置 是否启用，0否1是
+    * @param enabled
+    */
+    public void setEnabled(Integer enabled){
+        this.enabled = enabled;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SkinFieldEntity) {
+            SkinFieldEntity tmp = (SkinFieldEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",skinId:").append(getSkinId());
+        sb.append(",templateId:").append(getTemplateId());
+        sb.append(",fieldCode:").append(getFieldCode());
+        sb.append(",fieldName:").append(getFieldName());
+        sb.append(",fieldType:").append(getFieldType());
+        sb.append(",fieldValue:").append(getFieldValue());
+        sb.append(",fieldLen:").append(getFieldLen());
+        sb.append(",fieldNull:").append(getFieldNull());
+        sb.append(",fieldOrderNo:").append(getFieldOrderNo());
+        sb.append(",remark:").append(getRemark());
+        sb.append(",enabled:").append(getEnabled());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.skinId = null;
+
+            this.templateId = null;
+
+            this.fieldCode = "";
+
+            this.fieldName = "";
+
+            this.fieldType = "";
+
+            this.fieldValue = "";
+
+            this.fieldLen = 100;
+
+            this.fieldNull = 1;
+
+            this.fieldOrderNo = "";
+
+            this.remark = "";
+
+            this.enabled = 1;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinTemplateEntity.java

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.vo.SkinTemplateVo;
+/**
+* 系统皮肤模板实体对象
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+
+public class SkinTemplateEntity extends SkinTemplateVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 产品ID
+    */
+    private Long productId;
+    /**
+    * 产品名称
+    */
+    private String productName;
+    /**
+    * 模板名称
+    */
+    private String templateName;
+
+
+
+    public SkinTemplateEntity(){}
+    /**
+    * 获取 产品ID
+    * @return Long
+    */
+    public Long getProductId(){
+        return productId;
+    }
+    /**
+    * 设置 产品ID
+    * @param productId
+    */
+    public void setProductId(Long productId){
+        this.productId = productId;
+    }
+    /**
+    * 获取 产品名称
+    * @return String
+    */
+    public String getProductName(){
+        return productName;
+    }
+    /**
+    * 设置 产品名称
+    * @param productName
+    */
+    public void setProductName(String productName){
+        this.productName = productName;
+    }
+    /**
+    * 获取 模板名称
+    * @return String
+    */
+    public String getTemplateName(){
+        return templateName;
+    }
+    /**
+    * 设置 模板名称
+    * @param templateName
+    */
+    public void setTemplateName(String templateName){
+        this.templateName = templateName;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SkinTemplateEntity) {
+            SkinTemplateEntity tmp = (SkinTemplateEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",productId:").append(getProductId());
+        sb.append(",productName:").append(getProductName());
+        sb.append(",templateName:").append(getTemplateName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.productId = null;
+
+            this.productName = "";
+
+            this.templateName = "";
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinBaseVo.java

@@ -9,7 +9,7 @@ import java.util.List;
 * 系统基础皮肤视图对象
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @Data
 public class SkinBaseVo extends BaseEntityLong {

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinCategoryVo.java

@@ -9,7 +9,7 @@ import java.util.List;
 * 系统皮肤分类视图对象
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @Data
 public class SkinCategoryVo extends BaseEntityLong {

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinFieldVo.java

+package com.mortals.xhx.module.skin.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 皮肤属性字段配置视图对象
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Data
+public class SkinFieldVo extends BaseEntityLong {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinTemplateVo.java

+package com.mortals.xhx.module.skin.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+* 系统皮肤模板视图对象
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Data
+public class SkinTemplateVo extends BaseEntityLong {
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/SkinBaseService.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.skin.model.SkinBaseEntity;
 * 系统基础皮肤 service接口
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public interface SkinBaseService extends ICRUDService<SkinBaseEntity,Long>{
 

base-manager/src/main/java/com/mortals/xhx/module/skin/service/SkinCategoryService.java

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
 * 系统皮肤分类 service接口
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public interface SkinCategoryService extends ICRUDService<SkinCategoryEntity,Long>{
 

base-manager/src/main/java/com/mortals/xhx/module/skin/service/SkinFieldService.java

+package com.mortals.xhx.module.skin.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+/**
+* SkinFieldService
+*
+* 皮肤属性字段配置 service接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public interface SkinFieldService extends ICRUDService<SkinFieldEntity,Long>{
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/SkinTemplateService.java

+package com.mortals.xhx.module.skin.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+/**
+* SkinTemplateService
+*
+* 系统皮肤模板 service接口
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public interface SkinTemplateService extends ICRUDService<SkinTemplateEntity,Long>{
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -9,7 +9,7 @@ import com.mortals.xhx.module.skin.service.SkinBaseService;
 * 系统基础皮肤 service实现
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @Service("skinBaseService")
 public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, SkinBaseEntity, Long> implements SkinBaseService {

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinCategoryServiceImpl.java

@@ -9,7 +9,7 @@ import com.mortals.xhx.module.skin.service.SkinCategoryService;
 * 系统皮肤分类 service实现
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @Service("skinCategoryService")
 public class SkinCategoryServiceImpl extends AbstractCRUDServiceImpl<SkinCategoryDao, SkinCategoryEntity, Long> implements SkinCategoryService {

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinFieldServiceImpl.java

+package com.mortals.xhx.module.skin.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.skin.dao.SkinFieldDao;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+import com.mortals.xhx.module.skin.service.SkinFieldService;
+/**
+* SkinFieldService
+* 皮肤属性字段配置 service实现
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Service("skinFieldService")
+public class SkinFieldServiceImpl extends AbstractCRUDServiceImpl<SkinFieldDao, SkinFieldEntity, Long> implements SkinFieldService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinTemplateServiceImpl.java

+package com.mortals.xhx.module.skin.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.xhx.module.skin.dao.SkinTemplateDao;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+import com.mortals.xhx.module.skin.service.SkinTemplateService;
+/**
+* SkinTemplateService
+* 系统皮肤模板 service实现
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@Service("skinTemplateService")
+public class SkinTemplateServiceImpl extends AbstractCRUDServiceImpl<SkinTemplateDao, SkinTemplateEntity, Long> implements SkinTemplateService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.java

@@ -28,7 +28,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 系统基础皮肤
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @RestController
 @RequestMapping("skin/base")
@@ -44,9 +44,8 @@ public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBa
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "deviceType", paramService.getParamBySecondOrganize("SkinBase","deviceType"));
-        this.addDict(model, "imageResolution", paramService.getParamBySecondOrganize("SkinBase","imageResolution"));
         super.init(model, context);
     }
 
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseForm.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.skin.model.SkinBaseQuery;
 * 系统基础皮肤 Form
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public class SkinBaseForm extends BaseCRUDFormLong<SkinBaseEntity> {
     private SkinBaseEntity entity = new SkinBaseEntity();

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryController.java

@@ -28,7 +28,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 系统皮肤分类
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 @RestController
 @RequestMapping("skin/category")

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryForm.java

@@ -11,7 +11,7 @@ import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
 * 系统皮肤分类 Form
 *
 * @author zxfei
-* @date 2022-05-16
+* @date 2022-05-24
 */
 public class SkinCategoryForm extends BaseCRUDFormLong<SkinCategoryEntity> {
     private SkinCategoryEntity entity = new SkinCategoryEntity();

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinFieldController.java

+package com.mortals.xhx.module.skin.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+import com.mortals.xhx.module.skin.model.SkinFieldQuery;
+import com.mortals.xhx.module.skin.service.SkinFieldService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 皮肤属性字段配置
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@RestController
+@RequestMapping("skin/field")
+public class SkinFieldController extends BaseCRUDJsonBodyMappingController<SkinFieldService,SkinFieldEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SkinFieldController(){
+        super.setFormClass(SkinFieldForm.class);
+        super.setModuleDesc( "皮肤属性字段配置");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "fieldType", paramService.getParamBySecondOrganize("SkinField","fieldType"));
+        this.addDict(model, "fieldNull", paramService.getParamBySecondOrganize("SkinField","fieldNull"));
+        this.addDict(model, "enabled", paramService.getParamBySecondOrganize("SkinField","enabled"));
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinFieldForm.java

+package com.mortals.xhx.module.skin.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.skin.model.SkinFieldEntity;
+import com.mortals.xhx.module.skin.model.SkinFieldQuery;
+
+/**
+* SkinField
+*
+* 皮肤属性字段配置 Form
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public class SkinFieldForm extends BaseCRUDFormLong<SkinFieldEntity> {
+    private SkinFieldEntity entity = new SkinFieldEntity();
+    private SkinFieldQuery query = new SkinFieldQuery();
+    public SkinFieldForm(){
+    }
+
+    @Override
+    public SkinFieldEntity getEntity() {
+        return entity;
+    }
+
+    public void setSkinField(SkinFieldEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public SkinFieldQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(SkinFieldQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinTemplateController.java

+package com.mortals.xhx.module.skin.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+import com.mortals.xhx.module.skin.model.SkinTemplateQuery;
+import com.mortals.xhx.module.skin.service.SkinTemplateService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 系统皮肤模板
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+@RestController
+@RequestMapping("skin/template")
+public class SkinTemplateController extends BaseCRUDJsonBodyMappingController<SkinTemplateService,SkinTemplateEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SkinTemplateController(){
+        super.setFormClass(SkinTemplateForm.class);
+        super.setModuleDesc( "系统皮肤模板");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinTemplateForm.java

+package com.mortals.xhx.module.skin.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.skin.model.SkinTemplateEntity;
+import com.mortals.xhx.module.skin.model.SkinTemplateQuery;
+
+/**
+* SkinTemplate
+*
+* 系统皮肤模板 Form
+*
+* @author zxfei
+* @date 2022-05-24
+*/
+public class SkinTemplateForm extends BaseCRUDFormLong<SkinTemplateEntity> {
+    private SkinTemplateEntity entity = new SkinTemplateEntity();
+    private SkinTemplateQuery query = new SkinTemplateQuery();
+    public SkinTemplateForm(){
+    }
+
+    @Override
+    public SkinTemplateEntity getEntity() {
+        return entity;
+    }
+
+    public void setSkinTemplate(SkinTemplateEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public SkinTemplateQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(SkinTemplateQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/main/resources/template/css/skin.css.ftl

+/* 变量 */
+:root {
+    /* 标题颜色 */
+    --main-h1-color: ${skin.titleColorStyle};
+    /* 时间颜色 */
+    --main-time-color: ${skin.timeColorStyle};
+    /* 数据颜色 */
+    --main-info-color: ${skin.dataTitleColorStyle};
+    /* 备案颜色 */
+}
+/* 背景颜色 */
+.main-bg-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
+/* 现场取号 */
+.main-xc-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
+/* 预约取号 */
+.main-yy-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
+/* vip取号 */
+.main-big-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
+/* 重打小票 */
+.main-cd-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
+/* 现场签到 */
+.main-qd-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
+/* 政务网取号 */
+.main-zwfw-img{
+    background: url(${skin.backgroundImagePath}) no-repeat;
+}
\ No newline at end of file