diff --git a/dashboard-domain-service/pom.xml b/dashboard-domain-service/pom.xml index e7c6ada..bfbdb6a 100644 --- a/dashboard-domain-service/pom.xml +++ b/dashboard-domain-service/pom.xml @@ -58,11 +58,11 @@ h2 1.4.196 - - - - - + + mysql + mysql-connector-java + 5.1.24 + org.mybatis.spring.boot mybatis-spring-boot-starter diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/DimQuery.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/DimQuery.java new file mode 100644 index 0000000..9562485 --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/DimQuery.java @@ -0,0 +1,20 @@ +package com.jd.logistics.cloud.data.domain; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 15:39 + */ +@Data +public class DimQuery implements Serializable { + private static final long serialVersionUID = -946299281247438489L; + private String funcName; + private String warehouse; + private String dateCycle; + private String dateStart; + private String dateEnd; +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/Function.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/Function.java index 0fb1e43..2c07cf8 100644 --- a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/Function.java +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/Function.java @@ -9,45 +9,44 @@ */ @Data public class Function implements Serializable{ - public enum FuncType { - BOX(0), CHART(1), FREE(2); - private int index; - FuncType(int index) { - this.index = index; - } - public static FuncType getFuncType(int index) { - switch (index) { - case 0: - return FuncType.BOX; - case 1: - return FuncType.CHART; - case 2: - return FuncType.FREE; - } - return FuncType.BOX; - } - } + private static final long serialVersionUID = -3908221732001318230L; + // public enum FuncType { +// BOX(0), CHART(1), FREE(2); +// private int index; +// FuncType(int index) { +// this.index = index; +// } +// public static FuncType getFuncType(int index) { +// switch (index) { +// case 0: +// return FuncType.BOX; +// case 1: +// return FuncType.CHART; +// case 2: +// return FuncType.FREE; +// } +// return FuncType.BOX; +// } +// } + private int id; private String funcName; - private FuncType funcType; - - public Function(String funcName, FuncType funcType) { - this.funcName = funcName; - this.funcType = funcType; - } - - public String getFuncName() { - return funcName; - } - - public void setFuncName(String funcName) { - this.funcName = funcName; - } - - public FuncType getFuncType() { - return funcType; - } - - public void setFuncType(FuncType funcType) { - this.funcType = funcType; - } + private int funcType; // BOX(0), CHART(1), FREE(2); + private int seq; + +// public String getFuncName() { +// return funcName; +// } +// +// public void setFuncName(String funcName) { +// this.funcName = funcName; +// } +// +// public int getFuncType() { +// return funcType; +// } +// +// public void setFuncType(int funcType) { +// this.funcType = funcType; +// } +// } diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/GenericRes.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/GenericRes.java new file mode 100644 index 0000000..363429b --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/domain/GenericRes.java @@ -0,0 +1,42 @@ +package com.jd.logistics.cloud.data.domain; + +import lombok.Data; + +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 15:50 + */ +@Data +public class GenericRes implements Serializable{ + private static final long serialVersionUID = 1902248647108008231L; + private String funcName; + private String funcValue; + private String idxName1; + private double idxValue1; + private String idxName2; + private double idxValue2; + private String idxName3; + private double idxValue3; + private String idxName4; + private double idxValue4; + private String statDate; + + public String getFuncValue() { + DecimalFormat df = new DecimalFormat("###,##0"); + DecimalFormat df2 = new DecimalFormat("###,##0.00"); + double tmp = Double.parseDouble(funcValue); + if (tmp / 100000 >=1) + funcValue = df.format(tmp/1000) + "K"; + else if ((tmp * 10) % 10 == 0) // integer + funcValue = df.format(tmp); + else if (tmp <= 1 ) // 百分比 + funcValue = df2.format(tmp * 100) + "%"; + else funcValue = df2.format(tmp); + return funcValue; + } +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/DimRepository.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/DimRepository.java new file mode 100644 index 0000000..379299b --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/DimRepository.java @@ -0,0 +1,27 @@ +package com.jd.logistics.cloud.data.repository; + +import com.jd.logistics.cloud.data.domain.Dim; +import com.jd.logistics.cloud.data.domain.DimQuery; +import com.jd.logistics.cloud.data.domain.Function; +import com.jd.logistics.cloud.data.domain.GenericRes; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/30 9:22 + */ +@Mapper +public interface DimRepository { + @Select("SELECT * FROM T_WAREHOUSE") + List getWarehouses(); + + @Select("SELECT * FROM T_DATECYCLE") + List getDateCycles(); + +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/FuncRepository.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/FuncRepository.java new file mode 100644 index 0000000..25a435f --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/FuncRepository.java @@ -0,0 +1,25 @@ +package com.jd.logistics.cloud.data.repository; + +import com.jd.logistics.cloud.data.domain.Function; +import com.jd.logistics.cloud.data.domain.User; +import org.apache.ibatis.annotations.*; + +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/30 9:22 + */ +@Mapper +public interface FuncRepository { + + @Select("SELECT id, name as funcName, type as funcType, seq FROM T_FUNCTION where type=#{type}order by seq") + List getByType(@Param("type") int type); + + @Select("SELECT id, name as funcName, type as funcType, seq FROM T_FUNCTION order by seq") + List getAll(); + + @Update("UPDATE T_FUNCTION SET type=#{func.funcType}, seq=#{func.seq} WHERE name=#{func.funcName}") + void update(@Param("func") Function func); +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/StatRepository.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/StatRepository.java new file mode 100644 index 0000000..bafb1ee --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/StatRepository.java @@ -0,0 +1,37 @@ +package com.jd.logistics.cloud.data.repository; + +import com.jd.logistics.cloud.data.domain.DimQuery; +import com.jd.logistics.cloud.data.domain.GenericRes; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 17:41 + */ +@Mapper +public interface StatRepository { + @Select("" + ) + List getRes(@Param("query")DimQuery query); +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/UserRepository.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/UserRepository.java index 6b357bf..c848e4a 100644 --- a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/UserRepository.java +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/repository/UserRepository.java @@ -1,8 +1,12 @@ package com.jd.logistics.cloud.data.repository; +import com.jd.logistics.cloud.data.domain.DimQuery; +import com.jd.logistics.cloud.data.domain.GenericRes; import com.jd.logistics.cloud.data.domain.User; import org.apache.ibatis.annotations.*; +import java.util.List; + /** * @Author hubin * @Description: @@ -10,18 +14,10 @@ */ @Mapper public interface UserRepository { - @Insert("INSERT into T_USER (name,age,addr) VALUES(#{name}, #{age}, #{addr})") - void add(User user); - @Select("SELECT * FROM T_USER WHERE id = #{id}") User getById(@Param("id") Long id); - @Select("SELECT * FROM T_USER WHERE name = #{name}") - User getByName(@Param("name") String name); - - @Update("UPDATE T_USER SET name=#{user.name}, age=#{user.age}, addr=#{user.addr} WHERE id=#{user.id}") - void update(@Param("user") User user); + @Select("SELECT * FROM T_USER WHERE username = #{username}") + User getByName(@Param("username") String username); - @Delete("DELETE FROM T_USER WHERE id =#{id}") - void delete(@Param("id") Long id); } diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/FuncService.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/FuncService.java new file mode 100644 index 0000000..44a088c --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/FuncService.java @@ -0,0 +1,16 @@ +package com.jd.logistics.cloud.data.service; + +import com.jd.logistics.cloud.data.domain.Function; + +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 10:17 + */ +public interface FuncService { + List getFuncByType(int type); + List getAllFunc(); + void updateFuncType(Function func); +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/FuncServiceImpl.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/FuncServiceImpl.java new file mode 100644 index 0000000..fc0f179 --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/FuncServiceImpl.java @@ -0,0 +1,33 @@ +package com.jd.logistics.cloud.data.service; + +import com.jd.logistics.cloud.data.domain.Function; +import com.jd.logistics.cloud.data.repository.FuncRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 10:17 + */ +@Service +public class FuncServiceImpl implements FuncService { + @Autowired + FuncRepository funcRepository; + @Override + public List getFuncByType(int type) { + return funcRepository.getByType(type); + } + + @Override + public List getAllFunc() { + return funcRepository.getAll(); + } + + @Override + public void updateFuncType(Function func) { + funcRepository.update(func); + } +} diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/GenStatService.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/GenStatService.java index 2b7baa3..fcae9f0 100644 --- a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/GenStatService.java +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/GenStatService.java @@ -22,22 +22,23 @@ public class GenStatService { private static void gen(int num){ Calendar date = Calendar.getInstance(); date.setTime(new Date()); - String[] functions = {"接收订单量", + String[] functions = { + "接收订单量", "Sku准确率", "调拨入库单数", "发出订单量", "在库Sku", "人效-DO", - "成本效率","测试1","测试2"}; + "成本效率", + "测试1", + "测试2" + }; for (int i = 0; i < num; i++) { date.set(Calendar.DATE, date.get(Calendar.DATE) + 1); String tmp_date = new SimpleDateFormat("YYYY-MM-dd").format(date.getTime()); statList.add(new Stat(tmp_date, r.nextInt(20), 20+r.nextInt(50), 50+r.nextInt(100), 100+r.nextInt(200))); } - for(String function : functions) { - int index = r.nextInt(3); - functionList.add(new Function(function, Function.FuncType.getFuncType(index))); - } + } public static List getStatList(int limit, int offset){ diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatService.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatService.java index 2c2b28f..290a308 100644 --- a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatService.java +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatService.java @@ -26,11 +26,9 @@ public interface StatService { List> getColumns(); - User getUser(long id); - List getBoxes(); List getCharts(); - List getFunctions(String type); + List getRes(DimQuery query); } diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatServiceImpl.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatServiceImpl.java index d95d293..0ae5078 100644 --- a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatServiceImpl.java +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/StatServiceImpl.java @@ -5,12 +5,14 @@ import com.jd.logistics.cloud.data.commons.page.Page; import com.jd.logistics.cloud.data.commons.page.PageRequest; import com.jd.logistics.cloud.data.domain.*; +import com.jd.logistics.cloud.data.repository.StatRepository; import com.jd.logistics.cloud.data.repository.UserRepository; import io.swagger.annotations.ApiModelProperty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.lang.reflect.Field; +import java.text.DecimalFormat; import java.util.*; /** @@ -21,7 +23,7 @@ @Service public class StatServiceImpl implements StatService { @Autowired - UserRepository userRepository; + StatRepository statRepository; @Override public Page findStats(StatQuery query, PageRequest pageRequest) { List statList = GenStatService.getStatList(pageRequest.getPageSize(), (int) pageRequest.getOffset()); @@ -115,11 +117,6 @@ public List> getColumns() { return tmp; } - @Override - public User getUser(long id) { - return userRepository.getById(id); - } - @Override public List getBoxes() { List tmp = new ArrayList<>(); @@ -146,15 +143,17 @@ public List getCharts() { } @Override - public List getFunctions(String type) { - return GenStatService.getFunctionList(); + public List getRes(DimQuery query) { + return statRepository.getRes(query); } public static void main(String[] args) { StatServiceImpl ss = new StatServiceImpl(); System.out.println(ss.getPeriods()); System.out.println(ss.getCharts().get(0)); - System.out.println(ss.getFunctions("")); + DecimalFormat df = new DecimalFormat("###,##0.00"); + double d = 0.777; + System.out.println(df.format(d*100)+"%"); //System.out.println(GenStatService.statList); } } diff --git a/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/UserService.java b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/UserService.java new file mode 100644 index 0000000..50c3030 --- /dev/null +++ b/dashboard-domain-service/src/main/java/com/jd/logistics/cloud/data/service/UserService.java @@ -0,0 +1,18 @@ +package com.jd.logistics.cloud.data.service; + +import com.jd.logistics.cloud.data.domain.User; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 9:13 + */ +public interface UserService { + User getUserByName(String username); + + boolean checkPwd(String username, String pwd); + + boolean checkUser(String username); + + User getUserById(long id); +} diff --git a/dashboard-domain-service/src/main/resources/schema.sql b/dashboard-domain-service/src/main/resources/schema.sql index 862133c..e20a3f2 100644 --- a/dashboard-domain-service/src/main/resources/schema.sql +++ b/dashboard-domain-service/src/main/resources/schema.sql @@ -1,10 +1,81 @@ CREATE TABLE IF NOT EXISTS T_USER( - ID INT NOT NULL AUTO_INCREMENT, - USERNAME VARCHAR(100) NOT NULL, - PASSWORD VARCHAR(100) NOT NULL, - PRIMARY KEY ( ID ) + ID INT NOT NULL AUTO_INCREMENT, + USERNAME VARCHAR(100) NOT NULL, + PASSWORD VARCHAR(100) NOT NULL, + PRIMARY KEY ( ID ) ); - - -INSERT INTO T_USER (USERNAME, PASSWORD) VALUES ('Jack', 'AAAAAAAA'); -INSERT INTO T_USER (USERNAME, PASSWORD) VALUES ('Jones', 'BBBBBBBB'); \ No newline at end of file +--INSERT INTO T_USER (USERNAME, PASSWORD) VALUES ('admin', 'admin'); +--INSERT INTO T_USER (USERNAME, PASSWORD) VALUES ('Jack', 'AAAAAAAA'); +--INSERT INTO T_USER (USERNAME, PASSWORD) VALUES ('Jones', 'BBBBBBBB'); +-- +--CREATE TABLE IF NOT EXISTS T_WAREHOUSE( +-- ID INT NOT NULL AUTO_INCREMENT, +-- NAME VARCHAR(100) NOT NULL, +-- PRIMARY KEY ( ID ) +--); +--INSERT INTO T_WAREHOUSE(NAME) VALUES('全部仓库'); +--INSERT INTO T_WAREHOUSE(NAME) VALUES('上海1仓'); +--INSERT INTO T_WAREHOUSE(NAME) VALUES('上海2仓'); +--INSERT INTO T_WAREHOUSE(NAME) VALUES('上海3仓'); +-- +--CREATE TABLE IF NOT EXISTS T_DATECYCLE( +-- ID INT NOT NULL AUTO_INCREMENT, +-- NAME VARCHAR(100) NOT NULL, +-- PRIMARY KEY ( ID ) +--); +--INSERT INTO T_DATECYCLE(NAME) VALUES('日维度'); +--INSERT INTO T_DATECYCLE(NAME) VALUES('周维度'); +--INSERT INTO T_DATECYCLE(NAME) VALUES('月维度'); +-- +--CREATE TABLE IF NOT EXISTS T_FUNCTION( +-- ID INT NOT NULL AUTO_INCREMENT, +-- NAME VARCHAR(100) NOT NULL, +-- TYPE int NOT NULL, +-- SEQ int NOT NULL, +-- PRIMARY KEY ( ID ) +--); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('接收订单量', 0, 0); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('Sku准确率', 0, 1); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('调拨入库单数', 0, 2); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('发出订单量', 0, 3); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('在库Sku', 1, 0); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('人效-DO', 1, 1); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('成本效率', 2, 0); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('测试1', 2, 1); +--INSERT INTO T_FUNCTION (NAME, TYPE, SEQ) VALUES ('测试', 2, 2); +-- +--CREATE TABLE IF NOT EXISTS T_RESULT( +-- ID INT NOT NULL AUTO_INCREMENT, +-- FUNC_NAME VARCHAR(100) NOT NULL, +-- WAREHOUSE_NAME VARCHAR(100) NOT NULL, +-- DATE_CYCLE VARCHAR(100) NOT NULL, +-- STAT_DATE VARCHAR(20) NOT NULL, +-- FUNC_VALUE DECIMAL(10,4) NOT NULL, +-- IDX_NAME VARCHAR(20) NOT NULL, +-- IDX_VALUE DECIMAL(10,2) NOT NULL, +-- PRIMARY KEY ( ID ) +--); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('接收订单量','上海1仓','日维度','2017/10/31',23123,'日环比',2.0); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('接收订单量','上海1仓','日维度','2017/10/31',23123,'周同比',-1.3); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('接收订单量','上海2仓','日维度','2017/10/31',20123,'日环比',5.0); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('接收订单量','上海2仓','日维度','2017/10/31',20123,'周同比',-2.3); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('Sku准确率','上海1仓','日维度','2017/10/31',0.767,'日环比',2.0); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('Sku准确率','上海1仓','日维度','2017/10/31',0.767,'周同比',-1.3); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('Sku准确率','上海2仓','日维度','2017/10/31',0.838,'日环比',5.0); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('Sku准确率','上海2仓','日维度','2017/10/31',0.838,'周同比',-2.3); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('调拨入库单数','上海1仓','日维度','2017/10/31',3123,'日环比',2.0); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('调拨入库单数','上海1仓','日维度','2017/10/31',3123,'周同比',-1.3); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('调拨入库单数','上海3仓','日维度','2017/10/31',1639,'日环比',5.0); +--INSERT INTO T_RESULT (FUNC_NAME, WAREHOUSE_NAME, DATE_CYCLE, STAT_DATE, FUNC_VALUE, IDX_NAME, IDX_VALUE) +-- VALUES ('调拨入库单数','上海3仓','日维度','2017/10/31',1639,'周同比',-2.3); diff --git a/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/FuncRestController.java b/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/FuncRestController.java new file mode 100644 index 0000000..2caa82a --- /dev/null +++ b/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/FuncRestController.java @@ -0,0 +1,42 @@ +package com.jd.logistics.cloud.data.web.api; + +import com.jd.logistics.cloud.data.domain.Function; +import com.jd.logistics.cloud.data.service.FuncService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; +import java.io.Serializable; +import java.util.List; + +/** + * @Author hubin + * @Description: + * @Date 2017/10/31 10:16 + */ +@RestController +public class FuncRestController implements FuncApi{ + @Autowired + FuncService funcService; + @Override + public List getFuncByType(@PathVariable("type") int type) { + return funcService.getFuncByType(type); + } + + @Override + public List getFunc() { + return funcService.getAllFunc(); + } + + @Override + public ResponseEntity updateFuncType(@Valid @RequestBody List functionList) { + for(Function function : functionList) { + funcService.updateFuncType(function); + } + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatApi.java b/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatApi.java index 8aad573..55a0ca6 100644 --- a/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatApi.java +++ b/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatApi.java @@ -53,16 +53,6 @@ public interface StatApi { method = RequestMethod.GET) List> cAll(); - @RequestMapping(value = "/login", - produces = { "application/json" }, - method = RequestMethod.POST) - ResponseEntity login(@Valid @RequestBody User user); - - @RequestMapping(value = "/user/{id}", - produces = { "application/json" }, - method = RequestMethod.GET) - User user(@PathVariable("id") long id); - @RequestMapping(value = "/boxinfo", produces = { "application/json" }, method = RequestMethod.GET) @@ -73,9 +63,9 @@ public interface StatApi { method = RequestMethod.GET) List getCharts(); - @RequestMapping(value = "/func/{type}", + @RequestMapping(value = "/res", produces = { "application/json" }, - method = RequestMethod.GET) - List getFunction(@PathVariable("type") String type); + method = RequestMethod.POST) + List getRes(@Valid @RequestBody DimQuery query); } diff --git a/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatRestController.java b/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatRestController.java index 9ef0158..1e6806d 100644 --- a/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatRestController.java +++ b/dashboard-web/src/main/java/com/jd/logistics/cloud/data/web/api/StatRestController.java @@ -56,26 +56,6 @@ public List> cAll() { return statService.getColumns(); } - @Override - public ResponseEntity login(@RequestBody User user) { - Errors.Builder errorsBuilder = new Errors.Builder(); - if(!"admin".equalsIgnoreCase(user.getUsername())) { - errorsBuilder.addFieldError("username", "用户名不存在！"); - return new ResponseEntity<>(errorsBuilder.build(), HttpStatus.OK); - } - if(!"admin".equalsIgnoreCase(user.getPassword())) { - errorsBuilder.addFieldError("password", "密码不正确！"); - return new ResponseEntity<>(errorsBuilder.build(), HttpStatus.OK); - } - - return new ResponseEntity<>(HttpStatus.OK); - } - - @Override - public User user(@PathVariable("id") long id) { - return statService.getUser(id); - } - @Override public List getBoxes() { return statService.getBoxes(); @@ -87,8 +67,9 @@ public List getCharts() { } @Override - public List getFunction(@PathVariable("type") String type) { - return statService.getFunctions(type); + public List getRes(@RequestBody DimQuery query) { + return statService.getRes(query); } + } diff --git a/dashboard-web/src/main/resources/dev.properties b/dashboard-web/src/main/resources/dev.properties index f549608..c3b12ca 100644 --- a/dashboard-web/src/main/resources/dev.properties +++ b/dashboard-web/src/main/resources/dev.properties @@ -1,11 +1,11 @@ spring.velocity.cache=false spring.devtools.remote.restart.enabled=false - spring.datasource.url=jdbc:h2:mem:dev_db;MODE=MySQL - spring.datasource.username= - spring.datasource.password= - spring.datasource.driver-class-name=org.h2.Driver -# spring.datasource.url=jdbc:mysql://192.168.99.100:3306/dev?characterEncoding=utf8&useSSL=false -# spring.datasource.username=root -# spring.datasource.password=root -# spring.datasource.driver-class-name=com.mysql.jdbc.Driver \ No newline at end of file +# spring.datasource.url=jdbc:h2:mem:dev_db;MODE=MySQL +# spring.datasource.username= +# spring.datasource.password= +# spring.datasource.driver-class-name=org.h2.Driver + spring.datasource.url=jdbc:mysql://192.168.99.100:3306/dev?characterEncoding=utf8&useSSL=false + spring.datasource.username=root + spring.datasource.password=root + spring.datasource.driver-class-name=com.mysql.jdbc.Driver \ No newline at end of file