mynav

src/main/java/io/renren/modules/app/controller/AppRegisterController.java

@@ -60,7 +60,7 @@ public class AppRegisterController {
        //表单校验
        ValidatorUtils.validateEntity(user, AddGroup.class);
        userService.saveMember(user);
        userService.saveUser(user);
        return R.ok();
    }

src/main/java/io/renren/modules/app/controller/AppTestController.java

@@ -30,12 +30,12 @@ import org.springframework.web.bind.annotation.RestController;
@Api("APP测试接口")
public class AppTestController {
    @Login
    @GetMapping("userInfo")
    @ApiOperation("获取用户信息")
    public R userInfo(@LoginUser UserEntity user){
        return R.ok().put("user", user);
    }
    // @Login
    // @GetMapping("userInfo")
    // @ApiOperation("获取用户信息")
    // public R userInfo(@LoginUser UserEntity user){
    //     return R.ok().put("user", user);
    // }
    @Login
    @GetMapping("userId")

src/main/java/io/renren/modules/app/controller/OrderController.java

@@ -0,0 +1,20 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * OrderController
 */
public class OrderController {
    
    
}

src/main/java/io/renren/modules/app/controller/UserController.java

@@ -0,0 +1,54 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Date;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * APP测试接口
 *
 * @author Mark sunlightcs@gmail.com
 */
@RestController
@RequestMapping("/app/user")
@Api("个人中心接口")
public class UserController {
    @Autowired
    private UserService userService;
    @Login
    @GetMapping("/userInfo")
    @ApiOperation("获取用户信息")
    public R userInfo(@LoginUser UserEntity user){
        return R.ok().put("user", user);
    }
    /**
     * 修改
     */
    @Login
    @PostMapping("/update")
    @ApiOperation("修改")
    public R update(@RequestBody UserEntity user){
    
        user.setModifyTime(new Date());
		userService.updateById(user);
        return R.ok();
    }
}

src/main/java/io/renren/modules/app/entity/OrderEntity.java

@@ -0,0 +1,80 @@
package io.renren.modules.app.entity;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-03-06 11:27:30
 */
@Data
public class OrderEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 缴费信息id
	 */
	private Long id;
	/**
	 * 订单编号
	 */
	private Long orderId;
	/**
	 * 公司id
	 */
	private Long companyId;
	/**
	 * 参会人员id
	 */
	private Long attenderId;
	/**
	 * 缴费时间
	 */
	private Date payTime;
	/**
	 * 缴费方式
	 */
	private Integer payType;
	/**
	 * 缴费项目
	 */
	private String payOption;
	/**
	 * 金额
	 */
	private BigDecimal money;
	/**
	 * 发票抬头
	 */
	private String taxTitle;
	/**
	 * 纳税人税号
	 */
	private String taxNumber;
	/**
	 * 地址 电话
	 */
	private String addrPhone;
	/**
	 * 开户行及账号
	 */
	private String bankAddrAccount;
	/**
	 * 邮寄地址
	 */
	private String taxAddress;
	/**
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	private Integer isDel;
}

src/main/java/io/renren/modules/app/entity/UserEntity.java

@@ -90,4 +90,8 @@ public class UserEntity implements Serializable {
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 创建时间
	 */
	private Date modifyTime;
}

src/main/java/io/renren/modules/app/service/UserService.java

@@ -33,5 +33,5 @@ public interface UserService extends IService<UserEntity> {
	 * 用户注册
	 * @param user
	 */
	public void saveMember(UserEntity user);
	public void saveUser(UserEntity user);
}

src/main/java/io/renren/modules/app/service/impl/UserServiceImpl.java

