From abded014f0c9735431848aa7925773a67d4acd23 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Wed, 10 May 2023 18:51:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/entity/HotspotArea.java    | 4 ++++
 .../src/main/java/com/kening/vordm/entity/Websites.java       | 2 +-
 .../src/main/java/com/kening/vordm/mapper/HotspotMapper.xml   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
index 7492d2a..ff95e2f 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
@@ -17,4 +17,8 @@ public class HotspotArea {
 	 * 频次
 	 */
 	private Integer value;
+	/**
+	 * 名称
+	 */
+	private String nameNew;
 }
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
index c8a3340..f52d2ab 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
@@ -49,7 +49,7 @@ public class Websites implements Serializable {
     /**
      * 网站灾害对应id
      */
-    private Long websiteId;
+    private String websiteId;
 
     /**
      * 上传的管理人员
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
index fc9c1fb..8c9e2a4 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
@@ -25,6 +25,7 @@
     <select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
         select
                concat(area_cn,"(",area_en,")") as name,
+               area_en  AS nameNew,
                frequency as value
         from hotspot
         <where>

From 5fe40fd34a08c546d3ef1ccf18b72b6128e0c7df Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Fri, 12 May 2023 09:13:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kening/vordm/service/impl/AdministratorServiceImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
index 3d48c2a..67bd11b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
@@ -52,11 +52,16 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
 	 */
 	@Override
 	public boolean saveChiefAdmin(Administrator administrator) {
+		Administrator adminNew = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getEmail,administrator.getEmail()));
+		if(adminNew!=null){
+			throw new RuntimeException("The email has been registered");
+		}
 		//校验账号是否存在
 		Administrator admin = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getAccount,administrator.getAccount()));
 		if(admin!=null){
 			throw new RuntimeException("The account has been registered");
 		}
+
 		String tenantId = baseMapper.getChiefTenant("VORDM");
 		administrator.setTenantId(tenantId);
 		administrator.setUserType(1);

