From d5f552784dfefcb709c05bd4eda178bba0e7e876 Mon Sep 17 00:00:00 2001 From: glj <13935964706@163.com> Date: Wed, 10 Jul 2024 18:06:53 +0800 Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/entity/EntityDataAll.java | 2 +- .../vordm/entity/GuestApplyDisasterRef.java | 58 ++++--------------- .../controller/EntityDataAllController.java | 5 +- .../GuestApplyDisasterRefController.java | 10 ++-- .../vordm/mapper/EntityDataAllMapper.xml | 2 +- .../mapper/GuestApplyDisasterRefMapper.java | 6 ++ .../mapper/GuestApplyDisasterRefMapper.xml | 13 +++++ .../vordm/service/EntityDataAllService.java | 2 +- .../service/GuestApplyDisasterRefService.java | 5 ++ .../impl/EntityDataAllServiceImpl.java | 7 ++- .../GuestApplyDisasterRefServiceImpl.java | 8 +++ 11 files changed, 62 insertions(+), 56 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java index 29decc5..06e7b2f 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityDataAll.java @@ -115,7 +115,7 @@ public class EntityDataAll implements Serializable { private Integer isDeleted; /** - * 是否发布（0未发布/1已发布） + * 是否发布（0未发布/1已发布）w */ private Integer isPublish; diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestApplyDisasterRef.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestApplyDisasterRef.java index 8a11144..04fa56b 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestApplyDisasterRef.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/GuestApplyDisasterRef.java @@ -41,53 +41,19 @@ public class GuestApplyDisasterRef implements Serializable { */ private Long adminId; + /** + * 用户邮件 + */ + @TableField(exist = false) + private String userName; + + /** + * 用户邮件 + */ + @TableField(exist = false) + private String userEmail; + @TableField(exist = false) private static final long serialVersionUID = 1L; - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - GuestApplyDisasterRef other = (GuestApplyDisasterRef) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getDisasterId() == null ? other.getDisasterId() == null : this.getDisasterId().equals(other.getDisasterId())) - && (this.getUserStatus() == null ? other.getUserStatus() == null : this.getUserStatus().equals(other.getUserStatus())) - && (this.getApplyTime() == null ? other.getApplyTime() == null : this.getApplyTime().equals(other.getApplyTime())) - && (this.getAdminId() == null ? other.getAdminId() == null : this.getAdminId().equals(other.getAdminId())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getDisasterId() == null) ? 0 : getDisasterId().hashCode()); - result = prime * result + ((getUserStatus() == null) ? 0 : getUserStatus().hashCode()); - result = prime * result + ((getApplyTime() == null) ? 0 : getApplyTime().hashCode()); - result = prime * result + ((getAdminId() == null) ? 0 : getAdminId().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", disasterId=").append(disasterId); - sb.append(", userStatus=").append(userStatus); - sb.append(", applyTime=").append(applyTime); - sb.append(", adminId=").append(adminId); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataAllController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataAllController.java index 5c4606e..b5a0ee6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataAllController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataAllController.java @@ -117,7 +117,8 @@ public class EntityDataAllController { */ //4遥感数据(Remote sensing data) type @PostMapping("/importTemplate") - public R fileExcelUpload(@RequestParam("fileDataOne") MultipartFile fileDataOne, @RequestParam("fileDataTwo") List fileDataTwo, @RequestParam("type") Integer type, @RequestParam("disasterId") Long disasterId) { - return entityDataAllService.fileExcelUpload(fileDataOne,fileDataTwo,type,disasterId); + public R fileExcelUpload(@RequestParam("fileDataOne") MultipartFile fileDataOne, @RequestParam("fileDataTwo") List fileDataTwo, + @RequestParam("type") Integer type, @RequestParam("disasterId") Long disasterId, @RequestParam("userId") Long userId) { + return entityDataAllService.fileExcelUpload(fileDataOne,fileDataTwo,type,disasterId,userId); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/GuestApplyDisasterRefController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/GuestApplyDisasterRefController.java index 1a1be4a..6d2622c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/GuestApplyDisasterRefController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/GuestApplyDisasterRefController.java @@ -3,6 +3,7 @@ package com.kening.vordm.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.GuestApplyDisasterRef; import com.kening.vordm.service.GuestApplyDisasterRefService; import io.swagger.annotations.ApiOperation; @@ -14,6 +15,8 @@ import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; import java.util.Arrays; +import java.util.Date; +import java.util.List; @RestController @AllArgsConstructor @@ -32,6 +35,7 @@ public class GuestApplyDisasterRefController { @ApiOperation(value = "新增", notes = "传入Influence") @PostMapping("/save") public R save(@ApiParam(value = "Influence对象", required = true) @RequestBody GuestApplyDisasterRef guestApplyDisasterRef) { + guestApplyDisasterRef.setApplyTime(new Date()); return R.status(guestApplyDisasterRefService.save(guestApplyDisasterRef)); } @@ -57,10 +61,8 @@ public class GuestApplyDisasterRefController { } @GetMapping("/detailByDisasterInfoId") - public R detailByDisasterInfoId(@ApiParam(value = "主键", required = true) @RequestParam String id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(GuestApplyDisasterRef::getDisasterId,id); - GuestApplyDisasterRef detail = guestApplyDisasterRefService.getOne(queryWrapper); + public R> detailByDisasterInfoId(String id, Query query) { + IPage detail = guestApplyDisasterRefService.detailByDisasterInfoId(Condition.getPage(query), id); return R.data(detail); } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml index 974d04f..e7ff6a5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataAllMapper.xml @@ -83,7 +83,7 @@ + select ga.id,ga.disaster_id,ga.user_status, + ga.apply_time,ga.admin_id, + bu.name AS userName,bu.email AS userEmail + from guest_apply_disaster_ref ga + left join blade_user bu on ga.admin_id = bu.id + + + ga.disaster_id = #{id} + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataAllService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataAllService.java index 63e5361..02f695e 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataAllService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/EntityDataAllService.java @@ -23,5 +23,5 @@ public interface EntityDataAllService extends IService { R saveEntityData(EntityDataAll entityData); - R fileExcelUpload(MultipartFile fileDataOne, List fileDataTwo, Integer type, Long disasterId); + R fileExcelUpload(MultipartFile fileDataOne, List fileDataTwo, Integer type, Long disasterId, Long userId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestApplyDisasterRefService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestApplyDisasterRefService.java index 3a9f4b4..f2bd5f5 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestApplyDisasterRefService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestApplyDisasterRefService.java @@ -1,8 +1,12 @@ package com.kening.vordm.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.GuestApplyDisasterRef; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author G * @description 针对表【guest_apply_disaster_ref(灾害响应表，每一个灾害可能有多个用户响应-申请)】的数据库操作Service @@ -10,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface GuestApplyDisasterRefService extends IService { + IPage detailByDisasterInfoId(IPage page, String id); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java index e04d7bb..fa3831c 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java @@ -103,7 +103,7 @@ public class EntityDataAllServiceImpl extends ServiceImpl fileDataTwo, Integer type, Long disasterId) { + public R fileExcelUpload(MultipartFile fileDataOne, List fileDataTwo, Integer type, Long disasterId, Long userId) { HashSet pictureNames = new HashSet<>(); fileDataTwo.stream().forEach(multipartFile -> { String filename = multipartFile.getOriginalFilename(); @@ -122,6 +122,7 @@ public class EntityDataAllServiceImpl extends ServiceImpl implements GuestApplyDisasterRefService{ + @Override + public IPage detailByDisasterInfoId(IPage page, String id) { + return this.baseMapper.detailByDisasterInfoId(page,id); + } }