From 8dbbc89c906a4d6c52fb4863b2cfc4a64a560bf2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 25 Sep 2021 11:52:17 +0800
Subject: [PATCH] 1.山洪
---
src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml | 10 +++++-----
src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java | 9 ++++-----
src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/mountainrain/entity/Yucpptn.java | 4 +---
src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.java | 3 ++-
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java b/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
index cb963c6..6ecac8b 100644
--- a/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
+++ b/src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java
@@ -691,8 +691,8 @@
* @return
*/
@GetMapping("/yuc")
- public R yuc(String addvcd, String time, String intv) throws ParseException {
- List<Yucpptn> yucpptnList = new ArrayList<Yucpptn>();
+ public R yuc(String addvcd, String time, String intv,String drp) throws ParseException {
+ List yucpptnList = new ArrayList<>();
//通过行政区查询站点编码
List<Map<String, Object>> list = mountainrainService.selectAddvcd(addvcd);
for (int i = 0; i < list.size(); i++) {
@@ -700,9 +700,8 @@
//站点编码
String stcd = list.get(i).get("STCD").toString();
yucpptn.setSTCD(stcd);
- DateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date date = sf.parse(time);
- java.sql.Date sqlDate = new java.sql.Date(date.getTime());
+ yucpptn.setTM(time);
+ yucpptn.setDRP(drp);
yucpptn.setINTV(intv);
yucpptnList.add(yucpptn);
}
diff --git a/src/main/java/org/springblade/modules/mountainrain/entity/Yucpptn.java b/src/main/java/org/springblade/modules/mountainrain/entity/Yucpptn.java
index eebb2d5..2f767e3 100644
--- a/src/main/java/org/springblade/modules/mountainrain/entity/Yucpptn.java
+++ b/src/main/java/org/springblade/modules/mountainrain/entity/Yucpptn.java
@@ -25,9 +25,7 @@
* 时间
*/
@ApiModelProperty(value = "时间")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss" )
- private Date TM;
+ private String TM;
/**
* 时段降水量
diff --git a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.java b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.java
index d4377cc..163fc4e 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.java
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.mountainrain.entity.Mountainrain;
import org.springblade.modules.mountainrain.entity.Yucpptn;
import org.springblade.modules.mountainrain.vo.*;
@@ -145,5 +146,5 @@
void soildel();
//预报信息新增
- int insertYuc(List<Yucpptn> yucpptnList);
+ int insertYuc(@Param("list") List<Yucpptn> list);
}
diff --git a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
index 35f2187..b358fe6 100644
--- a/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
+++ b/src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml
@@ -438,13 +438,13 @@
<!-- 批量插入预报信息-->
<insert id ="insertYuc" parameterType="java.util.List" >
insert into sys_yucpptn
- (STCD, TM, DRP, INTV)
+ (STCD,TM,DRP,INTV)
values
- <foreach collection ="list" item="reddemCode" index= "index" separator =",">
+ <foreach collection ="list" item="item" index= "index" separator =",">
(
- #{reddemCode.STCD}, #{reddemCode.TM},
- #{reddemCode.DRP},
- #{reddemCode.INTV}
+ #{item.STCD},#{item.TM},
+ #{item.DRP},
+ #{item.INTV}
)
</foreach >
</insert >
diff --git a/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java b/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java
index e8909fe..2921b7e 100644
--- a/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java
+++ b/src/main/java/org/springblade/modules/mountainrain/service/impl/MountainrainServiceImpl.java
@@ -427,7 +427,7 @@
@Override
public int insertYuc(List<Yucpptn> yucpptnList) {
- return 0;
+ return baseMapper.insertYuc(yucpptnList);
}
--
Gitblit v1.9.3