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

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/controller/DemoController.java

@@ -0,0 +1,38 @@
+package com.zcxk.controller;
+
+import com.zcxk.dao.mysql.SendDao;
+import com.zcxk.dao.sqlserver.ReceiveDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class DemoController {
+    @Autowired
+    ReceiveDao receiveDao;
+    @Autowired
+    SendDao sendDao;
+    @GetMapping("/test")
+    public void countPlanDevice(){
+        sendDao.selectOne();
+        Map<String,Object>args=new HashMap<>();
+        args.put("regionId",null);
+      /*  List<Map<String, Object>> meterInfor = receiveDao.getMeterInfor(args);
+       // List<Map<String, Object>> meterChangeRecord = receiveDao.getMeterChangeRecord(args);
+        args.clear();
+        Map<String,Object>args2=new HashMap<>();
+        List<Map<String, Object>> uploadPlan = receiveDao.getUploadPlan(args2);
+        uploadPlan.forEach(map->{
+          //  args.put("planId ",map.get("PlanId"));
+            receiveDao.creatUploadTask(args);
+        });
+
+       // receiveDao.meterDataInsert(args);
+        System.out.println(1);*/
+
+    }
+}

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/dao/sqlserver/ReceiveDao.java

@@ -2,16 +2,17 @@ package com.zcxk.dao.sqlserver;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 @Mapper
 public interface ReceiveDao {
 
-   void getMeterInfor(Map<String,String> map);
-   void getMeterChangeRecord(Map<String,String> map);
-   void getUploadPlan(Map<String,String> map);
-   void creatUploadTask(Map<String,String> map);
-   void meterDataInsert(Map<String,String> map);
+   List<Map<String,Object>> getMeterInfor(Map<String,Object> map);
+   List<Map<String,Object>>  getMeterChangeRecord(Map<String,Object> map);
+   List<Map<String,Object>> getUploadPlan(Map<String,Object> map);
+   void creatUploadTask(Map<String,Object> map);
+   void meterDataInsert(Map<String,Object> map);
    void dropMeterDataTable();
    void createMeterDataTable();
    void insertIntoMeterDataTemp(Map<String,Object>map);

meter-reading-sishui/read-sqlSever/src/main/resources/application-dev.properties

@@ -13,5 +13,6 @@ spring.datasource.sqlsever.username=LoginNo_MaiTuo
 spring.datasource.sqlsever.password=maituo@OKM123
 spring.datasource.sqlsever.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
 mybatis.configuration.map-underscore-to-camel-case=true
+
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis.configuration.use-column-label=true

meter-reading-sishui/read-sqlSever/src/main/resources/logback-spring.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <springProperty scope="context" name="LOG_PATH" source="logging.path" defaultValue="/tmp" />
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+    <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
+    <appender name="TIME_FILE"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
+            <pattern>${FILE_LOG_PATTERN}</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/smart_city.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <maxHistory>365</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+    </appender>
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="TIME_FILE" />
+    </root>
+</configuration>

meter-reading-sishui/read-sqlSever/src/main/resources/mysql-mapper/SendDao.xml

@@ -6,6 +6,8 @@
 <mapper namespace="com.zcxk.dao.mysql.SendDao">
 
 
-    <select id="selectOne"></select>
+    <select id="selectOne" resultType="map">
+        select count(*) from sms_alarm_details
+    </select>
 
 </mapper>

meter-reading-sishui/read-sqlSever/src/main/resources/sqlserver-mapper/ReceiveDao.xml

@@ -9,16 +9,17 @@
 
 
 
-    <update id="getMeterInfor" parameterType="map" statementType="CALLABLE">
-        { call DBi_GetMeterInfor_Batch(
+    <select id="getMeterInfor" parameterType="map"  statementType="CALLABLE" resultType="map">
+        <![CDATA[ { call DBi_GetMeterInfor_Batch(
                 #{regionId,mode=IN,jdbcType=VARCHAR},
                 #{returnCode,mode=OUT,jdbcType=INTEGER},
                 #{returnMsg,mode=OUT,jdbcType=VARCHAR}
             )
             }
-    </update>
-    <update id="getMeterChangeRecord" parameterType="map" statementType="CALLABLE">
-        { call DBi_GetMeterInfor_Batch(
+             ]]>
+    </select>
+    <select id="getMeterChangeRecord" parameterType="map" statementType="CALLABLE" resultType="map">
+        <![CDATA[ { { call DBi_GetMeterChangeRecord_Batch(
                 #{regionId,mode=IN,jdbcType=VARCHAR},
                 #{changeField,mode=IN,jdbcType=VARCHAR},
                 #{id,mode=IN,jdbcType=INTEGER},
@@ -26,17 +27,19 @@
                 #{returnMsg,mode=OUT,jdbcType=VARCHAR}
             )
             }
-    </update>
-    <update id="getUploadPlan" parameterType="map" statementType="CALLABLE">
-        { call DBi_GetMeterInfor_Batch(
+             ]]>
+    </select>
+    <select id="getUploadPlan" parameterType="map" statementType="CALLABLE" resultType="map">
+        <![CDATA[   { call DBi_GetUploadPlan(
                 #{returnCode,mode=OUT,jdbcType=INTEGER},
                 #{returnMsg,mode=OUT,jdbcType=VARCHAR}
             )
             }
-    </update>
+              ]]>
+    </select>
     <update id="creatUploadTask" parameterType="map" statementType="CALLABLE">
-        { call DBi_GetMeterInfor_Batch(
-                #{regionId,mode=IN,jdbcType=VARCHAR},
+        { call DBi_CreateUploadTask(
+                #{planId,mode=IN,jdbcType=VARCHAR},
                 #{taskId,mode=OUT,jdbcType=VARCHAR},
                 #{returnCode,mode=OUT,jdbcType=INTEGER},
                 #{returnMsg,mode=OUT,jdbcType=VARCHAR}
@@ -44,7 +47,7 @@
             }
     </update>
     <update id="meterDataInsert" parameterType="map" statementType="CALLABLE">
-        { call DBi_GetMeterInfor_Batch(
+        { call DBi_MeterDataInsert_Batch(
                 #{taskId,mode=IN,jdbcType=VARCHAR},
                 #{meterData,mode=IN,jdbcType=VARCHAR},
                 #{returnCode,mode=OUT,jdbcType=INTEGER},