employee,filemanager

pom.xml

@@ -242,6 +242,11 @@
			<artifactId>javase</artifactId>
			<version>3.1.0</version>
		</dependency>
		<dependency>
            <groupId>net.coobird</groupId>
            <artifactId>thumbnailator</artifactId>
            <version>0.4.8</version>
        </dependency>
	</dependencies>
	<build>

src/main/java/io/renren/modules/admin/adminmenu/controller/AdminMenuController.java

@@ -0,0 +1,105 @@
package io.renren.modules.admin.adminmenu.controller;
import java.util.Arrays;
import java.util.Map;
import java.util.List;
import java.util.Set;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.adminmenu.entity.AdminMenuEntity;
import io.renren.modules.admin.adminmenu.service.AdminMenuService;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.modules.sys.controller.AbstractController;
import io.renren.modules.sys.service.ShiroService;
/**
 * 管理员菜单管理
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-28 19:20:56
 */
@RestController
@RequestMapping("admin/adminmenu")
public class AdminMenuController extends AbstractController {
    @Autowired
    private AdminMenuService adminMenuService;
    @Autowired
	private ShiroService shiroService;
    /**
     * 导航菜单
     */
    @GetMapping("/nav")
    public R nav(){
        List<AdminMenuEntity> menuList = adminMenuService.getUserMenuList(getUserId());
        Set<String> permissions = shiroService.getUserPermissions(getUserId());
        return R.ok().put("menuList", menuList).put("permissions", permissions);
    }
    /**
     * 列表
     */
    @RequestMapping("/list")
    @RequiresPermissions("admin:adminmenu:list")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = adminMenuService.queryPage(params);
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */
    @RequestMapping("/info/{menuId}")
    @RequiresPermissions("admin:adminmenu:info")
    public R info(@PathVariable("menuId") Long menuId){
		AdminMenuEntity adminMenu = adminMenuService.getById(menuId);
        return R.ok().put("adminMenu", adminMenu);
    }
    /**
     * 保存
     */
    @RequestMapping("/save")
    @RequiresPermissions("admin:adminmenu:save")
    public R save(@RequestBody AdminMenuEntity adminMenu){
		adminMenuService.save(adminMenu);
        return R.ok();
    }
    /**
     * 修改
     */
    @RequestMapping("/update")
    @RequiresPermissions("admin:adminmenu:update")
    public R update(@RequestBody AdminMenuEntity adminMenu){
		adminMenuService.updateById(adminMenu);
        return R.ok();
    }
    /**
     * 删除
     */
    @RequestMapping("/delete")
    @RequiresPermissions("admin:adminmenu:delete")
    public R delete(@RequestBody Long[] menuIds){
		adminMenuService.removeByIds(Arrays.asList(menuIds));
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/adminmenu/dao/AdminMenuDao.java

@@ -0,0 +1,23 @@
package io.renren.modules.admin.adminmenu.dao;
import java.util.List;
import io.renren.modules.admin.adminmenu.entity.AdminMenuEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
/**
 * 管理员菜单管理
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-28 19:20:56
 */
@Mapper
public interface AdminMenuDao extends BaseMapper<AdminMenuEntity> {
	/**
	 * 根据父菜单，查询子菜单
	 * @param parentId 父菜单ID
	 */
	@Select("select * from admin_menu where parent_id = #{parentId} order by order_num asc")
	List<AdminMenuEntity> queryListParentId(Long parentId);
}

src/main/java/io/renren/modules/admin/adminmenu/entity/AdminMenuEntity.java

@@ -0,0 +1,74 @@
package io.renren.modules.admin.adminmenu.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import java.util.List;
/**
 * 管理员菜单管理
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-28 19:20:56
 */
@Data
@TableName("admin_menu")
public class AdminMenuEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 
	 */
	@TableId
	private Long menuId;
	/**
	 * 父菜单ID，一级菜单为0
	 */
	private Long parentId;
	/**
	 * 菜单名称
	 */
	private String name;
	/**
	 * 菜单URL
	 */
	private String url;
	/**
	 * 授权(多个用逗号分隔，如：user:list,user:create)
	 */
	private String perms;
	/**
	 * 类型   0：目录   1：菜单   2：按钮
	 */
	private Integer type;
	/**
	 * 菜单图标
	 */
	private String icon;
	/**
	 * 排序
	 */
	private Integer orderNum;
	/**
	 * 会议目录
	 */
	private Integer me;
	/**
	 * tab
	 */
	private Integer isTab;
	/**
	 * ztree属性
	 */
	@TableField(exist=false)
	private Boolean open;
	@TableField(exist=false)
	private List<?> list;
}

src/main/java/io/renren/modules/admin/adminmenu/service/AdminMenuService.java

@@ -0,0 +1,26 @@
package io.renren.modules.admin.adminmenu.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.adminmenu.entity.AdminMenuEntity;
import java.util.Map;
import java.util.List;
/**
 * 管理员菜单管理
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-28 19:20:56
 */
public interface AdminMenuService extends IService<AdminMenuEntity> {
    PageUtils queryPage(Map<String, Object> params);
    /**
	 * 获取用户菜单列表
	 */
	List<AdminMenuEntity> getUserMenuList(Long userId);
}

src/main/java/io/renren/modules/admin/adminmenu/service/impl/AdminMenuServiceImpl.java

@@ -0,0 +1,95 @@
package io.renren.modules.admin.adminmenu.service.impl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.common.utils.Constant;
import io.renren.modules.admin.adminmenu.dao.AdminMenuDao;
import io.renren.modules.admin.adminmenu.entity.AdminMenuEntity;
import io.renren.modules.admin.adminmenu.service.AdminMenuService;
import io.renren.modules.sys.service.SysUserService;
@Service("adminMenuService")
public class AdminMenuServiceImpl extends ServiceImpl<AdminMenuDao, AdminMenuEntity> implements AdminMenuService {
	@Autowired
	private SysUserService sysUserService;
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        IPage<AdminMenuEntity> page = this.page(
                new Query<AdminMenuEntity>().getPage(params),
                new QueryWrapper<AdminMenuEntity>()
        );
        return new PageUtils(page);
    }
	public List<AdminMenuEntity> queryListParentId(Long parentId, List<Long> menuIdList) {
		List<AdminMenuEntity> menuList = queryListParentId(parentId);
		if(menuIdList == null){
			return menuList;
		}
		
		List<AdminMenuEntity> userMenuList = new ArrayList<>();
		for(AdminMenuEntity menu : menuList){
			if(menuIdList.contains(menu.getMenuId())){
				userMenuList.add(menu);
			}
		}
		return userMenuList;
	}
	public List<AdminMenuEntity> queryListParentId(Long parentId) {
		return baseMapper.queryListParentId(parentId);
	}
	@Override
	public List<AdminMenuEntity> getUserMenuList(Long userId) {
		//系统管理员，拥有最高权限
		if(userId == Constant.SUPER_ADMIN){
			return getAllMenuList(null);
		}
		
		//用户菜单列表
		List<Long> menuIdList = sysUserService.queryAllMenuId(userId);
		return getAllMenuList(menuIdList);
	}
    /**
	 * 获取所有菜单列表
	 */
	private List<AdminMenuEntity> getAllMenuList(List<Long> menuIdList){
		//查询根菜单列表
		List<AdminMenuEntity> menuList = queryListParentId(0L, menuIdList);
		//递归获取子菜单
		getMenuTreeList(menuList, menuIdList);
		
		return menuList;
	}
	/**
	 * 递归
	 */
	private List<AdminMenuEntity> getMenuTreeList(List<AdminMenuEntity> menuList, List<Long> menuIdList){
		List<AdminMenuEntity> subMenuList = new ArrayList<AdminMenuEntity>();
		
		for(AdminMenuEntity entity : menuList){
			//目录
			if(entity.getType() == Constant.MenuType.CATALOG.getValue()){
				entity.setList(getMenuTreeList(queryListParentId(entity.getMenuId(), menuIdList), menuIdList));
			}
			subMenuList.add(entity);
		}
		
		return subMenuList;
	}
}

