5

src/main/java/com/ekexiu/console/service/Upload.java

@@ -0,0 +1,196 @@
package com.ekexiu.console.service;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.concurrent.atomic.AtomicReference;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
import org.jfw.util.web.fileupload.Item;
import org.jfw.util.web.fileupload.UploadItemIterator;
public class Upload {
	public static final int ERROR_NO_FOUND_SUFFIX = JfwBaseException.MIN_APP_ERROR_CODE + 1;
	public static final int ERROR_INVALID_SUFFIX = JfwBaseException.MIN_APP_ERROR_CODE + 2;
	public static final int ERROR_INVALID_SIZE = JfwBaseException.MIN_APP_ERROR_CODE + 3;
	// public static final int ERROR_NO_FOUND_SUFFIX =
	// JfwBaseException.MIN_APP_ERROR_CODE+1;
	private File path;
	private String validSuffix;
	private boolean includeSuffix;
	private long maxSize = Long.MAX_VALUE;
	private long rate = 24 * 60 * 60 * 1000;
	private int buffSize = 8092;
	private AtomicReference<String> lastPathWithCreate = new AtomicReference<String>(null);
	public int getBuffSize() {
		return buffSize;
	}
	public void setBuffSize(int buffSize) {
		this.buffSize = buffSize;
	}
	public long getRate() {
		return rate;
	}
	public void setRate(long rate) {
		this.rate = rate;
	}
	public File getPath() {
		return path;
	}
	public void setPath(File path) {
		this.path = path;
	}
	public String getValidSuffix() {
		return validSuffix;
	}
	public void setValidSuffix(String validSuffix) {
		this.validSuffix = validSuffix;
	}
	public boolean isIncludeSuffix() {
		return includeSuffix;
	}
	public void setIncludeSuffix(boolean includeSuffix) {
		this.includeSuffix = includeSuffix;
	}
	public long getMaxSize() {
		return maxSize;
	}
	public void setMaxSize(long maxSize) {
		this.maxSize = maxSize;
	}
	public void setUploadPath(File path) {
		this.path = path;
	}
	private void checkSuffix(String ext) throws JfwBaseException {
		if (ext == null) {
			if (this.includeSuffix) {
				throw new JfwBaseException(ERROR_NO_FOUND_SUFFIX, "upload file no found suffix");
			}
		} else {
			if (null != this.validSuffix && this.validSuffix.indexOf("," + ext + ",") < 0) {
				throw new JfwBaseException(ERROR_INVALID_SUFFIX, "upload file suffix  invalid");
			}
		}
	}
	public UploadItem upload(UploadItemIterator it) throws IOException, JfwBaseException {
		while (it.hasNext()) {
			Item item = it.next();
			if (!item.isFormField()) {
				String fn = item.getName();
				String ext = null;
				int index = fn.lastIndexOf('.');
				if (index >= 0) {
					ext = fn.substring(index + 1);
					if (ext.length() == 0) {
						ext = null;
					}
				}
				this.checkSuffix(ext);
				UploadItem ui = new UploadItem();
				ui.setName(fn);
				String uri = this.findValidUri(ext);
				File dest = new File(this.path, uri);
				while (dest.exists()) {
					uri = this.findValidUri(ext);
					dest = new File(this.path, uri);
				}
				FileOutputStream os = new FileOutputStream(dest);
				try {
					byte[] buf = new byte[this.buffSize];
					InputStream in = item.getInputStream();
					long size = 0;
					try {
						int len = 0;
						while ((len = in.read(buf)) >= 0) {
							if (len > 0) {
								os.write(buf, 0, len);
								size += len;
								if (size > this.maxSize) {
									throw new JfwBaseException(ERROR_INVALID_SIZE, "upload file size is larger");
								}
							}
						}
						ui.setSize(size);
						ui.setUri(uri);
						return ui;
					} finally {
						IoUtil.close(in);
					}
				} finally {
					IoUtil.close(os);
				}
			}
		}
		return null;
	}
	private String findValidUri(String ext) throws IOException {
		StringBuilder sb = new StringBuilder();
		sb.append(Long.toHexString(System.currentTimeMillis() / this.rate));
		String p = sb.toString();
		if (!p.equals(lastPathWithCreate.get())) {
			File cp = new File(this.path, p);
			if (!cp.exists()) {
				if (!cp.mkdirs()) {
					throw new IOException("create path[" + cp.getAbsolutePath() + "] error");
				}
			} else if (cp.isFile()) {
				throw new IOException("create path[" + cp.getAbsolutePath() + "] error,exists same name file");
			}
			lastPathWithCreate.set(p);
		}
		sb.append("/").append(Long.toBinaryString(System.nanoTime()));
		if (ext != null)
			sb.append(".").append(ext);
		return sb.toString();
	}
	public static class UploadItem {
		private String name;
		private String uri;
		private long size;
		public String getName() {
			return name;
		}
		public void setName(String name) {
			this.name = name;
		}
		public String getUri() {
			return uri;
		}
		public void setUri(String uri) {
			this.uri = uri;
		}
		public long getSize() {
			return size;
		}
		public void setSize(long size) {
			this.size = size;
		}
	}
}