From a10d4e09b03c847a8b409190d7df501b7bdc4f67 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Fri, 12 May 2023 16:03:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?glj-=E6=9C=80=E8=BF=91=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A45.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/entity/HotspotArea.java  |  4 ++
 .../com/kening/vordm/entity/Websites.java     |  2 +-
 .../controller/DisasterInfoController.java    |  1 -
 .../vordm/controller/WebsitesController.java  | 48 +++++++++++++++++++
 .../com/kening/vordm/mapper/HotspotMapper.xml |  1 +
 .../kening/vordm/mapper/WebsitesMapper.java   |  3 ++
 .../kening/vordm/mapper/WebsitesMapper.xml    | 10 ++++
 .../kening/vordm/service/WebsitesService.java |  3 ++
 .../impl/AdministratorServiceImpl.java        |  5 ++
 .../service/impl/WebsitesServiceImpl.java     |  6 +++
 10 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WebsitesController.java

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
index 7492d2a..ff95e2f 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java
@@ -17,4 +17,8 @@ public class HotspotArea {
 	 * 频次
 	 */
 	private Integer value;
+	/**
+	 * 名称
+	 */
+	private String nameNew;
 }
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
index c8a3340..f52d2ab 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java
@@ -49,7 +49,7 @@ public class Websites implements Serializable {
     /**
      * 网站灾害对应id
      */
-    private Long websiteId;
+    private String websiteId;
 
     /**
      * 上传的管理人员
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 fb9c123..6cc27db 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
@@ -2,7 +2,6 @@ package com.kening.vordm.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 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.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WebsitesController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WebsitesController.java
new file mode 100644
index 0000000..4d42bf7
--- /dev/null
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/WebsitesController.java
@@ -0,0 +1,48 @@
+package com.kening.vordm.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.kening.vordm.entity.Websites;
+import com.kening.vordm.service.WebsitesService;
+import lombok.RequiredArgsConstructor;
+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 java.util.Date;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/ui/websites")
+public class WebsitesController {
+
+	private final WebsitesService websitesService;
+
+
+	@GetMapping("/websitesPage")
+	public R<IPage<Websites>> websitesPage(Query query, Websites websites){
+		return R.data(websitesService.websitesPage(Condition.getPage(query),websites));
+	}
+
+	@PostMapping("/saveWebsites")
+	public R saveWebsites(@RequestBody Websites websites){
+		websites.setCreateTime(new Date());
+		return R.status(websitesService.save(websites));
+	}
+
+	@DeleteMapping("/remove")
+	public R remove(@RequestParam String id){
+		return R.status(websitesService.removeByIds(Func.toLongList(id)));
+	}
+
+	@PostMapping("/updateWebsites")
+	public R updateWebsites(@RequestBody Websites websites){
+		return R.status(websitesService.updateById(websites));
+	}
+
+	@GetMapping("/getWebsitesById")
+	public R<Websites> getWebsitesById(Long id){
+		return R.data(websitesService.getById(id));
+	}
+}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
index fc9c1fb..8c9e2a4 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml
@@ -25,6 +25,7 @@
     <select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
         select
                concat(area_cn,"(",area_en,")") as name,
+               area_en  AS nameNew,
                frequency as value
         from hotspot
         <where>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.java
index 70dbdc0..b12cab0 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.java
@@ -2,7 +2,9 @@ package com.kening.vordm.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kening.vordm.entity.Websites;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @author G1393
@@ -13,4 +15,5 @@ import com.kening.vordm.entity.Websites;
 public interface WebsitesMapper extends BaseMapper<Websites> {
 
 
+    IPage<Websites> websitesPage(IPage<Object> page,@Param("websites") Websites websites);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml
index 20881d9..bc5a366 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WebsitesMapper.xml
@@ -20,4 +20,14 @@
         provider,disaster_id,create_time,
         website_id,upload_id
     </sql>
+
+    <select id="websitesPage" resultType="com.kening.vordm.entity.Websites">
+        SELECT id,title,link,provider,disaster_id,create_time,website_id,upload_id
+        FROM  websites
+        <where>
+            <if test="websites.disasterId!=null">
+                and disaster_id = #{websites.disasterId}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java
index a4c2cde..65aeb44 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/WebsitesService.java
@@ -1,8 +1,10 @@
 package com.kening.vordm.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kening.vordm.entity.Websites;
+import com.kening.vordm.vo.CallForHelpVo;
 
 /**
 * @author G1393
@@ -11,4 +13,5 @@ import com.kening.vordm.entity.Websites;
 */
 public interface WebsitesService extends IService<Websites> {
 
+	IPage<Websites> websitesPage(IPage<Object> page, Websites websites);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
index 3d48c2a..67bd11b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
@@ -52,11 +52,16 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
 	 */
 	@Override
 	public boolean saveChiefAdmin(Administrator administrator) {
+		Administrator adminNew = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getEmail,administrator.getEmail()));
+		if(adminNew!=null){
+			throw new RuntimeException("The email has been registered");
+		}
 		//校验账号是否存在
 		Administrator admin = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getAccount,administrator.getAccount()));
 		if(admin!=null){
 			throw new RuntimeException("The account has been registered");
 		}
+
 		String tenantId = baseMapper.getChiefTenant("VORDM");
 		administrator.setTenantId(tenantId);
 		administrator.setUserType(1);
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java
index a3dfb33..632c8c6 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/WebsitesServiceImpl.java
@@ -1,5 +1,7 @@
 package com.kening.vordm.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kening.vordm.entity.Websites;
 import com.kening.vordm.mapper.WebsitesMapper;
@@ -15,4 +17,8 @@ import org.springframework.stereotype.Service;
 public class WebsitesServiceImpl extends ServiceImpl<WebsitesMapper, Websites>
 implements WebsitesService {
 
+	@Override
+	public IPage<Websites> websitesPage(IPage<Object> page, Websites websites) {
+		return this.baseMapper.websitesPage(page, websites);
+	}
 }