天府通办数据汇聚接口

sst-manager/db/add_db.sql

@@ -195,5 +195,59 @@ CREATE TABLE mortals_xhx_user_matter_examine(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户申报事项审批';
 
---------待执行脚本
 ALTER TABLE `mortals_xhx_sst_basic` ADD COLUMN `countdown` tinyint(2)   DEFAULT '0'  COMMENT '操作倒计时单位分' AFTER `elderEnable`;
+
+-- ----------------------------
+-- 网点信息表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_converge_site`;
+CREATE TABLE mortals_xhx_converge_site(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `branchName` varchar(100)      COMMENT '网点名称',
+    `branchLogo` varchar(50)      COMMENT '网点标识',
+    `status` char(1)      COMMENT '网点服务状态，正常Y异常N',
+    `serverTime` varchar(100)      COMMENT '网点服务时间',
+    `consultPhone` varchar(100) NOT NULL     COMMENT '网点咨询电话',
+    `branchStyle` char(1)      COMMENT '网点类型',
+    `address` varchar(200)      COMMENT '网点地址',
+    `opr` char(1)      COMMENT '操作类型',
+    `siteId` bigint(20)      COMMENT '站点id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网点信息';
+-- ----------------------------
+-- 网点设备表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_converge_device`;
+CREATE TABLE mortals_xhx_converge_device(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `branchId` bigint(20)      COMMENT '网点ID',
+    `equipmentName` varchar(100)      COMMENT '设备名称',
+    `systemName` char(1)      COMMENT '设备系统类型',
+    `logo` varchar(100)      COMMENT '设备标识，具有唯一性',
+    `industry` varchar(100)      COMMENT '设备所属行业',
+    `isAbnormal` char(1) NOT NULL     COMMENT '设备运行状态',
+    `opr` char(1)      COMMENT '操作类型',
+    `siteId` bigint(20)      COMMENT '站点id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='网点设备';
+-- ----------------------------
+-- 设备应用表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_converge_apps`;
+CREATE TABLE mortals_xhx_converge_apps(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '序号，主键，自增长',
+    `equipmentId` bigint(20)      COMMENT '设备ID',
+    `appEname` varchar(100)      COMMENT '应用标识，具有唯一性',
+    `appName` varchar(100)      COMMENT '应用名称',
+    `appSimpleName` varchar(100)      COMMENT '应用简称',
+    `provider` varchar(100)      COMMENT '应用提供方',
+    `origin` char(1)      COMMENT '应用来源',
+    `pv` int(8)      COMMENT '应用访问数',
+    `uv` int(8)      COMMENT '应用访客数',
+    `opr` char(1)      COMMENT '操作类型',
+    `siteId` bigint(20)      COMMENT '站点id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用';
+
+
+INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('省平台数据汇聚任务', 'provinceConvergeTask', '0', 'ProvinceConvergeTask', NULL, NULL, '1', '0', '23:30', NULL, NULL, NULL, '0', NOW(), '1', '系统管理员');

sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java

@@ -18,12 +18,10 @@ import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
 import com.mortals.xhx.module.converge.service.ConvergeSiteService;
 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.*;
 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.*;
@@ -77,6 +75,9 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co
         ret.setData(model);
         ret.setDict(model.get("dict"));
         ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        if(model.get("data")==null){
+            model.put("data", Collections.emptyList());
+        }
         return JSONObject.toJSONString(model.get("data"));
     }
 }
\ No newline at end of file