init2

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

@@ -0,0 +1,39 @@
package com.ekexiu.console.system.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import com.ekexiu.console.system.po.Dict;
@DAO
public interface DictDao {
	@SelectList
	List<Dict> queryAlll(Connection con)throws SQLException;
	
	@Nullable
	@QueryVal
	@Column(value="ITEM",handlerClass=StringHandler.class)
	@From(Dict.class)
	String queryItem(Connection con,String code)throws SQLException;
	
	@UpdateWith
	@From(Dict.class)
	int update(Connection con,String code,@Set String item)throws SQLException;
	
	@DeleteWith
	@From(Dict.class)
	int delete(Connection con,String code)throws SQLException;
}

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

@@ -0,0 +1,44 @@
package com.ekexiu.console.system.dao;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
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.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.util.PageQueryResult;
import com.ekexiu.console.system.po.Organization;
@DAO
public interface OrgDao {
	@Insert
	int insert(Connection con, Organization org) throws SQLException;
	@Update
	int update(Connection con, Organization org) throws SQLException;
	@DeleteWith
	@From(Organization.class)
	int delete(Connection con, String id) throws SQLException;
	@Nullable
	@SelectOne
	Organization query(Connection con, String id) throws SQLException;
	@PageSelect
	@OrderBy(" ORDER BY ID")
	PageQueryResult<Organization> query(Connection con, @Nullable @Like String name, @Nullable String type, @GtEq @Nullable @Alias("createTime") String bt,
			@LtEq @Nullable @Alias("createTime") String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -38,6 +38,6 @@ public interface RoleDao {
	List<Role> query(Connection con)throws SQLException;
	@SelectList
	List<Role> queryByUser(Connection con , @SqlColumn(handlerClass=StringHandler.class,value="id in (SELECT ROLEID FROM USER_ROLE WHERE USER_ID=?")  String userid) throws SQLException;
	List<Role> queryByUser(Connection con , @SqlColumn(handlerClass=StringHandler.class,value="id in (SELECT ROLEID FROM USER_ROLE WHERE USERID=?)")  String userid) throws SQLException;
	
}

src/main/java/com/ekexiu/console/system/po/Dict.java

@@ -0,0 +1,54 @@
package com.ekexiu.console.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("code")
@Table
public class Dict {
	private String code;
	private String caption;
	private String descp;
	private boolean readonly;
	private String item;
	
	@Column(DE.string_de)
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	@Column(DE.string_de)
	public String getCaption() {
		return caption;
	}
	public void setCaption(String caption) {
		this.caption = caption;
	}
	@Column(DE.Text_de)
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	@Column(DE.boolean_de)
	public boolean isReadonly() {
		return readonly;
	}
	public void setReadonly(boolean readonly) {
		this.readonly = readonly;
	}
	@Column(DE.Text_de)
	public String getItem() {
		return item;
	}
	public void setItem(String item) {
		this.item = item;
	}
	
}

src/main/java/com/ekexiu/console/system/po/Organization.java

@@ -0,0 +1,62 @@
package com.ekexiu.console.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.console.basepo.CreateTimeSupported;
import com.ekexiu.console.basepo.DescpSupported;
import com.ekexiu.console.basepo.ModifyTimeSupported;
@PrimaryKey("id")
@Table
public class Organization implements CreateTimeSupported,ModifyTimeSupported,DescpSupported{
	
	private String id;
	private String name;
	private String type;
	private String createTime;
	private String modifyTime;
	private String descp;
	
	@Column(DE.id_32)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.string_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.singleChar)
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	public String getModifyTime() {
		return modifyTime;
	}
	public void setModifyTime(String modifyTime) {
		this.modifyTime = modifyTime;
	}
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	
}

src/main/java/com/ekexiu/console/system/po/UserConfig.java

@@ -27,7 +27,7 @@ public class UserConfig {
	public void setCfkey(String cfkey) {
		this.cfkey = cfkey;
	}
	@Column(DE.string_de)
	@Column(DE.text_de)
	public String getCfval() {
		return cfval;
	}

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

@@ -0,0 +1,219 @@
package com.ekexiu.console.system.service;
import java.lang.reflect.Type;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import javax.swing.event.ListSelectionEvent;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.json.JsonService;
import org.jfw.util.reflect.TypeReference;
import com.ekexiu.console.system.dao.DictDao;
import com.ekexiu.console.system.po.Dict;
import com.ekexiu.console.system.vo.DictInfo;
import com.ekexiu.console.system.vo.DictItem;
import com.ekexiu.console.system.vo.EditDictItem;
@Path("/sys/dict")
public class DictService {
	private final static Type LINKEDLIST_EDITDICTITEM_TYPE = new TypeReference<List<EditDictItem>>() {
	}.getType();
	private AtomicReference<Map<String, DictInfo>> dicts = new AtomicReference<Map<String, DictInfo>>();
	private Map<String, AtomicReference<LinkedList<DictItem>>> items = new HashMap<String, AtomicReference<LinkedList<DictItem>>>();
	@Autowrie
	private DictDao dictDao;
	public DictDao getDictDao() {
		return dictDao;
	}
	public void setDictDao(DictDao dictDao) {
		this.dictDao = dictDao;
	}
	@Get
	@Path("/all")
	public List<DictInfo> getAll() {
		Collection<DictInfo> ds = this.dicts.get().values();
		ArrayList<DictInfo> ret = new ArrayList<DictInfo>(ds.size());
		ret.addAll(ds);
		return ret;
	}
	
	@Get
	@Path("/code/{code}")
	public DictInfo get(@PathVar String code)
	{
		return this.dicts.get().get(code);
	}
	
	
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con,  @RequestBody List<EditDictItem> items) throws SQLException, JfwBaseException {
		LinkedList<DictItem> ret = new LinkedList<DictItem>();
	//	if()
		
	}
	// public static List
	public DictItem queryItem(String dictCode, String itemCode) {
		AtomicReference<LinkedList<DictItem>> aitems = this.items.get(dictCode);
		if (null != aitems) {
			LinkedList<DictItem> ims = aitems.get();
			if (ims != null && ims.size() > 0) {
				return query(ims, itemCode);
			}
		}
		return null;
	}
	private DictItem query(LinkedList<DictItem> items, String code) {
		for (ListIterator<DictItem> it = items.listIterator(); it.hasNext();) {
			DictItem item = it.next();
			if (item.getCode().equals(code))
				return item;
			LinkedList<DictItem> citems = item.getChildren();
			if (citems.size() > 0) {
				item = query(citems, code);
				if (null != item)
					return item;
			}
		}
		return null;
	}
	
	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;
			}
		}
		// while(map.size()>0){
		// boolean added = false;
		// 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){
		// added = true;
		// map.remove(code);
		// dest.add(transfer(eitem));
		// break;
		// }else{
		// DictItem item = query(dest,pc);
		// if(item!=null){
		// added=true;
		// item.getChildren().add(transfer(eitem));
		// map.remove(code);
		// break;
		// }
		// }
		// }
		// if(!added) break;
		// }
		// return dest;
	}
	public DictItem transfer(EditDictItem eitem) {
		DictItem item = new DictItem();
		item.setCaption(eitem.getCaption());
		item.setCode(eitem.getCode());
		item.setData(eitem.getData());
		item.setEnabled(eitem.isEnabled());
		item.setShortCode(eitem.getShortCode());
		item.setSystem(eitem.isSystem());
		return item;
	}
	private LinkedList<DictItem> transfer(String s) {
		LinkedList<DictItem> ret = new LinkedList<DictItem>();
		if (s == null || s.length() == 0 || s.equals("[]")) {
			return ret;
		}
		try {
			List<EditDictItem> list = JsonService.fromJson(s, LINKEDLIST_EDITDICTITEM_TYPE);
			if (null == transfer(list, ret)) {
				// TODO:: // log not exists parentCode or loop parentCode
			} 
		} catch (Exception e) {
			// TODO: ///// log json parse exception
		}
		return ret;
	}
	private synchronized void init(List<Dict> list) {
		if(null!= this.dicts.get()) return;		
		Map<String, DictInfo> map = new HashMap<String, DictInfo>();
		for (Dict dict : list) {
			map.put(dict.getCode(), new DictInfo(dict));
			AtomicReference<LinkedList<DictItem>> ar = new AtomicReference<LinkedList<DictItem>>(transfer(dict.getItem()));
			this.items.put(dict.getCode(), ar);
		}
		this.dicts.set(map);
	}
	private void update(Dict dict) {
		Map<String, DictInfo> map = new HashMap<String, DictInfo>();
		map.putAll(this.dicts.get());
		map.remove(dict.getCode());
		map.put(dict.getCode(), new DictInfo(dict));
		this.dicts.set(map);
	}
	
	
}

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

