更新接口

src/main/java/com/sooka/sponest/construction/api/GasApi.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.construction.api;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoringData;
 import com.sooka.sponest.construction.gas.service.*;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -16,32 +17,9 @@ import javax.annotation.Resource;
 public class GasApi {
 
     private static final org.slf4j.Logger log = LoggerFactory.getLogger(GasApi.class);
-    @Resource
-    private IGasRepairRecordService repairRecordService;
-
-    @Resource
-    private IGasStationService stationService;
-
-    @Resource
-    private IGasCustomerService customerService;
 
     @Resource
-    private IGasDeviceBasicService deviceBasicService;
-
-    @Resource
-    private IGasDeviceOperationService deviceOperationService;
-
-    @Resource
-    private IGasInspectionRecordService inspectionRecordService;
-
-    @Resource
-    private IGasCustomerTrainingService customerTrainingService;
-
-    @Resource
-    private IGasDeviceAlarmService deviceAlarmService;
-
-    @Resource
-    private IGasDeviceMonitoringService deviceMonitoringService;
+    private IGasDeviceMonitoringDataService deviceMonitoringDataService;
 
     /**
      * 燃气-维修数据-接收接口
@@ -163,12 +141,13 @@ public class GasApi {
     @RequestMapping("/deviceMonitoringDataReceiver")
     public AjaxResult deviceMonitoringDataReceiver(@RequestBody JSONObject json) {
         log.info("燃气-行业监测指标数据-接收成功: {}", json);
-//        boolean result = deviceMonitoringService.saveDeviceMonitoringData(deviceMonitoring);
-//        if (result) {
+        GasDeviceMonitoringData deviceMonitoring = JSONObject.toJavaObject(json, GasDeviceMonitoringData.class);
+        int result = deviceMonitoringDataService.insertGasDeviceMonitoringData(deviceMonitoring);
+        if (result > 0) {
             return AjaxResult.success("接收成功");
-//        } else {
-//            return AjaxResult.error("接收失败");
-//        }
+        } else {
+            return AjaxResult.error("接收失败");
+        }
     }
 
 }

src/main/java/com/sooka/sponest/construction/gas/controller/GasDeviceMonitoringDataController.java

@@ -5,7 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.log.annotation.Log;
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
+import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoringData;
 import com.sooka.sponest.construction.gas.service.IGasDeviceMonitoringDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -30,9 +30,9 @@ public class GasDeviceMonitoringDataController extends BaseController {
      * 查询燃气设备监测数据列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(GasDeviceMonitoring gasDeviceMonitoringData) {
+    public TableDataInfo list(GasDeviceMonitoringData gasDeviceMonitoringData) {
         startPage();
-        List<GasDeviceMonitoring> list = gasDeviceMonitoringDataService.selectGasDeviceMonitoringDataList(gasDeviceMonitoringData);
+        List<GasDeviceMonitoringData> list = gasDeviceMonitoringDataService.selectGasDeviceMonitoringDataList(gasDeviceMonitoringData);
         return getDataTable(list);
     }
 
@@ -41,9 +41,9 @@ public class GasDeviceMonitoringDataController extends BaseController {
      */
     @Log(title = "燃气设备监测数据", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, GasDeviceMonitoring gasDeviceMonitoringData) {
-        List<GasDeviceMonitoring> list = gasDeviceMonitoringDataService.selectGasDeviceMonitoringDataList(gasDeviceMonitoringData);
-        ExcelUtil<GasDeviceMonitoring> util = new ExcelUtil<GasDeviceMonitoring>(GasDeviceMonitoring.class);
+    public void export(HttpServletResponse response, GasDeviceMonitoringData gasDeviceMonitoringData) {
+        List<GasDeviceMonitoringData> list = gasDeviceMonitoringDataService.selectGasDeviceMonitoringDataList(gasDeviceMonitoringData);
+        ExcelUtil<GasDeviceMonitoringData> util = new ExcelUtil<GasDeviceMonitoringData>(GasDeviceMonitoringData.class);
         util.exportExcel(response, list, "燃气设备监测数据数据");
     }
 
@@ -60,7 +60,7 @@ public class GasDeviceMonitoringDataController extends BaseController {
      */
     @Log(title = "燃气设备监测数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody GasDeviceMonitoring gasDeviceMonitoringData) {
+    public AjaxResult add(@RequestBody GasDeviceMonitoringData gasDeviceMonitoringData) {
         return toAjax(gasDeviceMonitoringDataService.insertGasDeviceMonitoringData(gasDeviceMonitoringData));
     }
 
@@ -69,7 +69,7 @@ public class GasDeviceMonitoringDataController extends BaseController {
      */
     @Log(title = "燃气设备监测数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody GasDeviceMonitoring gasDeviceMonitoringData) {
+    public AjaxResult edit(@RequestBody GasDeviceMonitoringData gasDeviceMonitoringData) {
         return toAjax(gasDeviceMonitoringDataService.updateGasDeviceMonitoringData(gasDeviceMonitoringData));
     }
 

src/main/java/com/sooka/sponest/construction/gas/domain/GasDeviceMonitoring.java

@@ -1,104 +0,0 @@
-package com.sooka.sponest.construction.gas.domain;
-
-
-import lombok.Data;
-
-/**
- * 燃气行业监测指标表实体类
- *
- * @author System
- * @date 2023/07/10
- */
-@Data
-public class GasDeviceMonitoring {
-
-    /**
-     * 主键ID
-     */
-    private Long id;
-
-    /**
-     * 设备编码
-     */
-    private String deviceCode;
-
-    /**
-     * 点位标识码
-     */
-    private String pointId;
-
-    /**
-     * 监测指标
-     */
-    private String indicator;
-
-    /**
-     * 监测值
-     */
-    private String monitoringValue;
-
-    /**
-     * 监测值单位
-     */
-    private String valueUnit;
-
-    /**
-     * 采集时间
-     */
-    private String collectionTime;
-
-    /**
-     * 上报时间
-     */
-    private String reportTime;
-
-    /**
-     * 同步时间
-     */
-    private String syncTime;
-
-    /**
-     * 同步状态
-     */
-    private String syncStatus;
-
-    /**
-     * 设备状态
-     */
-    private String deviceStatus;
-
-    /**
-     * 压力
-     */
-    private String pressure;
-
-    /**
-     * 流量
-     */
-    private String flowRate;
-
-    /**
-     * 相邻地下空间内甲烷气体浓度
-     */
-    private String mgc;
-
-    /**
-     * 燃气场站内浓度
-     */
-    private String stationConcentration;
-
-    /**
-     * 人口密集区用气餐饮场所的可燃气体浓度
-     */
-    private String cgc;
-
-    /**
-     * 数据创建时间
-     */
-    private String createTime;
-
-    /**
-     * 数据更新时间
-     */
-    private String updateTime;
-}

src/main/java/com/sooka/sponest/construction/gas/domain/GasDeviceMonitoringData.java

@@ -1,15 +1,16 @@
 package com.sooka.sponest.construction.gas.domain;
 
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import lombok.Data;
 
-import java.util.Date;
+import lombok.Data;
 
 /**
- * 燃气设备监测数据表实体类
+ * 燃气行业监测指标表实体类
+ *
+ * @author System
+ * @date 2023/07/10
  */
 @Data
-public class GasDeviceMonitoringData extends BaseEntity {
+public class GasDeviceMonitoringData {
 
     /**
      * 主键ID
@@ -17,52 +18,87 @@ public class GasDeviceMonitoringData extends BaseEntity {
     private Long id;
 
     /**
-     * 燃气压力
+     * 设备编码
      */
-    private String gasPressure;
+    private String deviceCode;
 
     /**
-     * 燃气流量
+     * 点位标识码
      */
-    private String gasFlow;
+    private String pointId;
 
     /**
-     * 燃气浓度
+     * 监测指标
      */
-    private String gasConcentration;
+    private String indicator;
 
     /**
-     * 温度
+     * 监测值
      */
-    private String temperature;
+    private String monitoringValue;
 
     /**
-     * 湿度
+     * 监测值单位
      */
-    private String humidity;
+    private String valueUnit;
 
     /**
-     * 阀门状态
+     * 采集时间
      */
-    private String valveStatus;
+    private String collectionTime;
 
     /**
-     * 监测时间
+     * 上报时间
      */
-    private Date monitoringTime;
+    private String reportTime;
 
     /**
-     * 监测点位位置
+     * 同步时间
      */
-    private String location;
+    private String syncTime;
 
     /**
-     * 监测设备编号
+     * 同步状态
      */
-    private String deviceCode;
+    private String syncStatus;
+
+    /**
+     * 设备状态
+     */
+    private String deviceStatus;
+
+    /**
+     * 压力
+     */
+    private String pressure;
+
+    /**
+     * 流量
+     */
+    private String flowRate;
+
+    /**
+     * 相邻地下空间内甲烷气体浓度
+     */
+    private String mgc;
+
+    /**
+     * 燃气场站内浓度
+     */
+    private String stationConcentration;
+
+    /**
+     * 人口密集区用气餐饮场所的可燃气体浓度
+     */
+    private String cgc;
+
+    /**
+     * 数据创建时间
+     */
+    private String createTime;
 
     /**
-     * 监测设备名称
+     * 数据更新时间
      */
-    private String deviceName;
+    private String updateTime;
 }

src/main/java/com/sooka/sponest/construction/gas/mapper/GasDeviceMonitoringDataMapper.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.construction.gas.mapper;
 
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
+import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoringData;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -17,7 +17,7 @@ public interface GasDeviceMonitoringDataMapper {
      * @param deviceMonitoring 设备监测数据列表
      * @return 插入数量
      */
-    int insertDeviceMonitoring(List<GasDeviceMonitoring> deviceMonitoring);
+    int insertDeviceMonitoring(List<GasDeviceMonitoringData> deviceMonitoring);
 
     /**
      * 查询燃气设备监测数据列表
@@ -25,7 +25,7 @@ public interface GasDeviceMonitoringDataMapper {
      * @param gasDeviceMonitoringData 燃气设备监测数据
      * @return 燃气设备监测数据集合
      */
-    List<GasDeviceMonitoring> selectGasDeviceMonitoringDataList(GasDeviceMonitoring gasDeviceMonitoringData);
+    List<GasDeviceMonitoringData> selectGasDeviceMonitoringDataList(GasDeviceMonitoringData gasDeviceMonitoringData);
 
     /**
      * 查询燃气设备监测数据详细
@@ -33,7 +33,7 @@ public interface GasDeviceMonitoringDataMapper {
      * @param id 燃气设备监测数据ID
      * @return 燃气设备监测数据
      */
-    GasDeviceMonitoring selectGasDeviceMonitoringDataById(Long id);
+    GasDeviceMonitoringData selectGasDeviceMonitoringDataById(Long id);
 
     /**
      * 新增燃气设备监测数据
@@ -41,7 +41,7 @@ public interface GasDeviceMonitoringDataMapper {
      * @param gasDeviceMonitoringData 燃气设备监测数据
      * @return 结果
      */
-    int insertGasDeviceMonitoringData(GasDeviceMonitoring gasDeviceMonitoringData);
+    int insertGasDeviceMonitoringData(GasDeviceMonitoringData gasDeviceMonitoringData);
 
     /**
      * 修改燃气设备监测数据
@@ -49,7 +49,7 @@ public interface GasDeviceMonitoringDataMapper {
      * @param gasDeviceMonitoringData 燃气设备监测数据
      * @return 结果
      */
-    int updateGasDeviceMonitoringData(GasDeviceMonitoring gasDeviceMonitoringData);
+    int updateGasDeviceMonitoringData(GasDeviceMonitoringData gasDeviceMonitoringData);
 
     /**
      * 删除燃气设备监测数据

src/main/java/com/sooka/sponest/construction/gas/mapper/GasDeviceMonitoringMapper.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.construction.gas.mapper;
 
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
+import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoringData;
 
 import java.util.List;
 
@@ -17,5 +17,5 @@ public interface GasDeviceMonitoringMapper {
      * @param industryMonitoring 行业监测指标记录列表
      * @return 插入条数
      */
-    int insertDeviceMonitoring(List<GasDeviceMonitoring> industryMonitoring);
+    int insertDeviceMonitoring(GasDeviceMonitoringData industryMonitoring);
 }

src/main/java/com/sooka/sponest/construction/gas/service/IGasDeviceMonitoringDataService.java

@@ -1,6 +1,6 @@
 package com.sooka.sponest.construction.gas.service;
 
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
+import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoringData;
 
 import java.util.List;
 
@@ -15,7 +15,7 @@ public interface IGasDeviceMonitoringDataService {
      * @param deviceMonitoring 设备监测数据列表
      * @return 是否保存成功
      */
-    boolean saveDeviceMonitoringData(List<GasDeviceMonitoring> deviceMonitoring);
+    boolean saveDeviceMonitoringData(List<GasDeviceMonitoringData> deviceMonitoring);
 
     /**
      * 查询燃气设备监测数据列表
@@ -23,7 +23,7 @@ public interface IGasDeviceMonitoringDataService {
      * @param gasDeviceMonitoringData 燃气设备监测数据
      * @return 燃气设备监测数据集合
      */
-    List<GasDeviceMonitoring> selectGasDeviceMonitoringDataList(GasDeviceMonitoring gasDeviceMonitoringData);
+    List<GasDeviceMonitoringData> selectGasDeviceMonitoringDataList(GasDeviceMonitoringData gasDeviceMonitoringData);
 
     /**
      * 查询燃气设备监测数据详细
@@ -31,7 +31,7 @@ public interface IGasDeviceMonitoringDataService {
      * @param id 燃气设备监测数据ID
      * @return 燃气设备监测数据
      */
-    GasDeviceMonitoring selectGasDeviceMonitoringDataById(Long id);
+    GasDeviceMonitoringData selectGasDeviceMonitoringDataById(Long id);
 
     /**
      * 新增燃气设备监测数据
@@ -39,7 +39,7 @@ public interface IGasDeviceMonitoringDataService {
      * @param gasDeviceMonitoringData 燃气设备监测数据
      * @return 结果
      */
-    int insertGasDeviceMonitoringData(GasDeviceMonitoring gasDeviceMonitoringData);
+    int insertGasDeviceMonitoringData(GasDeviceMonitoringData gasDeviceMonitoringData);
 
     /**
      * 修改燃气设备监测数据
@@ -47,7 +47,7 @@ public interface IGasDeviceMonitoringDataService {
      * @param gasDeviceMonitoringData 燃气设备监测数据
      * @return 结果
      */
-    int updateGasDeviceMonitoringData(GasDeviceMonitoring gasDeviceMonitoringData);
+    int updateGasDeviceMonitoringData(GasDeviceMonitoringData gasDeviceMonitoringData);
 
     /**
      * 删除燃气设备监测数据

src/main/java/com/sooka/sponest/construction/gas/service/IGasDeviceMonitoringService.java

@@ -1,21 +0,0 @@
-package com.sooka.sponest.construction.gas.service;
-
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
-
-import java.util.List;
-
-/**
- * 燃气行业监测指标数据Service接口
- *
- * @author System
- * @date 2023/07/10
- */
-public interface IGasDeviceMonitoringService {
-    /**
-     * 批量保存行业监测指标数据
-     *
-     * @param industryMonitoring 行业监测指标数据列表
-     * @return 是否保存成功
-     */
-    boolean saveDeviceMonitoringData(List<GasDeviceMonitoring> industryMonitoring);
-}

src/main/java/com/sooka/sponest/construction/gas/service/impl/DeviceMonitoringServiceImpl.java

@@ -1,50 +0,0 @@
-package com.sooka.sponest.construction.gas.service.impl;
-
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
-import com.sooka.sponest.construction.gas.mapper.GasDeviceMonitoringMapper;
-import com.sooka.sponest.construction.gas.service.IGasDeviceMonitoringService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * 燃气行业监测指标数据Service实现类
- *
- * @author System
- * @date 2023/07/10
- */
-@Service
-@Transactional
-public class DeviceMonitoringServiceImpl implements IGasDeviceMonitoringService {
-
-    private static final Logger log = LoggerFactory.getLogger(DeviceMonitoringServiceImpl.class);
-
-    @Resource
-    private GasDeviceMonitoringMapper gasDeviceMonitoringMapper;
-
-    /**
-     * 批量保存行业监测指标数据
-     *
-     * @param industryMonitoring 行业监测指标数据列表
-     * @return 是否保存成功
-     */
-    @Override
-    public boolean saveDeviceMonitoringData(List<GasDeviceMonitoring> industryMonitoring) {
-        try {
-            if (industryMonitoring != null && !industryMonitoring.isEmpty()) {
-                int result = gasDeviceMonitoringMapper.insertDeviceMonitoring(industryMonitoring);
-                log.info("燃气行业监测指标数据保存成功，共保存 {} 条数据", result);
-                return result > 0;
-            }
-            log.warn("燃气行业监测指标数据列表为空，无需保存");
-            return false;
-        } catch (Exception e) {
-            log.error("燃气行业监测指标数据保存失败", e);
-            return false;
-        }
-    }
-}

src/main/java/com/sooka/sponest/construction/gas/service/impl/GasDeviceMonitoringDataServiceImpl.java

@@ -1,7 +1,7 @@
 package com.sooka.sponest.construction.gas.service.impl;
 
 import com.sooka.sponest.construction.gas.domain.GasDeviceDept;
-import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoring;
+import com.sooka.sponest.construction.gas.domain.GasDeviceMonitoringData;
 import com.sooka.sponest.construction.gas.domain.GasDeviceThreshold;
 import com.sooka.sponest.construction.gas.mapper.GasDeviceDeptMapper;
 import com.sooka.sponest.construction.gas.mapper.GasDeviceMonitoringDataMapper;
@@ -50,7 +50,7 @@ public class GasDeviceMonitoringDataServiceImpl implements IGasDeviceMonitoringD
      */
     @Override
     @Transactional
-    public boolean saveDeviceMonitoringData(List<GasDeviceMonitoring> deviceMonitoring) {
+    public boolean saveDeviceMonitoringData(List<GasDeviceMonitoringData> deviceMonitoring) {
         try {
             if (deviceMonitoring != null && !deviceMonitoring.isEmpty()) {
                 int count = gasDeviceMonitoringDataMapper.insertDeviceMonitoring(deviceMonitoring);
@@ -68,7 +68,7 @@ public class GasDeviceMonitoringDataServiceImpl implements IGasDeviceMonitoringD
      * 查询燃气设备监测数据列表
      */
     @Override
-    public List<GasDeviceMonitoring> selectGasDeviceMonitoringDataList(GasDeviceMonitoring gasDeviceMonitoringData) {
+    public List<GasDeviceMonitoringData> selectGasDeviceMonitoringDataList(GasDeviceMonitoringData gasDeviceMonitoringData) {
         return gasDeviceMonitoringDataMapper.selectGasDeviceMonitoringDataList(gasDeviceMonitoringData);
     }
 
@@ -76,7 +76,7 @@ public class GasDeviceMonitoringDataServiceImpl implements IGasDeviceMonitoringD
      * 根据ID查询燃气设备监测数据
      */
     @Override
-    public GasDeviceMonitoring selectGasDeviceMonitoringDataById(Long id) {
+    public GasDeviceMonitoringData selectGasDeviceMonitoringDataById(Long id) {
         return gasDeviceMonitoringDataMapper.selectGasDeviceMonitoringDataById(id);
     }
 
@@ -84,7 +84,7 @@ public class GasDeviceMonitoringDataServiceImpl implements IGasDeviceMonitoringD
      * 新增燃气设备监测数据
      */
     @Override
-    public int insertGasDeviceMonitoringData(GasDeviceMonitoring gasDeviceMonitoringData) {
+    public int insertGasDeviceMonitoringData(GasDeviceMonitoringData gasDeviceMonitoringData) {
         reportEvent(gasDeviceMonitoringData);
         return gasDeviceMonitoringDataMapper.insertGasDeviceMonitoringData(gasDeviceMonitoringData);
     }
@@ -93,12 +93,12 @@ public class GasDeviceMonitoringDataServiceImpl implements IGasDeviceMonitoringD
      * 修改燃气设备监测数据
      */
     @Override
-    public int updateGasDeviceMonitoringData(GasDeviceMonitoring gasDeviceMonitoringData) {
+    public int updateGasDeviceMonitoringData(GasDeviceMonitoringData gasDeviceMonitoringData) {
         reportEvent(gasDeviceMonitoringData);
         return gasDeviceMonitoringDataMapper.updateGasDeviceMonitoringData(gasDeviceMonitoringData);
     }
 
-    private void reportEvent(GasDeviceMonitoring vo) {
+    private void reportEvent(GasDeviceMonitoringData vo) {
         boolean flag = false;
         String deviceCode = vo.getDeviceCode();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

src/main/resources/mapper/construction/gas/GasDeviceMonitoringDataMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.sponest.construction.gas.mapper.GasDeviceMonitoringDataMapper">
 
-    <resultMap type="GasDeviceMonitoring" id="GasDeviceMonitoringDataResult">
+    <resultMap type="GasDeviceMonitoringData" id="GasDeviceMonitoringDataResult">
         <result property="id" column="id"/>
         <result property="deviceCode" column="device_code"/>
         <result property="pressure" column="pressure"/>
@@ -29,7 +29,7 @@
         from gas_device_monitoring_data
     </sql>
 
-    <select id="selectGasDeviceMonitoringDataList" parameterType="GasDeviceMonitoring" resultMap="GasDeviceMonitoringDataResult">
+    <select id="selectGasDeviceMonitoringDataList" parameterType="GasDeviceMonitoringData" resultMap="GasDeviceMonitoringDataResult">
         select
         a.id,
         a.device_code,
@@ -65,31 +65,49 @@
         where a.id = #{id}
     </select>
 
-    <insert id="insertGasDeviceMonitoringData" parameterType="GasDeviceMonitoring" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertGasDeviceMonitoringData" parameterType="GasDeviceMonitoringData" useGeneratedKeys="true" keyProperty="id">
         insert into gas_device_monitoring_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">device_code,</if>
+            <if test="pointId != null and pressure != ''">point_id,</if>
+            <if test="indicator != null and pressure != ''">indicator,</if>
+            <if test="monitoringValue != null and pressure != ''">monitoring_value,</if>
+            <if test="valueUnit != null and pressure != ''">value_unit,</if>
+            <if test="collectionTime != null and pressure != ''">collection_time,</if>
+            <if test="reportTime != null and pressure != ''">report_time,</if>
+            <if test="syncTime != null and pressure != ''">sync_time,</if>
+            <if test="syncStatus != null and pressure != ''">sync_status,</if>
+            <if test="deviceStatus != null and pressure != ''">device_status,</if>
             <if test="pressure != null and pressure != ''">pressure,</if>
             <if test="flowRate != null and flowRate != ''">flow_rate,</if>
             <if test="mgc != null and mgc != ''">mgc,</if>
             <if test="stationConcentration != null and stationConcentration != ''">station_concentration,</if>
             <if test="cgc != null and cgc != ''">cgc,</if>
-            <if test="deviceCode != null and deviceCode != ''">device_code,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
+            <if test="pointId != null and pointId != ''">#{pointId},</if>
+            <if test="indicator != null and indicator != ''">#{indicator},</if>
+            <if test="monitoringValue != null and monitoringValue != ''">#{monitoringValue},</if>
+            <if test="valueUnit != null and valueUnit != ''">#{valueUnit},</if>
+            <if test="collectionTime != null and collectionTime != ''">#{collectionTime},</if>
+            <if test="reportTime != null and reportTime != ''">#{reportTime},</if>
+            <if test="syncTime != null and syncTime != ''">#{syncTime},</if>
+            <if test="syncStatus != null and syncStatus != ''">#{syncStatus},</if>
+            <if test="deviceStatus != null and deviceStatus != ''">#{deviceStatus},</if>
             <if test="pressure != null and pressure != ''">#{pressure},</if>
             <if test="flowRate != null and flowRate != ''">#{flowRate},</if>
             <if test="mgc != null and mgc != ''">#{mgc},</if>
             <if test="stationConcentration != null and stationConcentration != ''">#{stationConcentration},</if>
             <if test="cgc != null and cgc != ''">#{cgc},</if>
-            <if test="deviceCode != null and deviceCode != ''">#{deviceCode},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
         </trim>
     </insert>
 
-    <update id="updateGasDeviceMonitoringData" parameterType="GasDeviceMonitoring">
+    <update id="updateGasDeviceMonitoringData" parameterType="GasDeviceMonitoringData">
         update gas_device_monitoring_data
         <set>
             <if test="pressure != null and pressure != ''">pressure = #{pressure},</if>
@@ -118,23 +136,41 @@
 
     <insert id="insertDeviceMonitoring" parameterType="java.util.List">
         insert into gas_device_monitoring_data (
+        device_code,
+        pointId,
+        indicator,
+        monitoringValue,
+        valueUnit,
+        collectionTime,
+        reportTime,
+        syncTime,
+        syncStatus,
+        deviceStatus,
         pressure,
         flow_rate,
         mgc,
         station_concentration,
         cgc,
-        device_code,
         create_time,
         update_time
         ) values
         <foreach collection="list" item="item" separator=",">
             (
+            #{item.deviceCode},
+            #{item.pointId},
+            #{item.indicator},
+            #{item.monitoringValue},
+            #{item.valueUnit},
+            #{item.collectionTime},
+            #{item.reportTime},
+            #{item.syncTime},
+            #{item.syncStatus},
+            #{item.deviceStatus},
             #{item.pressure},
             #{item.flowRate},
             #{item.mgc},
             #{item.stationConcentration},
             #{item.cgc},
-            #{item.deviceCode},
             #{item.createTime},
             #{item.updateTime}
             )

src/main/resources/mapper/construction/gas/GasDeviceMonitoringMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.sooka.sponest.construction.gas.mapper.GasDeviceMonitoringMapper">
-
-    <insert id="insertDeviceMonitoring" parameterType="java.util.List">
-        insert into gas_device_monitoring_data (
-        device_code,
-        pressure,
-        flow_rate,
-        mgc,
-        station_concentration,
-        video_monitoring,
-        cgc,
-        create_time,
-        update_time)
-        values
-        <foreach collection="list" item="item" separator=",">
-            (
-            #{item.deviceCode},
-            #{item.pressure},
-            #{item.flowRate},
-            #{item.mgc},
-            #{item.stationConcentration},
-            #{item.videoMonitoring},
-            #{item.cgc},
-            #{item.createTime},
-            #{item.updateTime}
-            )
-        </foreach>
-    </insert>
-
-</mapper>