From 31910e7c8b44507c234df4cee82f4414d80325bd Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 26 Apr 2024 16:13:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-admin/pom.xml | 13 +- .../kms/web/synchronous/YgSynchronous.java | 252 ++++++++++++++++++ .../dd/controller/AttDiscBaseController.java | 115 ++++++++ .../com/kms/yg/dd/domain/AttDiscBase.java | 105 ++++++++ .../kms/yg/dd/mapper/AttDiscBaseMapper.java | 16 ++ .../kms/yg/dd/service/AttDiscBaseService.java | 16 ++ .../ly/controller/AttBasBaseController.java | 115 ++++++++ .../java/com/kms/yg/ly/domain/AttBasBase.java | 84 ++++++ .../kms/yg/ly/mapper/AttBasBaseMapper.java | 16 ++ .../kms/yg/ly/service/AttBasBaseService.java | 16 ++ .../yg/rv/controller/AttRvBaseController.java | 116 ++++++++ .../java/com/kms/yg/rv/domain/AttRvBase.java | 205 ++++++++++++++ .../com/kms/yg/rv/mapper/AttRvBaseMapper.java | 16 ++ .../kms/yg/rv/service/AttRvBaseService.java | 16 ++ .../sk/controller/AttResBaseController.java | 116 ++++++++ .../sk/controller/AttResRsppController.java | 115 ++++++++ .../java/com/kms/yg/sk/domain/AttResBase.java | 129 +++++++++ .../java/com/kms/yg/sk/domain/AttResRspp.java | 173 ++++++++++++ .../kms/yg/sk/mapper/AttResBaseMapper.java | 17 ++ .../kms/yg/sk/mapper/AttResRsppMapper.java | 17 ++ .../kms/yg/sk/service/AttResBaseService.java | 16 ++ .../kms/yg/sk/service/AttResRsppService.java | 16 ++ .../controller/AttDpdsBaseController.java | 115 ++++++++ .../com/kms/yg/xgxd/domain/AttDpdsBase.java | 109 ++++++++ .../kms/yg/xgxd/mapper/AttDpdsBaseMapper.java | 16 ++ .../yg/xgxd/service/AttDpdsBaseService.java | 16 ++ 26 files changed, 1954 insertions(+), 2 deletions(-) create mode 100644 shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java create mode 100644 shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java create mode 100644 shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/dd/service/AttDiscBaseService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java create mode 100644 shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/ly/service/AttBasBaseService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java create mode 100644 shuili-system/src/main/java/com/kms/yg/rv/mapper/AttRvBaseMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/rv/service/AttRvBaseService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java create mode 100644 shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java create mode 100644 shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/xgxd/service/AttDpdsBaseService.java diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index fdf7a539..0070776b 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -77,8 +77,16 @@ bcprov-jdk15on 1.65 - - + + commons-io + commons-io + 2.2 + + + org.codehaus.plexus + plexus-component-annotations + 1.6 + @@ -111,6 +119,7 @@ maven-assembly-plugin + 2.4 ${project.name} false diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java new file mode 100644 index 00000000..6ebe6309 --- /dev/null +++ b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java @@ -0,0 +1,252 @@ +package com.kms.web.synchronous; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; +import com.kms.yg.dd.domain.AttDiscBase; +import com.kms.yg.dd.service.AttDiscBaseService; +import com.kms.yg.ly.domain.AttBasBase; +import com.kms.yg.ly.service.AttBasBaseService; +import com.kms.yg.rv.domain.AttRvBase; +import com.kms.yg.rv.service.AttRvBaseService; +import com.kms.yg.sk.domain.AttResBase; +import com.kms.yg.sk.domain.AttResRspp; +import com.kms.yg.sk.service.AttResBaseService; +import com.kms.yg.sk.service.AttResRsppService; +import com.kms.yg.xgxd.domain.AttDpdsBase; +import com.kms.yg.xgxd.service.AttDpdsBaseService; +import org.apache.commons.lang.SerializationUtils; +import org.checkerframework.checker.units.qual.A; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; + +@Configuration +@RestController +public class YgSynchronous { + + @Autowired + AttResRsppService attResRsppService; + @Autowired + AttResBaseService attResBaseService; + @Autowired + AttRvBaseService attRvBaseService; + + @Autowired + AttDpdsBaseService attDpdsBaseService; + @Autowired + AttBasBaseService attBasBaseService; + @Autowired + AttDiscBaseService attDiscBaseService; + + private static String XH3CID = "3359137640337"; + private static String XH3CAPPKEY = "q7sli9ch"; + + ExecutorService executorService = Executors.newFixedThreadPool(50); + + public String sendRequest(String url){ + HttpRequest httpRequest = HttpRequest.get(url); + httpRequest.header("X-H3C-APPKEY",XH3CAPPKEY) + .header("X-H3C-ID",XH3CID) + .header("Content-Type", "application/json"); + HttpResponse execute = httpRequest.execute(); + return execute.body(); + } + + //水库特征 + static final String sktz = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_res_rspp" ; + //水库基本数据 + static final String sksj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ygtjgx/dws_att_res_base" ; + //河流基本数据 + static final String rvsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_rv_base" ; + //提段基本数据 + static final String ddsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_disc_base" ; + //险工险段基本数据 + static final String xgxdsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dpds_base" ; + //流域基本数据 + static final String llsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_bas_base" ; + + /** + * 同步 + */ + @GetMapping("sktz1") + public void synchronous(){ + int pageNum = 1; + int pageSize = 1000; + Boolean f = true; + while (f) { + String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); + if (attResRspps.size() attDiscBases = new ArrayList(); + synchronized (attResRspps){ + attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); + } + attDiscBases.forEach(attResRspp -> { + attResRspp.preInsert(); + attResRspp.setId(attResRspp.getDiscCode()); + attDiscBaseService.save(attResRspp); + }); + } + }; + executorService.execute(runnable); + } + } + + + + /*** + * 提段线程 + * @param list + * @return + */ +// public Runnable discRun(List list){ +// return new Runnable() { +// @Override +// public void run() { +// CopyOnWriteArrayList attResRspps1 = CollectionUtil.newCopyOnWriteArrayList(list); +// attResRspps1.forEach(attResRspp -> { +// attResRspp.preInsert(); +// }); +// attDiscBaseService.saveBatch(attResRspps1); +// } +// }; +// } + + + /** + * 水库特征信息 + */ + @GetMapping("sktz") + @Scheduled(cron = "0 0 0 * * ?") + public void sktz(){ + int pageNum = 1; + int pageSize = 999999; + String s = sendRequest(sktz + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attResRspps = JSONObject.parseArray(data, AttResRspp.class); + attResRspps.forEach(attResRspp -> { + attResRspp.preInsert(); + attResRspp.setId(attResRspp.getResCode()); + attResRsppService.saveOrUpdate(attResRspp); + }); + } + + + /** + * 水库基本信息 + */ + @GetMapping("sksj") + @Scheduled(cron = "0 0 0 * * ?") + public void sksj(){ + int pageNum = 1; + int pageSize = 999999; + String s = sendRequest(sksj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attResRspps = JSONObject.parseArray(data, AttResBase.class); + attResRspps.forEach(attResRspp -> { + attResRspp.preInsert(); + attResRspp.setId(attResRspp.getResCode()); + attResBaseService.saveOrUpdate(attResRspp); + }); + } + + /** + * 河流基础信息 + */ + @GetMapping("rvsj") + @Scheduled(cron = "0 0 0 * * ?") + public void rvsj(){ + int pageNum = 1; + int pageSize = 999999; + String s = sendRequest(rvsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attRvBases = JSONObject.parseArray(data, AttRvBase.class); + attRvBases.forEach(attResRspp -> { + attResRspp.preInsert(); + attResRspp.setId(attResRspp.getRvCode()); + attRvBaseService.saveOrUpdate(attResRspp); + }); + } + + + /** + * 险工险峻信息 + */ + @GetMapping("dpds") + @Scheduled(cron = "0 0 0 * * ?") + public void dpds(){ + int pageNum = 1; + int pageSize = 999999; + String s = sendRequest(xgxdsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attRvBases = JSONObject.parseArray(data, AttDpdsBase.class); + attRvBases.forEach(attResRspp -> { + attResRspp.preInsert(); + attResRspp.setId(attResRspp.getDpdsCode()); + attDpdsBaseService.saveOrUpdate(attResRspp); + }); + } + + + /** + * 提段基本数据 + */ + @GetMapping("disc") + @Scheduled(cron = "0 0 0 * * ?") + public void disc(){ + int pageNum = 1; + int pageSize = 999999; + String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attRvBases = JSONObject.parseArray(data, AttDiscBase.class); + attRvBases.forEach(attResRspp -> { + attResRspp.preInsert(); + attResRspp.setId(attResRspp.getDiscCode()); + attDiscBaseService.saveOrUpdate(attResRspp); + }); + } + + + /** + * 流域基本数据 + */ + @GetMapping("bas") + @Scheduled(cron = "0 0 0 * * ?") + public void bas(){ + int pageNum = 1; + int pageSize = 99999; + String s = sendRequest( llsj+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attRvBases = JSONObject.parseArray(data, AttBasBase.class); + attRvBases.forEach(attResRspp -> { + attResRspp.preInsert(); +// attResRspp.setId(attResRspp.getBasCode()); + attBasBaseService.saveOrUpdate(attResRspp); + }); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java b/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java new file mode 100644 index 00000000..fc155565 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/dd/controller/AttDiscBaseController.java @@ -0,0 +1,115 @@ +package com.kms.yg.dd.controller; + +import java.util.Arrays; +import java.util.List; + +import com.kms.yg.dd.domain.AttDiscBase; +import com.kms.yg.dd.service.AttDiscBaseService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 堤段基本信息Controller + * + * @author kms + * @date 2024-04-26 + */ +@RestController +@RequestMapping("/system/disc") +@Api(tags = "堤段基本信息") +public class AttDiscBaseController extends BaseController +{ + @Autowired + private AttDiscBaseService attDiscBaseService; + + + /** + * 查询堤段基本信息列表 + */ + @PostMapping("/list") + @ApiOperation("堤段基本信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return attDiscBaseService.selectPage(sp); + } + + /** + * 导出堤段基本信息列表 + */ + @Log(title = "堤段基本信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤段基本信息导出") + public AjaxResult export(@RequestBody AttDiscBase attDiscBase) + { + List list = attDiscBaseService.listByIds(attDiscBase.getIds()); + ExcelUtil util = new ExcelUtil<>(AttDiscBase.class); + return util.exportExcel(list, "base"); + } + + /** + * 获取堤段基本信息详细信息 + */ + @ApiOperation(" 堤段基本信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attDiscBaseService.getById(id)); + } + + /** + * 新增堤段基本信息 + */ + @Log(title = "堤段基本信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤段基本信息新增") + public AjaxResult add(@RequestBody AttDiscBase attDiscBase) + { + BaseEntityUtils.preInsert(attDiscBase); + return toAjax(attDiscBaseService.save(attDiscBase)); + } + + /** + * 修改堤段基本信息 + */ + @ApiOperation("堤段基本信息修改") + @Log(title = "堤段基本信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttDiscBase attDiscBase) + { + return toAjax(attDiscBaseService.updateById(attDiscBase)); + } + + /** + * 删除堤段基本信息 + */ + @ApiOperation("堤段基本信息删除") + @Log(title = "堤段基本信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attDiscBaseService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java new file mode 100644 index 00000000..9648b637 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java @@ -0,0 +1,105 @@ +package com.kms.yg.dd.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤段基本信息对象 att_disc_base + * + * @author kms + * @date 2024-04-26 + */ +@TableName("att_disc_base") +@Data +@ApiModel("堤段基本信息") +public class AttDiscBase extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** 堤段代码 */ + @Excel(name = "堤段代码") + @ApiModelProperty("堤段代码") + private String discCode; + + /** 堤段名称 */ + @Excel(name = "堤段名称") + @ApiModelProperty("堤段名称") + private String discName; + + /** 起点经度 */ + @Excel(name = "起点经度") + @ApiModelProperty("起点经度") + private String startLong; + + /** 起点纬度 */ + @Excel(name = "起点纬度") + @ApiModelProperty("起点纬度") + private String startLat; + + /** 终点经度 */ + @Excel(name = "终点经度") + @ApiModelProperty("终点经度") + private String endLong; + + /** 终点纬度 */ + @Excel(name = "终点纬度") + @ApiModelProperty("终点纬度") + private String endLat; + + /** 起点所在位置 */ + @Excel(name = "起点所在位置") + @ApiModelProperty("起点所在位置") + private String startLoc; + + /** 终点所在位置 */ + @Excel(name = "终点所在位置") + @ApiModelProperty("终点所在位置") + private String endLoc; + + /** 堤段级别 */ + @Excel(name = "堤段级别") + @ApiModelProperty("堤段级别") + private String discGrad; + + /** 堤段类型 */ + @Excel(name = "堤段类型") + @ApiModelProperty("堤段类型") + private String discType; + + /** 堤段型式 */ + @Excel(name = "堤段型式") + @ApiModelProperty("堤段型式") + private String discPatt; + + /** 堤段长度 */ + @Excel(name = "堤段长度") + @ApiModelProperty("堤段长度") + private String discLen; + + /** 所属管理单位名称 */ + @Excel(name = "所属管理单位名称") + @ApiModelProperty("所属管理单位名称") + private String affWiunName; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty("备注") + private String note; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java new file mode 100644 index 00000000..7a3e0cb1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/dd/mapper/AttDiscBaseMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.dd.mapper; + +import com.kms.yg.dd.domain.AttDiscBase; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 堤段基本信息Mapper接口 + * + * @author kms + * @date 2024-04-26 + */ +@Repository +public interface AttDiscBaseMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/dd/service/AttDiscBaseService.java b/shuili-system/src/main/java/com/kms/yg/dd/service/AttDiscBaseService.java new file mode 100644 index 00000000..226f87af --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/dd/service/AttDiscBaseService.java @@ -0,0 +1,16 @@ +package com.kms.yg.dd.service; + +import com.kms.yg.dd.domain.AttDiscBase; +import com.kms.yg.dd.mapper.AttDiscBaseMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; +/** + * 堤段基本信息Service接口 + * + * @author kms + * @date 2024-04-26 + */ +@Service +public class AttDiscBaseService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java b/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java new file mode 100644 index 00000000..72e4aa83 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/ly/controller/AttBasBaseController.java @@ -0,0 +1,115 @@ +package com.kms.yg.ly.controller; + +import java.util.Arrays; +import java.util.List; + +import com.kms.yg.ly.domain.AttBasBase; +import com.kms.yg.ly.service.AttBasBaseService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 流域基础信息Controller + * + * @author kms + * @date 2024-04-26 + */ +@RestController +@RequestMapping("/system/bas") +@Api(tags = "流域基础信息") +public class AttBasBaseController extends BaseController +{ + @Autowired + private AttBasBaseService attBasBaseService; + + + /** + * 查询流域基础信息列表 + */ + @PostMapping("/list") + @ApiOperation("流域基础信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return attBasBaseService.selectPage(sp); + } + + /** + * 导出流域基础信息列表 + */ + @Log(title = "流域基础信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("流域基础信息导出") + public AjaxResult export(@RequestBody AttBasBase attBasBase) + { + List list = attBasBaseService.listByIds(attBasBase.getIds()); + ExcelUtil util = new ExcelUtil<>(AttBasBase.class); + return util.exportExcel(list, "base"); + } + + /** + * 获取流域基础信息详细信息 + */ + @ApiOperation(" 流域基础信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attBasBaseService.getById(id)); + } + + /** + * 新增流域基础信息 + */ + @Log(title = "流域基础信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("流域基础信息新增") + public AjaxResult add(@RequestBody AttBasBase attBasBase) + { + BaseEntityUtils.preInsert(attBasBase); + return toAjax(attBasBaseService.save(attBasBase)); + } + + /** + * 修改流域基础信息 + */ + @ApiOperation("流域基础信息修改") + @Log(title = "流域基础信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttBasBase attBasBase) + { + return toAjax(attBasBaseService.updateById(attBasBase)); + } + + /** + * 删除流域基础信息 + */ + @ApiOperation("流域基础信息删除") + @Log(title = "流域基础信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attBasBaseService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java b/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java new file mode 100644 index 00000000..4b091c1a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/ly/domain/AttBasBase.java @@ -0,0 +1,84 @@ +package com.kms.yg.ly.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 流域基础信息对象 att_bas_base + * + * @author kms + * @date 2024-04-26 + */ +@TableName("att_bas_base") +@Data +@ApiModel("流域基础信息") +public class AttBasBase extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** 流域代码 */ + @Excel(name = "流域代码") + @ApiModelProperty("流域代码") + private String basCode; + + /** 流域名称 */ + @Excel(name = "流域名称") + @ApiModelProperty("流域名称") + private String basName; + + /** 流域跨界类型 */ + @Excel(name = "流域跨界类型") + @ApiModelProperty("流域跨界类型") + private String basCrOverType; + + /** 流域所属行政区 */ + @Excel(name = "流域所属行政区") + @ApiModelProperty("流域所属行政区") + private String basAdName; + + /** 流域级别 */ + @Excel(name = "流域级别") + @ApiModelProperty("流域级别") + private String basGrad; + + /** 流域面积 */ + @Excel(name = "流域面积") + @ApiModelProperty("流域面积") + private BigDecimal basArea; + + /** 所属管理单位名称 */ + @Excel(name = "所属管理单位名称") + @ApiModelProperty("所属管理单位名称") + private String affWiunName; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty("备注") + private String note; + + /** 记录生效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录生效时间") + private Date effDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java new file mode 100644 index 00000000..4106afe1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/ly/mapper/AttBasBaseMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.ly.mapper; + +import com.kms.yg.ly.domain.AttBasBase; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 流域基础信息Mapper接口 + * + * @author kms + * @date 2024-04-26 + */ +@Repository +public interface AttBasBaseMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/ly/service/AttBasBaseService.java b/shuili-system/src/main/java/com/kms/yg/ly/service/AttBasBaseService.java new file mode 100644 index 00000000..0ee06c9e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/ly/service/AttBasBaseService.java @@ -0,0 +1,16 @@ +package com.kms.yg.ly.service; + +import com.kms.yg.ly.domain.AttBasBase; +import com.kms.yg.ly.mapper.AttBasBaseMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; +/** + * 流域基础信息Service接口 + * + * @author kms + * @date 2024-04-26 + */ +@Service +public class AttBasBaseService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java b/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java new file mode 100644 index 00000000..4fd1aeb5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/rv/controller/AttRvBaseController.java @@ -0,0 +1,116 @@ +package com.kms.yg.rv.controller; + +import java.util.Arrays; +import java.util.List; + +import com.kms.yg.rv.domain.AttRvBase; +import com.kms.yg.rv.service.AttRvBaseService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + + +/** + * 河流基础信息Controller + * + * @author kms + * @date 2024-04-25 + */ +@RestController +@RequestMapping("/system/rv") +@Api(tags = "河流基础信息") +public class AttRvBaseController extends BaseController +{ + @Autowired + private AttRvBaseService attRvBaseService; + + + /** + * 查询河流基础信息列表 + */ + @PostMapping("/list") + @ApiOperation("河流基础信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return attRvBaseService.selectPage(sp); + } + + /** + * 导出河流基础信息列表 + */ + @Log(title = "河流基础信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("河流基础信息导出") + public AjaxResult export(@RequestBody AttRvBase attRvBase) + { + List list = attRvBaseService.listByIds(attRvBase.getIds()); + ExcelUtil util = new ExcelUtil<>(AttRvBase.class); + return util.exportExcel(list, "base"); + } + + /** + * 获取河流基础信息详细信息 + */ + @ApiOperation(" 河流基础信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attRvBaseService.getById(id)); + } + + /** + * 新增河流基础信息 + */ + @Log(title = "河流基础信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("河流基础信息新增") + public AjaxResult add(@RequestBody AttRvBase attRvBase) + { + BaseEntityUtils.preInsert(attRvBase); + return toAjax(attRvBaseService.save(attRvBase)); + } + + /** + * 修改河流基础信息 + */ + @ApiOperation("河流基础信息修改") + @Log(title = "河流基础信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttRvBase attRvBase) + { + return toAjax(attRvBaseService.updateById(attRvBase)); + } + + /** + * 删除河流基础信息 + */ + @ApiOperation("河流基础信息删除") + @Log(title = "河流基础信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attRvBaseService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java b/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java new file mode 100644 index 00000000..825fd8e4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/rv/domain/AttRvBase.java @@ -0,0 +1,205 @@ +package com.kms.yg.rv.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 河流基础信息对象 att_rv_base + * + * @author kms + * @date 2024-04-25 + */ +@TableName("att_rv_base") +@Data +@ApiModel("河流基础信息") +public class AttRvBase extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** 河流代码 */ + @Excel(name = "河流代码") + @ApiModelProperty("河流代码") + private String rvCode; + + /** 河流名称 */ + @Excel(name = "河流名称") + @ApiModelProperty("河流名称") + private String rvName; + + /** 河名备注 */ + @Excel(name = "河名备注") + @ApiModelProperty("河名备注") + private String rvNote; + + /** 河流级别 */ + @Excel(name = "河流级别") + @ApiModelProperty("河流级别") + private String rvGrad; + + /** 河流类型 */ + @Excel(name = "河流类型") + @ApiModelProperty("河流类型") + private String rvType; + + /** 河流跨界类型 */ + @Excel(name = "河流跨界类型") + @ApiModelProperty("河流跨界类型") + private String rvCrOverType; + + /** 河口类型 */ + @Excel(name = "河口类型") + @ApiModelProperty("河口类型") + private String rvMouType; + + /** 成因类型 */ + @Excel(name = "成因类型") + @ApiModelProperty("成因类型") + private String cafmRvType; + + /** 河源经度 */ + @Excel(name = "河源经度") + @ApiModelProperty("河源经度") + private String rvSourLong; + + /** 河源纬度 */ + @Excel(name = "河源纬度") + @ApiModelProperty("河源纬度") + private String rvSourLat; + + /** 河源地址 */ + @Excel(name = "河源地址") + @ApiModelProperty("河源地址") + private String rvSourAddr; + + /** 河口经度 */ + @Excel(name = "河口经度") + @ApiModelProperty("河口经度") + private String rvMouLong; + + /** 河口纬度 */ + @Excel(name = "河口纬度") + @ApiModelProperty("河口纬度") + private String rvMouLat; + + /** 河口地址 */ + @Excel(name = "河口地址") + @ApiModelProperty("河口地址") + private String rvMouAddr; + + /** 河源备注 */ + @Excel(name = "河源备注") + @ApiModelProperty("河源备注") + private String rvSourNote; + + /** 河口备注 */ + @Excel(name = "河口备注") + @ApiModelProperty("河口备注") + private String rvMouNote; + + /** 河流长度 */ + @Excel(name = "河流长度") + @ApiModelProperty("河流长度") + private BigDecimal rvLen; + + /** 河源高程 */ + @Excel(name = "河源高程") + @ApiModelProperty("河源高程") + private BigDecimal hwps; + + /** 河口高程 */ + @Excel(name = "河口高程") + @ApiModelProperty("河口高程") + private BigDecimal esel; + + /** 水准基面 */ + @Excel(name = "水准基面") + @ApiModelProperty("水准基面") + private String dtpl; + + /** 河道平均比降 */ + @Excel(name = "河道平均比降") + @ApiModelProperty("河道平均比降") + private BigDecimal averSlop; + + /** 干流弯曲率 */ + @Excel(name = "干流弯曲率") + @ApiModelProperty("干流弯曲率") + private BigDecimal msCv; + + /** 岸别 */ + @Excel(name = "岸别") + @ApiModelProperty("岸别") + private String bank; + + /** 河流流域面积 */ + @Excel(name = "河流流域面积") + @ApiModelProperty("河流流域面积") + private BigDecimal rvBasArea; + + /** 流经区域 */ + @Excel(name = "流经区域") + @ApiModelProperty("流经区域") + private String flowArea; + + /** 管理级别 */ + @Excel(name = "管理级别") + @ApiModelProperty("管理级别") + private String admGrad; + + /** 河流概况 */ + @Excel(name = "河流概况") + @ApiModelProperty("河流概况") + private String rvov; + + /** 是否为内河 */ + @Excel(name = "是否为内河") + @ApiModelProperty("是否为内河") + private String inlandFlag; + + /** 水利部普查编码 */ + @Excel(name = "水利部普查编码") + @ApiModelProperty("水利部普查编码") + private String watObjCode; + + /** 河长级别 */ + @Excel(name = "河长级别") + @ApiModelProperty("河长级别") + private Integer rvChiefGrad; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty("备注") + private String note; + + /** 记录生效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录生效时间") + private Date effDate; + + /** 记录失效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录失效时间") + private Date exprDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/rv/mapper/AttRvBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/rv/mapper/AttRvBaseMapper.java new file mode 100644 index 00000000..d2996a6c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/rv/mapper/AttRvBaseMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.rv.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.rv.domain.AttRvBase; +import org.springframework.stereotype.Repository; + +/** + * 河流基础信息Mapper接口 + * + * @author kms + * @date 2024-04-25 + */ +@Repository +public interface AttRvBaseMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/rv/service/AttRvBaseService.java b/shuili-system/src/main/java/com/kms/yg/rv/service/AttRvBaseService.java new file mode 100644 index 00000000..d074d3c5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/rv/service/AttRvBaseService.java @@ -0,0 +1,16 @@ +package com.kms.yg.rv.service; + +import com.kms.yg.rv.domain.AttRvBase; +import com.kms.yg.rv.mapper.AttRvBaseMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; +/** + * 河流基础信息Service接口 + * + * @author kms + * @date 2024-04-25 + */ +@Service +public class AttRvBaseService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java new file mode 100644 index 00000000..9fc8403d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseController.java @@ -0,0 +1,116 @@ +package com.kms.yg.sk.controller; + +import java.util.Arrays; +import java.util.List; + +import com.kms.yg.sk.domain.AttResBase; +import com.kms.yg.sk.service.AttResBaseService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + + +/** + * 【请填写功能名称】Controller + * + * @author kms + * @date 2024-04-24 + */ +@RestController +@RequestMapping("/system/base") +@Api(tags = "【请填写功能名称】") +public class AttResBaseController extends BaseController +{ + @Autowired + private AttResBaseService attResBaseService; + + + /** + * 查询【请填写功能名称】列表 + */ + @PostMapping("/list") + @ApiOperation("【请填写功能名称】列表") + public IPage list(@RequestBody SearchParam sp) + { + return attResBaseService.selectPage(sp); + } + + /** + * 导出【请填写功能名称】列表 + */ + @Log(title = "【请填写功能名称】导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("【请填写功能名称】导出") + public AjaxResult export(@RequestBody AttResBase attResBase) + { + List list = attResBaseService.listByIds(attResBase.getIds()); + ExcelUtil util = new ExcelUtil<>(AttResBase.class); + return util.exportExcel(list, "base"); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + @ApiOperation(" 【请填写功能名称】详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attResBaseService.getById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @Log(title = "【请填写功能名称】新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("【请填写功能名称】新增") + public AjaxResult add(@RequestBody AttResBase attResBase) + { + BaseEntityUtils.preInsert(attResBase); + return toAjax(attResBaseService.save(attResBase)); + } + + /** + * 修改【请填写功能名称】 + */ + @ApiOperation("【请填写功能名称】修改") + @Log(title = "【请填写功能名称】修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttResBase attResBase) + { + return toAjax(attResBaseService.updateById(attResBase)); + } + + /** + * 删除【请填写功能名称】 + */ + @ApiOperation("【请填写功能名称】删除") + @Log(title = "【请填写功能名称】删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attResBaseService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java new file mode 100644 index 00000000..942ea469 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java @@ -0,0 +1,115 @@ +package com.kms.yg.sk.controller; + +import java.util.Arrays; +import java.util.List; + +import com.kms.yg.sk.domain.AttResRspp; +import com.kms.yg.sk.service.AttResRsppService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 【请填写功能名称】Controller + * + * @author kms + * @date 2024-04-24 + */ +@RestController +@RequestMapping("/system/rspp") +@Api(tags = "【请填写功能名称】") +public class AttResRsppController extends BaseController +{ + @Autowired + private AttResRsppService attResRsppService; + + + /** + * 查询【请填写功能名称】列表 + */ + @PostMapping("/list") + @ApiOperation("【请填写功能名称】列表") + public IPage list(@RequestBody SearchParam sp) + { + return attResRsppService.selectPage(sp); + } + + /** + * 导出【请填写功能名称】列表 + */ + @Log(title = "【请填写功能名称】导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("【请填写功能名称】导出") + public AjaxResult export(@RequestBody AttResRspp attResRspp) + { + List list = attResRsppService.listByIds(attResRspp.getIds()); + ExcelUtil util = new ExcelUtil<>(AttResRspp.class); + return util.exportExcel(list, "rspp"); + } + + /** + * 获取【请填写功能名称】详细信息 + */ + @ApiOperation(" 【请填写功能名称】详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attResRsppService.getById(id)); + } + + /** + * 新增【请填写功能名称】 + */ + @Log(title = "【请填写功能名称】新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("【请填写功能名称】新增") + public AjaxResult add(@RequestBody AttResRspp attResRspp) + { + BaseEntityUtils.preInsert(attResRspp); + return toAjax(attResRsppService.save(attResRspp)); + } + + /** + * 修改【请填写功能名称】 + */ + @ApiOperation("【请填写功能名称】修改") + @Log(title = "【请填写功能名称】修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttResRspp attResRspp) + { + return toAjax(attResRsppService.updateById(attResRspp)); + } + + /** + * 删除【请填写功能名称】 + */ + @ApiOperation("【请填写功能名称】删除") + @Log(title = "【请填写功能名称】删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attResRsppService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java new file mode 100644 index 00000000..5dda4f66 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBase.java @@ -0,0 +1,129 @@ +package com.kms.yg.sk.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 【请填写功能名称】对象 att_res_base + * + * @author kms + * @date 2024-04-24 + */ +@TableName("att_res_base") +@Data +@ApiModel("【请填写功能名称】") +public class AttResBase extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** 水库代码 */ + @ApiModelProperty("${comment}") + private String resCode; + + /** 水库名称 */ + @Excel(name = "水库名称") + @ApiModelProperty("水库名称") + private String resName; + + /** 水库中心经度 */ + @Excel(name = "水库中心经度") + @ApiModelProperty("水库中心经度") + private String resCenLong; + + /** 水库中心纬度 */ + @Excel(name = "水库中心纬度") + @ApiModelProperty("水库中心纬度") + private String resCenLat; + + /** 水库所在位置 */ + @Excel(name = "水库所在位置") + @ApiModelProperty("水库所在位置") + private String resLoc; + + /** 水库类型 */ + @Excel(name = "水库类型") + @ApiModelProperty("水库类型") + private String resType; + + /** 管理单位 */ + @Excel(name = "管理单位") + @ApiModelProperty("管理单位") + private String mnun; + + /** 主管单位 */ + @Excel(name = "主管单位") + @ApiModelProperty("主管单位") + private String cmun; + + /** 工程等别 */ + @Excel(name = "工程等别") + @ApiModelProperty("工程等别") + private String engGrad; + + /** 工程规模 */ + @Excel(name = "工程规模") + @ApiModelProperty("工程规模") + private String engScal; + + /** 坝址控制流域面积 */ + @Excel(name = "坝址控制流域面积") + @ApiModelProperty("坝址控制流域面积") + private Double watShedArea; + + /** 工程状况 */ + @Excel(name = "工程状况") + @ApiModelProperty("工程状况") + private String engStat; + + /** 开工时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "开工时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("开工时间") + private Date startDate; + + /** 建成时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "建成时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("建成时间") + private Date compDate; + + /** 归口管理部门 */ + @Excel(name = "归口管理部门") + @ApiModelProperty("归口管理部门") + private String admDep; + + /** 水库概况 */ + @Excel(name = "水库概况") + @ApiModelProperty("水库概况") + private String resOv; + + /** 记录生效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录生效时间") + private Date effDate; + + /** $column.columnComment */ + @Excel(name = "记录生效时间") + @ApiModelProperty("记录生效时间") + private String note; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java new file mode 100644 index 00000000..5867018a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java @@ -0,0 +1,173 @@ +package com.kms.yg.sk.domain; + +import java.io.Serializable; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 【请填写功能名称】对象 att_res_rspp + * + * @author kms + * @date 2024-04-24 + */ +@TableName("att_res_rspp") +@Data +@ApiModel("【请填写功能名称】") +public class AttResRspp extends BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** 水库代码 */ + @ApiModelProperty("${comment}") + private String resCode; + + /** 死水位 */ + @Excel(name = "死水位") + @ApiModelProperty("死水位") + private Double deadLev; + + /** 汛限水位 */ + @Excel(name = "汛限水位") + @ApiModelProperty("汛限水位") + private String flLowLimLev; + + /** 正常蓄水位 */ + @Excel(name = "正常蓄水位") + @ApiModelProperty("正常蓄水位") + private Double normWatLev; + + /** 防洪高水位 */ + @Excel(name = "防洪高水位") + @ApiModelProperty("防洪高水位") + private Double uppLevFlco; + + /** 设计洪水位 */ + @Excel(name = "设计洪水位") + @ApiModelProperty("设计洪水位") + private Double dsfllv; + + /** 校核洪水位 */ + @Excel(name = "校核洪水位") + @ApiModelProperty("校核洪水位") + private Double chfllv; + + /** 旱警水位 */ + @Excel(name = "旱警水位") + @ApiModelProperty("旱警水位") + private Double drwlv; + + /** 总库容 */ + @Excel(name = "总库容") + @ApiModelProperty("总库容") + private Double totCap; + + /** 死库容 */ + @Excel(name = "死库容") + @ApiModelProperty("死库容") + private Double deadCap; + + /** 调洪库容 */ + @Excel(name = "调洪库容") + @ApiModelProperty("调洪库容") + private Double storFlCap; + + /** 防洪库容 */ + @Excel(name = "防洪库容") + @ApiModelProperty("防洪库容") + private Double flcoCap; + + /** 正常蓄水位相应库容 */ + @Excel(name = "正常蓄水位相应库容") + @ApiModelProperty("正常蓄水位相应库容") + private Double normPoolStagCap; + + /** 汛限水位库容 */ + @Excel(name = "汛限水位库容") + @ApiModelProperty("汛限水位库容") + private String flLowLimLevCap; + + /** 设计洪水总量 */ + @Excel(name = "设计洪水总量") + @ApiModelProperty("设计洪水总量") + private String dsflnu; + + /** 校核洪水总量 */ + @Excel(name = "校核洪水总量") + @ApiModelProperty("校核洪水总量") + private String chflvl; + + /** 设计洪峰流量 */ + @Excel(name = "设计洪峰流量") + @ApiModelProperty("设计洪峰流量") + private String dspkfl; + + /** 校核洪峰流量 */ + @Excel(name = "校核洪峰流量") + @ApiModelProperty("校核洪峰流量") + private String chpkfl; + + /** 多年平均径流量 */ + @Excel(name = "多年平均径流量") + @ApiModelProperty("多年平均径流量") + private String avanrnam; + + /** 多年平均降水量 */ + @Excel(name = "多年平均降水量") + @ApiModelProperty("多年平均降水量") + private String avanpram; + + /** 多年平均蒸发量 */ + @Excel(name = "多年平均蒸发量") + @ApiModelProperty("多年平均蒸发量") + private String avanev; + + /** 多年平均输沙量 */ + @Excel(name = "多年平均输沙量") + @ApiModelProperty("多年平均输沙量") + private String avansdam; + + /** 多年平均最低气温 */ + @Excel(name = "多年平均最低气温") + @ApiModelProperty("多年平均最低气温") + private String myavgmintp; + + /** 设计重现期 */ + @Excel(name = "设计重现期") + @ApiModelProperty("设计重现期") + private String dsrcin; + + /** 校核重现期 */ + @Excel(name = "校核重现期") + @ApiModelProperty("校核重现期") + private String chrcin; + + /** 记录生效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录生效时间") + private Date effDate; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty("备注") + private String note; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java new file mode 100644 index 00000000..4ee5486f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.sk.mapper; + +import com.kms.yg.sk.domain.AttResBase; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-24 + */ +@Repository +public interface AttResBaseMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java new file mode 100644 index 00000000..762aa5f0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java @@ -0,0 +1,17 @@ +package com.kms.yg.sk.mapper; + +import com.kms.yg.sk.domain.AttResRspp; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + + +/** + * 【请填写功能名称】Mapper接口 + * + * @author kms + * @date 2024-04-24 + */ +@Repository +public interface AttResRsppMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java new file mode 100644 index 00000000..565d11c9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseService.java @@ -0,0 +1,16 @@ +package com.kms.yg.sk.service; + +import com.kms.yg.sk.domain.AttResBase; +import com.kms.yg.sk.mapper.AttResBaseMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; +/** + * 【请填写功能名称】Service接口 + * + * @author kms + * @date 2024-04-24 + */ +@Service +public class AttResBaseService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java new file mode 100644 index 00000000..245d2a13 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java @@ -0,0 +1,16 @@ +package com.kms.yg.sk.service; + +import com.kms.yg.sk.domain.AttResRspp; +import com.kms.yg.sk.mapper.AttResRsppMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; +/** + * 【请填写功能名称】Service接口 + * + * @author kms + * @date 2024-04-24 + */ +@Service +public class AttResRsppService extends BaseService{ + +} diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java b/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java new file mode 100644 index 00000000..1e8f8648 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/controller/AttDpdsBaseController.java @@ -0,0 +1,115 @@ +package com.kms.yg.xgxd.controller; + +import java.util.Arrays; +import java.util.List; + +import com.kms.yg.xgxd.domain.AttDpdsBase; +import com.kms.yg.xgxd.service.AttDpdsBaseService; +import com.shuili.common.core.controller.BaseController; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.shuili.common.mybaitsplus.BeanToWrapper; + +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.AjaxResult; +import com.shuili.common.enums.BusinessType; + + +/** + * 堤段基本信息Controller + * + * @author kms + * @date 2024-04-26 + */ +@RestController +@RequestMapping("/system/dpds") +@Api(tags = "堤段基本信息") +public class AttDpdsBaseController extends BaseController +{ + @Autowired + private AttDpdsBaseService attDpdsBaseService; + + + /** + * 查询堤段基本信息列表 + */ + @PostMapping("/list") + @ApiOperation("堤段基本信息列表") + public IPage list(@RequestBody SearchParam sp) + { + return attDpdsBaseService.selectPage(sp); + } + + /** + * 导出堤段基本信息列表 + */ + @Log(title = "堤段基本信息导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("堤段基本信息导出") + public AjaxResult export(@RequestBody AttDpdsBase attDpdsBase) + { + List list = attDpdsBaseService.listByIds(attDpdsBase.getIds()); + ExcelUtil util = new ExcelUtil<>(AttDpdsBase.class); + return util.exportExcel(list, "base"); + } + + /** + * 获取堤段基本信息详细信息 + */ + @ApiOperation(" 堤段基本信息详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(attDpdsBaseService.getById(id)); + } + + /** + * 新增堤段基本信息 + */ + @Log(title = "堤段基本信息新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤段基本信息新增") + public AjaxResult add(@RequestBody AttDpdsBase attDpdsBase) + { + BaseEntityUtils.preInsert(attDpdsBase); + return toAjax(attDpdsBaseService.save(attDpdsBase)); + } + + /** + * 修改堤段基本信息 + */ + @ApiOperation("堤段基本信息修改") + @Log(title = "堤段基本信息修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AttDpdsBase attDpdsBase) + { + return toAjax(attDpdsBaseService.updateById(attDpdsBase)); + } + + /** + * 删除堤段基本信息 + */ + @ApiOperation("堤段基本信息删除") + @Log(title = "堤段基本信息删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(attDpdsBaseService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java new file mode 100644 index 00000000..c2d80be8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java @@ -0,0 +1,109 @@ +package com.kms.yg.xgxd.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.shuili.common.annotation.Excel; +import com.shuili.common.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableName; + + + +/** + * 堤段基本信息对象 att_dpds_base + * + * @author kms + * @date 2024-04-26 + */ +@TableName("att_dpds_base") +@Data +@ApiModel("堤段基本信息") +public class AttDpdsBase extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String updateUid; + + /** 险工险段代码 */ + @Excel(name = "险工险段代码") + @ApiModelProperty("险工险段代码") + private String dpdsCode; + + /** 险工险段名称 */ + @Excel(name = "险工险段名称") + @ApiModelProperty("险工险段名称") + private String dpdsName; + + /** 险工险段几何中心点经度 */ + @Excel(name = "险工险段几何中心点经度") + @ApiModelProperty("险工险段几何中心点经度") + private String dpdsLong; + + /** 险工险段几何中心点纬度 */ + @Excel(name = "险工险段几何中心点纬度") + @ApiModelProperty("险工险段几何中心点纬度") + private String dpdsLat; + + /** 险工险段位置 */ + @Excel(name = "险工险段位置") + @ApiModelProperty("险工险段位置") + private String dpdsLoc; + + /** $column.columnComment */ + @Excel(name = "险工险段位置") + @ApiModelProperty("险工险段位置") + private String dsdpType; + + /** 出险数量 */ + @Excel(name = "出险数量") + @ApiModelProperty("出险数量") + private Long dangNum; + + /** $column.columnComment */ + @Excel(name = "出险数量") + @ApiModelProperty("出险数量") + private Long dpdsStarNum; + + /** 桩号 */ + @Excel(name = "桩号") + @ApiModelProperty("桩号") + private Long dpdsEndNum; + + /** 长度 */ + @Excel(name = "长度") + @ApiModelProperty("长度") + private String dpdsLen; + + /** $column.columnComment */ + @Excel(name = "长度") + @ApiModelProperty("长度") + private String dpdsMonType; + + /** 备注 */ + @Excel(name = "备注") + @ApiModelProperty("备注") + private String note; + + /** 记录生效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录生效时间") + private Date effDate; + + /** 记录失效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录失效时间") + private Date exprDate; + +} diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java b/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java new file mode 100644 index 00000000..6212df5c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/mapper/AttDpdsBaseMapper.java @@ -0,0 +1,16 @@ +package com.kms.yg.xgxd.mapper; + +import com.kms.yg.xgxd.domain.AttDpdsBase; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * 堤段基本信息Mapper接口 + * + * @author kms + * @date 2024-04-26 + */ +@Repository +public interface AttDpdsBaseMapper extends BaseMapper { + +} diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/service/AttDpdsBaseService.java b/shuili-system/src/main/java/com/kms/yg/xgxd/service/AttDpdsBaseService.java new file mode 100644 index 00000000..555c1a31 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/service/AttDpdsBaseService.java @@ -0,0 +1,16 @@ +package com.kms.yg.xgxd.service; + +import com.kms.yg.xgxd.domain.AttDpdsBase; +import com.kms.yg.xgxd.mapper.AttDpdsBaseMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; +/** + * 堤段基本信息Service接口 + * + * @author kms + * @date 2024-04-26 + */ +@Service +public class AttDpdsBaseService extends BaseService{ + +} From 708d988ac1a4f4b91d744955bfc4f905ac7d4de7 Mon Sep 17 00:00:00 2001 From: ljf Date: Mon, 29 Apr 2024 11:00:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-admin/pom.xml | 8 +- .../kms/web/synchronous/YgSynchronous.java | 88 ++++++++++++------- .../com/kms/yg/dd/domain/AttDiscBase.java | 1 + .../com/kms/yg/xgxd/domain/AttDpdsBase.java | 6 +- 4 files changed, 67 insertions(+), 36 deletions(-) diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index 0070776b..373d16b1 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -87,6 +87,12 @@ plexus-component-annotations 1.6 + + org.apache.maven.plugins + maven-assembly-plugin + 3.0.0 + + @@ -119,7 +125,7 @@ maven-assembly-plugin - 2.4 + 3.0.0 ${project.name} false diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java index 6ebe6309..e3b3c967 100644 --- a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java +++ b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java @@ -1,6 +1,7 @@ package com.kms.web.synchronous; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -18,6 +19,8 @@ import com.kms.yg.sk.service.AttResBaseService; import com.kms.yg.sk.service.AttResRsppService; import com.kms.yg.xgxd.domain.AttDpdsBase; import com.kms.yg.xgxd.service.AttDpdsBaseService; +import io.swagger.models.auth.In; +import lombok.Data; import org.apache.commons.lang.SerializationUtils; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; @@ -29,12 +32,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @Configuration @@ -81,39 +83,59 @@ public class YgSynchronous { static final String xgxdsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dpds_base" ; //流域基本数据 static final String llsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_bas_base" ; + // /** * 同步 */ - @GetMapping("sktz1") - public void synchronous(){ - int pageNum = 1; - int pageSize = 1000; - Boolean f = true; - while (f) { - String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); - String data = JSONObject.parseObject(s).getString("data"); - List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); - if (attResRspps.size() hashMap = new HashMap<>(); +// int i = 1; +// while (f) { +// String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); +// String data = JSONObject.parseObject(s).getString("data"); +// List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); +// if(attResRspps.size() attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); +//// executorService.execute(new sktz(attResRspps)); +// pageNum++; +// } +// } + + @Data + class sktz implements Runnable{ + + private List list; + + public sktz(List list){ + this.list = list; + } + + @Override + public void run() { + int a = 1; + for (AttDiscBase attDiscBase : list) { + attDiscBase.preInsert(); +// attResRspp.setId(attResRspp.getDiscCode()); + boolean save = attDiscBaseService.save(attDiscBase); + if(save){ + System.out.println(a++); + if(a>=1000){ + System.out.println("批量处理完成1000条------------------------------------"); + } } } - Runnable runnable = new Runnable() { - @Override - public void run() { - List attDiscBases = new ArrayList(); - synchronized (attResRspps){ - attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); - } - attDiscBases.forEach(attResRspp -> { - attResRspp.preInsert(); - attResRspp.setId(attResRspp.getDiscCode()); - attDiscBaseService.save(attResRspp); - }); - } - }; - executorService.execute(runnable); } } @@ -249,4 +271,6 @@ public class YgSynchronous { attBasBaseService.saveOrUpdate(attResRspp); }); } + + } diff --git a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java index 9648b637..770ad9d5 100644 --- a/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java +++ b/shuili-system/src/main/java/com/kms/yg/dd/domain/AttDiscBase.java @@ -7,6 +7,7 @@ import com.shuili.common.annotation.Excel; import com.shuili.common.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; /** diff --git a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java index c2d80be8..40d7e82e 100644 --- a/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java +++ b/shuili-system/src/main/java/com/kms/yg/xgxd/domain/AttDpdsBase.java @@ -67,17 +67,17 @@ public class AttDpdsBase extends BaseEntity /** 出险数量 */ @Excel(name = "出险数量") @ApiModelProperty("出险数量") - private Long dangNum; + private String dangNum; /** $column.columnComment */ @Excel(name = "出险数量") @ApiModelProperty("出险数量") - private Long dpdsStarNum; + private String dpdsStarNum; /** 桩号 */ @Excel(name = "桩号") @ApiModelProperty("桩号") - private Long dpdsEndNum; + private String dpdsEndNum; /** 长度 */ @Excel(name = "长度")