src/main/java/io/renren/modules/admin/employee/controller/EmployeeController.java

@@ -0,0 +1,182 @@
package io.renren.modules.admin.employee.controller;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.renren.common.annotation.SysLog;
import io.renren.common.utils.Query;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.renren.modules.admin.employee.entity.EmployeeEntity;
import io.renren.modules.admin.employee.service.EmployeeService;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
/**
 * 
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-17 13:38:28
 */
@RestController
@RequestMapping("admin/employee")
public class EmployeeController {
    @Autowired
    private EmployeeService employeeService;
//     /**
//      * 列表
//      */
//    @RequestMapping("/list")
//    @RequiresPermissions("admin:employee:list")
//    public  Map<String,Object> SelectMyPage (Page page,@RequestBody EmployeeEntity employeeEntity){
//        Map<String,Object> map = new HashMap<>();
//        QueryWrapper<EmployeeEntity> queryWrapper = new QueryWrapper<>();
//        if(StrUtil.isNotBlank(employeeEntity.getUsername())){
//            queryWrapper.like("e.username",employeeEntity.getUsername());
//        }
//        if(StrUtil.isNotBlank(employeeEntity.getTruename())){
//            queryWrapper.like("e.truename",employeeEntity.getTruename());
//        }
//        IPage<EmployeeEntity> selectMyPage = employeeService.queryPage(page, queryWrapper);
//        map.put("page",selectMyPage);
//        return map ;
//     }
    /**
     * 列表
     */
    @RequestMapping("/listtest")
    @RequiresPermissions("admin:employee:list")
    public R listtest(@RequestParam Map<String, Object> params){
        String key = (String) params.get("key");
        int p = Integer.valueOf(params.get("page").toString());
        int limit = Integer.valueOf(params.get("limit").toString());
        PageUtils page = employeeService.queryList(p,limit, key);
        return R.ok().put("page",page);
    }
    /**
     * findAll
     */
    @RequestMapping("/findAllByisDel/{is_del}")
    @RequiresPermissions("admin:employee:findAllByisDel")
    public List<EmployeeEntity> findAllByisDel(@PathVariable("is_del") int isDel){
        List<EmployeeEntity> employeeEntityList = employeeService.findAllByisDel(isDel);
        return  employeeEntityList;
    }
    /**
     * 信息
     */
    @RequestMapping("/info/{id}")
    @RequiresPermissions("admin:employee:info")
    public R info(@PathVariable("id") Long id){
		EmployeeEntity employee = employeeService.getById(id);
        return R.ok().put("employee", employee);
    }
    /**
     * 保存
     */
    @RequestMapping("/save")
    @RequiresPermissions("admin:employee:save")
    public R save(@RequestBody EmployeeEntity employee){
//        Date date = new Date();
////        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
////        String format = dateFormat.format(date);
        //创建时间
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss");
        java.util.Date time = null;
        try {
            time= sdf.parse(sdf.format(new Date()));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        employee.setCreateTime(time);
		employeeService.save(employee);
        return R.ok();
    }
    /**
     * 修改
     */
    @RequestMapping("/update")
    @RequiresPermissions("admin:employee:update")
    public R update(@RequestBody EmployeeEntity employee){
        //修改时间
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss");
        java.util.Date time = null;
        try {
            time= sdf.parse(sdf.format(new Date()));
        } catch (ParseException e) {
            e.printStackTrace();
        }
        employee.setModifyTime(time);
		employeeService.updateById(employee);
        return R.ok();
    }
//    /**
//     * 删除
//     */
//    @RequestMapping("/delete")
//    @RequiresPermissions("admin:employee:delete")
//    public R delete(@RequestBody Long[] ids){
//		employeeService.removeByIds(Arrays.asList(ids));
//
//        return R.ok();
//    }
    /**
     * 删除
     */
    @RequestMapping("/delete/{id}")
    @RequiresPermissions("admin:employee:delete")
    public R delete(@PathVariable("id") Long id){
		//employeeService.removeByIds(Arrays.asList(ids));
        boolean flag = employeeService.delete(id);
        if(flag){
            R.ok("逻辑删除成功");
        }
        return R.ok();
    }
    /**
     * 重置密码
     */
    @SysLog("修改密码")
    @PostMapping("/password/{id}")
    @RequiresPermissions("admin:employee:password")
    public R password(@PathVariable("id") Long id){
        boolean flag = employeeService.updatePasswordByid(id);
        if(flag){
            return  R.ok("重置密码成功");
        }
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/employee/dao/EmployeeDao.java

@@ -0,0 +1,35 @@
package io.renren.modules.admin.employee.dao;
import io.renren.modules.admin.employee.entity.EmployeeEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
/**
 * 
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-17 13:38:28
 */
@Mapper
public interface EmployeeDao extends BaseMapper<EmployeeEntity> {
	List<EmployeeEntity> findAllByisDel(int isDel);
    boolean updatePasswordByid(Long id);
    boolean delete(Long id);
    //多表联查 + 分页
    @Select("select e.id,e.truename,e.username,e.password,e.phone,e.email,e.create_time,e.modify_time,e.is_del,c.companyname " +
            " from employee e left JOIN company c on e.company_id = c.id" +
            " where e.is_del = 0 AND (e.truename like '%${key}%' or e.username like '%${key2}%') limit #{page},#{limit}")
    List<Map<String,Object>> queryListBykey(int page, int limit, String key,String key2);
    @Select("select count(*) from employee where is_del=0 and (truename like '%${key}%' or username like '%${key2}%')")
    Integer queryTotalCount(String key,String key2);
//    IPage<EmployeeEntity> selectMyPage(Page page, Wrapper<EmployeeEntity> queryWrapper);
}

src/main/java/io/renren/modules/admin/employee/entity/EmployeeEntity.java

@@ -0,0 +1,185 @@
package io.renren.modules.admin.employee.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 
 * 
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-17 13:38:28
 */
@Data
@TableName("employee")
public class EmployeeEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 员工id (员工表)
	 */
	@TableId
	private Long id;
	/**
	 * 账号
	 */
	private String username;
	/**
	 * 密码
	 */
	private String password;
	/**
	 * 姓名
	 */
	private String truename;
	/**
	 * 单位id
	 */
	private Long companyId;
	/**
	 * 角色id（控制权限）
	 */
	private Long roleId;
	/**
	 * 部门id
	 */
	private Long departmentId;
	/**
	 * 职位id
	 */
	private Long positionId;
	/**
	 * 联系电话
	 */
	private String phone;
	/**
	 * 邮箱
	 */
	private String email;
	/**
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 修改时间
	 */
	private Date modifyTime;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	@TableLogic
	private Integer isDel;
	public static long getSerialVersionUID() {
		return serialVersionUID;
	}
	public Long getId() {
		return id;
	}
	public void setId(Long id) {
		this.id = id;
	}
	public String getUsername() {
		return username;
	}
	public void setUsername(String username) {
		this.username = username;
	}
	public String getPassword() {
		return password;
	}
	public void setPassword(String password) {
		this.password = password;
	}
	public String getTruename() {
		return truename;
	}
	public void setTruename(String truename) {
		this.truename = truename;
	}
	public Long getCompanyId() {
		return companyId;
	}
	public void setCompanyId(Long companyId) {
		this.companyId = companyId;
	}
	public Long getRoleId() {
		return roleId;
	}
	public void setRoleId(Long roleId) {
		this.roleId = roleId;
	}
	public Long getDepartmentId() {
		return departmentId;
	}
	public void setDepartmentId(Long departmentId) {
		this.departmentId = departmentId;
	}
	public Long getPositionId() {
		return positionId;
	}
	public void setPositionId(Long positionId) {
		this.positionId = positionId;
	}
	public String getPhone() {
		return phone;
	}
	public void setPhone(String phone) {
		this.phone = phone;
	}
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	public Date getCreateTime() {
		return createTime;
	}
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	public Date getModifyTime() {
		return modifyTime;
	}
	public void setModifyTime(Date modifyTime) {
		this.modifyTime = modifyTime;
	}
	public Integer getIsDel() {
		return isDel;
	}
	public void setIsDel(Integer isDel) {
		this.isDel = isDel;
	}
}

src/main/java/io/renren/modules/admin/employee/service/EmployeeService.java

@@ -0,0 +1,37 @@
package io.renren.modules.admin.employee.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.employee.entity.EmployeeEntity;
import javafx.scene.control.Pagination;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
 * 
 *
 * @author chenshun
 * @email sunlightcs@gmail.com
 * @date 2020-02-17 13:38:28
 */
public interface EmployeeService extends IService<EmployeeEntity> {
    PageUtils queryPage(Map<String, Object> params);
    List<EmployeeEntity> findAllByisDel(int isDel);
    boolean updatePasswordByid(Long id);
    boolean delete(Long id);
    //多表联查 + 分页
   PageUtils queryList(int page,int limit,String key);
}

src/main/java/io/renren/modules/admin/employee/service/impl/EmployeeServiceImpl.java

@@ -0,0 +1,70 @@
package io.renren.modules.admin.employee.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javafx.scene.control.Pagination;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.admin.employee.dao.EmployeeDao;
import io.renren.modules.admin.employee.entity.EmployeeEntity;
import io.renren.modules.admin.employee.service.EmployeeService;
@Service("employeeService")
public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity> implements EmployeeService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String key = (String) params.get("key");
        IPage<EmployeeEntity> page = this.page(
                new Query<EmployeeEntity>().getPage(params),
                new QueryWrapper<EmployeeEntity>()
                .like(StringUtils.isNotBlank(key),"username",key)
                        .or()
                .like(StringUtils.isNotBlank(key),"truename",key)
        );
        return new PageUtils(page);
    }
    @Override
    public List<EmployeeEntity> findAllByisDel(int isDel) {
        return  baseMapper.findAllByisDel(isDel);
    }
    @Override
    public boolean updatePasswordByid(Long id) {
        return baseMapper.updatePasswordByid(id);
    }
    @Override
    public boolean delete(Long id) {
        return baseMapper.delete(id);
    }
    @Override
    public PageUtils queryList(int page, int limit, String key) {
        System.out.println(page);
        System.out.println(limit);
        System.out.println(key);
        List<Map<String, Object>> mList = baseMapper.queryListBykey(page, limit, key, key);
       int total = baseMapper.queryTotalCount(key, key);
        return new PageUtils(mList,total,limit,page);
    }
//    @Override
//    public IPage<EmployeeEntity> selectMyPage(Page page, Wrapper<EmployeeEntity> queryWrapper) {
//        return baseMapper.selectMyPage(page,queryWrapper);
//    }
}

