From 25ee39069e5befffb56275e5a32d313a0232a1e5 Mon Sep 17 00:00:00 2001 From: glj Date: Fri, 21 Apr 2023 16:19:23 +0800 Subject: [PATCH] =?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 @@