src/main/java/com/ekexiu/console/system/dao/UserDao.java

@@ -11,19 +11,24 @@ import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.PageQueryResult;
import com.ekexiu.console.system.po.User;
@DAO
public interface UserDao {
	
	@Insert
	int insert(Connection con,User user)throws SQLException;
	int insert(Connection con, User user) throws SQLException;
	@Nullable
	@SelectOne
@@ -56,4 +61,9 @@ public interface UserDao {
	@UpdateWith
	int dsiable(Connection con, String id) throws SQLException;
	@PageSelect
	public PageQueryResult<User> pageQuery(Connection con, @Nullable @Like String name, @Nullable Boolean actived, @Nullable String mobile,
			@Nullable String email, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageNo, int pageSize)
			throws SQLException;
}

src/main/java/com/ekexiu/console/system/service/DictService.java

@@ -166,15 +166,7 @@ public class DictService {
		}
		// TODO : check dictItem.system == true can't modify
		LinkedList<DictItem> ret = new LinkedList<DictItem>();
		if (di.isTree()) {
			if (transfer(items, ret) == null) {
				throw new JfwBaseException(50003, "not exists parentCode or loop parentCode");
			}
		} else {
			for (ListIterator<EditDictItem> it = items.listIterator(); it.hasNext();) {
				ret.add(transfer(it.next()));
			}
		}
		this.transfer(items,ret);
		final AtomicBoolean ab = new AtomicBoolean(false);
		final String val = JsonService.toJson(items);
		JdbcUtil.executeAutoCommit(con, new JdbcTask() {
@@ -216,37 +208,18 @@ public class DictService {
	}
	public LinkedList<DictItem> transfer(List<EditDictItem> src, LinkedList<DictItem> dest) {
		Map<String, EditDictItem> map = new HashMap<String, EditDictItem>();
		for (EditDictItem eitem : src) {
			map.put(eitem.getCode(), eitem);
		}
		LinkedList<String> removeCodes = new LinkedList<String>();
		for (;;) {
			for (String code : removeCodes) {
				map.remove(code);
			}
			removeCodes.clear();
			for (Map.Entry<String, EditDictItem> entry : map.entrySet()) {
				String code = entry.getKey();
				EditDictItem eitem = entry.getValue();
				String pc = eitem.getParentCode();
				if (pc == null || pc.length() == 0) {
					removeCodes.add(code);
					dest.add(transfer(eitem));
				} else {
					DictItem item = query(dest, pc);
					if (item != null) {
						removeCodes.add(code);
						item.getChildren().add(transfer(eitem));
					}
				}
			}
			if (removeCodes.size() == map.size())
				return dest;
			if (removeCodes.isEmpty()) {
				return null;
		for(ListIterator<EditDictItem> it = src.listIterator();it.hasNext();){
			EditDictItem edi = it.next();
			DictItem id = transfer(edi);
			dest.add(id);
			LinkedList<EditDictItem> child = edi.getChildren();
			if(null!= child && child.size()>0){
				LinkedList<DictItem> ldi =new LinkedList<DictItem>();
				id .setChildren(ldi);
				transfer(child,ldi);
			}
		}
		return dest;
	}
	public DictItem transfer(EditDictItem eitem) {

src/main/java/com/ekexiu/console/system/service/UserService.java

@@ -1,19 +1,29 @@
package com.ekexiu.console.system.service;
import java.io.File;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.method.InvalidSession;
import org.jfw.apt.web.annotation.method.SetSession;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.FieldParam;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.auth.AuthUtil;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.web.fileupload.UploadItemIterator;
import com.ekexiu.console.service.Upload;
import com.ekexiu.console.system.dao.RoleDao;
import com.ekexiu.console.system.dao.UserDao;
import com.ekexiu.console.system.po.Role;
@@ -21,13 +31,24 @@ import com.ekexiu.console.system.po.User;
import com.ekexiu.console.system.vo.ConsoleAuthUser;
@Path("/sys/user")
public class UserService {
public class UserService extends Upload {
	public static final String DEFAULT_AUTH_STR=AuthUtil.serialAuth(new int[]{0});
	public static final String DEFAULT_PW_STR=StringUtil.md5("12345678");
	private File headPath;
	@Autowrie
	private UserDao userDao;
	@Autowrie
	RoleDao roleDao;
	public File getHeadPath() {
		return headPath;
	}
	public void setHeadPath(File headPath) {
		this.headPath = headPath;
	}
	public RoleDao getRoleDao() {
		return roleDao;
	}
@@ -56,7 +77,7 @@ public class UserService {
			cau.setName(user.getName());
			ArrayList<int[]> list = new ArrayList<int[]>(1);
			list.add(AuthUtil.deSerialAuth(user.getAuthinfo()));
			for(Role role:this.roleDao.queryByUser(con,user.getId())){
			for (Role role : this.roleDao.queryByUser(con, user.getId())) {
				list.add(AuthUtil.deSerialAuth(role.getAuthinfo()));
			}
			cau.setAuths(AuthUtil.merge(list.toArray(new int[0][0])));
@@ -64,12 +85,54 @@ public class UserService {
		}
		return null;
	}
	@Get
	@Path("/logout")
	@InvalidSession
	public void logout(){		
	public void logout() {
	}
	public static void main(String[] args) throws Exception {
		System.out.println(AuthUtil.serialAuth(new int[] { 0 }));
	}
	@Get
	@Path("/pq")
	public PageQueryResult<User> pageQuery(@JdbcConn Connection con, @Nullable String name, @Nullable Boolean actived, @Nullable String mobile,
			@Nullable String email, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)
			throws SQLException {
		if (bt != null)
			bt = bt + "000000";
		if (et != null)
			et = et + "235959";
		PageQueryResult<User> ret = this.userDao.pageQuery(con, name, actived, mobile, email, bt, et, pageNo, pageSize);
		for (User u : ret.getData()) {
			u.setLoginPassword(null);
			u.setAuthinfo(null);
		}
		return ret;
	}
	@Post
	@Path
	public void insert(@JdbcConn(true) Connection con,
			@RequestParam(fields = { @FieldParam(value = "name", valueClass = String.class, required = true),
					@FieldParam(value = "email", valueClass = String.class, required = true),
					@FieldParam(value = "mobile", valueClass = String.class, required = false),
					@FieldParam(value = "descp", valueClass = String.class, required = false),
					@FieldParam(value="head",valueClass=String.class,required=false)}) User user)
			throws SQLException {
		String id = StringUtil.buildUUID();
		user.setId(id);
		user.setActived(true);
		user.setAuthinfo(DEFAULT_AUTH_STR);
		user.setLoginPassword(DEFAULT_PW_STR);
		this.userDao.insert(con, user);
	}
	public static void main(String[] args)throws Exception{
		System.out.println(AuthUtil.serialAuth(new int[]{0}));
	@Post
	@Path("/head")
	public Upload.UploadItem head(@org.jfw.apt.web.annotation.param.Upload UploadItemIterator it) throws JfwBaseException, IOException {
		return this.upload(it);
	}
}

src/main/java/com/ekexiu/console/system/vo/EditDictItem.java

@@ -1,15 +1,16 @@
package com.ekexiu.console.system.vo;
import java.util.HashMap;
import java.util.LinkedList;
public class EditDictItem {
	private String code;
	private String parentCode;
	private String caption;
	private String shortCode;
	private boolean enabled;
	private HashMap<String,String> data = new HashMap<String,String>();
    private boolean system;
    private LinkedList<EditDictItem> children;
    private String descp ;
    
	public String getCode() {
@@ -18,12 +19,7 @@ public class EditDictItem {
	public void setCode(String code) {
		this.code = code;
	}
	public String getParentCode() {
		return parentCode;
	}
	public void setParentCode(String parentCode) {
		this.parentCode = parentCode;
	}
	public String getCaption() {
		return caption;
	}
@@ -60,5 +56,10 @@ public class EditDictItem {
	public void setDescp(String descp) {
		this.descp = descp;
	}
	
	public LinkedList<EditDictItem> getChildren() {
		return children;
	}
	public void setChildren(LinkedList<EditDictItem> children) {
		this.children = children;
	}
}