Skip to content

Commit

Permalink
0.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
snakerflow committed Jan 14, 2015
1 parent 32f6c06 commit 42ee3fd
Showing 56 changed files with 1,319 additions and 1,112 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<packaging>war</packaging>

<properties>
<snaker.version>2.3.0</snaker.version>
<snaker.version>2.5.1</snaker.version>
<spring.version>3.1.3.RELEASE</spring.version>
<hibernate.version>3.5.5-Final</hibernate.version>
<shiro.version>1.2.1</shiro.version>
2 changes: 0 additions & 2 deletions src/main/java/com/snakerflow/app/modules/entity/Borrow.java
Original file line number Diff line number Diff line change
@@ -36,14 +36,12 @@ public Double getAmount() {
public void setAmount(Double amount) {
this.amount = amount;
}
@Column(name = "operateTime")
public String getOperateTime() {
return operateTime;
}
public void setOperateTime(String operateTime) {
this.operateTime = operateTime;
}
@Column(name = "repaymentDate")
public String getRepaymentDate() {
return repaymentDate;
}
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@
import java.util.Map;
import java.util.TreeMap;

import com.snakerflow.framework.config.service.DictionaryManager;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.snakerflow.framework.dictionary.IDictionary;
import com.snakerflow.framework.web.TagBuilder;
import com.snakerflow.framework.web.TagDTO;
import org.springframework.stereotype.Component;
@@ -113,9 +113,9 @@ private void dataProcess(TagDTO dto) {
values.add(value);
}
}
IDictionary dictionary = springContext.getBean(IDictionary.class);
if(dictionary != null) {
items = dictionary.getByName(configName);
DictionaryManager dictionaryManager = springContext.getBean(DictionaryManager.class);
if(dictionaryManager != null) {
items = dictionaryManager.getByName(configName);
}
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.snakerflow.framework.dictionary.dao;
package com.snakerflow.framework.config.dao;

import com.snakerflow.framework.dictionary.entity.Dictionary;
import com.snakerflow.framework.config.entity.Dictionary;
import com.snakerflow.framework.orm.hibernate.HibernateDao;
import org.springframework.stereotype.Component;

15 changes: 15 additions & 0 deletions src/main/java/com/snakerflow/framework/config/dao/FieldDao.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.snakerflow.framework.config.dao;


import com.snakerflow.framework.config.entity.Field;
import com.snakerflow.framework.orm.hibernate.HibernateDao;
import org.springframework.stereotype.Component;

/**
* 表单字段持久化类
* @author yuqs
* @since 0.1
*/
@Component
public class FieldDao extends HibernateDao<Field, Long> {
}
14 changes: 14 additions & 0 deletions src/main/java/com/snakerflow/framework/config/dao/FormDao.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.snakerflow.framework.config.dao;

import com.snakerflow.framework.config.entity.Form;
import com.snakerflow.framework.orm.hibernate.HibernateDao;
import org.springframework.stereotype.Component;

/**
* 表单持久化类
* @author yuqs
* @since 0.1
*/
@Component
public class FormDao extends HibernateDao<Form, Long> {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.snakerflow.framework.dictionary.entity;
package com.snakerflow.framework.config.entity;

import java.util.ArrayList;
import java.util.List;
@@ -51,7 +51,7 @@ public List<DictionaryItem> getDictionaryItems() {
public void setDictionaryItems(List<DictionaryItem> dictionaryItems) {
this.dictionaryItems = dictionaryItems;
}
@Column(name = "cnName", nullable = false, length = 200)
@Column(name = "cn_name", nullable = false, length = 200)
public String getCnName() {
return cnName;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.snakerflow.framework.dictionary.entity;
package com.snakerflow.framework.config.entity;

import java.io.Serializable;

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.snakerflow.framework.dictionary.entity;
package com.snakerflow.framework.config.entity;

import org.codehaus.jackson.annotate.JsonIgnore;

89 changes: 89 additions & 0 deletions src/main/java/com/snakerflow/framework/config/entity/Field.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
package com.snakerflow.framework.config.entity;

import javax.persistence.*;
import java.io.Serializable;

/**
* 表单字段实体类
* @author yuqs
* @since 0.1
*/
@Entity
@Table(name = "DF_FIELD")
public class Field implements Serializable {
private static final long serialVersionUID = -1;
public static final String FLOW = "1";
private long id;
private String name;
private String plugins;
private String title;
private String type;
private String flow;
private String tableName;
private long formId = 0;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
public long getId() {
return id;
}

public void setId(long id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getPlugins() {
return plugins;
}

public void setPlugins(String plugins) {
this.plugins = plugins;
}

public String getTitle() {
return title;
}

public void setTitle(String title) {
this.title = title;
}

public String getType() {
return type;
}

public void setType(String type) {
this.type = type;
}

public String getFlow() {
return flow;
}

public void setFlow(String flow) {
this.flow = flow;
}

public String getTableName() {
return tableName;
}

public void setTableName(String tableName) {
this.tableName = tableName;
}

public long getFormId() {
return formId;
}

public void setFormId(long formId) {
this.formId = formId;
}
}
97 changes: 97 additions & 0 deletions src/main/java/com/snakerflow/framework/config/entity/Form.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
package com.snakerflow.framework.config.entity;

import javax.persistence.*;
import java.io.Serializable;

/**
* 表单实体类
* @author yuqs
* @since 0.1
*/
@Entity
@Table(name = "DF_FORM")
public class Form implements Serializable {
private static final long serialVersionUID = -1;
private long id;
private String name;
private String displayName;
private String type;
private String creator;
private String createTime;
private String originalHtml;
private String parseHtml;
private int fieldNum = 0;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
public long getId() {
return id;
}

public void setId(long id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getDisplayName() {
return displayName;
}

public void setDisplayName(String displayName) {
this.displayName = displayName;
}

public String getType() {
return type;
}

public void setType(String type) {
this.type = type;
}

public String getCreator() {
return creator;
}

public void setCreator(String creator) {
this.creator = creator;
}

public String getCreateTime() {
return createTime;
}

public void setCreateTime(String createTime) {
this.createTime = createTime;
}

public String getOriginalHtml() {
return originalHtml;
}

public void setOriginalHtml(String originalHtml) {
this.originalHtml = originalHtml;
}

public String getParseHtml() {
return parseHtml;
}

public void setParseHtml(String parseHtml) {
this.parseHtml = parseHtml;
}

public int getFieldNum() {
return fieldNum;
}

public void setFieldNum(int fieldNum) {
this.fieldNum = fieldNum;
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package com.snakerflow.framework.dictionary.service;
package com.snakerflow.framework.config.service;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;

import org.hibernate.SQLQuery;
import com.snakerflow.framework.dictionary.dao.DictionaryDao;
import com.snakerflow.framework.dictionary.entity.Dictionary;
import com.snakerflow.framework.dictionary.entity.DictionaryItem;
import com.snakerflow.framework.config.dao.DictionaryDao;
import com.snakerflow.framework.config.entity.Dictionary;
import com.snakerflow.framework.config.entity.DictionaryItem;
import com.snakerflow.framework.orm.Page;
import com.snakerflow.framework.orm.PropertyFilter;
import org.springframework.beans.factory.annotation.Autowired;
@@ -94,4 +97,19 @@ public List<DictionaryItem> getItemsByName(String name) {
query.addEntity(DictionaryItem.class);
return query.list();
}

/**
* 根据字典名称,获取配置字典数据对象
* @param name
* @return Map<String, String> 选项主键ID、选项名称的字典映射集合
*/
public Map<String, String> getByName(String name) {
List<DictionaryItem> items = getItemsByName(name);
if(items == null || items.isEmpty()) return Collections.emptyMap();
Map<String, String> dicts = new TreeMap<String, String>();
for(DictionaryItem item : items) {
dicts.put(item.getCode(), item.getName());
}
return dicts;
}
}
Loading

0 comments on commit 42ee3fd

Please sign in to comment.