From 260eb3acd98721280e0f093f0310b6b26ae260b0 Mon Sep 17 00:00:00 2001 From: why <986973311@qq.com> Date: Wed, 19 Apr 2023 18:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/vo/CenterDisasterInfo.java | 156 ++++++++++++++++++ .../vordm/controller/CenterController.java | 72 ++++++++ .../mapper/CenterDisasterInfoMapper.java | 18 ++ .../vordm/mapper/CenterDisasterInfoMapper.xml | 47 ++++++ .../kening/vordm/mapper/GuestInfoMapper.java | 2 + .../kening/vordm/mapper/GuestInfoMapper.xml | 3 + .../service/CenterDisasterInfoService.java | 13 ++ .../vordm/service/GuestInfoService.java | 1 + .../impl/CenterDisasterInfoServiceImpl.java | 22 +++ .../service/impl/GuestInfoServiceImpl.java | 16 ++ .../java/mapper/CenterDisasterInfoMapper.xml | 48 ++++++ 11 files changed, 398 insertions(+) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CenterDisasterInfo.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/CenterDisasterInfoService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/CenterDisasterInfoServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/mapper/CenterDisasterInfoMapper.xml diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CenterDisasterInfo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CenterDisasterInfo.java new file mode 100644 index 0000000..96343ee --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CenterDisasterInfo.java @@ -0,0 +1,156 @@ +package com.kening.vordm.vo; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import java.util.Date; +import lombok.Data; + +/** + * + * @TableName center_disaster_info + */ +@TableName(value ="center_disaster_info") +@Data +public class CenterDisasterInfo implements Serializable { + /** + * 唯一值 + */ + private Long id; + + /** + * 灾害类型 + */ + private String disasterType; + + /** + * 灾害关键词 + */ + private String disasterKeyword; + + /** + * 灾害发生时间 + */ + private Date disasterTime; + + /** + * 灾害发起时间 + */ + private Date uploadTime; + + /** + * 灾害区域地理字段 + */ + private String geometry; + + /** + * 灾害强度或震级 + */ + private String disasterLevel; + + /** + * 受灾国家 + */ + private String disasterCountry; + + /** + * 响应状态，0未审批，1审批未通过。2审批通过并正在响应，3审批通过并且响应完成 + */ + private Integer respondStatus; + + /** + * 本灾害的用户访问次数 + */ + private Integer visitCount; + + /** + * 本灾害的数据下载次数 + */ + private Integer downloadCount; + + /** + * 爬虫类型 + */ + private Integer spiderType; + + /** + * 爬虫起始时间 + */ + private Date tempendTime; + + /** + * 爬虫终止时间 + */ + private Date tempStartTime; + + /** + * 数据条目创建时间 + */ + private Date createTime; + + /** + * 灾害id,审批通过后生成 + */ + private String vordmId; + + /** + * 灾害响应时间 + */ + private Date respondTime; + + /** + * 灾害申请组织 + */ + private String sponsorOrganization; + + /** + * 字典名称 + */ + private String dictValue; + + /** + * 数据存储链接 + */ + private String disasterImg; + + /** + * + */ + private Long size; + + /** + * + */ + private String news; + + /** + * 用户名称 + */ + private String userName; + + /** + * 审核状态 0未审核 1审核通过 2审核不通过 3未认领 + */ + private Integer status; + + /** + * 申请管理员时间 + */ + private LocalDateTime applyTime; + + /** + * 审批管理员时间 + */ + private LocalDateTime reviewTime; + + /** + * 用户邮件 + */ + private String email; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} 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 new file mode 100644 index 0000000..d0ac039 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java @@ -0,0 +1,72 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.kening.vordm.entity.Tool; +import com.kening.vordm.service.CenterDisasterInfoService; +import com.kening.vordm.service.DisasterInfoVoService; +import com.kening.vordm.service.GuestInfoService; +import com.kening.vordm.service.ToolService; +import com.kening.vordm.vo.CenterDisasterInfo; +import com.kening.vordm.vo.DisasterInfoVo; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +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.springframework.web.bind.annotation.*; + +import java.time.LocalDate; +import java.util.Arrays; +import java.util.Date; +import java.util.Map; + +@RestController +@AllArgsConstructor +@RequestMapping("/ui/center") +public class CenterController { + private final CenterDisasterInfoService centerDisasterInfoService; + private final GuestInfoService guestInfoService; + + /** + * 个人中心 Responding列表 + * 必传email + * @param query + * @return + */ + @GetMapping("/respondingList") + public R> disasterInfoList(Query query, @RequestParam Map params) { + return R.data(centerDisasterInfoService.page(Condition.getPage(query), Wrappers.lambdaQuery() + .eq(CenterDisasterInfo::getRespondStatus,2) + .eq(CenterDisasterInfo::getEmail,String.valueOf(params.get("email"))) + .orderByDesc(CenterDisasterInfo::getApplyTime) + )); + } + + /** + * 个人中心 Responded列表 + * 必传email + * @param query + * @return + */ + @GetMapping("/respondedList") + public R> respondedList(Query query, @RequestParam Map params) { + return R.data(centerDisasterInfoService.page(Condition.getPage(query), Wrappers.lambdaQuery() + .eq(CenterDisasterInfo::getRespondStatus,3) + .eq(CenterDisasterInfo::getEmail,String.valueOf(params.get("email"))) + .eq(CenterDisasterInfo::getStatus, 1) + .orderByDesc(CenterDisasterInfo::getVordmId) + )); + } + @PostMapping("/updatePassword") + public R updatePassword(String oldPassword, String password, String email) { + return R.data(guestInfoService.updatePassword(oldPassword, password, email)); + } +} + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.java new file mode 100644 index 0000000..97c1345 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.java @@ -0,0 +1,18 @@ +package com.kening.vordm.mapper; + +import com.kening.vordm.vo.CenterDisasterInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author wangns +* @description 针对表【center_disaster_info】的数据库操作Mapper +* @createDate 2023-04-19 11:46:32 +* @Entity com.kening.vordm.vo.CenterDisasterInfo +*/ +public interface CenterDisasterInfoMapper extends BaseMapper { + +} + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.xml new file mode 100644 index 0000000..87fb7bb --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/CenterDisasterInfoMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + 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 f241bc8..687e16d 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 @@ -16,4 +16,6 @@ public interface GuestInfoMapper extends BaseMapper { UserVo getBladeUserByEmail(@Param("email") String email); + + int updatePassword(String email, String password); } 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 350129e..0e997da 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 @@ -23,6 +23,9 @@ organization,research_field,create_time, is_manage,occupation,professional_title,last_name,first_name + + update blade_user t set t.password = #{password} where t.email = #{email} +