From db31c95ccc5cdd3bcad93a0f743173e790f017f7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 23 Jun 2021 09:29:40 +0800
Subject: [PATCH] 取证上报新增接口修改，返回自增的Id
---
src/main/java/org/springblade/modules/survey/controller/SurveyController.java | 2 +-
src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java | 2 ++
src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java | 6 +++++-
src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml | 2 +-
src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java | 11 +++++++----
src/main/java/org/springblade/modules/wj/entity/Wj.java | 6 +++++-
6 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
index 90c9472..fe36014 100644
--- a/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
+++ b/src/main/java/org/springblade/modules/feedback/controller/FeedbackController.java
@@ -271,6 +271,10 @@
@PostMapping("/saves")
public R saves(FeedbackVO feedback) {
+ //插入数据,并返回id
+ Integer id = feedbackService.insert(feedback);
+ System.out.println("id = " + id);
+
if (feedback.getStatus()==0) {
SimpleDateFormat sdf = new SimpleDateFormat();// 格式化时间
sdf.applyPattern("yyyy-MM-dd HH:mm:ss");// a为am/pm的标记
@@ -321,21 +325,20 @@
for (String string2 : splitsp) {
wj.setSnumber(feedback.getSnumber());
wj.setAddress(string2);
+ wj.setSid(id);
iWjService.insertfeed(wj);
}
}
if (feedback.getTpaddress() != null && feedback.getTpaddress()!="") {
String[] splittp = feedback.getTpaddress().split(",");//以逗号分割
- for (
- String string3 : splittp) {
+ for (String string3 : splittp) {
wj.setSnumber(feedback.getSnumber());
wj.setAddress(string3);
+ wj.setSid(id);
iWjService.insertfeed(wj);
}
}
}
-
- feedbackService.save(feedback);
return R.success("新增成功");
}
diff --git a/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java b/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java
index 81238d4..572bbbe 100644
--- a/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java
+++ b/src/main/java/org/springblade/modules/feedback/service/IFeedbackService.java
@@ -45,4 +45,6 @@
List<FeedbackVO> selectFeedList();
List<FeedbackVO> selectFeedEdit(String jid);
List<Map<String, Object>> selectWjEdit(String jid);
+
+ Integer insert(FeedbackVO feedback);
}
diff --git a/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java b/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java
index 15ddb99..cfc7bca 100644
--- a/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java
+++ b/src/main/java/org/springblade/modules/feedback/service/impl/FeedbackServiceImpl.java
@@ -61,5 +61,9 @@
return baseMapper.selectWjEdit(jid);
}
-
+ @Override
+ public Integer insert(FeedbackVO feedback) {
+ baseMapper.insert(feedback);
+ return feedback.getId();
+ }
}
diff --git a/src/main/java/org/springblade/modules/survey/controller/SurveyController.java b/src/main/java/org/springblade/modules/survey/controller/SurveyController.java
index 73ac513..03edbf3 100644
--- a/src/main/java/org/springblade/modules/survey/controller/SurveyController.java
+++ b/src/main/java/org/springblade/modules/survey/controller/SurveyController.java
@@ -188,7 +188,7 @@
String address= "localhost:80/"+fileName;
//文件新增
Wj wj = new Wj();
- wj.setSid(sid);
+ wj.setSid(Integer.parseInt(sid));
wj.setAddress(address);
iWjService.insertsurvey(wj);
map.put("id", wj.getId());
diff --git a/src/main/java/org/springblade/modules/wj/entity/Wj.java b/src/main/java/org/springblade/modules/wj/entity/Wj.java
index c012c99..73bc1cb 100644
--- a/src/main/java/org/springblade/modules/wj/entity/Wj.java
+++ b/src/main/java/org/springblade/modules/wj/entity/Wj.java
@@ -53,7 +53,11 @@
private String rid;
private String snumber;
private String tid;
- private String sid;
+
+ /**
+ * 取证上报Id
+ */
+ private Integer sid;
}
diff --git a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
index 808cadd..dcf03b5 100644
--- a/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
+++ b/src/main/java/org/springblade/modules/wj/mapper/WjMapper.xml
@@ -20,7 +20,7 @@
<insert id="insertfeed" useGeneratedKeys="true" keyProperty="id" parameterType="org.springblade.modules.wj.entity.Wj">
- INSERT INTO sys_wj (jid,address) VALUES (#{jid},#{address})
+ INSERT INTO sys_wj (jid,address,sid) VALUES (#{jid},#{address},#{sid})
</insert>
<select id="selectInfo" resultMap="wjResultMap">
--
Gitblit v1.9.3