diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java index 4051373..35e9312 100644 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java +++ b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java @@ -88,25 +88,6 @@ public class MockController { return readJson("classpath:org/jeecg/modules/demo/mock/json/area.json"); } - /** - * 测试报表数据 - */ - @GetMapping(value = "/report/getYearCountInfo") - public String getYearCountInfo() { - return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json"); - } - @GetMapping(value = "/report/getMonthCountInfo") - public String getMonthCountInfo() { - return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json"); - } - @GetMapping(value = "/report/getCntrNoCountInfo") - public String getCntrNoCountInfo() { - return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json"); - } - @GetMapping(value = "/report/getCabinetCountInfo") - public String getCabinetCountInfo() { - return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json"); - } @GetMapping(value = "/report/getTubiao") public String getTubiao() { return readJson("classpath:org/jeecg/modules/demo/mock/json/getTubiao.json"); diff --git a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json b/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json deleted file mode 100644 index 5b65704..0000000 --- a/nursing-unit-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "success": true, - "message": "查询成功", - "code": null, - "result": [ - { - "resultIndex": 0, - "yearcount": 623, - "year": 2016, - "month": "四月", - "monthcount": 3255, - "classifyname": "证明类", - "cntrnocount": 24, - "cabinetname": "一号柜", - "cabinetcocunt": 12 - }, - { - "resultIndex": 1, - "yearcount": 243, - "year": 2017, - "month": "五月", - "monthcount": 5673, - "classifyname": "产权类", - "cntrnocount": 52, - "cabinetname": "二号柜", - "cabinetcocunt": 52 - }, - { - "resultIndex": 2, - "yearcount": 345, - "year": 2018, - "month": "六月", - "monthcount": 2673, - "classifyname": "知识类", - "cntrnocount": 85, - "cabinetname": "三号柜", - "cabinetcocunt": 24 - }, - { - "resultIndex": 3, - "yearcount": 452, - "year": 2019, - "month": "七月", - "monthcount": 2341, - "classifyname": "技术类", - "cntrnocount": 67, - "cabinetname": "四号柜", - "cabinetcocunt": 45 - }, - { - "resultIndex": 4, - "yearcount": 645, - "year": 2020, - "month": "八月", - "monthcount": 7473, - "classifyname": "工具类", - "cntrnocount": 93, - "cabinetname": "五号柜", - "cabinetcocunt": 94 - } - ], - "timestamp": 1554285003594 -} \ No newline at end of file diff --git a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java index 85dc897..da548a4 100644 --- a/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java +++ b/nursing-unit-system/nu-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java @@ -1,50 +1,50 @@ -package org.jeecg; - -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.util.oConvertUtils; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.Environment; - -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.HashMap; -import java.util.Map; - -/** -* 单体启动类 -*/ -@Slf4j -@SpringBootApplication -public class JeecgSystemApplication extends SpringBootServletInitializer { - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(JeecgSystemApplication.class); - } - - public static void main(String[] args) throws UnknownHostException { - SpringApplication app = new SpringApplication(JeecgSystemApplication.class); - Map defaultProperties = new HashMap<>(); - defaultProperties.put("management.health.elasticsearch.enabled", false); - app.setDefaultProperties(defaultProperties); - log.info("[JEECG] Elasticsearch Health Check Enabled: false" ); - - ConfigurableApplicationContext application = app.run(args);; - Environment env = application.getEnvironment(); - String ip = InetAddress.getLocalHost().getHostAddress(); - String port = env.getProperty("server.port"); - String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); - log.info("\n----------------------------------------------------------\n\t" + - "Application Jeecg-Boot is running! Access URLs:\n\t" + - "Local: \t\thttp://localhost:" + port + path + "/\n\t" + - "External: \thttp://" + ip + ":" + port + path + "/\n\t" + - "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + - "----------------------------------------------------------"); - - } - -} \ No newline at end of file +//package org.jeecg; +// +//import lombok.extern.slf4j.Slf4j; +//import org.jeecg.common.util.oConvertUtils; +//import org.springframework.boot.SpringApplication; +//import org.springframework.boot.autoconfigure.SpringBootApplication; +//import org.springframework.boot.builder.SpringApplicationBuilder; +//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +//import org.springframework.context.ConfigurableApplicationContext; +//import org.springframework.core.env.Environment; +// +//import java.net.InetAddress; +//import java.net.UnknownHostException; +//import java.util.HashMap; +//import java.util.Map; +// +///** +//* 单体启动类 +//*/ +//@Slf4j +//@SpringBootApplication +//public class JeecgSystemApplication extends SpringBootServletInitializer { +// +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { +// return application.sources(JeecgSystemApplication.class); +// } +// +// public static void main(String[] args) throws UnknownHostException { +// SpringApplication app = new SpringApplication(JeecgSystemApplication.class); +// Map defaultProperties = new HashMap<>(); +// defaultProperties.put("management.health.elasticsearch.enabled", false); +// app.setDefaultProperties(defaultProperties); +// log.info("[JEECG] Elasticsearch Health Check Enabled: false" ); +// +// ConfigurableApplicationContext application = app.run(args);; +// Environment env = application.getEnvironment(); +// String ip = InetAddress.getLocalHost().getHostAddress(); +// String port = env.getProperty("server.port"); +// String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); +// log.info("\n----------------------------------------------------------\n\t" + +// "Application Jeecg-Boot is running! Access URLs:\n\t" + +// "Local: \t\thttp://localhost:" + port + path + "/\n\t" + +// "External: \thttp://" + ip + ":" + port + path + "/\n\t" + +// "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" + +// "----------------------------------------------------------"); +// +// } +// +//}