Merge remote-tracking branch 'origin/20210716' into 20210716

gateway/src/main/java/com/zcxk/gateway/config/SwaggerProvider.java

@@ -34,6 +34,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider {
         resources.add(swaggerResource("运维管理接口", "/operation-manager/v2/api-docs?group=api"));
         resources.add(swaggerResource("消息中心接口", "/uims-message/v2/api-docs?group=api"));
         resources.add(swaggerResource("集抄中心接口", "/zoniot-rmcp-web/v2/api-docs?group=api"));
+        resources.add(swaggerResource("调度中心接口新", "/zoniot-charge/v2/api-docs?group=api"));
         return resources;
     }
 

gateway/src/main/resources/application-dev.properties

@@ -51,5 +51,11 @@ spring.cloud.gateway.routes[6].predicates[0]=Path=/iot/api/**
 spring.cloud.gateway.routes[6].filters[0]=StripPrefix=1
 spring.cloud.gateway.routes[6].filters[1]=Auth
 
+spring.cloud.gateway.routes[7].id=zoniot-charge
+spring.cloud.gateway.routes[7].uri=http://zoniot-charge
+spring.cloud.gateway.routes[7].predicates[0]=Path=/zoniot-charge/**
+spring.cloud.gateway.routes[7].filters[0]=StripPrefix=1
+spring.cloud.gateway.routes[7].filters[1]=Auth
+
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB

pom.xml

@@ -23,6 +23,7 @@
         <module>zoniot-common/zoniot-core-redis</module>
         <module>zoniot-common/zoniot-core-utils</module>
         <module>zoniot-rmcp</module>
+        <module>zoniot-charge</module>
     </modules>
 
     <!--父工程打包方式为pom-->

zoniot-charge/zoniot-charge-web/src/main/java/com/zcxk/charge/web/client/OperationManagerClient.java

@@ -35,7 +35,7 @@ public interface OperationManagerClient {
     * @return java.lang.Integer
     **/
     @PostMapping("/order/workOrderManage/batchDeleteByAlarms")
-    Integer batchDeleteByAlarms(@RequestParam List<Long> deviceIds);
+    Integer batchDeleteByAlarms(@RequestParam(name="deviceIds") List<Long> deviceIds);
 
     /**
     * updateByAlarms

zoniot-charge/zoniot-charge-web/src/main/resources/bootstrap-prod.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: workflow-mgnt
+    name: zoniot-charge
   profiles:
     active: dev
   cloud:

zoniot-charge/zoniot-charge-web/src/main/resources/bootstrap-sit.yml

@@ -1,6 +1,6 @@
 spring:
   application:
-    name: workflow-mgnt
+    name: zoniot-charge
   profiles:
     active: sit
   cloud:
@@ -8,8 +8,7 @@ spring:
       config:
         namespace: 33c2968d-5b0c-4da2-bfd7-af8ef5a8f669
         server-addr: 10.0.0.63:8848
-        prefix: workflow-mgnt
+        prefix: zoniot-charge
         file-extension: properties
-        group: sit
   main:
     allow-bean-definition-overriding: true

zoniot-charge/zoniot-charge-web/src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
             <pattern>${FILE_LOG_PATTERN}</pattern>
         </encoder>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_PATH}/smartcity-workflow.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/zoniot-charge.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
             <maxHistory>365</maxHistory>
             <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>100MB</maxFileSize>