From e18b864ee3a396c6d2d8a595cb9072c86b879171 Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Wed, 19 Apr 2023 21:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90tool=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90contact=20=E5=AE=8C=E6=88=90=20?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=A1=E6=A0=B8=E5=8A=A0=E5=85=A5=E5=88=86?=
=?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/kening/vordm/entity/Contact.java | 4 ++++
.../main/java/com/kening/vordm/entity/DisasterInfo.java | 4 ++++
.../src/main/java/com/kening/vordm/entity/Tool.java | 4 ++++
.../com/kening/vordm/controller/ContactController.java | 1 +
.../kening/vordm/controller/DisasterInfoController.java | 7 +++++++
.../java/com/kening/vordm/controller/ToolController.java | 3 +++
.../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 8 +++++++-
.../org/springblade/auth/SystemManagerApplication.java | 2 +-
.../auth/system/controller/DictBizController.java | 1 -
9 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Contact.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Contact.java
index 4ef6699..ef835f5 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Contact.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Contact.java
@@ -63,5 +63,9 @@ public class Contact implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+ @TableField(exist = false)
+ private String verify;
+ @TableField(exist = false)
+ private String key;
}
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
index e6e720b..c439b5c 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterInfo.java
@@ -144,4 +144,8 @@ public class DisasterInfo implements Serializable {
@TableField(exist = false)
private static final long serialVersionUID = 1L;
+ private Long chiefId;
+
+ private String chiefName;
+
}
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java
index d3bfc9a..d901118 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Tool.java
@@ -85,5 +85,9 @@ public class Tool implements Serializable {
private static final long serialVersionUID = 1L;
@TableField(exist = false)
private String checked;
+ /**
+ * 贡献者
+ */
+ private String showName;
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java
index 772d5ad..13fc70d 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ContactController.java
@@ -70,6 +70,7 @@ public class ContactController{
@ApiOperation(value = "提交", notes = "传入Contact")
@PostMapping("/submit")
public R submit(@ApiParam(value = "Contact对象", required = true) @RequestBody Contact contact) {
+
contact.setContactDate(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
return R.status(contactService.saveOrUpdate(contact));
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
index ba96113..b6564e9 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java
@@ -16,6 +16,7 @@ import com.kening.vordm.vo.UserTenantVo;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -329,4 +330,10 @@ public class DisasterInfoController {
Boolean flag=disasterInfoService.updateById(disasterInfo);
return R.data(flag);
}
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "提交", notes = "传入Tool")
+ @PostMapping("/submit")
+ public R submit(@ApiParam(value = "Tool对象", required = true) @RequestBody DisasterInfo disasterInfo) {
+ return R.status(disasterInfoService.saveOrUpdate(disasterInfo));
+ }
}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
index f2efdf0..fb16c3d 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ToolController.java
@@ -38,6 +38,9 @@ public class ToolController{
if(!StringUtils.isEmpty(tool.getToolName())){
queryWrapper.like("tool_name", tool.getToolName());
}
+ if(!StringUtils.isEmpty(tool.getLabel())){
+ queryWrapper.like("label", tool.getLabel());
+ }
String checkd = tool.getChecked();
if(checkd != null && checkd.equals("1")){
queryWrapper.isNull("review_time");
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index 32ae215..7c07277 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -143,7 +143,10 @@
d.disaster_keyword,
d.upload_time,
d.geometry,
- d.respond_status
+ d.respond_status,
+ d.chief_id,
+ d.chief_name
+
From
guest_manage_disaster_ref ud join
guest_info u on u.id = ud.sponsor_id JOIN
@@ -158,6 +161,9 @@
d.respond_status = 2 or d.respond_status = 3
+
+ d.chief_id = #{callForHelpVo.chiefId}
+
order by d.upload_time desc
diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java b/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java
index b873e06..bc1cc0a 100644
--- a/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java
+++ b/kn-sys-manager/src/main/java/org/springblade/auth/SystemManagerApplication.java
@@ -18,7 +18,7 @@ import org.springframework.context.annotation.ComponentScan;
public class SystemManagerApplication {
public static void main(String[] args) {
- BladeApplication.run("glj-"+CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args);
+ BladeApplication.run("yyhouc-"+CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args);
}
}
diff --git a/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java b/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java
index 29d1e5d..b0ab17b 100644
--- a/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java
+++ b/kn-sys-manager/src/main/java/org/springblade/auth/system/controller/DictBizController.java
@@ -57,7 +57,6 @@ public class DictBizController {
DictBiz detail = dictService.getOne(Condition.getQueryWrapper(dict));
return R.data(DictBizWrapper.build().entityVO(detail));
}
-
/**
* 列表
*/