Commit 951392fa authored by 朱翔's avatar 朱翔
Browse files

部门管理相关接口

parent e4227e8a
package com.ruzhoukj.sms.common;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.common
* @Project:OA
* @name:Constant
* @Date:2025/2/21 10:26
* @Filename:Constant
*/
public class Constant {
/**
* 用户角色
*/
public static final String ADMIN = "ADMIN";
//部门管理员
public static final String D_ADMIN = "D_ADMIN";
}
package com.ruzhoukj.sms.controller;
import com.google.common.collect.Lists;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.page.TableDataInfo;
import com.ruzhoukj.sms.common.Constant;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.model.dto.DeptDTO;
import com.ruzhoukj.sms.service.DeptService;
import com.ruzhoukj.sms.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.controller
* @Project:OA
* @name:DeptController
* @Date:2025/2/21 9:52
* @Filename:DeptController
*/
@Api(tags = "部门管理")
@RestController
@RequestMapping("/dept")
public class DeptController extends BaseController {
@Resource
private UserService userService;
@Resource
private DeptService deptService;
@PostMapping("/page")
@ApiOperation(value = "分页列表")
public TableDataInfo page(@RequestBody DeptDTO deptDTO){
UserEntity user = userService.getById(deptDTO.getLoginUserId());
startPage(deptDTO.getPageNum(),deptDTO.getPageSize());
if(user.getUserRole().equals(Constant.ADMIN)){
return getDataTable(deptService.queryList(deptDTO));
}
if(user.getUserRole().equals(Constant.D_ADMIN)){
deptDTO.setDeptAdmin(user.getId());
return getDataTable(deptService.queryList(deptDTO));
}
return getDataTable(Lists.newArrayList());
}
@PostMapping("/saveOrUpdate")
public Result saveOrUpdate(@RequestBody DeptDTO deptDTO){
return toAjax(deptService.saveOrUpdateDept(deptDTO));
}
@DeleteMapping("/delete/{id}")
public Result delete(@PathVariable String id){
return toAjax(deptService.removeById(id));
}
@PostMapping("/userList")
public Result<List<DeptAndUserEntity>> userList(@RequestBody DeptDTO deptDTO){
return Result.data(deptService.getDeptUserList(deptDTO));
}
}
...@@ -38,4 +38,10 @@ public class ReportDataInfoController extends BaseController { ...@@ -38,4 +38,10 @@ public class ReportDataInfoController extends BaseController {
public Result<ReportDataInfoVO> getInfo(@PathVariable String id){ public Result<ReportDataInfoVO> getInfo(@PathVariable String id){
return Result.data(DozerUtils.convertBean(reportDataInfoService.getById(id),ReportDataInfoVO.class)); return Result.data(DozerUtils.convertBean(reportDataInfoService.getById(id),ReportDataInfoVO.class));
} }
@GetMapping("/test")
public void test(){
reportDataInfoService.test();
}
} }
package com.ruzhoukj.sms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.dao
* @Project:OA
* @name:DeptAndUserDao
* @Date:2025/2/21 10:04
* @Filename:DeptAndUserDao
*/
@Mapper
public interface DeptAndUserDao extends BaseMapper<DeptAndUserEntity> {
/**
* 查看部门用户列表
* @param deptAndUserEntity deptAndUserEntity
* @return List<DeptAndUserEntity>
*/
List<DeptAndUserEntity> queryList(DeptAndUserEntity deptAndUserEntity);
}
package com.ruzhoukj.sms.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.sms.entity.DeptEntity;
import com.ruzhoukj.sms.model.dto.DeptDTO;
import com.ruzhoukj.sms.model.vo.DeptVO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.dao
* @Project:OA
* @name:DeptDao
* @Date:2025/2/21 9:47
* @Filename:DeptDao
*/
@Mapper
public interface DeptDao extends BaseMapper<DeptEntity> {
List<DeptVO> queryList(DeptDTO deptDTO);
}
package com.ruzhoukj.sms.entity;
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 lombok.Data;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.entity
* @Project:OA
* @name:DeptAndUserEntity
* @Date:2025/2/21 10:02
* @Filename:DeptAndUserEntity
*/
@Data
@TableName("dept_and_user")
public class DeptAndUserEntity {
@TableId(value = "id",type = IdType.ASSIGN_ID)
private String id;
@TableField("dept_id")
private String deptId;
@TableField("user_id")
private String userId;
@TableField(exist = false)
private String userName;
}
package com.ruzhoukj.sms.entity;
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 lombok.Data;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.entity
* @Project:OA
* @name:DeptEntity
* @Date:2025/2/21 9:45
* @Filename:DeptEntity
*/
@Data
@TableName("dept")
public class DeptEntity {
@TableId(value = "id",type = IdType.ASSIGN_ID)
private String id;
@TableField("name")
private String name;
@TableField("dept_admin")
private String deptAdmin;
}
...@@ -79,4 +79,7 @@ public class UserEntity { ...@@ -79,4 +79,7 @@ public class UserEntity {
@TableField("email") @TableField("email")
private String email; private String email;
@TableField("user_role")
private String userRole;
} }
package com.ruzhoukj.sms.model.dto;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import com.ruzhoukj.sms.entity.DeptEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model.dto
* @Project:OA
* @name:DeptDTO
* @Date:2025/2/21 9:54
* @Filename:DeptDTO
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DeptDTO extends DeptEntity {
private Integer pageNum;
private Integer pageSize;
@ApiModelProperty(value = "部门人员")
private List<DeptAndUserEntity> deptUserList;
@ApiModelProperty(value = "当前登陆人")
private String loginUserId;
}
package com.ruzhoukj.sms.model.vo;
import com.ruzhoukj.sms.entity.DeptEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.model.vo
* @Project:OA
* @name:DeptVO
* @Date:2025/2/21 9:59
* @Filename:DeptVO
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DeptVO extends DeptEntity {
}
package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service
* @Project:OA
* @name:DeptAndUserService
* @Date:2025/2/21 10:05
* @Filename:DeptAndUserService
*/
public interface DeptAndUserService extends IService<DeptAndUserEntity> {
/**
*
* @param deptAndUserEntity deptAndUserEntity
* @return List<DeptAndUserEntity>
*/
List<DeptAndUserEntity> queryList(DeptAndUserEntity deptAndUserEntity);
}
package com.ruzhoukj.sms.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import com.ruzhoukj.sms.entity.DeptEntity;
import com.ruzhoukj.sms.model.dto.DeptDTO;
import com.ruzhoukj.sms.model.vo.DeptVO;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service
* @Project:OA
* @name:DeptService
* @Date:2025/2/21 9:51
* @Filename:DeptService
*/
public interface DeptService extends IService<DeptEntity> {
List<DeptVO> queryList(DeptDTO deptDTO);
/**
*
* @param deptDTO deptDTO
* @return boolean
*/
boolean saveOrUpdateDept(DeptDTO deptDTO);
/**
*
* @param deptDTO deptDTO
* @return List<DeptAndUserEntity>
*/
List<DeptAndUserEntity> getDeptUserList(DeptDTO deptDTO);
}
...@@ -17,4 +17,6 @@ import java.util.List; ...@@ -17,4 +17,6 @@ import java.util.List;
*/ */
public interface ReportDataInfoService extends IService<ReportDataInfoEntity> { public interface ReportDataInfoService extends IService<ReportDataInfoEntity> {
List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO); List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO);
void test();
} }
package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.sms.dao.DeptAndUserDao;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import com.ruzhoukj.sms.service.DeptAndUserService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl
* @Project:OA
* @name:DeptAndUserServiceImpl
* @Date:2025/2/21 10:05
* @Filename:DeptAndUserServiceImpl
*/
@Service
public class DeptAndUserServiceImpl extends ServiceImpl<DeptAndUserDao, DeptAndUserEntity> implements DeptAndUserService {
@Override
public List<DeptAndUserEntity> queryList(DeptAndUserEntity deptAndUserEntity) {
return baseMapper.queryList(deptAndUserEntity);
}
}
package com.ruzhoukj.sms.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruzhoukj.sms.common.Constant;
import com.ruzhoukj.sms.dao.DeptDao;
import com.ruzhoukj.sms.entity.DeptAndUserEntity;
import com.ruzhoukj.sms.entity.DeptEntity;
import com.ruzhoukj.sms.entity.UserEntity;
import com.ruzhoukj.sms.model.dto.DeptDTO;
import com.ruzhoukj.sms.model.vo.DeptVO;
import com.ruzhoukj.sms.model.vo.UserVO;
import com.ruzhoukj.sms.service.DeptAndUserService;
import com.ruzhoukj.sms.service.DeptService;
import com.ruzhoukj.sms.service.UserService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author:zhuxiang
* @Package:com.ruzhoukj.sms.service.impl
* @Project:OA
* @name:DeptServiceImpl
* @Date:2025/2/21 9:52
* @Filename:DeptServiceImpl
*/
@Service
public class DeptServiceImpl extends ServiceImpl<DeptDao, DeptEntity> implements DeptService {
@Resource
private UserService userService;
@Resource
private DeptAndUserService deptAndUserService;
@Override
public List<DeptVO> queryList(DeptDTO deptDTO) {
return baseMapper.queryList(deptDTO);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateDept(DeptDTO deptDTO) {
if(deptDTO.getId()!=null){
//删除当前部门人员
deptAndUserService.remove(new LambdaQueryWrapper<DeptAndUserEntity>().eq(DeptAndUserEntity::getDeptId,deptDTO.getId()));
updateById(deptDTO);
//保存部门人员
deptDTO.getDeptUserList().forEach(deptAndUserEntity -> deptAndUserEntity.setDeptId(deptDTO.getId()));
}else{
save(deptDTO);
//保存部门人员
deptDTO.getDeptUserList().forEach(deptAndUserEntity -> {
deptAndUserEntity.setDeptId(deptDTO.getId());
});
deptAndUserService.saveBatch(deptDTO.getDeptUserList());
}
return true;
}
@Override
public List<DeptAndUserEntity> getDeptUserList(DeptDTO deptDTO) {
//查看当前登录用户信息
UserEntity user = userService.getById(deptDTO.getLoginUserId());
DeptAndUserEntity deptAndUserEntity = new DeptAndUserEntity();
if(user.getUserRole().equals(Constant.ADMIN)){
//查询全部用户
return deptAndUserService.queryList(deptAndUserEntity);
}
if(user.getUserRole().equals(Constant.D_ADMIN)){
//查看部门用户
deptAndUserEntity.setDeptId(deptDTO.getId());
return deptAndUserService.queryList(deptAndUserEntity);
}
return Lists.newArrayList();
}
}
package com.ruzhoukj.sms.service.impl; package com.ruzhoukj.sms.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.utils.StringUtils;
import com.ruzhoukj.sms.dao.ReportDataInfoMapper; import com.ruzhoukj.sms.dao.ReportDataInfoMapper;
import com.ruzhoukj.sms.entity.ReportDataInfoEntity; import com.ruzhoukj.sms.entity.ReportDataInfoEntity;
import com.ruzhoukj.sms.model.dto.ReportDataInfoDTO; import com.ruzhoukj.sms.model.dto.ReportDataInfoDTO;
...@@ -24,4 +28,25 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoMapper, ...@@ -24,4 +28,25 @@ public class ReportDataInfoServiceImpl extends ServiceImpl<ReportDataInfoMapper,
public List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO) { public List<ReportDataInfoVO> queryList(ReportDataInfoDTO reportDataInfoDTO) {
return baseMapper.queryList(reportDataInfoDTO); return baseMapper.queryList(reportDataInfoDTO);
} }
@Override
public void test() {
ReportDataInfoEntity reportDataInfoEntity = getById(1);
String content = reportDataInfoEntity.getContent();
//解析json
//污水处理量
JSONArray a = null;
JSONArray b = null;
String e = null;
try {
a = JSON.parseArray(content);
b = (JSONArray) a.get(3);
JSONArray c = (JSONArray) b.get(0);
System.out.println(b);
// JSONObject d = c.getJSONObject(column);
// e = d.getString("m");
} catch (Exception ex) {
}
}
} }
...@@ -20,3 +20,9 @@ mybatis-plus: ...@@ -20,3 +20,9 @@ mybatis-plus:
logging: logging:
level: level:
com.ruzhoukj.sms.dao: debug # 这里的包路径需要指向你的 MyBatis Plus mapper 接口所在的包 com.ruzhoukj.sms.dao: debug # 这里的包路径需要指向你的 MyBatis Plus mapper 接口所在的包
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countSql
\ No newline at end of file
<?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.ruzhoukj.sms.dao.DeptAndUserDao">
<select id="queryList" resultType="com.ruzhoukj.sms.entity.DeptAndUserEntity">
select
dau.user_id userId,
u.name userName
from
dept_and_user dau
left join user u on dau.user_id = u.id
<where>
<if test="deptId != null and deptId != ''">
and dau.dept_id = #{deptId}
</if>
</where>
</select>
</mapper>
<?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.ruzhoukj.sms.dao.DeptDao">
<select id="queryList" resultType="com.ruzhoukj.sms.model.vo.DeptVO">
select
d.id id,
d.name name,
u.name deptAdminName
from
dept d
left join user u on d.dept_admin = u.id
<where>
<if test="deptAdmin != null and deptAdmin !=''">
and dept_admin = #{deptAdmin}
</if>
</where>
</select>
</mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment