diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
new file mode 100644
index 0000000..96f5964
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.dto.AlarmData;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName UploadController
+ * @Description 实时数据上传接口
+ * @Author lwh 
+ * @Date 2021/4/13 14:07
+ * @Version 1.0
+ */
+@RestController
+public class UploadController {
+    @PostMapping({"api/upload/alarm"})
+    public Object alarm(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        int count = SqlRunner.db().selectCount("select count(1) from casic_optmonitoring.alarm_data where id = {0}", data.getId());
+        if (count == 0) {
+            SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        } else {
+            SqlRunner.db().update("update casic_optmonitoring.alarm_data set alarm_data ={0} where id ={1}", JSON.toJSONString(data), data.getId());
+        }
+        return ResponseData.success();
+    }
+
+    @PostMapping({"api/data/upload"})
+    public Object event(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        return ResponseData.success();
+    }
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
new file mode 100644
index 0000000..96f5964
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.dto.AlarmData;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName UploadController
+ * @Description 实时数据上传接口
+ * @Author lwh 
+ * @Date 2021/4/13 14:07
+ * @Version 1.0
+ */
+@RestController
+public class UploadController {
+    @PostMapping({"api/upload/alarm"})
+    public Object alarm(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        int count = SqlRunner.db().selectCount("select count(1) from casic_optmonitoring.alarm_data where id = {0}", data.getId());
+        if (count == 0) {
+            SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        } else {
+            SqlRunner.db().update("update casic_optmonitoring.alarm_data set alarm_data ={0} where id ={1}", JSON.toJSONString(data), data.getId());
+        }
+        return ResponseData.success();
+    }
+
+    @PostMapping({"api/data/upload"})
+    public Object event(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        return ResponseData.success();
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
new file mode 100644
index 0000000..e97b256
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName AlarmData
+ * @Description 告警数据
+ * @Author lwh
+ * @Date 2021/4/13 14:11
+ * @Version 1.0
+ */
+@Data
+public class AlarmData {
+    private String id;
+    private String deviceName;
+    private String deviceCode;
+
+    /**
+     * 1.告警 2.离线
+     */
+    private String type;
+    private String warnMsg;
+    private String alarmAttr;
+    /**
+     * 0 一般 1 重要 2紧急
+     */
+    private String level;
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
new file mode 100644
index 0000000..96f5964
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.dto.AlarmData;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName UploadController
+ * @Description 实时数据上传接口
+ * @Author lwh 
+ * @Date 2021/4/13 14:07
+ * @Version 1.0
+ */
+@RestController
+public class UploadController {
+    @PostMapping({"api/upload/alarm"})
+    public Object alarm(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        int count = SqlRunner.db().selectCount("select count(1) from casic_optmonitoring.alarm_data where id = {0}", data.getId());
+        if (count == 0) {
+            SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        } else {
+            SqlRunner.db().update("update casic_optmonitoring.alarm_data set alarm_data ={0} where id ={1}", JSON.toJSONString(data), data.getId());
+        }
+        return ResponseData.success();
+    }
+
+    @PostMapping({"api/data/upload"})
+    public Object event(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        return ResponseData.success();
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
new file mode 100644
index 0000000..e97b256
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName AlarmData
+ * @Description 告警数据
+ * @Author lwh
+ * @Date 2021/4/13 14:11
+ * @Version 1.0
+ */
+@Data
+public class AlarmData {
+    private String id;
+    private String deviceName;
+    private String deviceCode;
+
+    /**
+     * 1.告警 2.离线
+     */
+    private String type;
+    private String warnMsg;
+    private String alarmAttr;
+    /**
+     * 0 一般 1 重要 2紧急
+     */
+    private String level;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
index efa941b..d7ce287 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.modular.system.dao.ExternalViewConfigMapper;
 import com.casic.missiles.modular.system.dto.CarPosData;
+import com.casic.missiles.modular.system.dto.CarPostionDTO;
 import com.casic.missiles.modular.system.dto.SocialResponseDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.ExternalViewConfig;
@@ -53,7 +54,8 @@
             String jsonData = HttpUtils.sendGet(url, map, null, new DefaultHttpHeaderHandler());
             SocialResponseDto<CarPosData> carPosData = JSON.parseObject(jsonData, new TypeReference<SocialResponseDto<CarPosData>>(){});
            if(carPosData!=null&&carPosData.getData()!=null&&carPosData.getData().getData().size()>0){
-               SqlRunner.db().update("update casic_urban_governance.dcms_car_info set recordTime = from_unixtime({0}/1000) where simcardnum={1}",new Object[]{carPosData.getData().getData().get(carPosData.getData().getData().size()-1).getRecordTime(),obj});
+               CarPostionDTO posData = carPosData.getData().getData().get(carPosData.getData().getData().size()-1);
+               SqlRunner.db().update("update casic_urban_governance.dcms_car_info set recordTime = from_unixtime({0}/1000),coordinatex={1},coordinatey={2} where simcardnum={3}",new Object[]{posData.getRecordTime(),posData.getCoordinateX(),posData.getCoordinateY(),obj});
            }
         }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
new file mode 100644
index 0000000..96f5964
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.dto.AlarmData;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName UploadController
+ * @Description 实时数据上传接口
+ * @Author lwh 
+ * @Date 2021/4/13 14:07
+ * @Version 1.0
+ */
+@RestController
+public class UploadController {
+    @PostMapping({"api/upload/alarm"})
+    public Object alarm(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        int count = SqlRunner.db().selectCount("select count(1) from casic_optmonitoring.alarm_data where id = {0}", data.getId());
+        if (count == 0) {
+            SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        } else {
+            SqlRunner.db().update("update casic_optmonitoring.alarm_data set alarm_data ={0} where id ={1}", JSON.toJSONString(data), data.getId());
+        }
+        return ResponseData.success();
+    }
+
+    @PostMapping({"api/data/upload"})
+    public Object event(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        return ResponseData.success();
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
new file mode 100644
index 0000000..e97b256
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName AlarmData
+ * @Description 告警数据
+ * @Author lwh
+ * @Date 2021/4/13 14:11
+ * @Version 1.0
+ */
+@Data
+public class AlarmData {
+    private String id;
+    private String deviceName;
+    private String deviceCode;
+
+    /**
+     * 1.告警 2.离线
+     */
+    private String type;
+    private String warnMsg;
+    private String alarmAttr;
+    /**
+     * 0 一般 1 重要 2紧急
+     */
+    private String level;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
index efa941b..d7ce287 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.modular.system.dao.ExternalViewConfigMapper;
 import com.casic.missiles.modular.system.dto.CarPosData;
+import com.casic.missiles.modular.system.dto.CarPostionDTO;
 import com.casic.missiles.modular.system.dto.SocialResponseDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.ExternalViewConfig;
@@ -53,7 +54,8 @@
             String jsonData = HttpUtils.sendGet(url, map, null, new DefaultHttpHeaderHandler());
             SocialResponseDto<CarPosData> carPosData = JSON.parseObject(jsonData, new TypeReference<SocialResponseDto<CarPosData>>(){});
            if(carPosData!=null&&carPosData.getData()!=null&&carPosData.getData().getData().size()>0){
-               SqlRunner.db().update("update casic_urban_governance.dcms_car_info set recordTime = from_unixtime({0}/1000) where simcardnum={1}",new Object[]{carPosData.getData().getData().get(carPosData.getData().getData().size()-1).getRecordTime(),obj});
+               CarPostionDTO posData = carPosData.getData().getData().get(carPosData.getData().getData().size()-1);
+               SqlRunner.db().update("update casic_urban_governance.dcms_car_info set recordTime = from_unixtime({0}/1000),coordinatex={1},coordinatey={2} where simcardnum={3}",new Object[]{posData.getRecordTime(),posData.getCoordinateX(),posData.getCoordinateY(),obj});
            }
         }
 
diff --git a/casic-web/etl/demo/front_db_demo.ktr b/casic-web/etl/demo/front_db_demo.ktr
index d170fef..195243e 100644
--- a/casic-web/etl/demo/front_db_demo.ktr
+++ b/casic-web/etl/demo/front_db_demo.ktr
@@ -436,11 +436,11 @@
   <notepads>
   </notepads>
   <connection>
-    <name>163_casic_people_livelihood</name>
+    <name>163_casic_palnning_construction</name>
     <server>11.100.6.163</server>
     <type>MYSQL</type>
     <access>Native</access>
-    <database>casic_people_livelihood</database>
+    <database>casic_palnning_construction</database>
     <port>3306</port>
     <username>root</username>
     <password>Encrypted 2be98afc86aa7f2e48818bd79ddc0ff89</password>
@@ -495,8 +495,8 @@
     </attributes>
   </connection>
   <connection>
-    <name>交通前置_10.225.240.12</name>
-    <server>10.225.240.12</server>
+    <name>住建前置_10.225.240.11</name>
+    <server>10.225.240.11</server>
     <type>POSTGRESQL</type>
     <access>Native</access>
     <database>front_db</database>
@@ -1078,7 +1078,7 @@
     </GUI>
   </step>
   <step>
-    <name>订单支付数据转换</name>
+    <name>工人基本信息映射</name>
     <type>JsonInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1121,8 +1121,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>order_no</name>
-        <path>$..ORDER_NO</path>
+        <name>worker_name</name>
+        <path>$..WORKER_NAME</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1134,8 +1134,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>park_id</name>
-        <path>$..PARK_ID</path>
+        <name>worker_code</name>
+        <path>$..WORKER_CODE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1147,8 +1147,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>car_no</name>
-        <path>$..CAR_NO</path>
+        <name>head_portrait</name>
+        <path>$..HEAD_PORTRAIT</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1160,8 +1160,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>car_user_id</name>
-        <path>$..CAR_USER_ID</path>
+        <name>mobile</name>
+        <path>$..MOBILE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1173,8 +1173,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>biz_code</name>
-        <path>$..BIZ_CODE</path>
+        <name>work_type_id</name>
+        <path>$..WORK_TYPE_ID</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1186,8 +1186,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>order_type</name>
-        <path>$..ORDER_TYPE</path>
+        <name>sex</name>
+        <path>$..SEX</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1199,8 +1199,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>coupon_detail_id</name>
-        <path>$..COUPON_DETAIL_ID</path>
+        <name>age</name>
+        <path>$..AGE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1212,8 +1212,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>pay_type</name>
-        <path>$..PAY_TYPE</path>
+        <name>birthday</name>
+        <path>$..BIRTHDAY</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1225,8 +1225,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>pay_code</name>
-        <path>$..PAY_CODE</path>
+        <name>dept_id</name>
+        <path>$..DEPT_ID</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1238,8 +1238,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>trade_no</name>
-        <path>$..TRADE_NO</path>
+        <name>nation</name>
+        <path>$..NATION</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1251,8 +1251,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>receivable_amount</name>
-        <path>$..RECEIVABLE_AMOUNT</path>
+        <name>nation_place</name>
+        <path>$..NATION_PLACE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1264,8 +1264,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>receive_amount</name>
-        <path>$..RECEIVE_AMOUNT</path>
+        <name>id_card</name>
+        <path>$..ID_CARD</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1277,60 +1277,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>local_receive_amount</name>
-        <path>$..LOCAL_RECEIVE_AMOUNT</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>online_receive_amount</name>
-        <path>$..ONLINE_RECEIVE_AMOUNT</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>create_time</name>
-        <path>$..CREATE_TIME</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>update_time</name>
-        <path>$..UPDATE_TIME</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>version</name>
-        <path>$..VERSION</path>
+        <name>current_address</name>
+        <path>$..CURRENT_ADDRESS</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1355,8 +1303,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>sync_status</name>
-        <path>$..SYNC_STATUS</path>
+        <name>project_id</name>
+        <path>$..PROJECT_ID</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1415,8 +1363,182 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>313</xloc>
-      <yloc>421</yloc>
+      <xloc>768</xloc>
+      <yloc>272</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>物联网数据转换</name>
+    <type>JsonInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <include>N</include>
+    <include_field/>
+    <rownum>N</rownum>
+    <addresultfile>N</addresultfile>
+    <readurl>N</readurl>
+    <removeSourceField>N</removeSourceField>
+    <IsIgnoreEmptyFile>N</IsIgnoreEmptyFile>
+    <doNotFailIfNoFile>Y</doNotFailIfNoFile>
+    <ignoreMissingPath>Y</ignoreMissingPath>
+    <defaultPathLeafToNull>Y</defaultPathLeafToNull>
+    <rownum_field/>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>id</name>
+        <path>$..ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>device_code</name>
+        <path>$..DEVICE_CODE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>device_name</name>
+        <path>$..DEVICE_NAME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>warn_time</name>
+        <path>$..WARN_TIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>warn_msg</name>
+        <path>$..WARN_MSG</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>device_no</name>
+        <path>$..DEVICE_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>rules</name>
+        <path>$..RULES</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatestatus</name>
+        <path>$..UPDATESTATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatetime</name>
+        <path>$..UPDATETIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+    </fields>
+    <limit>0</limit>
+    <IsInFields>Y</IsInFields>
+    <IsAFile>N</IsAFile>
+    <valueField>result</valueField>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>176</xloc>
+      <yloc>176</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -2915,7 +3037,7 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>163_casic_people_livelihood</connection>
+    <connection>163_casic_palnning_construction</connection>
     <execute_each_row>Y</execute_each_row>
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
@@ -2965,17 +3087,17 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>交通前置_10.225.240.12</connection>
+    <connection>住建前置_10.225.240.11</connection>
     <sql> SELECT
 	col_description ( A.attrelid, A.attnum ) AS COMMENT,
 	format_type ( A.atttypid, A.atttypmod ) AS type,
 	A.attname AS NAME,
-    'parking_zh_order_record' as TABLENAME
+    'iot_warning' as TABLENAME
 FROM
 	pg_class AS C,
 	pg_attribute AS A 
 WHERE
-	C.relname = 'tcjlzfjlb103634' 
+	C.relname = 'gjxxb108055' 
 	AND A.attrelid = C.oid 
 	AND A.attnum > 0
 	and a.attname not in('ins','seq')
@@ -3094,6 +3216,349 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>订单支付数据转换</name>
+    <type>JsonInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <include>N</include>
+    <include_field/>
+    <rownum>N</rownum>
+    <addresultfile>N</addresultfile>
+    <readurl>N</readurl>
+    <removeSourceField>N</removeSourceField>
+    <IsIgnoreEmptyFile>N</IsIgnoreEmptyFile>
+    <doNotFailIfNoFile>Y</doNotFailIfNoFile>
+    <ignoreMissingPath>Y</ignoreMissingPath>
+    <defaultPathLeafToNull>Y</defaultPathLeafToNull>
+    <rownum_field/>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>id</name>
+        <path>$..ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>order_no</name>
+        <path>$..ORDER_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>park_id</name>
+        <path>$..PARK_ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>car_no</name>
+        <path>$..CAR_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>car_user_id</name>
+        <path>$..CAR_USER_ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>biz_code</name>
+        <path>$..BIZ_CODE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>order_type</name>
+        <path>$..ORDER_TYPE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>coupon_detail_id</name>
+        <path>$..COUPON_DETAIL_ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>pay_type</name>
+        <path>$..PAY_TYPE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>pay_code</name>
+        <path>$..PAY_CODE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>trade_no</name>
+        <path>$..TRADE_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>receivable_amount</name>
+        <path>$..RECEIVABLE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>receive_amount</name>
+        <path>$..RECEIVE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>local_receive_amount</name>
+        <path>$..LOCAL_RECEIVE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>online_receive_amount</name>
+        <path>$..ONLINE_RECEIVE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>create_time</name>
+        <path>$..CREATE_TIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>update_time</name>
+        <path>$..UPDATE_TIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>version</name>
+        <path>$..VERSION</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>status</name>
+        <path>$..STATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>sync_status</name>
+        <path>$..SYNC_STATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatestatus</name>
+        <path>$..UPDATESTATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatetime</name>
+        <path>$..UPDATETIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+    </fields>
+    <limit>0</limit>
+    <IsInFields>Y</IsInFields>
+    <IsAFile>N</IsAFile>
+    <valueField>result</valueField>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>688</xloc>
+      <yloc>176</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
new file mode 100644
index 0000000..96f5964
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UploadController.java
@@ -0,0 +1,43 @@
+package com.casic.missiles.modular.system.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.util.ToolUtil;
+import com.casic.missiles.modular.system.dto.AlarmData;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @ClassName UploadController
+ * @Description 实时数据上传接口
+ * @Author lwh 
+ * @Date 2021/4/13 14:07
+ * @Version 1.0
+ */
+@RestController
+public class UploadController {
+    @PostMapping({"api/upload/alarm"})
+    public Object alarm(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        int count = SqlRunner.db().selectCount("select count(1) from casic_optmonitoring.alarm_data where id = {0}", data.getId());
+        if (count == 0) {
+            SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        } else {
+            SqlRunner.db().update("update casic_optmonitoring.alarm_data set alarm_data ={0} where id ={1}", JSON.toJSONString(data), data.getId());
+        }
+        return ResponseData.success();
+    }
+
+    @PostMapping({"api/data/upload"})
+    public Object event(@RequestBody AlarmData data) {
+        if (ToolUtil.isEmpty(data) || ToolUtil.isEmpty(data.getId())) {
+            return ResponseData.error("告警ID不能为空");
+        }
+        SqlRunner.db().insert("insert into casic_optmonitoring.alarm_data values({0},{1})", data.getId(), JSON.toJSONString(data));
+        return ResponseData.success();
+    }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
new file mode 100644
index 0000000..e97b256
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/AlarmData.java
@@ -0,0 +1,28 @@
+package com.casic.missiles.modular.system.dto;
+
+import lombok.Data;
+
+/**
+ * @ClassName AlarmData
+ * @Description 告警数据
+ * @Author lwh
+ * @Date 2021/4/13 14:11
+ * @Version 1.0
+ */
+@Data
+public class AlarmData {
+    private String id;
+    private String deviceName;
+    private String deviceCode;
+
+    /**
+     * 1.告警 2.离线
+     */
+    private String type;
+    private String warnMsg;
+    private String alarmAttr;
+    /**
+     * 0 一般 1 重要 2紧急
+     */
+    private String level;
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
index efa941b..d7ce287 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/ExternalViewConfigServiceImpl.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.core.util.DateUtil;
 import com.casic.missiles.modular.system.dao.ExternalViewConfigMapper;
 import com.casic.missiles.modular.system.dto.CarPosData;
+import com.casic.missiles.modular.system.dto.CarPostionDTO;
 import com.casic.missiles.modular.system.dto.SocialResponseDto;
 import com.casic.missiles.modular.system.handler.DefaultHttpHeaderHandler;
 import com.casic.missiles.modular.system.model.ExternalViewConfig;
@@ -53,7 +54,8 @@
             String jsonData = HttpUtils.sendGet(url, map, null, new DefaultHttpHeaderHandler());
             SocialResponseDto<CarPosData> carPosData = JSON.parseObject(jsonData, new TypeReference<SocialResponseDto<CarPosData>>(){});
            if(carPosData!=null&&carPosData.getData()!=null&&carPosData.getData().getData().size()>0){
-               SqlRunner.db().update("update casic_urban_governance.dcms_car_info set recordTime = from_unixtime({0}/1000) where simcardnum={1}",new Object[]{carPosData.getData().getData().get(carPosData.getData().getData().size()-1).getRecordTime(),obj});
+               CarPostionDTO posData = carPosData.getData().getData().get(carPosData.getData().getData().size()-1);
+               SqlRunner.db().update("update casic_urban_governance.dcms_car_info set recordTime = from_unixtime({0}/1000),coordinatex={1},coordinatey={2} where simcardnum={3}",new Object[]{posData.getRecordTime(),posData.getCoordinateX(),posData.getCoordinateY(),obj});
            }
         }
 
diff --git a/casic-web/etl/demo/front_db_demo.ktr b/casic-web/etl/demo/front_db_demo.ktr
index d170fef..195243e 100644
--- a/casic-web/etl/demo/front_db_demo.ktr
+++ b/casic-web/etl/demo/front_db_demo.ktr
@@ -436,11 +436,11 @@
   <notepads>
   </notepads>
   <connection>
-    <name>163_casic_people_livelihood</name>
+    <name>163_casic_palnning_construction</name>
     <server>11.100.6.163</server>
     <type>MYSQL</type>
     <access>Native</access>
-    <database>casic_people_livelihood</database>
+    <database>casic_palnning_construction</database>
     <port>3306</port>
     <username>root</username>
     <password>Encrypted 2be98afc86aa7f2e48818bd79ddc0ff89</password>
@@ -495,8 +495,8 @@
     </attributes>
   </connection>
   <connection>
-    <name>交通前置_10.225.240.12</name>
-    <server>10.225.240.12</server>
+    <name>住建前置_10.225.240.11</name>
+    <server>10.225.240.11</server>
     <type>POSTGRESQL</type>
     <access>Native</access>
     <database>front_db</database>
@@ -1078,7 +1078,7 @@
     </GUI>
   </step>
   <step>
-    <name>订单支付数据转换</name>
+    <name>工人基本信息映射</name>
     <type>JsonInput</type>
     <description/>
     <distribute>Y</distribute>
@@ -1121,8 +1121,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>order_no</name>
-        <path>$..ORDER_NO</path>
+        <name>worker_name</name>
+        <path>$..WORKER_NAME</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1134,8 +1134,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>park_id</name>
-        <path>$..PARK_ID</path>
+        <name>worker_code</name>
+        <path>$..WORKER_CODE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1147,8 +1147,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>car_no</name>
-        <path>$..CAR_NO</path>
+        <name>head_portrait</name>
+        <path>$..HEAD_PORTRAIT</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1160,8 +1160,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>car_user_id</name>
-        <path>$..CAR_USER_ID</path>
+        <name>mobile</name>
+        <path>$..MOBILE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1173,8 +1173,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>biz_code</name>
-        <path>$..BIZ_CODE</path>
+        <name>work_type_id</name>
+        <path>$..WORK_TYPE_ID</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1186,8 +1186,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>order_type</name>
-        <path>$..ORDER_TYPE</path>
+        <name>sex</name>
+        <path>$..SEX</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1199,8 +1199,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>coupon_detail_id</name>
-        <path>$..COUPON_DETAIL_ID</path>
+        <name>age</name>
+        <path>$..AGE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1212,8 +1212,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>pay_type</name>
-        <path>$..PAY_TYPE</path>
+        <name>birthday</name>
+        <path>$..BIRTHDAY</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1225,8 +1225,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>pay_code</name>
-        <path>$..PAY_CODE</path>
+        <name>dept_id</name>
+        <path>$..DEPT_ID</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1238,8 +1238,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>trade_no</name>
-        <path>$..TRADE_NO</path>
+        <name>nation</name>
+        <path>$..NATION</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1251,8 +1251,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>receivable_amount</name>
-        <path>$..RECEIVABLE_AMOUNT</path>
+        <name>nation_place</name>
+        <path>$..NATION_PLACE</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1264,8 +1264,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>receive_amount</name>
-        <path>$..RECEIVE_AMOUNT</path>
+        <name>id_card</name>
+        <path>$..ID_CARD</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1277,60 +1277,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>local_receive_amount</name>
-        <path>$..LOCAL_RECEIVE_AMOUNT</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>online_receive_amount</name>
-        <path>$..ONLINE_RECEIVE_AMOUNT</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>create_time</name>
-        <path>$..CREATE_TIME</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>update_time</name>
-        <path>$..UPDATE_TIME</path>
-        <type>None</type>
-        <format/>
-        <currency/>
-        <decimal/>
-        <group/>
-        <length>-1</length>
-        <precision>-1</precision>
-        <trim_type>none</trim_type>
-        <repeat>N</repeat>
-      </field>
-      <field>
-        <name>version</name>
-        <path>$..VERSION</path>
+        <name>current_address</name>
+        <path>$..CURRENT_ADDRESS</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1355,8 +1303,8 @@
         <repeat>N</repeat>
       </field>
       <field>
-        <name>sync_status</name>
-        <path>$..SYNC_STATUS</path>
+        <name>project_id</name>
+        <path>$..PROJECT_ID</path>
         <type>None</type>
         <format/>
         <currency/>
@@ -1415,8 +1363,182 @@
       </output>
     </remotesteps>
     <GUI>
-      <xloc>313</xloc>
-      <yloc>421</yloc>
+      <xloc>768</xloc>
+      <yloc>272</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
+  <step>
+    <name>物联网数据转换</name>
+    <type>JsonInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <include>N</include>
+    <include_field/>
+    <rownum>N</rownum>
+    <addresultfile>N</addresultfile>
+    <readurl>N</readurl>
+    <removeSourceField>N</removeSourceField>
+    <IsIgnoreEmptyFile>N</IsIgnoreEmptyFile>
+    <doNotFailIfNoFile>Y</doNotFailIfNoFile>
+    <ignoreMissingPath>Y</ignoreMissingPath>
+    <defaultPathLeafToNull>Y</defaultPathLeafToNull>
+    <rownum_field/>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>id</name>
+        <path>$..ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>device_code</name>
+        <path>$..DEVICE_CODE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>device_name</name>
+        <path>$..DEVICE_NAME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>warn_time</name>
+        <path>$..WARN_TIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>warn_msg</name>
+        <path>$..WARN_MSG</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>device_no</name>
+        <path>$..DEVICE_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>rules</name>
+        <path>$..RULES</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatestatus</name>
+        <path>$..UPDATESTATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatetime</name>
+        <path>$..UPDATETIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+    </fields>
+    <limit>0</limit>
+    <IsInFields>Y</IsInFields>
+    <IsAFile>N</IsAFile>
+    <valueField>result</valueField>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>176</xloc>
+      <yloc>176</yloc>
       <draw>Y</draw>
     </GUI>
   </step>
@@ -2915,7 +3037,7 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>163_casic_people_livelihood</connection>
+    <connection>163_casic_palnning_construction</connection>
     <execute_each_row>Y</execute_each_row>
     <single_statement>N</single_statement>
     <replace_variables>Y</replace_variables>
@@ -2965,17 +3087,17 @@
       <method>none</method>
       <schema_name/>
     </partitioning>
-    <connection>交通前置_10.225.240.12</connection>
+    <connection>住建前置_10.225.240.11</connection>
     <sql> SELECT
 	col_description ( A.attrelid, A.attnum ) AS COMMENT,
 	format_type ( A.atttypid, A.atttypmod ) AS type,
 	A.attname AS NAME,
-    'parking_zh_order_record' as TABLENAME
+    'iot_warning' as TABLENAME
 FROM
 	pg_class AS C,
 	pg_attribute AS A 
 WHERE
-	C.relname = 'tcjlzfjlb103634' 
+	C.relname = 'gjxxb108055' 
 	AND A.attrelid = C.oid 
 	AND A.attnum > 0
 	and a.attname not in('ins','seq')
@@ -3094,6 +3216,349 @@
       <draw>Y</draw>
     </GUI>
   </step>
+  <step>
+    <name>订单支付数据转换</name>
+    <type>JsonInput</type>
+    <description/>
+    <distribute>Y</distribute>
+    <custom_distribution/>
+    <copies>1</copies>
+    <partitioning>
+      <method>none</method>
+      <schema_name/>
+    </partitioning>
+    <include>N</include>
+    <include_field/>
+    <rownum>N</rownum>
+    <addresultfile>N</addresultfile>
+    <readurl>N</readurl>
+    <removeSourceField>N</removeSourceField>
+    <IsIgnoreEmptyFile>N</IsIgnoreEmptyFile>
+    <doNotFailIfNoFile>Y</doNotFailIfNoFile>
+    <ignoreMissingPath>Y</ignoreMissingPath>
+    <defaultPathLeafToNull>Y</defaultPathLeafToNull>
+    <rownum_field/>
+    <file>
+      <name/>
+      <filemask/>
+      <exclude_filemask/>
+      <file_required>N</file_required>
+      <include_subfolders>N</include_subfolders>
+    </file>
+    <fields>
+      <field>
+        <name>id</name>
+        <path>$..ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>order_no</name>
+        <path>$..ORDER_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>park_id</name>
+        <path>$..PARK_ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>car_no</name>
+        <path>$..CAR_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>car_user_id</name>
+        <path>$..CAR_USER_ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>biz_code</name>
+        <path>$..BIZ_CODE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>order_type</name>
+        <path>$..ORDER_TYPE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>coupon_detail_id</name>
+        <path>$..COUPON_DETAIL_ID</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>pay_type</name>
+        <path>$..PAY_TYPE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>pay_code</name>
+        <path>$..PAY_CODE</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>trade_no</name>
+        <path>$..TRADE_NO</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>receivable_amount</name>
+        <path>$..RECEIVABLE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>receive_amount</name>
+        <path>$..RECEIVE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>local_receive_amount</name>
+        <path>$..LOCAL_RECEIVE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>online_receive_amount</name>
+        <path>$..ONLINE_RECEIVE_AMOUNT</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>create_time</name>
+        <path>$..CREATE_TIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>update_time</name>
+        <path>$..UPDATE_TIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>version</name>
+        <path>$..VERSION</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>status</name>
+        <path>$..STATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>sync_status</name>
+        <path>$..SYNC_STATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatestatus</name>
+        <path>$..UPDATESTATUS</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+      <field>
+        <name>updatetime</name>
+        <path>$..UPDATETIME</path>
+        <type>None</type>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+      </field>
+    </fields>
+    <limit>0</limit>
+    <IsInFields>Y</IsInFields>
+    <IsAFile>N</IsAFile>
+    <valueField>result</valueField>
+    <shortFileFieldName/>
+    <pathFieldName/>
+    <hiddenFieldName/>
+    <lastModificationTimeFieldName/>
+    <uriNameFieldName/>
+    <rootUriNameFieldName/>
+    <extensionFieldName/>
+    <sizeFieldName/>
+    <attributes/>
+    <cluster_schema/>
+    <remotesteps>
+      <input>
+      </input>
+      <output>
+      </output>
+    </remotesteps>
+    <GUI>
+      <xloc>688</xloc>
+      <yloc>176</yloc>
+      <draw>Y</draw>
+    </GUI>
+  </step>
   <step_error_handling>
   </step_error_handling>
   <slave-step-copy-partition-distribution>
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 44a5841..fbc79e8 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -1,5 +1,6 @@
 package com.casic.missiles;
 
+import com.casic.missiles.core.util.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;