From 865b70121c29b7944b1c1b68a6569a2211606dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 29 Aug 2023 15:21:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=BB=BAwater-quality=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service-api/pom.xml | 1 + hzims-service-api/water-quality-api/pom.xml | 20 ++ .../hnac/hzims/waterquality/entity/WqConfigD.java | 24 ++ .../hnac/hzims/waterquality/entity/WqWfrinfB.java | 54 +++ .../hnac/hzims/waterquality/entity/WqWqsinfB.java | 59 +++ .../hnac/hzims/waterquality/entity/WqWrrinfB.java | 22 ++ .../hzims/waterquality/feign/IWqWqsinfBClient.java | 50 +++ .../hnac/hzims/waterquality/vo/WqWqsinfBVo.java | 7 + hzims-service/pom.xml | 1 + hzims-service/water-quality/pom.xml | 68 ++++ .../waterquality/WaterQualityApplication.java | 51 +++ .../controller/WqConfigDController.java | 125 +++++++ .../controller/WqDealDataController.java | 179 ++++++++++ .../controller/WqWfrinfBController.java | 128 +++++++ .../controller/WqWqsinfBController.java | 151 ++++++++ .../controller/WqWrrinfBController.java | 128 +++++++ .../hzims/waterquality/mapper/WqConfigDMapper.java | 12 + .../hzims/waterquality/mapper/WqConfigDMapper.xml | 10 + .../hzims/waterquality/mapper/WqWfrinfBMapper.java | 8 + .../hzims/waterquality/mapper/WqWfrinfBMapper.xml | 5 + .../hzims/waterquality/mapper/WqWqsinfBMapper.java | 30 ++ .../hzims/waterquality/mapper/WqWqsinfBMapper.xml | 5 + .../hzims/waterquality/mapper/WqWrrinfBMapper.java | 8 + .../hzims/waterquality/mapper/WqWrrinfBMapper.xml | 5 + .../waterquality/service/IWqConfigDService.java | 21 ++ .../waterquality/service/IWqDealDataService.java | 20 ++ .../waterquality/service/IWqWfrinfBService.java | 9 + .../waterquality/service/IWqWqsinfBService.java | 30 ++ .../waterquality/service/IWqWrrinfBService.java | 8 + .../service/impl/WqConfigDServiceImpl.java | 48 +++ .../service/impl/WqDealDataServiceImpl.java | 397 +++++++++++++++++++++ .../service/impl/WqWfrinfBServiceImpl.java | 13 + .../service/impl/WqWqsinfBServiceServiceImpl.java | 34 ++ .../service/impl/WqWrrinfBServiceImpl.java | 13 + .../hnac/hzims/waterquality/util/ParamUtil.java | 54 +++ .../waterquality/wrapper/WqWqsinfBWrapper.java | 26 ++ .../src/main/resources/application-dev.yml | 30 ++ .../src/main/resources/application-prod.yml | 28 ++ .../src/main/resources/application-test.yml | 28 ++ .../src/main/resources/application.yml | 13 + 40 files changed, 1923 insertions(+) create mode 100644 hzims-service-api/water-quality-api/pom.xml create mode 100644 hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java create mode 100644 hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java create mode 100644 hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java create mode 100644 hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java create mode 100644 hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java create mode 100644 hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java create mode 100644 hzims-service/water-quality/pom.xml create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/WaterQualityApplication.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqConfigDController.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqDealDataController.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWfrinfBController.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWqsinfBController.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWrrinfBController.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.xml create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.xml create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.xml create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.xml create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqConfigDService.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqDealDataService.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWfrinfBService.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWqsinfBService.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWrrinfBService.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqConfigDServiceImpl.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqDealDataServiceImpl.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWfrinfBServiceImpl.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWqsinfBServiceServiceImpl.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWrrinfBServiceImpl.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/util/ParamUtil.java create mode 100644 hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/wrapper/WqWqsinfBWrapper.java create mode 100644 hzims-service/water-quality/src/main/resources/application-dev.yml create mode 100644 hzims-service/water-quality/src/main/resources/application-prod.yml create mode 100644 hzims-service/water-quality/src/main/resources/application-test.yml create mode 100644 hzims-service/water-quality/src/main/resources/application.yml diff --git a/hzims-service-api/pom.xml b/hzims-service-api/pom.xml index 62171b4..8fcd395 100644 --- a/hzims-service-api/pom.xml +++ b/hzims-service-api/pom.xml @@ -31,6 +31,7 @@ digital-twin-display-api dam-safety-api video-image-api + water-quality-api diff --git a/hzims-service-api/water-quality-api/pom.xml b/hzims-service-api/water-quality-api/pom.xml new file mode 100644 index 0000000..c203bd2 --- /dev/null +++ b/hzims-service-api/water-quality-api/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.hnac.hzims + hzims-service-api + 4.0.0-SNAPSHOT + + + water-quality-api + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java new file mode 100644 index 0000000..c69e21a --- /dev/null +++ b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqConfigD.java @@ -0,0 +1,24 @@ +package com.hnac.hzims.waterquality.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *水质监测指标配置 + */ +@Data +@TableName("wq_config_d") +public class WqConfigD implements Serializable { + @ApiModelProperty("测站编码") + @TableId(type=IdType.INPUT) + private String stcd; + @ApiModelProperty("指标类型") + private String type; + @ApiModelProperty("指标值") + private String value; +} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java new file mode 100644 index 0000000..6cd688b --- /dev/null +++ b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWfrinfB.java @@ -0,0 +1,54 @@ +package com.hnac.hzims.waterquality.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + + +/** + *水功能区基本信息 + */ +@Data +@TableName("wq_wfrinf_b") +@EqualsAndHashCode(callSuper = true) +public class WqWfrinfB extends BaseEntity { + @ApiModelProperty("水功能区代码") + private String wfrcd; + @ApiModelProperty("水功能区名称") + private String wfrnm; + @ApiModelProperty("流域名称") + private String bsnm; + @ApiModelProperty("水系名称") + private String hnnm; + @ApiModelProperty("河流名称") + private String rvnm; + @ApiModelProperty("水功能区起始断面名称") + private String wfrscsnm; + @ApiModelProperty("水功能区起始断面经度") + private Double wfrscslgtd; + @ApiModelProperty("水功能区起始断面纬度") + private Double wfrscslttd; + @ApiModelProperty("水功能区终止断面名称") + private String wfrecsnm; + @ApiModelProperty("水功能区终止断面经度") + private Double wfrecslgtd; + @ApiModelProperty("水功能区终止断面纬度") + private Double wfrecslttd; + + @ApiModelProperty("行政区划码") + private String addvcd; + @ApiModelProperty("水功能区长度") + private Double wfrln; + @ApiModelProperty("水功能区库容") + private Double wfrrc; + @ApiModelProperty("水功能区面积") + private Double wfrar; + @ApiModelProperty("水功能区水质目标") + private String wfrwqt; + @ApiModelProperty("水功能区功能排序") + private String wfrwfo; + @ApiModelProperty("备注") + private String nt; +} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java new file mode 100644 index 0000000..96c7c70 --- /dev/null +++ b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWqsinfB.java @@ -0,0 +1,59 @@ +package com.hnac.hzims.waterquality.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.util.Date; + +/** + *水质监测站 + */ +@Data +@TableName("wq_wqsinf_b") +@EqualsAndHashCode(callSuper = true) +public class WqWqsinfB extends BaseEntity { + @ApiModelProperty("测站编码") + private String stcd; + @ApiModelProperty("测站名称") + private String stnm; + @ApiModelProperty("测站等级") + private String stgrd; + @ApiModelProperty("流域名称") + private String bsnm; + @ApiModelProperty("水系名称") + private String hnnm; + @ApiModelProperty("河流名称") + private String rvnm; + @ApiModelProperty("经度") + private Double lgtd; + @ApiModelProperty("纬度") + private Double lttd; + @ApiModelProperty("站址") + private String stlc; + @ApiModelProperty("行政区划码") + private String addvcd; + @ApiModelProperty("水资源分区码") + private String wrrcd; + @ApiModelProperty("水功能区划码") + private String wfrcd; + @ApiModelProperty("管理单位") + private String adag; + @ApiModelProperty("监测单位") + private String mnag; + @ApiModelProperty("监测频次") + private Integer mnfrq; + @ApiModelProperty("自动监测") + private Integer atmn; + @ApiModelProperty("建站年月") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date esstym; + @ApiModelProperty("撤站年月") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date wdstym; + @ApiModelProperty("备注") + private String nt; +} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java new file mode 100644 index 0000000..b09563b --- /dev/null +++ b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/entity/WqWrrinfB.java @@ -0,0 +1,22 @@ +package com.hnac.hzims.waterquality.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + + +/** + * 水资源分区基本信息 + */ +@Data +@TableName("wq_wrrinf_b") +public class WqWrrinfB extends BaseEntity { + @ApiModelProperty("水资源分区码") + private String wrrcd; + @ApiModelProperty("水资源分区名称") + private String wrrnm; + @ApiModelProperty("水资源分区面积") + private Double wrr5r; + +} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java new file mode 100644 index 0000000..a80f5c4 --- /dev/null +++ b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/feign/IWqWqsinfBClient.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright Example, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * Example, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.hnac.hzims.waterquality.feign; + +import com.hnac.hzims.waterquality.vo.WqWqsinfBVo; +import org.springblade.core.launch.constant.AppConstant; +import org.springblade.core.tool.api.R; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * Example Feign接口类 + * + * @author Chill + */ +@FeignClient( + value = AppConstant.APPLICATION_DESK_NAME +) +public interface IWqWqsinfBClient { + + String API_PREFIX = "/wqWqsinfBClient"; + String LIST = API_PREFIX + "/list"; + + /** + * 获取Example列表 + * + * @param number + * @return + */ + @GetMapping(LIST) + R> list(@RequestParam("number") Integer number); + +} diff --git a/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java new file mode 100644 index 0000000..9d05b72 --- /dev/null +++ b/hzims-service-api/water-quality-api/src/main/java/com/hnac/hzims/waterquality/vo/WqWqsinfBVo.java @@ -0,0 +1,7 @@ +package com.hnac.hzims.waterquality.vo; + + +import com.hnac.hzims.waterquality.entity.WqWqsinfB; + +public class WqWqsinfBVo extends WqWqsinfB { +} diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index 46c8839..53bf722 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -31,6 +31,7 @@ digital-twin-display dam-safety video-image + water-quality diff --git a/hzims-service/water-quality/pom.xml b/hzims-service/water-quality/pom.xml new file mode 100644 index 0000000..1e83802 --- /dev/null +++ b/hzims-service/water-quality/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + com.hnac.hzims + hzims-service + 4.0.0-SNAPSHOT + + + water-quality + + + 8 + 8 + UTF-8 + + + + + + + org.springblade + blade-core-boot + + + org.springblade + blade-starter-swagger + + + org.springblade + blade-starter-oss-all + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + org.springblade + blade-core-test + test + + + org.springblade + blade-core-auto + compile + + + com.hnac.hzims + water-quality-api + ${hzims.project.version} + compile + + + org.springblade + blade-common + + + com.hnac.hzinfo.data + hzinfo-data-sdk + + + com.hnac.hzims + common-api + + + \ No newline at end of file diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/WaterQualityApplication.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/WaterQualityApplication.java new file mode 100644 index 0000000..9fdd761 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/WaterQualityApplication.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright Example, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * Example, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.hnac.hzims.waterquality; + +import org.mybatis.spring.annotation.MapperScan; +import org.springblade.core.cloud.feign.EnableBladeFeign; +import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableScheduling; + +/** + * Demo启动器 + * + * @author Chill + */ +@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) +@SpringCloudApplication +@MapperScan("com.hnac.hzims.**.mapper.**") +@EnableScheduling +@ComponentScan(basePackages = {"com.hnac.hzims.*"}) +public class WaterQualityApplication extends SpringBootServletInitializer { + + static String APPLICATION_NAME="water-quality"; + + public static void main(String[] args) { + BladeApplication.run(APPLICATION_NAME, WaterQualityApplication.class, args); + } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return BladeApplication.createSpringApplicationBuilder(builder, APPLICATION_NAME, WaterQualityApplication.class); + } +} + diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqConfigDController.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqConfigDController.java new file mode 100644 index 0000000..ae02fc3 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqConfigDController.java @@ -0,0 +1,125 @@ +package com.hnac.hzims.waterquality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.waterquality.entity.WqConfigD; +import com.hnac.hzims.waterquality.service.IWqConfigDService; +import com.hnac.hzims.waterquality.util.ParamUtil; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterQuality/wqConfigD") +@AllArgsConstructor +@Api(value = "水质监测指标配置", tags = "水质监测指标配置接口") +public class WqConfigDController extends BladeController implements CacheNames { + + private final IWqConfigDService wqConfigDService; + + + /** + * 分页 + */ + + @GetMapping("/pageList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "传入wqConfigD") + public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { + LambdaQueryWrapper wrapper= ParamUtil.conditionWqConfigD(param); + IPage pages = wqConfigDService.page(Condition.getPage(query), wrapper); + return R.data(pages); + } + + /** + * 列表 + */ + + @GetMapping("/list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 2) + @ApiOperation(value = "列表", notes = "传入wqConfigD") + public R> list(@ApiIgnore @RequestParam Map param) { + LambdaQueryWrapper wrapper=ParamUtil.conditionWqConfigD(param); + List list = wqConfigDService.list(wrapper); + return R.data(list); + } + + + /** + * 详情 + */ + + @GetMapping("/detail") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "详情", notes = "传入wqConfigD") + public R detail(WqConfigD wqConfigD) { + WqConfigD detail = wqConfigDService.getOne(Condition.getQueryWrapper(wqConfigD)); + return R.data(detail); + } + + /** + * 新增 + */ + + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入wqConfigD") + public R save(@RequestBody Map param) { + String stcd=String.valueOf(param.get("stcd")); + if(StringUtils.isBlank(stcd)){ + return R.fail("未传递测站编码"); + } + List> list=(List>)param.get("list"); + List wqConfigDs=new ArrayList<>(); + for(Map data:list){ + WqConfigD wqConfigD=new WqConfigD(); + wqConfigD.setStcd(stcd); + wqConfigD.setType(String.valueOf(data.get("type"))); + wqConfigD.setValue(String.valueOf(data.get("value"))); + wqConfigDs.add(wqConfigD); + } + if(wqConfigDs==null || wqConfigDs.isEmpty()){ + return R.fail("未传递配置参数"); + } + + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + wrapper.eq(WqConfigD::getStcd,stcd); + return R.status(wqConfigDService.batchSave(wqConfigDs,wrapper)); + } + + /** + * 删除 + */ + + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "逻辑删除", notes = "stcd") + public R remove(@ApiParam(value = "测站编码集合") @RequestParam String stcd) { + List list=Func.toStrList(stcd); + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + wrapper.in(WqConfigD::getStcd,list); + boolean temp = wqConfigDService.delete(wrapper); + return R.status(temp); + } + +} + diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqDealDataController.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqDealDataController.java new file mode 100644 index 0000000..02e8d45 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqDealDataController.java @@ -0,0 +1,179 @@ +package com.hnac.hzims.waterquality.controller; + +import com.hnac.hzims.entity.Report; +import com.hnac.hzims.entity.ReportData; +import com.hnac.hzims.enums.QueryDateTypeEnum; +import com.hnac.hzims.util.CommonUtil; +import com.hnac.hzims.waterquality.service.IWqDealDataService; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterQuality/wqData") +@AllArgsConstructor +@Api(value = "水质数据查询接口", tags = "水质数据查询接口") +public class WqDealDataController extends BladeController implements CacheNames { + + private final IWqDealDataService wqDealDataService; + +// DeviceClient deviceClient; + + /** + * + * @param stcd + * @param beginSpt + * @param endSpt + * @param type hour month year + * @param accessRules 取数规则0=整点值、1=最大值、2=最小值、3=平均值、4=（累计值/和值)、5=（变化值/差值） 6=最新值 + * @return + */ + + @ApiOperation("基础数据报表,数据查询和统计分析使用接口") + @RequestMapping(value = "/getReportData", method = RequestMethod.GET) + public R getReportData(String stcd, String beginSpt, String endSpt,String type,Integer accessRules) { + Map res= CommonUtil.getStartEnd(beginSpt,endSpt); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + //查询基础数据 + Report report = wqDealDataService.getReportData(stcd,type,accessRules, res.get("begin"), res.get("end")); + return R.data(report,"查询成功"); + } + + //同期比较 + + @ApiOperation("同期比较") + @RequestMapping(value = "/getCompare", method = RequestMethod.GET) + public R getCompare(String stcd, String beginSpt, String endSpt,Integer accessRules,String col) { + Map res=CommonUtil.getStartEnd(beginSpt,endSpt); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + //查询基础数据 + Report report = wqDealDataService.getCompare(stcd, QueryDateTypeEnum.DAY.getQueryDateType(),accessRules, res.get("begin"), res.get("end"), col); + return R.data(report,"查询成功"); + } + + //环比 + + @ApiOperation("同一时刻的环比") + @RequestMapping(value = "/getRingCompare", method = RequestMethod.GET) + public R getRingCompare(String stcd, String beginSpt, String endSpt, Integer hour) { + Map res=CommonUtil.getStartEnd(beginSpt,endSpt); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + //查询基础数据 + Report report = wqDealDataService.getRingCompare(stcd, res.get("begin"), res.get("end"),hour); + return R.data(report,"查询成功"); + } + + + + @ApiOperation("水质评价数据") + @RequestMapping(value = "/getEvaluate", method = RequestMethod.GET) + public R getEvaluate(String stcd, String type,String date) {//type 0实时 1历史 + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + List report = null; + if("1".equals(type)) { + Map res=CommonUtil.getStartEnd(date + " 00:00:00",date + " 23:59:59"); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + //查询基础数据 + report = wqDealDataService.getHistoryData(stcd,res.get("begin"), res.get("end")); + }else{ + report = wqDealDataService.getRealData(stcd); + } + return R.data(report,"查询成功"); + } + + + //同期比较 + + @ApiOperation("获取某一项的历史数据") + @RequestMapping(value = "/getHistoryDataByCol", method = RequestMethod.GET) + public R getHistoryDataByCol(String stcd, String beginSpt, String endSpt,Integer accessRules,String col) { + Map res=CommonUtil.getStartEnd(beginSpt,endSpt); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + //查询基础数据 + List report = wqDealDataService.getDataByCol(stcd,QueryDateTypeEnum.DAY.getQueryDateType(),accessRules, res.get("begin"), res.get("end"), col); + return R.data(report,"查询成功"); + } + + + @ApiOperation("表头列") + @RequestMapping(value = "/getTableHead", method = RequestMethod.GET) + public R getTableHead(String stcd) { + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + //查询基础数据 + List report = wqDealDataService.getSignages(stcd); + return R.data(report,"查询成功"); + } + + + //实时数据 + + @ApiOperation("实时数据接口") + @RequestMapping(value = "/getRealData", method = RequestMethod.GET) + public R getRealData(String stcd) { + +// R flag=deviceClient.isDeviceCodeExist(stcd); +// if(flag!=null && (!flag.isSuccess() || !flag.getData())){ +// return R.data(500,false, "设备实例不存在,请联系管理员"); +// } + + List report = wqDealDataService.getRealData(stcd); + return R.data(report,"查询成功"); + } + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWfrinfBController.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWfrinfBController.java new file mode 100644 index 0000000..5604e7a --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWfrinfBController.java @@ -0,0 +1,128 @@ +package com.hnac.hzims.waterquality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.waterquality.entity.WqWfrinfB; +import com.hnac.hzims.waterquality.service.IWqWfrinfBService; +import com.hnac.hzims.waterquality.util.ParamUtil; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; + +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterQuality/WqWfrinfB") +@AllArgsConstructor +@Api(value = "水功能区基本信息", tags = "水功能区基本信息接口") +public class WqWfrinfBController extends BladeController implements CacheNames { + + private final IWqWfrinfBService wqWfrinfBService; + + + /** + * 分页 + */ + + @GetMapping("/pageList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "wfrcd", value = "水功能区划码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "wfrnm", value = "水功能区名称", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "传入wqWfrinfB") + public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { + LambdaQueryWrapper wrapper= ParamUtil.conditionWqWfrinfB(param); + IPage pages = wqWfrinfBService.page(Condition.getPage(query), wrapper); + return R.data(pages); + } + + /** + * 列表 + */ + + @GetMapping("/list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "wfrcd", value = "水功能区划码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "wfrnm", value = "水功能区名称", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 2) + @ApiOperation(value = "列表", notes = "传入wqWfrinfB") + public R> list(@ApiIgnore @RequestParam Map param) { + LambdaQueryWrapper wrapper=ParamUtil.conditionWqWfrinfB(param); + List list = wqWfrinfBService.list(wrapper); + return R.data(list); + } + + + /** + * 详情 + */ + + @GetMapping("/detail") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "详情", notes = "传入wqWfrinfB") + public R detail(WqWfrinfB wqWfrinfB) { + WqWfrinfB detail = wqWfrinfBService.getOne(Condition.getQueryWrapper(wqWfrinfB)); + return R.data(detail); + } + + /** + * 新增 + */ + + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入wqWfrinfB") + public R save(@RequestBody WqWfrinfB wqWfrinfB) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(WqWfrinfB::getWfrcd,wqWfrinfB.getWfrcd()); + List list = wqWfrinfBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("水功能区代码已存在"); + } + + wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(WqWfrinfB::getWfrnm,wqWfrinfB.getWfrnm()); + list = wqWfrinfBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("水功能区名称已存在"); + } + + return R.status(wqWfrinfBService.save(wqWfrinfB)); + } + + /** + * 修改 + */ + + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入wqWfrinfB") + public R update(@RequestBody WqWfrinfB wqWfrinfB) { + return R.status(wqWfrinfBService.updateById(wqWfrinfB)); + } + + /** + * 删除 + */ + + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "逻辑删除", notes = "ids") + public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { + boolean temp = wqWfrinfBService.deleteLogic(Func.toLongList(ids)); + return R.status(temp); + } + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWqsinfBController.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWqsinfBController.java new file mode 100644 index 0000000..1d17fa1 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWqsinfBController.java @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright wqWqsinfB, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * wqWqsinfB, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.hnac.hzims.waterquality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.waterquality.entity.WqWqsinfB; +import com.hnac.hzims.waterquality.service.IWqWqsinfBService; +import com.hnac.hzims.waterquality.util.ParamUtil; +import com.hnac.hzims.waterquality.vo.WqWqsinfBVo; +import com.hnac.hzims.waterquality.wrapper.WqWqsinfBWrapper; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; + +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.util.Map; + +/** + * 水质监测站控制器 + * + * @author Chill + */ +@RestController +@RequestMapping("/waterQuality/wqWqsinfB") +@AllArgsConstructor +@Api(value = "水质监测站", tags = "水质监测站接口") +public class WqWqsinfBController extends BladeController implements CacheNames { + + private final IWqWqsinfBService wqWqsinfBService; + + + /** + * 分页 + */ + + @GetMapping("/pageList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "stnm", value = "测站名称", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "传入wqWqsinfB") + public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { + LambdaQueryWrapper wrapper= ParamUtil.conditionWqWqsinfB(param); + IPage pages = wqWqsinfBService.page(Condition.getPage(query), wrapper); + return R.data(WqWqsinfBWrapper.build().pageVO(pages)); + } + + /** + * 列表 + */ + + @GetMapping("/list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "stnm", value = "测站名称", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 2) + @ApiOperation(value = "列表", notes = "传入wqWqsinfB") + public R> list(@ApiIgnore @RequestParam Map param) { + LambdaQueryWrapper wrapper=ParamUtil.conditionWqWqsinfB(param); + List list = wqWqsinfBService.list(wrapper); + return R.data(WqWqsinfBWrapper.build().listVO(list)); + } + + + /** + * 详情 + */ + + @GetMapping("/detail") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "详情", notes = "传入wqWqsinfB") + public R detail(WqWqsinfB wqWqsinfB) { + WqWqsinfB detail = wqWqsinfBService.getOne(Condition.getQueryWrapper(wqWqsinfB)); + return R.data(WqWqsinfBWrapper.build().entityVO(detail)); + } + + /** + * 新增 + */ + + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入wqWqsinfB") + public R save(@RequestBody WqWqsinfB wqWqsinfB) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(WqWqsinfB::getStcd,wqWqsinfB.getStcd()); + List list = wqWqsinfBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("测站编码已存在"); + } + + wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(WqWqsinfB::getStnm,wqWqsinfB.getStnm()); + list = wqWqsinfBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("测站名称已存在"); + } + + return R.status(wqWqsinfBService.save(wqWqsinfB)); + } + + /** + * 修改 + */ + + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入wqWqsinfB") + public R update(@RequestBody WqWqsinfB wqWqsinfB) { + return R.status(wqWqsinfBService.updateById(wqWqsinfB)); + } + + /** + * 删除 + */ + + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "逻辑删除", notes = "ids") + public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { + boolean temp = wqWqsinfBService.deleteLogic(Func.toLongList(ids)); + return R.status(temp); + } + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWrrinfBController.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWrrinfBController.java new file mode 100644 index 0000000..697c530 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/controller/WqWrrinfBController.java @@ -0,0 +1,128 @@ +package com.hnac.hzims.waterquality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.waterquality.entity.WqWrrinfB; +import com.hnac.hzims.waterquality.service.IWqWrrinfBService; +import com.hnac.hzims.waterquality.util.ParamUtil; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; + +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterQuality/wqWrrinfB") +@AllArgsConstructor +@Api(value = "水资源分区基本信息", tags = "水资源分区基本信息接口") +public class WqWrrinfBController extends BladeController implements CacheNames { + + private final IWqWrrinfBService wqWrrinfBService; + + /** + * 分页 + */ + + @GetMapping("/pageList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "wrrcd", value = "水资源分区码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "wrrnm", value = "水资源分区名称", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "传入wqWrrinfB") + public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { + LambdaQueryWrapper wrapper= ParamUtil.conditionWqWrrinfB(param); + IPage pages = wqWrrinfBService.page(Condition.getPage(query), wrapper); + return R.data(pages); + } + + /** + * 列表 + */ + + @GetMapping("/list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "wrrcd", value = "水资源分区码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "wrrnm", value = "水资源分区名称", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 2) + @ApiOperation(value = "列表", notes = "传入wqWrrinfB") + public R> list(@ApiIgnore @RequestParam Map param) { + LambdaQueryWrapper wrapper=ParamUtil.conditionWqWrrinfB(param); + List list = wqWrrinfBService.list(wrapper); + return R.data(list); + } + + + /** + * 详情 + */ + + @GetMapping("/detail") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "详情", notes = "传入wqWrrinfB") + public R detail(WqWrrinfB wqWrrinfB) { + WqWrrinfB detail = wqWrrinfBService.getOne(Condition.getQueryWrapper(wqWrrinfB)); + return R.data(detail); + } + + /** + * 新增 + */ + + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入wqWrrinfB") + public R save(@RequestBody WqWrrinfB wqWrrinfB) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(WqWrrinfB::getWrrcd,wqWrrinfB.getWrrcd()); + List list = wqWrrinfBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("水资源分区码已存在"); + } + + wrapper=new LambdaQueryWrapper<>(); + wrapper.eq(WqWrrinfB::getWrrnm,wqWrrinfB.getWrrnm()); + list = wqWrrinfBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("水资源分区名称已存在"); + } + + + return R.status(wqWrrinfBService.save(wqWrrinfB)); + } + + /** + * 修改 + */ + + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入wqWrrinfB") + public R update(@RequestBody WqWrrinfB wqWrrinfB) { + return R.status(wqWrrinfBService.updateById(wqWrrinfB)); + } + + /** + * 删除 + */ + + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "逻辑删除", notes = "ids") + public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { + boolean temp = wqWrrinfBService.deleteLogic(Func.toLongList(ids)); + return R.status(temp); + } + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.java new file mode 100644 index 0000000..f4b2aaf --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.waterquality.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hnac.hzims.waterquality.entity.WqConfigD; +import org.apache.ibatis.annotations.Param; + + +import java.util.List; + +public interface WqConfigDMapper extends BaseMapper { + int batchSave(@Param("list") List list); +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.xml b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.xml new file mode 100644 index 0000000..e8c7d12 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqConfigDMapper.xml @@ -0,0 +1,10 @@ + + + + + insert into wq_config_d(STCD,TYPE,VALUE) values + + (#{item.stcd},#{item.type},#{item.value}) + + + \ No newline at end of file diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.java new file mode 100644 index 0000000..cb92865 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.java @@ -0,0 +1,8 @@ +package com.hnac.hzims.waterquality.mapper; + +import com.hnac.hzims.waterquality.entity.WqWfrinfB; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + + +public interface WqWfrinfBMapper extends UserDataScopeBaseMapper { +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.xml b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.xml new file mode 100644 index 0000000..d4a57da --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWfrinfBMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.java new file mode 100644 index 0000000..3ed932a --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright Example, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * Example, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.hnac.hzims.waterquality.mapper; + +import com.hnac.hzims.waterquality.entity.WqWqsinfB; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + + +/** + * Mapper 接口 + * + * @author Chill + */ +public interface WqWqsinfBMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.xml b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.xml new file mode 100644 index 0000000..378c80d --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWqsinfBMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.java new file mode 100644 index 0000000..0894a30 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.java @@ -0,0 +1,8 @@ +package com.hnac.hzims.waterquality.mapper; + +import com.hnac.hzims.waterquality.entity.WqWrrinfB; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + + +public interface WqWrrinfBMapper extends UserDataScopeBaseMapper { +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.xml b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.xml new file mode 100644 index 0000000..c3a33f3 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/mapper/WqWrrinfBMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqConfigDService.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqConfigDService.java new file mode 100644 index 0000000..faf62cc --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqConfigDService.java @@ -0,0 +1,21 @@ +package com.hnac.hzims.waterquality.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.waterquality.entity.WqConfigD; + + +import java.util.List; + +public interface IWqConfigDService { + IPage page(IPage page, LambdaQueryWrapper wrapper); + + List list(LambdaQueryWrapper wrapper); + + WqConfigD getOne(QueryWrapper wrapper); + + boolean batchSave(List list,LambdaQueryWrapper wrapper); + + boolean delete(LambdaQueryWrapper wrapper); +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqDealDataService.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqDealDataService.java new file mode 100644 index 0000000..e883e8e --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqDealDataService.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.waterquality.service; + +import com.hnac.hzims.entity.Report; +import com.hnac.hzims.entity.ReportData; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; + + +import java.util.Date; +import java.util.List; + +public interface IWqDealDataService { + Report getReportData(String stcd, String type, Integer accessRules, Date start, Date end); + Report getCompare(String stcd,String type,Integer accessRules,Date start,Date end,String col); + Report getRingCompare(String stcd,Date start,Date end,int hour); + List getDataByCol(String stcd, String type, Integer accessRules, Date start, Date end, String col); + List getRealData(String stcd); + List getSignages(String stcd); + List getHistoryData(String stcd, Date start, Date end); +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWfrinfBService.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWfrinfBService.java new file mode 100644 index 0000000..d252970 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWfrinfBService.java @@ -0,0 +1,9 @@ +package com.hnac.hzims.waterquality.service; + +import com.hnac.hzims.waterquality.entity.WqWfrinfB; +import org.springblade.core.mp.base.BaseService; + + +public interface IWqWfrinfBService extends BaseService { + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWqsinfBService.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWqsinfBService.java new file mode 100644 index 0000000..c8bd10b --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWqsinfBService.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright Example, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * Example, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.hnac.hzims.waterquality.service; + +import com.hnac.hzims.waterquality.entity.WqWqsinfB; +import org.springblade.core.mp.base.BaseService; + + +/** + * 服务类 + * + * @author Chill + */ +public interface IWqWqsinfBService extends BaseService { + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWrrinfBService.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWrrinfBService.java new file mode 100644 index 0000000..d540c50 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/IWqWrrinfBService.java @@ -0,0 +1,8 @@ +package com.hnac.hzims.waterquality.service; + +import com.hnac.hzims.waterquality.entity.WqWrrinfB; +import org.springblade.core.mp.base.BaseService; + + +public interface IWqWrrinfBService extends BaseService { +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqConfigDServiceImpl.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqConfigDServiceImpl.java new file mode 100644 index 0000000..34ba891 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqConfigDServiceImpl.java @@ -0,0 +1,48 @@ +package com.hnac.hzims.waterquality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import com.hnac.hzims.waterquality.entity.WqConfigD; +import com.hnac.hzims.waterquality.mapper.WqConfigDMapper; +import com.hnac.hzims.waterquality.service.IWqConfigDService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class WqConfigDServiceImpl implements IWqConfigDService { + @Resource + WqConfigDMapper wqConfigDMapper; + + @Override + public IPage page(IPage page, LambdaQueryWrapper wrapper) { + return wqConfigDMapper.selectPage(page,wrapper); + } + + @Override + public List list(LambdaQueryWrapper wrapper) { + return wqConfigDMapper.selectList(wrapper); + } + + @Override + public WqConfigD getOne(QueryWrapper wrapper) { + return wqConfigDMapper.selectOne(wrapper); + } + + @Override + public boolean batchSave(List list,LambdaQueryWrapper wrapper) { + delete(wrapper); + wqConfigDMapper.batchSave(list); + + return true; + } + + @Override + public boolean delete(LambdaQueryWrapper wrapper) { + int count=wqConfigDMapper.delete(wrapper); + return count>0; + } +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqDealDataServiceImpl.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqDealDataServiceImpl.java new file mode 100644 index 0000000..c7be9b3 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqDealDataServiceImpl.java @@ -0,0 +1,397 @@ +package com.hnac.hzims.waterquality.service.impl; + +import com.hnac.hzims.entity.Report; +import com.hnac.hzims.entity.ReportData; +import com.hnac.hzims.enums.QueryDateTypeEnum; +import com.hnac.hzims.util.CommonUtil; +import com.hnac.hzims.waterquality.service.IWqDealDataService; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyzeDataConditionPO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; +import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; +import com.hnac.hzinfo.sdk.analyse.AnalyseDataSearchClient; +import com.hnac.hzinfo.sdk.core.response.Result; +import com.hnac.hzinfo.sdk.real.RealDataSearchClient; +import org.springblade.core.tool.utils.StringUtil; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +@Service +public class WqDealDataServiceImpl implements IWqDealDataService { + + @Autowired + AnalyseDataSearchClient analyseDataSearchClient; + + @Autowired + RealDataSearchClient realDataSearchClient; + + + @Override + public List getRealData(String stcd){ + RealDataSearchPO po=new RealDataSearchPO(); + po.setAnalyzeCode(stcd); + List list=getSignages(stcd); + if(list==null || list.isEmpty()){ + return null; + } + List signages=new ArrayList<>(); + for(AnalyzeInstanceFieldVO vo:list){ + signages.add(vo.getSignage()); + } + po.setSignages(signages); + Result> result=realDataSearchClient.getRealDataByDeviceCode(po); + if(result==null || !result.isSuccess()){ + return null; + } + return result.getData(); + } + + + @Override + public List getSignages(String stcd){ + //查询列 + Result> result=analyseDataSearchClient.getInstanceFieldByAnalyseCode(stcd,1,""); + if(result==null || !result.isSuccess()){ + return null; + } + List analyzeInstanceFieldVOS=result.getData(); + + return analyzeInstanceFieldVOS; + } + + @Override + public List getHistoryData(String stcd, Date start, Date end) { + List result=new ArrayList<>(); + List signages=getSignages(stcd); + if(signages==null || signages.isEmpty()){ + return null; + } + List list=listDataReport(start, end, QueryDateTypeEnum.DAY,stcd,6,signages); + if(list==null || list.isEmpty()){ + return null; + } + for(ReportData data:list){ + FieldsData dd=new FieldsData(); + if(StringUtil.isNotBlank(data.getName())) { + dd.setFieldName(data.getName()); + }else{ + dd.setFieldName(getNameBySignage(data.getStcd(),signages)); + } + dd.setSignage(data.getStcd());//测站 换成 属性 + dd.setValue(data.getVal()); + dd.setTime(data.getKeyStr()); + dd.setQ(0); + result.add(dd); + } + return result; + } + + String getNameBySignage(String signage,List signages){ + for(AnalyzeInstanceFieldVO vo:signages){ + if(vo.getSignage().equals(signage)){ + return vo.getFieldName(); + } + } + return ""; + } + + @Override + public Report getReportData(String stcd, String type, Integer accessRules, Date start, Date end){ + //检查数据是否正常并转化 + final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); + if(stcd==null || "".equals(stcd)){ + return null; + } + + if(dtEnum ==null){ + return null; + } + + //设置基础数据 + List signages=getSignages(stcd); + if(signages==null || signages.isEmpty()){ + return null; + } + //初始化报表 + Report report = new Report(); + report.initBaseReport(signages.size(), start, end, dtEnum); + + //获取数据库某个站点不同时间要求的数据 + List timeDataList = listDataReport(start, end,dtEnum,stcd,accessRules,signages); + if(timeDataList==null || timeDataList.isEmpty()){ + return null; + } + for(int i=0;i tmpList=CommonUtil.getReportDataBySignage(timeDataList,signage); + for (ReportData reportData : tmpList) { + String value = reportData.getVal(); +// if (value != null && !"-".equals(value) && !"".equals(value.trim())) { +// value = new BigDecimal(value).setScale(3, BigDecimal.ROUND_DOWN).toString(); +// } + + if(value == null){ + value = "-"; + } + + report.setBaseCell(reportData.getKeyStr(), i, value); + } + } + + return report; + } + + @Override + public Report getCompare(String stcd, String type, Integer accessRules, Date start, Date end, String col) { + //检查数据是否正常并转化 + final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); + if(stcd==null || "".equals(stcd)){ + return null; + } + + if(dtEnum ==null){ + return null; + } + //初始化报表 + Report report = new Report(); + report.initCompareBaseReport(2, start, end, dtEnum); + + for(int i=0;i<2;i++){ + //当前日期范围 + List list=listDataReportByCol(subYear(start,i),subYear(end,i),dtEnum,stcd,accessRules,col,true); + if(list==null || list.isEmpty()){ + continue; + } + for (ReportData reportData : list) { + String value = reportData.getVal(); +// if (value != null && !"-".equals(value) && !"".equals(value.trim())) { +// value = new BigDecimal(value).setScale(3, BigDecimal.ROUND_DOWN).toString(); +// } + + if(value == null){ + value = "-"; + } + + report.setBaseCell(reportData.getKeyStr(), i, value); + } + } + + return report; + } + + private Date subYear(Date date,int year){ + Calendar calendar= Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.YEAR,-year); + return calendar.getTime(); + } + + @Override + public Report getRingCompare(String stcd, Date start, Date end,int hour) { + //检查数据是否正常并转化 + final QueryDateTypeEnum dtEnum = QueryDateTypeEnum.DAY; + //设置基础数据 + List signages=getSignages(stcd); + if(signages==null || signages.isEmpty()){ + return null; + } + //初始化报表 + Report report = new Report(); + report.initBaseRingReport(signages.size(), start, end, dtEnum); + + List reportDataList=listDataReport(start,end,QueryDateTypeEnum.HOUR,stcd,0,signages); + if(reportDataList==null || reportDataList.isEmpty()){ + return null; + } + String hourStr=hour>9? ""+hour : "0"+hour; + String keyStr=" "+hourStr; + + for(int i=0;i tmpList=CommonUtil.getReportDataBySignage(reportDataList,signage); + for (int j=0;j-1) { + String value = reportData.getVal(); +// if (value != null && !"-".equals(value) && !"".equals(value.trim())) { +// value = new BigDecimal(value).setScale(3, BigDecimal.ROUND_DOWN).toString(); +// } + + if (value == null) { + value = "-"; + } + + report.setBaseCell(reportData.getKeyStr(), i, value); + } + } + } + return report; + } + + @Override + public List getDataByCol(String stcd, String type, Integer accessRules, Date start, Date end, String col) { + //检查数据是否正常并转化 + final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); + if(stcd==null || "".equals(stcd)){ + return null; + } + + if(dtEnum ==null){ + return null; + } + //获取数据库某个站点不同时间要求的数据 + List timeDataList =listDataReportByCol(start, end,dtEnum,stcd,accessRules,col,false); + if(timeDataList==null || timeDataList.isEmpty()){ + return null; + } + return timeDataList; + } + + private List listDataReport(Date begin,Date endSt, QueryDateTypeEnum dtEnum, String deviceCode, Integer accessRules, List signages) { + //周期类型: 0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年) + Integer saveTimeType=2; + if(QueryDateTypeEnum.DAY.equals(dtEnum)){ + saveTimeType = 3; + } + if(QueryDateTypeEnum.MONTH.equals(dtEnum)){ + saveTimeType = 5; + } + if(QueryDateTypeEnum.YEAR.equals(dtEnum)){ + saveTimeType = 6; + } + + LocalDateTime start = LocalDateTime.ofInstant(begin.toInstant(), ZoneId.systemDefault()); + LocalDateTime end = LocalDateTime.ofInstant(endSt.toInstant(), ZoneId.systemDefault()); + + return getDataByDeviceCode(deviceCode,accessRules,saveTimeType,start,end,signages); + } + + private List listDataReportByCol(Date begin,Date endSt, QueryDateTypeEnum dtEnum, String deviceCode, + Integer accessRules, String col,boolean isCompare) { + //周期类型: 0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年) + Integer saveTimeType=2; + if(QueryDateTypeEnum.DAY.equals(dtEnum)){ + saveTimeType = 3; + } + if(QueryDateTypeEnum.MONTH.equals(dtEnum)){ + saveTimeType = 5; + } + if(QueryDateTypeEnum.YEAR.equals(dtEnum)){ + saveTimeType = 6; + } + + LocalDateTime start = LocalDateTime.ofInstant(begin.toInstant(), ZoneId.systemDefault()); + LocalDateTime end = LocalDateTime.ofInstant(endSt.toInstant(), ZoneId.systemDefault()); + + return getDataByDeviceCodeByCol(deviceCode,accessRules,saveTimeType,start,end,col,isCompare); + } + + + List getDataByDeviceCodeByCol(String deviceCode,Integer accessRules,Integer saveTimeType, + LocalDateTime start,LocalDateTime end,String col,boolean isCompare){ + List reportData=new ArrayList<>(); + AnalyseCodeByAnalyseDataPO po=new AnalyseCodeByAnalyseDataPO(); + po.setDeviceCode(deviceCode); + + List signboardConditions=new ArrayList<>(); + + AnalyzeDataConditionPO conditionPO = new AnalyzeDataConditionPO(); + conditionPO.setBeginTime(start); + conditionPO.setEndTime(end); + conditionPO.setSignages(col); +// conditionPO.setKeepFigures(3); + conditionPO.setAccessRules(accessRules); + conditionPO.setSaveTimeType(saveTimeType); + conditionPO.setTimeInterval(1); + conditionPO.setFull(1); + signboardConditions.add(conditionPO); + + + po.setSignboardConditions(signboardConditions); + + Result> result=analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); + if(result==null || !result.isSuccess()){ + return reportData; + } + List datas=result.getData(); + if(datas==null || datas.isEmpty()){ + return reportData; + } + for(AnalyzeDataConditionVO vo:datas){ + List dataTaosVOs=vo.getList(); + for(AnalyseDataTaosVO vv:dataTaosVOs) { + ReportData data=new ReportData(); + if(isCompare) { + data.setKeyStr(CommonUtil.getKey(vv.getTs())); + }else{ + data.setKeyStr(CommonUtil.getKeyBySaveTimeType(vv.getTs(),saveTimeType)); + } + data.setStcd(deviceCode);//测站 + data.setVal(vv.getVal()); + data.setName(vo.getName()); + reportData.add(data); + } + } + return reportData; + } + + List getDataByDeviceCode(String deviceCode,Integer accessRules,Integer saveTimeType, + LocalDateTime start,LocalDateTime end,List signages){ + List reportData=new ArrayList<>(); + AnalyseCodeByAnalyseDataPO po=new AnalyseCodeByAnalyseDataPO(); + po.setDeviceCode(deviceCode); + + List signboardConditions=new ArrayList<>(); + + for(AnalyzeInstanceFieldVO vo:signages) { + AnalyzeDataConditionPO conditionPO = new AnalyzeDataConditionPO(); + conditionPO.setBeginTime(start); + conditionPO.setEndTime(end); + conditionPO.setSignages(vo.getSignage()); +// conditionPO.setKeepFigures(3); + conditionPO.setAccessRules(accessRules); + conditionPO.setSaveTimeType(saveTimeType); + conditionPO.setTimeInterval(1); + conditionPO.setFull(1); + signboardConditions.add(conditionPO); + } + + po.setSignboardConditions(signboardConditions); + + Result> result=analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); + + if(result==null || !result.isSuccess()){ + return reportData; + } + List datas=result.getData(); + if(datas==null || datas.isEmpty()){ + return reportData; + } + + for(AnalyzeDataConditionVO vo:datas){ + List dataTaosVOs=vo.getList(); + for(AnalyseDataTaosVO vv:dataTaosVOs) { + ReportData data=new ReportData(); + data.setKeyStr(CommonUtil.getKeyBySaveTimeType(vv.getTs(),saveTimeType)); + data.setStcd(vo.getSignage());//测站变成属性值 + data.setVal(vv.getVal()); + data.setName(vo.getName()); + reportData.add(data); + } + } + return reportData; + } + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWfrinfBServiceImpl.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWfrinfBServiceImpl.java new file mode 100644 index 0000000..0860874 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWfrinfBServiceImpl.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.waterquality.service.impl; + +import com.hnac.hzims.waterquality.entity.WqWfrinfB; +import com.hnac.hzims.waterquality.mapper.WqWfrinfBMapper; +import com.hnac.hzims.waterquality.service.IWqWfrinfBService; +import org.springblade.core.mp.base.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +@Service +public class WqWfrinfBServiceImpl extends BaseServiceImpl implements IWqWfrinfBService { + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWqsinfBServiceServiceImpl.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWqsinfBServiceServiceImpl.java new file mode 100644 index 0000000..933d522 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWqsinfBServiceServiceImpl.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright Example, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * Example, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.hnac.hzims.waterquality.service.impl; + +import com.hnac.hzims.waterquality.entity.WqWqsinfB; +import com.hnac.hzims.waterquality.mapper.WqWqsinfBMapper; +import com.hnac.hzims.waterquality.service.IWqWqsinfBService; +import org.springblade.core.mp.base.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author Chill + */ +@Service +public class WqWqsinfBServiceServiceImpl extends BaseServiceImpl implements IWqWqsinfBService { + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWrrinfBServiceImpl.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWrrinfBServiceImpl.java new file mode 100644 index 0000000..e3d6ad5 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/service/impl/WqWrrinfBServiceImpl.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.waterquality.service.impl; + +import com.hnac.hzims.waterquality.entity.WqWrrinfB; +import com.hnac.hzims.waterquality.mapper.WqWrrinfBMapper; +import com.hnac.hzims.waterquality.service.IWqWrrinfBService; +import org.springblade.core.mp.base.BaseServiceImpl; + +import org.springframework.stereotype.Service; + +@Service +public class WqWrrinfBServiceImpl extends BaseServiceImpl implements IWqWrrinfBService { + +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/util/ParamUtil.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/util/ParamUtil.java new file mode 100644 index 0000000..e00f39e --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/util/ParamUtil.java @@ -0,0 +1,54 @@ +package com.hnac.hzims.waterquality.util; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.waterquality.entity.WqConfigD; +import com.hnac.hzims.waterquality.entity.WqWfrinfB; +import com.hnac.hzims.waterquality.entity.WqWqsinfB; +import com.hnac.hzims.waterquality.entity.WqWrrinfB; + + +import java.util.Map; + +public class ParamUtil { + public static LambdaQueryWrapper conditionWqWqsinfB(Map param){ + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + if(param.get("stcd")!=null) { + wrapper.like(WqWqsinfB::getStcd,param.get("stcd")); + } + if(param.get("stnm")!=null) { + wrapper.like(WqWqsinfB::getStnm,param.get("stnm")); + } + return wrapper; + } + + public static LambdaQueryWrapper conditionWqConfigD(Map param){ + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + if(param.get("stcd")!=null) { + wrapper.like(WqConfigD::getStcd,param.get("stcd")); + } + return wrapper; + } + + public static LambdaQueryWrapper conditionWqWfrinfB(Map param){ + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + if(param.get("wfrcd")!=null) { + wrapper.like(WqWfrinfB::getWfrcd,param.get("wfrcd")); + } + if(param.get("wfrnm")!=null) { + wrapper.like(WqWfrinfB::getWfrnm,param.get("wfrnm")); + } + return wrapper; + } + + + public static LambdaQueryWrapper conditionWqWrrinfB(Map param){ + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + if(param.get("wrrcd")!=null) { + wrapper.like(WqWrrinfB::getWrrcd,param.get("wrrcd")); + } + if(param.get("wrrnm")!=null) { + wrapper.like(WqWrrinfB::getWrrnm,param.get("wrrnm")); + } + return wrapper; + } +} diff --git a/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/wrapper/WqWqsinfBWrapper.java b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/wrapper/WqWqsinfBWrapper.java new file mode 100644 index 0000000..5824358 --- /dev/null +++ b/hzims-service/water-quality/src/main/java/com/hnac/hzims/waterquality/wrapper/WqWqsinfBWrapper.java @@ -0,0 +1,26 @@ +package com.hnac.hzims.waterquality.wrapper; + +import com.hnac.hzims.waterquality.entity.WqWqsinfB; +import com.hnac.hzims.waterquality.vo.WqWqsinfBVo; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + + +import java.util.Objects; + +public class WqWqsinfBWrapper extends BaseEntityWrapper { + public WqWqsinfBWrapper() { + } + + public static WqWqsinfBWrapper build() { + return new WqWqsinfBWrapper(); + } + + @Override + public WqWqsinfBVo entityVO(WqWqsinfB entity) { + WqWqsinfBVo wqWqsinfBVo = Objects.requireNonNull(BeanUtil.copy(entity, WqWqsinfBVo.class)); + + return wqWqsinfBVo; + } +} + diff --git a/hzims-service/water-quality/src/main/resources/application-dev.yml b/hzims-service/water-quality/src/main/resources/application-dev.yml new file mode 100644 index 0000000..50a4ea7 --- /dev/null +++ b/hzims-service/water-quality/src/main/resources/application-dev.yml @@ -0,0 +1,30 @@ +#服务器端口 +server: + port: 8200 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: root + password: 123456 + slave: + url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: root + password: 123456 +demo: + name: aaa diff --git a/hzims-service/water-quality/src/main/resources/application-prod.yml b/hzims-service/water-quality/src/main/resources/application-prod.yml new file mode 100644 index 0000000..da89262 --- /dev/null +++ b/hzims-service/water-quality/src/main/resources/application-prod.yml @@ -0,0 +1,28 @@ +#服务器端口 +server: + port: 8200 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.prod.url} +# username: ${blade.datasource.prod.username} +# password: ${blade.datasource.prod.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: ${blade.datasource.demo.master.url} + username: ${blade.datasource.demo.master.username} + password: ${blade.datasource.demo.master.password} + slave: + url: ${blade.datasource.demo.slave.url} + username: ${blade.datasource.demo.slave.username} + password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/water-quality/src/main/resources/application-test.yml b/hzims-service/water-quality/src/main/resources/application-test.yml new file mode 100644 index 0000000..4b4e157 --- /dev/null +++ b/hzims-service/water-quality/src/main/resources/application-test.yml @@ -0,0 +1,28 @@ +#服务器端口 +server: + port: 8200 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.test.url} +# username: ${blade.datasource.test.username} +# password: ${blade.datasource.test.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: ${blade.datasource.demo.master.url} + username: ${blade.datasource.demo.master.username} + password: ${blade.datasource.demo.master.password} + slave: + url: ${blade.datasource.demo.slave.url} + username: ${blade.datasource.demo.slave.username} + password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/water-quality/src/main/resources/application.yml b/hzims-service/water-quality/src/main/resources/application.yml new file mode 100644 index 0000000..0952a13 --- /dev/null +++ b/hzims-service/water-quality/src/main/resources/application.yml @@ -0,0 +1,13 @@ +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: + - org.springbalde + - com.hnac + + From 6108e81fef9fa69902df451f33659d30bc3eb813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 29 Aug 2023 15:28:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=BB=BAwater-rain=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service-api/pom.xml | 1 + hzims-service-api/water-rain-api/pom.xml | 20 + .../com/hnac/hzims/waterrain/bo/StationResp.java | 26 + .../com/hnac/hzims/waterrain/entity/HzStPptnR.java | 13 + .../hnac/hzims/waterrain/entity/HzStRiverR.java | 14 + .../com/hnac/hzims/waterrain/entity/HzStRsvrR.java | 15 + .../hzims/waterrain/entity/ReorganizeData.java | 14 + .../hnac/hzims/waterrain/entity/ReorganizeLog.java | 13 + .../com/hnac/hzims/waterrain/entity/StStbprpB.java | 74 ++ .../waterrain/enums/HistoryDataCalcTypeEnum.java | 35 + .../hzims/waterrain/enums/WaterFlowRainEnum.java | 35 + .../hzims/waterrain/feign/IStStbprpBClient.java | 28 + .../waterrain/feign/IStStbprpBDataClient.java | 19 + .../com/hnac/hzims/waterrain/vo/StStbprpBVo.java | 9 + hzims-service/pom.xml | 1 + hzims-service/water-rain/pom.xml | 77 ++ .../hnac/hzims/waterrain/WaterRainApplication.java | 29 + .../controller/ReorganizeLogController.java | 51 ++ .../waterrain/controller/StStbprpBController.java | 151 ++++ .../controller/StStbprpBDataController.java | 163 ++++ .../controller/WaterRainReorganizeController.java | 145 ++++ .../hzims/waterrain/feign/StStbprpBClient.java | 26 + .../hzims/waterrain/feign/StStbprpBDataClient.java | 20 + .../listener/UploadWaterFlowRainDataListener.java | 336 ++++++++ .../waterrain/mapper/ReorganizeLogMapper.java | 11 + .../hzims/waterrain/mapper/ReorganizeLogMapper.xml | 33 + .../hzims/waterrain/mapper/StStbprpBMapper.java | 8 + .../hzims/waterrain/mapper/StStbprpBMapper.xml | 5 + .../mapper/WaterRainReorganizeMapper.java | 28 + .../waterrain/mapper/WaterRainReorganizeMapper.xml | 150 ++++ .../waterrain/service/IReorganizeLogService.java | 12 + .../waterrain/service/IStStbprpBDataService.java | 47 ++ .../hzims/waterrain/service/IStStbprpBService.java | 8 + .../service/IWaterRainReorganizeService.java | 34 + .../hzims/waterrain/service/IWaterRainService.java | 4 + .../service/impl/ReorganizeLogServiceImpl.java | 45 ++ .../service/impl/StStbprpBDataServiceImpl.java | 896 +++++++++++++++++++++ .../service/impl/StStbprpBServiceImpl.java | 11 + .../impl/WaterRainReorganizeServiceImpl.java | 235 ++++++ .../service/impl/WaterRainServiceImpl.java | 8 + .../com/hnac/hzims/waterrain/util/DateUtil.java | 31 + .../com/hnac/hzims/waterrain/util/GisUtil.java | 64 ++ .../com/hnac/hzims/waterrain/util/ParamUtil.java | 26 + .../hzims/waterrain/wrapper/StStbprpBWrapper.java | 27 + .../src/main/resources/application-dev.yml | 30 + .../src/main/resources/application-prod.yml | 28 + .../src/main/resources/application-test.yml | 28 + .../water-rain/src/main/resources/application.yml | 13 + .../water-rain/src/main/resources/banner.txt | 7 + 49 files changed, 3104 insertions(+) create mode 100644 hzims-service-api/water-rain-api/pom.xml create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java create mode 100644 hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java create mode 100644 hzims-service/water-rain/pom.xml create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/WaterRainApplication.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/ReorganizeLogController.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBController.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBDataController.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/WaterRainReorganizeController.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBClient.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBDataClient.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/listener/UploadWaterFlowRainDataListener.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.xml create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.xml create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.xml create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IReorganizeLogService.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBDataService.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBService.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainReorganizeService.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainService.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/ReorganizeLogServiceImpl.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBDataServiceImpl.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBServiceImpl.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainReorganizeServiceImpl.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainServiceImpl.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/DateUtil.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/GisUtil.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/ParamUtil.java create mode 100644 hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/wrapper/StStbprpBWrapper.java create mode 100644 hzims-service/water-rain/src/main/resources/application-dev.yml create mode 100644 hzims-service/water-rain/src/main/resources/application-prod.yml create mode 100644 hzims-service/water-rain/src/main/resources/application-test.yml create mode 100644 hzims-service/water-rain/src/main/resources/application.yml create mode 100644 hzims-service/water-rain/src/main/resources/banner.txt diff --git a/hzims-service-api/pom.xml b/hzims-service-api/pom.xml index 8fcd395..6fc1e55 100644 --- a/hzims-service-api/pom.xml +++ b/hzims-service-api/pom.xml @@ -32,6 +32,7 @@ dam-safety-api video-image-api water-quality-api + water-rain-api diff --git a/hzims-service-api/water-rain-api/pom.xml b/hzims-service-api/water-rain-api/pom.xml new file mode 100644 index 0000000..a919a96 --- /dev/null +++ b/hzims-service-api/water-rain-api/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.hnac.hzims + hzims-service-api + 4.0.0-SNAPSHOT + + + water-rain-api + + + 8 + 8 + UTF-8 + + + \ No newline at end of file diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java new file mode 100644 index 0000000..2691c22 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/bo/StationResp.java @@ -0,0 +1,26 @@ +package com.hnac.hzims.waterrain.bo; + + +import com.hnac.hzims.waterrain.entity.StStbprpB; + +public class StationResp { + private StStbprpB stStbprpB; + + private Object obj; + + public StStbprpB getStStbprpB() { + return stStbprpB; + } + + public void setStStbprpB(StStbprpB stStbprpB) { + this.stStbprpB = stStbprpB; + } + + public Object getObj() { + return obj; + } + + public void setObj(Object obj) { + this.obj = obj; + } +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java new file mode 100644 index 0000000..dda2d53 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStPptnR.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.waterrain.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class HzStPptnR implements Serializable { + private String stcd; + private Date tm; + private Double drp; +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java new file mode 100644 index 0000000..d69750a --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRiverR.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.waterrain.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class HzStRiverR implements Serializable { + private String stcd; + private Date tm; + private Double z; + private Double q; +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java new file mode 100644 index 0000000..feb5928 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/HzStRsvrR.java @@ -0,0 +1,15 @@ +package com.hnac.hzims.waterrain.entity; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class HzStRsvrR implements Serializable { + private String stcd;//测站编码 + private Date tm;//时间 + private Double rz; //水位 + private Double inq;//流量 +} + diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java new file mode 100644 index 0000000..fee68a4 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeData.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.waterrain.entity; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class ReorganizeData { + private String yearMonth; + private String stcd; + private String sttp; + private List> data; +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java new file mode 100644 index 0000000..355fb4a --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/ReorganizeLog.java @@ -0,0 +1,13 @@ +package com.hnac.hzims.waterrain.entity; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ReorganizeLog implements Serializable { + private String stcd; + private String yearMonth; + private String operateUser; + private String checkUser; +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java new file mode 100644 index 0000000..5c8fb95 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/entity/StStbprpB.java @@ -0,0 +1,74 @@ +package com.hnac.hzims.waterrain.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 水雨情测站信息表 + */ +@Data +@TableName("st_stbprp_b") +public class StStbprpB extends BaseEntity { + @ApiModelProperty("机构id") + private String orgId; + @ApiModelProperty("河流id") + private String rvid; + @ApiModelProperty("水系id") + private String hnid; + @ApiModelProperty("流域id") + private String bsid; + @ApiModelProperty("测站编码") + private String stcd; + @ApiModelProperty("测站名称") + private String stnm; + @ApiModelProperty("河流名称") + private String rvnm; + @ApiModelProperty("水系名称") + private String hnnm; + @ApiModelProperty("流域名称") + private String bsnm; + @ApiModelProperty("经度(度分秒)") + private String lgtd; + @ApiModelProperty("纬度(度分秒)") + private String lttd; + @ApiModelProperty("站址") + private String stlc; + @ApiModelProperty("行政区划码") + private String addvcd; + @ApiModelProperty("基面修正基值") + private Double mdbz; + @ApiModelProperty("基面修正参数") + private Double mdpr; + @ApiModelProperty("基面名称") + private String dtmnm; + @ApiModelProperty("基面高程") + private Double dtmel; + @ApiModelProperty("站类") + private String sttp; + @ApiModelProperty("拍报段次") + private Double dfrtms; + @ApiModelProperty("拍报项目") + private String fritm; + @ApiModelProperty("报讯等级") + private String frgrd; + @ApiModelProperty("始报年月") + private String bgfrym; + @ApiModelProperty("截报年月") + private String edfrym; + @ApiModelProperty("管理机构") + private String admauth; + @ApiModelProperty("测站岸别") + private String stbk; + @ApiModelProperty("集水面积") + private Double drna; + @ApiModelProperty("拼音码") + private String phcd; + @ApiModelProperty("数值经度") + private Double nlgtd; + @ApiModelProperty("数值纬度") + private Double nlttd; + @ApiModelProperty("水库编码") + private String rscd; +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java new file mode 100644 index 0000000..a840f68 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/HistoryDataCalcTypeEnum.java @@ -0,0 +1,35 @@ +package com.hnac.hzims.waterrain.enums; + +public enum HistoryDataCalcTypeEnum { + ZERO(0,"整点值/最早值"), + ONE(1,"最大值"), + TWO(2,"最小值"), + THREE(3,"平均值"), + FOUR(4,"累计值/和值"), + FIVE(5,"变化值/差值"), + SIX(6,"最新值"); + + Integer strategy; + String desc; + + HistoryDataCalcTypeEnum(Integer strategy, String desc){ + this.strategy = strategy; + this.desc = desc; + } + + public Integer getStrategy() { + return strategy; + } + + public void setStrategy(Integer strategy) { + this.strategy = strategy; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java new file mode 100644 index 0000000..9858933 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/enums/WaterFlowRainEnum.java @@ -0,0 +1,35 @@ +package com.hnac.hzims.waterrain.enums; + +public enum WaterFlowRainEnum { + RR("RR","水库水文站"), + ZZ("ZZ","河道水位站"), + ZQ("ZQ","河道水文站"), + PP("PP","雨量站"), + + LEVEL("level","水位"), + FLOW("flow","流量"), + RAIN("rain","降水"); + private String code; + private String name; + + WaterFlowRainEnum(String code,String name){ + this.code=code; + this.name=name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java new file mode 100644 index 0000000..13c92ea --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBClient.java @@ -0,0 +1,28 @@ +package com.hnac.hzims.waterrain.feign; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +@FeignClient( + value = "water-rain-monitor", + url = "${feign.water-rain-monitor:}" +) +public interface IStStbprpBClient { + String API_PREFIX = "/stStbprpBClient"; + String DETAIL = API_PREFIX + "/detail"; + String LIST = API_PREFIX + "/list"; + + /** + * 获取测站详情 + * @return + */ + @GetMapping(DETAIL) + StStbprpB detail(LambdaQueryWrapper wrapper); + + @GetMapping(LIST) + List list(LambdaQueryWrapper wrapper); +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java new file mode 100644 index 0000000..091e381 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/feign/IStStbprpBDataClient.java @@ -0,0 +1,19 @@ +package com.hnac.hzims.waterrain.feign; + +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.Date; +import java.util.Map; + +@FeignClient( + value = "water-rain-monitor", + url = "${feign.water-rain-monitor:}" +) +public interface IStStbprpBDataClient { + String API_PREFIX = "/stStbprpBDataClient"; + String QUERYMAXORMIN = API_PREFIX + "/queryMaxOrMin"; + + @GetMapping(QUERYMAXORMIN) + Map queryMaxOrMin(String deviceCode, Date startTime, Date endTime, Integer calcType,Integer saveTimeType,Integer timeInterval, String col); +} diff --git a/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java new file mode 100644 index 0000000..8d1dfb8 --- /dev/null +++ b/hzims-service-api/water-rain-api/src/main/java/com/hnac/hzims/waterrain/vo/StStbprpBVo.java @@ -0,0 +1,9 @@ +package com.hnac.hzims.waterrain.vo; + +import com.hnac.hzims.waterrain.entity.StStbprpB; +import lombok.Data; + +@Data +public class StStbprpBVo extends StStbprpB { + private String sttpName; +} diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index 53bf722..e69bc7f 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -32,6 +32,7 @@ dam-safety video-image water-quality + water-rain diff --git a/hzims-service/water-rain/pom.xml b/hzims-service/water-rain/pom.xml new file mode 100644 index 0000000..14d3992 --- /dev/null +++ b/hzims-service/water-rain/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + com.hnac.hzims + hzims-service + 4.0.0-SNAPSHOT + + + water-rain + + + 8 + 8 + UTF-8 + + + + + + + org.springblade + blade-core-boot + + + org.springblade + blade-starter-swagger + + + org.springblade + blade-starter-oss-all + + + com.baomidou + dynamic-datasource-spring-boot-starter + + + org.springblade + blade-core-test + test + + + org.springblade + blade-core-auto + compile + + + + com.hnac.hzims + water-rain-api + ${hzims.project.version} + + + com.alibaba + easyexcel + + + org.springblade + blade-core-boot + + + org.springblade + blade-common + + + com.hnac.hzinfo.data + hzinfo-data-sdk + + + com.hnac.hzims + common-api + + + + \ No newline at end of file diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/WaterRainApplication.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/WaterRainApplication.java new file mode 100644 index 0000000..b8ebc15 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/WaterRainApplication.java @@ -0,0 +1,29 @@ +package com.hnac.hzims.waterrain; + +import org.mybatis.spring.annotation.MapperScan; +import org.springblade.core.cloud.feign.EnableBladeFeign; +import org.springblade.core.launch.BladeApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.scheduling.annotation.EnableScheduling; + +//水雨情模块 +@EnableBladeFeign(basePackages = {"org.springblade","com.hnac"}) +@SpringCloudApplication +@MapperScan("com.hnac.hzims.**.mapper.**") +@EnableScheduling +@ComponentScan(basePackages = {"com.hnac.hzims.*"}) +public class WaterRainApplication extends SpringBootServletInitializer { + public final static String APP_NAME = "water-rain"; + + public static void main(String[] args) { + BladeApplication.run(APP_NAME, WaterRainApplication.class, args); + } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { + return BladeApplication.createSpringApplicationBuilder(builder, APP_NAME, WaterRainApplication.class); + } +} \ No newline at end of file diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/ReorganizeLogController.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/ReorganizeLogController.java new file mode 100644 index 0000000..4d152ca --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/ReorganizeLogController.java @@ -0,0 +1,51 @@ +package com.hnac.hzims.waterrain.controller; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import com.hnac.hzims.waterrain.entity.ReorganizeLog; +import com.hnac.hzims.waterrain.service.IReorganizeLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/waterRain/reorganizeLog") +@AllArgsConstructor +@Api(value = "整编日志", tags = "整编日志接口") +public class ReorganizeLogController { + + @Autowired + IReorganizeLogService reorganizeLogService; + + @GetMapping("/detail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "yearMonth", value = "年月", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "详情", notes = "传入stcd+yearMonth") + public R detail(String stcd,String yearMonth) { + ReorganizeLog reorganizeLog = reorganizeLogService.queryReorganizeLog(stcd, yearMonth); + return R.data(reorganizeLog); + } + + + @GetMapping("/check") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "yearMonth", value = "年月", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "校核", notes = "传入stcd+yearMonth") + public R check(String stcd,String yearMonth) { + boolean flag = reorganizeLogService.check(stcd, yearMonth, AuthUtil.getUserName()); + return R.data(flag,"校核成功"); + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBController.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBController.java new file mode 100644 index 0000000..f51536c --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBController.java @@ -0,0 +1,151 @@ +package com.hnac.hzims.waterrain.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.annotations.*; +import lombok.AllArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import com.hnac.hzims.waterrain.service.IStStbprpBService; +import com.hnac.hzims.waterrain.util.GisUtil; +import com.hnac.hzims.waterrain.util.ParamUtil; +import com.hnac.hzims.waterrain.vo.StStbprpBVo; +import com.hnac.hzims.waterrain.wrapper.StStbprpBWrapper; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterRain/stStbprpB") +@AllArgsConstructor +@Api(value = "水雨情测站信息表", tags = "水雨情测站信息表接口") +public class StStbprpBController extends BladeController implements CacheNames { + private final IStStbprpBService stStbprpBService; + + + /** + * 分页 + */ + + @GetMapping("/pageList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "stnm", value = "测站名称", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "rscd", value = "水库编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "sttp", value = "站类", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 1) + @ApiOperation(value = "分页", notes = "传入StStbprpB") + public R> pageList(@ApiIgnore @RequestParam Map param, Query query) { + LambdaQueryWrapper wrapper= ParamUtil.conditionStStbprpB(param); + IPage pages = stStbprpBService.page(Condition.getPage(query), wrapper); + return R.data(StStbprpBWrapper.build().pageVO(pages)); + } + + /** + * 列表 + */ + + @GetMapping("/list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "stcd", value = "测站编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "stnm", value = "测站名称", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "rscd", value = "水库编码", paramType = "query", dataType = "string"), + @ApiImplicitParam(name = "sttp", value = "站类", paramType = "query", dataType = "string") + }) + @ApiOperationSupport(order = 2) + @ApiOperation(value = "列表", notes = "传入StStbprpB") + public R> list(@ApiIgnore @RequestParam Map param) { + LambdaQueryWrapper wrapper=ParamUtil.conditionStStbprpB(param); + List list = stStbprpBService.list(wrapper); + return R.data(StStbprpBWrapper.build().listVO(list)); + } + + + /** + * 详情 + */ + + @GetMapping("/detail") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "详情", notes = "传入StStbprpB") + public R detail(StStbprpB stStbprpB) { + StStbprpB detail = stStbprpBService.getOne(Condition.getQueryWrapper(stStbprpB)); + return R.data(StStbprpBWrapper.build().entityVO(detail)); + } + + /** + * 新增 + */ + + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @ApiOperation(value = "新增", notes = "传入stStbprpB") + public R save(@RequestBody StStbprpB stStbprpB) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + wrapper.eq(StStbprpB::getIsDeleted,stStbprpB.getIsDeleted()); + wrapper.eq(StStbprpB::getStcd,stStbprpB.getStcd()); + List list = stStbprpBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("测站编码已存在"); + } + wrapper=new LambdaQueryWrapper(); + wrapper.eq(StStbprpB::getIsDeleted,stStbprpB.getIsDeleted()); + wrapper.eq(StStbprpB::getStnm,stStbprpB.getStnm()); + list = stStbprpBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("测站名称已存在"); + } + //将经纬度转为度分秒 + GisUtil.dealGisData(stStbprpB); + return R.status(stStbprpBService.save(stStbprpB)); + } + + /** + * 修改 + */ + + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @ApiOperation(value = "修改", notes = "传入StStbprpB") + public R update(@RequestBody StStbprpB stStbprpB) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + wrapper.eq(StStbprpB::getStcd,stStbprpB.getStcd()); + wrapper.eq(StStbprpB::getIsDeleted,stStbprpB.getIsDeleted()); + wrapper.ne(StStbprpB::getId,stStbprpB.getId()); + List list = stStbprpBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("测站编码已存在"); + } + wrapper=new LambdaQueryWrapper(); + wrapper.eq(StStbprpB::getIsDeleted,stStbprpB.getIsDeleted()); + wrapper.eq(StStbprpB::getStnm,stStbprpB.getStnm()); + wrapper.ne(StStbprpB::getId,stStbprpB.getId()); + list = stStbprpBService.list(wrapper); + if(list!=null && !list.isEmpty()){ + return R.fail("测站名称已存在"); + } + //将经纬度转为度分秒 + GisUtil.dealGisData(stStbprpB); + return R.status(stStbprpBService.updateById(stStbprpB)); + } + + /** + * 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 6) + @ApiOperation(value = "逻辑删除", notes = "ids") + public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) { + boolean temp = stStbprpBService.deleteLogic(Func.toLongList(ids)); + return R.status(temp); + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBDataController.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBDataController.java new file mode 100644 index 0000000..9e0abda --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/StStbprpBDataController.java @@ -0,0 +1,163 @@ +package com.hnac.hzims.waterrain.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.cache.CaffeineCacheUtil; +import com.hnac.hzims.entity.Report; +import com.hnac.hzims.entity.YearReport; +import com.hnac.hzims.util.CommonUtil; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import com.hnac.hzims.waterrain.bo.StationResp; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import com.hnac.hzims.waterrain.service.IStStbprpBDataService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterRain/stStbprpBData") +@AllArgsConstructor +@Api(value = "水雨情测站数据", tags = "水雨情测站数据接口") +public class StStbprpBDataController extends BladeController implements CacheNames { + private final IStStbprpBDataService stStbprpBDataService; + + //获取实时数据 + @ApiOperation("实时数据") + @RequestMapping(value = "getRealData", method = RequestMethod.GET) + public R getRealData(String stcd) { + List realData = stStbprpBDataService.getRealData(stcd); + return R.data(realData,"查询成功"); + } + + + @ApiOperation("根据测站查询历史数据") + @RequestMapping(value = "getDataByHour", method = RequestMethod.GET) + public R getDataByHour(String stcd,String yearMonth) { + List> yearReport = stStbprpBDataService.getDataByHour(stcd,yearMonth); + return R.data(yearReport,"查询成功"); + } + + + @ApiOperation("表头列") + @RequestMapping(value = "/getTableHead", method = RequestMethod.GET) + public R getTableHead(String stcd) { + //查询基础数据 + List report = stStbprpBDataService.getSignages(stcd); + return R.data(report,"查询成功"); + } + /** + * 获取某站点年度统计报表 + * + * @param stcd 测站点 + * @param year 统计年份 yyyy + * @return + */ + @ApiOperation("年度统计报表") + @RequestMapping(value = "getYearReport", method = RequestMethod.GET) + public R getYearReport(String stcd, Integer year,String sttp,String col) { + String key=stcd+"_"+year+"_"+col; + YearReport report =CaffeineCacheUtil.getYear(key); + if(report!=null){ + return R.data(report,"查询缓存成功"); + } + YearReport yearReport = stStbprpBDataService.getYearReport(stcd, year,sttp, col); + CaffeineCacheUtil.addYear(key,yearReport); + return R.data(yearReport,"查询成功"); + } + + + @ApiOperation("水量年度统计报表") + @RequestMapping(value = "getWaterYearReport", method = RequestMethod.GET) + public R getWaterYearReport(String stcd, Integer year,String sttp) { + YearReport yearReport = stStbprpBDataService.getWaterYearReport(stcd, year,sttp); + return R.data(yearReport,"查询成功"); + } + + + @ApiOperation("水量年度统计报表") + @RequestMapping(value = "getRainYearReport", method = RequestMethod.GET) + public R getRainYearReport(String stcd, Integer year,String sttp,String col) { + YearReport yearReport = stStbprpBDataService.getRainYearReport(stcd, year,sttp,col); + return R.data(yearReport,"查询成功"); + } + + + @ApiOperation("基础数据报表,数据查询和统计分析使用接口") + @RequestMapping(value = "/getReportData", method = RequestMethod.GET) + public R getReportData( + String[] stcds, String beginSpt, String endSpt, String type,String sttp,String col) { + Map res=CommonUtil.getStartEnd(beginSpt,endSpt); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + String key=stcds.toString()+"_"+beginSpt+"_"+endSpt+"_"+type+"_"+col; + Report report = CaffeineCacheUtil.get(key); + if(report!=null){ + return R.data(report,"查询成功"); + } + //查询基础数据 + report = stStbprpBDataService + .getReportData(Arrays.asList(stcds), res.get("begin"), res.get("end"), type, sttp,col); + CaffeineCacheUtil.add(key,report); + return R.data(report,"查询成功"); + } + + + + @ApiOperation("水量基础数据报表,数据查询和统计分析使用接口") + @RequestMapping(value = "/getWaterReportData", method = RequestMethod.GET) + public R getWaterReportData( + String[] stcds, String beginSpt, String endSpt, String type,String sttp) { + Map res= CommonUtil.getStartEnd(beginSpt,endSpt); + if(res == null){ + return R.data(500,false, "日期格式错误"); + } + //查询基础数据 + Report report = stStbprpBDataService + .getWaterReportData(Arrays.asList(stcds), res.get("begin"), res.get("end"), type, sttp); + return R.data(report,"查询成功"); + } + + + @ApiOperation("app 水雨情接口") + @RequestMapping(value = "page", method = RequestMethod.GET) + public R page(String sttp,String name, Query page) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + if(StringUtils.isNotBlank(sttp)) { + wrapper.in(StStbprpB::getSttp,sttp.split(",")); + } + if(StringUtils.isNotBlank(name)) { + wrapper.like(StStbprpB::getStnm, name); + } + wrapper.like(StStbprpB::getCreateDept, AuthUtil.getDeptId()); + IPage pageList = stStbprpBDataService.pageData(wrapper, Condition.getPage(page)); + return R.data(pageList,"查询成功"); + } + + + + @ApiOperation("app 获取实时数据") + @RequestMapping(value = "getLastValue", method = RequestMethod.GET) + public R getLastValue(@RequestParam String stcd) { + Object obj = stStbprpBDataService.getLastValue(stcd); + return R.data(obj,"查询成功"); + } + +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/WaterRainReorganizeController.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/WaterRainReorganizeController.java new file mode 100644 index 0000000..1f2c182 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/controller/WaterRainReorganizeController.java @@ -0,0 +1,145 @@ +package com.hnac.hzims.waterrain.controller; + +import com.alibaba.excel.EasyExcel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; +import com.hnac.hzims.waterrain.entity.ReorganizeData; +import com.hnac.hzims.waterrain.entity.ReorganizeLog; +import com.hnac.hzims.waterrain.listener.UploadWaterFlowRainDataListener; +import com.hnac.hzims.waterrain.service.IReorganizeLogService; +import com.hnac.hzims.waterrain.service.IWaterRainReorganizeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/waterRain/reorganize") +@Api(tags = "水雨情数据整编接口") +public class WaterRainReorganizeController { + + @Autowired + IWaterRainReorganizeService reorganizeDataService; + + @Autowired + IReorganizeLogService reorganizeLogService; + + //批量新增 + + @ApiOperation(value = "水雨情数据保存",notes = "水雨情数据保存") + @RequestMapping(value = "/batchInsert", method = RequestMethod.POST) + public R batchInsert(@RequestBody ReorganizeData data) { + //判定是否已整编 + String stcd=data.getStcd(); + String yearMonth=data.getYearMonth(); + String sttp=data.getSttp(); + boolean flag=reorganizeLogService.getReorganizeLog(stcd,yearMonth); + if(flag){ + return R.fail(data.getYearMonth()+"数据已整编"); + } + //删除数据,防止插入主键冲突 + reorganizeDataService.delData(stcd,sttp,yearMonth); + flag=reorganizeDataService.batchInsert(data); + if(flag){ + ReorganizeLog reorganizeLog=new ReorganizeLog(); + reorganizeLog.setStcd(stcd); + reorganizeLog.setYearMonth(yearMonth); + reorganizeLog.setOperateUser(AuthUtil.getUserName()); + reorganizeLogService.insertReorganizeLog(reorganizeLog); + return R.data("数据整编成功"); + }else{ + return R.fail(500,"数据整编失败"); + } + } + + + //批量导入 + /** + * @param file excel文件 + * @param sttp + * @param stcd + * @return + */ + + @ApiOperation(value = "水雨情数据导入",notes = "水雨情数据导入") + @RequestMapping(value = "/uploadWaterFlowRain", method = RequestMethod.POST) + public R uploadReservoir(MultipartFile file, String sttp,String stcd,String yearMonth) { + //判定是否已整编 + boolean flag=reorganizeLogService.getReorganizeLog(stcd,yearMonth); + if(flag){ + return R.data(yearMonth+"数据已整编"); + } + if(file == null){ + return R.fail(500,"未上传文件"); + } + String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1); + if("xls".equals(suffix) || "xlsx".equals(suffix)){ + try { + //删除数据,防止插入主键冲突 + reorganizeDataService.delData(stcd, sttp, yearMonth); + List errMessage=getMessage(file,sttp,stcd); + if (errMessage.isEmpty()) { + ReorganizeLog reorganizeLog=new ReorganizeLog(); + reorganizeLog.setStcd(stcd); + reorganizeLog.setYearMonth(yearMonth); + reorganizeLog.setOperateUser(AuthUtil.getUserName()); + reorganizeLogService.insertReorganizeLog(reorganizeLog); + return R.data(true,"导入成功"); + } else { + return R.data(500,errMessage,"导入失败,请查看具体详情"); + } + + }catch (IOException e){ + return R.fail(500,"导入失败，文件流获取出错"); + } + }else{ + return R.fail(500,"导入文件格式不对，请按模板文件格式来"); + } + } + + + private List getMessage(MultipartFile file, String sttp,String stcd) throws IOException { + List errMessage=new ArrayList<>(); + + UploadWaterFlowRainDataListener uploadDataListener = new UploadWaterFlowRainDataListener(reorganizeDataService,sttp,stcd,0); + + EasyExcel.read(file.getInputStream(), uploadDataListener).sheet().doReadSync(); + + errMessage.addAll(uploadDataListener.getErrMessage()); + + return errMessage; + } + + + + @ApiOperation(value = "整编后数据查询",notes = "整编后数据查询") + @RequestMapping(value = "/queryData", method = RequestMethod.GET) + public R queryData(String stcd,String sttp,String yearMonth) { + //判定是否已整编 + boolean flag=reorganizeLogService.getReorganizeLog(stcd,yearMonth); + if(!flag){ + return R.data(200,null,"数据未整编，无法查询到数据"); + } + List> list=reorganizeDataService.queryData(stcd,sttp,yearMonth); + return R.data(list,"数据查询成功"); + } + + //重新整编 + @ApiOperation(value = "重新整编",notes = "重新整编") + @RequestMapping(value = "/afresh", method = RequestMethod.GET) + public R afresh(String stcd,String yearMonth) { + //删除整编日志 + reorganizeLogService.delReorganizeLog(stcd, yearMonth); + return R.data(true,"可以重新整编了"); + } + +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBClient.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBClient.java new file mode 100644 index 0000000..c9e67db --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBClient.java @@ -0,0 +1,26 @@ +package com.hnac.hzims.waterrain.feign; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import com.hnac.hzims.waterrain.service.IStStbprpBService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +public class StStbprpBClient implements IStStbprpBClient{ + + @Autowired + private IStStbprpBService stStbprpBService; + + @Override + public StStbprpB detail(LambdaQueryWrapper wrapper) { + return stStbprpBService.getOne(wrapper); + } + + @Override + public List list(LambdaQueryWrapper wrapper) { + return stStbprpBService.list(wrapper); + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBDataClient.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBDataClient.java new file mode 100644 index 0000000..d205cb3 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/feign/StStbprpBDataClient.java @@ -0,0 +1,20 @@ +package com.hnac.hzims.waterrain.feign; + +import com.hnac.hzims.waterrain.service.IStStbprpBDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.Map; + +@RestController +public class StStbprpBDataClient implements IStStbprpBDataClient{ + + @Autowired + IStStbprpBDataService stStbprpBDataService; + + @Override + public Map queryMaxOrMin(String deviceCode, Date startTime, Date endTime, Integer calcType, Integer saveTimeType, Integer timeInterval, String col) { + return stStbprpBDataService.queryMaxOrMin(deviceCode,startTime,endTime,calcType,col); + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/listener/UploadWaterFlowRainDataListener.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/listener/UploadWaterFlowRainDataListener.java new file mode 100644 index 0000000..8b5d4fd --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/listener/UploadWaterFlowRainDataListener.java @@ -0,0 +1,336 @@ +package com.hnac.hzims.waterrain.listener; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.event.AnalysisEventListener; +import com.hnac.hzims.waterrain.entity.HzStPptnR; +import com.hnac.hzims.waterrain.entity.HzStRiverR; +import com.hnac.hzims.waterrain.entity.HzStRsvrR; +import com.hnac.hzims.waterrain.enums.WaterFlowRainEnum; +import com.hnac.hzims.waterrain.service.IWaterRainReorganizeService; +import org.apache.commons.lang3.StringUtils; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +public class UploadWaterFlowRainDataListener extends AnalysisEventListener> { + //每00条在invoke中执行一次，剩余的会在doAfterAllAnalysed中执行 + private static final int BATCH_COUNT = 200; + private List errMessage; + //对应的测站类型 + private String sttp; + //对应的测站编码 + private String stcd; + //头部信息 + private List head; + + //数据的起始列数(从0开始算) + private int firstColumn; + + List> list = new ArrayList<>(); + + private IWaterRainReorganizeService waterRainReorganizeService;; + + public UploadWaterFlowRainDataListener(IWaterRainReorganizeService waterRainReorganizeService, String sttp, + String stcd, int firstColumn) { + this.waterRainReorganizeService = waterRainReorganizeService; + this.sttp = sttp; + this.stcd = stcd; + this.firstColumn = firstColumn; + errMessage = new ArrayList<>(); + head = new ArrayList<>(); + } + + + public String getSttp() { + return sttp; + } + + public void setSttp(String sttp) { + this.sttp = sttp; + } + + public List getErrMessage() { + return errMessage; + } + + public void setErrMessage(List errMessage) { + this.errMessage = errMessage; + } + + @Override + public void invokeHeadMap(Map headMap, AnalysisContext context) { + for(int i=0;i map, AnalysisContext analysisContext) { + list.add(map); + // 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM + if (list.size() >= BATCH_COUNT) { + saveData(); + // 存储完成清理 list + list.clear(); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + if(!list.isEmpty()) { + saveData(); + } + list.clear(); + head.clear(); + } + + private void saveData() { + //逐条执行 + try { +// dealData(); + //批量执行 + batchDealDataList(); + } catch (ParseException e) { + e.printStackTrace(); + } + + } + + private void dealData() throws ParseException { + Map data=checkData(sttp); + if ("true".equals(data.get("flag"))) { + for (Map map : list) { + //组装批量数据 + saveEntity(map, sttp, stcd); + } + } else { + errMessage.add(data.get("msg")); + } + } + + //批量执行 + private void batchDealDataList() throws ParseException { + List stPptnRList=new ArrayList<>(); + List stRiverRList=new ArrayList<>(); + List stRsvrRList=new ArrayList<>(); + Map data=checkData(sttp); + if ("true".equals(data.get("flag"))) { + for (Map map : list) { + + //组装批量数据 + Map res=getOneObj(map,sttp,stcd); + if(res!=null) { + if(WaterFlowRainEnum.PP.getCode().equals(sttp)) { + Object stPptnR = res.get(WaterFlowRainEnum.PP.getCode()); + stPptnRList.addAll((List) stPptnR); + } + + if(WaterFlowRainEnum.ZZ.getCode().equals(sttp)) { + Object stRiverR = res.get(WaterFlowRainEnum.ZZ.getCode()); + stRiverRList.addAll((List) stRiverR); + stRiverR = res.get(WaterFlowRainEnum.ZQ.getCode()); + stRiverRList.addAll((List) stRiverR); + } + if(WaterFlowRainEnum.ZQ.getCode().equals(sttp)) { + Object stRiverR = res.get(WaterFlowRainEnum.ZQ.getCode()); + stRiverRList.addAll((List) stRiverR); + } + + if(WaterFlowRainEnum.RR.getCode().equals(sttp)) { + Object stRsvrR = res.get(WaterFlowRainEnum.RR.getCode()); + stRsvrRList.addAll((List) stRsvrR); + } + + } + + } + } else { + errMessage.add(data.get("msg")); + } + //批量插入 + if(stPptnRList!=null && !stPptnRList.isEmpty() ) {//雨量站 + waterRainReorganizeService.batchStPptnR(stPptnRList); + } + if(stRiverRList!=null && !stRiverRList.isEmpty()) {//河道水文、水位站 + waterRainReorganizeService.batchStRiverR(stRiverRList); + } + if(stRsvrRList!=null && !stRsvrRList.isEmpty()) {//水库水文站 + waterRainReorganizeService.batchStRsvrR(stRsvrRList); + } + } + + private Map getOneObj(Map map,String sttp,String stcd) throws ParseException { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH"); + Map res=new HashMap<>(); + + Date dd=sdf.parse(map.get(0)); + + if(WaterFlowRainEnum.RR.getCode().equals(sttp)){ + HzStRsvrR stRsvrR=new HzStRsvrR(); + stRsvrR.setStcd(stcd); + stRsvrR.setTm(dd); + + String data=map.get(1); + stRsvrR.setRz(Double.valueOf(data)); + + data=map.get(2); + stRsvrR.setInq(Double.valueOf(data)); + + List dataRes=(List)res.get(sttp);; + if(dataRes==null || dataRes.isEmpty()) { + dataRes=new ArrayList<>(); + } + dataRes.add(stRsvrR); + res.put(sttp,dataRes); + } + if(WaterFlowRainEnum.ZZ.getCode().equals(sttp) || WaterFlowRainEnum.ZQ.getCode().equals(sttp)){ + HzStRiverR stRiverR=new HzStRiverR(); + stRiverR.setStcd(stcd); + stRiverR.setTm(dd); + String z=map.get(1); + stRiverR.setZ(Double.valueOf(z)); + String q=map.get(2); + stRiverR.setQ(Double.valueOf(q)); + List dataRes=(List)res.get(sttp); + if(dataRes==null || dataRes.isEmpty()) { + dataRes=new ArrayList<>(); + } + dataRes.add(stRiverR); + res.put(sttp,dataRes); + } + if(WaterFlowRainEnum.PP.getCode().equals(sttp)){ + HzStPptnR stPptnR=new HzStPptnR(); + String drp=map.get(1); + stPptnR.setStcd(stcd); + stPptnR.setTm(dd); + stPptnR.setDrp(Double.valueOf(drp)); + List dataRes=null; + if(res.get(sttp)!=null) { + dataRes=(List)res.get(sttp); + dataRes.add(stPptnR); + }else{ + dataRes=new ArrayList<>(); + } + res.put(sttp,dataRes); + } + + + return res; + } + + private void saveEntity(Map map,String sttp,String stcd) throws ParseException { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH"); + + String dateStr=map.get(0); + Date dd=sdf.parse(dateStr); + + if(WaterFlowRainEnum.RR.getCode().equals(sttp)){ + HzStRsvrR stRsvrR=new HzStRsvrR(); + stRsvrR.setStcd(stcd); + stRsvrR.setTm(dd); + String rz=map.get(1); + stRsvrR.setRz(Double.valueOf(rz)); + + String inq=map.get(2); + stRsvrR.setInq(Double.valueOf(inq)); + + waterRainReorganizeService.insertHzStRsvrR(stRsvrR); + } + if(WaterFlowRainEnum.ZZ.getCode().equals(sttp) || WaterFlowRainEnum.ZQ.getCode().equals(sttp)){ + HzStRiverR stRiverR=new HzStRiverR(); + stRiverR.setStcd(stcd); + stRiverR.setTm(dd); + String z=map.get(1); + stRiverR.setZ(Double.valueOf(z)); + String q=map.get(2); + stRiverR.setQ(Double.valueOf(q)); + + waterRainReorganizeService.insertHzStRiverR(stRiverR); + } + if(WaterFlowRainEnum.PP.getCode().equals(sttp)){//降雨 + HzStPptnR stPptnR=new HzStPptnR(); + stPptnR.setStcd(stcd); + stPptnR.setTm(dd); + String drp=map.get(1); + stPptnR.setDrp(Double.valueOf(drp)); + + waterRainReorganizeService.insertHzStPptnR(stPptnR); + } + } + + //校核某一行的数据 + Map checkData(String sttp) { + Map data = new HashMap<>(); + String msg="请检查导入数据中"; + for (Map map : list) { + String dateStr = map.get(0); + + String columnStr = ""; + + if (WaterFlowRainEnum.RR.getCode().equals(sttp)) { + String rz = map.get(1); + String inq = map.get(2); + if (StringUtils.isBlank(rz)) { + columnStr += dateStr + "的水位数据为空"; + if (StringUtils.isBlank(inq)) { + columnStr += ",流量数据为空"; + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } else { + if (StringUtils.isBlank(inq)) { + columnStr += dateStr + "的流量数据为空"; + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } + } + } + if (WaterFlowRainEnum.ZZ.getCode().equals(sttp) || WaterFlowRainEnum.ZQ.getCode().equals(sttp)) { + String z = map.get(1); + String q = map.get(2); + if (StringUtils.isBlank(z)) { + columnStr += dateStr + "的水位数据为空"; + if (StringUtils.isBlank(q)) { + columnStr += ",流量数据为空"; + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } else { + if (StringUtils.isBlank(q)) { + columnStr += dateStr + "的流量数据为空;"; + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } + } + } + if (WaterFlowRainEnum.PP.getCode().equals(sttp)) {//降雨 + String drp = map.get(1); + if (StringUtils.isBlank(drp)) { + columnStr += dateStr + "的降雨量数据为空"; + data.put("msg", msg + "," + columnStr); + data.put("flag", "false"); + return data; + } + } + + if ("".equals(columnStr)) { + data.put("msg", ""); + data.put("flag", "true"); + } + } + return data; + } + + +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.java new file mode 100644 index 0000000..b3815f7 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.waterrain.mapper; + +import org.apache.ibatis.annotations.Param; +import com.hnac.hzims.waterrain.entity.ReorganizeLog; + +public interface ReorganizeLogMapper { + int insert(ReorganizeLog reorganizeLog); + ReorganizeLog queryReorganizeLog(@Param("stcd") String stcd, @Param("yearMonth") String yearMonth); + int checkOk(ReorganizeLog reorganizeLog); + int delReorganizeLog(@Param("stcd") String stcd, @Param("yearMonth") String yearMonth); +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.xml b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.xml new file mode 100644 index 0000000..6ae1ac1 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/ReorganizeLogMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + insert into reorganize_log(stcd,`year_month`,operate_user,check_user) + values (#{stcd,jdbcType=VARCHAR},#{yearMonth,jdbcType=VARCHAR}, + #{operateUser,jdbcType=VARCHAR},#{checkUser,jdbcType=VARCHAR}) + + + + + + update reorganize_log + set check_user=#{checkUser} + where stcd=#{stcd} and `year_month`=#{yearMonth} + + + + delete + from reorganize_log + where stcd=#{stcd} and `year_month`=#{yearMonth} + + \ No newline at end of file diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.java new file mode 100644 index 0000000..16d59e8 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.java @@ -0,0 +1,8 @@ +package com.hnac.hzims.waterrain.mapper; + +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; +import com.hnac.hzims.waterrain.entity.StStbprpB; + +public interface StStbprpBMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.xml b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.xml new file mode 100644 index 0000000..0c090e6 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/StStbprpBMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.java new file mode 100644 index 0000000..5b4592a --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.java @@ -0,0 +1,28 @@ +package com.hnac.hzims.waterrain.mapper; + +import org.apache.ibatis.annotations.Param; +import com.hnac.hzims.waterrain.entity.HzStPptnR; +import com.hnac.hzims.waterrain.entity.HzStRiverR; +import com.hnac.hzims.waterrain.entity.HzStRsvrR; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +public interface WaterRainReorganizeMapper { + int batchStPptnR(@Param("list") List list); + int batchStRiverR(@Param("list")List list); + int batchStRsvrR(@Param("list")List list); + + int insertHzStPptnR(HzStPptnR hzStPptnR); + int insertHzStRsvrR(HzStRsvrR hzStRsvrR); + int insertHzStRiverR(HzStRiverR hzStRiverR); + + List> queryStPptnR(@Param("stcd") String stcd, @Param("start") Date start, @Param("end") Date end); + List> queryStRsvrR(@Param("stcd")String stcd,@Param("start") Date start, @Param("end") Date end); + List> queryStRiverR(@Param("stcd")String stcd,@Param("start") Date start, @Param("end") Date end); + + int delStPptnR(@Param("stcd") String stcd, @Param("start") Date start, @Param("end") Date end); + int delStRsvrR(@Param("stcd")String stcd,@Param("start") Date start, @Param("end") Date end); + int delStRiverR(@Param("stcd")String stcd,@Param("start") Date start, @Param("end") Date end); +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.xml b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.xml new file mode 100644 index 0000000..576bbd8 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/mapper/WaterRainReorganizeMapper.xml @@ -0,0 +1,150 @@ + + + + + + insert into st_pptn_r(STCD,TM,DRP) values + + (#{cus.stcd}, #{cus.tm},#{cus.drp}) + + + + + insert into st_river_r(STCD,TM,Z,Q) + + (#{cus.stcd}, #{cus.tm},#{cus.z},#{cus.q}) + + + + + insert into st_rsvr_r(STCD,TM,RZ,INQ) + + (#{cus.stcd}, #{cus.tm},#{cus.rz},#{cus.inq}) + + + + + insert into st_pptn_r + + + STCD, + + + TM, + + + DRP, + + + + + #{stcd,jdbcType=CHAR}, + + + #{tm,jdbcType=TIMESTAMP}, + + + #{drp,jdbcType=DECIMAL}, + + + + + + + insert into st_river_r + + + STCD, + + + TM, + + + Z, + + + Q, + + + + + #{stcd,jdbcType=CHAR}, + + + #{tm,jdbcType=TIMESTAMP}, + + + #{z,jdbcType=DECIMAL}, + + + #{q,jdbcType=DECIMAL}, + + + + + + insert into st_rsvr_r + + + STCD, + + + TM, + + + RZ, + + + INQ, + + + + + #{stcd,jdbcType=CHAR}, + + + #{tm,jdbcType=TIMESTAMP}, + + + #{rz,jdbcType=DECIMAL}, + + + #{inq,jdbcType=DECIMAL}, + + + + + + + + + + + + delete from st_pptn_r + where stcd=#{stcd} and tm between #{start} and #{end} + + + + delete from st_rsvr_r + where stcd=#{stcd} and tm between #{start} and #{end} + + + + delete from st_river_r + where stcd=#{stcd} and tm between #{start} and #{end} + + + \ No newline at end of file diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IReorganizeLogService.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IReorganizeLogService.java new file mode 100644 index 0000000..a5e5f1e --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IReorganizeLogService.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.waterrain.service; + +import com.hnac.hzims.waterrain.entity.ReorganizeLog; + +public interface IReorganizeLogService { + boolean getReorganizeLog(String stcd,String yearMonth); + ReorganizeLog queryReorganizeLog(String stcd, String yearMonth); + boolean insertReorganizeLog(ReorganizeLog reorganizeLog); + boolean check(String stcd,String yearMonth,String checkUser); + + boolean delReorganizeLog(String stcd,String yearMonth); +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBDataService.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBDataService.java new file mode 100644 index 0000000..944c3da --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBDataService.java @@ -0,0 +1,47 @@ +package com.hnac.hzims.waterrain.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.hnac.hzims.entity.Report; +import com.hnac.hzims.entity.YearReport; +import com.hnac.hzims.waterrain.bo.StationResp; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; + + +import java.util.Date; +import java.util.List; +import java.util.Map; + +public interface IStStbprpBDataService { + + //获取计算值(最大 最小 平均等等) + Map queryMaxOrMin(String deviceCode, Date startTime, Date endTime, + Integer calcType, String col); + + //获取最新值以及差值 + List> getLastValues(List stcds,String sttp); + + //过程线 + Report getReportData(List deviceCode, Date begin, Date end, String type , String sttp, String col); + + //水量过程线 + Report getWaterReportData(List deviceCodes, Date begin, Date end, String type, String sttp); + + //年报表 + YearReport getYearReport(String stcd, Integer year, String sttp, String col); + + //水量年报表 + YearReport getWaterYearReport(String deviceCode, Integer year,String sttp); + //将于年报 + YearReport getRainYearReport(String deviceCode, Integer year,String sttp,String col); + + Object getLastValue(String stcd); + + IPage pageData(LambdaQueryWrapper wrapper, IPage page); + + List getRealData(String stcd); + List getSignages(String stcd); + + List> getDataByHour(String stcd,String yearMonth); +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBService.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBService.java new file mode 100644 index 0000000..20abaf3 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IStStbprpBService.java @@ -0,0 +1,8 @@ +package com.hnac.hzims.waterrain.service; + +import org.springblade.core.mp.base.BaseService; +import com.hnac.hzims.waterrain.entity.StStbprpB; + +public interface IStStbprpBService extends BaseService { + +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainReorganizeService.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainReorganizeService.java new file mode 100644 index 0000000..6d8cff4 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainReorganizeService.java @@ -0,0 +1,34 @@ +package com.hnac.hzims.waterrain.service; + + +import com.hnac.hzims.waterrain.entity.HzStPptnR; +import com.hnac.hzims.waterrain.entity.HzStRiverR; +import com.hnac.hzims.waterrain.entity.HzStRsvrR; +import com.hnac.hzims.waterrain.entity.ReorganizeData; + +import java.util.List; +import java.util.Map; + +public interface IWaterRainReorganizeService { + + boolean batchInsert(ReorganizeData data); + + void batchStPptnR(List list); + void batchStRiverR(List list); + void batchStRsvrR(List list); + + int insertHzStPptnR(HzStPptnR hzStPptnR); + int insertHzStRsvrR(HzStRsvrR hzStRsvrR); + int insertHzStRiverR(HzStRiverR hzStRiverR); + + List> queryStPptnR(String stcd,String yearMonth); + List> queryStRsvrR(String stcd,String yearMonth); + List> queryStRiverR(String stcd,String yearMonth); + + boolean delStPptnR(String stcd,String yearMonth); + boolean delStRsvrR(String stcd,String yearMonth); + boolean delStRiverR(String stcd,String yearMonth); + + List> queryData(String stcd,String sttp,String yearMonth); + boolean delData(String stcd,String sttp,String yearMonth); +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainService.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainService.java new file mode 100644 index 0000000..b1aaef2 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/IWaterRainService.java @@ -0,0 +1,4 @@ +package com.hnac.hzims.waterrain.service; + +public interface IWaterRainService { +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/ReorganizeLogServiceImpl.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/ReorganizeLogServiceImpl.java new file mode 100644 index 0000000..e05a484 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/ReorganizeLogServiceImpl.java @@ -0,0 +1,45 @@ +package com.hnac.hzims.waterrain.service.impl; + +import com.hnac.hzims.waterrain.entity.ReorganizeLog; +import com.hnac.hzims.waterrain.mapper.ReorganizeLogMapper; +import com.hnac.hzims.waterrain.service.IReorganizeLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ReorganizeLogServiceImpl implements IReorganizeLogService { + + @Resource + ReorganizeLogMapper reorganizeLogMapper; + + @Override + public boolean getReorganizeLog(String stcd, String yearMonth) { + ReorganizeLog reorganizeLog=queryReorganizeLog(stcd,yearMonth); + return reorganizeLog!=null; + } + + @Override + public ReorganizeLog queryReorganizeLog(String stcd, String yearMonth) { + return reorganizeLogMapper.queryReorganizeLog(stcd,yearMonth); + } + + @Override + public boolean insertReorganizeLog(ReorganizeLog reorganizeLog) { + return reorganizeLogMapper.insert(reorganizeLog)>0; + } + + @Override + public boolean check(String stcd, String yearMonth, String checkUser) { + ReorganizeLog reorganizeLog=new ReorganizeLog(); + reorganizeLog.setStcd(stcd); + reorganizeLog.setYearMonth(yearMonth); + reorganizeLog.setCheckUser(checkUser); + return reorganizeLogMapper.checkOk(reorganizeLog)>0; + } + + @Override + public boolean delReorganizeLog(String stcd, String yearMonth) { + return reorganizeLogMapper.delReorganizeLog(stcd,yearMonth)>0; + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBDataServiceImpl.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBDataServiceImpl.java new file mode 100644 index 0000000..ab4ba1e --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBDataServiceImpl.java @@ -0,0 +1,896 @@ +package com.hnac.hzims.waterrain.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.hnac.hzims.entity.*; +import com.hnac.hzims.enums.QueryDateTypeEnum; +import com.hnac.hzims.util.CommonUtil; +import com.hnac.hzims.util.ReportDateUtil; +import com.hnac.hzinfo.datasearch.analyse.domain.FieldsData; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyseCodeByAnalyseDataPO; +import com.hnac.hzinfo.datasearch.analyse.po.AnalyzeDataConditionPO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyseDataTaosVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; +import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeInstanceFieldVO; +import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; +import com.hnac.hzinfo.sdk.analyse.AnalyseDataSearchClient; +import com.hnac.hzinfo.sdk.analyse.po.ComputeBaseStrategyPO; +import com.hnac.hzinfo.sdk.analyse.vo.DeviceSinglePropsValueQuery; +import com.hnac.hzinfo.sdk.analyse.vo.DeviceSinglePropsValueVO; +import com.hnac.hzinfo.sdk.core.response.Result; +import com.hnac.hzinfo.sdk.real.RealDataSearchClient; +import org.apache.commons.lang3.time.DateUtils; +import com.hnac.hzims.waterrain.bo.*; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import com.hnac.hzims.waterrain.service.IStStbprpBDataService; +import com.hnac.hzims.waterrain.service.IStStbprpBService; +import com.hnac.hzims.waterrain.util.DateUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.*; +import java.util.*; + +@Service +public class StStbprpBDataServiceImpl implements IStStbprpBDataService { + + @Autowired + AnalyseDataSearchClient analyseDataSearchClient; + + @Autowired + RealDataSearchClient realDataSearchClient; + + @Autowired + IStStbprpBService stStbprpBService; + + @Override + public Object getLastValue(String stcd) { + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + wrapper.eq(StStbprpB::getStcd,stcd); + wrapper.eq(StStbprpB::getIsDeleted,0); + StStbprpB resp = stStbprpBService.getOne(wrapper); + return getLastValue(resp); + } + + private Object getLastValue(StStbprpB resp){ + List stcds=new ArrayList<>(); + stcds.add(resp.getStcd()); + List> dataList = getLastValues(stcds, resp.getSttp()); + if(dataList!=null && !dataList.isEmpty()) { + return dataList.get(0); + }else{ + return null; + } + } + + @Override + public IPage pageData(LambdaQueryWrapper wrapper, IPage page) { + IPage pageList = stStbprpBService.page(page, wrapper); + IPage list = new Page(pageList.getCurrent(),pageList.getSize()); + int count=(int)pageList.getTotal(); + List stcds=new ArrayList<>(); + for (StStbprpB resp : pageList.getRecords()) { + stcds.add(resp.getStcd()); + } + + List records=new ArrayList<>(); + + for (StStbprpB resp : pageList.getRecords()) { + StationResp temp = new StationResp(); + temp.setStStbprpB(resp); + temp.setObj(getLastValue(resp)); + records.add(temp); + } + + list.setPages(pageList.getPages()); + list.setRecords(records); + list.setTotal(count); + + return list; + } + + @Override + public List getRealData(String stcd) { + RealDataSearchPO po=new RealDataSearchPO(); + po.setAnalyzeCode(stcd); + List list=getSignages(stcd); + if(list==null || list.isEmpty()){ + return null; + } + List signages=new ArrayList<>(); + for(AnalyzeInstanceFieldVO vo:list){ + signages.add(vo.getSignage()); + } + po.setSignages(signages); + Result> result=realDataSearchClient.getRealDataByDeviceCode(po); + if(result==null || !result.isSuccess()){ + return null; + } + return result.getData(); + } + + @Override + public List getSignages(String stcd){ + //查询列 + Result> result=analyseDataSearchClient.getInstanceFieldByAnalyseCode(stcd,1,""); + if(result==null || !result.isSuccess()){ + return null; + } + + List analyzeInstanceFieldVOS=result.getData(); + return analyzeInstanceFieldVOS; + } + + @Override + public List> getDataByHour(String stcd,String yearMonth) { + List> list=new ArrayList<>(); + Map dateMap=DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + + if(begin==null || endSt==null){ + return null; + } + + LocalDateTime start = LocalDateTime.ofInstant(begin.toInstant(), ZoneId.systemDefault()); + LocalDateTime end = LocalDateTime.ofInstant(endSt.toInstant(), ZoneId.systemDefault()); + + List vos=getSignages(stcd); + if(vos==null || vos.isEmpty()){ + return null; + } + + Map> map=new HashMap<>(); + int count=0; + for(AnalyzeInstanceFieldVO vo:vos) { + List reportDataList = getDataByDeviceCode(stcd, 6,2,start,end, vo.getSignage()); + map.put(vo.getSignage(),reportDataList); + count = reportDataList.size(); + } + + + for (int i = 0; i < count; i++) { + Map res=new HashMap<>(); + for(AnalyzeInstanceFieldVO vo:vos) { + List reportDataList=map.get(vo.getSignage()); + ReportData reportData=reportDataList.get(i); + res.put("tm",reportData.getKeyStr()); + res.put(vo.getSignage(),reportData.getVal()); + } + list.add(res); + } + + return list; + } + + + //获取测站 水量年报表 + @Override + public YearReport getWaterYearReport(String deviceCode, Integer year, String sttp) { + YearReport yearReport=getYearReport(deviceCode, year, sttp,"flow"); + dealYearReport(yearReport); + return yearReport; + } + + void dealRainYearReport(YearReport yearReport){ + if(yearReport!=null){ + List monthList=yearReport.getMonthList(); + dealMonthList(monthList,yearReport.getYear()); + List yearList=yearReport.getYearList(); + dealYearList(yearList,yearReport.getYear()); + } + } + + void dealYearReport(YearReport yearReport){ + if(yearReport!=null){ + List> dayList=yearReport.getDayList(); + dealDayList(dayList); + List monthList=yearReport.getMonthList(); + dealMonthList(monthList,yearReport.getYear()); + List yearList=yearReport.getYearList(); + dealYearList(yearList,yearReport.getYear()); + } + } + + void dealDayList(List> dayList){ + for(List list:dayList){ + if(list!=null && !list.isEmpty()) { + for (int i=0,size=list.size(); i monthList,int year){ + if(monthList!=null && !monthList.isEmpty()) { + for (ReportUnit reportUnit:monthList) { + String key=reportUnit.getKey(); + if(!key.contains("时间")){ + List list=reportUnit.getDataList(); + dealMonthDataList(list,year); + } + } + } + } + + void dealMonthDataList(List list,int year){ + if(list!=null && !list.isEmpty()){ + for (int i=0,size=list.size(); i yearList,int year){ + for(ReportData reportData:yearList){ + String keyStr=reportData.getKeyStr(); + if(!keyStr.contains("时间")){ + String str=reportData.getVal(); + if (!"-".equals(str)) { + reportData.setVal(getNewVal(str, "year", year + "")); + } + } + } + } + + + //获取测站 水量过程线 + @Override + public Report getWaterReportData(List deviceCodes, Date begin, Date end, String type, String sttp) { + Report report=getReportData(deviceCodes, begin, end, type, sttp,"flow"); + dealReportData(report,type); + return report; + } + + void dealReportData(Report report, String dateType){ + if(report!=null) { + List list = report.getData(); + if(list!=null && !list.isEmpty()) { + for (ReportUnit reportUnit : list) { + String key = reportUnit.getKey(); + List dataList = reportUnit.getDataList(); + dealDataList(dataList, dateType, key); + } + } + } + } + + void dealDataList(List dataList,String dateType,String key){ + if(dataList!=null && !dataList.isEmpty()) { + for (int i = 0,size=dataList.size(); i yearReportData = listDataReport(begin, end, QueryDateTypeEnum.DAY,deviceCode,sttp, col); + //年度数据转化到报表里,计算每月数据和年数据 + try { + toYearRainReport(yearReport, yearReportData, col,sttp); + } catch (Exception e) { + return null; + } + //返回数据 + return yearReport; + } + + @Override + public YearReport getYearReport(String deviceCode, Integer year, String sttp, String col) { + //初始化年份 + YearReport yearReport = new YearReport(); + yearReport.init(deviceCode, year); + //拿到一年数据 + Date begin = ReportDateUtil.getDate(year, 0, 1, 8, 0, 0); + Date end = ReportDateUtil.getNextDate(begin, Calendar.YEAR); + List yearReportData = listDataReport(begin, end, QueryDateTypeEnum.DAY,deviceCode,sttp, col); + //年度数据转化到报表里,计算每月数据和年数据 + try { + toYearReport(yearReport, yearReportData, col,sttp); + } catch (Exception e) { + return null; + } + //返回数据 + return yearReport; + } + + + /** + * 年度数据转化到报表里,然後计算每月统计数据和年统计数据 + * + * @param yearReport + * @param yearReportData + * @param col + * @throws ParseException + */ + private void toYearReport(YearReport yearReport, List yearReportData, String col,String sttp) + throws ParseException { + //先把数据转化到设计的二维链表里 + SimpleDateFormat sdf = ReportDateUtil.getSimpleDateFormatByType(QueryDateTypeEnum.DAY); + Calendar calendar = Calendar.getInstance(); + for (ReportData reportData : yearReportData) { + Date tempDay = sdf.parse(reportData.getKeyStr()); + calendar.setTime(tempDay); + int month = calendar.get(Calendar.MONTH); + int day = calendar.get(Calendar.DAY_OF_MONTH); + String value=reportData.getVal(); + + if(value!=null && !"-".equals(value) && !"".equals(value.trim())){ + value = new BigDecimal(value).setScale(3,BigDecimal.ROUND_DOWN).toString(); + } + yearReport.setDayValue(month, day,value); + } + //初始化每月列表 + yearReport.initMonthList(new String[]{ + StandardData.STANDARD_AVG, + StandardData.STANDARD_MAX, + StandardData.STANDARD_MAX_DATE, + StandardData.STANDARD_MIN, + StandardData.STANDARD_MIN_DATE + }); + //计算每月统计数据 + calcMonth(yearReport, col,sttp); + //计算年数据 + calcYear(yearReport, col,sttp); + } + + + private void toYearRainReport(YearReport yearReport, List yearReportData, String col,String sttp) + throws ParseException { + //先把数据转化到设计的二维链表里 + SimpleDateFormat sdf = ReportDateUtil.getSimpleDateFormatByType(QueryDateTypeEnum.DAY); + Calendar calendar = Calendar.getInstance(); + for (ReportData reportData : yearReportData) { + Date tempDay = sdf.parse(reportData.getKeyStr()); + calendar.setTime(tempDay); + int month = calendar.get(Calendar.MONTH); + int day = calendar.get(Calendar.DAY_OF_MONTH); + String value=reportData.getVal(); + + if(value!=null && !"-".equals(value) && !"".equals(value.trim())){ + value = new BigDecimal(value).setScale(3,BigDecimal.ROUND_DOWN).toString(); + } + yearReport.setDayValue(month, day,value); + } + //初始化每月列表 + yearReport.initMonthList(new String[]{ + StandardData.STANDARD_AVG, + StandardData.STANDARD_MAX, + StandardData.STANDARD_MAX_DATE, + StandardData.STANDARD_MIN, + StandardData.STANDARD_MIN_DATE + }); +// //计算每月统计数据 +// calcRainMonth(yearReport); +// //计算年数据 +// calcRainYear(yearReport, col,sttp); + } + +// private void calcRainMonth(YearReport yearReport) { +// StandardData standardData =null; +// String stcd = yearReport.getStcd(); +// List> dayList = yearReport.getDayList(); +// for (int month = 0; month < dayList.size(); month++) { +// if (Objects.isNull(standardData)) { +// standardData = new StandardData(); +// } +// standardData.dealNullData(); +// +// +// if(avgValue!=null && !avgValue.isEmpty()) { +// yearReport.setMonthValue(StandardData.STANDARD_AVG, month, avgValue.get(0).getVal()); +//// yearReport.setMonthValue(StandardData.STANDARD_AVG, month, avgValue.get(stcd)); +// }else{ +// yearReport.setMonthValue(StandardData.STANDARD_AVG, month, "-"); +// } +// +// if(maxValue!=null) { +// yearReport.setMonthValue(StandardData.STANDARD_MAX, month, maxValue.get(stcd)); +// yearReport.setMonthValue(StandardData.STANDARD_MAX_DATE, month, maxValue.get("tm")); +// }else{ +// yearReport.setMonthValue(StandardData.STANDARD_MAX, month, "-"); +// yearReport.setMonthValue(StandardData.STANDARD_MAX_DATE, month, "-"); +// } +// +// if(minValue!=null) { +// yearReport.setMonthValue(StandardData.STANDARD_MIN, month, minValue.get(stcd)); +// yearReport.setMonthValue(StandardData.STANDARD_MIN_DATE, month, minValue.get("tm")); +// }else{ +// yearReport.setMonthValue(StandardData.STANDARD_MIN, month, "-"); +// yearReport.setMonthValue(StandardData.STANDARD_MIN_DATE, month, "-"); +// } +// +// } +// } + + private void calcMonth(YearReport yearReport, String col,String sttp) { + //SimpleDateFormat sdf = ReportDateUtil.getSimpleDateFormatByType(QueryDateTypeEnum.DAY); + //获取日报表数据 + StandardData standardData =null; + String stcd = yearReport.getStcd(); + List> dayList = yearReport.getDayList(); + for (int month = 0; month < dayList.size(); month++) { + Date begin = ReportDateUtil.getDate(yearReport.getYear(), month, 1, 8, 0, 0); + Date end = ReportDateUtil.getNextDate(begin, Calendar.MONTH); + //拿到一个月的统计数据 + Map maxValue= queryMaxOrMin(stcd, begin, end,1,col); + Map minValue= queryMaxOrMin(stcd, begin, end,2,col); +// Map avgValue= queryMaxOrMin(stcd, begin, end,3,col); + List avgValue= listDataReport( begin, end,QueryDateTypeEnum.MONTH,stcd,sttp,col); + + if (Objects.isNull(standardData)) { + standardData = new StandardData(); + } + standardData.dealNullData(); + if(avgValue!=null && !avgValue.isEmpty()) { + yearReport.setMonthValue(StandardData.STANDARD_AVG, month, avgValue.get(0).getVal()); +// yearReport.setMonthValue(StandardData.STANDARD_AVG, month, avgValue.get(stcd)); + }else{ + yearReport.setMonthValue(StandardData.STANDARD_AVG, month, "-"); + } + + if(maxValue!=null && maxValue.get(stcd)!=null) { + yearReport.setMonthValue(StandardData.STANDARD_MAX, month, maxValue.get(stcd)); + yearReport.setMonthValue(StandardData.STANDARD_MAX_DATE, month, maxValue.get("tm")); + }else{ + yearReport.setMonthValue(StandardData.STANDARD_MAX, month, "-"); + yearReport.setMonthValue(StandardData.STANDARD_MAX_DATE, month, "-"); + } + + if(minValue!=null && minValue.get(stcd)!=null) { + yearReport.setMonthValue(StandardData.STANDARD_MIN, month, minValue.get(stcd)); + yearReport.setMonthValue(StandardData.STANDARD_MIN_DATE, month, minValue.get("tm")); + }else{ + yearReport.setMonthValue(StandardData.STANDARD_MIN, month, "-"); + yearReport.setMonthValue(StandardData.STANDARD_MIN_DATE, month, "-"); + } + } + } + + private void calcYear(YearReport yearReport, String col,String sttp) { + StandardData standardData =null; + String stcd = yearReport.getStcd(); + Date begin = ReportDateUtil.getDate(yearReport.getYear(), 0, 1, 8, 0, 0); + Date end = ReportDateUtil.getNextDate(begin, Calendar.YEAR); + Map maxValue= queryMaxOrMin(stcd, begin, end,1, col); + Map minValue= queryMaxOrMin(stcd, begin, end,2, col); +// Map avgValue= queryMaxOrMin(stcd, begin, end,3, col); + List avgValue= listDataReport( begin, end,QueryDateTypeEnum.YEAR,stcd,sttp,col); + if (Objects.isNull(standardData)) { + standardData = new StandardData(); + } + standardData.dealNullData(); + List yearList = new ArrayList<>(); + if(avgValue!=null && !avgValue.isEmpty()){ + yearList.add(new ReportData(StandardData.STANDARD_AVG, avgValue.get(0).getVal())); +// yearList.add(new ReportData(StandardData.STANDARD_AVG, avgValue.get(stcd))); + }else{ + yearList.add(new ReportData(StandardData.STANDARD_AVG, "-")); + } + + if(maxValue!=null && maxValue.get(stcd)!=null) { + yearList.add(new ReportData(StandardData.STANDARD_MAX, maxValue.get(stcd))); + yearList.add(new ReportData(StandardData.STANDARD_MAX_DATE, maxValue.get("tm"))); + }else{ + yearList.add(new ReportData(StandardData.STANDARD_MAX, "-")); + yearList.add(new ReportData(StandardData.STANDARD_MAX_DATE, "-")); + } + + if(minValue!=null && minValue.get(stcd)!=null) { + yearList.add(new ReportData(StandardData.STANDARD_MIN, minValue.get(stcd))); + yearList.add(new ReportData(StandardData.STANDARD_MIN_DATE, minValue.get("tm"))); + }else{ + yearList.add(new ReportData(StandardData.STANDARD_MIN, "-")); + yearList.add(new ReportData(StandardData.STANDARD_MIN_DATE, "-")); + } + + yearReport.setYearList(yearList); + } + + + //获取测站过程线 + @Override + public Report getReportData(List deviceCodes, Date begin, Date end, String type,String sttp,String col) { + //检查数据是否正常并转化 + final QueryDateTypeEnum dtEnum = CommonUtil.checkType(type); + if(deviceCodes==null || deviceCodes.size()<=0){ + return null; + } + + if(dtEnum ==null){ + return null; + } + + //初始化报表 + Report report = new Report(); + report.initBaseReport(deviceCodes.size(), begin, end, dtEnum); + //设置基础数据 + for (int i = 0; i < deviceCodes.size(); i++) { + String deviceCode = deviceCodes.get(i); + //获取数据库某个站点不同时间要求的数据 + List timeDataList = listDataReport(begin, end,dtEnum,deviceCode,sttp,col); + + for (ReportData reportData : timeDataList) { + String value=reportData.getVal(); +// if(value!=null && !"-".equals(value) && !"".equals(value.trim())){ +// value = new BigDecimal(value).setScale(3,BigDecimal.ROUND_DOWN).toString(); +// } + report.setBaseCell(reportData.getKeyStr(), i, value); + } + } + return report; + } + + private List listDataReport(Date begin,Date endSt,QueryDateTypeEnum dtEnum,String deviceCode,String sttp,String col) { + List list=new ArrayList<>(); + + //周期类型: 0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年) + Integer saveTimeType=2; + if(QueryDateTypeEnum.DAY.equals(dtEnum)){ + saveTimeType = 3; + } + if(QueryDateTypeEnum.MONTH.equals(dtEnum)){ + saveTimeType = 5; + } + if(QueryDateTypeEnum.YEAR.equals(dtEnum)){ + saveTimeType = 6; + } + + LocalDateTime start = LocalDateTime.ofInstant(begin.toInstant(), ZoneId.systemDefault()); + LocalDateTime end = LocalDateTime.ofInstant(endSt.toInstant(), ZoneId.systemDefault()); + + if(sttp.contains("RR") || sttp.contains("ZZ") || sttp.contains("ZQ")){ + return getDataByDeviceCode(deviceCode, 3, saveTimeType, start, end, col); + } + if("PP".equals(sttp)){ + return getDataByDeviceCode(deviceCode, 4, saveTimeType, start, end, col); + } + return list; + } + + List getDataByDeviceCode(String deviceCode,Integer accessRules,Integer saveTimeType, + LocalDateTime start,LocalDateTime end,String col){ + List reportData=new ArrayList<>(); + AnalyseCodeByAnalyseDataPO po=new AnalyseCodeByAnalyseDataPO(); + po.setDeviceCode(deviceCode); + + List signboardConditions=new ArrayList<>(); + AnalyzeDataConditionPO conditionPO=new AnalyzeDataConditionPO(); + conditionPO.setBeginTime(start); + conditionPO.setEndTime(end); + conditionPO.setSignages(col); +// conditionPO.setKeepFigures(3); + conditionPO.setAccessRules(accessRules); + conditionPO.setSaveTimeType(saveTimeType); + conditionPO.setTimeInterval(1); + conditionPO.setFull(1); + signboardConditions.add(conditionPO); + po.setSignboardConditions(signboardConditions); + + Result> result=analyseDataSearchClient.getAnalyzeDataByAnalyzeCodeAndSignages(po); + if(result==null || !result.isSuccess()){ + return reportData; + } + List datas=result.getData(); + if(datas==null || datas.isEmpty()){ + return reportData; + } + for(AnalyzeDataConditionVO vo:datas){ + List dataTaosVOs=vo.getList(); + for(AnalyseDataTaosVO vv:dataTaosVOs) { + if(vo.getSignage().equals(col)) { + ReportData data=new ReportData(); + data.setKeyStr(CommonUtil.getKeyBySaveTimeType(vv.getTs(),saveTimeType)); + String val=vv.getVal(); + data.setStcd(deviceCode); + data.setVal(val); + if(val!=null && !"".equals(val)) { + data.setValue(Double.valueOf(vv.getVal())); + }else{ + data.setValue(0.0); + } + data.setName(vo.getName()); + reportData.add(data); + } + } + } + return reportData; + } + + + + //获取测站最新值 + @Override + public List> getLastValues(List stcds,String sttp) { + List> result=new ArrayList<>(); + + List oldRzList=null; + List oldInqList=null; + List oldDrpList=null; + + List rzList=null; + List inqList=null; + List drpList=null; + + Date endTime =new Date(); + Date beginTime= DateUtils.addMinutes(endTime,-60); + Date beginTime1= DateUtils.addMinutes(beginTime,-60); + //获取一个最新值 + if("RR".equals(sttp) || "ZQ".equals(sttp)){ + rzList = getNewValue(stcds, "water_level", beginTime, endTime); + inqList = getNewValue(stcds, "flow", beginTime, endTime); + + oldRzList = getNewValue(stcds, "water_level", beginTime1, beginTime); + oldInqList = getNewValue(stcds, "flow", beginTime1, beginTime); + } + + if("PP".equals(sttp)) { + drpList = getNewValue(stcds, "rain", beginTime, endTime); + oldDrpList = getNewValue(stcds, "rain", beginTime1, beginTime); + } + + if("ZZ".equals(sttp)){ + rzList = getNewValue(stcds, "water_level", beginTime, endTime); +// inqList = getNewValue(stcds, "inq", beginTime, endTime); + + oldRzList = getNewValue(stcds, "water_level", beginTime1, beginTime); +// oldInqList = getNewValue(stcds, "inq", beginTime1, beginTime); + } + + for(String stcd:stcds) { + Map map=new HashMap<>(); + + + map.put("stcd",stcd); + if("RR".equals(sttp) || "ZQ".equals(sttp)){ + boolean inqFlag = true; + boolean rzFlag = true; + BigDecimal rz=getDataByStcd(stcd,rzList); + map.put("rz",rz); + BigDecimal inq=getDataByStcd(stcd,inqList); + map.put("inq",inq); + + + BigDecimal oldRz=getDataByStcd(stcd,oldRzList); + if (oldRz.compareTo(rz) > 0) { + rzFlag = false; + } + map.put("isRiseRz",rzFlag); + + BigDecimal oldInq=getDataByStcd(stcd,oldInqList); + if (oldInq.compareTo(inq) > 0) { + inqFlag = false; + } + map.put("isRiseInq",inqFlag); + } + if("PP".equals(sttp)){ + boolean inqDrp = true; + BigDecimal drp=getDataByStcd(stcd,drpList); + map.put("drp",drp); + + BigDecimal oldDrp=getDataByStcd(stcd,oldDrpList); + if (oldDrp.compareTo(drp) > 0) { + inqDrp = false; + } + map.put("isRiseDrp",inqDrp); + } + + if("ZZ".equals(sttp)){ + boolean rzFlag = true; + BigDecimal rz=getDataByStcd(stcd,rzList); + map.put("rz",rz); + + BigDecimal oldRz=getDataByStcd(stcd,oldRzList); + if (oldRz.compareTo(rz) > 0) { + rzFlag = false; + } + map.put("isRiseRz",rzFlag); + } + + result.add(map); + } + + return result; + } + + private BigDecimal getDataByStcd(String stcd,List data){ + if(data==null || data.isEmpty()){ + return BigDecimal.ZERO; + } + for(DeviceSinglePropsValueVO vo:data){ + if(stcd.equals(vo.getDeviceCode())){ + String value=String.valueOf(vo.getValue()); + if(vo.getValue()!=null && !"".equals(value)) { + return new BigDecimal(value); + }else{ + return BigDecimal.ZERO; + } + } + } + return BigDecimal.ZERO; + } + + List getNewValue(List stcds,String col,Date beginTime,Date endTime){ + //获取一个最新值 + DeviceSinglePropsValueQuery query = new DeviceSinglePropsValueQuery(); + query.setAccessRule("6"); + query.setDeviceCodes(stcds); + query.setSignage(col); + query.setBeginTime(beginTime); + query.setEndTime(endTime); + Result> res=analyseDataSearchClient.getValueOfBacthDeviceCode(query); + if(res==null || !res.isSuccess()){ + return null; + } + List list=res.getData(); + return list; + } + + /** + * 获取 对应(计算)值的遥测值 + * @param deviceCode 设备编码 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @param calcType 0=最早值、1=最大值、2=最小值、3=平均值、4=（累计值/和值)、5=（变化值/差值） 6=最新值 +// * @param saveTimeType 0-> s(秒) 1->、m(分)、2->h(小时)3->、d(天)4->、w(周)5->、n(自然月)、6->y(自然年) + * @param col 对应的物理值 英文 + * @return + */ + @Override + public Map queryMaxOrMin(String deviceCode, Date startTime, Date endTime, + Integer calcType, String col) { + Map res=new HashMap<>(); + + List signages=new ArrayList<>(); + signages.add(col); + ComputeBaseStrategyPO po=new ComputeBaseStrategyPO(); + LocalDateTime start = LocalDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault()); + po.setBeginTime(start); + LocalDateTime end = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()); + po.setEndTime(end); + po.setAccessRules(calcType); + po.setDeviceCode(deviceCode); + po.setSignages(signages); + Result> result=analyseDataSearchClient.getComputeBaseStrategy(po); + if(result==null || !result.isSuccess()){ + return res; + } + List datas=result.getData(); + + if(datas!=null && !datas.isEmpty()){ + for(AnalyseDataTaosVO vo:datas) { +// if(col.equals(vo.getSignage())) { + String value=vo.getVal(); + String tm=vo.getTs(); + res.put(deviceCode, value); + res.put("tm", tm); + +// } + } + } + + return res; + } + + private AnalyseCodeByAnalyseDataPO getAnalyseCodeByAnalyseDataPO(String deviceCode,Date startTime,Date endTime,Integer calcType, + Integer saveTimeType,Integer timeInterval,String col){ + AnalyseCodeByAnalyseDataPO analyzeDataCondition=new AnalyseCodeByAnalyseDataPO(); + analyzeDataCondition.setDeviceCode(deviceCode); + + List signboardConditions=new ArrayList<>(); + AnalyzeDataConditionPO conditionPO=new AnalyzeDataConditionPO(); + LocalDateTime start = LocalDateTime.ofInstant(startTime.toInstant(), ZoneId.systemDefault()); + conditionPO.setBeginTime(start); + LocalDateTime end = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault()); + conditionPO.setEndTime(end); + conditionPO.setAccessRules(calcType); + if(timeInterval == null) { + timeInterval = calcTimeInterval(saveTimeType, start, end); + //加1的目的 就是对小数位进行统一处理 + conditionPO.setTimeInterval(timeInterval + 1); + }else{ + conditionPO.setTimeInterval(timeInterval); + } + conditionPO.setSaveTimeType(saveTimeType); + conditionPO.setFull(1); + conditionPO.setSignages(col); + +// conditionPO.setKeepFigures(3); + + signboardConditions.add(conditionPO); + analyzeDataCondition.setSignboardConditions(signboardConditions); + return analyzeDataCondition; + } + + //计算时间间隔 + private static Integer calcTimeInterval(Integer saveTimeType,LocalDateTime start,LocalDateTime end){ + Duration duration = Duration.between(start,end); + switch (saveTimeType) { + case 1://分 + return (int)duration.toMinutes(); + case 2://时 + return (int)duration.toHours(); + case 3://天 + return (int)duration.toDays(); + case 4://周 + return (int)duration.toDays()/7; + case 5://月 + LocalDate startDate = start.toLocalDate(); + LocalDate endDate = end.toLocalDate(); + return Period.between(startDate, endDate).getMonths(); + case 6://年 + startDate = start.toLocalDate(); + endDate = end.toLocalDate(); + return Period.between(startDate, endDate).getYears(); + default: + return (int)duration.getSeconds(); + } + } + +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBServiceImpl.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBServiceImpl.java new file mode 100644 index 0000000..be2a74c --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/StStbprpBServiceImpl.java @@ -0,0 +1,11 @@ +package com.hnac.hzims.waterrain.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import com.hnac.hzims.waterrain.mapper.StStbprpBMapper; +import com.hnac.hzims.waterrain.service.IStStbprpBService; +import org.springframework.stereotype.Service; + +@Service +public class StStbprpBServiceImpl extends BaseServiceImpl implements IStStbprpBService { +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainReorganizeServiceImpl.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainReorganizeServiceImpl.java new file mode 100644 index 0000000..b610bc2 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainReorganizeServiceImpl.java @@ -0,0 +1,235 @@ +package com.hnac.hzims.waterrain.service.impl; + +import com.hnac.hzims.waterrain.entity.HzStPptnR; +import com.hnac.hzims.waterrain.entity.HzStRiverR; +import com.hnac.hzims.waterrain.entity.HzStRsvrR; +import com.hnac.hzims.waterrain.entity.ReorganizeData; +import com.hnac.hzims.waterrain.enums.WaterFlowRainEnum; +import com.hnac.hzims.waterrain.mapper.WaterRainReorganizeMapper; +import com.hnac.hzims.waterrain.service.IWaterRainReorganizeService; +import com.hnac.hzims.waterrain.util.DateUtil; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service +public class WaterRainReorganizeServiceImpl implements IWaterRainReorganizeService { + @Resource + WaterRainReorganizeMapper waterRainReorganizeMapper; + + @Override + public boolean batchInsert(ReorganizeData data) { + String sttp=data.getSttp(); + if(WaterFlowRainEnum.RR.getCode().equals(sttp)){ + List list=dealHzStRsvrR(data); + if(list!=null && !list.isEmpty()) { + batchStRsvrR(list); + return true; + } + } + if(WaterFlowRainEnum.ZZ.getCode().equals(sttp) || WaterFlowRainEnum.ZQ.getCode().equals(sttp)){ + List list=dealHzStRiverR(data); + if(list!=null && !list.isEmpty()) { + batchStRiverR(list); + return true; + } + } + if(WaterFlowRainEnum.PP.getCode().equals(sttp)){ + List list=dealHzStPptnR(data); + if(list!=null && !list.isEmpty()) { + batchStPptnR(list); + return true; + } + } + return false; + } + + private List dealHzStRsvrR(ReorganizeData data){ + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH"); + List list=new ArrayList<>(); + List> mapList=data.getData(); + if(mapList!=null && !mapList.isEmpty()){ + for(Map param:mapList){ + + String tm=String.valueOf(param.get("tm")); + String rz=String.valueOf(param.get("water_level")); + String inq=String.valueOf(param.get("flow")); + + HzStRsvrR stRsvrR=new HzStRsvrR(); + stRsvrR.setStcd(data.getStcd()); + stRsvrR.setInq(Double.valueOf(inq)); + stRsvrR.setRz(Double.valueOf(rz)); + try { + stRsvrR.setTm(sdf.parse(tm)); + } catch (ParseException e) { + e.printStackTrace(); + } + list.add(stRsvrR); + } + } + return list; + } + + private List dealHzStRiverR(ReorganizeData data){ + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH"); + List list=new ArrayList<>(); + List> mapList=data.getData(); + if(mapList!=null && !mapList.isEmpty()){ + for(Map param:mapList){ + + String tm=String.valueOf(param.get("tm")); + String z=String.valueOf(param.get("water_level")); + String q=String.valueOf(param.get("flow")); + + HzStRiverR stRiverR=new HzStRiverR(); + stRiverR.setStcd(data.getStcd()); + stRiverR.setQ(Double.valueOf(q)); + stRiverR.setZ(Double.valueOf(z)); + try { + stRiverR.setTm(sdf.parse(tm)); + } catch (ParseException e) { + e.printStackTrace(); + } + list.add(stRiverR); + } + } + return list; + } + + private List dealHzStPptnR(ReorganizeData data){ + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH"); + List list=new ArrayList<>(); + List> mapList=data.getData(); + if(mapList!=null && !mapList.isEmpty()){ + for(Map param:mapList){ + + String tm=String.valueOf(param.get("tm")); + String drp=String.valueOf(param.get("rain")); + + HzStPptnR stPptnR=new HzStPptnR(); + stPptnR.setStcd(data.getStcd()); + stPptnR.setDrp(Double.valueOf(drp)); + try { + stPptnR.setTm(sdf.parse(tm)); + } catch (ParseException e) { + e.printStackTrace(); + } + list.add(stPptnR); + } + } + return list; + } + + @Override + public void batchStPptnR(List list) { + waterRainReorganizeMapper.batchStPptnR(list); + } + + @Override + public void batchStRiverR(List list) { + waterRainReorganizeMapper.batchStRiverR(list); + } + + @Override + public void batchStRsvrR(List list) { + waterRainReorganizeMapper.batchStRsvrR(list); + } + + @Override + public int insertHzStPptnR(HzStPptnR hzStPptnR) { + return waterRainReorganizeMapper.insertHzStPptnR(hzStPptnR); + } + + @Override + public int insertHzStRsvrR(HzStRsvrR hzStRsvrR) { + return waterRainReorganizeMapper.insertHzStRsvrR(hzStRsvrR); + } + + @Override + public int insertHzStRiverR(HzStRiverR hzStRiverR) { + return waterRainReorganizeMapper.insertHzStRiverR(hzStRiverR); + } + + @Override + public List> queryStPptnR(String stcd, String yearMonth) { + Map dateMap=DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + return waterRainReorganizeMapper.queryStPptnR(stcd,begin,endSt); + } + + @Override + public List> queryStRsvrR(String stcd, String yearMonth) { + Map dateMap=DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + return waterRainReorganizeMapper.queryStRsvrR(stcd,begin,endSt); + } + + @Override + public List> queryStRiverR(String stcd, String yearMonth) { + Map dateMap= DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + return waterRainReorganizeMapper.queryStRiverR(stcd,begin,endSt); + } + + @Override + public boolean delStPptnR(String stcd, String yearMonth) { + Map dateMap= DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + return waterRainReorganizeMapper.delStPptnR(stcd,begin,endSt)>0; + } + + @Override + public boolean delStRsvrR(String stcd, String yearMonth) { + Map dateMap= DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + return waterRainReorganizeMapper.delStRsvrR(stcd,begin,endSt)>0; + } + + @Override + public boolean delStRiverR(String stcd, String yearMonth) { + Map dateMap= DateUtil.getStartEnd(yearMonth); + Date begin= dateMap.get("start"); + Date endSt= dateMap.get("end"); + return waterRainReorganizeMapper.delStRiverR(stcd,begin,endSt)>0; + } + + + @Override + public List> queryData(String stcd, String sttp, String yearMonth) { + if(WaterFlowRainEnum.RR.getCode().equals(sttp)){ + return queryStRsvrR(stcd,yearMonth); + } + if(WaterFlowRainEnum.ZZ.getCode().equals(sttp) || WaterFlowRainEnum.ZQ.getCode().equals(sttp)){ + return queryStRiverR(stcd,yearMonth); + } + if(WaterFlowRainEnum.PP.getCode().equals(sttp)){ + return queryStPptnR(stcd,yearMonth); + } + return null; + } + + @Override + public boolean delData(String stcd, String sttp, String yearMonth) { + if(WaterFlowRainEnum.RR.getCode().equals(sttp)){ + return delStRsvrR(stcd,yearMonth); + } + if(WaterFlowRainEnum.ZZ.getCode().equals(sttp) || WaterFlowRainEnum.ZQ.getCode().equals(sttp)){ + return delStRiverR(stcd,yearMonth); + } + if(WaterFlowRainEnum.PP.getCode().equals(sttp)){ + return delStPptnR(stcd,yearMonth); + } + return false; + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainServiceImpl.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainServiceImpl.java new file mode 100644 index 0000000..9f6a5d5 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/service/impl/WaterRainServiceImpl.java @@ -0,0 +1,8 @@ +package com.hnac.hzims.waterrain.service.impl; + +import com.hnac.hzims.waterrain.service.IWaterRainService; +import org.springframework.stereotype.Service; + +@Service +public class WaterRainServiceImpl implements IWaterRainService { +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/DateUtil.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/DateUtil.java new file mode 100644 index 0000000..fa3c4ca --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/DateUtil.java @@ -0,0 +1,31 @@ +package com.hnac.hzims.waterrain.util; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +public class DateUtil { + public static Map getStartEnd(String yearMonth){ + Map data=new HashMap<>(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + Date begin = sdf.parse(yearMonth+"-01 00:00:00"); + // 最大天数 + Date endSt = sdf.parse(yearMonth+"-"+getMaxDayByYearMonth(begin)+" 23:59:59"); + data.put("start",begin); + data.put("end",endSt); + } catch (ParseException e) { + e.printStackTrace(); + } + return data; + } + + public static int getMaxDayByYearMonth(Date start) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(start); + return calendar.getActualMaximum(Calendar.DAY_OF_MONTH); + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/GisUtil.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/GisUtil.java new file mode 100644 index 0000000..d8779cb --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/GisUtil.java @@ -0,0 +1,64 @@ +package com.hnac.hzims.waterrain.util; + + +import com.hnac.hzims.waterrain.entity.StStbprpB; + +import java.math.BigDecimal; + +public class GisUtil { + public static void dealGisData(StStbprpB stStbprpB){ + if(stStbprpB!=null) { + stStbprpB.setLgtd(dealData(stStbprpB.getNlgtd())); + stStbprpB.setLttd(dealData(stStbprpB.getNlttd())); + } + } + +// public static void main(String[] args) { +// System.out.println(dealData(new BigDecimal("10.121806"))); +// } + + private static String dealData(Double data0){ + if(data0!=null && new BigDecimal(data0).compareTo(BigDecimal.ZERO)!=0) { + BigDecimal data=new BigDecimal(data0); + //度 + String str=intVal(data)+"°"; + + //分 + String dataStr = String.valueOf(data); + if(dataStr.indexOf(".")>-1) { + String[] dataArr = dataStr.split("\\."); + data = mul("0." + dataArr[1]); + str += intVal(data) + "'"; + }else{ + str += "0'"; + } + + //秒 + dataStr=String.valueOf(data); + if(dataStr.indexOf(".")>-1) { + String[] dataArr = dataStr.split("\\."); + data = mul("0." + dataArr[1]); + str+=data.setScale(5, BigDecimal.ROUND_DOWN).stripTrailingZeros()+"\""; + }else{ + str += "0\""; + } + + + return str; + } + return "0°"; + } + + private static int intVal(BigDecimal data){ + return data.setScale( 0, BigDecimal.ROUND_DOWN).intValue(); + } + + private static BigDecimal mul(String data){ + return new BigDecimal(data).multiply(new BigDecimal("60")); + } + +// public static void main(String[] args) { +// String str=dealData(new BigDecimal("0.0")); +// System.out.println(str); +// } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/ParamUtil.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/ParamUtil.java new file mode 100644 index 0000000..8b9c7a6 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/util/ParamUtil.java @@ -0,0 +1,26 @@ +package com.hnac.hzims.waterrain.util; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.hnac.hzims.waterrain.entity.StStbprpB; + +import java.util.Map; + +public class ParamUtil { + public static LambdaQueryWrapper conditionStStbprpB(Map param){ + LambdaQueryWrapper wrapper=new LambdaQueryWrapper(); + if(param.get("stcd")!=null) { + wrapper.like(StStbprpB::getStcd,param.get("stcd")); + } + if(param.get("stnm")!=null && !"".equals(param.get("stnm").toString())) { + wrapper.like(StStbprpB::getStnm,param.get("stnm")); + } + if(param.get("sttp")!=null) { + String sttp=param.get("sttp").toString(); + wrapper.in(StStbprpB::getSttp,sttp.split(",")); + } + if(param.get("rscd")!=null) { + wrapper.like(StStbprpB::getRscd,param.get("rscd")); + } + return wrapper; + } +} diff --git a/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/wrapper/StStbprpBWrapper.java b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/wrapper/StStbprpBWrapper.java new file mode 100644 index 0000000..17adcb7 --- /dev/null +++ b/hzims-service/water-rain/src/main/java/com/hnac/hzims/waterrain/wrapper/StStbprpBWrapper.java @@ -0,0 +1,27 @@ +package com.hnac.hzims.waterrain.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.system.cache.DictCache; +import com.hnac.hzims.waterrain.entity.StStbprpB; +import com.hnac.hzims.waterrain.vo.StStbprpBVo; + +import java.util.Objects; + +public class StStbprpBWrapper extends BaseEntityWrapper { + public StStbprpBWrapper() { + } + + public static StStbprpBWrapper build() { + return new StStbprpBWrapper(); + } + + @Override + public StStbprpBVo entityVO(StStbprpB stStbprpB) { + StStbprpBVo stbprpBVo = (StStbprpBVo) Objects.requireNonNull(BeanUtil.copy(stStbprpB, StStbprpBVo.class)); + String sttpName = DictCache.getValue("st_station_type", Func.toStr(stbprpBVo.getSttp())); + stbprpBVo.setSttpName(sttpName); + return stbprpBVo; + } +} diff --git a/hzims-service/water-rain/src/main/resources/application-dev.yml b/hzims-service/water-rain/src/main/resources/application-dev.yml new file mode 100644 index 0000000..50a4ea7 --- /dev/null +++ b/hzims-service/water-rain/src/main/resources/application-dev.yml @@ -0,0 +1,30 @@ +#服务器端口 +server: + port: 8200 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.dev.url} +# username: ${blade.datasource.dev.username} +# password: ${blade.datasource.dev.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: root + password: 123456 + slave: + url: jdbc:mysql://127.0.0.1:3306/equipment?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true + username: root + password: 123456 +demo: + name: aaa diff --git a/hzims-service/water-rain/src/main/resources/application-prod.yml b/hzims-service/water-rain/src/main/resources/application-prod.yml new file mode 100644 index 0000000..da89262 --- /dev/null +++ b/hzims-service/water-rain/src/main/resources/application-prod.yml @@ -0,0 +1,28 @@ +#服务器端口 +server: + port: 8200 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.prod.url} +# username: ${blade.datasource.prod.username} +# password: ${blade.datasource.prod.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: ${blade.datasource.demo.master.url} + username: ${blade.datasource.demo.master.username} + password: ${blade.datasource.demo.master.password} + slave: + url: ${blade.datasource.demo.slave.url} + username: ${blade.datasource.demo.slave.username} + password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/water-rain/src/main/resources/application-test.yml b/hzims-service/water-rain/src/main/resources/application-test.yml new file mode 100644 index 0000000..4b4e157 --- /dev/null +++ b/hzims-service/water-rain/src/main/resources/application-test.yml @@ -0,0 +1,28 @@ +#服务器端口 +server: + port: 8200 + +#数据源配置 +#spring: +# datasource: +# url: ${blade.datasource.test.url} +# username: ${blade.datasource.test.username} +# password: ${blade.datasource.test.password} + +spring: + #排除DruidDataSourceAutoConfigure + autoconfigure: + exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure + datasource: + dynamic: + #设置默认的数据源或者数据源组,默认值即为master + primary: master + datasource: + master: + url: ${blade.datasource.demo.master.url} + username: ${blade.datasource.demo.master.username} + password: ${blade.datasource.demo.master.password} + slave: + url: ${blade.datasource.demo.slave.url} + username: ${blade.datasource.demo.slave.username} + password: ${blade.datasource.demo.slave.password} diff --git a/hzims-service/water-rain/src/main/resources/application.yml b/hzims-service/water-rain/src/main/resources/application.yml new file mode 100644 index 0000000..0952a13 --- /dev/null +++ b/hzims-service/water-rain/src/main/resources/application.yml @@ -0,0 +1,13 @@ +#mybatis-plus配置 +mybatis-plus: + mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml + #实体扫描，多个package用逗号或者分号分隔 + typeAliasesPackage: com.hnac.hzims.**.entity + +#swagger扫描路径配置 +swagger: + base-packages: + - org.springbalde + - com.hnac + + diff --git a/hzims-service/water-rain/src/main/resources/banner.txt b/hzims-service/water-rain/src/main/resources/banner.txt new file mode 100644 index 0000000..f171d84 --- /dev/null +++ b/hzims-service/water-rain/src/main/resources/banner.txt @@ -0,0 +1,7 @@ + _ _ ____ ___ __ __ ___ _ _ ___ _ _ ___ + | || | |_ / |_ _| | \/ | / __| o O O | | | | | _ \ o O O | | | | | _ \ + | __ | / / | | | |\/| | \__ \ o | |_| | | _/ o | |_| | | _/ + |_||_| /___| |___| |_|__|_| |___/ TS__[O] \___/ _|_|_ TS__[O] \___/ _|_|_ +_|"""""|_|"""""|_|"""""|_|"""""|_|"""""| {======|_|"""""|_| """ | {======|_|"""""|_| """ | +"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'"`-0-0-'./o--000'"`-0-0-'"`-0-0-'./o--000'"`-0-0-'"`-0-0-' +