Merge remote-tracking branch 'origin/master'

.gitignore

@@ -7,5 +7,6 @@ target/
 *test/
 # Package Files #
 *.jar
+logs/
 
 

core-api/src/main/java/cn/com/qmth/examcloud/service/core/api/OrgFunctionApi.java

@@ -0,0 +1,47 @@
+package cn.com.qmth.examcloud.service.core.api;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.com.qmth.examcloud.service.core.entity.OrgFunction;
+import cn.com.qmth.examcloud.service.core.repo.OrgFunctionRepo;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 机构功能API
+ * 
+ * @author wang wei
+ * @date 2018年4月9日
+ */
+@RestController
+@RequestMapping("${app.api.root}/orgFunction")
+public class OrgFunctionApi {
+
+	private final Logger LOG = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	OrgFunctionRepo orgFunctionRepo;
+
+	@ApiOperation(value = "查询所有功能", notes = "查询")
+	@GetMapping("/getAllFunctions")
+	public ResponseEntity<?> getAllFunctions() {
+		List<OrgFunction> allFuncs = orgFunctionRepo.findAll();
+		return new ResponseEntity<>(allFuncs, HttpStatus.OK);
+	}
+
+	@ApiOperation(value = "查询机构功能", notes = "查询")
+	@GetMapping("/{id}")
+	public ResponseEntity<?> getOrgFunctions(@PathVariable Long id) {
+		LOG.debug("getOrgFunctions(). id=" + id);
+		return new ResponseEntity<>("", HttpStatus.OK);
+	}
+}

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/entity/OrgFunction.java

@@ -0,0 +1,105 @@
+package cn.com.qmth.examcloud.service.core.entity;
+
+import java.io.Serializable;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 机构功能
+ * 
+ * @author wang wei
+ * @date 2018年4月9日
+ */
+@Entity
+@Table(name = "ecs_core_function")
+public class OrgFunction implements Serializable {
+
+	private static final long serialVersionUID = -3894524658332441373L;
+
+	@Id
+	@GeneratedValue
+	private Long id;
+
+	/**
+	 * 功能编码
+	 */
+	@NotNull
+	private String funcCode;
+
+	/**
+	 * 父功能id
+	 */
+	@NotNull
+	private Long parentId;
+
+	/**
+	 * 功能名称
+	 */
+	@NotNull
+	private String funcName;
+
+	/**
+	 * 描述
+	 */
+	@NotNull
+	private String description;
+
+	/**
+	 * 权重
+	 */
+	@NotNull
+	private int weigth;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getFuncCode() {
+		return funcCode;
+	}
+
+	public void setFuncCode(String funcCode) {
+		this.funcCode = funcCode;
+	}
+
+	public Long getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(Long parentId) {
+		this.parentId = parentId;
+	}
+
+	public String getFuncName() {
+		return funcName;
+	}
+
+	public void setFuncName(String funcName) {
+		this.funcName = funcName;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public int getWeigth() {
+		return weigth;
+	}
+
+	public void setWeigth(int weigth) {
+		this.weigth = weigth;
+	}
+
+}

core-domain/src/main/java/cn/com/qmth/examcloud/service/core/repo/OrgFunctionRepo.java

@@ -0,0 +1,18 @@
+package cn.com.qmth.examcloud.service.core.repo;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.repository.query.QueryByExampleExecutor;
+
+import cn.com.qmth.examcloud.service.core.entity.Org;
+import cn.com.qmth.examcloud.service.core.entity.OrgFunction;
+
+public interface OrgFunctionRepo extends JpaRepository<OrgFunction, Long>, QueryByExampleExecutor<OrgFunction> {
+	
+	@Query(nativeQuery = true, value = "select * from ecs_core_org t where t.parent_id = 0 and t.enable = 1 order by t.id")
+	List<Org> findByOrgId(@Param("orgId") long orgId);
+
+}

core-main/src/main/resources/logback-spring.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true" scan="true" scanPeriod="30 seconds">
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %m | [%class:%line]%n</pattern>
+		</encoder>
+	</appender>
+
+	<appender name="FILE-STDOUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>./logs/console/console.log</file>
+		<encoder>
+			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %m | [%class:%line]%n</pattern>
+		</encoder>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>./logs/console/console.%d{yyyy-MM-dd}.log.zip</fileNamePattern>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+	</appender>
+
+	<logger name="cn.com.qmth.examcloud" level="DEBUG" additivity="false">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILE-STDOUT" />
+	</logger>
+
+	<logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" />
+	<logger name="org.hibernate.type.descriptor.sql.BasicExtractor" level="DEBUG" />
+	<logger name="org.hibernate.SQL" level="ERROR" />
+	<logger name="org.hibernate.type" level="ERROR" />
+	<logger name="org.hibernate.engine.QueryParameters" level="DEBUG" />
+	<logger name="org.hibernate.engine.query.HQLQueryPlan" level="DEBUG" />
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILE-STDOUT" />
+	</root>
+
+</configuration>