@@ -0,0 +1,66 @@
package com.ekexiu.console.system.service;
import java.sql.Connection;
import java.sql.SQLException;
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.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.console.system.dao.OrgDao;
import com.ekexiu.console.system.po.Organization;
@Path("/sys/org")
public class OrgService {
	@Autowrie
	private OrgDao orgDao;
	public OrgDao getOrgDao() {
		return orgDao;
	}
	public void setOrgDao(OrgDao orgDao) {
		this.orgDao = orgDao;
	}
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "createTime", "modifyTime", "id" }) Organization orgn)
			throws SQLException {
		String id = StringUtil.buildUUID();
		orgn.setId(id);
		this.orgDao.insert(con, orgn);
		return id;
	}
	@Put
	@Path
	public void update(@JdbcConn(true) Connection con,@RequestBody Organization orgn)throws SQLException{
		this.orgDao.update(con, orgn);
	}
	@Get
	@Path("/pq")
	public PageQueryResult<Organization> pageQuery(@JdbcConn Connection con,@Nullable String name,@Nullable String type,@Nullable String bt,@Nullable String et,@DefaultValue("1") int pageNo,@DefaultValue("10") int pageSize)throws SQLException{
		return this.orgDao.query(con, name, type, bt, et, pageSize, pageNo);
	}
	
	@Get
	@Path("/id/{id}")
	public Organization query(@JdbcConn Connection con,@PathVar String id)throws SQLException{
		return this.orgDao.query(con, id);
	}
	
}

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

@@ -7,6 +7,7 @@ import java.util.ArrayList;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.method.SetSession;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.StringUtil;
import org.jfw.util.auth.AuthUtil;
@@ -43,6 +44,7 @@ public class UserService {
	@SetSession("JFW_SESSION_LOGIN_USER=result")
	@Path("/login")
	@Post
	public ConsoleAuthUser login(@JdbcConn Connection con, String key, String pw) throws SQLException {
		User user = userDao.queryByLoginKey(con, key);
		if (user != null && StringUtil.md5(pw).equals(user.getLoginPassword()) && user.isActived()) {
@@ -60,4 +62,7 @@ public class UserService {
		}
		return null;
	}
	public static void main(String[] args)throws Exception{
		System.out.println(AuthUtil.serialAuth(new int[]{0}));
	}
}

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

@@ -0,0 +1,46 @@
package com.ekexiu.console.system.vo;
import com.ekexiu.console.system.po.Dict;
public class DictInfo {
	private String code;
	private String caption;
	private String descp;
	private boolean readonly;
	
	
	
	public DictInfo(){}
	public DictInfo(Dict dict){
		this.code = dict.getCode();
		this.caption = dict.getCaption();
		this.descp = dict.getDescp();
		this.readonly = dict.isReadonly();
	}
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getCaption() {
		return caption;
	}
	public void setCaption(String caption) {
		this.caption = caption;
	}
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	public boolean isReadonly() {
		return readonly;
	}
	public void setReadonly(boolean readonly) {
		this.readonly = readonly;
	}
	
	
}

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

@@ -0,0 +1,57 @@
package com.ekexiu.console.system.vo;
import java.util.HashMap;
import java.util.LinkedList;
public class DictItem {
	private String code;
	private String caption;
	private String shortCode;
	private boolean enabled;
	private boolean system;
	private HashMap<String,String> data = new HashMap<String,String>();
	private LinkedList<DictItem> children = new LinkedList<DictItem>();
	
	public String getCode() {
		return code;
	}
	public void setCode(String code) {
		this.code = code;
	}
	public String getCaption() {
		return caption;
	}
	public void setCaption(String caption) {
		this.caption = caption;
	}
	public String getShortCode() {
		return shortCode;
	}
	public void setShortCode(String shortCode) {
		this.shortCode = shortCode;
	}
	public boolean isEnabled() {
		return enabled;
	}
	public void setEnabled(boolean enabled) {
		this.enabled = enabled;
	}
	public LinkedList<DictItem> getChildren() {
		return children;
	}
	public void setChildren(LinkedList<DictItem> children) {
		this.children = children;
	}
	public HashMap<String, String> getData() {
		return data;
	}
	public void setData(HashMap<String, String> data) {
		this.data = data;
	}
	public boolean isSystem() {
		return system;
	}
	public void setSystem(boolean system) {
		this.system = system;
	}
}

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

@@ -0,0 +1,64 @@
package com.ekexiu.console.system.vo;
import java.util.HashMap;
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 String descp ;
    
	public String getCode() {
		return code;
	}
	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;
	}
	public void setCaption(String caption) {
		this.caption = caption;
	}
	public String getShortCode() {
		return shortCode;
	}
	public void setShortCode(String shortCode) {
		this.shortCode = shortCode;
	}
	public boolean isEnabled() {
		return enabled;
	}
	public void setEnabled(boolean enabled) {
		this.enabled = enabled;
	}
	public HashMap<String, String> getData() {
		return data;
	}
	public void setData(HashMap<String, String> data) {
		this.data = data;
	}
	public boolean isSystem() {
		return system;
	}
	public void setSystem(boolean system) {
		this.system = system;
	}
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	
}