src/main/java/io/renren/modules/admin/meeting/controller/MeetingController.java

@@ -43,6 +43,19 @@ public class MeetingController {
        return R.ok().put("page", page);
    }
    /**
     * 列表2
     */
    @RequestMapping("/listtest")
    @RequiresPermissions("admin:meeting:list")
    public R listtest(@RequestParam Map<String, Object> params){
        String key = (String) params.get("key");
        int p = Integer.valueOf(params.get("page").toString());
        int l = Integer.valueOf(params.get("limit").toString());
        PageUtils page = meetingService.queryList(p, l, key);
        return R.ok().put("page", page);
    }
    /**
     * 信息

src/main/java/io/renren/modules/admin/meeting/dao/MeetingDao.java

@@ -1,9 +1,14 @@
package io.renren.modules.admin.meeting.dao;
import io.renren.modules.admin.meeting.entity.MeetingEntity;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.Select;
/**
 * 会议表
@@ -16,4 +21,10 @@ import org.apache.ibatis.annotations.Update;
public interface MeetingDao extends BaseMapper<MeetingEntity> {
	@Update("update meeting set is_check=#{isCheck} where id=#{id}")
    int updateStatus(Long id, Integer isCheck);
    @Select("select m.id,c.companyname,m.name_cn,m.address,m.start_time from meeting as m left JOIN company as c on m.company_id = c.id where m.is_del = 0 and (m.name_cn LIKE '%${key}%' or m.name_en LIKE '%${key2}%') limit #{page},#{limit} ")
    List<Map<String, Object>> queryCN(int page, int limit, String key, String key2);
    @Select("select count(*) from meeting  where is_del = 0 and (name_cn LIKE '%${key}%' or name_en LIKE '%${key2}%')")
    Integer queryCNCOUNTS(String key, String key2);
}

src/main/java/io/renren/modules/admin/meeting/service/MeetingService.java

@@ -15,7 +15,12 @@ import java.util.Map;
 */
