Skip to content

D
drp
Commit 1c97167c authored by sdcsyyg's avatar sdcsyyg
Browse files
Options

Merge branch 'refine-code-to-support-maven' into 'master' 

Refine code to support maven

See merge request !1
parents fedcc25d 18c52bf0
Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 205 deletions
pom.xml
View file @ 1c97167c
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.originspark.drp</groupId> <groupId>com.originspark.drp</groupId>
<artifactId>drp</artifactId> <artifactId>drp</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<name>drp Maven Webapp</name> <name>drp Maven Webapp</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<dependencies> <properties>
<dependency> <junit.version>4.11</junit.version>
<groupId>javax.servlet</groupId> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<artifactId>javax.servlet-api</artifactId> <jdk.version>1.7</jdk.version>
<version>3.0.1</version> <hibernate.version>4.2.0.Final</hibernate.version>
<scope>provided</scope> <mysql.connector.version>5.1.21</mysql.connector.version>
</dependency> <spring.version>3.2.2.RELEASE</spring.version>
<dependency> </properties>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<!-- spring mvc -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>3.2.13.RELEASE</version>
</dependency>
<!-- jpa -->
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
<version>1.0.1.Final</version>
</dependency>
<!-- hibernate -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>4.1.4.Final</version>
</dependency>
<!-- mysql -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.34</version>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate3</artifactId>
<version>2.2.3</version>
</dependency>
<!-- log4j -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.10</version>
</dependency>
<!-- commons -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
<!-- poi -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>3.9</version>
</dependency>
</dependencies>
<build> <dependencies>
<finalName>drp</finalName> <dependency>
<plugins> <groupId>javax.servlet</groupId>
<plugin> <artifactId>javax.servlet-api</artifactId>
<groupId>org.apache.maven.plugins</groupId> <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<!-- DB related dependencies -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-ehcache</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.12.1.GA</version>
</dependency>
<!-- SPRING -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.11</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.11</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.5.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.5.1</version>
</dependency>
</dependencies>
<build>
<finalName>drp</finalName>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration> <configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> <source>${jdk.version}</source>
</plugin> <target>${jdk.version}</target>
</plugins> </configuration>
</build> <dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac</artifactId>
<version>1.8.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.1</version>
<configuration>
<port>8080</port>
<path>/drp</path>
<uriEncoding>UTF-8</uriEncoding>
<finalName>drp</finalName>
<server>tomcat7</server>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>
src/main/java/com/originspark/drp/controllers/AbstractController.java
View file @ 1c97167c
...@@ -4,7 +4,7 @@ import java.util.HashMap; ...@@ -4,7 +4,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired;
import com.originspark.drp.service.projects.ProjectService; import com.originspark.drp.service.projects.ProjectService;
import com.originspark.drp.service.projects.invoices.StockInInvoiceService; import com.originspark.drp.service.projects.invoices.StockInInvoiceService;
...@@ -16,65 +16,65 @@ import com.originspark.drp.util.json.Jackson; ...@@ -16,65 +16,65 @@ import com.originspark.drp.util.json.Jackson;
public abstract class AbstractController { public abstract class AbstractController {
@Resource @Autowired
protected UserService userService; protected UserService userService;
@Resource @Autowired
protected WareService wareService; protected WareService wareService;
@Resource @Autowired
protected VendorService vendorService; protected VendorService vendorService;
@Resource @Autowired
protected ProjectService projectService; protected ProjectService projectService;
@Resource @Autowired
protected StockInInvoiceService stockInInvoiceService; protected StockInInvoiceService stockInInvoiceService;
@Resource @Autowired
protected StockOutInvoiceService stockOutInvoiceService; protected StockOutInvoiceService stockOutInvoiceService;
//一般用于create、update、delete的返回值 //一般用于create、update、delete的返回值
protected final static String ok(String message){ protected final static String ok(String message){
Map<String, Object> modelMap = new HashMap<String, Object>(2); Map<String, Object> modelMap = new HashMap<String, Object>(2);
modelMap.put("success", "true"); modelMap.put("success", "true");
modelMap.put("message", message); modelMap.put("message", message);
return Jackson.toJson(modelMap); return Jackson.toJson(modelMap);
} }
protected final static String ok(String message,Object object){ protected final static String ok(String message,Object object){
Map<String, Object> modelMap = new HashMap<String, Object>(3); Map<String, Object> modelMap = new HashMap<String, Object>(3);
modelMap.put("success", "true"); modelMap.put("success", "true");
modelMap.put("message", message); modelMap.put("message", message);
modelMap.put("object", object); modelMap.put("object", object);
return Jackson.toJson(modelMap); return Jackson.toJson(modelMap);
} }
//一般用于list分页数据的返回值 //一般用于list分页数据的返回值
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
protected final static String ok(List items, Long total){ protected final static String ok(List items, Long total){
Map<String, Object> modelMap = new HashMap<String, Object>(3); Map<String, Object> modelMap = new HashMap<String, Object>(3);
modelMap.put("success", "true"); modelMap.put("success", "true");
modelMap.put("data", items); modelMap.put("data", items);
modelMap.put("total", total); modelMap.put("total", total);
return Jackson.toJson(modelMap); return Jackson.toJson(modelMap);
} }
//一般用于list不分页的返回值 //一般用于list不分页的返回值
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
protected final static String ok(List items){ protected final static String ok(List items){
Map<String, Object> modelMap = new HashMap<String, Object>(2); Map<String, Object> modelMap = new HashMap<String, Object>(2);
modelMap.put("success", "true"); modelMap.put("success", "true");
modelMap.put("data", items); modelMap.put("data", items);
return Jackson.toJson(modelMap); return Jackson.toJson(modelMap);
} }
//失败信息的处理 //失败信息的处理
protected final static String failure(String message){ protected final static String failure(String message){
Map<String, Object> modelMap = new HashMap<String, Object>(2); Map<String, Object> modelMap = new HashMap<String, Object>(2);
modelMap.put("success", "false"); modelMap.put("success", "false");
modelMap.put("message", message); modelMap.put("message", message);
return Jackson.toJson(modelMap); return Jackson.toJson(modelMap);
} }
} }
src/main/java/com/originspark/drp/controllers/InitSystemServlet.java
View file @ 1c97167c
package com.originspark.drp.controllers; package com.originspark.drp.controllers;
import java.util.Map;
import java.util.Set;
import javax.servlet.ServletConfig; import javax.servlet.ServletConfig;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import com.originspark.drp.authority.RoleEnum;
import com.originspark.drp.util.AuthUtil;
public class InitSystemServlet extends HttpServlet { public class InitSystemServlet extends HttpServlet {
......
src/main/java/com/originspark/drp/controllers/projects/costs/StockInCostController.java
View file @ 1c97167c
...@@ -3,9 +3,9 @@ package com.originspark.drp.controllers.projects.costs; ...@@ -3,9 +3,9 @@ package com.originspark.drp.controllers.projects.costs;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -29,7 +29,7 @@ import com.originspark.drp.util.json.JsonUtils; ...@@ -29,7 +29,7 @@ import com.originspark.drp.util.json.JsonUtils;
@AuthRoleGroup(type={RoleEnum.MATERIALKEEPER}) @AuthRoleGroup(type={RoleEnum.MATERIALKEEPER})
public class StockInCostController extends AbstractController{ public class StockInCostController extends AbstractController{
@Resource @Autowired
private StockInCostService service; private StockInCostService service;
@RequestMapping(method = RequestMethod.POST) @RequestMapping(method = RequestMethod.POST)
......
src/main/java/com/originspark/drp/controllers/projects/costs/StockOutCostController.java
View file @ 1c97167c
...@@ -3,9 +3,9 @@ package com.originspark.drp.controllers.projects.costs; ...@@ -3,9 +3,9 @@ package com.originspark.drp.controllers.projects.costs;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -29,7 +29,7 @@ import com.originspark.drp.util.json.JsonUtils; ...@@ -29,7 +29,7 @@ import com.originspark.drp.util.json.JsonUtils;
@AuthRoleGroup(type={RoleEnum.MATERIALKEEPER}) @AuthRoleGroup(type={RoleEnum.MATERIALKEEPER})
public class StockOutCostController extends AbstractController{ public class StockOutCostController extends AbstractController{
@Resource @Autowired
private StockOutCostService service; private StockOutCostService service;
@RequestMapping(method = RequestMethod.POST) @RequestMapping(method = RequestMethod.POST)
......
src/main/java/com/originspark/drp/models/AbstractModel.java
View file @ 1c97167c
...@@ -9,8 +9,6 @@ import javax.persistence.MappedSuperclass; ...@@ -9,8 +9,6 @@ import javax.persistence.MappedSuperclass;
import javax.persistence.PrePersist; import javax.persistence.PrePersist;
import javax.persistence.PreUpdate; import javax.persistence.PreUpdate;
import com.sun.istack.internal.NotNull;
@MappedSuperclass @MappedSuperclass
public abstract class AbstractModel { public abstract class AbstractModel {
...@@ -21,7 +19,6 @@ public abstract class AbstractModel { ...@@ -21,7 +19,6 @@ public abstract class AbstractModel {
/** /**
* 维护信息：记录创建日期 * 维护信息：记录创建日期
*/ */
@NotNull
@Column(name="createOn") @Column(name="createOn")
private Date createOn; private Date createOn;
...@@ -34,7 +31,6 @@ public abstract class AbstractModel { ...@@ -34,7 +31,6 @@ public abstract class AbstractModel {
/** /**
* 维护信息：记录更新日期 * 维护信息：记录更新日期
*/ */
@NotNull
@Column(name="updateOn") @Column(name="updateOn")
private Date updateOn; private Date updateOn;
......
src/main/java/com/originspark/drp/models/projects/invoices/AbstractInvoice.java
View file @ 1c97167c
...@@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; ...@@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.originspark.drp.models.AbstractModel; import com.originspark.drp.models.AbstractModel;
import com.originspark.drp.models.projects.Project; import com.originspark.drp.models.projects.Project;
import com.originspark.drp.util.enums.AuditState; import com.originspark.drp.util.enums.AuditState;
import com.sun.istack.internal.NotNull;
/** /**
* 单据 * 单据
...@@ -35,7 +34,6 @@ public abstract class AbstractInvoice extends AbstractModel{ ...@@ -35,7 +34,6 @@ public abstract class AbstractInvoice extends AbstractModel{
/** /**
* 所属系统 * 所属系统
*/ */
@NotNull
@ManyToOne @ManyToOne
private Project system; private Project system;
...@@ -46,7 +44,6 @@ public abstract class AbstractInvoice extends AbstractModel{ ...@@ -46,7 +44,6 @@ public abstract class AbstractInvoice extends AbstractModel{
private Date forDate; private Date forDate;
@JsonIgnore @JsonIgnore
@NotNull
@Column(columnDefinition = "char(7)", nullable = false) @Column(columnDefinition = "char(7)", nullable = false)
private String forYearMonth; private String forYearMonth;
......
src/main/java/com/originspark/drp/models/resources/Ware.java
View file @ 1c97167c
...@@ -15,7 +15,6 @@ import com.originspark.drp.models.AbstractModel; ...@@ -15,7 +15,6 @@ import com.originspark.drp.models.AbstractModel;
import com.originspark.drp.models.projects.costs.StockInCost; import com.originspark.drp.models.projects.costs.StockInCost;
import com.originspark.drp.models.projects.costs.StockOutCost; import com.originspark.drp.models.projects.costs.StockOutCost;
import com.originspark.drp.models.projects.inventories.MonthendInventory; import com.originspark.drp.models.projects.inventories.MonthendInventory;
import com.sun.istack.internal.NotNull;
/** /**
* 产品 * 产品
...@@ -27,7 +26,6 @@ public class Ware extends AbstractModel { ...@@ -27,7 +26,6 @@ public class Ware extends AbstractModel {
/** /**
* 名称 * 名称
*/ */
@NotNull
private String name; private String name;
/** /**
...@@ -43,7 +41,6 @@ public class Ware extends AbstractModel { ...@@ -43,7 +41,6 @@ public class Ware extends AbstractModel {
/** /**
* 单位 * 单位
*/ */
@NotNull
private String unit; private String unit;
/** /**
...@@ -54,7 +51,6 @@ public class Ware extends AbstractModel { ...@@ -54,7 +51,6 @@ public class Ware extends AbstractModel {
/** /**
* 供应商 * 供应商
*/ */
@NotNull
@ManyToOne @ManyToOne
private Vendor vendor; private Vendor vendor;
......
src/main/java/com/originspark/drp/service/account/AccountServiceBean.java
View file @ 1c97167c
...@@ -17,7 +17,7 @@ import com.originspark.drp.models.users.AbstractUser; ...@@ -17,7 +17,7 @@ import com.originspark.drp.models.users.AbstractUser;
import com.originspark.drp.util.enums.Status; import com.originspark.drp.util.enums.Status;
@Transactional @Transactional
@Service("AccountService") @Service
public class AccountServiceBean implements AccountService { public class AccountServiceBean implements AccountService {
@PersistenceContext @PersistenceContext
......
src/main/java/com/originspark/drp/service/projects/ProjectService.java
View file @ 1c97167c
...@@ -3,15 +3,12 @@ package com.originspark.drp.service.projects; ...@@ -3,15 +3,12 @@ package com.originspark.drp.service.projects;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.stereotype.Service;
import com.originspark.drp.dao.BaseDAO; import com.originspark.drp.dao.BaseDAO;
import com.originspark.drp.models.projects.Project; import com.originspark.drp.models.projects.Project;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
import com.originspark.drp.web.models.projects.inventories.CurrentInventoryUI; import com.originspark.drp.web.models.projects.inventories.CurrentInventoryUI;
import com.originspark.drp.web.models.projects.inventories.Ware; import com.originspark.drp.web.models.projects.inventories.Ware;
@Service
public interface ProjectService extends BaseDAO<Project>{ public interface ProjectService extends BaseDAO<Project>{
List<Project> treeViewData(List<FilterRequest> filters); List<Project> treeViewData(List<FilterRequest> filters);
......
src/main/java/com/originspark/drp/service/projects/ProjectServiceBean.java
View file @ 1c97167c
...@@ -23,7 +23,7 @@ import com.originspark.drp.web.models.projects.inventories.CurrentInventoryUI; ...@@ -23,7 +23,7 @@ import com.originspark.drp.web.models.projects.inventories.CurrentInventoryUI;
import com.originspark.drp.web.models.projects.inventories.Ware; import com.originspark.drp.web.models.projects.inventories.Ware;
@Transactional @Transactional
@Service("projectService") @Service
public class ProjectServiceBean extends BaseDAOSupport<Project> implements ProjectService { public class ProjectServiceBean extends BaseDAOSupport<Project> implements ProjectService {
@Override @Override
......
src/main/java/com/originspark/drp/service/projects/invoices/StockInInvoiceServiceBean.java
View file @ 1c97167c
...@@ -24,7 +24,7 @@ import com.originspark.drp.util.enums.AuditState; ...@@ -24,7 +24,7 @@ import com.originspark.drp.util.enums.AuditState;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Transactional @Transactional
@Service("stockInInvoiceService") @Service
public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> implements public class StockInInvoiceServiceBean extends BaseDAOSupport<StockInInvoice> implements
StockInInvoiceService { StockInInvoiceService {
......
src/main/java/com/originspark/drp/service/projects/invoices/StockOutInvoiceServiceBean.java
View file @ 1c97167c
...@@ -24,7 +24,7 @@ import com.originspark.drp.util.enums.AuditState; ...@@ -24,7 +24,7 @@ import com.originspark.drp.util.enums.AuditState;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Transactional @Transactional
@Service("stockOutInvoiceService") @Service
public class StockOutInvoiceServiceBean extends BaseDAOSupport<StockOutInvoice> implements public class StockOutInvoiceServiceBean extends BaseDAOSupport<StockOutInvoice> implements
StockOutInvoiceService { StockOutInvoiceService {
......
src/main/java/com/originspark/drp/service/resources/VendorService.java
View file @ 1c97167c
...@@ -3,13 +3,10 @@ package com.originspark.drp.service.resources; ...@@ -3,13 +3,10 @@ package com.originspark.drp.service.resources;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.stereotype.Service;
import com.originspark.drp.dao.BaseDAO; import com.originspark.drp.dao.BaseDAO;
import com.originspark.drp.models.resources.Vendor; import com.originspark.drp.models.resources.Vendor;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Service
public interface VendorService extends BaseDAO<Vendor>{ public interface VendorService extends BaseDAO<Vendor>{
List<Vendor> pagedDataSet(int start, int limit, List<FilterRequest> filters); List<Vendor> pagedDataSet(int start, int limit, List<FilterRequest> filters);
......
src/main/java/com/originspark/drp/service/resources/VendorServiceBean.java
View file @ 1c97167c
...@@ -17,7 +17,7 @@ import com.originspark.drp.models.resources.Vendor; ...@@ -17,7 +17,7 @@ import com.originspark.drp.models.resources.Vendor;
import com.originspark.drp.models.resources.Vendor.COLUMNS; import com.originspark.drp.models.resources.Vendor.COLUMNS;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Service("vendorService") @Service
public class VendorServiceBean extends BaseDAOSupport<Vendor> implements VendorService { public class VendorServiceBean extends BaseDAOSupport<Vendor> implements VendorService {
@Override @Override
......
src/main/java/com/originspark/drp/service/resources/WareService.java
View file @ 1c97167c
...@@ -4,13 +4,10 @@ package com.originspark.drp.service.resources; ...@@ -4,13 +4,10 @@ package com.originspark.drp.service.resources;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.stereotype.Service;
import com.originspark.drp.dao.BaseDAO; import com.originspark.drp.dao.BaseDAO;
import com.originspark.drp.models.resources.Ware; import com.originspark.drp.models.resources.Ware;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Service
public interface WareService extends BaseDAO<Ware>{ public interface WareService extends BaseDAO<Ware>{
List<Ware> pagedDataSet(int start, int limit, List<FilterRequest> filters); List<Ware> pagedDataSet(int start, int limit, List<FilterRequest> filters);
......
src/main/java/com/originspark/drp/service/resources/WareServiceBean.java
View file @ 1c97167c
...@@ -23,7 +23,7 @@ import com.originspark.drp.models.resources.Ware.COLUMNS; ...@@ -23,7 +23,7 @@ import com.originspark.drp.models.resources.Ware.COLUMNS;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Transactional @Transactional
@Service("wareService") @Service
public class WareServiceBean extends BaseDAOSupport<Ware> implements public class WareServiceBean extends BaseDAOSupport<Ware> implements
WareService { WareService {
......
src/main/java/com/originspark/drp/service/users/UserService.java
View file @ 1c97167c
...@@ -2,14 +2,10 @@ package com.originspark.drp.service.users; ...@@ -2,14 +2,10 @@ package com.originspark.drp.service.users;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.stereotype.Service;
import com.originspark.drp.dao.BaseDAO; import com.originspark.drp.dao.BaseDAO;
import com.originspark.drp.models.users.AbstractUser; import com.originspark.drp.models.users.AbstractUser;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Service
public interface UserService extends BaseDAO<AbstractUser>{ public interface UserService extends BaseDAO<AbstractUser>{
List<AbstractUser> pagedDataSet(int start, int limit,List<FilterRequest> filters); List<AbstractUser> pagedDataSet(int start, int limit,List<FilterRequest> filters);
......
src/main/java/com/originspark/drp/service/users/UserServiceBean.java
View file @ 1c97167c
...@@ -20,7 +20,7 @@ import com.originspark.drp.util.enums.Status; ...@@ -20,7 +20,7 @@ import com.originspark.drp.util.enums.Status;
import com.originspark.drp.util.json.FilterRequest; import com.originspark.drp.util.json.FilterRequest;
@Transactional @Transactional
@Service("userService") @Service
public class UserServiceBean extends BaseDAOSupport<AbstractUser> implements UserService { public class UserServiceBean extends BaseDAOSupport<AbstractUser> implements UserService {
@Override @Override
......
src/main/java/com/originspark/drp/applicationContext.xml → src/main/resources/applicationContext.xml
View file @ 1c97167c
...@@ -12,12 +12,20 @@ ...@@ -12,12 +12,20 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
"> ">
<context:property-placeholder <bean class="org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor"/>
ignore-unresolvable="true"
local-override="true"
location="classpath*:/jdbc.properties,classpath*:/application.local.properties"/>
<util:properties id="APP_PROPERTIES" location="classpath:jdbc.properties" local-override="true"/> <!-- 使用annotation 自动注册bean, 并保证@Required、@Autowired的属性被注入 -->
<context:component-scan base-package="com.originspark.drp">
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
</context:component-scan>
<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<list>
<value>classpath:jdbc.properties</value>
</list>
</property>
</bean>
<!-- 数据源配置, 使用DBCP数据库连接池 --> <!-- 数据源配置, 使用DBCP数据库连接池 -->
<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
...@@ -25,7 +33,7 @@ ...@@ -25,7 +33,7 @@
<property name="driverClassName" value="${jdbc.driver}"/> <property name="driverClassName" value="${jdbc.driver}"/>
<property name="url" value="${jdbc.url}"/> <property name="url" value="${jdbc.url}"/>
<property name="username" value="${jdbc.username}"/> <property name="username" value="${jdbc.username}"/>
<property name="password" value=""/> <property name="password" value="${jdbc.password}"/>
<!-- Connection Pooling Info --> <!-- Connection Pooling Info -->
<property name="maxActive" value="${dbcp.maxActive}"/> <property name="maxActive" value="${dbcp.maxActive}"/>
...@@ -36,11 +44,6 @@ ...@@ -36,11 +44,6 @@
<property name="minEvictableIdleTimeMillis" value="3600000"/> <property name="minEvictableIdleTimeMillis" value="3600000"/>
</bean> </bean>
<!-- 使用annotation 自动注册bean, 并保证@Required、@Autowired的属性被注入 -->
<context:component-scan base-package="com.originspark.drp">
<context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
</context:component-scan>
<!-- Jpa Entity Manager 配置 --> <!-- Jpa Entity Manager 配置 -->
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="dataSource"/> <property name="dataSource" ref="dataSource"/>
...@@ -51,7 +54,7 @@ ...@@ -51,7 +54,7 @@
<prop key="hibernate.dialect">${hibernate.dialect}</prop> <prop key="hibernate.dialect">${hibernate.dialect}</prop>
<prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop> <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</prop> <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</prop>
<prop key="net.sf.ehcache.configurationResourceName">ehcache/ehcache-hibernate-local.xml</prop> <prop key="net.sf.ehcache.configurationResourceName">ehcache-hibernate-local.xml</prop>
<prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop> <prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
</props> </props>
</property> </property>
......
src/main/java/com/originspark/drp/jdbc.properties → src/main/resources/jdbc.properties
View file @ 1c97167c
...@@ -11,7 +11,7 @@ sql.type=mysql ...@@ -11,7 +11,7 @@ sql.type=mysql
jdbc.driver=com.mysql.jdbc.Driver jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/drp?useUnicode=true&characterEncoding=UTF-8 jdbc.url=jdbc:mysql://localhost:3306/drp?useUnicode=true&characterEncoding=UTF-8
jdbc.username=root jdbc.username=root
jdbc.password= jdbc.password=root
hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
#hibernate settings #hibernate settings
......
src/main/webapp/WEB-INF/web.xml
View file @ 1c97167c
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
<display-name>smart-nav</display-name> <display-name>smart-nav</display-name>
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value> <param-value>classpath*:applicationContext.xml</param-value>
classpath*:/applicationContext.xml
</param-value>
</context-param> </context-param>
<listener> <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment