..

src/main/java/io/renren/common/utils/ExcelUtils.java

@@ -1,7 +1,6 @@
package io.renren.common.utils;
import javax.servlet.http.HttpServletResponse;
import java.awt.*;
import java.io.OutputStream;
import java.util.List;

src/main/java/io/renren/modules/admin/controller/AttendersController.java

@@ -50,7 +50,7 @@ public class AttendersController {
    @RequiresPermissions("admin:attenders:list")
    public R list(@RequestParam Map<String, Object> params) {
        PageUtils page = attendersService.queryPage(params);
        
        return R.ok().put("page", page);
    }

src/main/java/io/renren/modules/admin/dao/AttendersDao.java

@@ -18,6 +18,15 @@ import org.apache.ibatis.annotations.Select;
 */
@Mapper
public interface AttendersDao extends BaseMapper<AttendersEntity> {
    // @Select("SELECT a.id, m.truename, m.organization, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_ispay FROM  payment p WHERE p.attenders.id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND () limit #{page},#{limit};")
    // List<Map<String, Object>> getMapList(Long meetingId, String truename, String organization, String servicerName, int page, int limit);
    // @Select("SELECT count(*) ")
    // int getCounts(Long meetingId, String truename, String organization, String servicerName);
    @Select("SELECT a.id, m.truename, m.organization, m.position, m.job_title as jobTitle, m.phone, m.email, (select t.name from types_of_attenders t where t.id=a.type_id) as typeName, (SELECT p.is_ispay FROM  payment p WHERE p.attenders.id=a.id) as isPay  FROM attenders a JOIN member m ON a.member_id=m.id WHERE a.is_del=0 AND a.meeting_id=#{meetingId}")
    List<Map<String, Object>> getMapList(Long meetingId);
    @Select("SELECT a.id as aid,a.meeting_id,m.name_cn FROM attenders a JOIN meeting m ON a.meeting_id=m.id WHERE a.member_id=#{memberId} ORDER BY a.id;")
    List<Map<String, Object>> getMeetingListByMemberId(Long memberId);
@@ -26,7 +35,4 @@ public interface AttendersDao extends BaseMapper<AttendersEntity> {
    @Select("SELECT a.id,m.truename,m.organization,m.position,m.job_title as jobTitle,m.phone,m.email,m.officephone,a.type_id typeId,(select t.name from types_of_attenders t where t.id=a.type_id) as typeName FROM attenders a JOIN member m ON a.member_id=m.id where a.is_del=0 AND a.id=#{aid}")
    Map<String, Object> getMapById(Long aid);
    @Select("SELECT a.id,m.truename,m.organization,m.position,m.job_title as jobTitle,m.phone,m.email,(select t.name from types_of_attenders t where t.id=a.type_id) as typeName FROM attenders a JOIN member m ON a.member_id=m.id where a.is_del=0 AND a.meeting_id=#{meetingId}")
    List<Map<String, Object>> getMapList(Long meetingId);
}

src/main/java/io/renren/modules/admin/entity/AttendersEntity.java

@@ -44,11 +44,11 @@ public class AttendersEntity implements Serializable {
	/**
	 * 职位
	 */
	private Long positionId;
	private String position;
	/**
	 * 职称
	 */
	private Long jobTitle;
	private String jobTitle;
	/**
	 * 电话
	 */

src/main/java/io/renren/modules/admin/service/impl/AttendersServiceImpl.java

@@ -3,6 +3,8 @@ package io.renren.modules.admin.service.impl;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -15,7 +17,6 @@ import io.renren.modules.admin.dao.AttendersDao;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.service.AttendersService;
@Service("attendersService")
public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEntity> implements AttendersService {
@@ -28,9 +29,34 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
                .like(StringUtils.isNotBlank(name),"name",name)
        );
        List<AttendersEntity> theList = page.getRecords();
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
        for (AttendersEntity attenders : theList) {
            Map<String, Object> map = new HashMap<String, Object>();
            Long aid = attenders.getId();
            map.put("id", aid);
            map.put("id", aid);
            map.put("id", aid);
            map.put("id", aid);
            map.put("id", aid);
            map.put("id", aid);
            map.put("id", aid);
        }
        return new PageUtils(page);
    }
    // @Override
    // public PageUtils myQueryPage(Map<String, Object> params) {
        
    //     List<Map<String, Object>> list = baseMapper.getMapList();
    //     return new PageUtils();
    // }
    @Override
    public List<Map<String, Object>> getMeetingListByMemberId(Long memberId){
        return baseMapper.getMeetingListByMemberId(memberId);

src/main/java/io/renren/modules/admin/service/impl/MemberServiceImpl.java

@@ -1,7 +1,6 @@
package io.renren.modules.admin.service.impl;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;

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

@@ -42,59 +42,42 @@ public class FileManagerController {
    @PostMapping("/uploadimg")
    public R uploadImage(@RequestParam(value = "upload_file") MultipartFile file, HttpServletRequest request)
            throws IOException {
        boolean isthumb = false;
        boolean isThumb = false;
        String thumb = request.getParameter("isthumb");
        if (thumb != null && thumb != "" && thumb.equals("1")) {
            isthumb = true;
            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.equals("")) {
            // 上传到指定目录
            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.getOriginalFilename().contains(".gif")) {
            Map<String, Object> resultSave = saveFile(file, activePath, false);
            
            if (Integer.valueOf((String) resultSave.get("status")) != 0) {
                return R.error((String) resultSave.get("msg"));
            }
                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);
            String filename = (String) resultSave.get("filename");
                return R.ok(result);
            Map<String, Object> result = new HashMap<String, Object>();
            result.put("picname", filename);
            if (isThumb) {
                int dot = filename.lastIndexOf(".");
                if ((dot >-1) && (dot < (filename.length()))) {
                    String suffix = filename.substring(dot + 1);
                    String thumbFilaname = filename.substring(0, dot)+ "_200." + suffix; 
                    Thumbnails.of(dataPath + filename).width(200).toFile(dataPath + filename);
                    result.put("thumb", thumbFilaname);
                }
            }
            
            return R.ok(result);
        } else {
            return R.error("上传文件失败");
        }
@@ -342,4 +325,61 @@ public class FileManagerController {
        }
        return list;
    }
    
    private Map<String, Object> saveFile(MultipartFile file) {
        return saveFile(file, "", false);   // 使用当前年月日目录,uuid新文件名
    }
    private Map<String, Object> saveFile(MultipartFile file, String desDir, 
        Boolean useOldname) {
        Map<String, Object> result = new HashMap<String, Object>();
        if (!file.isEmpty()) {
            try {
                String useUploadPath = "";
                if (desDir != null && !desDir.equals("")) {
                    useUploadPath = desDir + "/";
                } else {
                    // 使用配置文件中的指定上传目录与当前年月新建目录
                    LocalDateTime ldt = LocalDateTime.now();
                    String today = ldt.format(DateTimeFormatter.BASIC_ISO_DATE);
                    useUploadPath = uploadFolder + "/" + today + "/";
                }
                String absolutePath = dataPath + useUploadPath; // 目录绝对路径
                // 判断目录是否存在, 如果不存在则自动创建目录
                File createFile = new File(absolutePath);
                if (!createFile.exists()) {
                    createFile.mkdir();
                }
                String newFilename = "";
                String fileOldName = file.getOriginalFilename();
                String suffix = fileOldName.substring(fileOldName.lastIndexOf(".") + 1);
                if (useOldname) {
                    newFilename = fileOldName;
                } else {
                    String uuid = UUID.randomUUID().toString().replace("-", "");// 随机生成一个唯一性的id 文件不重名
                    newFilename = uuid + "." + suffix;
                }
                File f = new File(absolutePath + newFilename);
                if (f.exists()) {
                    result.put("status", 1);  // 上传的文件已经存在,则提示用户重新上传图片或者重命名
                    result.put("msg", "上传的文件已经存在,则提示用户重新上传图片或者重命名");  // 上传的文件已经存在,则提示用户重新上传图片或者重命名
                } else {
                    file.transferTo(f); // 将上传的文件写入到系统中
                    result.put("status", 0);
                    result.put("filename", useUploadPath + newFilename);
                }
            } catch (Exception e) {
                e.printStackTrace();
                result.put("status", 2);
                result.put("msg", e.getMessage());
            }
        }
        return result;
    }
}