From c534592f957fb2b2a48a9a9f05724ec5d97cc72e Mon Sep 17 00:00:00 2001 From: zxh <599622719@qq.com> Date: Wed, 5 Apr 2023 22:37:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=81=BE=E5=AE=B3=E6=95=B0=E6=8D=AE=E7=9A=84=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kening/vordm/entity/DisasterInfo.java | 1 + .../kening/vordm/vo/DisasterMangerInfo.java | 25 +++++++++++++++++++ .../java/com/kening/vordm/vo/GroupByUse.java | 11 +++++--- .../java/com/kening/vordm/vo/groupByUse.java | 25 ------------------- .../controller/DisasterInfoController.java | 22 ++++++++++++++++ .../controller/ManageInforController.java | 23 +++++++++++++++++ .../vordm/mapper/DisasterInfoMapper.java | 5 +++- .../vordm/mapper/DisasterInfoMapper.xml | 15 +++++++++-- .../vordm/mapper/ManagerInfoMapper.java | 4 +++ .../kening/vordm/mapper/ManagerInfoMapper.xml | 9 +++++++ .../vordm/service/DisasterInfoService.java | 6 ++++- .../vordm/service/ManagerInfoService.java | 5 +++- .../service/impl/DisasterInfoServiceImpl.java | 25 ++++++++++++++++--- .../service/impl/ManagerInfoServiceImpl.java | 7 +++++- 14 files changed, 145 insertions(+), 38 deletions(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java delete mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java 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 5358ef0..cc8752c 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 @@ -99,6 +99,7 @@ public class DisasterInfo implements Serializable { @TableField(exist = false) private String name; + @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/DisasterMangerInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java new file mode 100644 index 0000000..584aaa7 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/DisasterMangerInfo.java @@ -0,0 +1,25 @@ +package com.kening.vordm.vo; + +import com.kening.vordm.entity.DisasterInfo; + +public class DisasterMangerInfo extends DisasterInfo { + /** + * 用户名 + */ + private String username; + + /** + * 密码 + */ + private String password; + + /** + * 邮箱 + */ + private String email; + + /** + * 组织机构 + */ + private String organization; +} diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java index 1ba8bc3..af9d520 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/GroupByUse.java @@ -4,12 +4,10 @@ import lombok.Data; import lombok.Getter; import lombok.Setter; -import javax.swing.*; - @Data @Getter @Setter -public class groupByUse { +public class GroupByUse { /** * 名称 */ @@ -18,5 +16,10 @@ public class groupByUse { /** * 数量 */ - private String count; + private Integer cnt; + + /** + * 图标 + */ + private String icon; } diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java deleted file mode 100644 index 903d0c3..0000000 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/groupByUse.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.kening.vordm.vo; - -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -@Data -@Getter -@Setter -public class GroupByUse { - /** - * 名称 - */ - private String name; - - /** - * 数量 - */ - private String count; - - /** - * 图标 - */ - private String icon; -} 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 fda4e71..a169dfb 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 @@ -1,6 +1,9 @@ package com.kening.vordm.controller; +import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; +import com.sun.org.apache.bcel.internal.generic.NEW; +import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Queue; + @RestController @RequiredArgsConstructor @RequestMapping @@ -54,8 +59,25 @@ public class DisasterInfoController { return R.data(newsService.page(Condition.getPage(query),new QueryWrapper().in("disaster_id",disasterIds))); } + /** + * 灾害信息统计 国家/灾害类型 + * @param name + * @return + */ @GetMapping("/disasterStatistics") public R> getDisasterStatistics(String name){ return R.data(disasterInfoService.getDisasterStatistics(name)); } + + /** + * 首页数据展示，包括响应中和未响应 + * @param query + * @param respondStatus + * @return + */ + @GetMapping("/homeDisasterInfo") + public R> gethomeDisasterInfo(Query query,Integer respondStatus){ + IPage pages=disasterInfoService.getHomeDisaster(Condition.getPage(query),respondStatus); + return R.data(BladePage.of(pages)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java new file mode 100644 index 0000000..7abc700 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/ManageInforController.java @@ -0,0 +1,23 @@ +package com.kening.vordm.controller; + +import com.kening.vordm.service.ManagerInfoService; +import com.kening.vordm.vo.GroupByUse; +import lombok.AllArgsConstructor; +import org.springblade.core.tool.api.R; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@AllArgsConstructor +@RequestMapping +public class ManageInforController { + + private final ManagerInfoService managerInfoService; + @GetMapping("manageStatistics") + public R> manageStatistics(String name){ + return R.data(managerInfoService.getMangerStatistics(name)); + } +} 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 4b6a1de..a068557 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 @@ -2,11 +2,14 @@ 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.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Queue; /** * @author G1393 @@ -20,8 +23,8 @@ public interface DisasterInfoMapper extends BaseMapper { @Param("disaster_country") String disaster_country, @Param("disaster_time") String disaster_time, @Param("name") String name); - List getHomeDisasterInfo(); + List getHomeDisaster(IPage page, Integer respondStatus); List getDisasterStatistics(@Param("name" ) String name ); } 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 f5420ad..482b5d6 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 @@ -31,7 +31,10 @@ temp_start_time,create_time,vordm_id, respond_time - + + d.disaster_type,d.disaster_time,d.disaster_country, + m.organization + - + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java index 33db91e..e6f3152 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.java @@ -3,6 +3,9 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kening.vordm.entity.ManagerInfo; +import com.kening.vordm.vo.GroupByUse; + +import java.util.List; /** * @author G1393 @@ -12,5 +15,6 @@ import com.kening.vordm.entity.ManagerInfo; */ public interface ManagerInfoMapper extends BaseMapper { + public List manageStatistics(String name); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml index 2d11325..7c8711e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/ManagerInfoMapper.xml @@ -17,4 +17,13 @@ id,username,password, email,organization,create_time + + 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 7616394..bb9181d 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 @@ -1,9 +1,12 @@ 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.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; +import io.swagger.models.auth.In; import java.util.List; @@ -13,7 +16,6 @@ import java.util.List; * @createDate 2023-04-04 15:54:30 */ public interface DisasterInfoService extends IService { - List getAllData(); List getConditionData(String type, String country, String time, String name); // Long getDisasterId(DisasterInfo disasterInfo); @@ -26,4 +28,6 @@ public interface DisasterInfoService extends IService { List getDisasterId(DisasterInfo disasterInfo); List getDisasterStatistics( String name); + + IPage getHomeDisaster(IPage page, Integer respondStatus); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java index be25ca5..78d9597 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/ManagerInfoService.java @@ -3,6 +3,9 @@ package com.kening.vordm.service; import com.baomidou.mybatisplus.extension.service.IService; import com.kening.vordm.entity.ManagerInfo; +import com.kening.vordm.vo.GroupByUse; + +import java.util.List; /** * @author G1393 @@ -10,5 +13,5 @@ import com.kening.vordm.entity.ManagerInfo; * @createDate 2023-04-04 15:54:30 */ public interface ManagerInfoService extends IService { - + public List getMangerStatistics(String name); } 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 9eab765..347ab6c 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,12 +1,15 @@ 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.kening.vordm.entity.DisasterInfo; import com.kening.vordm.mapper.DisasterInfoMapper; import com.kening.vordm.service.DisasterInfoService; +import com.kening.vordm.vo.DisasterMangerInfo; import com.kening.vordm.vo.GroupByUse; import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.connection.RedisServer; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -26,9 +29,15 @@ implements DisasterInfoService { // this.disasterInfoService = disasterInfoService; // } - public List getAllData(){ - return this.baseMapper.getHomeDisasterInfo(); - } + + /** + * 返回指定的灾害条目 + * @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); return disasterInfos; @@ -62,7 +71,17 @@ implements DisasterInfoService { return null; } + /** + * 进行灾害信息的统计，国家，类型 + * @param name + * @return + */ public List getDisasterStatistics(String name){ return this.baseMapper.getDisasterStatistics(name); } + + public IPage getHomeDisaster(IPage page, Integer respondStatus){ + List disasterMangerInfos = this.baseMapper.getHomeDisaster(page, respondStatus); + return page.setRecords(disasterMangerInfos); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java index 2c6d94c..fe99f1c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/ManagerInfoServiceImpl.java @@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.ManagerInfo; import com.kening.vordm.mapper.ManagerInfoMapper; import com.kening.vordm.service.ManagerInfoService; +import com.kening.vordm.vo.GroupByUse; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author G1393 * @description 针对表【manager_info(管理员用户信息表)】的数据库操作Service实现 @@ -14,5 +17,7 @@ import org.springframework.stereotype.Service; @Service public class ManagerInfoServiceImpl extends ServiceImpl implements ManagerInfoService { - + public List getMangerStatistics(String name){ + return this.baseMapper.manageStatistics(name); + } }