public interface MeetingService extends IService<MeetingEntity> {
    PageUtils queryPage(Map<String, Object> params);
	PageUtils queryPage(Map<String, Object> params);
	
		/**
	 * 	带单位分页
	 */
	PageUtils queryList(int page, int limit, String key);
    /**
	 * 删除用户(逻辑删除)

src/main/java/io/renren/modules/admin/meeting/service/impl/MeetingServiceImpl.java

@@ -2,6 +2,7 @@ package io.renren.modules.admin.meeting.service.impl;
import org.springframework.stereotype.Service;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,6 +28,17 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
        return new PageUtils(page);
    }
    @Override
    public PageUtils queryList(int page, int limit, String key) {
        System.out.println(page);
        System.out.println(limit);
        System.out.println(key);
        List<Map<String, Object>> mList=baseMapper.queryCN(page, limit, key, key);
        Integer mc = baseMapper.queryCNCOUNTS(key, key);
        return new PageUtils(mList, mc, limit, page);
    }
    @Override
    public void delete(Long[] ids) {
        baseMapper.deleteBatchIds(Arrays.asList(ids));

src/main/java/io/renren/modules/sys/controller/FileManagerController.java

@@ -0,0 +1,222 @@
package io.renren.modules.sys.controller;
import java.io.File;
import java.io.IOException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import io.renren.common.utils.R;
import net.coobird.thumbnailator.Thumbnails;
/**
 * Captcha by huwhois time 2019/11/22
 */
@RestController
@RequestMapping("/sys/filemanager")
@Configuration
public class FileManagerController {
    @Value("${file.datapath}")
    private String dataPath; // 读取配置文件中的指定目录
    @Value("${file.uploadFolder}")
    private String uploadFolder; // 读取配置文件中的指定目录
    @PostMapping("/uploadimg")
    public R uploadImage(@RequestParam(value = "upload_file") MultipartFile file, HttpServletRequest request) throws IOException {
        boolean isthumb = false;
        String thumb = request.getParameter("isthumb");
        if (thumb != null && thumb != "" && thumb.equals("1")) {
            isthumb = true;
        }
        // 根据相对路径转化为真实路径
        // String rootpath = request.getSession().getServletContext().getRealPath(File.separator);// 获得web应用的绝对路径
        // File createFile = new File(rootpath + "../data/upload/");
        String useUploadPath;   // 文件上传使用的目录
        String activePath = request.getParameter("activepath"); 
        if (activePath != null && activePath != "") {
            // 上传到指定目录
            useUploadPath = activePath + "/";
        } else {
            // 使用配置文件中的指定上传目录与当前年月新建文件夹
            LocalDateTime ldt = LocalDateTime.now();
            String today = ldt.format(DateTimeFormatter.BASIC_ISO_DATE);
            useUploadPath = uploadFolder  + "/" + today + "/";
        }
        // System.out.println(useUploadPath);
        String picDir = dataPath + useUploadPath;   // 文件绝对路径
        File createFile = new File(picDir);
        if (!createFile.exists()) {// 判断文件是否存在如果不存在则自动创建文件夹
            createFile.mkdir();
        }
        // System.out.println(picDir);
        String fileOldName = file.getOriginalFilename();
        // 上传的图片只允许是 png、jpg 或 gif 中的格式
        if (file.getOriginalFilename().contains(".png") || file.getOriginalFilename().contains(".jpg") || file.getOriginalFilename().contains(".gif")) {
            String uuid = UUID.randomUUID().toString().replace("-", "");// 随机生成一个唯一性的id 文件不重名
            String suffix = fileOldName.substring(fileOldName.lastIndexOf(".") + 1);
            String newFilename = uuid + "." + suffix;
            File f = new File(picDir + newFilename);
            if (f.exists()) {//上传的文件已经存在,则提示用户重新上传 apk 或者重命名
                return R.error("上传的文件已经存在,则提示用户重新上传 apk 或者重命名");
            } else {
                Map<String, Object> result = new HashMap<String, Object>();
                file.transferTo(f); // 将上传的文件写入到系统中
                if (isthumb) {
                    String thumbFilaname = uuid + "_200." + suffix;
                    Thumbnails.of(picDir + newFilename).width(200).toFile(picDir + thumbFilaname);
                    result.put("thumb", useUploadPath + thumbFilaname);
                }
                result.put("picname", useUploadPath + newFilename);
             
                return  R.ok(result);
            }
        } else {
            return R.error("上传文件失败");
        }
    }
    /*
     * 读取指定路径下的文件名和目录名
     */
    @RequestMapping("/list")
    public R list(HttpServletRequest request) {
        Map<String, Object> result = new HashMap<String, Object>();
        String activepath = request.getParameter("activepath");
        // System.out.println(activepath);
        String dir = "";
        if (activepath!=null && activepath!="") {
            dir = activepath;
        }
        File file = new File(dataPath + dir);
        // System.out.println(dataPath +  dir);
        File[] fileList = file.listFiles();
        ArrayList<String> dList = new ArrayList<>();
        ArrayList<Map<String, Object>> fList = new ArrayList<>();
        for (int i = 0; i < fileList.length; i++) {
            if (fileList[i].isDirectory()) {
                String fileName = fileList[i].getName();
                dList.add(fileName);
                // System.out.println("文件：" + fileName);       
                // System.out.println(fileName);     
            }
            
            if (fileList[i].isFile()) {
                File ifile = fileList[i];
                String fileName = ifile.getName();
                String suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
                long size = ifile.length();
                long time = ifile.lastModified();
                // Map<String, Object> ofile = new HashMap<>();
                Map<String, Object> ofile = new HashMap<String, Object>();
                ofile.put("fileName", fileName);
                ofile.put("suffix", suffix);
                ofile.put("size", size);
                ofile.put("time", time);
                
                fList.add(ofile);
                // System.out.println("文件：" + fileName);       
                // System.out.println(fileName);       
            }
        }
        result.put("fList", fList);
        result.put("dList", dList);
        result.put("activepath", dir);
        // System.out.println(dir);
        return R.ok(result);
    }
    /**
	 * 删除文件
	 * 
	 * @param pathname
	 * @return
	 * @throws IOException
	 */
	public static boolean deleteFile(String pathname){
		boolean result = false;
		File file = new File(pathname);
		if (file.exists()) {
			file.delete();
			result = true;
		}
		return result;
    }
    
