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 + +