From ab28ab3b9c9de617ffa77414fbd1072e3c81684e Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Wed, 12 Apr 2023 09:22:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=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/AdminManager.java | 11 +++ .../kening/vordm/entity/Administrator.java | 61 +++++++++++++++++ .../com/kening/vordm/entity/DataUpload.java | 8 +++ .../com/kening/vordm/entity/EntityData.java | 5 ++ .../vordm/entity/GuestManageDisasterRef.java | 5 ++ .../controller/AdminManagerController.java | 46 +++++++++++++ .../controller/AdministratorController.java | 68 +++++++++++++++++++ .../controller/DataUploadController.java | 38 +++++++++++ .../vordm/mapper/AdministratorMapper.java | 19 ++++++ .../vordm/mapper/AdministratorMapper.xml | 18 +++++ .../kening/vordm/mapper/DataUploadMapper.java | 20 ++++++ .../kening/vordm/mapper/DataUploadMapper.xml | 18 +++++ .../mapper/GuestManageDisasterRefMapper.java | 8 ++- .../mapper/GuestManageDisasterRefMapper.xml | 20 ++++++ .../vordm/service/AdministratorService.java | 19 ++++++ .../vordm/service/DataUploadService.java | 20 ++++++ .../GuestManageDisasterRefService.java | 4 ++ .../impl/AdministratorServiceImpl.java | 26 +++++++ .../service/impl/DataUploadServiceImpl.java | 29 ++++++++ .../GuestManageDisasterRefServiceImpl.java | 14 ++++ 20 files changed, 456 insertions(+), 1 deletion(-) create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java create mode 100644 kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/AdministratorService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DataUploadService.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java create mode 100644 kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DataUploadServiceImpl.java 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 new file mode 100644 index 0000000..4e318b8 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java @@ -0,0 +1,11 @@ +package com.kening.vordm.entity; + +import lombok.Data; + +@Data +public class AdminManager extends DisasterInfo{ + + private String managerName; + + private Long managerId; +} 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 new file mode 100644 index 0000000..d746649 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java @@ -0,0 +1,61 @@ +package com.kening.vordm.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +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; + +/** + * user实体类 + * @author liyuchen + */ +@Data +@TableName(value ="blade_user") +public class Administrator extends BaseEntity { + + private Long id; + + private String tenantId; + + private String code; + + private Integer userType; + + private String account; + + private String password; + + private String name; + + private String realName; + + private String avatar; + + private String email; + + private String phone; + + /** + * 组织机构 + */ + private String organization; + + private String roleId; + + private Long createDept; + + private Long updateUser; + + private Long createUser; + + private Date createTime; + + private Date updateTime; + + private Integer status; + + private Integer isDeleted; +} 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 new file mode 100644 index 0000000..75c92e8 --- /dev/null +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java @@ -0,0 +1,8 @@ +package com.kening.vordm.entity; + +import lombok.Data; + +@Data +public class DataUpload extends EntityData{ + +} 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 b71d348..e4c7273 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 @@ -101,6 +101,11 @@ public class EntityData implements Serializable { */ private String sourceOrganization; + /** + * 上传类型 1.guest上传 2.manager上传（用来区分uploader_id字段） + */ + private Integer uploadType; + @TableField(exist = false) private static final long serialVersionUID = 1L; 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 b75f64a..904d48d 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 @@ -45,6 +45,11 @@ public class GuestManageDisasterRef implements Serializable { */ private String responseOrganization; + /** + * 审核状态 0未审核 1审核通过 2审核不通过 + */ + private Integer status; + @TableField(exist = false) private static final long serialVersionUID = 1L; 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 new file mode 100644 index 0000000..2572016 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java @@ -0,0 +1,46 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kening.vordm.entity.GuestManageDisasterRef; +import com.kening.vordm.service.GuestManageDisasterRefService; +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.util.List; +import java.util.Map; + +/** + * 后台管理系统-普通管理员控制器 + * @author liyuchen + * @date 2023/04/11 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/adminManager") +public class AdminManagerController { + + private GuestManageDisasterRefService guestManageDisasterRefService; + + /** + * 普通管理员分页查询 + * @param query + * @param params + * @return + */ + @GetMapping("/pages") + public R pages(Query query, @RequestParam Map params){ + return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params)); + } + + /** + * 审核这个管理人可以管理某个灾害 + * @return + */ + @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/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java new file mode 100644 index 0000000..51e5ad8 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java @@ -0,0 +1,68 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.Administrator; +import com.kening.vordm.service.AdministratorService; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +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.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * 后台管理系统-chief管理员管理控制器 + * @author liyuchen + * @date 2023/04/11 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/administrator") +public class AdministratorController { + + private AdministratorService service; + + /** + * 管理员用户分页列表 + * @param query + * @param params + * @return + */ + @GetMapping("/pages") + public R> pages(Query query, @RequestParam Map params){ + //查出角色名为chief的角色id 放入params中进行分页查询 + Long roleId = service.getChiefRole("chief"); + params.put("roleId_equal",roleId); + return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(params,Administrator.class))); + } + + /** + * 保存管理员信息 + * @param administrator + * @return + */ + @PostMapping("/add") + public R add(@RequestBody Administrator administrator){ + administrator.setTenantId("595035"); + administrator.setUserType(1); + //密码默认为1234 + administrator.setPassword(DigestUtil.encrypt("1234")); + //角色为chief + Long roleId = service.getChiefRole("chief"); + administrator.setRoleId(String.valueOf(roleId)); + return R.status(service.save(administrator)); + } + + /** + * 删除管理员用户 + * @param ids + * @return + */ + @DeleteMapping("/delete") + public R delete(@RequestParam Long ids){ + return R.status(service.removeById(ids)); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java new file mode 100644 index 0000000..47e41cc --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DataUploadController.java @@ -0,0 +1,38 @@ +package com.kening.vordm.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.DataUpload; +import com.kening.vordm.service.DataUploadService; +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.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * 后端管理系统-数据上传界面 + * @author liyuchen + */ +@RestController +@AllArgsConstructor +@RequestMapping("/dataUpload") +public class DataUploadController { + + private DataUploadService service; + + /** + * 分页列表查询 + * @param query + * @param params + * @return + */ + @GetMapping("/pages") + public R> pages(Query query, @RequestParam Map params){ + return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(params,DataUpload.class))); + } +} 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 new file mode 100644 index 0000000..1149e49 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java @@ -0,0 +1,19 @@ +package com.kening.vordm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.Administrator; +import org.apache.ibatis.annotations.Param; + +/** + * 管理员用户Mapper层 + * @author liycuhen + */ +public interface AdministratorMapper extends BaseMapper { + + /** + * 根据角色名称获取角色id + * @param roleName + * @return + */ + Long getChiefRole(@Param("roleName") String roleName); +} 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 new file mode 100644 index 0000000..8f81ac3 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.java new file mode 100644 index 0000000..95555e0 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.java @@ -0,0 +1,20 @@ +package com.kening.vordm.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kening.vordm.entity.Administrator; +import com.kening.vordm.entity.DataUpload; +import org.apache.ibatis.annotations.Param; + +/** + * 管理员用户Mapper层 + * @author liycuhen + */ +public interface DataUploadMapper extends BaseMapper { + + /** + * 根据角色名称获取角色id + * @param roleName + * @return + */ + Long getChiefRole(@Param("roleName") String roleName); +} 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 new file mode 100644 index 0000000..71a1701 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.java index e8b7b66..8670e51 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.java @@ -2,7 +2,13 @@ package com.kening.vordm.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kening.vordm.entity.AdminManager; import com.kening.vordm.entity.GuestManageDisasterRef; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** * @author G1393 @@ -12,5 +18,5 @@ import com.kening.vordm.entity.GuestManageDisasterRef; */ public interface GuestManageDisasterRefMapper extends BaseMapper { - + List queryPage(IPage page, @Param("params") Map params); } 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 c24283a..642e552 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 @@ -17,4 +17,24 @@ id,sponsor_id,uploader_id, manager_id,disaster_id,response_organization + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/AdministratorService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/AdministratorService.java new file mode 100644 index 0000000..e2f5464 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/AdministratorService.java @@ -0,0 +1,19 @@ +package com.kening.vordm.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.Administrator; +import org.springblade.core.mp.base.BaseService; + +/** + * 管理员用户服务层 + * @author liyuchen + */ +public interface AdministratorService extends BaseService { + + /** + * 根据角色名称获取角色id + * @param roleName + * @return + */ + Long getChiefRole(String roleName); +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DataUploadService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DataUploadService.java new file mode 100644 index 0000000..b488f65 --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DataUploadService.java @@ -0,0 +1,20 @@ +package com.kening.vordm.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.kening.vordm.entity.Administrator; +import com.kening.vordm.entity.DataUpload; +import org.springblade.core.mp.base.BaseService; + +/** + * 管理员用户服务层 + * @author liyuchen + */ +public interface DataUploadService extends IService { + + /** + * 根据角色名称获取角色id + * @param roleName + * @return + */ + Long getChiefRole(String roleName); +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestManageDisasterRefService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestManageDisasterRefService.java index 148c171..86df582 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestManageDisasterRefService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestManageDisasterRefService.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.GuestManageDisasterRef; +import java.util.Map; + /** * @author G1393 * @description 针对表【guest_manage_disaster_ref(灾害响应表，每一个灾害可能有多个用户响应)】的数据库操作Service @@ -11,4 +14,5 @@ import com.kening.vordm.entity.GuestManageDisasterRef; */ public interface GuestManageDisasterRefService extends IService { + IPage queryPage(IPage page, Map params); } 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 new file mode 100644 index 0000000..c44830c --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java @@ -0,0 +1,26 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.Administrator; +import com.kening.vordm.mapper.AdministratorMapper; +import com.kening.vordm.service.AdministratorService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 管理员用户实现类 + * @author liyuchen + */ +@Service +public class AdministratorServiceImpl extends BaseServiceImpl implements AdministratorService { + + /** + * 根据角色名称获取角色id + * @param roleName + * @return + */ + @Override + public Long getChiefRole(String roleName) { + return baseMapper.getChiefRole(roleName); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DataUploadServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DataUploadServiceImpl.java new file mode 100644 index 0000000..c3a379e --- /dev/null +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DataUploadServiceImpl.java @@ -0,0 +1,29 @@ +package com.kening.vordm.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.kening.vordm.entity.Administrator; +import com.kening.vordm.entity.DataUpload; +import com.kening.vordm.mapper.AdministratorMapper; +import com.kening.vordm.mapper.DataUploadMapper; +import com.kening.vordm.service.AdministratorService; +import com.kening.vordm.service.DataUploadService; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 管理员用户实现类 + * @author liyuchen + */ +@Service +public class DataUploadServiceImpl extends ServiceImpl implements DataUploadService { + + /** + * 根据角色名称获取角色id + * @param roleName + * @return + */ + @Override + public Long getChiefRole(String roleName) { + return baseMapper.getChiefRole(roleName); + } +} diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestManageDisasterRefServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestManageDisasterRefServiceImpl.java index 541ab2d..924dbfe 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestManageDisasterRefServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestManageDisasterRefServiceImpl.java @@ -1,11 +1,14 @@ package com.kening.vordm.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kening.vordm.entity.GuestManageDisasterRef; import com.kening.vordm.mapper.GuestManageDisasterRefMapper; import com.kening.vordm.service.GuestManageDisasterRefService; import org.springframework.stereotype.Service; +import java.util.Map; + /** * @author G1393 * @description 针对表【guest_manage_disaster_ref(灾害响应表，每一个灾害可能有多个用户响应)】的数据库操作Service实现 @@ -15,4 +18,15 @@ import org.springframework.stereotype.Service; public class GuestManageDisasterRefServiceImpl extends ServiceImpl implements GuestManageDisasterRefService { + /** + * 后台管理-普通管理员申请管理灾害分页查询 + * @param page + * @param params + * @return + */ + @Override + public IPage queryPage(IPage page, Map params) { + page.setRecords(baseMapper.queryPage(page,params)); + return page; + } }