    /**
	 * 删除目录
	 * 
	 * @param pathname
	 * @return
	 * @throws IOException
	 */
	public static boolean deleteDir(String pathname){
		boolean result = false;
		File dir = new File(pathname);
		if (dir.exists()) {
            File[] files = dir.listFiles();
            if (null == files) {
                dir.delete();
                result = true;
            }
		}
		return result;
    }
    @PostMapping("/delete")
    public R deleteFile(String activePath, String fileName){
        boolean result = false;
        String dir = "";
        if (activePath!=null || activePath!="") {
            dir = activePath;
        }
        
        String pathname = dataPath + dir + "/" + fileName;
        // System.out.println(pathname);
        File file = new File(pathname);
        if (!file.exists()) {
            return R.error(1, "文件or文件夹不存在");
        }
        if (file.isDirectory()) {
            File[] files = file.listFiles();
            if (null != files) {
                for (File f : files) {
                    if (f.exists()) {
                        f.delete();
                    }
                }
            }
            result = file.delete();
        }
        
        if (file.isFile()) {
            result = file.delete();
        }
        
        if (!result) {
            return R.error("删除失败");
        }
        return R.ok();
    }
}

src/main/java/io/renren/modules/sys/controller/SysConfigController.java

@@ -8,7 +8,6 @@
package io.renren.modules.sys.controller;
import io.renren.common.annotation.SysLog;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;

src/main/resources/application-dev.yml

@@ -33,7 +33,6 @@ spring:
                    config:
                        multi-statement-allow: true
##多数据源的配置
#dynamic:
#  datasource:
@@ -47,3 +46,8 @@ spring:
#      url: jdbc:postgresql://localhost:5432/renren_security
#      username: renren
#      password: 123456
## 图片文件目录配置
file:
    datapath: /web/static
    uploadFolder: /uploads