Merge remote-tracking branch 'origin/master'

assembly/assembly.xml

+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>release</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>${project.parent.basedir}/dist/${project.parent.artifactId}/boot</directory>
+            <outputDirectory>boot</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+        <fileSet>
+            <directory>./db</directory>
+            <includes>
+                <include>*.sql</include>
+            </includes>
+            <outputDirectory>db</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
+    </fileSets>
+
+    <files>
+        <file>
+            <source>target/${project.artifactId}-${project.version}.jar</source>
+            <outputDirectory>boot</outputDirectory>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/common/pdu/RespData.java

@@ -14,6 +14,6 @@ public class RespData<T> {
     private T data;
     private T entity;
     private PageInfo pageInfo;
-
+    private Object dict;
 
 }

common-lib/src/main/java/com/mortals/xhx/common/pdu/app/AppPdu.java

@@ -92,6 +92,11 @@ public class AppPdu extends BaseEntityLong {
      */
     private Integer dataUpdate;
 
+    /**
+     * 自主应用访问地址
+     */
+    private String custUrl;
+
 
     public AppPdu(){}
     /**
@@ -375,6 +380,13 @@ public class AppPdu extends BaseEntityLong {
         this.dataUpdate = dataUpdate;
     }
 
+    public String getCustUrl() {
+        return custUrl;
+    }
+
+    public void setCustUrl(String custUrl) {
+        this.custUrl = custUrl;
+    }
 
     @Override
     public int hashCode() {

common-lib/src/main/java/com/mortals/xhx/common/pdu/app/DeviceBlackappPdu.java

+package com.mortals.xhx.common.pdu.app;
+
+import com.mortals.framework.model.BaseEntityLong;
+import lombok.Data;
+
+@Data
+public class DeviceBlackappPdu extends BaseEntityLong {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 站点ID
+     */
+    private Long siteId;
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 应用id
+     */
+    private Long appId;
+    /**
+     * 应用编码
+     */
+    private String appCode;
+    /**
+     * 应用名称
+     */
+    private String appName;
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DeviceBlackappPdu) {
+            DeviceBlackappPdu tmp = (DeviceBlackappPdu) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+        this.siteId = null;
+
+        this.deviceId = null;
+
+        this.deviceCode = "";
+
+        this.deviceName = "";
+
+        this.appId = null;
+
+        this.appCode = "";
+
+        this.appName = null;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/dept/DeptPdu.java

+package com.mortals.xhx.common.pdu.dept;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class DeptPdu extends BaseEntityLong {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 从政务系统来的部门id
+     */
+    private String tid;
+    /**
+     * 从政务系统来的部门name
+     */
+    private String tname;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 从政务系统来的别名
+     */
+    private String simpleName;
+    /**
+     * 站点ID
+     */
+    private Long siteId;
+    /**
+     * 部门简称
+     */
+    private String deptAbb;
+    /**
+     * 部门电话
+     */
+    private String deptTelphone;
+    /**
+     * 部门编号
+     */
+    private String deptNumber;
+    /**
+     * 填单机展示 (0.否，1.是)
+     */
+    private Integer isAutotable;
+    /**
+     * 预约展示 (0.否，1.是)
+     */
+    private Integer isOrder;
+    /**
+     * 背靠背展示 (0.否，1.是)
+     */
+    private Integer isBkb;
+    /**
+     * 办事指南展示 (0.否，1.是)
+     */
+    private Integer isWorkGuide;
+    /**
+     * 是否使用 (0.否，1.是)
+     */
+    private Integer usValid;
+    /**
+     * 部门电话是否展示 (0.否，1.是)
+     */
+    private Integer isSecphone;
+    /**
+     * 是否展示英文 (0.否，1.是)
+     */
+    private Integer isEnglish;
+    /**
+     * 排序
+     */
+    private Integer sort;
+    /**
+     * 部门来源
+     */
+    private Integer source;
+    /**
+     * 关联事项数量
+     */
+    private Integer total;
+
+
+
+    public DeptPdu(){}
+    /**
+     * 获取 从政务系统来的部门id
+     * @return String
+     */
+    public String getTid(){
+        return tid;
+    }
+    /**
+     * 设置 从政务系统来的部门id
+     * @param tid
+     */
+    public void setTid(String tid){
+        this.tid = tid;
+    }
+    /**
+     * 获取 从政务系统来的部门name
+     * @return String
+     */
+    public String getTname(){
+        return tname;
+    }
+    /**
+     * 设置 从政务系统来的部门name
+     * @param tname
+     */
+    public void setTname(String tname){
+        this.tname = tname;
+    }
+    /**
+     * 获取 部门名称
+     * @return String
+     */
+    public String getName(){
+        return name;
+    }
+    /**
+     * 设置 部门名称
+     * @param name
+     */
+    public void setName(String name){
+        this.name = name;
+    }
+    /**
+     * 获取 从政务系统来的别名
+     * @return String
+     */
+    public String getSimpleName(){
+        return simpleName;
+    }
+    /**
+     * 设置 从政务系统来的别名
+     * @param simpleName
+     */
+    public void setSimpleName(String simpleName){
+        this.simpleName = simpleName;
+    }
+    /**
+     * 获取 站点ID
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点ID
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+    /**
+     * 获取 部门简称
+     * @return String
+     */
+    public String getDeptAbb(){
+        return deptAbb;
+    }
+    /**
+     * 设置 部门简称
+     * @param deptAbb
+     */
+    public void setDeptAbb(String deptAbb){
+        this.deptAbb = deptAbb;
+    }
+    /**
+     * 获取 部门电话
+     * @return String
+     */
+    public String getDeptTelphone(){
+        return deptTelphone;
+    }
+    /**
+     * 设置 部门电话
+     * @param deptTelphone
+     */
+    public void setDeptTelphone(String deptTelphone){
+        this.deptTelphone = deptTelphone;
+    }
+    /**
+     * 获取 部门编号
+     * @return String
+     */
+    public String getDeptNumber(){
+        return deptNumber;
+    }
+    /**
+     * 设置 部门编号
+     * @param deptNumber
+     */
+    public void setDeptNumber(String deptNumber){
+        this.deptNumber = deptNumber;
+    }
+    /**
+     * 获取 填单机展示 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getIsAutotable(){
+        return isAutotable;
+    }
+    /**
+     * 设置 填单机展示 (0.否，1.是)
+     * @param isAutotable
+     */
+    public void setIsAutotable(Integer isAutotable){
+        this.isAutotable = isAutotable;
+    }
+    /**
+     * 获取 预约展示 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getIsOrder(){
+        return isOrder;
+    }
+    /**
+     * 设置 预约展示 (0.否，1.是)
+     * @param isOrder
+     */
+    public void setIsOrder(Integer isOrder){
+        this.isOrder = isOrder;
+    }
+    /**
+     * 获取 背靠背展示 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getIsBkb(){
+        return isBkb;
+    }
+    /**
+     * 设置 背靠背展示 (0.否，1.是)
+     * @param isBkb
+     */
+    public void setIsBkb(Integer isBkb){
+        this.isBkb = isBkb;
+    }
+    /**
+     * 获取 办事指南展示 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getIsWorkGuide(){
+        return isWorkGuide;
+    }
+    /**
+     * 设置 办事指南展示 (0.否，1.是)
+     * @param isWorkGuide
+     */
+    public void setIsWorkGuide(Integer isWorkGuide){
+        this.isWorkGuide = isWorkGuide;
+    }
+    /**
+     * 获取 是否使用 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getUsValid(){
+        return usValid;
+    }
+    /**
+     * 设置 是否使用 (0.否，1.是)
+     * @param usValid
+     */
+    public void setUsValid(Integer usValid){
+        this.usValid = usValid;
+    }
+    /**
+     * 获取 部门电话是否展示 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getIsSecphone(){
+        return isSecphone;
+    }
+    /**
+     * 设置 部门电话是否展示 (0.否，1.是)
+     * @param isSecphone
+     */
+    public void setIsSecphone(Integer isSecphone){
+        this.isSecphone = isSecphone;
+    }
+    /**
+     * 获取 是否展示英文 (0.否，1.是)
+     * @return Integer
+     */
+    public Integer getIsEnglish(){
+        return isEnglish;
+    }
+    /**
+     * 设置 是否展示英文 (0.否，1.是)
+     * @param isEnglish
+     */
+    public void setIsEnglish(Integer isEnglish){
+        this.isEnglish = isEnglish;
+    }
+    /**
+     * 获取 排序
+     * @return Integer
+     */
+    public Integer getSort(){
+        return sort;
+    }
+    /**
+     * 设置 排序
+     * @param sort
+     */
+    public void setSort(Integer sort){
+        this.sort = sort;
+    }
+    /**
+     * 获取 部门来源
+     * @return Integer
+     */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+     * 设置 部门来源
+     * @param source
+     */
+    public void setSource(Integer source){
+        this.source = source;
+    }
+    /**
+     * 获取 关联事项数量
+     * @return Integer
+     */
+    public Integer getTotal(){
+        return total;
+    }
+    /**
+     * 设置 关联事项数量
+     * @param total
+     */
+    public void setTotal(Integer total){
+        this.total = total;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof DeptPdu) {
+            DeptPdu tmp = (DeptPdu) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",tid:").append(getTid());
+        sb.append(",tname:").append(getTname());
+        sb.append(",name:").append(getName());
+        sb.append(",simpleName:").append(getSimpleName());
+        sb.append(",siteId:").append(getSiteId());
+        sb.append(",deptAbb:").append(getDeptAbb());
+        sb.append(",deptTelphone:").append(getDeptTelphone());
+        sb.append(",deptNumber:").append(getDeptNumber());
+        sb.append(",isAutotable:").append(getIsAutotable());
+        sb.append(",isOrder:").append(getIsOrder());
+        sb.append(",isBkb:").append(getIsBkb());
+        sb.append(",isWorkGuide:").append(getIsWorkGuide());
+        sb.append(",usValid:").append(getUsValid());
+        sb.append(",isSecphone:").append(getIsSecphone());
+        sb.append(",isEnglish:").append(getIsEnglish());
+        sb.append(",sort:").append(getSort());
+        sb.append(",source:").append(getSource());
+        sb.append(",total:").append(getTotal());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.tid = null;
+
+        this.tname = null;
+
+        this.name = null;
+
+        this.simpleName = null;
+
+        this.siteId = null;
+
+        this.deptAbb = null;
+
+        this.deptTelphone = null;
+
+        this.deptNumber = null;
+
+        this.isAutotable = 1;
+
+        this.isOrder = 1;
+
+        this.isBkb = 1;
+
+        this.isWorkGuide = 1;
+
+        this.usValid = 1;
+
+        this.isSecphone = 1;
+
+        this.isEnglish = 1;
+
+        this.sort = 0;
+
+        this.source = 0;
+
+        this.total = 0;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DeviceAlarmPdu.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.common.pdu.device;
 import com.mortals.framework.model.BaseEntityLong;
 
 import java.util.Date;
+import java.util.List;
 
 public class DeviceAlarmPdu extends BaseEntityLong {
     private static final long serialVersionUID = 1L;
@@ -56,7 +57,15 @@ public class DeviceAlarmPdu extends BaseEntityLong {
     /** 结束 创建时间 */
     private String createTimeEnd;
 
+    private List<Long> alarmDeviceList;
 
+    public List<Long> getAlarmDeviceList() {
+        return alarmDeviceList;
+    }
+
+    public void setAlarmDeviceList(List<Long> alarmDeviceList) {
+        this.alarmDeviceList = alarmDeviceList;
+    }
 
     public DeviceAlarmPdu(){}
     /**

common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DeviceNotifyPdu.java

+package com.mortals.xhx.common.pdu.device;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 下发设备消息
+ */
+@Data
+public class DeviceNotifyPdu {
+    private List<String> deviceCodeList;
+    private String action;
+    private String content;
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterAcceptPdu.java

+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+public class MatterAcceptPdu extends BaseEntityLong {
+    /**
+     * 基础事项表id
+     */
+    private Long matterId;
+    /**
+     * 事项编码
+     */
+    private String matterCode;
+    /**
+     * 事项名称
+     */
+    private String matterName;
+    /**
+     * 受理条件
+     */
+    private String content;
+    /**
+     * 事项来源 (0.政务网，1.自定义)
+     */
+    private Integer source;
+
+    /** 主键，自增长列表 */
+    private List<Long> idList;
+
+    public Long getMatterId() {
+        return matterId;
+    }
+
+    public void setMatterId(Long matterId) {
+        this.matterId = matterId;
+    }
+
+    public String getMatterCode() {
+        return matterCode;
+    }
+
+    public void setMatterCode(String matterCode) {
+        this.matterCode = matterCode;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
+
+    public List<Long> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
+    }
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterAcceptPdu) {
+            MatterAcceptPdu tmp = (MatterAcceptPdu) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",content:").append(getContent());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.matterId = 0L;
+
+        this.matterCode = "";
+
+        this.matterName = "";
+
+        this.content = "";
+
+        this.source = 0;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterChargesPdu.java

+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+import java.util.List;
+
+public class MatterChargesPdu extends BaseEntityLong {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 事项基础表matter id
+     */
+    private Long matterId;
+    /**
+     * 事项编码
+     */
+    private String matterCode;
+    /**
+     * 事项名称
+     */
+    private String matterName;
+    /**
+     * 收费标准
+     */
+    private String content;
+    /**
+     * 事项来源，(0.政务网，1.自定义)
+     */
+    private Integer source;
+
+    /** 主键，自增长列表 */
+    private List<Long> idList;
+
+
+    public Long getMatterId() {
+        return matterId;
+    }
+
+    public void setMatterId(Long matterId) {
+        this.matterId = matterId;
+    }
+
+    public String getMatterCode() {
+        return matterCode;
+    }
+
+    public void setMatterCode(String matterCode) {
+        this.matterCode = matterCode;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
+
+    public List<Long> getIdList() {
+        return idList;
+    }
+
+    public void setIdList(List<Long> idList) {
+        this.idList = idList;
+    }
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterChargesPdu) {
+            MatterChargesPdu tmp = (MatterChargesPdu) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",matterId:").append(getMatterId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",matterName:").append(getMatterName());
+        sb.append(",content:").append(getContent());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.matterId = 0L;
+
+        this.matterCode = "";
+
+        this.matterName = "";
+
+        this.content = "";
+
+        this.source = 0;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/matter/MatterDatumFilePdu.java

+package com.mortals.xhx.common.pdu.matter;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class MatterDatumFilePdu extends BaseEntityLong {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 材料id
+     */
+    private Long datumId;
+    /**
+     * 事项编码
+     */
+    private String matterCode;
+    /**
+     * 材料名
+     */
+    private String materialName;
+    /**
+     * 附件名称
+     */
+    private String fileName;
+    /**
+     * 附件下载地址
+     */
+    private String fileUrl;
+    /**
+     * 附件本地下载地址
+     */
+    private String localFileUrl;
+    /**
+     * 附件类型 (示例样表.示例样表，空白表格.空白表格)
+     */
+    private String filetype;
+    /**
+     * 附件来源 (0.政务网，1.自定义)
+     */
+    private Integer source;
+
+    public Long getDatumId() {
+        return datumId;
+    }
+
+    public void setDatumId(Long datumId) {
+        this.datumId = datumId;
+    }
+
+    public String getMatterCode() {
+        return matterCode;
+    }
+
+    public void setMatterCode(String matterCode) {
+        this.matterCode = matterCode;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    public String getLocalFileUrl() {
+        return localFileUrl;
+    }
+
+    public void setLocalFileUrl(String localFileUrl) {
+        this.localFileUrl = localFileUrl;
+    }
+
+    public String getFiletype() {
+        return filetype;
+    }
+
+    public void setFiletype(String filetype) {
+        this.filetype = filetype;
+    }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof MatterDatumFilePdu) {
+            MatterDatumFilePdu tmp = (MatterDatumFilePdu) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",datumId:").append(getDatumId());
+        sb.append(",matterCode:").append(getMatterCode());
+        sb.append(",materialName:").append(getMaterialName());
+        sb.append(",fileName:").append(getFileName());
+        sb.append(",fileUrl:").append(getFileUrl());
+        sb.append(",localFileUrl:").append(getLocalFileUrl());
+        sb.append(",filetype:").append(getFiletype());
+        sb.append(",source:").append(getSource());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.datumId = null;
+
+        this.matterCode = "";
+
+        this.materialName = "";
+
+        this.fileName = "";
+
+        this.fileUrl = "";
+
+        this.localFileUrl = "";
+
+        this.filetype = "示例样表";
+
+        this.source = 1;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SiteThemePdu.java

+package com.mortals.xhx.common.pdu.site;
+
+import com.mortals.framework.model.BaseEntityLong;
+
+public class SiteThemePdu extends BaseEntityLong {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 站点id
+     */
+    private Long siteId;
+    /**
+     * 服务类型编号
+     */
+    private String userType;
+    /**
+     * 主题编号
+     */
+    private String themeCode;
+    /**
+     * 主题名称
+     */
+    private String themeName;
+
+
+
+    public SiteThemePdu(){}
+    /**
+     * 获取 站点id
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点id
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
+    /**
+     * 获取 服务类型编号
+     * @return String
+     */
+    public String getUserType(){
+        return userType;
+    }
+    /**
+     * 设置 服务类型编号
+     * @param userType
+     */
+    public void setUserType(String userType){
+        this.userType = userType;
+    }
+    /**
+     * 获取 主题编号
+     * @return String
+     */
+    public String getThemeCode(){
+        return themeCode;
+    }
+    /**
+     * 设置 主题编号
+     * @param themeCode
+     */
+    public void setThemeCode(String themeCode){
+        this.themeCode = themeCode;
+    }
+    /**
+     * 获取 主题名称
+     * @return String
+     */
+    public String getThemeName(){
+        return themeName;
+    }
+    /**
+     * 设置 主题名称
+     * @param themeName
+     */
+    public void setThemeName(String themeName){
+        this.themeName = themeName;
+    }
+
+
+
+
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof SiteThemePdu) {
+            SiteThemePdu tmp = (SiteThemePdu) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public String toString(){
+        StringBuilder sb = new StringBuilder("");
+        sb.append(",siteId:").append(getSiteId());
+        sb.append(",userType:").append(getUserType());
+        sb.append(",themeCode:").append(getThemeCode());
+        sb.append(",themeName:").append(getThemeName());
+        return sb.toString();
+    }
+
+    public void initAttrValue(){
+
+        this.siteId = null;
+
+        this.userType = null;
+
+        this.themeCode = null;
+
+        this.themeName = null;
+    }
+}

sst-manager/src/main/bin/start.cmd

@@ -28,6 +28,7 @@ set JVM_CONFIG=%JVM_CONFIG% -Dapp.name=%PROJECT_NAME%
 set JVM_CONFIG=%JVM_CONFIG% -Dapp.port=%PORT%
 set JVM_CONFIG=%JVM_CONFIG% -Djava.io.tmpdir=%TEMP_PATH%
 set JVM_CONFIG=%JVM_CONFIG% -Dbasedir=%BASEDIR%
+set JVM_CONFIG=%JVM_CONFIG% -Dloader.path=file://%BASEDIR%/conf,file://%BASEDIR%/lib
 
 
 set DEBUG_OPTS=

sst-manager/src/main/java/com/mortals/xhx/base/system/upload/service/impl/UploadServiceImpl.java

@@ -48,7 +48,9 @@ public class UploadServiceImpl implements UploadService {
         if (tempFile == null || tempFile.getSize() == 0) {
             throw new AppException("没有要上传的文件！");
         }
-
+        if(StringUtils.isEmpty(prePath)){
+            prePath = "file/uploadfile";
+        }
         String fileName = tempFile.getOriginalFilename();
         String extension = FilenameUtils.getExtension(fileName);
         UploadFileType type = UploadFileType.getFileType(extension);

sst-manager/src/main/java/com/mortals/xhx/common/code/ComponentEnum.java

@@ -18,7 +18,8 @@ public enum ComponentEnum {
     DATE("date", "日期选择栏"),
     AREA("area", "区域选择栏"),
     IMAGE("@image", "图片选择"),
-    DYNAMIC_TABLE("dt", "动态表格"),;
+    DYNAMIC_TABLE("dt", "动态表格"),
+    QRCODE("@qrcode", "二维码输入框");
 
     private String value;
     private String desc;