能耗计划接口完善

pom.xml

@@ -352,18 +352,28 @@
 
 
     <build>
-        <finalName>zhny</finalName>
+        <finalName>ROOT</finalName>
         <resources>
             <resource>
-                <directory>src/main/resources</directory>
-                <!--<includes>
-                  <include>**/*.yml</include>
-                  <include>**/*.properties</include>
-                  <include>**/*.xml</include>
-                  <include>**/*.ftl</include>
-                </includes>
-                <filtering>true</filtering>-->
-            </resource>
+            <directory>src/main/resources</directory>
+            <includes>
+                <include>**/*.yml</include>
+                <include>**/*.properties</include>
+                <include>**/*.xml</include>
+                <include>**/*.ftl</include>
+            </includes>
+            <filtering>true</filtering>
+        </resource>
+        <resource>
+            <directory>src/main/resources</directory>
+            <excludes>
+                <exclude>**/*.yml</exclude>
+                <exclude>**/*.properties</exclude>
+                <exclude>**/*.xml</exclude>
+                <exclude>**/*.ftl</exclude>
+            </excludes>
+            <filtering>false</filtering>
+        </resource>
         </resources>
         <plugins>
             <plugin>

src/main/java/org/rcisoft/ZhnyLineRunner.java

@@ -16,8 +16,6 @@ public class ZhnyLineRunner implements CommandLineRunner {
     @Override
     public void run(String... var1) throws Exception{
         System.out.println("MQTT 客户端启动++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
-        /*ClientMQTT mqclient = new ClientMQTT();
-        mqclient.start();*/
         MqttClient client = new MqttClient(rcRedisService,totalOriginalServiceImpl);
         //client.start();
     }

src/main/java/org/rcisoft/business/mainte/energyplan/service/impl/BusEnergyPlanServiceImpl.java

@@ -218,7 +218,7 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
                 tmMap.put(s,"1");
             }
             tmap.put("planmap",tmMap);
-
+            tmap.put("planT",busEnergyplanTService.queryBusEnergyplanTs(tmap.get("dev_num").toString(),day));
         }
         return list;
     }

src/main/java/org/rcisoft/mqttclient/Test.java

@@ -18,6 +18,7 @@ public class Test {
         String param = "sensor_01";
         System.out.println(param.substring(param.indexOf("_"),param.length()));*/
         System.out.println(UUID.randomUUID().toString().replace("-",""));
+        System.out.println("2018-06-01 10:20:00".substring(11));
     }
 }
 

src/main/resources/application-dev.yml

 server:
-  port: 8080
-  context-path: / #ContextPath must start with '/' and not end with '/'
+  port: 8082
+  context-path: /zhny #ContextPath must start with '/' and not end with '/'
   tomcat:
     max-threads: 300
+    max-http-post-size: 10240000
+  max-http-header-size: 10240000
     #uri-encoding: UTF-8
 
 # logging:   #使用logback-spring 注释掉logging 否则影响
@@ -11,7 +13,7 @@ server:
 #    org.springframework.web: DEBUG
 
 druid:
-  url: jdbc:mysql://139.199.98.105:3336/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+  url: jdbc:mysql://localhost:3306/zhny?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
   username: root
   password: root
   initial-size: 1
@@ -22,7 +24,7 @@ druid:
 
 mybatis:
   mapper-locations: classpath:mapper/**/**/*.xml
-
+  config-location: classpath:mybatis-config.xml
 
 mapper:
   mappers:

src/main/resources/application-prod.yml

 server:
   port: 8082
-  context-path: /project #ContextPath must start with '/' and not end with '/'
+  context-path: /zhny #ContextPath must start with '/' and not end with '/'
   tomcat:
     max-threads: 300
+    max-http-post-size: 10240000
   max-http-header-size: 10240000
 
 #logging:
@@ -45,6 +46,7 @@ spring:
     multipart:
       max-file-size: 100Mb
       max-request-size: 1000Mb
+
   mvc:
     throw-exception-if-no-handler-found: true
   resources: