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/feign/app/IAppFeign.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.feign.app;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.app.AppPdu;
+import com.mortals.xhx.common.pdu.app.DeviceBlackappPdu;
 import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.feign.IFeign;
 import com.mortals.xhx.feign.device.IDeviceFeign;
@@ -39,6 +40,14 @@ public interface IAppFeign extends IFeign {
      */
     @GetMapping(value = "/app/info")
     Rest<AppPdu> info(@RequestParam(value = "id") Long id);
+
+    /**
+     * 设备应用黑名单
+     * @param appPdu
+     * @return
+     */
+    @PostMapping(value = "/device/blackapp/list")
+    Rest<RespData<List<DeviceBlackappPdu>>> blackappList(@RequestBody DeviceBlackappPdu appPdu);
 }
 
 @Slf4j
@@ -58,6 +67,11 @@ class AppFeignFallbackFactory implements FallbackFactory<IAppFeign> {
             public Rest<AppPdu> info(Long id) {
                 return Rest.fail("暂时无法获取自助终端应用，请稍后再试!");
             }
+
+            @Override
+            public Rest<RespData<List<DeviceBlackappPdu>>> blackappList(DeviceBlackappPdu appPdu) {
+                return Rest.fail("暂时无法获取设备应用黑名单，请稍后再试!");
+            }
         };
     }
 }
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceFeign.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.feign.device;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DeviceNotifyPdu;
 import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
@@ -58,7 +59,13 @@ public interface IDeviceFeign extends IFeign {
     @PostMapping(value = "/device/save")
     Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization);
 
-
+    /**
+     * 接收第三方平台下发设备消息
+     * @param deviceNotifyPdu
+     * @return
+     */
+    @PostMapping(value = "/notify/downMsg")
+    Rest<String> downMsg(@RequestBody DeviceNotifyPdu deviceNotifyPdu);
 }
 
 
@@ -87,6 +94,11 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
             public Rest<RespData<DevicePdu>> save(DevicePdu devicePdu, String authorization) {
                 return Rest.fail("暂时无法保存设备，请稍后再试!");
             }
+
+            @Override
+            public Rest<String> downMsg(DeviceNotifyPdu deviceNotifyPdu) {
+                return Rest.fail("暂时无法接收第三方平台下发设备消息，请稍后再试!");
+            }
         };
     }
 }

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=