@@ -48,7 +48,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
	@Override
	@Transactional
    public void saveMember(UserEntity user){
    public void saveUser(UserEntity user){
        user.setCreateTime(new Date());
        //sha256加密
		String salt = RandomStringUtils.randomAlphanumeric(20);

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

@@ -2,6 +2,8 @@ package io.renren.modules.sys.controller;
import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
@@ -110,50 +112,59 @@ public class FileManagerController {
        // System.out.println(dataPath +  dir);
        File[] fileList = file.listFiles();
        // ArrayList<String> dList = new ArrayList<>();
        ArrayList<String> resultList = new ArrayList<>();
        // ArrayList<Map<String, Object>> fList = new ArrayList<>();
        ArrayList<Map<String, Object>> resultList = new ArrayList<>();
        Map<String, Object> rfile = new HashMap<String, Object>();
        for (int i = 0; i < fileList.length; i++) {
            if (fileList[i].isDirectory()) {
                String fileName = fileList[i].getName();
                long time = fileList[i].lastModified();
                Map<String, Object> dfile = new HashMap<String, Object>();
                dfile.put('fileName', fileName);
                dfile.put("modifyTime", time);
                // dList.add(fileName);
                resultList.add(dfile);
                // 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("modifyTime", time);
                
                // fList.add(ofile);
                resultList.add(ofile);
                // System.out.println("文件：" + fileName);       
                // System.out.println(fileName);       
            File ifile = fileList[i];
            String fileName = ifile.getName();
            long time = fileList[i].lastModified();
            SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); //设置格式
            String modifyTime=format.format(time);   //获得带格式的字符串
            String suffix = "";
            String size = "";
            if (ifile.isFile()) {
                suffix = fileName.substring(fileName.lastIndexOf(".") + 1);
                long s = ifile.length();
                size = sizeBKM(s);
            }
            rfile.put("fileName", fileName);
            rfile.put("suffix", suffix);
            rfile.put("size", size);
            rfile.put("modifyTime", modifyTime);
            resultList.add(rfile);
  
        }
        // result.put("fList", fList);
        // result.put("dList", dList);
        result.put("resultList", resultList);
        result.put("activepath", dir);
        // System.out.println(dir);
        return R.ok(result);
    }
    public String sizeBKM(long filesize) {
        String size = "";
        if (filesize > 1024) {
            DecimalFormat decimalFormat = new DecimalFormat(".00");//构造方法的字符格式这里如果小数不足2位,会以0补足.
            Double lsize = filesize / 1024d;
            if (lsize > 1024) {
                lsize = lsize/1024;
            
                size = decimalFormat.format(lsize) + "M";
            } else {
                size = decimalFormat.format(lsize) + "K";
            }
        } else {
            size = filesize + "B";
        }
        return size;
    }
    /**
	 * 删除文件
	 * 
@@ -227,4 +238,4 @@ public class FileManagerController {
        }
        return R.ok();
    }
}
}

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

@@ -46,6 +46,15 @@ public class SysMenuController extends AbstractController {
		return R.ok().put("menuList", menuList).put("permissions", permissions);
	}
	
	@GetMapping("/mynav")
	public R mynav(){
		Long meetingMenuId = 76L;
		List<SysMenuEntity> meetingMenuList = sysMenuService.getUserMenuList(getUserId(), meetingMenuId);
		List<SysMenuEntity> noMeetingMenuList = sysMenuService.getUserNotParentIdMenuList(getUserId(), meetingMenuId);
		Set<String> permissions = shiroService.getUserPermissions(getUserId());
		return R.ok().put("meetingMenuList", meetingMenuList).put("noMeetingMenuList", noMeetingMenuList).put("permissions", permissions);
	}
	/**
	 * 所有菜单列表
	 */

src/main/java/io/renren/modules/sys/dao/SysMenuDao.java

@@ -32,5 +32,4 @@ public interface SysMenuDao extends BaseMapper<SysMenuEntity> {
	 * 获取不包含按钮的菜单列表
	 */
	List<SysMenuEntity> queryNotButtonList();
}

src/main/java/io/renren/modules/sys/service/SysMenuService.java

@@ -45,6 +45,16 @@ public interface SysMenuService extends IService<SysMenuEntity> {
	 */
	List<SysMenuEntity> getUserMenuList(Long userId);
	/**
	 * 根据父ID获取用户菜单列表
	 */
	List<SysMenuEntity> getUserMenuList(Long userId, Long parentId);
	/**
	 * 排除父id获取用户菜单列表
	 */
	List<SysMenuEntity> getUserNotParentIdMenuList(Long userId, Long parentId);
	/**
	 * 删除
	 */

src/main/java/io/renren/modules/sys/service/impl/SysMenuServiceImpl.java

@@ -105,4 +105,69 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
		
		return subMenuList;
	}
	@Override
	public List<SysMenuEntity> getUserMenuList(Long userId, Long parentId) {
		//系统管理员，拥有最高权限
		if(userId == Constant.SUPER_ADMIN){
			//查询根菜单列表
			List<SysMenuEntity> menuList = queryListParentId(parentId);
			//递归获取子菜单
			getMenuTreeList(menuList, null);
			
			return menuList;
			// return getAllMenuList(null);
		}
		
		//用户菜单列表
		List<Long> menuIdList = sysUserService.queryAllMenuId(userId);
		//查询根菜单列表
		List<SysMenuEntity> menuList = queryListParentId(parentId, menuIdList);
		//递归获取子菜单
		getMenuTreeList(menuList, menuIdList);
		
		return menuList;
	}
	@Override
	public List<SysMenuEntity> getUserNotParentIdMenuList(Long userId, Long parentId) {
		//系统管理员，拥有最高权限
		if(userId == Constant.SUPER_ADMIN){
			//查询根菜单列表 第一遍父菜单id 为0
			List<SysMenuEntity> menuList = queryListParentId(0L);
			//递归获取子菜单
			getNotThatParentIdMenuTreeList(menuList, null, parentId);
			
			return menuList;
			// return getAllMenuList(null);
		}
		//用户菜单列表
		List<Long> menuIdList = sysUserService.queryAllMenuId(userId);
		//查询根菜单列表 第一遍父菜单id 为0
		List<SysMenuEntity> menuList = queryListParentId(0L, menuIdList);
		//递归获取子菜单
		getNotThatParentIdMenuTreeList(menuList, menuIdList, parentId);
		return menuList;
	}
/**
	 * 递归
	 */
	private List<SysMenuEntity> getNotThatParentIdMenuTreeList(List<SysMenuEntity> menuList, List<Long> menuIdList, Long parentId){
		List<SysMenuEntity> subMenuList = new ArrayList<SysMenuEntity>();
		
		for(SysMenuEntity entity : menuList){
			//目录
			if(entity.getType() == Constant.MenuType.CATALOG.getValue() && entity.getMenuId() != parentId){
				entity.setList(getMenuTreeList(queryListParentId(entity.getMenuId(), menuIdList), menuIdList));
			}
			subMenuList.add(entity);
		}
		
		return subMenuList;
	}
}