From 5abcf7ada15cf529d252eecf17279856600e7371 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Fri, 14 Apr 2023 17:01:43 +0800 Subject: [PATCH 01/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DataUpload.java | 6 ++++ .../com/kening/vordm/entity/OtherData.java | 1 - .../com/kening/vordm/entity/PictureInfo.java | 7 ++++ .../com/kening/vordm/VoRdmApplication.java | 2 +- .../controller/AdministratorController.java | 5 +-- .../vordm/controller/OtherDataController.java | 10 +++--- .../controller/PictureInfoController.java | 21 +++++++---- .../controller/VisualDataController.java | 35 ++++++++++++++----- .../kening/vordm/mapper/DataUploadMapper.xml | 4 ++- .../kening/vordm/mapper/OtherDataMapper.xml | 4 ++- .../kening/vordm/mapper/VisualDataMapper.xml | 4 ++- .../vordm/service/PictureInfoService.java | 8 +++++ .../impl/AdministratorServiceImpl.java | 3 -- .../service/impl/PictureInfoServiceImpl.java | 19 ++++++++++ .../src/main/resources/templates/email.html | 6 ---- 15 files changed, 99 insertions(+), 36 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java index 58f6ba7..fec1c4c 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java @@ -2,6 +2,8 @@ package com.kening.vordm.entity; import lombok.Data; +import java.util.Date; + /** * 数据上传实体类 * @author liyuchen @@ -16,5 +18,9 @@ public class DataUpload extends EntityData{ private String disasterKeyword; + private String disasterCountry; + + private Date disasterTime; + private Long disasterId; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java index b64bf3e..d7d8f9f 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java @@ -6,7 +6,6 @@ import org.springframework.web.multipart.MultipartFile; /** * 其他数据实体类 - * @extends 继承基础数据实体类 * @author liyuchen * @date 2023/04/12 */ diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java index 7ef4be6..5cb16d7 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/PictureInfo.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; import java.util.Date; @@ -66,6 +67,12 @@ public class PictureInfo implements Serializable { */ private Integer isDeleted; + /** + * 图片对象 + */ + @TableField(exist = false) + private MultipartFile file; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 60d7530..6979a41 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,7 +11,7 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("yyhouc-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); // BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java index 31cff24..ce10d20 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java @@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DigestUtil; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -55,7 +56,7 @@ public class AdministratorController { * @return */ @DeleteMapping("/delete") - public R delete(@RequestParam Long ids){ - return R.status(service.removeById(ids)); + public R delete(@RequestParam String ids){ + return R.status(service.removeByIds(Func.toLongList(ids))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java index 03bd7f2..4bb67c6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/OtherDataController.java @@ -1,8 +1,10 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.DataUpload; import com.kening.vordm.entity.EntityData; +import com.kening.vordm.entity.Hotspot; import com.kening.vordm.entity.OtherData; import com.kening.vordm.service.DataUploadService; import com.kening.vordm.service.OtherDataService; @@ -11,6 +13,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; import org.springframework.web.bind.annotation.*; import java.util.Date; @@ -65,10 +68,7 @@ public class OtherDataController { * @return */ @DeleteMapping("/remove") - public R remove(@RequestParam Long id){ - EntityData entityData = new EntityData(); - entityData.setId(id); - entityData.setIsDeleted(1); - return R.status(service.updateById(entityData)); + public R remove(@RequestParam String id){ + return R.status(service.removeByIds(Func.toLongList(id))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java index d283bfe..56a01cd 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/PictureInfoController.java @@ -2,6 +2,7 @@ package com.kening.vordm.controller; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.*; import com.kening.vordm.service.HotspotService; import com.kening.vordm.service.PictureInfoService; @@ -11,6 +12,7 @@ import lombok.AllArgsConstructor; 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.Map; @@ -43,20 +45,27 @@ public class PictureInfoController { * @return */ @PostMapping("/upload") - public R audit(OtherData OtherData){ + public R upload(OtherData OtherData){ return R.status(service.uploadData(OtherData)); } + /** + * 修改图片信息 + * @param pictureInfo + * @return + */ + @PutMapping("/update") + public R upadte(PictureInfo pictureInfo){ + return R.status(service.updatePicture(pictureInfo)); + } + /** * 逻辑删除图片数据 * @param id * @return */ @DeleteMapping("/remove") - public R remove(@RequestParam Long id){ - PictureInfo pictureInfo = new PictureInfo(); - pictureInfo.setId(id); - pictureInfo.setIsDeleted(1); - return R.status(service.updateById(pictureInfo)); + public R remove(@RequestParam String id){ + return R.status(service.removeByIds(Func.toLongList(id))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/VisualDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/VisualDataController.java index fb03349..971fbf8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/VisualDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/VisualDataController.java @@ -1,6 +1,7 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kening.vordm.entity.*; import com.kening.vordm.service.HotspotService; import com.kening.vordm.service.OtherDataService; @@ -10,6 +11,7 @@ import lombok.AllArgsConstructor; 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.Map; @@ -63,6 +65,27 @@ public class VisualDataController { return R.data(hotspotService.page(Condition.getPage(query),Condition.getQueryWrapper(params,Hotspot.class))); } + /** + * 更新词云数据 + * @param wordCLouds + * @return + */ + @PutMapping("/updateWordCloud") + public R updateWordCloud(@RequestBody WordCLouds wordCLouds){ + return R.status(wordCloudsService.updateById(wordCLouds)); + } + + /** + * 更新热点数据 + * @param hotspot + * @return + */ + @PutMapping("/updateHotspot") + public R updateHotspot(@RequestBody Hotspot hotspot){ + return R.status(hotspotService.updateById(hotspot)); + } + + /** * 移除词云或者热点数据 * @param id @@ -70,17 +93,11 @@ public class VisualDataController { * @return */ @DeleteMapping("/remove") - public R remove(@RequestParam Long id,@RequestParam Integer type){ + public R remove(@RequestParam String id,@RequestParam Integer type){ if(type == 1){ - WordCLouds wordCLouds = new WordCLouds(); - wordCLouds.setId(id); - wordCLouds.setIsDeleted(1); - return R.status(wordCloudsService.updateById(wordCLouds)); + return R.status(wordCloudsService.removeByIds(Func.toLongList(id))); }else { - Hotspot hotspot = new Hotspot(); - hotspot.setId(id); - hotspot.setIsDeleted(1); - return R.status(hotspotService.updateById(hotspot)); + return R.status(hotspotService.removeByIds(Func.toLongList(id))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml index 682e0c6..f42a1a9 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml @@ -20,7 +20,9 @@ select di.disaster_keyword, bdb.dict_value as disasterType, - di.id as disasterId + di.id as disasterId, + di.disaster_time as disasterTime, + di.disaster_country as disasterCountry from entity_data ed left join blade_user bu on bu.id = ed.uploader_id left join disaster_info di on di.id = ed.disaster_id diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml index 88ba110..936a778 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml @@ -20,7 +20,9 @@ select di.disaster_keyword, bdb.dict_value as disasterType, - di.id as disasterId + di.id as disasterId, + di.disaster_time as disasterTime, + di.disaster_country as disasterCountry from disaster_info di left join blade_dict_biz bdb on di.disaster_type = dict_key diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml index c5bd8aa..e06a2a7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml @@ -20,7 +20,9 @@ select di.disaster_keyword, bdb.dict_value as disasterType, - di.id as disasterId + di.id as disasterId, + di.disaster_time as disasterTime, + di.disaster_country as disasterCountry from disaster_info di left join blade_dict_biz bdb on di.disaster_type = dict_key diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/PictureInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/PictureInfoService.java index 3f5d2c8..00457f8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/PictureInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/PictureInfoService.java @@ -14,7 +14,15 @@ public interface PictureInfoService extends IService { /** * 上传图片信息数据 + * @param otherData * @return */ boolean uploadData(OtherData otherData); + + /** + * 修改图片信息 + * @param pictureInfo + * @return + */ + boolean updatePicture(PictureInfo pictureInfo); } 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 99fc256..ccac219 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 @@ -64,8 +64,6 @@ public class AdministratorServiceImpl extends BaseServiceImpl dataMap = new HashMap<>(); dataMap.put("account", administrator.getAccount()); @@ -75,7 +73,6 @@ public class AdministratorServiceImpl extends BaseServiceImpl激活账号-->
-

Hello, thank you for your registration

Your account number：

@@ -76,13 +73,10 @@

The date you registered：

Please click login:Point-me jump

-

This is system mail, please do not reply

Please take good care of your information to avoid misappropriation

-
From 1e90af8dcad678ff7f881ea37d42dd1a73c5975b Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Fri, 14 Apr 2023 18:28:48 +0800 Subject: [PATCH 02/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9chief=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E7=9A=84=E7=A7=9F=E6=88=B7=E6=9F=A5=E8=AF=A2-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kening/vordm/entity/Administrator.java | 2 ++ .../vordm/controller/AdministratorController.java | 12 +++++++++++- .../com/kening/vordm/mapper/AdministratorMapper.java | 7 +++++++ .../com/kening/vordm/mapper/AdministratorMapper.xml | 12 ++++++++++++ .../vordm/service/impl/AdministratorServiceImpl.java | 5 ++++- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java index d746649..9695efd 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java @@ -1,6 +1,7 @@ package com.kening.vordm.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.protostuff.runtime.ArraySchemas; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; @@ -26,6 +27,7 @@ public class Administrator extends BaseEntity { private String account; + @JsonIgnore private String password; private String name; diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java index ce10d20..ef7402b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java @@ -50,6 +50,16 @@ public class AdministratorController { return R.status(service.saveChiefAdmin(administrator)); } + /** + * 更新管理员信息 + * @param administrator + * @return + */ + @PutMapping("/update") + public R update(@RequestBody Administrator administrator){ + return R.status(service.updateById(administrator)); + } + /** * 删除管理员用户 * @param ids @@ -57,6 +67,6 @@ public class AdministratorController { */ @DeleteMapping("/delete") public R delete(@RequestParam String ids){ - return R.status(service.removeByIds(Func.toLongList(ids))); + return R.status(service.deleteLogic(Func.toLongList(ids))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java index 1149e49..22c044c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java @@ -16,4 +16,11 @@ public interface AdministratorMapper extends BaseMapper { * @return */ Long getChiefRole(@Param("roleName") String roleName); + + /** + * 根据租户名称查询租户id + * @param tenantName + * @return + */ + String getChiefTenant(@Param("tenantName") String tenantName); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml index 8f81ac3..9300ef8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml @@ -15,4 +15,16 @@ + + 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 ccac219..1e5ef26 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,7 +52,8 @@ public class AdministratorServiceImpl extends BaseServiceImpl dataMap = new HashMap<>(); dataMap.put("account", administrator.getAccount()); + //默认密码 1234 dataMap.put("password", "1234"); dataMap.put("time", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd"))); Email email = new Email(); From a8a914168403ceaedd9f0a5bf362d9ac39570ee5 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Fri, 14 Apr 2023 18:58:09 +0800 Subject: [PATCH 03/49] =?UTF-8?q?=E5=B0=86=E9=82=AE=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80=E7=A7=BB=E5=88=B0applicati?= =?UTF-8?q?on.yml=E4=B8=AD-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/service/impl/AdministratorServiceImpl.java | 10 ++++++++-- .../biz-vordm/src/main/resources/application.yml | 4 ++++ .../biz-vordm/src/main/resources/templates/email.html | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) 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 1e5ef26..3d48c2a 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 @@ -8,6 +8,7 @@ import com.kening.vordm.mapper.AdministratorMapper; import com.kening.vordm.service.AdministratorService; import com.kening.vordm.service.EmailService; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.DigestUtil; @@ -25,10 +26,14 @@ import java.util.Map; */ @Slf4j @Service -@AllArgsConstructor +@RequiredArgsConstructor public class AdministratorServiceImpl extends BaseServiceImpl implements AdministratorService { - private EmailService emailService; + private final EmailService emailService; + + + @Value("${mail.home.link}") + private String link; /** * 根据角色名称获取角色id @@ -71,6 +76,7 @@ public class AdministratorServiceImpl extends BaseServiceImplYour account number：

Your password：

The date you registered：

-

Please click login:Point-me jump

+

Please click login:Point-me jump

From bf2b77b6571c3ab55c2c0fc43ef4261e3ba18b0f Mon Sep 17 00:00:00 2001 From: qqGroup0 <253114712@qq.com> Date: Sat, 15 Apr 2023 16:32:04 +0800 Subject: [PATCH 04/49] =?UTF-8?q?zqq:=E9=81=A5=E6=84=9F=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/entity/RemoteSensingSourceData.java | 35 +++++++++++++++++ .../kening/vordm/vo/productResolutionVo.java | 12 ++++++ .../RemoteSensingSourceDataController.java | 38 +++++++++--------- .../mapper/RemoteSensingSourceDataMapper.java | 1 - .../mapper/RemoteSensingSourceDataMapper.xml | 14 +++++-- .../RemoteSensingSourceDataServiceImpl.java | 39 +++++++++++++++++-- 6 files changed, 113 insertions(+), 26 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/productResolutionVo.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java index 61e3709..cc25f5f 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java @@ -3,10 +3,12 @@ package com.kening.vordm.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.kening.vordm.vo.productResolutionVo; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 遥感影像源数据 @@ -154,7 +156,40 @@ public class RemoteSensingSourceData implements Serializable { */ private String sourceOrganization; + /** + * 分辨率集合最大值 + */ + @TableField(exist = false) + private Double productResolutionMax; + + /** + * 分辨率集合最小值 + */ + @TableField(exist = false) + private Double productResolutionMin; + + /** + * 卫星类型集合 + */ + @TableField(exist = false) + private String satelliteCodeList; + + /** + * 卫星类型集合 + */ + @TableField(exist = false) + private List satelliteCodeListNew; + + + /** + * 卫星类型集合 + */ + @TableField(exist = false) + private List productResolutionVos; + + @TableField(exist = false) private static final long serialVersionUID = 1L; + } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/productResolutionVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/productResolutionVo.java new file mode 100644 index 0000000..893bb60 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/productResolutionVo.java @@ -0,0 +1,12 @@ +package com.kening.vordm.vo; + +import lombok.Data; + +@Data +public class productResolutionVo { + + private Double productResolutionMin; + + + private Double productResolutionMax; +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index bd69049..e8bbf53 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -1,10 +1,9 @@ package com.kening.vordm.controller; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kening.vordm.entity.DisasterInfo; -import com.kening.vordm.entity.EntityData; -import com.kening.vordm.entity.RemoteSensingSourceData; +import com.kening.vordm.entity.*; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.RemoteSensingSourceDataService; import com.kening.vordm.vo.GroupByUse; @@ -13,11 +12,10 @@ 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.DateUtil; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @RestController @AllArgsConstructor @@ -45,23 +43,27 @@ public class RemoteSensingSourceDataController { /** * 实体数据列表信息 - * @param remoteSensingSourceData 实体数据条件信息 + * @param optionsJson 实体数据条件信息 * @param query current当前页 size 每页数据量 * @return */ @GetMapping("/Condition") - public R> getRemoteSensingSourceDataByCondition(RemoteSensingSourceData remoteSensingSourceData, Query query) { + public R> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) { + RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData(); + if (optionsJson!=null){ + remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class); + } return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); } -// /** -// * 根据页码和灾害信息查出遥感影像源数据，可多个灾害 -// * @param remoteSensingSourceData -// * @param query -// * @return -// */ -// @GetMapping("/Condition1") -// public R> getRemoteSensingSourceDataByCondition(RemoteSensingSourceData remoteSensingSourceData, Query query){ -// return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(remoteSensingSourceData))); -// } + /** + * 实体数据列表信息 + * @param params + * @param query + * @return + */ + @GetMapping("/PagesData") + public R> Pages(@RequestParam Map params, Query query){ + return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class))); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java index a899ac1..caeae21 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.java @@ -21,5 +21,4 @@ public interface RemoteSensingSourceDataMapper extends BaseMapper getRemoteSensingSourceData(@Param("disasterType") String disasterType,@Param("disasterCountry") String disasterCountry,@Param("disasterTime") String disasterTime); IPage getRemoteSensingSourceDataByCondition(@Param("remoteSensingSourceData") RemoteSensingSourceData remoteSensingSourceData, IPage page); - } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml index c09eb88..4a25900 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml @@ -71,11 +71,17 @@ r.disaster_id = #{remoteSensingSourceData.disasterId} - - and r.product_resolution = #{remoteSensingSourceData.productResolution} + + and r.product_resolution >= #{remoteSensingSourceData.productResolutionMin} and r.product_resolution < #{remoteSensingSourceData.productResolutionMax} - - and r.satellite_code = #{remoteSensingSourceData.satelliteCode} + + and r.product_resolution > #{remoteSensingSourceData.productResolutionMin} + + + and r.satellite_code in + #{AList} + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java index 701666d..878883e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java @@ -1,15 +1,19 @@ package com.kening.vordm.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.RemoteSensingSourceData; import com.kening.vordm.mapper.RemoteSensingSourceDataMapper; import com.kening.vordm.service.RemoteSensingSourceDataService; -import com.kening.vordm.vo.GroupByUse; +import com.kening.vordm.vo.productResolutionVo; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; /** * @author G1393 @@ -27,6 +31,35 @@ implements RemoteSensingSourceDataService { @Override public IPage getRemoteSensingSourceDataByCondition(IPage page, RemoteSensingSourceData remoteSensingSourceData) { - return this.baseMapper.getRemoteSensingSourceDataByCondition(remoteSensingSourceData, page); + List productResolutionVos = remoteSensingSourceData.getProductResolutionVos(); + String satelliteCodeList = remoteSensingSourceData.getSatelliteCodeList(); + List result = new ArrayList<>(); + if (satelliteCodeList!=null) { + result = Arrays.asList(satelliteCodeList.split(",")); + remoteSensingSourceData.setSatelliteCodeListNew(result); + } + IPage remoteSensingSourceDataByCondition = new Page<>(); + + if (productResolutionVos != null && !productResolutionVos.isEmpty()){ + List remoteSensingSourceData1 = new ArrayList<>(); + + productResolutionVos.stream().forEach(productResolutionVo -> { + if (Objects.equals(productResolutionVo.getProductResolutionMax(), new Double("1000"))){ + remoteSensingSourceData.setProductResolutionMax(null); + remoteSensingSourceData.setProductResolutionMin(productResolutionVo.getProductResolutionMin()); + }else { + remoteSensingSourceData.setProductResolutionMin(productResolutionVo.getProductResolutionMin()); + remoteSensingSourceData.setProductResolutionMax(productResolutionVo.getProductResolutionMax()); + } + IPage remoteSensingSourceDataByConditionNew = this.baseMapper.getRemoteSensingSourceDataByCondition(remoteSensingSourceData, page); + remoteSensingSourceData1.addAll(remoteSensingSourceDataByConditionNew.getRecords()); + }); + + remoteSensingSourceDataByCondition.setRecords(remoteSensingSourceData1); + remoteSensingSourceDataByCondition.setTotal(remoteSensingSourceData1.size()); + }else { + remoteSensingSourceDataByCondition = this.baseMapper.getRemoteSensingSourceDataByCondition(remoteSensingSourceData, page); + } + return remoteSensingSourceDataByCondition; } } From b8e97e3b94b75243d8e7c5b7b875f3b806551330 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Sat, 15 Apr 2023 17:09:45 +0800 Subject: [PATCH 05/49] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=81=BE=E5=AE=B3=E7=BB=9F=E8=AE=A1=E4=BB=A3=E7=A0=81-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterData.java | 10 ++ .../controller/DisasterInfoController.java | 9 ++ .../vordm/mapper/DisasterInfoMapper.java | 13 ++ .../vordm/mapper/DisasterInfoMapper.xml | 27 +++++ .../vordm/service/DisasterInfoService.java | 7 ++ .../service/impl/DisasterInfoServiceImpl.java | 113 ++++++++++++++++++ 6 files changed, 179 insertions(+) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterData.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterData.java new file mode 100644 index 0000000..132a78b --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DisasterData.java @@ -0,0 +1,10 @@ +package com.kening.vordm.entity; + +import lombok.Data; + +@Data +public class DisasterData { + private String type; + private Integer value; + private String date; +} 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..c34125f 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 @@ -329,4 +329,13 @@ public class DisasterInfoController { Boolean flag=disasterInfoService.updateById(disasterInfo); return R.data(flag); } + + /** + * 后台管理系统-控制台灾害各项统计 + * @return + */ + @GetMapping("/statistics") + public R statistics(){ + return R.data(disasterInfoService.statistics()); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index 9051bd0..63c4628 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.poi.ss.formula.functions.T; import java.util.List; +import java.util.Map; /** * @author G1393 @@ -49,4 +50,16 @@ public interface DisasterInfoMapper extends BaseMapper { List getLeft2Data(); List page(IPage page,@Param("callForHelpVo" )CallForHelpVo callForHelpVo); + + /** + * 获取灾害数据 关联字典项 + * @return + */ + List getAllData(); + + /** + * 查询每个月响应的灾害 + * @return + */ + List> getDisasterInfoByMouth(@Param("start") String start,@Param("end") String end,@Param("type") Integer type); } 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 f253c31..2948341 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 @@ -158,4 +158,31 @@ order by d.upload_time desc + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index d852563..2cc7cf9 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -10,6 +10,7 @@ import com.kening.vordm.vo.GroupByUse; import com.kening.vordm.vo.UserTenantVo; import java.util.List; +import java.util.Map; /** * @author G1393 @@ -55,4 +56,10 @@ public interface DisasterInfoService extends IService { Boolean addVisitCount(Long id); IPage page(IPage page, CallForHelpVo callForHelpVo); + + /** + * 后台管理系统-控制台灾害各项统计 + * @return + */ + Map statistics(); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index a65ebc4..b25c699 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -3,9 +3,12 @@ package com.kening.vordm.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Maps; +import com.kening.vordm.entity.DisasterData; import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.mapper.DisasterInfoMapper; import com.kening.vordm.service.DisasterInfoService; +import com.kening.vordm.service.GuestManageDisasterRefService; import com.kening.vordm.vo.CallForHelpVo; import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; @@ -14,8 +17,12 @@ import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @author G1393 @@ -27,6 +34,8 @@ import java.util.List; public class DisasterInfoServiceImpl extends ServiceImpl implements DisasterInfoService { + private final GuestManageDisasterRefService guestManageDisasterRefService; + /** * 返回指定的灾害条目 * @param type @@ -131,5 +140,109 @@ implements DisasterInfoService { return page.setRecords(this.baseMapper.page(page,callForHelpVo)); } + /** + * 后台管理系统-控制台灾害各项统计 + * @description 暂时没有条件查询 所有统计都暂时写在一个查询里面 + * @return + */ + @Override + public Map statistics() { + Map resultMap = Maps.newHashMap(); + //查询灾害表全部数据数据（tip:暂时没有条件 需要的话后期改） + List disasterInfoList = list(); + //统计head头部的数据 + Map headMap = headData(disasterInfoList); + //统计灾害发生区域占比 + Map countryData = disasterCountryProportion(disasterInfoList); + //统计当年的灾害申请次数 按月查询 + List> applyMonth = getDisasterReponseByMouth(1); + //统计灾害数量占比 + Map disasterNum = disasterNumProportion(); + //统计当年的灾害响应次数 按月查询 + List> responseMonth = getDisasterReponseByMouth(2); + resultMap.put("header",headMap); + resultMap.put("country",countryData); + resultMap.put("disasterNum",disasterNum); + resultMap.put("responseMonth",responseMonth); + resultMap.put("applyMonth",applyMonth); + return resultMap; + } + /** + * 统计head头部信息 + * @return + */ + private Map headData(List disasterInfoList){ + Map headMap = Maps.newHashMap(); + //用户访问量 + Integer visitCount = disasterInfoList.stream().map(DisasterInfo::getVisitCount).reduce(Integer::sum).orElse(0); + //数据下载量 + Integer downloadCount = disasterInfoList.stream().map(DisasterInfo::getDownloadCount).reduce(Integer::sum).orElse(0); + //灾害响应申请次数 + Integer size = disasterInfoList.size(); + //灾害响应实际次数 + Long actResponseNum = disasterInfoList.stream().filter(data-> data.getRespondStatus() > 1).count(); + //灾害响应百分比 + headMap.put("visitCount",visitCount); + headMap.put("downloadCount",downloadCount); + headMap.put("applyCount",size); + headMap.put("actResponseNum",actResponseNum); + return headMap; + } + + /** + *计算每个国家的灾害占比 + * @return + */ + private Map disasterCountryProportion(List disasterInfoList){ + Map proportionMap; + //根据国家分组统计次数以及总灾害的占比 + proportionMap = disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting())); + return proportionMap; + } + + /** + * 计算每个灾害发生的次数 + * @return + */ + private Map disasterNumProportion(){ + List disasterInfoList = baseMapper.getAllData(); + Map proportionMap = disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDictValue,Collectors.counting())); + return proportionMap; + } + + /** + * 按月统计当年每个月的响应或者申请量 + * @return + */ + private List> getDisasterReponseByMouth(Integer type){ + //统计每个月的个数 + final String[] MONTH = new String[]{"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"}; + int year = LocalDate.now().getYear(); + List> resultList = new ArrayList<>(); + //查询开始时间 + String start = year + "-01-01 00:00:00"; + //查询结束时间 + String end = year + 1 + "-01-01 00:00:00"; + List> mapList = baseMapper.getDisasterInfoByMouth(start,end,type); + List disasterList = mapList.stream().map((map) -> { + return cn.hutool.core.bean.BeanUtil.mapToBean(map, DisasterData.class, true); + }).collect(Collectors.toList()); + int size = MONTH.length; + Map> collect = disasterList.stream().collect(Collectors.groupingBy(DisasterData::getDate)); + for (int i = 0; i < size; ++i) { + Map result = Maps.newLinkedHashMap(); + String month = MONTH[i]; + List disasterData = collect.get(month); + if (disasterData!=null&&!disasterData.isEmpty()){ + DisasterData disasterData1 = disasterData.get(0); + result.put(year+"-"+month,disasterData1); + }else { + result.put(year+"-"+month,null); + } + resultList.add(result); + } + return resultList; + + } } From bbfb15fc3c891a68b04885ecee4c80e0efc966dc Mon Sep 17 00:00:00 2001 From: glj Date: Sat, 15 Apr 2023 17:33:41 +0800 Subject: [PATCH 06/49] =?UTF-8?q?=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 --- .../main/java/com/kening/vordm/vo/UserVo.java | 41 ++++++++++ .../com/kening/vordm/VoRdmApplication.java | 2 +- .../vordm/controller/LoginController.java | 50 ++++++++++++ .../vordm/mapper/DisasterInfoMapper.java | 12 ++- .../vordm/mapper/DisasterInfoMapper.xml | 23 ++++++ .../vordm/service/DisasterInfoService.java | 8 +- .../kening/vordm/service/EmailService.java | 4 + .../service/impl/DisasterInfoServiceImpl.java | 78 +++++++++++++------ .../vordm/service/impl/EmailServiceImpl.java | 25 ++++++ 9 files changed, 211 insertions(+), 32 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java new file mode 100644 index 0000000..032b5e8 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -0,0 +1,41 @@ +package com.kening.vordm.vo; + +import lombok.Data; + +@Data +public class UserVo { + + private Long id; + + /** + * 验证码 + */ + private String code; + + + /** + * 邮箱 + */ + private String email; + + /** + * 密码1 + */ + private String password; + + /** + * 密码2 + */ + private String password2; + + /** + * 验证码key + */ + private String key; + + /** + * 机构Id + */ + private String tenantId; + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 60d7530..8464ead 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,7 +11,7 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("yyhouc-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run("glj-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); // BladeApplication.run("zqq-" + CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java new file mode 100644 index 0000000..f4d446b --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/LoginController.java @@ -0,0 +1,50 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.service.DisasterInfoService; +import com.kening.vordm.service.EmailService; +import com.kening.vordm.vo.UserVo; +import lombok.RequiredArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.mail.MessagingException; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/ui/login") +public class LoginController { + + + //实体数据服务层 + private final DisasterInfoService disasterInfoService; + + + //邮箱发送服务 + private final EmailService emailService; + + /** + * 新增用户信息 + * + * @param userVo + * @return + */ + @PostMapping("/saveUserData") + public R saveUserData(@RequestBody UserVo userVo) { + return disasterInfoService.saveUserData(userVo); + } + + + /** + * 邮箱发送 + * @param userVo + * @return + * @throws MessagingException + */ + @PostMapping("/sendUserPasswordEmail") + public R sendUserPasswordEmail(@RequestBody UserVo userVo) throws MessagingException { + return emailService.sendUserPasswordEmail(userVo); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index 9051bd0..af4d11d 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -4,12 +4,10 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.kening.vordm.entity.DisasterInfo; -import com.kening.vordm.vo.CallForHelpVo; -import com.kening.vordm.vo.DisasterMangerInfo; -import com.kening.vordm.vo.GroupByUse; -import com.kening.vordm.vo.UserTenantVo; +import com.kening.vordm.vo.*; import org.apache.ibatis.annotations.Param; import org.apache.poi.ss.formula.functions.T; +import org.springblade.core.secure.BladeUser; import java.util.List; @@ -49,4 +47,10 @@ public interface DisasterInfoMapper extends BaseMapper { List getLeft2Data(); List page(IPage page,@Param("callForHelpVo" )CallForHelpVo callForHelpVo); + + Integer getUserEmail(@Param("email") String email); + + Integer saveUserData(@Param("userVo") UserVo userVo); + + UserVo getUserByEmail(String email); } 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 f253c31..6092c73 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 @@ -37,6 +37,10 @@ d.disaster_type,d.disaster_time,d.disaster_country, m.organization + + insert into blade_user (tenant_id,password,email,status,is_deleted) + values (#{userVo.tenantId},#{userVo.password},#{userVo.email},1,0); + + + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index d852563..49001c7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -4,10 +4,8 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; -import com.kening.vordm.vo.CallForHelpVo; -import com.kening.vordm.vo.DisasterMangerInfo; -import com.kening.vordm.vo.GroupByUse; -import com.kening.vordm.vo.UserTenantVo; +import com.kening.vordm.vo.*; +import org.springblade.core.tool.api.R; import java.util.List; @@ -55,4 +53,6 @@ public interface DisasterInfoService extends IService { Boolean addVisitCount(Long id); IPage page(IPage page, CallForHelpVo callForHelpVo); + + R saveUserData(UserVo userVo); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EmailService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EmailService.java index 2c8f205..2761b64 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EmailService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EmailService.java @@ -2,6 +2,8 @@ package com.kening.vordm.service; import com.kening.vordm.entity.Email; +import com.kening.vordm.vo.UserVo; +import org.springblade.core.tool.api.R; import javax.mail.MessagingException; @@ -14,4 +16,6 @@ public interface EmailService { void sendMimeMessage(Email email) throws MessagingException; void sendTemplate(Email email) throws MessagingException; + + R sendUserPasswordEmail(UserVo userVo) throws MessagingException; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index a65ebc4..ba99c1a 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.DisasterInfo; import com.kening.vordm.mapper.DisasterInfoMapper; import com.kening.vordm.service.DisasterInfoService; -import com.kening.vordm.vo.CallForHelpVo; -import com.kening.vordm.vo.DisasterMangerInfo; -import com.kening.vordm.vo.GroupByUse; -import com.kening.vordm.vo.UserTenantVo; +import com.kening.vordm.service.EmailService; +import com.kening.vordm.vo.*; import lombok.RequiredArgsConstructor; +import org.springblade.common.cache.CacheNames; +import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DigestUtil; +import org.springblade.core.tool.utils.StringUtil; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -18,49 +22,53 @@ import java.util.ArrayList; import java.util.List; /** -* @author G1393 -* @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service实现 -* @createDate 2023-04-04 15:54:30 -*/ + * @author G1393 + * @description 针对表【disaster_info(灾害信息表，存储灾害信息)】的数据库操作Service实现 + * @createDate 2023-04-04 15:54:30 + */ @Service @RequiredArgsConstructor public class DisasterInfoServiceImpl extends ServiceImpl -implements DisasterInfoService { + implements DisasterInfoService { + + private final BladeRedis bladeRedis; /** * 返回指定的灾害条目 + * * @param type * @param country * @param time * @param name * @return */ - public List getConditionData(String type, String country, String time, String name){ - List disasterInfos=this.baseMapper.getSelectCondition(type,country,time,name); + public List getConditionData(String type, String country, String time, String name) { + List disasterInfos = this.baseMapper.getSelectCondition(type, country, time, name); return disasterInfos; } /** * 用于获取灾害id类型 + * * @param disasterInfo * @return */ - public List getDisasterId(DisasterInfo disasterInfo){ + public List getDisasterId(DisasterInfo disasterInfo) { QueryWrapper qw = new QueryWrapper<>(); - if (disasterInfo.getDisasterType()!=null){ - qw.eq("disaster_type",disasterInfo.getDisasterType()); + if (disasterInfo.getDisasterType() != null) { + qw.eq("disaster_type", disasterInfo.getDisasterType()); } - if (disasterInfo.getDisasterCountry()!=null){ - qw.eq("disaster_country",disasterInfo.getDisasterCountry()); + if (disasterInfo.getDisasterCountry() != null) { + qw.eq("disaster_country", disasterInfo.getDisasterCountry()); } - if (disasterInfo.getDisasterTime()!=null){ - qw.eq("disaster_time",disasterInfo.getDisasterTime()); + if (disasterInfo.getDisasterTime() != null) { + qw.eq("disaster_time", disasterInfo.getDisasterTime()); } List disasterInfos = this.baseMapper.selectList(qw); List ids = new ArrayList<>(); - if (!disasterInfos.isEmpty()){ + if (!disasterInfos.isEmpty()) { disasterInfos.stream().forEach(disasterInfo1 -> { - ids .add(disasterInfo1.getId()); + ids.add(disasterInfo1.getId()); }); return ids; } @@ -69,6 +77,7 @@ implements DisasterInfoService { /** * 获取债害详情信息 + * * @param id * @return */ @@ -79,14 +88,15 @@ implements DisasterInfoService { /** * 进行灾害信息的统计，国家，类型 + * * @param name * @return */ - public List getDisasterStatistics(String name){ + public List getDisasterStatistics(String name) { return this.baseMapper.getDisasterStatistics(name); } - public IPage getHomeDisaster(IPage page, Integer respondStatus){ + public IPage getHomeDisaster(IPage page, Integer respondStatus) { List disasterMangerInfos = this.baseMapper.getHomeDisaster(page, respondStatus); return page.setRecords(disasterMangerInfos); } @@ -128,8 +138,30 @@ implements DisasterInfoService { @Override public IPage page(IPage page, CallForHelpVo callForHelpVo) { - return page.setRecords(this.baseMapper.page(page,callForHelpVo)); + return page.setRecords(this.baseMapper.page(page, callForHelpVo)); + } + + @Override + public R saveUserData(UserVo userVo) { + //通过邮箱判断当前用户是否存在 + Integer userEmail = this.baseMapper.getUserEmail(userVo.getEmail()); + if (userEmail > 0) { + return R.data(1405, "The current email is already bound to a user"); + } + + // 获取验证码 + String redisCode = bladeRedis.get(CacheNames.CAPTCHA_KEY + userVo.getKey()); + // 判断验证码 + if (userVo.getCode() == null || !StringUtil.equalsIgnoreCase(redisCode, userVo.getCode())) { + return R.data(1404, "Verification code error"); + } + + //密码 + userVo.setPassword(DigestUtil.encrypt(userVo.getPassword())); + Integer integer = this.baseMapper.saveUserData(userVo); + return R.status(integer > 0); } + } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java index fbd7a74..7218d63 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EmailServiceImpl.java @@ -1,8 +1,14 @@ package com.kening.vordm.service.impl; import com.kening.vordm.entity.Email; +import com.kening.vordm.mapper.DisasterInfoMapper; +import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.EmailService; +import com.kening.vordm.vo.UserVo; import lombok.RequiredArgsConstructor; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.javamail.JavaMailSender; @@ -30,6 +36,8 @@ public class EmailServiceImpl implements EmailService { private final TemplateEngine templateEngine; + private final DisasterInfoMapper disasterInfoMapper; + @Value("${spring.mail.username}") private String from; @@ -44,6 +52,23 @@ public class EmailServiceImpl implements EmailService { javaMailSender.send(buildTemplateMail(email)); } + @Override + public R sendUserPasswordEmail(UserVo userVo) throws MessagingException { + //通过邮箱判断当前用户是否存在 + UserVo bladeUser = disasterInfoMapper.getUserByEmail(userVo.getEmail()); + if (bladeUser == null || bladeUser.getPassword()==null){ + return R.data(1405, "There are currently no bound users for this email"); + } + Email email = new Email(); + email.setSubject("您的登录密码"); + String encrypt = DigestUtil.encrypt(bladeUser.getPassword()); + email.setText("邮箱为"+ userVo.getEmail()+ "的用户登录密码为："+encrypt); + email.setHtmlText(false); + email.setTos(userVo.getEmail().split(",")); + javaMailSender.send(buildMimeMessage(email)); + return R.status(true); + } + /** * 构建模板邮件 * @param email From 908feef7c5a47dd042cd1268ad72f0a4226ca851 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Mon, 17 Apr 2023 13:47:08 +0800 Subject: [PATCH 07/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kening/vordm/entity/AdminManager.java | 4 ++++ .../com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java index 94bb4de..f2c70a1 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java @@ -16,4 +16,8 @@ public class AdminManager extends DisasterInfo{ private Long managerId; private Integer status; + + private String occupation; + + private String researchField; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml index e160756..6e51a5f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml @@ -27,6 +27,8 @@ gmdr.response_organization, gmdr.status, bu.name as managerName, + bu.research_field as researchField, + bu.occupation, bdb.dict_value as disasterType, di.disaster_keyword, di.disaster_time, From b4ac00a0733ccf6175f9c0d812de46cb9fb73ec4 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 17 Apr 2023 13:50:25 +0800 Subject: [PATCH 08/49] =?UTF-8?q?=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 --- .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e3a0f0e..3a3300f 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 @@ -106,12 +106,12 @@ select t.sponsor_organization as `name`, count(*) as cnt, 'sponsorOrganization' as `type` from disaster_info t where t.sponsor_organization != '' GROUP BY t.sponsor_organization - ORDER BY cnt desc LIMIT 3 + ORDER BY cnt desc LIMIT 5 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 946fb50..89b623b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -14,7 +14,9 @@ import com.kening.vordm.vo.*; import lombok.RequiredArgsConstructor; import org.springblade.common.cache.CacheNames; import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DigestUtil; import org.springblade.core.tool.utils.StringUtil; import org.springframework.scheduling.annotation.Async; @@ -192,18 +194,19 @@ public class DisasterInfoServiceImpl extends ServiceImpl statistics() { Map resultMap = Maps.newHashMap(); - //查询灾害表全部数据数据（tip:暂时没有条件 需要的话后期改） - List disasterInfoList = list(); + boolean isAdmin = AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? true : false; + //查询灾害表数据 + List disasterInfoList = isAdmin ? list():list(Wrappers.lambdaQuery().eq(DisasterInfo::getChiefId,AuthUtil.getUserId())); //统计head头部的数据 Map headMap = headData(disasterInfoList); //统计灾害发生区域占比 Map countryData = disasterCountryProportion(disasterInfoList); //统计当年的灾害申请次数 按月查询 - List> applyMonth = getDisasterReponseByMouth(1); + List> applyMonth = getDisasterReponseByMouth(1,isAdmin); //统计灾害数量占比 - Map disasterNum = disasterNumProportion(); + Map disasterNum = disasterNumProportion(isAdmin); //统计当年的灾害响应次数 按月查询 - List> responseMonth = getDisasterReponseByMouth(2); + List> responseMonth = getDisasterReponseByMouth(2,isAdmin); resultMap.put("header",headMap); resultMap.put("country",countryData); resultMap.put("disasterNum",disasterNum); @@ -249,8 +252,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl disasterNumProportion(){ - List disasterInfoList = baseMapper.getAllData(); + private Map disasterNumProportion(boolean type){ + List disasterInfoList = baseMapper.getAllData(type ? null:AuthUtil.getUserId()); Map proportionMap = disasterInfoList.stream().filter(data->data.getDictValue()!=null).collect(Collectors.groupingBy(DisasterInfo::getDictValue,Collectors.counting())); return proportionMap; } @@ -259,7 +262,7 @@ public class DisasterInfoServiceImpl extends ServiceImpl> getDisasterReponseByMouth(Integer type){ + private List> getDisasterReponseByMouth(Integer type,boolean isAdmin){ //统计每个月的个数 final String[] MONTH = new String[]{"01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"}; int year = LocalDate.now().getYear(); @@ -268,7 +271,7 @@ public class DisasterInfoServiceImpl extends ServiceImpl> mapList = baseMapper.getDisasterInfoByMouth(start,end,type); + List> mapList = baseMapper.getDisasterInfoByMouth(start,end,type,isAdmin ? null:AuthUtil.getUserId()); List disasterList = mapList.stream().map((map) -> { return cn.hutool.core.bean.BeanUtil.mapToBean(map, DisasterData.class, true); }).collect(Collectors.toList()); From d0218aec0669d3ea846a4c60f28607015c11aa09 Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 18 Apr 2023 10:02:27 +0800 Subject: [PATCH 13/49] =?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 --- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index a714a44..48f4a45 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -65,5 +65,5 @@ public interface DisasterInfoMapper extends BaseMapper { * 查询每个月响应的灾害 * @return */ - List> getDisasterInfoByMouth(@Param("start") String start,@Param("end") String end,@Param("type") Integer type,@Param("chief") Long chief); + List> getDisasterInfoByMouth(@Param("start") String start,@Param("end") String end,@Param("type") Integer type,@Param("chiefId") Long chiefId); } From f5427555d8398f261b8750561953d0b60c15dc63 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Tue, 18 Apr 2023 10:08:49 +0800 Subject: [PATCH 14/49] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.java | 2 +- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index a714a44..3df87be 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -65,5 +65,5 @@ public interface DisasterInfoMapper extends BaseMapper { * 查询每个月响应的灾害 * @return */ - List> getDisasterInfoByMouth(@Param("start") String start,@Param("end") String end,@Param("type") Integer type,@Param("chief") Long chief); + List> getDisasterInfoByMouth(@Param("start") String start,@Param("end") String end,@Param("type") Integer type, @Param("chiefId") Long chiefId); } 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 ce006cb..731e3d5 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 @@ -229,7 +229,7 @@ AND di.respond_status > 1 - di.chief_id = #{chiefId} + and di.chief_id = #{chiefId} GROUP BY date From 18f5fc2a6b9be01443c2341cfbd35fdb11d96a47 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Tue, 18 Apr 2023 16:57:05 +0800 Subject: [PATCH 15/49] 1 --- .../java/com/kening/vordm/vo/DisasterInfoVo.java | 15 ++++++++++----- .../vordm/controller/DisasterInfoController.java | 15 +++++++++------ .../kening/vordm/mapper/DisasterInfoMapper.xml | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java index 4b4b306..add4353 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterInfoVo.java @@ -9,7 +9,7 @@ import java.util.Date; import lombok.Data; /** - * + * * @TableName disaster_info_vo */ @TableName(value ="disaster_info_vo") @@ -106,7 +106,7 @@ public class DisasterInfoVo implements Serializable { private String sponsorOrganization; /** - * + * */ private String disasterImg; @@ -116,15 +116,20 @@ public class DisasterInfoVo implements Serializable { private String dictValue; /** - * + * */ private Long size; /** - * + * */ private String news; + /** + * 发起人昵称 + */ + private String userName; + @TableField(exist = false) private static final long serialVersionUID = 1L; -} \ No newline at end of file +} 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 4b60c5c..fdd6a93 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 @@ -196,8 +196,9 @@ public class DisasterInfoController { .ge(DisasterInfoVo::getDisasterTime,date) .le(DisasterInfoVo::getDisasterTime,LocalDate.now()) .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) - .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) - ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) +// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) +// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))) // .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) // .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) // .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal"))) @@ -215,8 +216,9 @@ public class DisasterInfoController { .ge(DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("startTime")))) .le(DisasterInfoVo::getDisasterTime,LocalDate.parse(String.valueOf(params.get("endTime")))) .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) - .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) - ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))) +// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) +// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) // .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) // .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) // .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal"))) @@ -231,8 +233,9 @@ public class DisasterInfoController { return R.data(disasterInfoVoService.page(Condition.getPage(query),Wrappers.lambdaQuery() .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))),DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) - .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) - ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))) +// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) +// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) // .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) // .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) // .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal"))) 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 731e3d5..7eed3c4 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 @@ -131,7 +131,7 @@ (select t.disaster_country as name, count(*) as cnt, 'country' as `type` from disaster_info t group by t.disaster_country - order by cnt desc limit 5) b on c.flagname = b.`name` + limit 5) b on c.flagname = b.`name` order by b.cnt desc SELECT u.username , + u.last_name AS lastName, + u.first_name AS firstName, u.id as uid , u.email, u.research_field, diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java index f3c844b..f241bc8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java @@ -3,6 +3,8 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.GuestInfo; +import com.kening.vordm.vo.UserVo; +import org.apache.ibatis.annotations.Param; /** * @author G1393 @@ -13,4 +15,5 @@ import com.kening.vordm.entity.GuestInfo; public interface GuestInfoMapper extends BaseMapper { + UserVo getBladeUserByEmail(@Param("email") String email); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index a0b1982..350129e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -14,11 +14,20 @@ + + - id,username,email, + id ,username,email, organization,research_field,create_time, - is_manage,occupation,professional_title + is_manage,occupation,professional_title,last_name,first_name + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml index 80f883f..75d7d1b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml @@ -14,6 +14,7 @@ + @@ -25,7 +26,8 @@ select DATE_FORMAT(time,'%Y-%m-%d') date, frequency value, - word name + word name, + type from word_clouds and `status` = 1 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index e72ad83..7bc9d35 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -4,6 +4,7 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.vo.*; import org.springblade.core.tool.api.R; @@ -63,4 +64,8 @@ public interface DisasterInfoService extends IService { Map statistics(); boolean removeManage(List disasterInfoList); + + GuestInfo getUserByEmail(String email); + + UserVo getBladeUserByEmail(String email); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 89b623b..7b3adc9 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.kening.vordm.service.impl; +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.Wrappers; @@ -7,7 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Maps; import com.kening.vordm.entity.DisasterData; import com.kening.vordm.entity.DisasterInfo; +import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.mapper.DisasterInfoMapper; +import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.DisasterInfoService; import com.kening.vordm.service.GuestManageDisasterRefService; import com.kening.vordm.vo.*; @@ -40,6 +43,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl qw = new LambdaQueryWrapper<>(); + qw.eq(GuestInfo::getEmail,email); + return guestInfoMapper.selectOne(qw); + } + + @Override + public UserVo getBladeUserByEmail(String email) { + return guestInfoMapper.getBladeUserByEmail(email); + } + /** * 后台管理系统-控制台灾害各项统计 * @description 暂时没有条件查询 所有统计都暂时写在一个查询里面 From f47f07dabc95c73e635124fc374a0570a3aaa79f Mon Sep 17 00:00:00 2001 From: glj Date: Wed, 19 Apr 2023 10:37:03 +0800 Subject: [PATCH 17/49] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/entity/GuestManageDisasterRef.java | 10 ---------- .../vordm/mapper/GuestManageDisasterRefMapper.xml | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java index 904d48d..1234dff 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestManageDisasterRef.java @@ -25,11 +25,6 @@ public class GuestManageDisasterRef implements Serializable { */ private Long sponsorId; - /** - * 响应用户 - */ - private Long uploaderId; - /** * 管理人 */ @@ -40,11 +35,6 @@ public class GuestManageDisasterRef implements Serializable { */ private Long disasterId; - /** - * 灾害id - */ - private String responseOrganization; - /** * 审核状态 0未审核 1审核通过 2审核不通过 */ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml index 6e51a5f..9626c4e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml @@ -7,15 +7,14 @@ - - + - id,sponsor_id,uploader_id, - manager_id,disaster_id,response_organization + id,sponsor_id, + manager_id,disaster_id,status select , @@ -49,7 +59,8 @@ gi.organization AS sponsorOrganization, bu.name AS managerName, bu.organization AS managerOrganization, - bdb.dict_value AS dictValue + bdb.dict_value AS dictValue, + gmdr.status AS guestManageDisasterRefStatus from disaster_info di left join guest_manage_disaster_ref gmdr on gmdr.disaster_id = di.id left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type @@ -67,15 +78,15 @@ from disaster_info left join blade_dict_biz bdb on bdb.dict_key = disaster_info.disaster_type - - disaster_type = #{disaster_type} - - - and disaster_country like concat('%',#{disaster_country},'%') - - - and disaster_time like concat('%',#{disaster_time},'%') - + + disaster_type = #{disaster_type} + + + and disaster_country like concat('%',#{disaster_country},'%') + + + and disaster_time like concat('%',#{disaster_time},'%') + @@ -104,23 +115,33 @@ @@ -130,63 +151,63 @@ INNER JOIN (select t.disaster_country as name, count(*) as cnt, 'country' as `type` from disaster_info t - group by t.disaster_country - limit 5) b on c.flagname = b.`name` order by b.cnt desc + group by t.disaster_country limit 5) b on c.flagname = b.`name` + order by b.cnt desc select password from blade_user - + email = #{email} @@ -208,7 +229,7 @@ from disaster_info di left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type - + di.chief_id = #{chiefId} @@ -216,23 +237,23 @@ diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index a746ff1..cb58f2f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -16,7 +16,6 @@ - @@ -28,15 +27,17 @@ ed.id,ed.title,ed.size, ed.type,ed.link,ed.remark, ed.upload_time,ed.disaster_id,ed.visual_flag, - ed.visual_lon,ed.visual_lat,ed.exam_time, + ed.visual_lon,ed.visual_lat, ed.status,ed.uploader_id,ed.manager_id, ed.review_time, ed.source_organization select * FROM blade_user diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CenterDisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CenterDisasterInfoService.java new file mode 100644 index 0000000..269c0f8 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CenterDisasterInfoService.java @@ -0,0 +1,13 @@ +package com.kening.vordm.service; + +import com.kening.vordm.vo.CenterDisasterInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author wangns +* @description 针对表【center_disaster_info】的数据库操作Service +* @createDate 2023-04-19 11:46:32 +*/ +public interface CenterDisasterInfoService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java index ffba138..b01793c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java @@ -11,4 +11,5 @@ import com.kening.vordm.entity.GuestInfo; */ public interface GuestInfoService extends IService { + Boolean updatePassword(String oldPassword, String password, String email); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CenterDisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CenterDisasterInfoServiceImpl.java new file mode 100644 index 0000000..c9100ef --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CenterDisasterInfoServiceImpl.java @@ -0,0 +1,22 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.vo.CenterDisasterInfo; +import com.kening.vordm.service.CenterDisasterInfoService; +import com.kening.vordm.mapper.CenterDisasterInfoMapper; +import org.springframework.stereotype.Service; + +/** +* @author wangns +* @description 针对表【center_disaster_info】的数据库操作Service实现 +* @createDate 2023-04-19 11:46:32 +*/ +@Service +public class CenterDisasterInfoServiceImpl extends ServiceImpl + implements CenterDisasterInfoService{ + +} + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java index 1977f44..64056ea 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java @@ -1,9 +1,12 @@ package com.kening.vordm.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.GuestInfoService; +import com.kening.vordm.vo.UserVo; +import org.springblade.core.tool.utils.DigestUtil; import org.springframework.stereotype.Service; /** @@ -15,4 +18,17 @@ import org.springframework.stereotype.Service; public class GuestInfoServiceImpl extends ServiceImpl implements GuestInfoService { + @Override + public Boolean updatePassword(String oldPassword, String password, String email) { + String op = DigestUtil.encrypt(oldPassword); + UserVo user = this.baseMapper.getBladeUserByEmail(email); + int i = 0; + if(op.equals(user.getPassword())){ + i = this.baseMapper.updatePassword(email, password); + return true; + }else{ + return false; + } + + } } diff --git a/kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml new file mode 100644 index 0000000..f0e16d8 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,disaster_type,disaster_keyword, + disaster_time,upload_time,geometry, + disaster_level,disaster_country,respond_status, + visit_count,download_count,spider_type, + tempend_time,temp_start_time,create_time, + vordm_id,respond_time,sponsor_organization, + dict_value,disaster_img,size, + news,user_name,status, + apply_time,review_time,email + + From 9abf5b429eb1d0c813cb6444d93b02fc384beaf7 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Wed, 19 Apr 2023 19:01:07 +0800 Subject: [PATCH 21/49] =?UTF-8?q?=E7=88=AC=E8=99=AB=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/CommonConstant.java | 5 +- kn-service-api/kn-setting-api/pom.xml | 23 --- .../kening/setting/cache/DictBizCache.java | 133 ------------- .../com/kening/setting/entity/DictBiz.java | 109 ----------- .../com/kening/setting/enums/DictBizEnum.java | 39 ---- .../kening/setting/feign/IDictBizClient.java | 72 ------- .../setting/feign/IDictBizClientFallback.java | 46 ----- .../java/com/kening/setting/vo/DictBizVO.java | 71 ------- kn-service-api/pom.xml | 1 - kn-service/biz-vordm/pom.xml | 81 ++++++++ kn-service/kn-setting/pom.xml | 22 --- .../kening/setting/SettingApplication.java | 16 -- .../kening/setting/config/VoRdmConfig.java | 15 -- .../setting/controller/DictBizController.java | 179 ------------------ .../kening/setting/mapper/DictBizMapper.java | 64 ------- .../kening/setting/mapper/DictBizMapper.xml | 51 ----- .../setting/service/IDictBizService.java | 101 ---------- .../service/impl/DictBizServiceImpl.java | 121 ------------ .../setting/wrapper/DictBizWrapper.java | 61 ------ .../src/main/resources/application-dev.yml | 5 - .../src/main/resources/application-prod.yml | 5 - .../src/main/resources/application-test.yml | 5 - .../src/main/resources/application.yml | 13 -- kn-service/pom.xml | 84 +------- kn-service/vordm-crawl/pom.xml | 74 ++++++++ .../kening/crawl/CrawlProxyApplication.java | 13 ++ .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-prod.yaml | 0 .../src/main/resources/application.yaml | 12 ++ 29 files changed, 186 insertions(+), 1235 deletions(-) delete mode 100644 kn-service-api/kn-setting-api/pom.xml delete mode 100644 kn-service-api/kn-setting-api/src/main/java/com/kening/setting/cache/DictBizCache.java delete mode 100644 kn-service-api/kn-setting-api/src/main/java/com/kening/setting/entity/DictBiz.java delete mode 100644 kn-service-api/kn-setting-api/src/main/java/com/kening/setting/enums/DictBizEnum.java delete mode 100644 kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClient.java delete mode 100644 kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClientFallback.java delete mode 100644 kn-service-api/kn-setting-api/src/main/java/com/kening/setting/vo/DictBizVO.java delete mode 100644 kn-service/kn-setting/pom.xml delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/SettingApplication.java delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/config/VoRdmConfig.java delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/controller/DictBizController.java delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.java delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.xml delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/service/IDictBizService.java delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/service/impl/DictBizServiceImpl.java delete mode 100644 kn-service/kn-setting/src/main/java/com/kening/setting/wrapper/DictBizWrapper.java delete mode 100644 kn-service/kn-setting/src/main/resources/application-dev.yml delete mode 100644 kn-service/kn-setting/src/main/resources/application-prod.yml delete mode 100644 kn-service/kn-setting/src/main/resources/application-test.yml delete mode 100644 kn-service/kn-setting/src/main/resources/application.yml create mode 100644 kn-service/vordm-crawl/pom.xml create mode 100644 kn-service/vordm-crawl/src/main/java/com/kening/crawl/CrawlProxyApplication.java create mode 100644 kn-service/vordm-crawl/src/main/resources/application-dev.yaml create mode 100644 kn-service/vordm-crawl/src/main/resources/application-prod.yaml create mode 100644 kn-service/vordm-crawl/src/main/resources/application.yaml diff --git a/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java b/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java index e17fb0a..9d43d7b 100644 --- a/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java +++ b/kn-common/src/main/java/org/springblade/common/constant/CommonConstant.java @@ -56,5 +56,8 @@ public interface CommonConstant { * 系统管理模块 application name */ String KN_SYSTEM_MANAGER_MODULE_NAME = "system-manager"; - String KN_VORDM_SETTING = "kn-setting"; + /** + * 爬虫代理模块 application name + */ + String VORDM_PROXY_CRAWL_MODULE_NAME = "vordm-crawl"; } diff --git a/kn-service-api/kn-setting-api/pom.xml b/kn-service-api/kn-setting-api/pom.xml deleted file mode 100644 index ce8e3be..0000000 --- a/kn-service-api/kn-setting-api/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - kn-service-api - com.kening.platform - ${revision} - - 4.0.0 - - kn-setting-api - - - - - com.kening.platform - kn-common - ${revision} - - - - diff --git a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/cache/DictBizCache.java b/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/cache/DictBizCache.java deleted file mode 100644 index 0b8f553..0000000 --- a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/cache/DictBizCache.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.cache; - -import com.kening.setting.entity.DictBiz; -import com.kening.setting.enums.DictBizEnum; -import com.kening.setting.feign.IDictBizClient; -import org.springblade.core.cache.utils.CacheUtil; -import org.springblade.core.secure.utils.AuthUtil; -import org.springblade.core.tool.api.R; -import org.springblade.core.tool.utils.SpringUtil; -import org.springblade.core.tool.utils.StringPool; - -import java.util.List; - -import static org.springblade.core.cache.constant.CacheConstant.DICT_CACHE; - -/** - * 业务字典缓存工具类 - * - * @author Chill - */ -public class DictBizCache { - - private static final String DICT_ID = "dictBiz:id"; - private static final String DICT_VALUE = "dictBiz:value"; - private static final String DICT_LIST = "dictBiz:list"; - - private static IDictBizClient dictClient; - - private static IDictBizClient getDictClient() { - if (dictClient == null) { - dictClient = SpringUtil.getBean(IDictBizClient.class); - } - return dictClient; - } - - /** - * 获取字典实体 - * - * @param id 主键 - * @return DictBiz - */ - public static DictBiz getById(Long id) { - String keyPrefix = DICT_ID.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); - return CacheUtil.get(DICT_CACHE, keyPrefix, id, () -> { - R result = getDictClient().getById(id); - return result.getData(); - }); - } - - /** - * 获取字典值 - * - * @param code 字典编号枚举 - * @param dictKey Integer型字典键 - * @return String - */ - public static String getValue(DictBizEnum code, Integer dictKey) { - return getValue(code.getName(), dictKey); - } - - - /** - * 获取字典值 - * - * @param code 字典编号 - * @param dictKey Integer型字典键 - * @return String - */ - public static String getValue(String code, Integer dictKey) { - String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); - return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, String.valueOf(dictKey), () -> { - R result = getDictClient().getValue(code, String.valueOf(dictKey)); - return result.getData(); - }); - } - - /** - * 获取字典值 - * - * @param code 字典编号枚举 - * @param dictKey String型字典键 - * @return String - */ - public static String getValue(DictBizEnum code, String dictKey) { - return getValue(code.getName(), dictKey); - } - - /** - * 获取字典值 - * - * @param code 字典编号 - * @param dictKey String型字典键 - * @return String - */ - public static String getValue(String code, String dictKey) { - String keyPrefix = DICT_VALUE.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); - return CacheUtil.get(DICT_CACHE, keyPrefix + code + StringPool.COLON, dictKey, () -> { - R result = getDictClient().getValue(code, dictKey); - return result.getData(); - }); - } - - /** - * 获取字典集合 - * - * @param code 字典编号 - * @return List - */ - public static List getList(String code) { - String keyPrefix = DICT_LIST.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON); - return CacheUtil.get(DICT_CACHE, keyPrefix, code, () -> { - R> result = getDictClient().getList(code); - return result.getData(); - }); - } - -} diff --git a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/entity/DictBiz.java b/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/entity/DictBiz.java deleted file mode 100644 index 8affff9..0000000 --- a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/entity/DictBiz.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.kening.setting.entity; - -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * 实体类 - * - * @author Chill - */ -@Data -@TableName("blade_dict_biz") -@ApiModel(value = "DictBiz对象", description = "DictBiz对象") -public class DictBiz implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - @ApiModelProperty(value = "主键") - @TableId(value = "id", type = IdType.ASSIGN_ID) - private Long id; - - /** - * 租户ID - */ - @ApiModelProperty(value = "租户ID") - private String tenantId; - - /** - * 父主键 - */ - @JsonSerialize(using = ToStringSerializer.class) - @ApiModelProperty(value = "父主键") - private Long parentId; - - /** - * 字典码 - */ - @ApiModelProperty(value = "字典码") - private String code; - - /** - * 字典值 - */ - @ApiModelProperty(value = "字典值") - private String dictKey; - - /** - * 字典名称 - */ - @ApiModelProperty(value = "字典名称") - private String dictValue; - - /** - * 排序 - */ - @ApiModelProperty(value = "排序") - private Integer sort; - - /** - * 字典备注 - */ - @ApiModelProperty(value = "字典备注") - private String remark; - - /** - * 是否已封存 - */ - @ApiModelProperty(value = "是否已封存") - private Integer isSealed; - - /** - * 是否已删除 - */ - @TableLogic - @ApiModelProperty(value = "是否已删除") - private Integer isDeleted; - - -} diff --git a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/enums/DictBizEnum.java b/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/enums/DictBizEnum.java deleted file mode 100644 index abea0d7..0000000 --- a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/enums/DictBizEnum.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -/** - * 业务字典枚举类 - * - * @author Chill - */ -@Getter -@AllArgsConstructor -public enum DictBizEnum { - - /** - * 测试 - */ - TEST("test"), - ; - - final String name; - -} diff --git a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClient.java b/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClient.java deleted file mode 100644 index 0d3f3ea..0000000 --- a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClient.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.feign; - - -import com.kening.setting.entity.DictBiz; -import org.springblade.core.tool.api.R; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -/** - * Feign接口类 - * - * @author Chill - */ -@FeignClient( - value = "kn-system-biz-dict", - fallback = com.kening.setting.feign.IDictBizClientFallback.class -) -public interface IDictBizClient { - - String API_PREFIX = "/client"; - String GET_BY_ID = API_PREFIX + "/dict-biz/get-by-id"; - String GET_VALUE = API_PREFIX + "/dict-biz/get-value"; - String GET_LIST = API_PREFIX + "/dict-biz/get-list"; - - /** - * 获取字典实体 - * - * @param id 主键 - * @return - */ - @GetMapping(GET_BY_ID) - R getById(@RequestParam("id") Long id); - - /** - * 获取字典表对应值 - * - * @param code 字典编号 - * @param dictKey 字典序号 - * @return - */ - @GetMapping(GET_VALUE) - R getValue(@RequestParam("code") String code, @RequestParam("dictKey") String dictKey); - - /** - * 获取字典表 - * - * @param code 字典编号 - * @return - */ - @GetMapping(GET_LIST) - R> getList(@RequestParam("code") String code); - -} diff --git a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClientFallback.java b/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClientFallback.java deleted file mode 100644 index 8dfe6de..0000000 --- a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/feign/IDictBizClientFallback.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.feign; - -import com.kening.setting.entity.DictBiz; -import org.springblade.core.tool.api.R; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Feign失败配置 - * - * @author Chill - */ -@Component -public class IDictBizClientFallback implements IDictBizClient { - @Override - public R getById(Long id) { - return R.fail("获取数据失败"); - } - - @Override - public R getValue(String code, String dictKey) { - return R.fail("获取数据失败"); - } - - @Override - public R> getList(String code) { - return R.fail("获取数据失败"); - } -} diff --git a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/vo/DictBizVO.java b/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/vo/DictBizVO.java deleted file mode 100644 index 90207b5..0000000 --- a/kn-service-api/kn-setting-api/src/main/java/com/kening/setting/vo/DictBizVO.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.vo; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.kening.setting.entity.DictBiz; -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.core.tool.node.INode; - -import java.util.ArrayList; -import java.util.List; - -/** - * 视图实体类 - * - * @author Chill - */ -@Data -@EqualsAndHashCode(callSuper = true) -@ApiModel(value = "DictBizVO对象", description = "DictBizVO对象") -public class DictBizVO extends DictBiz implements INode { - private static final long serialVersionUID = 1L; - /** - * 主键ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 父节点ID - */ - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - - /** - * 子孙节点 - */ - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; - - @Override - public List getChildren() { - if (this.children == null) { - this.children = new ArrayList<>(); - } - return this.children; - } - - /** - * 上级字典 - */ - private String parentName; -} diff --git a/kn-service-api/pom.xml b/kn-service-api/pom.xml index 7aa4fae..9c7c75f 100644 --- a/kn-service-api/pom.xml +++ b/kn-service-api/pom.xml @@ -14,7 +14,6 @@ ${revision} biz-vordm-api - kn-setting-api pom 微服务API集合 diff --git a/kn-service/biz-vordm/pom.xml b/kn-service/biz-vordm/pom.xml index d09ca7f..e41a563 100644 --- a/kn-service/biz-vordm/pom.xml +++ b/kn-service/biz-vordm/pom.xml @@ -17,6 +17,87 @@ biz-vordm-api ${revision} + + org.hdrhistogram + HdrHistogram + 2.1.12 + + + org.javassist + javassist + 3.25.0-GA + + + org.springblade + blade-core-boot + + + com.oracle + ojdbc7 + + + HdrHistogram + org.hdrhistogram + + + javassist + org.javassist + + + com.microsoft.sqlserver + mssql-jdbc + + + org.postgresql + postgresql + + + fastjson + com.alibaba + + + + + org.springblade + blade-starter-oss + + + esdk-obs-java + com.huaweicloud + + + + + io.minio + minio + + + org.springframework + spring-mock + 2.0.8 + + + com.alibaba + fastjson + + + org.springblade + blade-starter-swagger + + + org.springblade + blade-starter-tenant + + + + org.springframework.boot + spring-boot-starter-mail + + + + org.springframework.boot + spring-boot-starter-thymeleaf + diff --git a/kn-service/kn-setting/pom.xml b/kn-service/kn-setting/pom.xml deleted file mode 100644 index c4112c2..0000000 --- a/kn-service/kn-setting/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - kn-service - com.kening.platform - ${revision} - - 4.0.0 - - kn-setting - - - com.kening.platform - kn-setting-api - ${revision} - - - - - diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/SettingApplication.java b/kn-service/kn-setting/src/main/java/com/kening/setting/SettingApplication.java deleted file mode 100644 index c571c80..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/SettingApplication.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.kening.setting; - -import org.springblade.common.constant.CommonConstant; -import org.springblade.core.launch.BladeApplication; -import org.springframework.cloud.client.SpringCloudApplication; - -/** - * @author wanghongqing - * @date 2023/3/21 14:24 - **/ -@SpringCloudApplication -public class SettingApplication { - public static void main(String[] args) { - BladeApplication.run(CommonConstant.KN_VORDM_SETTING, SettingApplication.class, args); - } -} diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/config/VoRdmConfig.java b/kn-service/kn-setting/src/main/java/com/kening/setting/config/VoRdmConfig.java deleted file mode 100644 index 6810001..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/config/VoRdmConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.kening.setting.config; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; - -/** - * @author wanghongqing - * @date 2023/3/21 14:32 - **/ -@Configuration -@ComponentScan({"org.springblade", "com.kening.setting"}) -@MapperScan({"org.springblade.**.mapper.**", "com.kening.**.mapper.**"}) -public class VoRdmConfig { -} diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/controller/DictBizController.java b/kn-service/kn-setting/src/main/java/com/kening/setting/controller/DictBizController.java deleted file mode 100644 index a5b304e..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/controller/DictBizController.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.kening.setting.entity.DictBiz; -import com.kening.setting.service.IDictBizService; -import com.kening.setting.vo.DictBizVO; -import com.kening.setting.wrapper.DictBizWrapper; -import io.swagger.annotations.*; -import lombok.AllArgsConstructor; -import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.cache.utils.CacheUtil; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tenant.annotation.NonDS; -import org.springblade.core.tool.api.R; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.validation.Valid; -import java.util.List; -import java.util.Map; - -import static org.springblade.core.cache.constant.CacheConstant.DICT_CACHE; - -/** - * 控制器 - * - * @author Chill - */ -@NonDS -@RestController -@AllArgsConstructor -@RequestMapping("/dict-biz") -@Api(value = "业务字典", tags = "业务字典") -public class DictBizController extends BladeController { - - private final IDictBizService dictService; - - /** - * 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @ApiOperation(value = "详情", notes = "传入dict") - public R detail(DictBiz dict) { - DictBiz detail = dictService.getOne(Condition.getQueryWrapper(dict)); - return R.data(DictBizWrapper.build().entityVO(detail)); - } - - /** - * 列表 - */ - @GetMapping("/list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 2) - @ApiOperation(value = "列表", notes = "传入dict") - public R> list(@ApiIgnore @RequestParam Map dict) { - List list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort)); - return R.data(DictBizWrapper.build().listNodeVO(list)); - } - - /** - * 顶级列表 - */ - @GetMapping("/parent-list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 3) - @ApiOperation(value = "列表", notes = "传入dict") - public R> parentList(@ApiIgnore @RequestParam Map dict, Query query) { - return R.data(dictService.parentList(dict, query)); - } - - /** - * 子列表 - */ - @GetMapping("/child-list") - @ApiImplicitParams({ - @ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string"), - @ApiImplicitParam(name = "parentId", value = "字典名称", paramType = "query", dataType = "string") - }) - @ApiOperationSupport(order = 4) - @ApiOperation(value = "列表", notes = "传入dict") - public R> childList(@ApiIgnore @RequestParam Map dict, @RequestParam(required = false, defaultValue = "-1") Long parentId) { - return R.data(dictService.childList(dict, parentId)); - } - - /** - * 获取字典树形结构 - */ - @GetMapping("/tree") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "树形结构", notes = "树形结构") - public R> tree() { - List tree = dictService.tree(); - return R.data(tree); - } - - /** - * 获取字典树形结构 - */ - @GetMapping("/parent-tree") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "树形结构", notes = "树形结构") - public R> parentTree() { - List tree = dictService.parentTree(); - return R.data(tree); - } - - /** - * 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入dict") - public R submit(@Valid @RequestBody DictBiz dict) { - CacheUtil.clear(DICT_CACHE); - return R.status(dictService.submit(dict)); - } - - - /** - * 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - CacheUtil.clear(DICT_CACHE); - return R.status(dictService.removeDict(ids)); - } - - /** - * 获取字典 - */ - @GetMapping("/dictionary") - @ApiOperationSupport(order = 8) - @ApiOperation(value = "获取字典", notes = "获取字典") - public R> dictionary(String code) { - List tree = dictService.getList(code); - return R.data(tree); - } - - /** - * 获取字典树 - */ - @GetMapping("/dictionary-tree") - @ApiOperationSupport(order = 9) - @ApiOperation(value = "获取字典树", notes = "获取字典树") - public R> dictionaryTree(String code) { - List tree = dictService.getList(code); - return R.data(DictBizWrapper.build().listNodeVO(tree)); - } - - -} diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.java b/kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.java deleted file mode 100644 index d79cfbf..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kening.setting.entity.DictBiz; -import com.kening.setting.vo.DictBizVO; - -import java.util.List; - -/** - * Mapper 接口 - * - * @author Chill - */ -public interface DictBizMapper extends BaseMapper { - - /** - * 获取字典表对应中文 - * - * @param code 字典编号 - * @param dictKey 字典序号 - * @return - */ - String getValue(String code, String dictKey); - - /** - * 获取字典表 - * - * @param code 字典编号 - * @return - */ - List getList(String code); - - /** - * 获取树形节点 - * - * @return - */ - List tree(); - - /** - * 获取树形节点 - * - * @return - */ - List parentTree(); - -} diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.xml b/kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.xml deleted file mode 100644 index a023b60..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/mapper/DictBizMapper.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/service/IDictBizService.java b/kn-service/kn-setting/src/main/java/com/kening/setting/service/IDictBizService.java deleted file mode 100644 index 8b0fe59..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/service/IDictBizService.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.service; - - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.kening.setting.entity.DictBiz; -import com.kening.setting.vo.DictBizVO; -import org.springblade.core.mp.support.Query; - -import java.util.List; -import java.util.Map; - -/** - * 服务类 - * - * @author Chill - */ -public interface IDictBizService extends IService { - - /** - * 树形结构 - * - * @return - */ - List tree(); - - /** - * 树形结构 - * - * @return - */ - List parentTree(); - - /** - * 获取字典表对应中文 - * - * @param code 字典编号 - * @param dictKey 字典序号 - * @return - */ - String getValue(String code, String dictKey); - - /** - * 获取字典表 - * - * @param code 字典编号 - * @return - */ - List getList(String code); - - /** - * 新增或修改 - * - * @param dict - * @return - */ - boolean submit(DictBiz dict); - - /** - * 删除字典 - * - * @param ids - * @return - */ - boolean removeDict(String ids); - - /** - * 顶级列表 - * - * @param dict - * @param query - * @return - */ - IPage parentList(Map dict, Query query); - - /** - * 子列表 - * - * @param dict - * @param parentId - * @return - */ - List childList(Map dict, Long parentId); - -} diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/service/impl/DictBizServiceImpl.java b/kn-service/kn-setting/src/main/java/com/kening/setting/service/impl/DictBizServiceImpl.java deleted file mode 100644 index 7c949e9..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/service/impl/DictBizServiceImpl.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kening.setting.cache.DictBizCache; -import com.kening.setting.entity.DictBiz; -import com.kening.setting.mapper.DictBizMapper; -import com.kening.setting.service.IDictBizService; -import com.kening.setting.vo.DictBizVO; -import com.kening.setting.wrapper.DictBizWrapper; -import org.springblade.common.constant.CommonConstant; -import org.springblade.core.cache.utils.CacheUtil; -import org.springblade.core.log.exception.ServiceException; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.tool.constant.BladeConstant; -import org.springblade.core.tool.node.ForestNodeMerger; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.StringPool; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import static org.springblade.core.cache.constant.CacheConstant.DICT_CACHE; - -/** - * 服务实现类 - * - * @author Chill - */ -@Service -public class DictBizServiceImpl extends ServiceImpl implements IDictBizService { - - @Override - public List tree() { - return ForestNodeMerger.merge(baseMapper.tree()); - } - - @Override - public List parentTree() { - return ForestNodeMerger.merge(baseMapper.parentTree()); - } - - @Override - public String getValue(String code, String dictKey) { - return Func.toStr(baseMapper.getValue(code, dictKey), StringPool.EMPTY); - } - - @Override - public List getList(String code) { - return baseMapper.getList(code); - } - - @Override - public boolean submit(DictBiz dict) { - LambdaQueryWrapper lqw = Wrappers.query().lambda().eq(DictBiz::getCode, dict.getCode()).eq(DictBiz::getDictKey, dict.getDictKey()); - Integer cnt = baseMapper.selectCount((Func.isEmpty(dict.getId())) ? lqw : lqw.notIn(DictBiz::getId, dict.getId())); - if (cnt > 0) { - throw new ServiceException("当前字典键值已存在!"); - } - // 修改顶级字典后同步更新下属字典的编号 - if (Func.isNotEmpty(dict.getId()) && dict.getParentId().longValue() == BladeConstant.TOP_PARENT_ID) { - DictBiz parent = DictBizCache.getById(dict.getId()); - this.update(Wrappers.update().lambda().set(DictBiz::getCode, dict.getCode()).eq(DictBiz::getCode, parent.getCode()).ne(DictBiz::getParentId, BladeConstant.TOP_PARENT_ID)); - } - if (Func.isEmpty(dict.getParentId())) { - dict.setParentId(BladeConstant.TOP_PARENT_ID); - } - dict.setIsDeleted(BladeConstant.DB_NOT_DELETED); - CacheUtil.clear(DICT_CACHE); - return saveOrUpdate(dict); - } - - @Override - public boolean removeDict(String ids) { - Integer cnt = baseMapper.selectCount(Wrappers.query().lambda().in(DictBiz::getParentId, Func.toLongList(ids))); - if (cnt > 0) { - throw new ServiceException("请先删除子节点!"); - } - return removeByIds(Func.toLongList(ids)); - } - - @Override - public IPage parentList(Map dict, Query query) { - IPage page = this.page(Condition.getPage(query), Condition.getQueryWrapper(dict, DictBiz.class).lambda().eq(DictBiz::getParentId, CommonConstant.TOP_PARENT_ID).orderByAsc(DictBiz::getSort)); - return DictBizWrapper.build().pageVO(page); - } - - @Override - public List childList(Map dict, Long parentId) { - if (parentId < 0) { - return new ArrayList<>(); - } - dict.remove("parentId"); - DictBiz parentDict = DictBizCache.getById(parentId); - List list = this.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().ne(DictBiz::getId, parentId).eq(DictBiz::getCode, parentDict.getCode()).orderByAsc(DictBiz::getSort)); - return DictBizWrapper.build().listNodeVO(list); - } - -} diff --git a/kn-service/kn-setting/src/main/java/com/kening/setting/wrapper/DictBizWrapper.java b/kn-service/kn-setting/src/main/java/com/kening/setting/wrapper/DictBizWrapper.java deleted file mode 100644 index 6a242f9..0000000 --- a/kn-service/kn-setting/src/main/java/com/kening/setting/wrapper/DictBizWrapper.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the dreamlu.net developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: Chill 庄骞 (smallchill@163.com) - */ -package com.kening.setting.wrapper; - -import com.kening.setting.cache.DictBizCache; -import com.kening.setting.entity.DictBiz; -import com.kening.setting.vo.DictBizVO; -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.constant.BladeConstant; -import org.springblade.core.tool.node.ForestNodeMerger; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.core.tool.utils.Func; - -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - - -/** - * 包装类,返回视图层所需的字段 - * - * @author Chill - */ -public class DictBizWrapper extends BaseEntityWrapper { - - public static DictBizWrapper build() { - return new DictBizWrapper(); - } - - @Override - public DictBizVO entityVO(DictBiz dict) { - DictBizVO dictVO = Objects.requireNonNull(BeanUtil.copy(dict, DictBizVO.class)); - if (Func.equals(dict.getParentId(), BladeConstant.TOP_PARENT_ID)) { - dictVO.setParentName(BladeConstant.TOP_PARENT_NAME); - } else { - DictBiz parent = DictBizCache.getById(dict.getParentId()); - dictVO.setParentName(parent.getDictValue()); - } - return dictVO; - } - - public List listNodeVO(List list) { - List collect = list.stream().map(dict -> BeanUtil.copy(dict, DictBizVO.class)).collect(Collectors.toList()); - return ForestNodeMerger.merge(collect); - } - -} diff --git a/kn-service/kn-setting/src/main/resources/application-dev.yml b/kn-service/kn-setting/src/main/resources/application-dev.yml deleted file mode 100644 index 3aef9ec..0000000 --- a/kn-service/kn-setting/src/main/resources/application-dev.yml +++ /dev/null @@ -1,5 +0,0 @@ -spring: - datasource: - url: ${kn.datasource.vordm.url} - username: ${kn.datasource.vordm.username} - password: ${kn.datasource.vordm.password} diff --git a/kn-service/kn-setting/src/main/resources/application-prod.yml b/kn-service/kn-setting/src/main/resources/application-prod.yml deleted file mode 100644 index 3aef9ec..0000000 --- a/kn-service/kn-setting/src/main/resources/application-prod.yml +++ /dev/null @@ -1,5 +0,0 @@ -spring: - datasource: - url: ${kn.datasource.vordm.url} - username: ${kn.datasource.vordm.username} - password: ${kn.datasource.vordm.password} diff --git a/kn-service/kn-setting/src/main/resources/application-test.yml b/kn-service/kn-setting/src/main/resources/application-test.yml deleted file mode 100644 index 3aef9ec..0000000 --- a/kn-service/kn-setting/src/main/resources/application-test.yml +++ /dev/null @@ -1,5 +0,0 @@ -spring: - datasource: - url: ${kn.datasource.vordm.url} - username: ${kn.datasource.vordm.username} - password: ${kn.datasource.vordm.password} diff --git a/kn-service/kn-setting/src/main/resources/application.yml b/kn-service/kn-setting/src/main/resources/application.yml deleted file mode 100644 index ed591cc..0000000 --- a/kn-service/kn-setting/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: - port: 8106 - -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/kening/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.kening.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: - - com.kening.setting diff --git a/kn-service/pom.xml b/kn-service/pom.xml index c10d910..e1b2c42 100644 --- a/kn-service/pom.xml +++ b/kn-service/pom.xml @@ -5,7 +5,8 @@ 4.0.0 biz-vordm - + vordm-crawl + @@ -21,91 +22,10 @@ 微服务集合 - - org.hdrhistogram - HdrHistogram - 2.1.12 - - - org.javassist - javassist - 3.25.0-GA - com.kening.platform kn-launcher - - org.springblade - blade-core-boot - - - com.oracle - ojdbc7 - - - HdrHistogram - org.hdrhistogram - - - javassist - org.javassist - - - com.microsoft.sqlserver - mssql-jdbc - - - org.postgresql - postgresql - - - fastjson - com.alibaba - - - - - org.springblade - blade-starter-oss - - - esdk-obs-java - com.huaweicloud - - - - - io.minio - minio - - - org.springframework - spring-mock - 2.0.8 - - - com.alibaba - fastjson - - - org.springblade - blade-starter-swagger - - - org.springblade - blade-starter-tenant - - - - org.springframework.boot - spring-boot-starter-mail - - - - org.springframework.boot - spring-boot-starter-thymeleaf - diff --git a/kn-service/vordm-crawl/pom.xml b/kn-service/vordm-crawl/pom.xml new file mode 100644 index 0000000..0222113 --- /dev/null +++ b/kn-service/vordm-crawl/pom.xml @@ -0,0 +1,74 @@ + + + + kn-service + com.kening.platform + ${revision} + + 4.0.0 + + vordm-crawl + + + 8 + 8 + UTF-8 + + + + + com.kening.platform + kn-launcher + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-undertow + + + wildfly-common + org.wildfly.common + + + + + com.itmuch + spring-cloud-wii + 2.2.6.RELEASE + + + de.codecentric + spring-boot-admin-starter-client + + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + + + commons-logging + commons-logging + + + HdrHistogram + org.hdrhistogram + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + diff --git a/kn-service/vordm-crawl/src/main/java/com/kening/crawl/CrawlProxyApplication.java b/kn-service/vordm-crawl/src/main/java/com/kening/crawl/CrawlProxyApplication.java new file mode 100644 index 0000000..43d2acc --- /dev/null +++ b/kn-service/vordm-crawl/src/main/java/com/kening/crawl/CrawlProxyApplication.java @@ -0,0 +1,13 @@ +package com.kening.crawl; + +import org.springblade.core.launch.BladeApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringCloudApplication +@ComponentScan({"org.springblade", "com.kening.crawl"}) +public class CrawlProxyApplication { + public static void main(String[] args) { + BladeApplication.run("vordm-crawl", CrawlProxyApplication.class, args); + } +} diff --git a/kn-service/vordm-crawl/src/main/resources/application-dev.yaml b/kn-service/vordm-crawl/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/kn-service/vordm-crawl/src/main/resources/application-prod.yaml b/kn-service/vordm-crawl/src/main/resources/application-prod.yaml new file mode 100644 index 0000000..e69de29 diff --git a/kn-service/vordm-crawl/src/main/resources/application.yaml b/kn-service/vordm-crawl/src/main/resources/application.yaml new file mode 100644 index 0000000..68512b0 --- /dev/null +++ b/kn-service/vordm-crawl/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +server: + port: 8989 + +spring: + cloud: + gateway: + discovery: + locator: + enabled: true + loadbalancer: + retry: + enabled: true From 57f56c4d923a698bf575946ccaa86ff4c1bea852 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Wed, 19 Apr 2023 19:05:19 +0800 Subject: [PATCH 22/49] Dockerfile --- kn-service/biz-vordm/Dockerfile | 15 +++++++++++++++ kn-service/vordm-crawl/Dockerfile | 15 +++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 kn-service/biz-vordm/Dockerfile create mode 100644 kn-service/vordm-crawl/Dockerfile diff --git a/kn-service/biz-vordm/Dockerfile b/kn-service/biz-vordm/Dockerfile new file mode 100644 index 0000000..68d10bc --- /dev/null +++ b/kn-service/biz-vordm/Dockerfile @@ -0,0 +1,15 @@ +FROM bladex/alpine-java:openjdk8-openj9_cn_slim + +LABEL maintainer=whq<460794335@qq.com> + +RUN mkdir -p /kn/vordm + +WORKDIR /kn/vordm + +EXPOSE 8282 + +ADD ./target/kn-system.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] diff --git a/kn-service/vordm-crawl/Dockerfile b/kn-service/vordm-crawl/Dockerfile new file mode 100644 index 0000000..623911e --- /dev/null +++ b/kn-service/vordm-crawl/Dockerfile @@ -0,0 +1,15 @@ +FROM bladex/alpine-java:openjdk8-openj9_cn_slim + +LABEL maintainer=whq<460794335@qq.com> + +RUN mkdir -p /kn/vordm + +WORKDIR /kn/vordm + +EXPOSE 8989 + +ADD ./target/kn-system.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] From 9e4e7c1ba2d2e68a1325e358502010ab8681bc8e Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Wed, 19 Apr 2023 19:08:51 +0800 Subject: [PATCH 23/49] Dockerfile --- kn-service/biz-vordm/Dockerfile | 2 +- kn-service/vordm-crawl/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kn-service/biz-vordm/Dockerfile b/kn-service/biz-vordm/Dockerfile index 68d10bc..ee2b05c 100644 --- a/kn-service/biz-vordm/Dockerfile +++ b/kn-service/biz-vordm/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /kn/vordm EXPOSE 8282 -ADD ./target/kn-system.jar ./app.jar +ADD ./target/biz-vordm.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/kn-service/vordm-crawl/Dockerfile b/kn-service/vordm-crawl/Dockerfile index 623911e..a8eeb9b 100644 --- a/kn-service/vordm-crawl/Dockerfile +++ b/kn-service/vordm-crawl/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /kn/vordm EXPOSE 8989 -ADD ./target/kn-system.jar ./app.jar +ADD ./target/vordm-crawl.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] From 559553b29d13f231dcaf9f92c9a39ddbb75316db Mon Sep 17 00:00:00 2001 From: glj Date: Thu, 20 Apr 2023 09:04:40 +0800 Subject: [PATCH 24/49] =?UTF-8?q?=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 --- .../com/kening/vordm/controller/EntityDataController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 172628f..65a8f69 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -50,5 +50,13 @@ public class EntityDataController { public R saveEntityData(EntityDataUserVo entityDataUserVo) { return R.data(entityDataService.saveEntityData(entityDataUserVo)); } + + @GetMapping("/updateByIdEntityDataStatus") + public R updateByIdEntityDataStatus(Long id,Integer status) { + EntityData entityData = new EntityData(); + entityData.setId(id); + entityData.setStatus(status); + return R.data(entityDataService.updateById(entityData)); + } } From 836a19065c41b9f58aa9a6f3ca315ac10e126969 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Thu, 20 Apr 2023 09:32:37 +0800 Subject: [PATCH 25/49] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/mapper/CenterDisasterInfoMapper.xml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml diff --git a/kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml deleted file mode 100644 index f0e16d8..0000000 --- a/kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id,disaster_type,disaster_keyword, - disaster_time,upload_time,geometry, - disaster_level,disaster_country,respond_status, - visit_count,download_count,spider_type, - tempend_time,temp_start_time,create_time, - vordm_id,respond_time,sponsor_organization, - dict_value,disaster_img,size, - news,user_name,status, - apply_time,review_time,email - - From 7a42e218979d88408ad54f41880a1fe71dd59e1d Mon Sep 17 00:00:00 2001 From: glj Date: Thu, 20 Apr 2023 14:20:52 +0800 Subject: [PATCH 26/49] =?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 --- .../java/com/kening/vordm/entity/OtherData.java | 2 ++ .../com/kening/vordm/mapper/DisasterInfoMapper.xml | 1 + .../vordm/service/impl/OtherDataServiceImpl.java | 14 ++++++++------ .../vordm/service/impl/PictureInfoServiceImpl.java | 4 ---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java index d7d8f9f..deb9653 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java @@ -21,4 +21,6 @@ public class OtherData{ private String remark; private Long disasterId; + + private Integer visualFlag; } 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 c665bf9..5f47773 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 @@ -77,6 +77,7 @@ di.id = #{id} + and gmdr.STATUS != 2 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java index 74e40f0..5652da0 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java @@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.OtherData; -import com.kening.vordm.mapper.DataUploadMapper; import com.kening.vordm.mapper.OtherDataMapper; -import com.kening.vordm.service.DataUploadService; import com.kening.vordm.service.OtherDataService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -25,6 +23,7 @@ import java.util.Map; /** * 管理员用户实现类 + * * @author liyuchen */ @Slf4j @@ -45,24 +44,26 @@ public class OtherDataServiceImpl extends ServiceImpl params) { - page.setRecords(baseMapper.queryDisasterPage(page,params)); + page.setRecords(baseMapper.queryDisasterPage(page, params)); return page; } /** * 分页列表查询 + * * @param page * @param params * @return */ @Override public IPage queryPage(IPage page, Map params) { - page.setRecords(baseMapper.queryPage(page,params)); + page.setRecords(baseMapper.queryPage(page, params)); return page; } /** * 根据角色名称获取角色id + * * @param roleName * @return */ @@ -73,13 +74,13 @@ public class OtherDataServiceImpl extends ServiceImpl link = new ArrayList<>(); //文件大小 @@ -97,7 +98,7 @@ public class OtherDataServiceImpl extends ServiceImpl Date: Thu, 20 Apr 2023 14:21:05 +0800 Subject: [PATCH 27/49] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/controller/CenterController.java | 4 ++-- .../vordm/service/impl/GuestInfoServiceImpl.java | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java index d0ac039..816ddef 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java @@ -65,8 +65,8 @@ public class CenterController { )); } @PostMapping("/updatePassword") - public R updatePassword(String oldPassword, String password, String email) { - return R.data(guestInfoService.updatePassword(oldPassword, password, email)); + public R updatePassword(@RequestBody Map param) { + return R.data(guestInfoService.updatePassword(param.get("originalPassword"), param.get("password"), param.get("email"))); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java index 64056ea..3d1a2e8 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java @@ -6,26 +6,34 @@ import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.GuestInfoService; import com.kening.vordm.vo.UserVo; +import org.springblade.core.cache.utils.CacheUtil; +import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.utils.DigestUtil; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE; + /** * @author G1393 * @description 针对表【guest_info(游客信息表/志愿者)】的数据库操作Service实现 * @createDate 2023-04-04 15:54:30 */ @Service + public class GuestInfoServiceImpl extends ServiceImpl implements GuestInfoService { - + @Autowired + private BladeRedis bladeRedis; @Override public Boolean updatePassword(String oldPassword, String password, String email) { String op = DigestUtil.encrypt(oldPassword); UserVo user = this.baseMapper.getBladeUserByEmail(email); int i = 0; if(op.equals(user.getPassword())){ - i = this.baseMapper.updatePassword(email, password); - return true; + i = this.baseMapper.updatePassword(email, DigestUtil.encrypt(password)); + CacheUtil.clear(USER_CACHE); + return i>0; }else{ return false; } From f71c2f5bef50fe3452795354cbc77a80d3dd5b44 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Thu, 20 Apr 2023 17:45:33 +0800 Subject: [PATCH 28/49] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vordm/mapper/DisasterInfoMapper.xml | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) 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 c665bf9..75669d1 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 @@ -121,19 +121,32 @@ From fd313cce30f12b08872b73e61f98c66d6cda0a16 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Fri, 21 Apr 2023 14:09:22 +0800 Subject: [PATCH 29/49] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/auth/SystemManagerApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bc1cc0a..ec350bf 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("yyhouc-"+CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args); + BladeApplication.run(CommonConstant.KN_SYSTEM_MANAGER_MODULE_NAME, SystemManagerApplication.class, args); } } From 25ee39069e5befffb56275e5a32d313a0232a1e5 Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 21 Apr 2023 16:19:23 +0800 Subject: [PATCH 30/49] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/entity/Administrator.java | 2 - .../com/kening/vordm/entity/SerialNumber.java | 42 +++++++++++++++++ .../com/kening/vordm/vo/CallForHelpVo.java | 10 +++++ .../controller/AdminManagerController.java | 4 ++ .../controller/DisasterInfoController.java | 39 ++++++++++++---- .../controller/EntityDataController.java | 5 ++- .../vordm/mapper/DisasterInfoMapper.xml | 1 - .../vordm/mapper/SerialNumberMapper.java | 16 +++++++ .../vordm/mapper/SerialNumberMapper.xml | 18 ++++++++ .../kening/vordm/mapper/WordCloudsMapper.xml | 2 +- .../vordm/service/SerialNumberService.java | 17 +++++++ .../service/impl/EntityDataServiceImpl.java | 3 +- .../service/impl/SerialNumberServiceImpl.java | 45 +++++++++++++++++++ 13 files changed, 190 insertions(+), 14 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SerialNumber.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/SerialNumberService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/SerialNumberServiceImpl.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java index 9695efd..0096541 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java @@ -2,10 +2,8 @@ package com.kening.vordm.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.protostuff.runtime.ArraySchemas; import lombok.Data; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.secure.BladeUser; import java.util.Date; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SerialNumber.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SerialNumber.java new file mode 100644 index 0000000..6ace12b --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/SerialNumber.java @@ -0,0 +1,42 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @TableName serial_number + */ +@TableName(value ="serial_number") +@Data +public class SerialNumber implements Serializable { + /** + * + */ + @TableId + private Integer id; + + /** + * + */ + private Integer number; + + /** + * + */ + private String type; + + /** + * + */ + private Date operateTime; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + +} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java index 04abf8c..ac46f70 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -57,4 +57,14 @@ public class CallForHelpVo extends DisasterInfo { * 名字 */ private String firstName; + + /** + * 职业 + */ + private String occupation; + + /** + * 受灾国家 + */ + private String disasterCountry; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java index cbefa2e..c492382 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -41,6 +41,10 @@ public class AdminManagerController { */ @PostMapping("/audit") public R audit(@RequestBody List guestManageDisasterRef){ + + + + return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef)); } } 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 12c4584..770e6ed 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 @@ -52,6 +52,10 @@ public class DisasterInfoController { private final DisasterInfoVoService disasterInfoVoService; + /** + * 编号生成 + */ + private final SerialNumberService serialNumberService; @GetMapping("/saveGuestManageDisasterRef") public R saveGuestManageDisasterRef(Long disasterId, Long managerId) { @@ -322,20 +326,33 @@ public class DisasterInfoController { */ @PostMapping("Call-for-help") public R insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(GuestInfo::getEmail,callForHelpVo.getEmail()); + GuestInfo one = guestInfoService.getOne(qw); + GuestInfo guestInfo = new GuestInfo(); BeanUtil.copyProperties(callForHelpVo, guestInfo); - guestInfo.setId(IdWorker.getId()); + Boolean flag1 = false; + if (one==null){ + guestInfo.setId(IdWorker.getId()); + flag1 = guestInfoService.save(guestInfo); + }else { + guestInfo.setId(one.getId()); + flag1 =guestInfoService.updateById(guestInfo); + } + DisasterInfo disasterInfo = new DisasterInfo(); BeanUtil.copyProperties(callForHelpVo, disasterInfo); - disasterInfo.setId(IdWorker.getId()); disasterInfo.setUploadTime(new Date()); - GuestManageDisasterRef GuestManageDisasterRef = new GuestManageDisasterRef(); - GuestManageDisasterRef.setId(IdWorker.getId()); - GuestManageDisasterRef.setSponsorId(guestInfo.getId()); - GuestManageDisasterRef.setDisasterId(disasterInfo.getId()); - Boolean flag1 = guestInfoService.save(guestInfo); - Boolean flag2 = guestManageDisasterRefService.save(GuestManageDisasterRef); Boolean flag3 = disasterInfoService.save(disasterInfo); + + + GuestManageDisasterRef guestManageDisasterRef = new GuestManageDisasterRef(); + guestManageDisasterRef.setSponsorId(guestInfo.getId()); + guestManageDisasterRef.setDisasterId(disasterInfo.getId()); + guestManageDisasterRef.setApplyTime(new Date()); + Boolean flag2 = guestManageDisasterRefService.save(guestManageDisasterRef); + Boolean callForHelp = flag1 && flag2 && flag3; return R.data(callForHelp); } @@ -343,6 +360,12 @@ public class DisasterInfoController { @PostMapping("review") public R review(@RequestBody DisasterInfo disasterInfo) { + + //审批通过 + if (disasterInfo.getRespondStatus() == 2){ + String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType()); + disasterInfo.setVordmId(numbering); + } Boolean flag = disasterInfoService.updateById(disasterInfo); return R.data(flag); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java index 65a8f69..9d70501 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java @@ -11,6 +11,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; @RestController @@ -52,10 +53,12 @@ public class EntityDataController { } @GetMapping("/updateByIdEntityDataStatus") - public R updateByIdEntityDataStatus(Long id,Integer status) { + public R updateByIdEntityDataStatus(Long id,Integer status,Long managerId) { EntityData entityData = new EntityData(); entityData.setId(id); entityData.setStatus(status); + entityData.setManagerId(managerId); + entityData.setReviewTime(new Date()); return R.data(entityDataService.updateById(entityData)); } } 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 5f47773..c665bf9 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 @@ -77,7 +77,6 @@ di.id = #{id} - and gmdr.STATUS != 2 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.java new file mode 100644 index 0000000..b28203b --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.java @@ -0,0 +1,16 @@ +package com.kening.vordm.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.SerialNumber; + +/** +* @author G1393 +* @description 针对表【serial_number】的数据库操作Mapper +* @createDate 2023-04-21 11:22:19 +* @Entity new.domain.SerialNumber +*/ +public interface SerialNumberMapper extends BaseMapper { + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.xml new file mode 100644 index 0000000..62878dc --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/SerialNumberMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + id,number,type, + operate_time + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml index 75d7d1b..41e1587 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml @@ -24,7 +24,7 @@ select * FROM blade_user diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java index b01793c..43ff3bc 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java @@ -3,6 +3,7 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.GuestInfo; +import com.kening.vordm.vo.UserVo; /** * @author G1393 @@ -12,4 +13,6 @@ import com.kening.vordm.entity.GuestInfo; public interface GuestInfoService extends IService { Boolean updatePassword(String oldPassword, String password, String email); + + Boolean updateAccount(UserVo userVo); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java index 3d1a2e8..644d8d3 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java @@ -39,4 +39,11 @@ implements GuestInfoService { } } + + @Override + public Boolean updateAccount(UserVo userVo) { + int i = this.baseMapper.updateAccount(userVo); + CacheUtil.clear(USER_CACHE); + return i>0; + } } From 4cf8423642481a3af38b938ea8c9a6d08e4234e8 Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 21 Apr 2023 18:23:52 +0800 Subject: [PATCH 32/49] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/CrawlInfo.java | 67 +++++++++++++++++++ .../vordm/controller/CrawlInfoController.java | 25 +++++++ .../kening/vordm/mapper/CrawlInfoMapper.java | 16 +++++ .../kening/vordm/mapper/CrawlInfoMapper.xml | 24 +++++++ .../vordm/service/CrawlInfoService.java | 14 ++++ .../service/impl/CrawlInfoServiceImpl.java | 18 +++++ 6 files changed, 164 insertions(+) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java new file mode 100644 index 0000000..0cc9e66 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/CrawlInfo.java @@ -0,0 +1,67 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @TableName crawl_info + */ +@TableName(value ="crawl_info") +@Data +public class CrawlInfo implements Serializable { + /** + * 自增列 + */ + @TableId + private Integer id; + + /** + * 爬虫类型 1-bing,2-baidu 3-twitter,4-weibo 5 -landset.6-sentinel,7-searchone,8 word clouds，9-hotspot + */ + private Integer type; + + /** + * 管理人员 + */ + private Long manageId; + + /** + * 爬虫状态，0-未开始，1-正在爬取 2已完成 + */ + private Integer status; + + /** + * 灾害id + */ + private Long disasterId; + + /** + * 启动时间 + */ + private Date startTime; + + /** + * 完成时间 + */ + private Date endTime; + + /** + * 实际关键词 + */ + private String keywords; + + /** + * 实际爬取范围 + */ + private String range; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java new file mode 100644 index 0000000..baf2c30 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CrawlInfoController.java @@ -0,0 +1,25 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.entity.CrawlInfo; +import com.kening.vordm.service.CrawlInfoService; +import lombok.AllArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@AllArgsConstructor +@RequestMapping("/ui/crawlInfo") +public class CrawlInfoController { + + private CrawlInfoService crawlInfoService; + + + @PostMapping("/save") + public R save(@RequestBody CrawlInfo crawlInfo) { + return R.status(crawlInfoService.save(crawlInfo)); + } + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java new file mode 100644 index 0000000..d6f6452 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.java @@ -0,0 +1,16 @@ +package com.kening.vordm.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.CrawlInfo; + +/** +* @author G1393 +* @description 针对表【crawl_info】的数据库操作Mapper +* @createDate 2023-04-21 16:51:37 +* @Entity new.domain.CrawlInfo +*/ +public interface CrawlInfoMapper extends BaseMapper { + + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml new file mode 100644 index 0000000..c79288e --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CrawlInfoMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + id,type,manage_id, + status,disaster_id,start_time, + end_time,keywords,range + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java new file mode 100644 index 0000000..bd3a6be --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CrawlInfoService.java @@ -0,0 +1,14 @@ +package com.kening.vordm.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.CrawlInfo; + +/** +* @author G1393 +* @description 针对表【crawl_info】的数据库操作Service +* @createDate 2023-04-21 16:51:37 +*/ +public interface CrawlInfoService extends IService { + +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java new file mode 100644 index 0000000..d9e81b5 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CrawlInfoServiceImpl.java @@ -0,0 +1,18 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.CrawlInfo; +import com.kening.vordm.mapper.CrawlInfoMapper; +import com.kening.vordm.service.CrawlInfoService; +import org.springframework.stereotype.Service; + +/** +* @author G1393 +* @description 针对表【crawl_info】的数据库操作Service实现 +* @createDate 2023-04-21 16:51:37 +*/ +@Service +public class CrawlInfoServiceImpl extends ServiceImpl +implements CrawlInfoService { + +} From 0adf0e11133cb7f2e8c5f0bde3b34f04a2fc35a4 Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 21 Apr 2023 19:37:17 +0800 Subject: [PATCH 33/49] =?UTF-8?q?=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/WordCLouds.java | 2 +- .../main/java/com/kening/vordm/mapper/WordCloudsMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java index 4bd0d69..66108f7 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/WordCLouds.java @@ -26,7 +26,7 @@ public class WordCLouds implements Serializable { /** * 该词组归属的时间 */ - private Date time; + private Date date; /** * 改词组的频次 diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml index 41e1587..81708aa 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/WordCloudsMapper.xml @@ -6,7 +6,7 @@ - + @@ -18,7 +18,7 @@ - id,time,frequency, + id,date,frequency, word,disaster_id,create_time, status,manager_id,review_time From 4b164610f2ea0dadcfe4ec2d5fd4246be2f4d910 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 10:42:45 +0800 Subject: [PATCH 34/49] =?UTF-8?q?=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 --- .../main/java/com/kening/vordm/entity/AdminManager.java | 6 ++++++ .../src/main/java/com/kening/vordm/vo/UserVo.java | 4 ++++ .../kening/vordm/controller/AdminManagerController.java | 9 +++++---- .../java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 7 ++----- .../kening/vordm/mapper/GuestManageDisasterRefMapper.xml | 9 ++++++++- .../vordm/service/impl/DisasterInfoServiceImpl.java | 3 ++- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java index f2c70a1..acd4b0f 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java @@ -2,6 +2,8 @@ package com.kening.vordm.entity; import lombok.Data; +import java.util.Date; + /** * 返回页面管理员数据实体 * @author liyuchen @@ -20,4 +22,8 @@ public class AdminManager extends DisasterInfo{ private String occupation; private String researchField; + + private Date reviewTime; + + private Date applyTime; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java index f596c27..d86fcca 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -82,6 +82,10 @@ public class UserVo { * 职业 */ private String occupation; + /** + * 职业 + */ + private String roleId; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java index c492382..982ed30 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -9,6 +9,7 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; import java.util.Map; @@ -32,6 +33,7 @@ public class AdminManagerController { */ @GetMapping("/pages") public R pages(Query query, @RequestParam Map params){ + return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params)); } @@ -41,10 +43,9 @@ public class AdminManagerController { */ @PostMapping("/audit") public R audit(@RequestBody List guestManageDisasterRef){ - - - - + guestManageDisasterRef.stream().forEach(guestManageDisasterRef1 -> { + guestManageDisasterRef1.setReviewTime(new Date()); + }); return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef)); } } 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 c665bf9..458c670 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 @@ -46,8 +46,8 @@ - insert into blade_user (tenant_id, password, email, status, is_deleted) - values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0); + insert into blade_user (tenant_id, password, email, status, is_deleted, role_id) + values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0,#{userVo.roleId}); @@ -219,9 +219,6 @@ email = #{email} - - d.chief_id = #{callForHelpVo.chiefId} - diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml index 9626c4e..eef1bb7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml @@ -24,6 +24,8 @@ gmdr.manager_id, gmdr.disaster_id, gmdr.status, + gmdr.review_time, + gmdr.apply_time, bu.name as managerName, bu.research_field as researchField, bu.occupation, @@ -38,7 +40,12 @@ left join blade_user bu on gmdr.manager_id = bu.id left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type - and gmdr.status = 0 + + and gmdr.status = 0 or gmdr.status = 1 + + + and gmdr.status = #{params.status} + and bu.name like concat('%',#{params.managerName},'%') diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index e5cb3e5..7d1cb8e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -172,7 +172,8 @@ public class DisasterInfoServiceImpl extends ServiceImpl 0); } From ffc44eb0b6f56ad338f21e7f34fbab2512f1d23f Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 15:11:47 +0800 Subject: [PATCH 35/49] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4-glj?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterInfo.java | 6 ++ .../main/java/com/kening/vordm/vo/UserVo.java | 3 +- .../controller/DisasterInfoController.java | 87 +++++++++---------- .../vordm/mapper/DisasterInfoMapper.xml | 37 ++++---- .../service/impl/DisasterInfoServiceImpl.java | 3 + 5 files changed, 72 insertions(+), 64 deletions(-) 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 3f14b48..b749a24 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 @@ -158,4 +158,10 @@ public class DisasterInfo implements Serializable { private String chiefName; + + /** + * 完成时间 + */ + private Date respondedTime; + } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java index d86fcca..e7013f2 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -87,5 +87,6 @@ public class UserVo { */ private String roleId; - + //国家 + private String country; } 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 770e6ed..b8b7595 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 @@ -210,58 +210,37 @@ public class DisasterInfoController { break; } return R.data(disasterInfoVoService.page(Condition.getPage(query), Wrappers.lambdaQuery() - .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) - .ge(DisasterInfoVo::getDisasterTime, date) - .le(DisasterInfoVo::getDisasterTime, LocalDate.now()) - .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) -// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) -// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) - .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) -// .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) -// .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) -// .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal"))) -// .inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " + -// " where t.response_organization = " + params.get("leftVal")) - .orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount) - .orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount) - .orderByDesc(DisasterInfoVo::getVordmId) + .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) + .ge(DisasterInfoVo::getDisasterTime, date) + .le(DisasterInfoVo::getDisasterTime, LocalDate.now()) + .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) + .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime) + .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime) + .orderByDesc(DisasterInfoVo::getVordmId) )); } if ("4".equals(dateType)) { //自定义时间 return R.data(disasterInfoVoService.page(Condition.getPage(query), Wrappers.lambdaQuery() - .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) - .ge(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("startTime")))) - .le(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("endTime")))) - .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) - .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) -// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) -// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) -// .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) -// .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) -// .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal"))) -// .inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " + -// " where t.response_organization = " + params.get("leftVal")) - .orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount) - .orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount) - .orderByDesc(DisasterInfoVo::getVordmId) + .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) + .ge(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("startTime")))) + .le(DisasterInfoVo::getDisasterTime, LocalDate.parse(String.valueOf(params.get("endTime")))) + .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) + .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime) + .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime) + .orderByDesc(DisasterInfoVo::getVordmId) )); } else { //没有时间相关的 return R.data(disasterInfoVoService.page(Condition.getPage(query), Wrappers.lambdaQuery() - .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) - .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) - .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) -// .and(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))) -// ,Wrappers->Wrappers.like(DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("affectedArea"))).or().like(DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("affectedArea")))) -// .eq("type".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterType,String.valueOf(params.get("leftVal"))) -// .eq("country".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getDisasterCountry,String.valueOf(params.get("leftVal"))) -// .eq("sponsorOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getSponsorOrganization,String.valueOf(params.get("leftVal"))) -// .inSql("responseOrganization".equals(String.valueOf(params.get("leftType"))) && !"null".equals(String.valueOf(params.get("leftType"))),DisasterInfoVo::getId,"select t.disaster_id from guest_manage_disaster_ref t " + -// " where t.response_organization = " + params.get("leftVal")) - .orderByDesc("Visits".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getVisitCount) - .orderByDesc("Downloads".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDownloadCount) - .orderByDesc(DisasterInfoVo::getVordmId) + .eq(DisasterInfoVo::getRespondStatus, Integer.valueOf(params.get("respondStatus"))) + .eq(StringUtils.isNotBlank(String.valueOf(params.get("disasterType"))) && !"null".equals(String.valueOf(params.get("disasterType"))), DisasterInfoVo::getDisasterType, String.valueOf(params.get("disasterType"))) + .like(StringUtils.isNotBlank(String.valueOf(params.get("affectedArea"))) && !"null".equals(String.valueOf(params.get("affectedArea"))), DisasterInfoVo::getDisasterCountry, String.valueOf(params.get("affectedArea"))) + .orderByDesc("DisasterTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getDisasterTime) + .orderByDesc("RespondTime".equals(String.valueOf(params.get("order"))), DisasterInfoVo::getRespondTime) + .orderByDesc(DisasterInfoVo::getVordmId) )); } @@ -327,18 +306,18 @@ public class DisasterInfoController { @PostMapping("Call-for-help") public R insertRespondInfo(@RequestBody CallForHelpVo callForHelpVo) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); - qw.eq(GuestInfo::getEmail,callForHelpVo.getEmail()); + qw.eq(GuestInfo::getEmail, callForHelpVo.getEmail()); GuestInfo one = guestInfoService.getOne(qw); GuestInfo guestInfo = new GuestInfo(); BeanUtil.copyProperties(callForHelpVo, guestInfo); Boolean flag1 = false; - if (one==null){ + if (one == null) { guestInfo.setId(IdWorker.getId()); flag1 = guestInfoService.save(guestInfo); - }else { + } else { guestInfo.setId(one.getId()); - flag1 =guestInfoService.updateById(guestInfo); + flag1 = guestInfoService.updateById(guestInfo); } DisasterInfo disasterInfo = new DisasterInfo(); @@ -362,7 +341,7 @@ public class DisasterInfoController { public R review(@RequestBody DisasterInfo disasterInfo) { //审批通过 - if (disasterInfo.getRespondStatus() == 2){ + if (disasterInfo.getRespondStatus() == 2) { String numbering = serialNumberService.generateNumbering(disasterInfo.getDisasterType()); disasterInfo.setVordmId(numbering); } @@ -420,4 +399,16 @@ public class DisasterInfoController { public R getByUserDisasterInfo(Long userId, Long disasterId) { return R.data(disasterInfoService.getByUserDisasterInfo(userId, disasterId)); } + + + @GetMapping("/responseEndedDisasterInfo") + public R responseEndedDisasterInfo(Long id) { + DisasterInfo disasterInfo = new DisasterInfo(); + disasterInfo.setId(id); + disasterInfo.setRespondStatus(3); + disasterInfo.setRespondedTime(new Date()); + return R.data(disasterInfoService.updateById(disasterInfo)); + } + + } 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 458c670..9682464 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 @@ -23,18 +23,17 @@ + - di - . - id + di.id ,di.disaster_type,di.disaster_keyword, di.disaster_time,di.upload_time,di.geometry, di.disaster_level,di.disaster_country,di.respond_status, di.visit_count,di.spider_type,di.tempend_time, di.temp_start_time,di.create_time,di.vordm_id, - di.respond_time,di.download_count,di.sponsor_organization + di.respond_time,di.download_count,di.sponsor_organization,di.responded_time @@ -46,8 +45,8 @@ - insert into blade_user (tenant_id, password, email, status, is_deleted, role_id) - values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0,#{userVo.roleId}); + insert into blade_user (tenant_id, password, email, status, is_deleted, role_id, code, name) + values (#{userVo.tenantId}, #{userVo.password}, #{userVo.email}, 1, 0, #{userVo.roleId}, #{userVo.country}, #{userVo.name}); @@ -121,20 +120,28 @@ select * FROM blade_user diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java index b01793c..43ff3bc 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java @@ -3,6 +3,7 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.GuestInfo; +import com.kening.vordm.vo.UserVo; /** * @author G1393 @@ -12,4 +13,6 @@ import com.kening.vordm.entity.GuestInfo; public interface GuestInfoService extends IService { Boolean updatePassword(String oldPassword, String password, String email); + + Boolean updateAccount(UserVo userVo); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java index 3d1a2e8..644d8d3 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java @@ -39,4 +39,11 @@ implements GuestInfoService { } } + + @Override + public Boolean updateAccount(UserVo userVo) { + int i = this.baseMapper.updateAccount(userVo); + CacheUtil.clear(USER_CACHE); + return i>0; + } } From c13e038991c3e110316869cdff058e811025d2f9 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 15:49:52 +0800 Subject: [PATCH 37/49] =?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 --- .../com/kening/vordm/entity/EntityData.java | 18 ++++++++++++++++++ .../kening/vordm/mapper/EntityDataMapper.xml | 8 ++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java index 67849b1..985f1d9 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java @@ -114,6 +114,24 @@ public class EntityData implements Serializable { @TableField(exist = false) private String uploaderName; + /** + * 图层名称 + */ + @TableField(exist = false) + private String layerName; + + /** + * vordmId + */ + @TableField(exist = false) + private String vordmId; + + /** + * 图层名称 + */ + @TableField(exist = false) + private String msName; + @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index cb58f2f..78bf371 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -35,9 +35,13 @@ + + + + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index 9793fa6..a2e93f6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -70,4 +70,6 @@ public interface DisasterInfoService extends IService { UserVo getBladeUserByEmail(String email); Integer getByUserDisasterInfo(Long userId, Long disasterId); + + UserVo getByUserDisasterInfoStatistics(Long userId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 70e994e..c05023b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -217,6 +217,24 @@ public class DisasterInfoServiceImpl extends ServiceImpl Date: Mon, 24 Apr 2023 18:49:45 +0800 Subject: [PATCH 39/49] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DisasterInfoController.java | 4 +- .../vordm/mapper/DisasterInfoMapper.java | 12 +++ .../vordm/mapper/DisasterInfoMapper.xml | 100 ++++++++++++++++++ .../vordm/service/DisasterInfoService.java | 2 +- .../service/impl/DisasterInfoServiceImpl.java | 67 ++++++++++-- 5 files changed, 171 insertions(+), 14 deletions(-) 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 b8b7595..4cd0e48 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 @@ -362,8 +362,8 @@ public class DisasterInfoController { * @return */ @GetMapping("/statistics") - public R statistics() { - return R.data(disasterInfoService.statistics()); + public R statistics(String year) { + return R.data(disasterInfoService.statistics(year)); } /** diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java index 8259c97..76d20ce 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.java @@ -68,4 +68,16 @@ public interface DisasterInfoMapper extends BaseMapper { List> getDisasterInfoByMouth(@Param("start") String start,@Param("end") String end,@Param("type") Integer type,@Param("chiefId") Long chiefId); void updataUserByEmail(@Param("email") String email,@Param("password") String password); + + List listGetByYear(String year); + + List> visitAndDownLoad(String year); + + List> initiateAndResponseData(String year); + + List> chiefData(String year); + + List> adminData(String year); + + List> disasterNum(String year); } 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 9682464..6fc84ff 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 @@ -272,5 +272,105 @@ GROUP BY date + + + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index 9793fa6..b5a00a7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -61,7 +61,7 @@ public interface DisasterInfoService extends IService { * 后台管理系统-控制台灾害各项统计 * @return */ - Map statistics(); + Map statistics(String year); boolean removeManage(List disasterInfoList); diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 70e994e..e3e767c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Service; import java.time.LocalDate; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -223,29 +224,70 @@ public class DisasterInfoServiceImpl extends ServiceImpl statistics() { + public Map statistics(String year) { Map resultMap = Maps.newHashMap(); - boolean isAdmin = AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? true : false; + //boolean isAdmin = AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? true : false; //查询灾害表数据 - List disasterInfoList = isAdmin ? list():list(Wrappers.lambdaQuery().eq(DisasterInfo::getChiefId,AuthUtil.getUserId())); + List disasterInfoList = this.baseMapper.listGetByYear(year); //统计head头部的数据 Map headMap = headData(disasterInfoList); + //访问量和下载量 + List> visitAndDownLoadData = this.baseMapper.visitAndDownLoad(year); + //响应量和发起量 + List> initiateAndResponseData = this.baseMapper.initiateAndResponseData(year); //统计灾害发生区域占比 Map countryData = disasterCountryProportion(disasterInfoList); //统计当年的灾害申请次数 按月查询 - List> applyMonth = getDisasterReponseByMouth(1,isAdmin); - //统计灾害数量占比 - Map disasterNum = disasterNumProportion(isAdmin); + //List> applyMonth = getDisasterReponseByMouth(1,isAdmin); + //统计灾害数量占比 那个饼图 + List> disasterNum = this.baseMapper.disasterNum(year); + //统计chief + List> chiefMap = this.baseMapper.chiefData(year); + //统计admin + List> adminfMap = this.baseMapper.adminData(year); //统计当年的灾害响应次数 按月查询 - List> responseMonth = getDisasterReponseByMouth(2,isAdmin); + //List> responseMonth = getDisasterReponseByMouth(2,isAdmin); resultMap.put("header",headMap); + //响应量 + resultMap.put("line",initiateAndResponseData); + //下载量 + resultMap.put("vandd",visitAndDownLoadData); + //admin + resultMap.put("admin",adminfMap); + //chief + resultMap.put("chief",chiefMap); + //国家 resultMap.put("country",countryData); + //灾害类型分类 resultMap.put("disasterNum",disasterNum); - resultMap.put("responseMonth",responseMonth); - resultMap.put("applyMonth",applyMonth); return resultMap; } + + +// @Override +// public Map statistics(String year) { +// Map resultMap = Maps.newHashMap(); +// boolean isAdmin = AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? true : false; +// //查询灾害表数据 +// List disasterInfoList = isAdmin ? list():list(Wrappers.lambdaQuery().eq(DisasterInfo::getChiefId,AuthUtil.getUserId())); +// //统计head头部的数据 +// Map headMap = headData(disasterInfoList); +// //统计灾害发生区域占比 +// Map countryData = disasterCountryProportion(disasterInfoList); +// //统计当年的灾害申请次数 按月查询 +// List> applyMonth = getDisasterReponseByMouth(1,isAdmin); +// //统计灾害数量占比 +// Map disasterNum = disasterNumProportion(isAdmin); +// //统计当年的灾害响应次数 按月查询 +// List> responseMonth = getDisasterReponseByMouth(2,isAdmin); +// resultMap.put("header",headMap); +// resultMap.put("country",countryData); +// resultMap.put("disasterNum",disasterNum); +// resultMap.put("responseMonth",responseMonth); +// resultMap.put("applyMonth",applyMonth); +// return resultMap; +// } /** * 统计head头部信息 * @return @@ -273,9 +315,12 @@ public class DisasterInfoServiceImpl extends ServiceImpl disasterCountryProportion(List disasterInfoList){ - Map proportionMap; + Map proportionMap = new LinkedHashMap<>(); //根据国家分组统计次数以及总灾害的占比 - proportionMap = disasterInfoList.stream().filter(data->data.getDisasterCountry()!=null).collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting())); + disasterInfoList.stream().filter(data-> + data.getDisasterCountry()!=null + ).collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting())) + .entrySet().stream().sorted(Map.Entry.comparingByValue().reversed()).limit(15).forEachOrdered(e -> proportionMap.put(e.getKey(), e.getValue())); return proportionMap; } From a5913eae41de15ff508870091e4941c36f7d7e1b Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:28:36 +0800 Subject: [PATCH 40/49] Twitter --- kn-service/vordm-twitter/Dockerfile | 15 ++++++++++++++ kn-service/vordm-twitter/pom.xml | 20 +++++++++++++++++++ .../crawl/twitter/TwitterApplication.java | 7 +++++++ .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-prod.yaml | 0 .../src/main/resources/application.yaml | 12 +++++++++++ 6 files changed, 54 insertions(+) create mode 100644 kn-service/vordm-twitter/Dockerfile create mode 100644 kn-service/vordm-twitter/pom.xml create mode 100644 kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java create mode 100644 kn-service/vordm-twitter/src/main/resources/application-dev.yaml create mode 100644 kn-service/vordm-twitter/src/main/resources/application-prod.yaml create mode 100644 kn-service/vordm-twitter/src/main/resources/application.yaml diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile new file mode 100644 index 0000000..a8eeb9b --- /dev/null +++ b/kn-service/vordm-twitter/Dockerfile @@ -0,0 +1,15 @@ +FROM bladex/alpine-java:openjdk8-openj9_cn_slim + +LABEL maintainer=whq<460794335@qq.com> + +RUN mkdir -p /kn/vordm + +WORKDIR /kn/vordm + +EXPOSE 8989 + +ADD ./target/vordm-crawl.jar ./app.jar + +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] + +CMD ["--spring.profiles.active=test"] diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml new file mode 100644 index 0000000..78ba4e5 --- /dev/null +++ b/kn-service/vordm-twitter/pom.xml @@ -0,0 +1,20 @@ + + + + kn-service + com.kening.platform + 1.0.0-SNAPSHOT + + 4.0.0 + + vordm-twitter + + + 8 + 8 + UTF-8 + + + diff --git a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java new file mode 100644 index 0000000..9822078 --- /dev/null +++ b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java @@ -0,0 +1,7 @@ +package com.kening.platform; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/kn-service/vordm-twitter/src/main/resources/application-prod.yaml b/kn-service/vordm-twitter/src/main/resources/application-prod.yaml new file mode 100644 index 0000000..e69de29 diff --git a/kn-service/vordm-twitter/src/main/resources/application.yaml b/kn-service/vordm-twitter/src/main/resources/application.yaml new file mode 100644 index 0000000..68512b0 --- /dev/null +++ b/kn-service/vordm-twitter/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +server: + port: 8989 + +spring: + cloud: + gateway: + discovery: + locator: + enabled: true + loadbalancer: + retry: + enabled: true From 05fe6dd72faf9002ca16738fbb622ee02137d92f Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:28:56 +0800 Subject: [PATCH 41/49] Twitter --- kn-service/pom.xml | 1 + kn-service/vordm-twitter/Dockerfile | 2 +- kn-service/vordm-twitter/pom.xml | 54 +++++++++++++++++++ .../crawl/twitter/TwitterApplication.java | 12 +++-- .../src/main/resources/application-dev.yaml | 7 +++ .../src/main/resources/application.yaml | 2 +- 6 files changed, 73 insertions(+), 5 deletions(-) diff --git a/kn-service/pom.xml b/kn-service/pom.xml index e1b2c42..8406685 100644 --- a/kn-service/pom.xml +++ b/kn-service/pom.xml @@ -6,6 +6,7 @@ biz-vordm vordm-crawl + vordm-twitter diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile index a8eeb9b..7fb149c 100644 --- a/kn-service/vordm-twitter/Dockerfile +++ b/kn-service/vordm-twitter/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /kn/vordm WORKDIR /kn/vordm -EXPOSE 8989 +EXPOSE 8987 ADD ./target/vordm-crawl.jar ./app.jar diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml index 78ba4e5..9dbfdb2 100644 --- a/kn-service/vordm-twitter/pom.xml +++ b/kn-service/vordm-twitter/pom.xml @@ -17,4 +17,58 @@ UTF-8 + + + com.kening.platform + kn-launcher + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-undertow + + + wildfly-common + org.wildfly.common + + + + + com.itmuch + spring-cloud-wii + 2.2.6.RELEASE + + + de.codecentric + spring-boot-admin-starter-client + + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + + + commons-logging + commons-logging + + + HdrHistogram + org.hdrhistogram + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + diff --git a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java index 9822078..a86ca1c 100644 --- a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java +++ b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java @@ -1,7 +1,13 @@ -package com.kening.platform; +package com.kening.crawl.twitter; -public class Main { +import org.springblade.core.launch.BladeApplication; +import org.springframework.cloud.client.SpringCloudApplication; +import org.springframework.context.annotation.ComponentScan; + +@SpringCloudApplication +@ComponentScan({"org.springblade", "com.kening.crawl.twitter"}) +public class TwitterApplication { public static void main(String[] args) { - System.out.println("Hello world!"); + BladeApplication.run("vordm-twitter", TwitterApplication.class, args); } } diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml index e69de29..93c68f9 100644 --- a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml +++ b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml @@ -0,0 +1,7 @@ +wii: + # 异构微服务的IP + ip: 78.46.158.237 + # 异构微服务的端口 + port: 7000 + # 异构微服务的健康检查URL + #health-check-route: /health diff --git a/kn-service/vordm-twitter/src/main/resources/application.yaml b/kn-service/vordm-twitter/src/main/resources/application.yaml index 68512b0..bd57f03 100644 --- a/kn-service/vordm-twitter/src/main/resources/application.yaml +++ b/kn-service/vordm-twitter/src/main/resources/application.yaml @@ -1,5 +1,5 @@ server: - port: 8989 + port: 8980 spring: cloud: From 890c26bfb5c959c18204aa024620575fda843339 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:55:20 +0800 Subject: [PATCH 42/49] Twitter --- kn-service/vordm-twitter/Dockerfile | 2 +- .../vordm-twitter/src/main/resources/application-dev.yaml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile index 7fb149c..457912a 100644 --- a/kn-service/vordm-twitter/Dockerfile +++ b/kn-service/vordm-twitter/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /kn/vordm WORKDIR /kn/vordm -EXPOSE 8987 +EXPOSE 8980 ADD ./target/vordm-crawl.jar ./app.jar diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml index 93c68f9..e69de29 100644 --- a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml +++ b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml @@ -1,7 +0,0 @@ -wii: - # 异构微服务的IP - ip: 78.46.158.237 - # 异构微服务的端口 - port: 7000 - # 异构微服务的健康检查URL - #health-check-route: /health From 54ea3a9431f8b5a7c5ef680dd68cc2e0f75826b5 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:58:10 +0800 Subject: [PATCH 43/49] Twitter --- kn-service/vordm-twitter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml index 9dbfdb2..01ce55a 100644 --- a/kn-service/vordm-twitter/pom.xml +++ b/kn-service/vordm-twitter/pom.xml @@ -5,7 +5,7 @@ kn-service com.kening.platform - 1.0.0-SNAPSHOT + ${revision} 4.0.0 From 9648ec944b8662ad2885706ac2f40f65bb5e2698 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 19:59:47 +0800 Subject: [PATCH 44/49] Twitter --- kn-service/vordm-twitter/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile index 457912a..d2ba668 100644 --- a/kn-service/vordm-twitter/Dockerfile +++ b/kn-service/vordm-twitter/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /kn/vordm EXPOSE 8980 -ADD ./target/vordm-crawl.jar ./app.jar +ADD ./target/vordm-twitter.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] From 472d54963b9b4bdc66c323816cc494efe31aa8f1 Mon Sep 17 00:00:00 2001 From: whq <460794335@qq.com> Date: Mon, 24 Apr 2023 20:16:50 +0800 Subject: [PATCH 45/49] =?UTF-8?q?whq=EF=BC=9A=20=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kening/vordm/VoRdmApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 3761a4f..cd32db5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } From 8be32612a57edfa2cf2e45d77d5d4cd4c300dfdc Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 25 Apr 2023 09:16:15 +0800 Subject: [PATCH 46/49] =?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 --- .../RemoteSensingSourceDataController.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index e8bbf53..d08f310 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -28,42 +28,47 @@ public class RemoteSensingSourceDataController { /** * 根据页码和灾害信息查出遥感影像源数据，可多个灾害 + * * @param disasterInfo * @param query * @return */ @GetMapping("/SourceData") - public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){ + public R> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query) { List disasterIds = disasterInfoService.getDisasterId(disasterInfo); - if (disasterIds.isEmpty()){ + if (disasterIds.isEmpty()) { return R.data(null); } - return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); + return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper().in("disaster_id", disasterIds))); } /** * 实体数据列表信息 + * * @param optionsJson 实体数据条件信息 - * @param query current当前页 size 每页数据量 + * @param query current当前页 size 每页数据量 * @return */ @GetMapping("/Condition") - public R> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) { + public R> getRemoteSensingSourceDataByCondition(String optionsJson, Query query) { RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData(); - if (optionsJson!=null){ - remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class); + if (optionsJson != null) { + remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class); } return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData)); } /** * 实体数据列表信息 - * @param params - * @param query - * @return + * + * @param disasterId + * @param query + * @return */ @GetMapping("/PagesData") - public R> Pages(@RequestParam Map params, Query query){ - return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class))); + public R> pages(Query query, String disasterId) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("disaster_id", disasterId); + return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw)); } } From 6b3dc3554b4fb1e88f5320d3e3ae7651de8446c5 Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 25 Apr 2023 10:37:43 +0800 Subject: [PATCH 47/49] =?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/vo/CallForHelpVo.java | 5 +++++ .../src/main/java/com/kening/vordm/VoRdmApplication.java | 2 +- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 1 + .../main/java/com/kening/vordm/mapper/EntityDataMapper.xml | 4 ++-- .../main/java/com/kening/vordm/mapper/GuestInfoMapper.xml | 1 - 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java index ac46f70..b903d5a 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java @@ -67,4 +67,9 @@ public class CallForHelpVo extends DisasterInfo { * 受灾国家 */ private String disasterCountry; + + /** + * 受灾国家 + */ + private String vordmId; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index cd32db5..3761a4f 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } 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 6fc84ff..fc25e8a 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 @@ -173,6 +173,7 @@ SELECT d.chief_id, d.chief_name, + d.vordm_id, u.username , u.last_name AS lastName, u.first_name AS firstName, diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml index 78bf371..3b8cf9b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml @@ -40,8 +40,8 @@ ms.vordm_id, ms.name AS msName from entity_data ed - inner join guest_info gi on gi.id = ed.uploader_id - inner join map_server ms on ms.disaster_id = ed.disaster_id + left join guest_info gi on gi.id = ed.uploader_id + left join map_server ms on ms.disaster_id = ed.disaster_id ed.disaster_id = #{entityData.disasterId} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index 41dd933..3180088 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -27,7 +27,6 @@ update blade_user t set t.password = #{password} where t.email = #{email} - update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization}, t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country} where t.id = #{id} From d7dc4eb2e100b8462dfd3aa6a61353ba3f6bf0ae Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 25 Apr 2023 10:48:44 +0800 Subject: [PATCH 48/49] =?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/VoRdmApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java index 3761a4f..cd32db5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java @@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication; @SpringCloudApplication public class VoRdmApplication { public static void main(String[] args) { - BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); + BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args); } } From 839a033a64bc10c4ef896624757be5df43ac1f75 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Tue, 25 Apr 2023 16:14:51 +0800 Subject: [PATCH 49/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=BE=E5=AE=B3?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 ba8aabc..af7ff3c 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 @@ -216,7 +216,10 @@ and d.chief_id = #{callForHelpVo.chiefIdEquals} - and bdb.dict_value like concat('%', #{callForHelpVo.disasterType},'%') + and d.disaster_type = #{callForHelpVo.disasterType} + + + and d.disaster_country like concat('%', #{callForHelpVo.disasterCountry},'%') order by d.upload_time desc