From 1d5b53e233f8d2f86c7f73cc0113a449d2f1838c Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 10 Apr 2024 18:52:31 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 8 +- .../com/kms/web/utils/WaterRequestUtil.java | 100 +++++++++--------- .../kms/system/service/SysMenuService.java | 15 +++ 3 files changed, 69 insertions(+), 54 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index fff9b451..e835bf68 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -163,8 +163,7 @@ public class SysLoginController extends BaseController { public AjaxResult getRouters() { // 用户信息 SysUser user = UserUtils.getUser(); - List menus = menuService.selectMenuTreeByUserId(user.getId()); - menus.addAll(permissionService.getUserMenuFromPortal(user.getId())); + List menus = menuService.selectMenuTreeByUserId(user.getId(), permissionService.getUserMenuFromPortal(user.getId())); return AjaxResult.success(menuService.buildMenus(menus)); } @@ -303,7 +302,7 @@ public class SysLoginController extends BaseController { String data = waterResult.getData(); JSONObject datajson = JSONObject.parseObject(data); List functionPerms = datajson.getJSONArray("functionPerms").toJavaList(String.class); - List menuCode = singleMenus.stream().map(SingleMenu::getCode).distinct().collect(Collectors.toList()); + List menuCode = singleAllMenus.stream().map(SingleMenu::getCode).distinct().collect(Collectors.toList()); permissionService.setUserPermissionFromPortal(userId, functionPerms); permissionService.setUserMenuFromPortal(userId, menuCode); @@ -319,8 +318,7 @@ public class SysLoginController extends BaseController { public static void setChildren(List singleMenus, List singleAllMenus) { if (CollectionUtil.isNotEmpty(singleMenus)) { - for (SingleMenu singleMenu : - singleMenus) { //剔除掉不符合的 + for (SingleMenu singleMenu : singleMenus) { //剔除掉不符合的 if (singleMenu.getVisible() != null && singleMenu.getStatus() != null) { if (singleMenu.getStatus().equals("1")) { singleAllMenus.add(singleMenu); diff --git a/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java b/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java index 02616363..fd4c8f6d 100644 --- a/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java +++ b/shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java @@ -65,7 +65,6 @@ public class WaterRequestUtil { public String roleAppsecret; - @Value("${water.systemUrl:}") public String systemUrl; @Value("${water.systemServiceId:}") @@ -91,11 +90,12 @@ public class WaterRequestUtil { /** * 设置 + * * @param httpRequest * @param serviceId * @param appsecret */ - private void setHead(HttpRequest httpRequest,String serviceId,String appsecret){ + private void setHead(HttpRequest httpRequest, String serviceId, String appsecret) { String timestamp = String.valueOf(new Date().getTime()); String nonce = IdUtil.fastSimpleUUID(); String signature = timestamp + paasToken + nonce + timestamp; @@ -105,37 +105,38 @@ public class WaterRequestUtil { e.printStackTrace(); } httpRequest - .header("x-tsp-paasid",paasId) - .header("x-tsp-signature",signature) - .header("x-tsp-timestamp",timestamp) + .header("x-tsp-paasid", paasId) + .header("x-tsp-signature", signature) + .header("x-tsp-timestamp", timestamp) .header("x-tsp-nonce", nonce) - .header("x-tsp-serviceid",serviceId) - .header("x-tsp-appsecret",appsecret); + .header("x-tsp-serviceid", serviceId) + .header("x-tsp-appsecret", appsecret); } - public HttpRequest createGet(String url,String serviceId,String appsecret){ + public HttpRequest createGet(String url, String serviceId, String appsecret) { HttpRequest httpRequest = HttpRequest.get(url); - setHead(httpRequest,serviceId,appsecret); + setHead(httpRequest, serviceId, appsecret); return httpRequest; } - public HttpRequest createPost(String url,String serviceId,String appsecret){ + public HttpRequest createPost(String url, String serviceId, String appsecret) { HttpRequest httpRequest = HttpRequest.post(url); - setHead(httpRequest,serviceId,appsecret); + setHead(httpRequest, serviceId, appsecret); return httpRequest; } /** * 业务系统 + * * @return */ - public WaterResult systemPage(){ + public WaterResult systemPage() { log.info("查询业务系统-----------------"); HttpRequest post = createPost(systemUrl, systemServiceId, systemAppsecret); HashMap query = new HashMap<>(); - query.put("code",systemCode); - query.put("name",systemName); + query.put("code", systemCode); + query.put("name", systemName); String body; try (HttpResponse response = post.body(JSONObject.toJSONString(query)) .execute()) { @@ -173,10 +174,11 @@ public class WaterRequestUtil { /** * 单点登录 + * * @return */ - public WaterResult signOn(String userId){ - HttpRequest get = createGet(userUrl,singOnServiceId,singOnAppsecret); + public WaterResult signOn(String userId) { + HttpRequest get = createGet(userUrl, singOnServiceId, singOnAppsecret); String body; try (HttpResponse response = get.header("x-tsp-target", paasId) .header("x-tsp-uid-type", "id") @@ -189,12 +191,13 @@ public class WaterRequestUtil { /** * 验证用户登录 + * * @param authorization * @return */ - public WaterResult authUser(String authorization){ - log.info("--------请求统一门户用户验证,请求地址为:"+userUrl); - HttpRequest get = createGet(userUrl,authUserServiceId,authUserAppsecret); + public WaterResult authUser(String authorization) { + log.info("--------请求统一门户用户验证,请求地址为:" + userUrl); + HttpRequest get = createGet(userUrl, authUserServiceId, authUserAppsecret); String body; try (HttpResponse response = get.header("Authorization", authorization) .execute()) { @@ -206,13 +209,13 @@ public class WaterRequestUtil { } - public WaterResult getOrgPage(){ - log.info("--------请求获取门户组织信息,请求地址为:"+orgUrl); + public WaterResult getOrgPage() { + log.info("--------请求获取门户组织信息,请求地址为:" + orgUrl); HashMap hashMap = new HashMap<>(); - hashMap.put("page",1); - hashMap.put("size",100); - hashMap.put("systemCode",systemCode); - HttpRequest get = createPost(orgUrl,orgServiceId,orgAppsecret); + hashMap.put("page", 1); + hashMap.put("size", 100); + hashMap.put("systemCode", systemCode); + HttpRequest get = createPost(orgUrl, orgServiceId, orgAppsecret); String body; try (HttpResponse response = get.body(JSONObject.toJSONString(hashMap)) .execute()) { @@ -235,18 +238,18 @@ public class WaterRequestUtil { } - public WaterResult getUserResource(String authorization){ - log.info("--------请求获取门户角色信息,请求地址为:"+resourceUrl); + public WaterResult getUserResource(String authorization) { + log.info("--------请求获取门户角色信息,请求地址为:" + resourceUrl); HashMap hashMap = new HashMap<>(); - hashMap.put("systemCode",systemCode); - HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret); + hashMap.put("systemCode", systemCode); + HttpRequest get = createPost(resourceUrl + "?systemCode=" + systemCode, resourceServiceId, resourceAppsecret); // HttpRequest get = createPost(resourceUrl,resourceServiceId,resourceAppsecret); - get.header("Authorization",authorization); + get.header("Authorization", authorization); String body; - try (HttpResponse response = get - .execute()) { + try (HttpResponse response = get.execute()) { body = response.body(); } + log.info("--------请求获取门户用户资源信息,返回结果为:" + body); WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class); isSuccess(waterResult); //{\"total\":1,\"size\":100,\"records\":[{\"area\":\"440000\",\"systemList\":[{\"area\":\"440000\",\"code\":\"sgc-jg\",\"name\":\"水工程应用-水利工程建设管理模块\",\"id\":\"1732648267643097090\"}],\"code\":\"YW00013\",\"level\":\"1d\",\"dataConfig\":\"none\",\"type\":\"BUSINESS\",\"posts\":[],\"users\":[{\"id\":\"20231225000006\"},{\"id\":\"20240119000002\"}],\"name\":\"水利工程应用-水利工程建设管理模块角色\",\"id\":\"20231213000001\",\"category\":\"BUSINESS\",\"businesses\":[{\"parent\":\"1762458920822599682\",\"businessCode\":\"YWSLGCJSGL0008\",\"parentName\":\"水利工程建设管理\",\"businessName\":\"水利工程建设管理\",\"description\":\"\",\"id\":\"1705128209926942721\",\"delFlag\":0}],\"status\":\"1\"}],\"page\":1} @@ -254,13 +257,13 @@ public class WaterRequestUtil { } - public WaterResult getRolePage(){ - log.info("--------请求获取门户角色信息,请求地址为:"+roleUrl); + public WaterResult getRolePage() { + log.info("--------请求获取门户角色信息,请求地址为:" + roleUrl); HashMap hashMap = new HashMap<>(); - hashMap.put("page",1); - hashMap.put("size",100); - hashMap.put("systemCode",systemCode); - HttpRequest get = createPost(roleUrl,roleServiceId,roleAppsecret); + hashMap.put("page", 1); + hashMap.put("size", 100); + hashMap.put("systemCode", systemCode); + HttpRequest get = createPost(roleUrl, roleServiceId, roleAppsecret); String body; try (HttpResponse response = get.body(JSONObject.toJSONString(hashMap)) .execute()) { @@ -273,13 +276,13 @@ public class WaterRequestUtil { } - public WaterResult usersPage(){ - log.info("--------请求获取门户用户信息,请求地址为:"+usersUrl); + public WaterResult usersPage() { + log.info("--------请求获取门户用户信息,请求地址为:" + usersUrl); HashMap hashMap = new HashMap<>(); - hashMap.put("page",1); - hashMap.put("size",100); - hashMap.put("systemCode",systemCode); - HttpRequest get = createPost(usersUrl,usersServiceId,usersAppsecret); + hashMap.put("page", 1); + hashMap.put("size", 100); + hashMap.put("systemCode", systemCode); + HttpRequest get = createPost(usersUrl, usersServiceId, usersAppsecret); String body; try (HttpResponse response = get.body(JSONObject.toJSONString(hashMap)) .execute()) { @@ -291,13 +294,12 @@ public class WaterRequestUtil { } - - private void isSuccess(WaterResult waterResult){ - if(waterResult==null){ + private void isSuccess(WaterResult waterResult) { + if (waterResult == null) { throw new CustomException("请求异常"); } - if(waterResult.getCode()!=200||!waterResult.getSuccess()){ - throw new CustomException("请求失败,原因："+waterResult.getMessage()); + if (waterResult.getCode() != 200 || !waterResult.getSuccess()) { + throw new CustomException("请求失败,原因：" + waterResult.getMessage()); } } diff --git a/shuili-system/src/main/java/com/kms/system/service/SysMenuService.java b/shuili-system/src/main/java/com/kms/system/service/SysMenuService.java index 205a5b99..e63a0e26 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysMenuService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysMenuService.java @@ -101,6 +101,21 @@ public class SysMenuService extends BaseService { return getChildPerms(menus, "0"); } + public List selectMenuTreeByUserId(String userId, List menuList) { + List menus; + if ("1".equals(userId)) { + menus = menuMapper.selectMenuTreeAll(); + } else { + menus = menuMapper.selectMenuTreeByUserId(userId); + } + if (menus != null) { + menus.addAll(menuList); + return getChildPerms(menus, "0"); + } else { + return Collections.emptyList(); + } + } + /** * 根据角色ID查询菜单树信息 * From ec4798c0569010123ac542f95989a9393113e004 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Tue, 16 Apr 2024 17:57:13 +0800 Subject: [PATCH 02/11] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=9F=BA?= =?UTF-8?q?=E7=A1=80/=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-sy.yml | 12 + .../src/main/resources/application-test.yml | 12 + .../com/kms/yxgh/base/domain/DwsRelBasAd.java | 63 ++ .../com/kms/yxgh/base/domain/DwsRelLkAd.java | 64 ++ .../com/kms/yxgh/base/domain/DwsRelLkBas.java | 56 + .../com/kms/yxgh/base/domain/DwsRelRvBas.java | 64 ++ .../kms/yxgh/base/domain/DwsRelRvCounty.java | 63 ++ .../com/kms/yxgh/base/domain/DwsRelRvRv.java | 65 ++ .../yxgh/base/domain/df/DfDwsRelDikeRv.java | 63 ++ .../yxgh/base/domain/monitor/MsHdmAms.java | 101 ++ .../yxgh/base/domain/monitor/MsHdmAtpr.java | 101 ++ .../yxgh/base/domain/monitor/MsHdmCkopdg.java | 108 ++ .../yxgh/base/domain/monitor/MsHdmDayev.java | 93 ++ .../yxgh/base/domain/monitor/MsHdmDkrs.java | 159 +++ .../yxgh/base/domain/monitor/MsHdmEnv.java | 172 ++++ .../yxgh/base/domain/monitor/MsHdmGate.java | 157 +++ .../base/domain/monitor/MsHdmGstmonrec.java | 180 ++++ .../yxgh/base/domain/monitor/MsHdmInhrds.java | 108 ++ .../yxgh/base/domain/monitor/MsHdmInvrds.java | 147 +++ .../yxgh/base/domain/monitor/MsHdmObp.java | 128 +++ .../base/domain/monitor/MsHdmOssmonrec.java | 123 +++ .../kms/yxgh/base/domain/monitor/MsHdmPr.java | 108 ++ .../yxgh/base/domain/monitor/MsHdmPstat.java | 100 ++ .../yxgh/base/domain/monitor/MsHdmPzwl.java | 102 ++ .../yxgh/base/domain/monitor/MsHdmRiver.java | 149 +++ .../yxgh/base/domain/monitor/MsHdmRsvr.java | 150 +++ .../yxgh/base/domain/monitor/MsHdmSalt.java | 107 ++ .../yxgh/base/domain/monitor/MsHdmSlcrs.java | 146 +++ .../yxgh/base/domain/monitor/MsHdmSppr.java | 115 +++ .../yxgh/base/domain/monitor/MsHdmSpqn.java | 115 +++ .../yxgh/base/domain/monitor/MsHdmSrhrds.java | 109 ++ .../kms/yxgh/base/domain/monitor/MsHdmSt.java | 108 ++ .../yxgh/base/domain/monitor/MsHdmStorm.java | 108 ++ .../yxgh/base/domain/monitor/MsHdmSvrds.java | 103 ++ .../yxgh/base/domain/monitor/MsHdmTide.java | 122 +++ .../kms/yxgh/base/domain/monitor/MsHdmTm.java | 101 ++ .../yxgh/base/domain/monitor/MsHdmTmp.java | 102 ++ .../yxgh/base/domain/monitor/MsHdmUpdwwl.java | 101 ++ .../yxgh/base/domain/monitor/MsHdmWas.java | 136 +++ .../yxgh/base/domain/monitor/MsHdmWdwv.java | 115 +++ .../yxgh/base/domain/monitor/MsHdmWqamd.java | 248 +++++ .../base/domain/sk/SkDwsRelResDscdnm.java | 64 ++ .../yxgh/base/domain/sk/SkDwsRelResRv.java | 64 ++ .../yxgh/base/domain/sz/SzDwsRelWagaDike.java | 65 ++ .../yxgh/base/domain/sz/SzDwsRelWagaLk.java | 65 ++ .../yxgh/base/domain/sz/SzDwsRelWagaRes.java | 64 ++ .../yxgh/base/domain/sz/SzDwsRelWagaRv.java | 56 + .../yxgh/base/enums/DataSyncBasicEnum.java | 44 + .../yxgh/base/enums/DataSyncMonitorEnum.java | 59 ++ .../com/kms/yxgh/base/job/DataSyncJob.java | 253 +++++ .../kms/yxgh/base/job/TableFieldFactory.java | 74 ++ .../kms/yxgh/base/mapper/BaseDdlMapper.java | 20 + .../com/kms/yxgh/util/RestTemplateUtils.java | 92 ++ .../resources/mapper/yxgh/BaseDdlMapper.xml | 18 + sql/sy/v1.2.0/全量脚本/dataSync.sql | 960 ++++++++++++++++++ 55 files changed, 6382 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelBasAd.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkAd.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkBas.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvBas.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvCounty.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvRv.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/df/DfDwsRelDikeRv.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAms.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAtpr.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDayev.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDkrs.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmOssmonrec.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPzwl.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSalt.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSlcrs.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmStorm.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTide.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTm.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmUpdwwl.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWdwv.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResDscdnm.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResRv.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaDike.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaLk.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRv.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncMonitorEnum.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/job/TableFieldFactory.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/base/mapper/BaseDdlMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtils.java create mode 100644 shuili-system/src/main/resources/mapper/yxgh/BaseDdlMapper.xml create mode 100644 sql/sy/v1.2.0/全量脚本/dataSync.sql diff --git a/shuili-admin/src/main/resources/application-sy.yml b/shuili-admin/src/main/resources/application-sy.yml index e075bcbf..18b56e9f 100644 --- a/shuili-admin/src/main/resources/application-sy.yml +++ b/shuili-admin/src/main/resources/application-sy.yml @@ -194,3 +194,15 @@ algorithm: # 自动打抽取摘要 summary: http://192.168.0.210:12343 ocr: http://192.168.0.62:12340/ExtractServer?WSDL +#数据同步 +dataSync: + #数据同步地址 + enabled: false + #服务地址 + url: http://19.25.35.205:31190/ZHSL_ZY + #认证ID + x-h3c-id: 3359137640337 + #认证秘钥 + x-h3c-appKey: q7sli9ch + #同步天数 +# days: 7 \ No newline at end of file diff --git a/shuili-admin/src/main/resources/application-test.yml b/shuili-admin/src/main/resources/application-test.yml index bc383895..7b502c49 100644 --- a/shuili-admin/src/main/resources/application-test.yml +++ b/shuili-admin/src/main/resources/application-test.yml @@ -294,3 +294,15 @@ water: resourceServiceId: DGSP_1606193569955950593 resourceAppsecret: e9fbf96d53b34abca030b8f64de70ce9 +#数据同步 +dataSync: + #数据同步地址 + enabled: false + #服务地址 + url: http://19.25.35.205:31190/ZHSL_ZY + #认证ID + x-h3c-id: 3359137640337 + #认证秘钥 + x-h3c-appKey: q7sli9ch + #同步天数 +# days: 7 \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelBasAd.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelBasAd.java new file mode 100644 index 00000000..392f74b1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelBasAd.java @@ -0,0 +1,63 @@ +package com.kms.yxgh.base.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_bas_ad") +@Data +@ApiModel("流域与行政区划对象关系表") +public class DwsRelBasAd extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 流域代码 + */ + @ApiModelProperty("流域代码") + @TableField("BAS_CODE") + private String basCode; + + /** + * 流域名称 + */ + @ApiModelProperty("流域名称") + @TableField("BAS_NAME") + private String baseName; + + /** + * 行政区划编码 + */ + @ApiModelProperty("行政区划编码") + @TableField("ADCD") + private String adcd; + + /** + * 行政区划名称 + */ + @ApiModelProperty("行政区划名称") + @TableField("ADNM") + private String adnm; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkAd.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkAd.java new file mode 100644 index 00000000..3c9a7f7d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkAd.java @@ -0,0 +1,64 @@ +package com.kms.yxgh.base.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_lk_ad") +@Data +@ApiModel("湖泊所属行政区划对象关系表") +public class DwsRelLkAd extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 湖泊编码 + */ + @ApiModelProperty("湖泊编码") + @TableField("LK_CODE") + private String lkCode; + + /** + * 湖泊名称 + */ + @ApiModelProperty("湖泊名称") + @TableField("LK_NAME") + private String lkName; + + /** + * 行政区划编码 + */ + @ApiModelProperty("行政区划编码") + @TableField("ADCD") + private String adcd; + + /** + * 行政区划名称 + */ + @ApiModelProperty("行政区划名称") + @TableField("ADNM") + private String adnm; + + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkBas.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkBas.java new file mode 100644 index 00000000..df294d5a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelLkBas.java @@ -0,0 +1,56 @@ +package com.kms.yxgh.base.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_lk_bas") +@Data +@ApiModel("湖泊所在流域对象关系表") +public class DwsRelLkBas extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 湖泊编码 + */ + @ApiModelProperty("湖泊编码") + @TableField("LK_CODE") + private String lkCode; + + /** + * 湖泊名称 + */ + @ApiModelProperty("湖泊名称") + @TableField("LK_NAME") + private String lkName; + + /** + * 盆地 + */ + @ApiModelProperty("盆地") + @TableField("BASIN") + private String basin; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvBas.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvBas.java new file mode 100644 index 00000000..5aa0a612 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvBas.java @@ -0,0 +1,64 @@ + +package com.kms.yxgh.base.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_rv_bas") +@Data +@ApiModel("河流所属流域表对象关系表") +public class DwsRelRvBas extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 河流（湖、库、渠、海堤）编码 + */ + @ApiModelProperty("河流编码") + @TableField("RV_CODE") + private String rvCode; + + /** + * 河流名称 + */ + @ApiModelProperty("河流名称") + @TableField("RV_NAME") + private String rvName; + + /** + * 流域代码 + */ + @ApiModelProperty("流域代码") + @TableField("BAS_CODE") + private String basCode; + + /** + * 流域名称 + */ + @ApiModelProperty("流域名称") + @TableField("BAS_NAME") + private String basName; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvCounty.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvCounty.java new file mode 100644 index 00000000..c62fd7e4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvCounty.java @@ -0,0 +1,63 @@ +package com.kms.yxgh.base.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_rv_county") +@Data +@ApiModel("河流流经行政区划对象关系表") +public class DwsRelRvCounty extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 河流（湖、库、渠、海堤）编码 + */ + @ApiModelProperty("河流编码") + @TableField("RV_CODE") + private String rvCode; + + /** + * 河流名称 + */ + @ApiModelProperty("河流名称") + @TableField("RV_NAME") + private String rvName; + + /** + * 行政区划编码 + */ + @ApiModelProperty("行政区划编码") + @TableField("ADCD") + private String adcd; + + /** + * 行政区划名称 + */ + @ApiModelProperty("行政区划名称") + @TableField("ADNM") + private String adnm; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvRv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvRv.java new file mode 100644 index 00000000..2de5adf6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/DwsRelRvRv.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.base.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("dws_rel_rv_rv") +@Data +@ApiModel("河流上下级对象关系表") +public class DwsRelRvRv extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 河流（湖、库、渠、海堤）编码 + */ + @ApiModelProperty("河流编码") + @TableField("RV_CODE") + private String rvCode; + + /** + * 河流名称 + */ + @ApiModelProperty("河流名称") + @TableField("RV_NAME") + private String rvName; + + /** + * 上下级代码 + */ + @ApiModelProperty("上下级代码") + @TableField("PARENT_CODE") + private String parentCode; + + /** + * 上下级名称 + */ + @ApiModelProperty("上下级名称") + @TableField("PARENT_NAME") + private String parentName; + + private BigDecimal price; + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/df/DfDwsRelDikeRv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/df/DfDwsRelDikeRv.java new file mode 100644 index 00000000..0f200131 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/df/DfDwsRelDikeRv.java @@ -0,0 +1,63 @@ +package com.kms.yxgh.base.domain.df; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_dike_rv") +@Data +@ApiModel("堤防所属河流对象关系表") +public class DfDwsRelDikeRv extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + @TableField("DIKE_CODE") + private String dikeCode; + + /** + * 堤防名称 + */ + @ApiModelProperty("堤防名称") + @TableField("DIKE_NAME") + private String dikeName; + + /** + * 河流（湖、库、渠、海堤）编码 + */ + @ApiModelProperty("河流编码") + @TableField("RV_CODE") + private String rvCode; + + /** + * 河流名称 + */ + @ApiModelProperty("河流名称") + @TableField("RV_NAME") + private String rvName; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAms.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAms.java new file mode 100644 index 00000000..390537b0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAms.java @@ -0,0 +1,101 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_ams") +@Data +@ApiModel("气温监测表") +public class MsHdmAms extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 气'温度（气温℃） + */ + @ApiModelProperty("'温度（气温℃）") + @TableField("ATMP") + private BigDecimal atmp; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAtpr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAtpr.java new file mode 100644 index 00000000..0d20c712 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmAtpr.java @@ -0,0 +1,101 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_atpr") +@Data +@ApiModel("气压监测表") +public class MsHdmAtpr extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 气压（kPa） + */ + @ApiModelProperty("气压（kPa）") + @TableField("ATPR") + private BigDecimal atpr; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java new file mode 100644 index 00000000..122fdf6f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmCkopdg.java @@ -0,0 +1,108 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_ckopdg") +@Data +@ApiModel("裂缝开合度位移监测表") +public class MsHdmCkopdg extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TMP") + private BigDecimal tmp; + /** + * 裂缝开合度（位移）（mm） + */ + @ApiModelProperty("裂缝开合度（位移）（mm）") + @TableField("CKOPDG") + private BigDecimal ckopdg; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDayev.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDayev.java new file mode 100644 index 00000000..1f849ad3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDayev.java @@ -0,0 +1,93 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_dayev") +@Data +@ApiModel("日蒸发量表") +public class MsHdmDayev extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 蒸发器类型 + */ + @ApiModelProperty("蒸发器类型") + @TableField("EPTP") + private BigDecimal eptp; + + /** + * 日蒸发量（mm） + */ + @ApiModelProperty("日蒸发量（mm）") + @TableField("DYE") + private BigDecimal dye; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDkrs.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDkrs.java new file mode 100644 index 00000000..871a0043 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmDkrs.java @@ -0,0 +1,159 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hpm_dkrs") +@Data +@ApiModel("堤防段运行状况监测表") +public class MsHdmDkrs extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 采集点经度坐标（°） + */ + @ApiModelProperty("采集点经度坐标（°）") + @TableField("LGTD") + private BigDecimal lgtd; + /** + * 采集点纬度坐标（°） + */ + @ApiModelProperty("采集点纬度坐标（°）") + @TableField("LTTD") + private BigDecimal lttd; + + /** + * 水文控制站代码 + */ + @ApiModelProperty("水文控制站代码") + @TableField("HDRSTCD") + private String hdrstcd; + + /** + * 采集点地名 + */ + @ApiModelProperty("采集点地名") + @TableField("CLPSADDR") + private String clpsaddr; + /** + * 采集点桩号 + */ + @ApiModelProperty("采集点桩号") + @TableField("CLPSDRN") + private String clpsdrn; + + /** + * 水位（m） + */ + @ApiModelProperty("水位（m）") + @TableField("Z") + private BigDecimal z; + /** + * 流量（m³/s） + */ + @ApiModelProperty("流量（m³/s）") + @TableField("Q") + private BigDecimal q; + /** + * 水面距堤顶高差（m） + */ + @ApiModelProperty("水面距堤顶高差（m）") + @TableField("WSDCH") + private BigDecimal wsdch; + /** + * 填报人 + */ + @ApiModelProperty("填报人") + @TableField("REPORTER") + private String reporter; + + /** + * 填报人联系方式 + */ + @ApiModelProperty("填报人联系方式") + @TableField("RPTTLNMB") + private String rpttlnmb; + + /** + * 备注 + */ + @ApiModelProperty("备注") + @TableField("NT") + private String nt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java new file mode 100644 index 00000000..ed8411ab --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmEnv.java @@ -0,0 +1,172 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_env") +@Data +@ApiModel("环境量监测表") +public class MsHdmEnv extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + @TableField("TM") + private Date tm; + + /** + * 地温（℃） + */ + @ApiModelProperty("地温（℃）") + @TableField("GTP") + private BigDecimal gtp; + /** + * 瞬时气温（℃） + */ + @ApiModelProperty("瞬时气温（℃）") + @TableField("AlTP") + private BigDecimal altp; + /** + * 瞬时气温（℃） + */ + @ApiModelProperty("瞬时水温（℃）") + @TableField("CTP") + private BigDecimal ctp; + /** + * 湿度（℃） + */ + @ApiModelProperty("湿度（℃）") + @TableField("MST") + private BigDecimal mst; + /** + * 日蒸发量（mm） + */ + @ApiModelProperty("日蒸发量（mm）") + @TableField("ED") + private BigDecimal ed; + /** + * 当前蒸发（℃） + */ + @ApiModelProperty("当前蒸发（℃））") + @TableField("EJ") + private BigDecimal ej; + /** + * 气压（kPa） + */ + @ApiModelProperty("气压（kPa）") + @TableField("ATMP") + private BigDecimal atmp; + /** + * 风向 + */ + @ApiModelProperty("风向") + @TableField("UC") + private BigDecimal uc; + /** + * 风力（级） + */ + @ApiModelProperty("风力（级）") + @TableField("UE") + private BigDecimal ue; + /** + * 风速（m/s） + */ + @ApiModelProperty("风速（m/s）") + @TableField("US") + private BigDecimal us; + /** + * pH值 + */ + @ApiModelProperty("pH值") + @TableField("PH") + private BigDecimal ph; + /** + * 电导率（mS/cm） + */ + @ApiModelProperty("电导率（mS/cm）") + @TableField("COND") + private BigDecimal cond; + /** + * 浊度（°） + */ + @ApiModelProperty("浊度（°）") + @TableField("TURB") + private BigDecimal turb; + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java new file mode 100644 index 00000000..d5ec492e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGate.java @@ -0,0 +1,157 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hpm_gate") +@Data +@ApiModel("水利工程闸门开度监测表") +public class MsHdmGate extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 闸孔编号 + */ + @ApiModelProperty("闸孔编号") + @TableField("MPCD") + private String mpcd; + + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 扩展关键字 + */ + @ApiModelProperty("扩展关键字") + @TableField("EXKEY") + private String exkey; + + /** + * 设备类别 + */ + @ApiModelProperty("设备类别") + @TableField("EQPTP") + private String eqptp; + + /** + * 设备编号 + */ + @ApiModelProperty("设备编号") + @TableField("EQPNO") + private String eqpno; + + + /** + * 开启状态 + */ + @ApiModelProperty("开启状态") + @TableField("GTOPNUM") + private String gtopNum; + + + /** + * 开启高度 + */ + @ApiModelProperty("开启高度") + @TableField("GTOPHGT") + private String gtopHgt; + + + /** + * 旋转角度 + */ + @ApiModelProperty("旋转角度") + @TableField("GTOPROT") + private String gtopRot; + + + /** + * 过闸流量 + */ + @ApiModelProperty("过闸流量") + @TableField("GTQ") + private String gtq; + + + /** + * 测流方法 + */ + @ApiModelProperty("设备编号") + @TableField("MSMT") + private String msmt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java new file mode 100644 index 00000000..0af09e65 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmGstmonrec.java @@ -0,0 +1,180 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_gstmonrec") +@Data +@ApiModel("GNSS状态量监测表") +public class MsHdmGstmonrec extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + @TableField("TM") + private Date tm; + + /** + * GNSS定位状态 + */ + @ApiModelProperty("GNSS定位状态") + @TableField("STATUS") + private Long status; + + /** + * 卫星数 + */ + @ApiModelProperty("卫星数") + @TableField("SATELLITE_NUM") + private Long satelliteNum; + /** + * 经度（°） + */ + @ApiModelProperty("经度（°）") + @TableField("LGTD") + private BigDecimal lgtd; + /** + * 纬度（°） + */ + @ApiModelProperty("纬度（°）") + @TableField("LTTD") + private BigDecimal lttd; + /** + * 设备电压（mV） + */ + @ApiModelProperty("设备电压（mV）") + @TableField("VOLTAGE") + private BigDecimal voltage; + /** + * 数据是否有效 + */ + @ApiModelProperty("数据是否有效") + @TableField("VALID") + private Long valid; + /** + * 北向偏移量（mm） + */ + @ApiModelProperty("北向偏移量（mm）") + @TableField("DEVIATION_Y") + private Long deviationY; + /** + * 东向偏移量（mm） + */ + @ApiModelProperty("东向偏移量（mm）") + @TableField("DEVIATION_X") + private BigDecimal deviationX; + /** + * 天向（高）偏移量（mm） + */ + @ApiModelProperty("天向（高）偏移量（mm）") + @TableField("DEVIATION_Z") + private BigDecimal deviationZ; + /** + * 北向距离（m） + */ + @ApiModelProperty("北向距离（m）") + @TableField("DISTANCE_Y") + private BigDecimal distanceY; + /** + * 东向距离（m） + */ + @ApiModelProperty("东向距离（m）") + @TableField("DISTANCE_X") + private BigDecimal distanceX; + /** + * 天向距离（m） + */ + @ApiModelProperty("天向距离（m）") + @TableField("DISTANCE_Z") + private BigDecimal distanceZ; + /** + * 解算结果时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("解算结果时间") + @TableField("SOLVE_TM") + private Date solveTm; + /** + * 高程（m） + */ + @ApiModelProperty("高程（m）") + @TableField("ALT") + private BigDecimal alt; + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java new file mode 100644 index 00000000..a5e90d6d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInhrds.java @@ -0,0 +1,108 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_inhrds") +@Data +@ApiModel("内部水平位移监测表") +public class MsHdmInhrds extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * X向水平位移（mm） + */ + @ApiModelProperty("X向水平位移（mm）") + @TableField("XHRDS") + private BigDecimal xhrds; + /** + * Y向水平位移（mm） + */ + @ApiModelProperty("Y向水平位移（mm）") + @TableField("YHRDS") + private BigDecimal yhrds; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java new file mode 100644 index 00000000..02c9d41b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmInvrds.java @@ -0,0 +1,147 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_invrds") +@Data +@ApiModel("内部垂直位移监测表") +public class MsHdmInvrds extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + @TableField("TM") + private Date tm; + + /** + * 闸上水位 + */ + @ApiModelProperty("闸上水位") + @TableField("SLUPSZ") + private BigDecimal slupsz; + /** + * 闸上水位 + */ + @ApiModelProperty("闸下水位") + @TableField("SLDSZ") + private BigDecimal sldsz; + + /** + * 过闸流量（m³/s） + */ + @ApiModelProperty("过闸流量（m³/s）") + @TableField("THRSLQ") + private BigDecimal thrslq; + /** + * 开启孔数（m³/s + */ + @ApiModelProperty("开启孔数（m³/s") + @TableField("GTOPN") + private BigDecimal gtopn; + /** + * 闸上水势 + */ + @ApiModelProperty("闸上水势") + @TableField("UPSWTP") + private BigDecimal upswtp; + /** + * 闸下水势 + */ + @ApiModelProperty("闸下水势") + @TableField("DSWTP") + private BigDecimal dswtp; + + /** + * 填报人 + */ + @ApiModelProperty("填报人") + @TableField("REPORTER") + private String reporter; + + /** + * 填报人联系方式 + */ + @ApiModelProperty("填报人联系方式") + @TableField("RPTTLNMB") + private String rpttlnmb; + + /** + * 备注 + */ + @ApiModelProperty("备注") + @TableField("NT") + private String nt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java new file mode 100644 index 00000000..bab81ed1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmObp.java @@ -0,0 +1,128 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * todo + */ +@TableName("ms_hdm_obp") +@Data +@ApiModel("降水量监测表") +public class MsHdmObp extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + /** + * 时段长 + */ + @ApiModelProperty("时段长") + @TableField("INTV") + private Long intv; + /** + * 时段降水量 + */ + @ApiModelProperty("时段降水量") + @TableField("DRP") + private BigDecimal drp; + /** + * 降水历时 + */ + @ApiModelProperty("降水历时") + @TableField("PDR") + private Long pdr; + /** + * 日降水量 + */ + @ApiModelProperty("日降水量") + @TableField("DYP") + private BigDecimal dyp; + + /** + * 降水量类型 + */ + @ApiModelProperty("降水量类型") + @TableField("PTP") + private String ptp; + + /** + * 天气状况 + */ + @ApiModelProperty("天气状况") + @TableField("WTH") + private String wth; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmOssmonrec.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmOssmonrec.java new file mode 100644 index 00000000..a56e7117 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmOssmonrec.java @@ -0,0 +1,123 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_ossmonrec") +@Data +@ApiModel("渗压计监测表") +public class MsHdmOssmonrec extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + @TableField("TM") + private Date tm; + + /** + * 扬压力（MPa） + */ + @ApiModelProperty("扬压力（MPa）") + @TableField("UPLIFTED_PRESSURE") + private BigDecimal upliftedPressure; + /** + * 渗透压力（坝体、坝基、绕坝）（MPa） + */ + @ApiModelProperty("渗透压力（坝体、坝基、绕坝）（MPa）") + @TableField("OSMOTIC_PRESSURE") + private BigDecimal osmoticPressure; + /** + * 绕坝渗流（m） + */ + @ApiModelProperty("绕坝渗流（m）") + @TableField("BYPASS_SEEPAGE") + private BigDecimal bypassSeepage; + /** + * 频模 + */ + @ApiModelProperty("频模") + @TableField("FM") + private BigDecimal fm; + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TEMP") + private BigDecimal temp; + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java new file mode 100644 index 00000000..54f0b914 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPr.java @@ -0,0 +1,108 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_pr") +@Data +@ApiModel("应力监测表") +public class MsHdmPr extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TMP") + private BigDecimal tmp; + + /** + * 应力（MPa） + */ + @ApiModelProperty("应力（MPa）") + @TableField("STS") + private BigDecimal sts; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java new file mode 100644 index 00000000..133ea2cf --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPstat.java @@ -0,0 +1,100 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_pstat") +@Data +@ApiModel("降水量统计表") +public class MsHdmPstat extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 标志时间 + */ + @ApiModelProperty("标志时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("IDTM") + private Date idtm; + + /** + * 统计时段标志 + */ + @ApiModelProperty("统计时段标志") + @TableField("STTDRCD") + private String sttdrcd; + + /** + * 累计降水量（mm） + */ + @ApiModelProperty("累计降水量（mm）") + @TableField("ACCP") + private BigDecimal accp; + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPzwl.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPzwl.java new file mode 100644 index 00000000..f37e2b96 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmPzwl.java @@ -0,0 +1,102 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_pzwl") +@Data +@ApiModel("测压管水位监测表") +public class MsHdmPzwl extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 测压管水位（m） + */ + @ApiModelProperty("测压管水位（m）") + @TableField("PZTBWL") + private BigDecimal pztbwl; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java new file mode 100644 index 00000000..3d398085 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRiver.java @@ -0,0 +1,149 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_river") +@Data +@ApiModel("河道水情监测表") +public class MsHdmRiver extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 水位 + */ + @ApiModelProperty("水位") + @TableField("Z") + private BigDecimal z; + + /** + * 流量 + */ + @ApiModelProperty("流量") + @TableField("Q") + private BigDecimal q; + + /** + * 断面过水面积 + */ + @ApiModelProperty("断面过水面积") + @TableField("XSA") + private BigDecimal xsa; + + /** + * 断面平均流速 + */ + @ApiModelProperty("断面平均流速") + @TableField("XSAVV") + private BigDecimal xsavv; + + /** + * 断面最大流速 + */ + @ApiModelProperty("断面最大流速") + @TableField("XSMXV") + private BigDecimal xsmxv; + + /** + * 河水特征码 + */ + @ApiModelProperty("河水特征码") + @TableField("FLWCHRCD") + private String flwchrcd; + + /** + * 水势 + */ + @ApiModelProperty("水势") + @TableField("WPTN") + private String wptn; + + /** + * 测流方法 + */ + @ApiModelProperty("测流方法") + @TableField("MSQMT") + private String msqmt; + + /** + * 测积方法 + */ + @ApiModelProperty("测积方法") + @TableField("MSAMT") + private String msamt; + + /** + * 测速方法 + */ + @ApiModelProperty("测速方法") + @TableField("MSVMT") + private String msvmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java new file mode 100644 index 00000000..c60e1d4f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmRsvr.java @@ -0,0 +1,150 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_rsvr") +@Data +@ApiModel("水库水情监测表") +public class MsHdmRsvr extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 库上水位（m） + */ + @ApiModelProperty("库上水位（m）") + @TableField("RZ") + private BigDecimal rz; + + /** + * 入库流量（m³/s） + */ + @ApiModelProperty("入库流量（m³/s）") + @TableField("INQ") + private BigDecimal inq; + + /** + * 蓄水量 + */ + @ApiModelProperty("蓄水量") + @TableField("W") + private BigDecimal w; + + /** + * 库下水位（m） + */ + @ApiModelProperty("库下水位（m）") + @TableField("BLRZ") + private BigDecimal blrz; + + /** + * 出库流量（m³/s） + */ + @ApiModelProperty("出库流量（m³/s）") + @TableField("OTQ") + private BigDecimal otq; + + /** + * 库水特征码 + */ + @ApiModelProperty("库水特征码") + @TableField("RWCHRCD") + private String rwchrcd; + + /** + * 库水水势 + */ + @ApiModelProperty("库水水势") + @TableField("RWPTN") + private String rwptn; + + /** + * 入流时段长 + */ + @ApiModelProperty("入流时段长") + @TableField("INQDR") + private Long inqdr; + + /** + * 测流方法 + */ + @ApiModelProperty("测流方法") + @TableField("MSQMT") + private String msqmt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSalt.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSalt.java new file mode 100644 index 00000000..98742822 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSalt.java @@ -0,0 +1,107 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_salt") +@Data +@ApiModel("咸潮监测表") +public class MsHdmSalt extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站代码 + */ + @ApiModelProperty("测站代码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("时间") + @TableField("TM") + private Date tm; + + /** + * 电导率 + */ + @ApiModelProperty("'电导率") + @TableField("CNDCT") + private BigDecimal cndct; + /** + * 含氯度 + */ + @ApiModelProperty("'含氯度") + @TableField("CHLRN") + private BigDecimal chlrn; + + /** + * 盐度 + */ + @ApiModelProperty("'盐度") + @TableField("SALT") + private BigDecimal salt; + + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSlcrs.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSlcrs.java new file mode 100644 index 00000000..600286f5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSlcrs.java @@ -0,0 +1,146 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hpm_slcrs") +@Data +@ApiModel("水闸运行状况监测表") +public class MsHdmSlcrs extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 闸上水位 + */ + @ApiModelProperty("闸上水位") + @TableField("SLUPSZ") + private BigDecimal slupsz; + /** + * 闸上水位 + */ + @ApiModelProperty("闸下水位") + @TableField("SLDSZ") + private BigDecimal sldsz; + + /** + * 过闸流量（m³/s） + */ + @ApiModelProperty("过闸流量（m³/s）") + @TableField("THRSLQ") + private BigDecimal thrslq; + /** + * 开启孔数（m³/s + */ + @ApiModelProperty("开启孔数（m³/s") + @TableField("GTOPN") + private BigDecimal gtopn; + /** + * 闸上水势 + */ + @ApiModelProperty("闸上水势") + @TableField("UPSWTP") + private BigDecimal upswtp; + /** + * 闸下水势 + */ + @ApiModelProperty("闸下水势") + @TableField("DSWTP") + private BigDecimal dswtp; + + /** + * 填报人 + */ + @ApiModelProperty("填报人") + @TableField("REPORTER") + private String reporter; + + /** + * 填报人联系方式 + */ + @ApiModelProperty("填报人联系方式") + @TableField("RPTTLNMB") + private String rpttlnmb; + + /** + * 备注 + */ + @ApiModelProperty("备注") + @TableField("NT") + private String nt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java new file mode 100644 index 00000000..a727a4bb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSppr.java @@ -0,0 +1,115 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_sppr") +@Data +@ApiModel("渗流压力水位监测表") +public class MsHdmSppr extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TMP") + private BigDecimal tmp; + /** + * 渗流压力水位（m） + */ + @ApiModelProperty("渗流压力水位（m）") + @TableField("SPPRWL") + private BigDecimal spprwl; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 机构代码 + */ + @ApiModelProperty("机构代码") + @TableField("GDWR_OGID") + private String gdwrOgid; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java new file mode 100644 index 00000000..313f1a5f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSpqn.java @@ -0,0 +1,115 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_spqn") +@Data +@ApiModel("渗流量监测表") +public class MsHdmSpqn extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TMP") + private BigDecimal tmp; + + /** + * 渗流量（L/s） + */ + @ApiModelProperty("渗流量（L/s）") + @TableField("SPQN") + private BigDecimal spqn; + + /** + * 标准水温渗流量（L/s） + */ + @ApiModelProperty("标准水温渗流量（L/s）") + @TableField("STSPQN") + private BigDecimal stspqn; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java new file mode 100644 index 00000000..15f23764 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSrhrds.java @@ -0,0 +1,109 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_srhrds") +@Data +@ApiModel("表面水平位移监测表") +public class MsHdmSrhrds extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + + /** + * 测量时间 + */ + @ApiModelProperty("测量时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("MSTM") + private Date mstm; + + /** + * X向水平位移（mm） + */ + @ApiModelProperty("X向水平位移（mm）") + @TableField("XHRDS") + private BigDecimal xhrds; + + /** + * Y向水平位移（mm） + */ + @ApiModelProperty("Y向水平位移（mm）") + @TableField("YHRDS") + private BigDecimal yhrds; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java new file mode 100644 index 00000000..de763b12 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSt.java @@ -0,0 +1,108 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_st") +@Data +@ApiModel("应变监测表") +public class MsHdmSt extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TMP") + private BigDecimal tmp; + + /** + * 应变10-6 + */ + @ApiModelProperty("应变10-6") + @TableField("STN") + private BigDecimal stn; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmStorm.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmStorm.java new file mode 100644 index 00000000..00e144ad --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmStorm.java @@ -0,0 +1,108 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_storm") +@Data +@ApiModel("暴雨加报监测表") +public class MsHdmStorm extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 暴雨历时 + */ + @ApiModelProperty("暴雨历时") + @TableField("STRMDR") + private BigDecimal strmdr; + + /** + * 暴雨量（mm） + */ + @ApiModelProperty("暴雨量（mm）") + @TableField("STRMP") + private BigDecimal strmp; + + /** + * 天气状况 + */ + @ApiModelProperty("天气状况") + @TableField("WTH") + private String wth; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java new file mode 100644 index 00000000..dca98885 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmSvrds.java @@ -0,0 +1,103 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_srvrds") +@Data +@ApiModel("表面垂直位移监测表") +public class MsHdmSvrds extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + + /** + * 测量时间 + */ + @ApiModelProperty("测量时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("MSTM") + private Date mstm; + + /** + * 垂直位移（mm） + */ + @ApiModelProperty("垂直位移（mm）") + @TableField("VRDS") + private BigDecimal vrds; + + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTide.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTide.java new file mode 100644 index 00000000..1fa4ab0b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTide.java @@ -0,0 +1,122 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_tide") +@Data +@ApiModel("潮汐水情监测表") +public class MsHdmTide extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 潮位（m） + */ + @ApiModelProperty("潮位（m）") + @TableField("TDZ") + private BigDecimal tdz; + + /** + * 气压 + */ + @ApiModelProperty("气压") + @TableField("AIRP") + private BigDecimal airp; + + /** + * 潮水特征码 + */ + @ApiModelProperty("潮水特征码") + @TableField("TDCHRCD") + private String tdchrcd; + + /** + * 潮势 + */ + @ApiModelProperty("潮势") + @TableField("TDPTN") + private String tdptn; + + /** + * 高低潮标志 + */ + @ApiModelProperty("高低潮标志") + @TableField("HLTDMK") + private String hltdmk; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTm.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTm.java new file mode 100644 index 00000000..187ba079 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTm.java @@ -0,0 +1,101 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_tm") +@Data +@ApiModel("温度监测表") +public class MsHdmTm extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 温度（℃） + */ + @ApiModelProperty("温度（℃）") + @TableField("TMP") + private BigDecimal tmp; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java new file mode 100644 index 00000000..5ed6d1d1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmp.java @@ -0,0 +1,102 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_tmp") +@Data +@ApiModel("气温水温监测表") +public class MsHdmTmp extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 气温（℃） + */ + @ApiModelProperty("气温（℃）") + @TableField("ATMP") + private BigDecimal atmp; + + /** + * 水温（℃） + */ + @ApiModelProperty("水温（℃）") + @TableField("WTMP") + private BigDecimal wtmp; + + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmUpdwwl.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmUpdwwl.java new file mode 100644 index 00000000..c6bbfade --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmUpdwwl.java @@ -0,0 +1,101 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_dsm_updwwl") +@Data +@ApiModel("水位监测表") +public class MsHdmUpdwwl extends SyBaseEntity { + + + private static final long serialVersionUID = 1L; + + /** + * 水利工程测站代码 + */ + @ApiModelProperty("水利工程测站代码") + @TableField("PRJ_STCD") + private String prjStcd; + + /** + * 测点编号 + */ + @ApiModelProperty("测点编号") + @TableField("MPCD") + private String mpcd; + + /** + * 测量时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("测量时间") + @TableField("MSTM") + private Date mstm; + + /** + * 水位（m） + */ + @ApiModelProperty("水位（m）") + @TableField("WL") + private BigDecimal wl; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java new file mode 100644 index 00000000..21288e76 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWas.java @@ -0,0 +1,136 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_was") +@Data +@ApiModel("堰闸水情监测表") +public class MsHdmWas extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 闸上水位（m） + */ + @ApiModelProperty("闸上水位（m）") + @TableField("UPZ") + private BigDecimal upz; + + /** + * 闸下水位（m） + */ + @ApiModelProperty("闸下水位（m）") + @TableField("DWZ") + private BigDecimal dwz; + + /** + * 总过闸流量（m³/s） + */ + @ApiModelProperty("总过闸流量（m³/s）") + @TableField("TGTQ") + private BigDecimal tgtq; + + /** + * 闸水特征码 + */ + @ApiModelProperty("闸水特征码") + @TableField("SWCHRCD") + private String swchrcd; + + /** + * 闸上水势 + */ + @ApiModelProperty("闸上水势") + @TableField("SUPWPTN") + private String supwptn; + + /** + * 闸下水势 + */ + @ApiModelProperty("闸下水势") + @TableField("SDWWPTN") + private String sdwwptn; + + /** + * 测流方法 + */ + @ApiModelProperty("测流方法") + @TableField("MSQMT") + private String msqmt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWdwv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWdwv.java new file mode 100644 index 00000000..6d4f5891 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWdwv.java @@ -0,0 +1,115 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_hdm_wdwv") +@Data +@ApiModel("风浪监测表") +public class MsHdmWdwv extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 时间 + */ + @ApiModelProperty("时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("TM") + private Date tm; + + /** + * 风速（m/s） + */ + @ApiModelProperty("风速（m/s）") + @TableField("WNDV") + private BigDecimal wndv; + + /** + * 风力 + */ + @ApiModelProperty("风力") + @TableField("WNDPWR") + private BigDecimal wndpwr; + + /** + * 风向 + */ + @ApiModelProperty("风向") + @TableField("WNDDIR") + private String wnddir; + + /** + * 浪高（cm） + */ + @ApiModelProperty("浪高（cm）") + @TableField("WVHGT") + private BigDecimal wvhgt; + + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java new file mode 100644 index 00000000..99af08f4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java @@ -0,0 +1,248 @@ +package com.kms.yxgh.base.domain.monitor; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@TableName("ms_wqm_wqamd") +@Data +@ApiModel("水质自动监测数据表") +public class MsHdmWqamd extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 测站编码 + */ + @ApiModelProperty("测站编码") + @TableField("STCD") + private String stcd; + + /** + * 采样时间 + */ + @ApiModelProperty("采样时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("SPT") + private Date spt; + + /** + * 水温（℃ + */ + @ApiModelProperty("水温（℃") + @TableField("WTMP") + private BigDecimal wtmp; + + /** + * pH值 + */ + @ApiModelProperty("pH值") + @TableField("PH") + private BigDecimal ph; + + /** + * 电导率（㎲/cm） + */ + @ApiModelProperty("电导率（㎲/cm）") + @TableField("COND") + private BigDecimal cond; + + /** + * 浑浊度（NTU） + */ + @ApiModelProperty("浑浊度（NTU）") + @TableField("TURB") + private BigDecimal turb; + + /** + * 溶解氧（mg/L） + */ + @ApiModelProperty("溶解氧（mg/L）") + @TableField("DOX") + private BigDecimal dox; + + /** + * 水温（℃ + */ + @ApiModelProperty("'高锰酸钾指数（mg/L)") + @TableField("CODMN") + private BigDecimal codmn; + + /** + * 化学需氧量（mg/L)） + */ + @ApiModelProperty("化学需氧量（mg/L)）") + @TableField("CODCR") + private BigDecimal codcr; + + /** + * 总氮（mg/L） + */ + @ApiModelProperty("总氮（mg/L）") + @TableField("TN") + private BigDecimal tn; + + /** + * 氨氮（mg/L） + */ + @ApiModelProperty("氨氮（mg/L）") + @TableField("NH3N") + private BigDecimal nh3n; + + /** + *亚硝酸盐氮（mg/L） + */ + @ApiModelProperty("亚硝酸盐氮（mg/L）") + @TableField("NO2") + private BigDecimal no2; + + /** + * 硝酸盐氮（mg/L） + */ + @ApiModelProperty("硝酸盐氮（mg/L）") + @TableField("NO3") + private BigDecimal no3; + /** + * 总磷（mg/L） + */ + @ApiModelProperty("总磷（mg/L）") + @TableField("TP") + private BigDecimal tp; + /** + * 总有机碳（mg/L） + */ + @ApiModelProperty("总有机碳（mg/L）") + @TableField("TOC") + private BigDecimal toc; + /** + * 挥发酚（mg/L） + */ + @ApiModelProperty("挥发酚（mg/L）") + @TableField("VLPH") + private BigDecimal vlph; + /** + * 叶绿素a（mg/L） + */ + @ApiModelProperty("叶绿素a（mg/L）") + @TableField("CHLA") + private BigDecimal chla; + /** + * 氟化物（mg/L） + */ + @ApiModelProperty("氟化物（mg/L）") + @TableField("F") + private BigDecimal f; + /** + * 砷（mg/L） + */ + @ApiModelProperty("砷（mg/L）") + @TableField("ARS") + private BigDecimal ars; + /** + * 汞（mg/L） + */ + @ApiModelProperty("汞（mg/L）") + @TableField("HG") + private BigDecimal hg; + /** + * 铬（六价）（mg/L） + */ + @ApiModelProperty("铬（六价）（mg/L") + @TableField("CR6") + private BigDecimal cr6; + /** + * 挥发酚（mg/L） + */ + @ApiModelProperty("铜（mg/L）") + @TableField("CU") + private BigDecimal cu; + /** + * 铅（mg/L） + */ + @ApiModelProperty("铅（mg/L）") + @TableField("PB") + private BigDecimal pb; + /** + * 镉（mg/L） + */ + @ApiModelProperty("镉（mg/L）") + @TableField("CD") + private BigDecimal cd; + /** + * 锌（mg/L） + */ + @ApiModelProperty("锌（mg/L）") + @TableField("ZN") + private BigDecimal zn; + /** + * 锑（mg/L） + */ + @ApiModelProperty("锑（mg/L）") + @TableField("SB") + private BigDecimal sb; + /** + * 备注 + */ + @ApiModelProperty("备注") + @TableField("NT") + private String nt; + /** + * 采集方式 + */ + @ApiModelProperty("采集方式") + @TableField("COLMT") + private String colmt; + + /** + * 级联时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("级联时间") + @TableField("CONN_TIME") + private Date connTime; + + /** + * 采集时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("采集时间") + @TableField("COLL_TIME") + private Date collTime; + + /** + * 数据来源 + */ + @ApiModelProperty("数据来源") + @TableField("GDWR_DASC") + private String gdwrDasc; + + + /** + * 置信度 + */ + @ApiModelProperty("置信度") + @TableField("RELIABILITY") + private String reliability; + + /** + * 指令ID + */ + @ApiModelProperty("指令ID") + @TableField("COMMAND_ID") + private String commandId; + + /** + * 入库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("入库时间") + @TableField("MS_CREATE_TIME") + private Date msCreateTime; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResDscdnm.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResDscdnm.java new file mode 100644 index 00000000..7846a354 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResDscdnm.java @@ -0,0 +1,64 @@ +package com.kms.yxgh.base.domain.sk; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_res_dscdnm") +@Data +@ApiModel("水库所属行政区划") +public class SkDwsRelResDscdnm extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水库编码 + */ + @ApiModelProperty("水库编码") + @TableField("RES_CODE") + private String resCode; + + /** + * 水库名称 + */ + @ApiModelProperty("水库名称") + @TableField("RES_NAME") + private String resName; + + /** + * 行政区划代码 + */ + @ApiModelProperty("行政区划代码") + @TableField("ADCD") + private String adcd; + + /** + * 行政区划名称 + */ + @ApiModelProperty("行政区划名称") + @TableField("ADNM") + private String adnm; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_CODE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResRv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResRv.java new file mode 100644 index 00000000..e3c62fb7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkDwsRelResRv.java @@ -0,0 +1,64 @@ +package com.kms.yxgh.base.domain.sk; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_res_rv") +@Data +@ApiModel("水库所属河流") +public class SkDwsRelResRv extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水库编码 + */ + @ApiModelProperty("水库编码") + @TableField("RES_CODE") + private String resCode; + + /** + * 水库名称 + */ + @ApiModelProperty("水库名称") + @TableField("RES_NAME") + private String resName; + + /** + * 河流代码 + */ + @ApiModelProperty("河流代码") + @TableField("RV_CODE") + private String rvCode; + + /** + * 河流名称 + */ + @ApiModelProperty("河流名称") + @TableField("RV_NAME") + private String rvName; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_CODE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaDike.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaDike.java new file mode 100644 index 00000000..07ebef9c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaDike.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.base.domain.sz; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_waga_dike") +@Data +@ApiModel("水闸所属堤防对象关系表") +public class SzDwsRelWagaDike extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("WAGA_CODE") + private String wagaCode; + + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("WAGA_NAME") + private String wagaName; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + @TableField("DIKE_CODE") + private String dikeCode; + + + /** + * 堤防名称 + */ + @ApiModelProperty("堤防名称") + @TableField("DIKE_NAME") + private String dikeName; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaLk.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaLk.java new file mode 100644 index 00000000..a03a77fa --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaLk.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.base.domain.sz; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_waga_lk") +@Data +@ApiModel("水闸所在湖泊对象关系表") +public class SzDwsRelWagaLk extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("WAGA_CODE") + private String wagaCode; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("WAGA_NAME") + private String wagaName; + + /** + * 湖泊编码 + */ + @ApiModelProperty("湖泊编码") + @TableField("LK_CODE") + private String lkCode; + + + /** + * 湖泊名称 + */ + @ApiModelProperty("湖泊名称") + @TableField("LK_NAME") + private String lkName; + + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java new file mode 100644 index 00000000..2a9d9c12 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRes.java @@ -0,0 +1,64 @@ +package com.kms.yxgh.base.domain.sz; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_waga_res") +@Data +@ApiModel("水闸所属水库关系表") +public class SzDwsRelWagaRes extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("WAGA_CODE") + private String wagaCode; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("WAGA_NAME") + private String wagaName; + + /** + * 水库编码 + */ + @ApiModelProperty("水库编码") + @TableField("RES_CODE") + private String resCode; + + + /** + * 水库代码 + */ + @ApiModelProperty("水库代码") + @TableField("RES_NAME") + private String resName; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRv.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRv.java new file mode 100644 index 00000000..baf04e7c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/sz/SzDwsRelWagaRv.java @@ -0,0 +1,56 @@ +package com.kms.yxgh.base.domain.sz; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@TableName("dws_rel_waga_rv") +@Data +@ApiModel("水闸所属河流对象关系表") +public class SzDwsRelWagaRv extends SyBaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("GATE_CODE") + private String gateCode; + + /** + * 水闸代码 + */ + @ApiModelProperty("水闸代码") + @TableField("GATE_NAME") + private String gateName; + + /** + * 河流（湖、库、渠、海堤）编码 + */ + @ApiModelProperty("河流编码") + @TableField("RV_CODE") + private String rvCode; + + /** + * 关系建立时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系建立时间") + @TableField("FROM_DATE") + private Date fromDate; + + /** + * 关系终止时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("关系终止时间") + @TableField("TO_DATE") + private Date toDate; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java new file mode 100644 index 00000000..c92ee832 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncBasicEnum.java @@ -0,0 +1,44 @@ +package com.kms.yxgh.base.enums; + +import com.kms.yxgh.base.domain.*; +import com.kms.yxgh.base.domain.sk.*; +import com.kms.yxgh.base.domain.sz.*; +import com.kms.yxgh.base.domain.df.*; +import lombok.Getter; + +/** + * 基础数据同步服务枚举：表名-接口地址-类-说明 + * + * @author hry + * @date 2024/3/4 18:57 + */ +@Getter +public enum DataSyncBasicEnum { + /** + * todo （待补充）湖泊流入河流、湖泊流出河流、水库所在流域、水闸涉及行政区划、水闸所在流域、堤防涉及行政区划、堤防所在流域、堤防所在湖泊 + */ + REL_BAS_Ad("dws_rel_bas_ad", "/dws_rel_bas_ad", DwsRelBasAd.class, "流域与行政区划对象关系表"), + REL_RV_RV("dws_rel_rv_rv", "/dws_rel_rv_rv", DwsRelRvRv.class, "河流上下级关系"), + REL_LK_BAS("dws_rel_lk_bas", "/dws_rel_lk_bas", DwsRelLkBas.class, "湖泊所在流域对象关系表"), + REL_RES_DSCDNM("dws_rel_res_dscdnm", "/dws_rel_res_dscdnm", SkDwsRelResDscdnm.class, "水库所属行政区划表"), + REL_RES_RV("dws_rel_res_rv", "/dws_rel_res_rv", SkDwsRelResRv.class, "水库所属河流关系表"), + REL_WAGA_RV("dws_rel_waga_rv", "/dws_rel_waga_rv", SzDwsRelWagaRv.class, "水闸所属河流对象关系表"), + REL_WAGA_LK("dws_rel_waga_lk", "/dws_rel_waga_lk", SzDwsRelWagaLk.class, "水闸所在湖泊对象关系表"), + REL_WAGA_RES("dws_rel_waga_res", "/dws_rel_waga_res", SzDwsRelWagaRes.class, "水闸所属水库关系表"), + REL_WAGA_DIKE("dws_rel_waga_dike", "/dws_rel_waga_dike", SzDwsRelWagaDike.class, "水闸所属堤防对象关系表"), + REL_DIKE_RV("dws_rel_dike_rv", "/dws_rel_dike_rv", DfDwsRelDikeRv.class, "堤防所属河流关系表"), + ; + + private final String name; + private final String url; + private final Class classT; + private final String remark; + + DataSyncBasicEnum(String name, String url, Class classT, String remark) { + this.name = name; + this.url = url; + this.classT = classT; + this.remark = remark; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncMonitorEnum.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncMonitorEnum.java new file mode 100644 index 00000000..7b29e4f5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DataSyncMonitorEnum.java @@ -0,0 +1,59 @@ +package com.kms.yxgh.base.enums; + +import com.kms.yxgh.base.domain.monitor.*; +import lombok.Getter; + +/** + * 监测数据同步服务枚举：表名-接口地址-类-说明 + */ +@Getter +public enum DataSyncMonitorEnum { + + MS_HDM_OBP("ms_hdm_obp", "/bzjck/ms_hdm_obp", MsHdmObp.class, "降水量监测表"), + MS_HDM_RIVER("ms_hdm_river", "/bzjck/ms_hdm_river", MsHdmRiver.class, "河道水情监测表"), + MS_HDM_RSVR("ms_hdm_rsvr", "/bzjck/ms_hdm_rsvr", MsHdmRiver.class, "水库水情监测表"), + MS_HDM_TIDE("ms_hdm_tide", "/bzjck/ms_hdm_tide", MsHdmTide.class, "潮汐水情监测表"), + MS_HDM_WDWV("ms_hdm_wdwv", "/bzjck/ms_hdm_wdwv", MsHdmWdwv.class, "风浪监测表"), + MS_HDM_SALT("ms_hdm_salt", "/bzjck/ms_hdm_salt", MsHdmSalt.class, "咸潮监测表"), + MS_HDM_TMP("ms_hdm_tmp", "/bzjck/ms_hdm_tmp", MsHdmTmp.class, "气温水温监测表"), + MS_HDM_STORM("ms_hdm_storm", "/bzjck/ms_hdm_storm", MsHdmStorm.class, "暴雨加报监测表"), + MS_HDM_WAS("ms_hdm_was", "/bzjck/ms_hdm_was", MsHdmWas.class, "堰闸水情监测表"), + MS_HDM_DAYEV("ms_hdm_dayev", "/bzjck/ms_hdm_dayev", MsHdmDayev.class, "日蒸发量表"), + MS_HDM_PSTAT("ms_hdm_pstat", "/bzjck/ms_hdm_pstat", MsHdmPstat.class, "降水量统计表"), + MS_WQM_WQAMD("ms_wqm_wqamd", "/bzjck/ms_wqm_wqamd", MsHdmWqamd.class, "水质自动监测数据表"), + MS_HPM_SLCRS("ms_hpm_slcrs", "/bzjck/ms_hpm_slcrs", MsHdmStorm.class, "水闸运行状况监测表"), + MS_HPM_DKRS("ms_hpm_dkrs", "/bzjck/ms_hpm_dkrs", MsHdmDkrs.class, "堤防段运行状况监测表"), + MS_HPM_GATE("ms_hpm_gate", "/bzjck/ms_hpm_gate", MsHdmGate.class, "水利工程闸门开度监测表"), + MS_DSM_SRVRDS("ms_dsm_srvrds", "/bzjck/ms_dsm_srvrds", MsHdmSvrds.class, "表面垂直位移监测表"), + MS_DSM_SRHRDS("ms_dsm_srhrds", "/bzjck/ms_dsm_srhrds", MsHdmSrhrds.class, "表面水平位移监测表"), + MS_DSM_INVRDS("ms_dsm_invrds", "/bzjck/ms_dsm_invrds", MsHdmInvrds.class, "内部垂直位移监测表"), + MS_DSM_INHRDS("ms_dsm_inhrds", "/bzjck/ms_dsm_inhrds", MsHdmInhrds.class, "内部水平位移监测表"), + MS_DSM_CKOPDG("ms_dsm_ckopdg", "/bzjck/ms_dsm_ckopdg", MsHdmGate.class, "裂缝开合度位移监测表"), + MS_DSM_SPPR("ms_dsm_sppr", "/bzjck/ms_dsm_sppr", MsHdmSvrds.class, "渗流压力水位监测表"), + MS_DSM_PZWL("ms_dsm_pzwl", "/bzjck/ms_dsm_pzwl", MsHdmPzwl.class, "测压管水位监测表"), + MS_DSM_SPQN("ms_dsm_spqn", "/bzjck/ms_dsm_spqn", MsHdmSpqn.class, "渗流量监测表"), + MS_DSM_ST("ms_dsm_st", "/bzjck/ms_dsm_srhrds", MsHdmSt.class, "应变监测表"), + MS_DSM_PR("ms_dsm_pr", "/bzjck/ms_dsm_pr", MsHdmPr.class, "应力监测表"), + MS_DSM_TM("ms_dsm_tm", "/bzjck/ms_dsm_tm", MsHdmTm.class, "温度监测表"), + MS_DSM_UPDWWL("ms_dsm_updwwl", "/bzjck/ms_dsm_updwwl", MsHdmUpdwwl.class, "水位监测表"), + MS_DSM_ATPR("ms_dsm_atpr", "/bzjck/ms_dsm_atpr", MsHdmAtpr.class, "气压监测表"), + MS_DSM_AMS("ms_dsm_ams", "/bzjck/ms_dsm_ams", MsHdmAms.class, "气温监测表"), + MS_DSM_GSTMONREC("ms_dsm_gstmonrec", "/bzjck/ms_dsm_gstmonrec", MsHdmGstmonrec.class, "GNSS状态量监测表"), + MS_DSM_OSSMONREC("ms_dsm_ossmonrec", "/bzjck/ms_dsm_ossmonrec", MsHdmOssmonrec.class, "渗压计监测表"), + MS_DSM_ENV("ms_dsm_env", "/bzjck/ms_dsm_env", MsHdmEnv.class, "环境量监测表"), + ; + + private final String name; + private final String url; + private final Class classT; + private final String remark; + + DataSyncMonitorEnum(String name, String url, Class classT, String remark) { + this.name = name; + this.url = url; + this.classT = classT; + this.remark = remark; + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java new file mode 100644 index 00000000..8dcb4879 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java @@ -0,0 +1,253 @@ +package com.kms.yxgh.base.job; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.kms.yxgh.base.enums.DataSyncBasicEnum; +import com.kms.yxgh.base.enums.DataSyncMonitorEnum; +import com.kms.yxgh.base.mapper.BaseDdlMapper; +import com.kms.yxgh.util.RestTemplateUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + +/** + * 数据同步 + */ +@Slf4j +@Component +public class DataSyncJob { + + @Value("${dataSync.url:}") + private String dataSyncUrl; + @Value("${dataSync.days:7}") + private String dataSyncDays; + @Value("${dataSync.enabled:false}") + private Boolean dataSyncEnabled; + @Autowired + private RestTemplateUtils restTemplateUtils; + @Autowired + private BaseDdlMapper baseDdlMapper; + private static final Map FIELD_MAP = TableFieldFactory.getCacheFieldMap(); + private static final Map> FIELD_TYPE_MAP = TableFieldFactory.getCacheFieldTypeMap(); + private static final int ASYNC_THRESHOLD = 500; + private static final int BATCH_COUNT = 100; + private static final SimpleDateFormat DATE_FORMAT_WITH_TIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + private static final SimpleDateFormat DATE_FORMAT_WITH_OUT_TIME = new SimpleDateFormat("yyyy-MM-dd"); + + /** + * 每天凌晨1点执行0 0 1 * * * + */ + @Scheduled(cron = "0 0 1 * * *") + public void run() { + log.info("-------------基础数据同步请求：{}--------------", dataSyncEnabled); + if (dataSyncEnabled) { + Date date = new Date(); + for (DataSyncBasicEnum dataSyncStatusEnum : DataSyncBasicEnum.values()) { + syncData(dataSyncStatusEnum.getName(), dataSyncStatusEnum.getUrl(), dataSyncStatusEnum.getRemark(), date, null); + } + } + } + + /** + * 每天凌晨2点执行 (0 57 14 ? * *) + */ + @Scheduled(cron = "0 55 16 ? * *") + public void runMonitor() { + log.info("--------开启监测数据同步请求--------------", dataSyncEnabled); + if (dataSyncEnabled) { + Date date = new Date(); + for (DataSyncMonitorEnum dataSyncEnum : DataSyncMonitorEnum.values()) { + syncData(dataSyncEnum.getName(), dataSyncEnum.getUrl(), dataSyncEnum.getRemark(), date, "1"); + } + } + } + + private void syncData(String tableName, String url, String remark, Date date, String type) { + String originalFiled = FIELD_MAP.get(tableName); + if (StringUtils.isBlank(originalFiled)) { + return; + } + String filed = originalFiled + ",CREATE_TIME,UPDATE_TIME"; + int total = 0; + int pageNum = 1; + int pageSize = 1000; + String beginTime = ""; + String endTime = ""; + + try { + if (StringUtils.isNotBlank(type)) { + Date beginTimeDate = baseDdlMapper.selectLastCreateTime(tableName); + beginTime = beginTimeDate == null ? DATE_FORMAT_WITH_TIME.format(getBeginDays()) : DATE_FORMAT_WITH_TIME.format(beginTimeDate); + endTime = DATE_FORMAT_WITH_TIME.format(date); + } + do { + String requestUrl = String.format("%s%s?pageNum=%s&pageSize=%s", dataSyncUrl, url, pageNum, pageSize); + if (StringUtils.isNotBlank(type)) { + requestUrl = String.format("%s&START_TIME=%s&END_TIME=%s", requestUrl, beginTime, endTime); + } + // 发送请求 + String jsonStr = restTemplateUtils.doGetRequest(requestUrl); + if (StringUtils.isBlank(jsonStr)) { + log.info(String.format("--------数据同步请求%s出错，响应结果为空--------", remark)); + break; + } + JSONObject jsonObject = JSONObject.parseObject(jsonStr); + total = jsonObject.containsKey("total") ? jsonObject.getInteger("total") : jsonObject.getJSONObject("data").getInteger("total"); + JSONArray jsonArray = null; + if (jsonObject.containsKey("records")) { + jsonArray = jsonObject.getJSONArray("records"); + } else { + jsonArray = jsonObject.getJSONArray("data"); + } + if (jsonArray == null) { + break; + } + + // 解析数据 + List> dataList = processDataList(jsonArray, filed.split(","), date, tableName, type); + // 清除数据 + if (StringUtils.isBlank(type)) { + baseDdlMapper.delete(tableName); + } + // 插入数据 + insertData(filed, dataList, tableName); + if (pageNum * pageSize >= total) { + break; + } + pageNum += 1; + } while (true); + } catch (Exception e) { + log.error("--------数据同步出错--------------,表：" + tableName, e); + } + } + + /** + * 获取近x天的开始时间，默认7天 + */ + public Date getBeginDays() { + return Date.from(LocalDateTime.of(LocalDate.now().minusDays(Long.parseLong(dataSyncDays)), LocalTime.MIN).atZone(ZoneId.systemDefault()).toInstant()); + } + + /** + * 解析数据并处理 + * + * @return + */ + public List> processDataList(JSONArray jsonArray, String[] fieldStr, Date nowDate, String tableName, String type) { + return jsonArray.stream().map(JSONObject.class::cast).map(obj -> Arrays.stream(fieldStr) + .map(fieldName -> { + Class fieldType = FIELD_TYPE_MAP.getOrDefault(tableName, Collections.emptyMap()).get(fieldName); + // 特殊处理：监测数据的入库时间与系统的CREATE_TIME冲突 + if (StringUtils.isNotBlank(type)) { + if (fieldName.equals("MS_CREATE_TIME")) { + return typeConversion(obj, "CREATE_TIME", fieldType); + } else if (fieldName.equals("CREATE_TIME")) { + return nowDate; + } + } + return extractValue(obj, fieldName, fieldType, nowDate); + }).filter(Objects::nonNull).collect(Collectors.toList())) + .collect(Collectors.toList()); + } + + /** + * 批量入库 + */ + private void insertData(String filed, List> dataList, String tableName) { + // 入库操作 + if (dataList.size() > ASYNC_THRESHOLD) { + // 先入库100条数据入库 + List> firstBatchDataList = dataList.subList(0, BATCH_COUNT); + baseDdlMapper.insert(filed, firstBatchDataList, tableName); + + // 剩下的走异步分批入库 + CompletableFuture.runAsync(() -> { + List> cachedDataList = new ArrayList<>(BATCH_COUNT); + List> residualDataList = dataList.subList(BATCH_COUNT, dataList.size()); + for (List objectList : residualDataList) { + cachedDataList.add(objectList); + if (cachedDataList.size() >= BATCH_COUNT) { + baseDdlMapper.insert(filed, cachedDataList, tableName); + cachedDataList = new ArrayList<>(BATCH_COUNT); + } + } + baseDdlMapper.insert(filed, cachedDataList, tableName); + }); + } else { + baseDdlMapper.insert(filed, dataList, tableName); + } + } + + + /** + * 数据类型转换&填充时间 + */ + private Object extractValue(JSONObject obj, String fieldName, Class fieldType, Date nowDate) { + if (obj.get(fieldName) == null) { + if ("CREATE_TIME".equals(fieldName) || "UPDATE_TIME".equals(fieldName)) { + return nowDate; + } + return ""; + } + return typeConversion(obj, fieldName, fieldType); + } + + /** + * 类型转换 + * + * @return + */ + private Object typeConversion(JSONObject obj, String fieldName, Class fieldType) { + if (fieldType == null) { + return obj.get(fieldName); + } + if (String.class.equals(fieldType)) { + return obj.getString(fieldName); + } else if (BigDecimal.class.equals(fieldType)) { + return convertToBigDecimal(obj, fieldName); + } else if (Date.class.equals(fieldType)) { + return convertToDate(obj, fieldName); + } else if (Long.class.equals(fieldType)) { + return obj.getLong(fieldName); + } + return null; + } + + private BigDecimal convertToBigDecimal(JSONObject obj, String fieldName) { + try { + return StringUtils.isNotBlank(obj.getString(fieldName)) ? new BigDecimal(obj.getString(fieldName)) : new BigDecimal(0); + } catch (NumberFormatException e) { + log.error("Failed to convert field {} to BigDecimal", fieldName, e); + return new BigDecimal(0); + } + } + + private Date convertToDate(JSONObject obj, String fieldName) { + String dateStr = obj.getString(fieldName); + try { + return DATE_FORMAT_WITH_TIME.parse(dateStr); + } catch (ParseException e) { + try { + return DATE_FORMAT_WITH_OUT_TIME.parse(dateStr); + } catch (ParseException ex) { + log.error("Failed to convert field {} to Date", fieldName, ex); + return null; + } + } + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/job/TableFieldFactory.java b/shuili-system/src/main/java/com/kms/yxgh/base/job/TableFieldFactory.java new file mode 100644 index 00000000..48bd1666 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/job/TableFieldFactory.java @@ -0,0 +1,74 @@ +package com.kms.yxgh.base.job; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.kms.yxgh.base.enums.DataSyncBasicEnum; +import com.kms.yxgh.base.enums.DataSyncMonitorEnum; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.stereotype.Component; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +@Slf4j +@Component +public class TableFieldFactory implements InitializingBean { + + private static final Map CACHE_FIELD_MAP = new HashMap<>(); + private static final Map> CACHE_FIELD_TYPE_MAP = new HashMap<>(); + + @Override + public void afterPropertiesSet() throws Exception { + fetchTableFieldNames(); + } + + /** + * 加载基础数据的字段属性放入cacheFieldMap缓存 + */ + private void fetchTableFieldNames() { + ExecutorService executor = Executors.newCachedThreadPool(); + try { + executor.execute(() -> { + for (DataSyncBasicEnum dataSyncStatusEnum : DataSyncBasicEnum.values()) { + Field[] fields = dataSyncStatusEnum.getClassT().getDeclaredFields(); + processEnums(fields, dataSyncStatusEnum.getName()); + } + for (DataSyncMonitorEnum dataSyncStatusEnum : DataSyncMonitorEnum.values()) { + Field[] fields = dataSyncStatusEnum.getClassT().getDeclaredFields(); + processEnums(fields, dataSyncStatusEnum.getName()); + } + }); + } catch (Exception e) { + log.error("Failed to fetch table field names", e); + } finally { + executor.shutdown(); + } + } + + private void processEnums(Field[] fields, String name) { + StringBuilder filedName = new StringBuilder(); + Map type = new HashMap<>(); + for (Field field : fields) { + TableField tableField = field.getAnnotation(TableField.class); + if (tableField != null) { + type.put(tableField.value(), field.getType()); + filedName.append(tableField.value()).append(","); + } + } + String keywordStr = filedName.deleteCharAt(filedName.length() - 1).toString(); + CACHE_FIELD_MAP.put(name, keywordStr); + CACHE_FIELD_TYPE_MAP.put(name, type); + } + + public static Map getCacheFieldMap() { + return CACHE_FIELD_MAP; + } + + public static Map> getCacheFieldTypeMap() { + return CACHE_FIELD_TYPE_MAP; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/mapper/BaseDdlMapper.java b/shuili-system/src/main/java/com/kms/yxgh/base/mapper/BaseDdlMapper.java new file mode 100644 index 00000000..db49b235 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/base/mapper/BaseDdlMapper.java @@ -0,0 +1,20 @@ +package com.kms.yxgh.base.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; + +@Repository +public interface BaseDdlMapper extends BaseMapper { + + void insert(@Param("field") String field, @Param("dataList") List> dataList, @Param("tableName") String tableName); + + void delete(@Param("tableName") String tableName); + + @Select("select create_time from ${tableName} order by create_time desc limit 1") + Date selectLastCreateTime(@Param("tableName") String tableName); +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtils.java b/shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtils.java new file mode 100644 index 00000000..a5d70748 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtils.java @@ -0,0 +1,92 @@ +package com.kms.yxgh.util; + + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.*; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.util.UriComponentsBuilder; + +import java.io.UnsupportedEncodingException; +import java.net.URI; + +@Component +@Slf4j +public class RestTemplateUtils { + @Autowired + private RestTemplate restTemplate; + + @Value("${dataSync.x-h3c-id:}") + private String h3cId; + + @Value("${dataSync.x-h3c-appKey:}") + private String h3cAppKey; + + + /** + * get 请求 参数在url后面 http://xxxx?aa=xxx&page=0&size=10"; + * @param urls + * @return string + */ + public String doGetRequest(String urls) { + + URI uri = UriComponentsBuilder.fromUriString(urls).build().toUri(); + log.info("请求接口:{}", urls); + HttpHeaders headers = getHttpHeaders(); + HttpEntity httpEntity = new HttpEntity<>(headers); + //通用的方法exchange,这个方法需要你在调用的时候去指定请求类型，可以是get,post,也能是其它类型的请求 + ResponseEntity responseEntity = restTemplate.exchange(uri, HttpMethod.GET, httpEntity, String.class); + if (responseEntity == null) { + return null; + } + log.info("返回报文:{}", JSON.toJSONString(responseEntity)); + + return responseEntity.getBody(); + } + + /** + * post 请求 参数在 request里; + * @param url, request + * @return string + */ + public String doPostRequest(String url, Object request){ + URI uri = UriComponentsBuilder.fromUriString(url).build().toUri(); + + String requestStr= JSONObject.toJSONString(request); + log.info("请求接口:{}, 请求报文:{}", url, requestStr); + HttpHeaders headers = getHttpHeaders(); + HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); + ResponseEntity responseEntity = restTemplate.exchange(uri, HttpMethod.POST, httpEntity, String.class); + + if (responseEntity == null) { + return null; + } + + String seqResult = ""; + try { + seqResult = new String(responseEntity.getBody().getBytes(),"utf-8"); + log.info("返回报文:{}", seqResult); + } catch (UnsupportedEncodingException e) { + log.error("接口返回异常", e); + } + return seqResult; + } + + /** + * 封装请求头参数 + * X-H3C-ID 认证ID 3359137640337 + * X-H3C-APPKEY 认证秘钥 q7sli9ch + * @return + */ + private HttpHeaders getHttpHeaders(){ + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.set("X-H3C-ID", h3cId); + headers.set("X-H3C-APPKEY", h3cAppKey); + return headers; + } +} \ No newline at end of file diff --git a/shuili-system/src/main/resources/mapper/yxgh/BaseDdlMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/BaseDdlMapper.xml new file mode 100644 index 00000000..f9895001 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yxgh/BaseDdlMapper.xml @@ -0,0 +1,18 @@ + + + + + + insert into ${tableName} (${field}) + values + + + #{value} + + + + + + delete from ${tableName} + + diff --git a/sql/sy/v1.2.0/全量脚本/dataSync.sql b/sql/sy/v1.2.0/全量脚本/dataSync.sql new file mode 100644 index 00000000..d3692de1 --- /dev/null +++ b/sql/sy/v1.2.0/全量脚本/dataSync.sql @@ -0,0 +1,960 @@ +SET NAMES utf8mb4; +CREATE TABLE `dws_rel_bas_ad` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `BAS_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '流域代码', + `BAS_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '流域名称', + `ADCD` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '行政区划代码', + `ADNM` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '行政区划名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='流域与行政区划对象关系表'; + +CREATE TABLE `dws_rel_rv_rv` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `RV_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '河流代码', + `RV_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '河流名称', + `PARENT_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '上下级代码', + `PARENT_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '上下级名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='河流上下级对象关系表'; + +CREATE TABLE `dws_rel_lk_bas` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `LK_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '湖泊代码', + `LK_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '湖泊名称', + `BASIN` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '盆地', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='湖泊所在流域对象关系表'; + +CREATE TABLE `dws_rel_res_dscdnm` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `RES_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水库代码', + `RES_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水库名称', + `ADCD` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '行政区划代码', + `ADNM` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '行政区划名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水库所属行政区划对象关系表'; + +CREATE TABLE `dws_rel_res_rv` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `RES_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水库代码', + `RES_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水库名称', + `RV_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '河流代码', + `RV_NAME` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '河流名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水库所属河流对象关系表'; + +CREATE TABLE `dws_rel_waga_rv` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `WAGA_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸编码', + `WAGA_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水闸名称', + `RV_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '河流（湖、库、渠、海堤）编码', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸所属河流对象关系表'; + +CREATE TABLE `dws_rel_waga_lk` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `WAGA_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸编码', + `WAGA_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水闸名称', + `LK_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '湖泊代码', + `LK_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '湖泊名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸所在湖泊对象关系表'; + +CREATE TABLE `dws_rel_waga_res` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `WAGA_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸编码', + `WAGA_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水闸名称', + `RES_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水库代码', + `RES_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水库名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸所属水库对象关系表'; + +CREATE TABLE `dws_rel_waga_dike` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `WAGA_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸编码', + `WAGA_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '水闸名称', + `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `DIKE_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '堤防名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸所属堤防对象关系表'; + +CREATE TABLE `dws_rel_dike_rv` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `DIKE_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码', + `DIKE_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '堤防名称', + `RV_CODE` varchar(255) COLLATE utf8mb4_general_ci NOT NULL COMMENT '河流代码', + `RV_NAME` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '河流名称', + `FROM_DATE` datetime DEFAULT NULL COMMENT '关系建立时间', + `TO_DATE` datetime DEFAULT NULL COMMENT '关系终止时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防所属河流对象关系表'; + + + + + + + + + + + +CREATE TABLE `MS_HDM_OBP` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `INTV` int(4) NOT NULL COMMENT '时段长', + `DRP` decimal(5,1) DEFAULT NULL COMMENT '时段降水量', + `PDR` int(4) DEFAULT NULL COMMENT '降水历时', + `DYP` decimal(5,1) DEFAULT NULL COMMENT '日降水量', + `PTP` char(1) DEFAULT NULL COMMENT '降水量类型', + `WTH` char(1) DEFAULT NULL COMMENT '天气状况', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='降水量监测表'; + +CREATE TABLE `MS_HDM_RIVER` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `Z` decimal(7,3) DEFAULT NULL COMMENT '水位（m）', + `Q` decimal(9,3) DEFAULT NULL COMMENT '流量（m³/s）', + `XSA` decimal(9,3) DEFAULT NULL COMMENT '断面过水面积（m²）', + `XSAVV` decimal(5,3) DEFAULT NULL COMMENT '断面平均流速（m/s）', + `XSMXV` decimal(5,3) DEFAULT NULL COMMENT '断面最大流速（m/s）', + `FLWCHRCD` char(1) DEFAULT NULL COMMENT '河水特征码', + `WPTN` char(1) DEFAULT NULL COMMENT '水势', + `MSQMT` char(1) DEFAULT NULL COMMENT '测流方法', + `MSAMT` char(1) DEFAULT NULL COMMENT '测积方法', + `MSVMT` char(1) DEFAULT NULL COMMENT '测速方法', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='河道水情监测表'; + +CREATE TABLE `MS_HDM_RSVR` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `RZ` decimal(7,3) DEFAULT NULL COMMENT '库上水位（m）', + `INQ` decimal(9,3) DEFAULT NULL COMMENT '入库流量（m³/s）', + `W` decimal(9,3) DEFAULT NULL COMMENT '蓄水量', + `BLRZ` decimal(7,3) DEFAULT NULL COMMENT '库下水位（m）', + `OTQ` decimal(9,3) DEFAULT NULL COMMENT '出库流量（m³/s）', + `RWCHRCD` char(1) DEFAULT NULL COMMENT '库水特征码', + `RWPTN` char(1) DEFAULT NULL COMMENT '库水水势', + `INQDR` int(4) DEFAULT NULL COMMENT '入流时段长', + `MSQMT` char(1) DEFAULT NULL COMMENT '测流方法', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水库水情监测表'; + +CREATE TABLE `MS_HDM_TIDE` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `TDZ` decimal(7,3) DEFAULT NULL COMMENT '潮位（m）', + `AIRP` decimal(5) DEFAULT NULL COMMENT '气压', + `TDCHRCD` char(1) DEFAULT NULL COMMENT '潮水特征码', + `TDPTN` char(1) DEFAULT NULL COMMENT '潮势', + `HLTDMK` char(1) DEFAULT NULL COMMENT '高低潮标志', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='潮汐水情监测表'; + +CREATE TABLE `MS_HDM_WDWV` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `WNDV` decimal(4,1) DEFAULT NULL COMMENT '风速（m/s）', + `WNDPWR` decimal(2) DEFAULT NULL COMMENT '风力', + `WNDDIR` char(2) DEFAULT NULL COMMENT '风向', + `WVHGT` decimal(4) DEFAULT NULL COMMENT '浪高（cm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='风浪监测表'; + +CREATE TABLE `MS_HDM_SALT` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `CNDCT` decimal(9,3) DEFAULT NULL COMMENT '电导率', + `CHLRN` decimal(8,3) DEFAULT NULL COMMENT '含氯度', + `SALT` decimal(8,3) DEFAULT NULL COMMENT '盐度', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='咸潮监测表'; + +CREATE TABLE `MS_HDM_TMP` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `ATMP` decimal(3,1) DEFAULT NULL COMMENT '气温（℃）', + `WTMP` decimal(3,1) DEFAULT NULL COMMENT '水温（℃）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='气温水温监测表'; + +CREATE TABLE `MS_HDM_STORM` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `STRMDR` decimal(5,2) DEFAULT NULL COMMENT '暴雨历时', + `STRMP` decimal(4,1) DEFAULT NULL COMMENT '暴雨量（mm）', + `WTH` char(1) DEFAULT NULL COMMENT '天气状况', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='暴雨加报监测表'; + +CREATE TABLE `MS_HDM_WAS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `UPZ` decimal(7,3) DEFAULT NULL COMMENT '闸上水位（m）', + `DWZ` decimal(7,3) DEFAULT NULL COMMENT '闸下水位（m）', + `TGTQ` decimal(9,3) DEFAULT NULL COMMENT '总过闸流量（m³/s）', + `SWCHRCD` char(1) DEFAULT NULL COMMENT '闸水特征码', + `SUPWPTN` char(1) DEFAULT NULL COMMENT '闸上水势', + `SDWWPTN` char(1) DEFAULT NULL COMMENT '闸下水势', + `MSQMT` char(2) DEFAULT NULL COMMENT '测流方法', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堰闸水情监测表'; + +CREATE TABLE `MS_HDM_DAYEV` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(18) NOT NULL COMMENT '测站编码', + `TM` datetime NOT NULL COMMENT '时间', + `EPTP` char(1) DEFAULT NULL COMMENT '蒸发器类型', + `DYE` decimal(5,1) DEFAULT NULL COMMENT '日蒸发量（mm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime DEFAULT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) DEFAULT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='日蒸发量监测表'; + +CREATE TABLE `MS_HDM_PSTAT` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `IDTM` datetime NOT NULL COMMENT '时间', + `STTDRCD` char(1) NOT NULL COMMENT '统计时段标志', + `ACCP` decimal(6,1) DEFAULT NULL COMMENT '累计降水量（mm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='降水量统计表'; + +CREATE TABLE `MS_WQM_WQAMD` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `STCD` varchar(8) NOT NULL COMMENT '测站编码', + `SPT` datetime NOT NULL COMMENT '采样时间', + `WTMP` decimal(3,1) DEFAULT NULL COMMENT '水温（℃）', + `PH` decimal(4,2) DEFAULT NULL COMMENT 'pH值', + `COND` decimal(6) DEFAULT NULL COMMENT '电导率（㎲/cm）', + `TURB` decimal(3) DEFAULT NULL COMMENT '浑浊度（NTU）', + `DOX` decimal(4,2) DEFAULT NULL COMMENT '溶解氧（mg/L）', + `CODMN` decimal(6,1) DEFAULT NULL COMMENT '高锰酸钾指数（mg/L）', + `CODCR` decimal(7,1) DEFAULT NULL COMMENT '化学需氧量（mg/L）', + `TN` decimal(6,3) DEFAULT NULL COMMENT '总氮（mg/L）', + `NH3N` decimal(6,3) DEFAULT NULL COMMENT '氨氮（mg/L）', + `NO2` decimal(5,3) DEFAULT NULL COMMENT '亚硝酸盐氮（mg/L）', + `NO3` decimal(5,3) DEFAULT NULL COMMENT '硝酸盐氮（mg/L）', + `TP` decimal(8,3) DEFAULT NULL COMMENT '总磷（mg/L）', + `TOC` decimal(4,1) DEFAULT NULL COMMENT '总有机碳（mg/L）', + `VLPH` decimal(10,6) DEFAULT NULL COMMENT '挥发酚（mg/L）', + `CHLA` decimal(6,4) DEFAULT NULL COMMENT '叶绿素a（mg/L）', + `F` decimal(5,2) DEFAULT NULL COMMENT '氟化物（mg/L）', + `ARS` decimal(8,6) DEFAULT NULL COMMENT '砷（mg/L）', + `HG` decimal(9,7) DEFAULT NULL COMMENT '汞（mg/L）', + `CR6` decimal(5,3) DEFAULT NULL COMMENT '铬（六价）（mg/L）', + `CU` decimal(7,4) DEFAULT NULL COMMENT '铜（mg/L）', + `PB` decimal(7,5) DEFAULT NULL COMMENT '铅（mg/L）', + `CD` decimal(7,5) DEFAULT NULL COMMENT '镉（mg/L）', + `ZN` decimal(6,4) DEFAULT NULL COMMENT '锌（mg/L）', + `SB` decimal(7,5) DEFAULT NULL COMMENT '锑（mg/L）', + `NT` varchar(256) DEFAULT NULL COMMENT '备注', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水质自动监测数据表'; + +CREATE TABLE `MS_HPM_SLCRS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `TM` datetime DEFAULT NULL COMMENT '时间', + `SLUPSZ` decimal(6,2) DEFAULT NULL COMMENT '闸上水位', + `SLDSZ` decimal(6,2) DEFAULT NULL COMMENT '闸下水位', + `THRSLQ` decimal(10,2) DEFAULT NULL COMMENT '过闸流量（m³/s）', + `GTOPN` decimal(2) DEFAULT NULL COMMENT '开启孔数', + `UPSWTP` decimal(1) DEFAULT NULL COMMENT '闸上水势', + `DSWTP` decimal(1) DEFAULT NULL COMMENT '闸下水势', + `REPORTER` char(100) NOT NULL COMMENT '填报人', + `RPTTLNMB` char(50) DEFAULT NULL COMMENT '填报人联系方式', + `NT` varchar(256) DEFAULT NULL COMMENT '备注', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸运行状况监测表'; + +CREATE TABLE `MS_HPM_DKRS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `TM` datetime DEFAULT NULL COMMENT '时间', + `LGTD` char(16) NOT NULL COMMENT '采集点经度坐标（°）', + `LTTD` char(16) NOT NULL COMMENT '采集点纬度坐标（°）', + `HDRSTCD` char(18) DEFAULT NULL COMMENT '水文控制站代码', + `CLPSADDR` varchar(20) DEFAULT NULL COMMENT '采集点地名', + `CLPSDRN` char(20) DEFAULT NULL COMMENT '采集点桩号', + `Z` decimal(8,2) DEFAULT NULL COMMENT '水位（m）', + `Q` decimal(8,2) DEFAULT NULL COMMENT '流量（m³/s）', + `WSDCH` decimal(4,2) DEFAULT NULL COMMENT '水面距堤顶高差（m）', + `REPORTER` char(100) NOT NULL COMMENT '填报人', + `RPTTLNMB` char(50) DEFAULT NULL COMMENT '填报人联系方式', + `NT` varchar(256) DEFAULT NULL COMMENT '备注', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防（段）运行状况监测表'; + +CREATE TABLE `MS_HPM_GATE` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '闸孔编号', + `TM` datetime DEFAULT NULL COMMENT '时间', + `EXKEY` varchar(256) NOT NULL COMMENT '扩展关键字', + `EQPTP` varchar(100) NOT NULL COMMENT '设备类别', + `EQPNO` varchar(256) NOT NULL COMMENT '设备编号', + `GTOPNUM` varchar(100) NOT NULL COMMENT '开启状态', + `GTOPHGT` varchar(100) NOT NULL COMMENT '开启高度', + `GTOPROT` varchar(100) NOT NULL COMMENT '旋转角度', + `GTQ` varchar(100) NOT NULL COMMENT '过闸流量', + `MSMT` varchar(100) NOT NULL COMMENT '测流方法', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水利工程闸门开度监测表'; + +CREATE TABLE `MS_DSM_SRVRDS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `VRDS` decimal(6,1) NOT NULL COMMENT '垂直位移（mm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表面垂直位移监测表'; + +CREATE TABLE `MS_DSM_SRHRDS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `XHRDS` decimal(6,1) DEFAULT NULL COMMENT 'X向水平位移（mm）', + `YHRDS` decimal(6,1) DEFAULT NULL COMMENT 'Y向水平位移（mm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表面水平位移监测表'; + +CREATE TABLE `MS_DSM_INVRDS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `TM` datetime NOT NULL COMMENT '时间', + `SLUPSZ` decimal(6,2) DEFAULT NULL COMMENT '闸上水位', + `SLDSZ` decimal(6,2) DEFAULT NULL COMMENT '闸下水位', + `THRSLQ` decimal(10,2) DEFAULT NULL COMMENT '过闸流量（m³/s）', + `GTOPN` decimal(2) DEFAULT NULL COMMENT '开启孔数', + `UPSWTP` decimal(1) DEFAULT NULL COMMENT '闸上水势', + `DSWTP` decimal(1) DEFAULT NULL COMMENT '闸下水势', + `REPORTER` char(100) NOT NULL COMMENT '填报人', + `RPTTLNMB` char(50) DEFAULT NULL COMMENT '填报人联系方式', + `NT` varchar(256) DEFAULT NULL COMMENT '备注', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='内部垂直位移监测表'; + +CREATE TABLE `MS_DSM_INHRDS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `XHRDS` decimal(6,1) DEFAULT NULL COMMENT 'X向水平位移（mm）', + `YHRDS` decimal(6,1) DEFAULT NULL COMMENT 'Y向水平位移（mm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='内部水平位移监测表'; + +CREATE TABLE `MS_DSM_CKOPDG` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `TMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `CKOPDG` decimal(6,1) DEFAULT NULL COMMENT '裂缝开合度（位移）（mm）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='裂缝开合度（位移）监测表'; + +CREATE TABLE `MS_DSM_SPPR` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `TMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `SPPRWL` decimal(6,2) DEFAULT NULL COMMENT '渗流压力水位（m）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `GDWR_OGID` varchar(10) DEFAULT NULL COMMENT '机构代码', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='渗流压力水位监测表'; + +CREATE TABLE `MS_DSM_PZWL` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `PZTBWL` decimal(6,2) DEFAULT NULL COMMENT '测压管水位（m）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='测压管水位监测表'; + +CREATE TABLE `MS_DSM_SPQN` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `TMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `SPQN` decimal(6,2) DEFAULT NULL COMMENT '渗流量（L/s）', + `STSPQN` decimal(6,2) DEFAULT NULL COMMENT '标准水温渗流量（L/s）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='渗流量监测表'; + +CREATE TABLE `MS_DSM_ST` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `TMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `STN` decimal(7,3) DEFAULT NULL COMMENT '应变10-6', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='应变监测表'; + +CREATE TABLE `MS_DSM_PR` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `TMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `STS` decimal(7,3) DEFAULT NULL COMMENT '应力（MPa）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='应力监测表'; + +CREATE TABLE `MS_DSM_TM` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `TMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='温度监测表'; + +CREATE TABLE `MS_DSM_UPDWWL` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `WL` decimal(6,2) DEFAULT NULL COMMENT '水位（m）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水位监测表'; + +CREATE TABLE `MS_DSM_ATPR` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `ATPR` decimal(5,2) DEFAULT NULL COMMENT '气压（kPa）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='气压监测表'; + +CREATE TABLE `MS_DSM_AMS` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(20) NOT NULL COMMENT '测点编号', + `MSTM` datetime NOT NULL COMMENT '测量时间', + `ATMP` decimal(4,1) DEFAULT NULL COMMENT '温度（气温℃）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='气温监测表'; + +CREATE TABLE `MS_DSM_GSTMONREC` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(13) NOT NULL COMMENT '测点编号', + `TM` datetime NOT NULL COMMENT '时间', + `STATUS` int DEFAULT NULL COMMENT 'GNSS定位状态（°）', + `SATELLITE_NUM` int DEFAULT NULL COMMENT '卫星数', + `LGTD` decimal(9,6) DEFAULT NULL COMMENT '经度（°）', + `LTTD` decimal(9,6) DEFAULT NULL COMMENT '纬度（°）', + `VOLTAGE` decimal(5,2) DEFAULT NULL COMMENT '设备电压（mV）', + `VALID` int DEFAULT NULL COMMENT '数据是否有效', + `DEVIATION_Y` decimal(8,2) DEFAULT NULL COMMENT '北向偏移量（mm）', + `DEVIATION_X` decimal(8,2) DEFAULT NULL COMMENT '东向偏移量（mm）', + `DEVIATION_Z` decimal(8,2) DEFAULT NULL COMMENT '天向（高）偏移量（mm）', + `DISTANCE_Y` decimal(8,2) DEFAULT NULL COMMENT '北向距离（m）', + `DISTANCE_X` decimal(8,2) DEFAULT NULL COMMENT '东向距离（m）', + `DISTANCE_Z` decimal(8,2) DEFAULT NULL COMMENT '天向距离（m）', + `SOLVE_TM` datetime DEFAULT NULL COMMENT '解算结果时间', + `ALT` decimal(8,2) DEFAULT NULL COMMENT '高程（m）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='GNSS状态量监测表'; + +CREATE TABLE `MS_DSM_OSSMONREC` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(13) NOT NULL COMMENT '测点编号', + `TM` datetime NOT NULL COMMENT '时间', + `UPLIFTED_PRESSURE` decimal(8,2) DEFAULT NULL COMMENT '扬压力（MPa）', + `OSMOTIC_PRESSURE` decimal(8,2) DEFAULT NULL COMMENT '渗透压力（坝体、坝基、绕坝）（MPa）', + `BYPASS_SEEPAGE` decimal(8,2) DEFAULT NULL COMMENT '绕坝渗流（m）', + `FM` decimal(8,2) DEFAULT NULL COMMENT '频模', + `TEMP` decimal(4,1) DEFAULT NULL COMMENT '温度（℃）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='渗压计监测表'; + +CREATE TABLE `MS_DSM_ENV` ( + `ID` int NOT NULL AUTO_INCREMENT COMMENT '编号', + `PRJ_STCD` varchar(18) NOT NULL COMMENT '水利工程测站代码', + `MPCD` varchar(13) NOT NULL COMMENT '测点编号', + `TM` datetime NOT NULL COMMENT '时间', + `GTP` decimal(6,1) DEFAULT NULL COMMENT '地温（℃）', + `AlTP` decimal(6,1) DEFAULT NULL COMMENT '瞬时气温（℃）', + `CTP` decimal(6,1) DEFAULT NULL COMMENT '瞬时水温（℃）', + `MST` decimal(8,2) DEFAULT NULL COMMENT '湿度（%）', + `ED` decimal(5,1) DEFAULT NULL COMMENT '日蒸发量（mm）', + `EJ` decimal(5,1) DEFAULT NULL COMMENT '当前蒸发（mm）', + `ATMP` decimal(5,2) DEFAULT NULL COMMENT '气压（kPa）', + `UC` decimal(8,2) DEFAULT NULL COMMENT '风向', + `UE` decimal(8,2) DEFAULT NULL COMMENT '风力（级）', + `US` decimal(8,2) DEFAULT NULL COMMENT '风速（m/s）', + `PH` decimal(8,2) DEFAULT NULL COMMENT 'pH值', + `COND` decimal(8,2) DEFAULT NULL COMMENT '电导率（mS/cm）', + `TURB` decimal(8,2) DEFAULT NULL COMMENT '浊度（°）', + `COLMT` varchar(2) DEFAULT NULL COMMENT '采集方式', + `CONN_TIME` datetime DEFAULT NULL COMMENT '级联时间', + `COLL_TIME` datetime NOT NULL COMMENT '采集时间', + `GDWR_DASC` varchar(30) NOT NULL COMMENT '数据来源', + `RELIABILITY` char(1) DEFAULT NULL COMMENT '置信度', + `COMMAND_ID` varchar(32) DEFAULT NULL COMMENT '指令ID', + `MS_CREATE_TIME` datetime DEFAULT NULL COMMENT '入库时间', + `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', + `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', + `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人', + `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='环境量监测表'; From efc98f16b24008b44fda25c12d8ad6c5b3122a46 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Tue, 16 Apr 2024 17:58:40 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/base/job/DataSyncJob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java index 8dcb4879..02327609 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java @@ -65,7 +65,7 @@ public class DataSyncJob { /** * 每天凌晨2点执行 (0 57 14 ? * *) */ - @Scheduled(cron = "0 55 16 ? * *") + @Scheduled(cron = "0 0 2 * * *") public void runMonitor() { log.info("--------开启监测数据同步请求--------------", dataSyncEnabled); if (dataSyncEnabled) { From b49c3e463072b188a2a47047f409d35876f46ba2 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 17 Apr 2024 18:07:34 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=E6=B0=B4=E9=9B=A8=E6=83=85?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/DfYqStatisticsController.java | 8 ++++++++ .../kms/yxgh/df/dto/DfYqExceedIndexQueDto.java | 2 ++ .../com/kms/yxgh/df/dto/DfYqYearRainFallDto.java | 15 +++++++++++++++ .../kms/yxgh/df/mapper/DfWaterRegimeMapper.java | 3 +++ .../yxgh/df/service/DfYqStatisticsService.java | 16 ++++++++++++++++ .../sz/controller/SzYqStatisticsController.java | 8 ++++++++ .../kms/yxgh/sz/dto/SzYqExceedIndexQueDto.java | 3 +++ .../com/kms/yxgh/sz/dto/SzYqYearRainFallDto.java | 15 +++++++++++++++ .../kms/yxgh/sz/mapper/SzWaterRegimeMapper.java | 4 ++++ .../yxgh/sz/service/SzYqStatisticsService.java | 15 +++++++++++++++ 10 files changed, 89 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqYearRainFallDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqYearRainFallDto.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYqStatisticsController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYqStatisticsController.java index 8600953c..8631a23e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYqStatisticsController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYqStatisticsController.java @@ -4,6 +4,7 @@ import com.kms.yxgh.base.Response; import com.kms.yxgh.df.dto.DfYqDailyWaterLevelDto; import com.kms.yxgh.df.dto.DfYqExceedIndexDto; import com.kms.yxgh.df.dto.DfYqExceedIndexQueDto; +import com.kms.yxgh.df.dto.DfYqYearRainFallDto; import com.kms.yxgh.df.service.DfYqStatisticsService; import com.shuili.common.core.controller.BaseController; import io.swagger.annotations.Api; @@ -51,4 +52,11 @@ public class DfYqStatisticsController extends BaseController { public Response getTenDaysRainfall(@RequestBody DfYqExceedIndexQueDto dto) { return Response.ok(dfYqStatisticsService.getTenDaysRainfall(dto)); } + + //按年份获取堤防雨量统计数据 + @PostMapping("/get-year-rainfall") + @ApiOperation("按年份获取堤防雨量统计数据") + public Response getYearRainfall(@RequestBody DfYqExceedIndexQueDto dto) { + return Response.ok(dfYqStatisticsService.getYearRainfall(dto)); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqExceedIndexQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqExceedIndexQueDto.java index 6c5bb2c9..51ac0c8e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqExceedIndexQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqExceedIndexQueDto.java @@ -19,4 +19,6 @@ public class DfYqExceedIndexQueDto { @ApiModelProperty("堤防代码") private String dikeCode; + @ApiModelProperty("年份") + private String year; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqYearRainFallDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqYearRainFallDto.java new file mode 100644 index 00000000..2970a387 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqYearRainFallDto.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Map; + +@ApiModel("堤防雨量年统计数据") +@Data +public class DfYqYearRainFallDto { + + @ApiModelProperty(value = "月份-雨量:1-1000") + private Map yearRainFall; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java index 76ec21d8..4f3096b0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfWaterRegimeMapper.java @@ -76,4 +76,7 @@ public interface DfWaterRegimeMapper extends BaseMapper { @Select("SELECT rain_fall FROM bs_sgc_df_syq WHERE dike_code = #{dikeCode} AND DATE(create_time) = CURDATE() ORDER BY create_time DESC LIMIT 1") Double getTodayRainfall(@Param("dikeCode") String dikeCode); + //查询某年按月份份获取堤防雨量统计数据 + @Select("SELECT DATE_FORMAT(create_time, '%m') AS date, SUM(rain_fall) AS sum FROM bs_sgc_df_syq WHERE dike_code = #{dikeCode} AND YEAR(create_time) = #{year} GROUP BY DATE_FORMAT(create_time, '%m')") + List getYearRainfall(@Param("year") String year, @Param("dikeCode") String dikeCode); } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYqStatisticsService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYqStatisticsService.java index 51d65c2f..0c1cc1dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYqStatisticsService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYqStatisticsService.java @@ -4,6 +4,7 @@ import com.kms.yxgh.common.dto.DailySumDto; import com.kms.yxgh.df.dto.DfYqDailyWaterLevelDto; import com.kms.yxgh.df.dto.DfYqExceedIndexDto; import com.kms.yxgh.df.dto.DfYqExceedIndexQueDto; +import com.kms.yxgh.df.dto.DfYqYearRainFallDto; import com.kms.yxgh.df.mapper.DfWaterRegimeMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -136,4 +137,19 @@ public class DfYqStatisticsService { private Map convertListToMap(List dailyData) { return dailyData.stream().collect(Collectors.toMap(DailySumDto::getDate, dailySumDto -> dailySumDto)); } + + + public DfYqYearRainFallDto getYearRainfall(DfYqExceedIndexQueDto dto) { + List dailyRainfall = dfWaterRegimeMapper.getYearRainfall(dto.getYear(), dto.getDikeCode()); + DfYqYearRainFallDto result = new DfYqYearRainFallDto(); + Map dailyRainfallMap = convertListToMap(dailyRainfall); + result.setYearRainFall( + IntStream.range(1, 13) + .mapToObj(i -> i + "-" + dailyRainfallMap.getOrDefault(i + "", new DailySumDto()).getSum()) + .collect(Collectors.toMap( + s -> s.split("-")[0], + s -> Double.parseDouble(s.split("-")[1]) + ))); + return result; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYqStatisticsController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYqStatisticsController.java index 28f86099..bd978972 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYqStatisticsController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzYqStatisticsController.java @@ -4,6 +4,7 @@ import com.kms.yxgh.base.Response; import com.kms.yxgh.sz.dto.SzYqDailyWaterLevelDto; import com.kms.yxgh.sz.dto.SzYqExceedIndexDto; import com.kms.yxgh.sz.dto.SzYqExceedIndexQueDto; +import com.kms.yxgh.sz.dto.SzYqYearRainFallDto; import com.kms.yxgh.sz.service.SzYqStatisticsService; import com.shuili.common.core.controller.BaseController; import io.swagger.annotations.Api; @@ -51,4 +52,11 @@ public class SzYqStatisticsController extends BaseController { public Response getTenDaysRainfall(@RequestBody SzYqExceedIndexQueDto dto) { return Response.ok(dfYqStatisticsService.getTenDaysRainfall(dto)); } + + //按年份获取堤防雨量统计数据 + @PostMapping("/get-year-rainfall") + @ApiOperation("按年份获取堤防雨量统计数据") + public Response getYearRainfall(@RequestBody SzYqExceedIndexQueDto dto) { + return Response.ok(dfYqStatisticsService.getYearRainfall(dto)); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqExceedIndexQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqExceedIndexQueDto.java index 053ccd05..d7d99807 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqExceedIndexQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqExceedIndexQueDto.java @@ -19,4 +19,7 @@ public class SzYqExceedIndexQueDto { @ApiModelProperty("水闸代码") private String wagaCode; + + @ApiModelProperty("年份") + private String year; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqYearRainFallDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqYearRainFallDto.java new file mode 100644 index 00000000..4ee13e5c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqYearRainFallDto.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.sz.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Map; + +@ApiModel("水闸雨量年统计数据") +@Data +public class SzYqYearRainFallDto { + + @ApiModelProperty(value = "月份-雨量:1-1000") + private Map yearRainFall; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java index 1e144e59..93fdbc47 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzWaterRegimeMapper.java @@ -75,4 +75,8 @@ public interface SzWaterRegimeMapper extends BaseMapper { //获取当天最新的降雨量数据 @Select("SELECT rain_fall FROM bs_sgc_sz_syq WHERE waga_code = #{wagaCode} AND DATE(create_time) = CURDATE() ORDER BY create_time DESC LIMIT 1") Double getTodayRainfall(@Param(value = "wagaCode") String wagaCode); + + //查询某年按月份份获取水闸雨量统计数据 + @Select("SELECT DATE_FORMAT(create_time, '%m') AS date, SUM(rain_fall) AS sum FROM bs_sgc_sz_syq WHERE YEAR(create_time) = #{year} AND waga_code = #{wagaCode} GROUP BY DATE_FORMAT(create_time, '%m')") + List getYearRainfall(@Param("wagaCode") String wagaCode, @Param("year") String year); } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYqStatisticsService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYqStatisticsService.java index 802181d2..2413b5a1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYqStatisticsService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYqStatisticsService.java @@ -4,6 +4,7 @@ import com.kms.yxgh.common.dto.DailySumDto; import com.kms.yxgh.sz.dto.SzYqDailyWaterLevelDto; import com.kms.yxgh.sz.dto.SzYqExceedIndexDto; import com.kms.yxgh.sz.dto.SzYqExceedIndexQueDto; +import com.kms.yxgh.sz.dto.SzYqYearRainFallDto; import com.kms.yxgh.sz.mapper.SzWaterRegimeMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -136,4 +137,18 @@ public class SzYqStatisticsService { private Map convertListToMap(List dailyData) { return dailyData.stream().collect(Collectors.toMap(DailySumDto::getDate, dailySumDto -> dailySumDto)); } + + public SzYqYearRainFallDto getYearRainfall(SzYqExceedIndexQueDto dto) { + List yearRainFall = szWaterRegimeMapper.getYearRainfall(dto.getWagaCode(), dto.getYear()); + SzYqYearRainFallDto result = new SzYqYearRainFallDto(); + Map dailyRainfallMap = convertListToMap(yearRainFall); + result.setYearRainFall( + IntStream.range(1, 13) + .mapToObj(i -> i + "-" + dailyRainfallMap.getOrDefault(i + "", new DailySumDto()).getSum()) + .collect(Collectors.toMap( + s -> s.split("-")[0], + s -> Double.parseDouble(s.split("-")[1]) + ))); + return result; + } } From 00b0640b3162c9c0c3490d3faa609cc0f0f703d5 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Fri, 26 Apr 2024 11:59:47 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/base/job/DataSyncJob.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java index 02327609..830aea01 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java @@ -95,12 +95,16 @@ public class DataSyncJob { endTime = DATE_FORMAT_WITH_TIME.format(date); } do { - String requestUrl = String.format("%s%s?pageNum=%s&pageSize=%s", dataSyncUrl, url, pageNum, pageSize); - if (StringUtils.isNotBlank(type)) { - requestUrl = String.format("%s&START_TIME=%s&END_TIME=%s", requestUrl, beginTime, endTime); + String requestUrl = String.format("%s%s", dataSyncUrl, url); + // 发送POST请求 + Map map = new HashMap(); + map.put("pageNum", pageNum); + map.put("pageSize", pageSize); + if(StringUtils.isNotBlank(type)){ + map.put("beginTime", beginTime); + map.put("endTime", endTime); } - // 发送请求 - String jsonStr = restTemplateUtils.doGetRequest(requestUrl); + String jsonStr = restTemplateUtils.doPostRequest(requestUrl, map); if (StringUtils.isBlank(jsonStr)) { log.info(String.format("--------数据同步请求%s出错，响应结果为空--------", remark)); break; @@ -160,7 +164,7 @@ public class DataSyncJob { } } return extractValue(obj, fieldName, fieldType, nowDate); - }).filter(Objects::nonNull).collect(Collectors.toList())) + }).collect(Collectors.toList())) .collect(Collectors.toList()); } @@ -231,7 +235,7 @@ public class DataSyncJob { try { return StringUtils.isNotBlank(obj.getString(fieldName)) ? new BigDecimal(obj.getString(fieldName)) : new BigDecimal(0); } catch (NumberFormatException e) { - log.error("Failed to convert field {} to BigDecimal", fieldName, e); +// log.error("Failed to convert field {} to BigDecimal", fieldName, e); return new BigDecimal(0); } } @@ -244,7 +248,7 @@ public class DataSyncJob { try { return DATE_FORMAT_WITH_OUT_TIME.parse(dateStr); } catch (ParseException ex) { - log.error("Failed to convert field {} to Date", fieldName, ex); +// log.error("Failed to convert field {} to Date", fieldName, ex); return null; } } From 705ccf19a30177a94b6bf264cb3cecff11595784 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Fri, 26 Apr 2024 12:57:30 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E5=88=86=E9=A1=B5=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/base/job/DataSyncJob.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java index 830aea01..6647ae5b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/job/DataSyncJob.java @@ -129,6 +129,10 @@ public class DataSyncJob { } // 插入数据 insertData(filed, dataList, tableName); + // 兼容基础数据若数据量小于pageSize则不再请求否则发送下一次请求 + if (StringUtils.isBlank(type) && jsonArray.size() < pageSize) { + break; + } if (pageNum * pageSize >= total) { break; } From 4815c9379aad4ea24d6d3bc9bab469cac2acb783 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Wed, 8 May 2024 18:07:01 +0800 Subject: [PATCH 07/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java | 6 ++++-- .../java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java | 6 ++++++ .../main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java | 6 ++++-- .../com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java | 2 +- .../java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java | 3 +++ .../java/com/kms/yxgh/df/service/DfAnimalRecordService.java | 2 +- .../com/kms/yxgh/df/service/DfSuperviseTaskService.java | 5 ++++- .../src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java | 6 ++++-- .../java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java | 6 ++++++ .../main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java | 6 ++++-- .../java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java | 3 +++ .../com/kms/yxgh/sz/service/SzSuperviseTaskService.java | 6 ++++-- 12 files changed, 44 insertions(+), 13 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java index dd02e919..66763219 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhPlan.java @@ -6,6 +6,8 @@ import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -50,14 +52,14 @@ public class DfYhPlan extends SyBaseEntity { */ @Excel(name = "国补资金") @ApiModelProperty("国补资金") - private Long nationalSupplement; + private BigDecimal nationalSupplement; /** * 自筹资金 */ @Excel(name = "自筹资金") @ApiModelProperty("自筹资金") - private Long selfSupplement; + private BigDecimal selfSupplement; /** * 具体地点 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java index 5be0e29d..f81a5cac 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java @@ -81,4 +81,10 @@ public class DfDangerousTaskSearchDto { @ApiModelProperty(value = "是否排序") private String isOrder; + + /** + * 病险工程核查分组ID + */ + @ApiModelProperty(value = "病险工程核查分组ID") + private String groupId; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java index 47bf99da..80e5a5b7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java @@ -3,6 +3,8 @@ package com.kms.yxgh.df.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -43,13 +45,13 @@ public class DfYhPlanDetailDto { * 国补资金 */ @ApiModelProperty("国补资金") - private Long nationalSupplement; + private BigDecimal nationalSupplement; /** * 自筹资金 */ @ApiModelProperty("自筹资金") - private Long selfSupplement; + private BigDecimal selfSupplement; /** * 具体地点 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java index a2e7fe41..a1e58337 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Repository; public interface DfDangerousGroupingMapper extends BaseMapper { @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + - "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + + "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_df_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + " FROM bs_sgc_df_bxgcfz a " + " LEFT JOIN sys_dept b ON a.dept_id = b.id " + " order by a.create_time desc") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java index d8b41479..40d5102d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java @@ -56,6 +56,9 @@ public interface DfDangerousTaskMapper extends BaseMapper { "" + "AND rw.state = #{dto.state} " + "" + + "" + + "AND rw.GROUP_ID = #{dto.groupId} " + + "" + "" + "ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC " + "" + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalRecordService.java index f291439d..5a095126 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfAnimalRecordService.java @@ -69,7 +69,7 @@ public class DfAnimalRecordService extends BaseService list(SearchParam sp){ Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - return this.getBaseMapper().selectPage(page, sp.getData()); + //根据创建时间倒序排列 + IPage pageData = this.getBaseMapper().selectPage(page, sp.getData()); + pageData.getRecords().sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())); + return pageData; } @Transactional(rollbackFor = Exception.class) diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java index 6509cf3e..b07c9c2b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhPlan.java @@ -6,6 +6,8 @@ import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -50,14 +52,14 @@ public class SzYhPlan extends SyBaseEntity { */ @Excel(name = "国补资金") @ApiModelProperty("国补资金") - private Long nationalSupplement; + private BigDecimal nationalSupplement; /** * 自筹资金 */ @Excel(name = "自筹资金") @ApiModelProperty("自筹资金") - private Long selfSupplement; + private BigDecimal selfSupplement; /** * 具体地点 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java index e881a5d8..cafd9e2c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java @@ -73,4 +73,10 @@ public class SzDangerousTaskSearchDto { @ApiModelProperty(value = "是否排序") private String isOrder; + + /** + * 病险工程核查分组ID + */ + @ApiModelProperty(value = "病险工程核查分组ID") + private String groupId; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java index 3a67ff23..12a9f40a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhPlanDetailDto.java @@ -3,6 +3,8 @@ package com.kms.yxgh.sz.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; import java.util.Date; import lombok.Data; @@ -43,13 +45,13 @@ public class SzYhPlanDetailDto { * 国补资金 */ @ApiModelProperty("国补资金") - private Long nationalSupplement; + private BigDecimal nationalSupplement; /** * 自筹资金 */ @ApiModelProperty("自筹资金") - private Long selfSupplement; + private BigDecimal selfSupplement; /** * 具体地点 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java index babf4e1e..1b70e2ea 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java @@ -56,6 +56,9 @@ public interface SzDangerousTaskMapper extends BaseMapper { "" + "AND rw.state = #{dto.state} " + "" + + "" + + "AND rw.GROUP_ID = #{dto.groupId} " + + "" + "" + "ORDER BY CASE WHEN CAST(rw.remark AS UNSIGNED) = 100 THEN 1 ELSE 0 END, CAST(rw.remark AS UNSIGNED) DESC, rw.FINISH_TIME ASC " + "" + diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseTaskService.java index 24a47ad4..026c8c76 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseTaskService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseTaskService.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sz.mapper.BsSgcSzGcdaMapper; import com.kms.yxgh.base.SzException; import com.kms.yxgh.sz.domain.SzSuperviseTask; import com.kms.yxgh.sz.dto.SzSuperviseTaskCommonDto; @@ -33,7 +32,10 @@ public class SzSuperviseTaskService extends BaseService list(SearchParam sp){ Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - return this.getBaseMapper().selectPage(page, sp.getData()); + //根据创建时间倒序排列 + IPage pageData = this.getBaseMapper().selectPage(page, sp.getData()); + pageData.getRecords().sort((o1, o2) -> o2.getCreateTime().compareTo(o1.getCreateTime())); + return pageData; } @Transactional(rollbackFor = Exception.class) From 0c6f5eef049344a4f864ecc48f22d20029760b83 Mon Sep 17 00:00:00 2001 From: huangrenya Date: Thu, 9 May 2024 15:03:17 +0800 Subject: [PATCH 08/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java | 5 ++++- .../main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java | 3 +++ .../src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java | 3 ++- .../src/main/java/com/kms/yxgh/df/dto/DfYhPlanDto.java | 3 +++ .../main/java/com/kms/yxgh/df/dto/DfYqProjectListDto.java | 2 ++ .../src/main/java/com/kms/yxgh/df/dto/DfYqProjectQueDto.java | 3 +++ .../main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java | 4 ++-- .../src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java | 4 ++-- .../src/main/java/com/kms/yxgh/sz/dto/SzYhPlanSearchDto.java | 3 +++ .../src/main/java/com/kms/yxgh/sz/mapper/SzYhPlanMapper.java | 4 ++-- 10 files changed, 26 insertions(+), 8 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java index fd638001..94a7fcc1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java @@ -108,7 +108,7 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper { IPage getDfYhProjectListWithPage(Page page, @Param("sp") DfYhProjectQueDto sp); @Select("") IPage getDfYqProjectListWithPage(Page page, @Param("dfProject") DfYqProjectQueDto dfProject); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java index 650094a6..02177747 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAnimalPlanSimpleDto.java @@ -29,6 +29,9 @@ public class DfAnimalPlanSimpleDto { @ApiModelProperty("堤防名称") private String dikeName; + @ApiModelProperty("堤防id") + private String dikeId; + /** * 害堤动物防治计划名称 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java index 1cf18c95..08364c29 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfProjectListDto.java @@ -33,7 +33,8 @@ public class DfProjectListDto { private String startLoc; @ApiModelProperty(value = "终点位置") private String endLoc; - + @ApiModelProperty("行政区划") + private String adcd; @ApiModelProperty(value = "工程管理单位") private String engineeringManagementUnit; @ApiModelProperty(value = "水务行政部门") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDto.java index 79cb0341..0807fe44 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDto.java @@ -31,6 +31,9 @@ public class DfYhPlanDto { @ApiModelProperty("堤防名称") private String dikeName; + @ApiModelProperty("堤防id") + private String dikeId; + /** * 名称 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectListDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectListDto.java index 2c1eb18f..7411d301 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectListDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectListDto.java @@ -34,5 +34,7 @@ public class DfYqProjectListDto { private String adcdStart; @ApiModelProperty("终点行政区划") private String adcdEnd; + @ApiModelProperty("行政区划") + private String adcd; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectQueDto.java index fcc577e9..cfec8609 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYqProjectQueDto.java @@ -30,4 +30,7 @@ public class DfYqProjectQueDto { @ApiModelProperty(value = "结束行政区划") private String endAdcd; + + @ApiModelProperty(value = "行政区划") + private String adcd; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java index bc377678..039e68a3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalPlanMapper.java @@ -20,11 +20,11 @@ public interface DfAnimalPlanMapper extends BaseMapper { @Select("