添加皮肤管理

base-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -85,7 +85,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
             }
             userEntity = userService.doLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
-            saveCurrUser(userEntity);
+
 
             recordSysLog(request, userEntity, "用户登录系统成功!");
             // 返回拥有的菜单数据

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)枚举类
+*
+* @author zxfei
+*/
+public enum DeviceTypeEnum {
+    排队机("pdj", "排队机"),
+    窗口屏("ckp", "窗口屏"),
+    呼叫器("hjq", "呼叫器"),
+    集中显示屏("jzxsp", "集中显示屏"),
+    导视机("dsj", "导视机"),
+    评级器("pjq", "评级器"),
+    自助服务终端("zzfwzd", "自助服务终端"),
+    填单机("tdj", "填单机"),
+    样表机("ybj", "样表机");
+    private String value;
+    private String desc;
+
+    DeviceTypeEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static DeviceTypeEnum getByValue(String value) {
+        for (DeviceTypeEnum deviceTypeEnum : DeviceTypeEnum.values()) {
+            if (deviceTypeEnum.getValue() == value) {
+                return deviceTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (DeviceTypeEnum item : DeviceTypeEnum.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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)枚举类
+*
+* @author zxfei
+*/
+public enum ImageResolutionEnum {
+    R1920_1080("1", "1920*1080"),
+    R1080_1920("2", "1080*1920"),
+    R1280_1280("3", "1280*1280");
+    private String value;
+    private String desc;
+
+    ImageResolutionEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static ImageResolutionEnum getByValue(String value) {
+        for (ImageResolutionEnum imageResolutionEnum : ImageResolutionEnum.values()) {
+            if (imageResolutionEnum.getValue() == value) {
+                return imageResolutionEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (ImageResolutionEnum item : ImageResolutionEnum.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/module/site/web/SiteBusinessController.java

@@ -7,16 +7,13 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.util.StringUtils;
 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.IsBusinessEnum;
-import com.mortals.xhx.module.business.model.BusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessEntity;
 import com.mortals.xhx.module.site.model.SiteBusinessQuery;
 import com.mortals.xhx.module.site.model.SiteBusinessTreeSelect;
 import com.mortals.xhx.module.site.service.SiteBusinessService;
 import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -28,8 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.mortals.framework.ap.SysConstains.RESULT_KEY;
-
 /**
  * 站点事项
  *

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

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

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

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

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

+package com.mortals.xhx.module.skin.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.skin.dao.SkinBaseDao;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 系统基础皮肤DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@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

+package com.mortals.xhx.module.skin.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.skin.dao.SkinCategoryDao;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 系统皮肤分类DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Repository("skinCategoryDao")
+public class SkinCategoryDaoImpl extends BaseCRUDDaoMybatis<SkinCategoryEntity,Long> implements SkinCategoryDao {
+
+
+
+}

base-manager/src/main/java/com/mortals/xhx/module/skin/model/SkinCategoryEntity.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.SkinCategoryVo;
+/**
+* 系统皮肤分类实体对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+
+public class SkinCategoryEntity extends SkinCategoryVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 分类名称
+    */
+    private String name;
+
+
+
+    public SkinCategoryEntity(){}
+    /**
+    * 获取 分类名称
+    * @return String
+    */
+    public String getName(){
+        return name;
+    }
+    /**
+    * 设置 分类名称
+    * @param name
+    */
+    public void setName(String name){
+        this.name = name;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SkinCategoryEntity) {
+            SkinCategoryEntity tmp = (SkinCategoryEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",name:").append(getName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+            this.name = "";
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.module.skin.model;
+
+import java.util.List;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+/**
+* 系统皮肤分类查询对象
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinCategoryQuery extends SkinCategoryEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 分类名称 */
+    private List<String> nameList;
+
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
+    /** 开始 创建用户 */
+    private Long createUserIdStart;
+
+    /** 结束 创建用户 */
+    private Long createUserIdEnd;
+
+    /** 增加 创建用户 */
+    private Long createUserIdIncrement;
+
+    /** 创建用户列表 */
+    private List <Long> createUserIdList;
+
+    /** 开始 修改时间 */
+    private String updateTimeStart;
+
+    /** 结束 修改时间 */
+    private String updateTimeEnd;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<SkinCategoryQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<SkinCategoryQuery> andConditionList;
+
+    public SkinCategoryQuery(){}
+
+    /**
+    * 获取 开始 序号，主键，自增长
+    * @return idStart
+    */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+    * 获取 结束 序号，主键，自增长
+    * @return $idEnd
+    */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+    * 获取 增加 序号，主键，自增长
+    * @return idIncrement
+    */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+    * 获取 序号，主键，自增长
+    * @return idList
+    */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+    * 获取 分类名称
+    * @return nameList
+    */
+    public List<String> getNameList(){
+        return this.nameList;
+    }
+
+    /**
+    * 设置 分类名称
+    * @param nameList
+    */
+    public void setNameList(List<String> nameList){
+        this.nameList = nameList;
+    }
+    /**
+    * 获取 开始 创建时间
+    * @return createTimeStart
+    */
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
+    }
+
+    /**
+    * 设置 开始 创建时间
+    * @param createTimeStart
+    */
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
+    }
+
+    /**
+    * 获取 结束 创建时间
+    * @return createTimeEnd
+    */
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
+    }
+
+    /**
+    * 设置 结束 创建时间
+    * @param createTimeEnd
+    */
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
+    }
+
+    /**
+    * 获取 开始 创建用户
+    * @return createUserIdStart
+    */
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
+    }
+
+    /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
+    }
+
+    /**
+    * 获取 结束 创建用户
+    * @return $createUserIdEnd
+    */
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
+    }
+
+    /**
+    * 获取 增加 创建用户
+    * @return createUserIdIncrement
+    */
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
+    }
+
+    /**
+    * 获取 创建用户
+    * @return createUserIdList
+    */
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+    }
+
+    /**
+    * 获取 开始 修改时间
+    * @return updateTimeStart
+    */
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
+    }
+
+    /**
+    * 设置 开始 修改时间
+    * @param updateTimeStart
+    */
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
+    }
+
+    /**
+    * 获取 结束 修改时间
+    * @return updateTimeEnd
+    */
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
+    }
+
+    /**
+    * 设置 结束 修改时间
+    * @param updateTimeEnd
+    */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
+
+    /**
+    * 设置  序号，主键，自增长
+    * @param id
+    */
+    public SkinCategoryQuery id(Long id){
+	    setId(id);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 序号，主键，自增长
+    * @param idStart
+    */
+    public SkinCategoryQuery idStart(Long idStart){
+		this.idStart = idStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 序号，主键，自增长
+    * @param idEnd
+    */
+    public SkinCategoryQuery idEnd(Long idEnd){
+		this.idEnd = idEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 序号，主键，自增长
+    * @param idIncrement
+    */
+    public SkinCategoryQuery idIncrement(Long idIncrement){
+		this.idIncrement = idIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 序号，主键，自增长
+    * @param idList
+    */
+    public SkinCategoryQuery idList(List<Long> idList){
+        this.idList = idList;
+		return this;
+        }
+
+
+	/**
+    * 设置 分类名称
+    * @param name
+    */
+    public SkinCategoryQuery name(String name){
+        setName(name);
+		return this;
+    }
+
+    /**
+    * 设置 分类名称
+    * @param nameList
+    */
+    public SkinCategoryQuery nameList(List<String> nameList){
+        this.nameList = nameList;
+		return this;
+    }
+
+
+    /**
+    * 设置  创建用户
+    * @param createUserId
+    */
+    public SkinCategoryQuery createUserId(Long createUserId){
+	    setCreateUserId(createUserId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 创建用户
+    * @param createUserIdStart
+    */
+    public SkinCategoryQuery createUserIdStart(Long createUserIdStart){
+		this.createUserIdStart = createUserIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 创建用户
+    * @param createUserIdEnd
+    */
+    public SkinCategoryQuery createUserIdEnd(Long createUserIdEnd){
+		this.createUserIdEnd = createUserIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 创建用户
+    * @param createUserIdIncrement
+    */
+    public SkinCategoryQuery createUserIdIncrement(Long createUserIdIncrement){
+		this.createUserIdIncrement = createUserIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 创建用户
+    * @param createUserIdList
+    */
+    public SkinCategoryQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
+		return this;
+        }
+
+
+    /**
+    * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @return orConditionList
+    */
+    public List<SkinCategoryQuery> getOrConditionList(){
+    return this.orConditionList;
+    }
+
+    /**
+    * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+    * @param orConditionList
+    */
+    public void setOrConditionList(List<SkinCategoryQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+    * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @return andConditionList
+    */
+    public List<SkinCategoryQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+    * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+    * @param andConditionList
+    */
+    public void setAndConditionList(List<SkinCategoryQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

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

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

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

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

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

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

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

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

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.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.SkinBaseDao;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import com.mortals.xhx.module.skin.service.SkinBaseService;
+/**
+* SkinBaseService
+* 系统基础皮肤 service实现
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Service("skinBaseService")
+public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, SkinBaseEntity, Long> implements SkinBaseService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinCategoryServiceImpl.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.SkinCategoryDao;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import com.mortals.xhx.module.skin.service.SkinCategoryService;
+/**
+* SkinCategoryService
+* 系统皮肤分类 service实现
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+@Service("skinCategoryService")
+public class SkinCategoryServiceImpl extends AbstractCRUDServiceImpl<SkinCategoryDao, SkinCategoryEntity, Long> implements SkinCategoryService {
+    
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinBaseController.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.SkinBaseEntity;
+import com.mortals.xhx.module.skin.model.SkinBaseQuery;
+import com.mortals.xhx.module.skin.service.SkinBaseService;
+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-16
+*/
+@RestController
+@RequestMapping("skin/base")
+public class SkinBaseController extends BaseCRUDJsonBodyMappingController<SkinBaseService,SkinBaseEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SkinBaseController(){
+        super.setFormClass(SkinBaseForm.class);
+        super.setModuleDesc( "系统基础皮肤");
+    }
+
+    @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

+package com.mortals.xhx.module.skin.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.skin.model.SkinBaseEntity;
+import com.mortals.xhx.module.skin.model.SkinBaseQuery;
+
+/**
+* SkinBase
+*
+* 系统基础皮肤 Form
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinBaseForm extends BaseCRUDFormLong<SkinBaseEntity> {
+    private SkinBaseEntity entity = new SkinBaseEntity();
+    private SkinBaseQuery query = new SkinBaseQuery();
+    public SkinBaseForm(){
+    }
+
+    @Override
+    public SkinBaseEntity getEntity() {
+        return entity;
+    }
+
+    public void setSkinBase(SkinBaseEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public SkinBaseQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(SkinBaseQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinCategoryController.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.SkinCategoryEntity;
+import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
+import com.mortals.xhx.module.skin.service.SkinCategoryService;
+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-16
+*/
+@RestController
+@RequestMapping("skin/category")
+public class SkinCategoryController extends BaseCRUDJsonBodyMappingController<SkinCategoryService,SkinCategoryEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public SkinCategoryController(){
+        super.setFormClass(SkinCategoryForm.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/SkinCategoryForm.java

+package com.mortals.xhx.module.skin.web;
+
+
+import com.mortals.framework.web.BaseCRUDFormLong;
+import com.mortals.xhx.module.skin.model.SkinCategoryEntity;
+import com.mortals.xhx.module.skin.model.SkinCategoryQuery;
+
+/**
+* SkinCategory
+*
+* 系统皮肤分类 Form
+*
+* @author zxfei
+* @date 2022-05-16
+*/
+public class SkinCategoryForm extends BaseCRUDFormLong<SkinCategoryEntity> {
+    private SkinCategoryEntity entity = new SkinCategoryEntity();
+    private SkinCategoryQuery query = new SkinCategoryQuery();
+    public SkinCategoryForm(){
+    }
+
+    @Override
+    public SkinCategoryEntity getEntity() {
+        return entity;
+    }
+
+    public void setSkinCategory(SkinCategoryEntity entity) {
+        this.entity = entity;
+    }
+
+    @Override
+    public SkinCategoryQuery getQuery() {
+        return query;
+    }
+
+    public void setQuery(SkinCategoryQuery query) {
+        this.query = query;
+    }
+}
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/skin/SkinBaseController.http

+
+###系统基础皮肤列表
+POST {{baseUrl}}/skin/base/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###系统基础皮肤更新与保存
+POST {{baseUrl}}/skin/base/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "categoryId":342,
+        "deviceType":"phj",
+        "shortName":"yoqk5a",
+        "imageResolution":"0",
+        "backgroundImagePath":"ghmrvv",
+        "sceneNumImagePath":"1977xs",
+        "bookingNumImagePath":"d8nd1m",
+        "vipNumImagePath":"0z6xfe",
+        "smallTicketNumImagePath":"k7er3k",
+        "sceneSignImagePath":"pb4s89",
+        "govNumImagePath":"fk4qjn",
+        "titleColorStyle":"7x2uby",
+        "timeColorStyle":"qqj9om",
+        "dataTitleColorStyle":"t1v89j",
+        "dataColorStyle":"arbo9i",
+        "recordColorStyle":"9ukimo",
+        "previewImagePath":"ais7r0",
+        "sortNum":832,
+}
+
+> {%
+client.global.set("SkinBase_id", JSON.parse(response.body).data.id);
+%}
+
+###系统基础皮肤查看
+GET {{baseUrl}}/skin/base/info?id={{SkinBase_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###系统基础皮肤编辑
+GET {{baseUrl}}/skin/base/edit?id={{SkinBase_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###系统基础皮肤删除
+GET {{baseUrl}}/skin/base/delete?id={{SkinBase_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

base-manager/src/test/java/com/mortals/httpclient/skin/SkinCategoryController.http

+
+###系统皮肤分类列表
+POST {{baseUrl}}/skin/category/list
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+    "page":1,
+    "size":10
+}
+
+
+###系统皮肤分类更新与保存
+POST {{baseUrl}}/skin/category/save
+Authorization: {{authToken}}
+Content-Type: application/json
+
+{
+        "name":"m4abmg",
+}
+
+> {%
+client.global.set("SkinCategory_id", JSON.parse(response.body).data.id);
+%}
+
+###系统皮肤分类查看
+GET {{baseUrl}}/skin/category/info?id={{SkinCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+###系统皮肤分类编辑
+GET {{baseUrl}}/skin/category/edit?id={{SkinCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###系统皮肤分类删除
+GET {{baseUrl}}/skin/category/delete?id={{SkinCategory_id}}
+Authorization: {{authToken}}
+Accept: application/json
+
+
+
+

db/base_modules.sql

@@ -592,3 +592,47 @@ CREATE TABLE `mortals_sys_holiday` (
 ) ENGINE = InnoDB  CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '节假日表' ROW_FORMAT = Dynamic;
 
 
+
+
+-- ----------------------------
+-- 系统皮肤分类表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_skin_category`;
+CREATE TABLE mortals_sys_skin_category(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '序号，主键，自增长',
+    `name` varchar(64)     COMMENT '分类名称',
+    `createTime` datetime     COMMENT '创建时间',
+    `createUserId` bigint(20)     COMMENT '创建用户',
+    `updateTime` datetime     COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统皮肤分类';
+-- ----------------------------
+-- 系统基础皮肤表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_sys_skin_base`;
+CREATE TABLE mortals_sys_skin_base(
+    `id` bigint(20)   AUTO_INCREMENT  COMMENT '序号，主键，自增长',
+    `categoryId` bigint(20)     COMMENT '所属种类,来源种类',
+    `deviceType` varchar(64)     COMMENT '设备类型  (pdj.排队机，ckp.窗口屏，hjq.呼叫器，jzxsp.集中显示屏，dsj.导视机，pjq.评级器，zzfwzd.自助服务终端，tdj.填单机，ybj.样表机)',
+    `shortName` varchar(64)     COMMENT '皮肤名称',
+    `imageResolution` varchar(64)     COMMENT '分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)',
+    `backgroundImagePath` varchar(256)     COMMENT '背景大图',
+    `sceneNumImagePath` varchar(256)     COMMENT '现场取号图片',
+    `bookingNumImagePath` varchar(256)     COMMENT '预约取号图片',
+    `vipNumImagePath` varchar(256)     COMMENT 'vip取号图片',
+    `smallTicketNumImagePath` varchar(256)     COMMENT '重打小票图片',
+    `sceneSignImagePath` varchar(256)     COMMENT '现场签到图片',
+    `govNumImagePath` varchar(256)     COMMENT '政务网取号图片',
+    `titleColorStyle` varchar(256)     COMMENT '标题颜色',
+    `timeColorStyle` varchar(256)     COMMENT '时间颜色',
+    `dataTitleColorStyle` varchar(256)     COMMENT '数据标题颜色',
+    `dataColorStyle` varchar(256)     COMMENT '数据颜色',
+    `recordColorStyle` varchar(256)     COMMENT '备案颜色',
+    `previewImagePath` varchar(256)     COMMENT '预览图片',
+    `sortNum` int(9)     COMMENT '排序编号',
+    `createTime` datetime     COMMENT '创建时间',
+    `createUserId` bigint(20)     COMMENT '创建用户',
+    `updateTime` datetime     COMMENT '修改时间',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='系统基础皮肤';
+

db/params.sql

@@ -319,3 +319,18 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '区域状态', 'Area', 'status',
 
 
 
+-- ----------------------------
+-- 系统基础皮肤参数 SQL
+-- ----------------------------
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'pdj', '排队机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'ckp', '窗口屏', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'hjq', '呼叫器', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'jzxsp', '集中显示屏', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'dsj', '导视机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'pjq', '评级器', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'zzfwzd', '自助服务终端', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'tdj', '填单机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '设备类型  ', 'SkinBase', 'deviceType', 'ybj', '样表机', 1, 4, 0, 'deviceType', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '分辨率 ', 'SkinBase', 'imageResolution', '1', '1920*1080', 1, 4, 0, 'imageResolution', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '分辨率 ', 'SkinBase', 'imageResolution', '2', '1080*1920', 1, 4, 0, 'imageResolution', NULL, NULL, NULL);
+INSERT INTO `mortals_xhx_param` VALUES (null, '分辨率 ', 'SkinBase', 'imageResolution', '3', '1280*1280', 1, 4, 0, 'imageResolution', NULL, NULL, NULL);
\ No newline at end of file