提交管理员审核功能-liyuchen
This commit is contained in:
parent
6c7048cb95
commit
ab28ab3b9c
|
@ -0,0 +1,11 @@
|
|||
package com.kening.vordm.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AdminManager extends DisasterInfo{
|
||||
|
||||
private String managerName;
|
||||
|
||||
private Long managerId;
|
||||
}
|
|
@ -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;
|
||||
}
|
|
@ -0,0 +1,8 @@
|
|||
package com.kening.vordm.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DataUpload extends EntityData{
|
||||
|
||||
}
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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<String,Object> params){
|
||||
return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params));
|
||||
}
|
||||
|
||||
/**
|
||||
* 审核这个管理人可以管理某个灾害
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/audit")
|
||||
public R audit(@RequestBody List<GuestManageDisasterRef> guestManageDisasterRef){
|
||||
return R.status(guestManageDisasterRefService.updateBatchById(guestManageDisasterRef));
|
||||
}
|
||||
}
|
|
@ -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<IPage<Administrator>> pages(Query query, @RequestParam Map<String,Object> 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<Boolean> 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<Boolean> delete(@RequestParam Long ids){
|
||||
return R.status(service.removeById(ids));
|
||||
}
|
||||
}
|
|
@ -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<IPage<DataUpload>> pages(Query query, @RequestParam Map<String,Object> params){
|
||||
return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(params,DataUpload.class)));
|
||||
}
|
||||
}
|
|
@ -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<Administrator> {
|
||||
|
||||
/**
|
||||
* 根据角色名称获取角色id
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
Long getChiefRole(@Param("roleName") String roleName);
|
||||
}
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.kening.vordm.mapper.AdministratorMapper">
|
||||
|
||||
<select id="getChiefRole" resultType="java.lang.Long">
|
||||
select
|
||||
id
|
||||
from blade_role
|
||||
<where>
|
||||
and is_deleted = 0
|
||||
<if test="roleName!=null and roleName!=''">
|
||||
and role_name = #{roleName}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
|
@ -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<DataUpload> {
|
||||
|
||||
/**
|
||||
* 根据角色名称获取角色id
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
Long getChiefRole(@Param("roleName") String roleName);
|
||||
}
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.kening.vordm.mapper.DataUploadMapper">
|
||||
|
||||
<select id="getChiefRole" resultType="java.lang.Long">
|
||||
select
|
||||
id
|
||||
from blade_role
|
||||
<where>
|
||||
and is_deleted = 0
|
||||
<if test="roleName!=null and roleName!=''">
|
||||
and role_name = #{roleName}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
|
@ -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<GuestManageDisasterRef> {
|
||||
|
||||
|
||||
List<AdminManager> queryPage(IPage page, @Param("params") Map<String, Object> params);
|
||||
}
|
||||
|
|
|
@ -17,4 +17,24 @@
|
|||
id,sponsor_id,uploader_id,
|
||||
manager_id,disaster_id,response_organization
|
||||
</sql>
|
||||
|
||||
<select id="queryPage" resultType="com.kening.vordm.entity.AdminManager">
|
||||
select
|
||||
gmdr.id,
|
||||
gmdr.sponsor_id,
|
||||
gmdr.manager_id,
|
||||
gmdr.disaster_id,
|
||||
gmdr.response_organization,
|
||||
bu.name as managerName,
|
||||
bdb.dict_value as disasterType,
|
||||
di.disaster_keyword,
|
||||
di.disaster_time,
|
||||
di.disaster_level,
|
||||
di.disaster_country,
|
||||
di.sponsor_organization
|
||||
from guest_manage_disaster_ref gmdr
|
||||
left join disaster_info di on gmdr.disaster_id = di.id
|
||||
left join blade_user bu on gmdr.manager_id = bu.id
|
||||
left join blade_dict_biz bdb on bdb.dict_key = di.disaster_type
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
@ -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<Administrator> {
|
||||
|
||||
/**
|
||||
* 根据角色名称获取角色id
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
Long getChiefRole(String roleName);
|
||||
}
|
|
@ -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<DataUpload> {
|
||||
|
||||
/**
|
||||
* 根据角色名称获取角色id
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
Long getChiefRole(String roleName);
|
||||
}
|
|
@ -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<GuestManageDisasterRef> {
|
||||
|
||||
IPage queryPage(IPage page, Map<String,Object> params);
|
||||
}
|
||||
|
|
|
@ -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<AdministratorMapper,Administrator> implements AdministratorService {
|
||||
|
||||
/**
|
||||
* 根据角色名称获取角色id
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Long getChiefRole(String roleName) {
|
||||
return baseMapper.getChiefRole(roleName);
|
||||
}
|
||||
}
|
|
@ -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<DataUploadMapper, DataUpload> implements DataUploadService {
|
||||
|
||||
/**
|
||||
* 根据角色名称获取角色id
|
||||
* @param roleName
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Long getChiefRole(String roleName) {
|
||||
return baseMapper.getChiefRole(roleName);
|
||||
}
|
||||
}
|
|
@ -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<GuestManageDisasterRefMapper, GuestManageDisasterRef>
|
||||
implements GuestManageDisasterRefService {
|
||||
|
||||
/**
|
||||
* 后台管理-普通管理员申请管理灾害分页查询
|
||||
* @param page
|
||||
* @param params
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public IPage queryPage(IPage page, Map<String, Object> params) {
|
||||
page.setRecords(baseMapper.queryPage(page,params));
|
||||
return page;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue