fix

src/main/java/com/cn/esermis/constant/Constant.java

@@ -8,6 +8,7 @@ public class Constant {
         public static final  String HOUR = "2061"; //小时值
         public static final String MINUTE = "2051"; //分钟值
         public static final String REAL = "2011"; //实时值
+        public static final String DAY = "2031"; //日数据
 
         public static final  String CN = "CN"; //大气环境污染源
         public static final  String SERVER = "server"; //大气环境污染源

src/main/java/com/cn/esermis/controller/DataAcquisitionInstrumentController.java

@@ -52,7 +52,7 @@ public class DataAcquisitionInstrumentController {
             List<DataAcquisitionInstrumentVo> revoList = new ArrayList<>();
             records.forEach(x->{
                 DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
-                List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.list(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", x.getId()));
+                List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(x.getId());
                 BeanUtils.copyProperties(x, instrumentVo);
                 if (!analyticalInstruments.isEmpty()){
                     List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
@@ -60,7 +60,7 @@ public class DataAcquisitionInstrumentController {
                         AnalyticalInstrumentsVo analyticalInstrumentsVo = new AnalyticalInstrumentsVo();
                         BeanUtils.copyProperties(y, analyticalInstrumentsVo);
                         analyticalInstrumentList.add(analyticalInstrumentsVo);
-                        List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.list(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
+                        List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.listByParentId(y.getId());
                         if (!analyticalInstrumentId.isEmpty()){
                             analyticalInstrumentId.forEach(z->{
                                 analyticalInstrumentsVo.getDetectMonitoringFactors().add(z);
@@ -79,30 +79,26 @@ public class DataAcquisitionInstrumentController {
     /**
      * 根据菜单编号获取详细信息
      */
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "delete/{id}")
     public AjaxResult getInfo(@PathVariable String id)
     {
         DataAcquisitionInstrument dataAcquisitionInstrument = dataAcquisitionInstrumentService.getById(id);
         DataAcquisitionInstrumentVo instrumentVo = new DataAcquisitionInstrumentVo();
         if (dataAcquisitionInstrument != null){
             BeanUtils.copyProperties(dataAcquisitionInstrument, instrumentVo);
-            List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.list(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", instrumentVo.getId()));
+            List<AnalyticalInstruments> analyticalInstruments = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(dataAcquisitionInstrument.getId());
             if (!analyticalInstruments.isEmpty()){
                 List<AnalyticalInstrumentsVo> analyticalInstrumentList = new ArrayList<>();
                 analyticalInstruments.forEach(y->{
-                    AnalyticalInstrumentsVo analyticalInstrumentsVo = new AnalyticalInstrumentsVo();
-                    BeanUtils.copyProperties(y, analyticalInstrumentsVo);
-                    analyticalInstrumentList.add(analyticalInstrumentsVo);
-                    List<DetectMonitoringFactor> analyticalInstrumentId = detectMonitoringFactorService.list(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
-                    if (!analyticalInstrumentId.isEmpty()){
-                        analyticalInstrumentId.forEach(z->{
-                            analyticalInstrumentsVo.getDetectMonitoringFactors().add(z);
-                        });
-                    }
+                    if (y.getId() != null)
+                    detectMonitoringFactorService.remove(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
                 });
+                if (analyticalInstruments.isEmpty())
+                analyticalInstrumentsService.remove(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
                 instrumentVo.setAnalyticalInstruments(analyticalInstrumentList);
             }
         }
+        dataAcquisitionInstrumentService.remove(new QueryWrapper<DataAcquisitionInstrument>().eq("id", id));
         return success(instrumentVo);
     }
 
@@ -117,28 +113,30 @@ public class DataAcquisitionInstrumentController {
         DataAcquisitionInstrument dataAcquisitionInstrument = new DataAcquisitionInstrument();
         BeanUtils.copyProperties(vo, dataAcquisitionInstrument);
         boolean save = dataAcquisitionInstrumentService.saveOrUpdate(dataAcquisitionInstrument);
-        if (save){
+        if (save && vo.getAnalyticalInstruments()!=null){
             List<AnalyticalInstrumentsVo> analyticalInstrumentList = vo.getAnalyticalInstruments();
             // 删除子项 全删全增操作
             {
-                List<AnalyticalInstruments> dataAcquisitionInstrumentId = analyticalInstrumentsService.list(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
-                if (!dataAcquisitionInstrumentId.isEmpty()){
-                    analyticalInstrumentList.forEach(y->{
-                        detectMonitoringFactorService.remove(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
-                    });
-                    analyticalInstrumentsService.remove(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
+                if (dataAcquisitionInstrument.getId() != null){
+                    List<AnalyticalInstruments> dataAcquisitionInstrumentId = analyticalInstrumentsService.getByDataAcquisitionInstrumentid(dataAcquisitionInstrument.getId());
+                    if (!dataAcquisitionInstrumentId.isEmpty()){
+                        analyticalInstrumentList.forEach(y->{
+                            detectMonitoringFactorService.remove(new QueryWrapper<DetectMonitoringFactor>().eq("analytical_instrument_id", y.getId()));
+                        });
+                        analyticalInstrumentsService.remove(new QueryWrapper<AnalyticalInstruments>().eq("data_acquisition_instrument_id", dataAcquisitionInstrument.getId()));
+                    }
                 }
             }
             // 新增子表
             analyticalInstrumentList.forEach(x->{
                 AnalyticalInstruments analyticalInstruments = new AnalyticalInstruments();
-                analyticalInstruments.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
                 BeanUtils.copyProperties(x, analyticalInstruments);
+                analyticalInstruments.setDataAcquisitionInstrumentId(dataAcquisitionInstrument.getId());
                 boolean save1 = analyticalInstrumentsService.save(analyticalInstruments);
                 if (save1){
                     List<DetectMonitoringFactor> detectMonitoringFactors = x.getDetectMonitoringFactors();
                     detectMonitoringFactors.forEach(y->{
-                        y.setAnalytical_instrument_id(analyticalInstruments.getId());
+                        y.setAnalyticalInstrumentId(analyticalInstruments.getId());
                         boolean save2 = detectMonitoringFactorService.save(y);
                         if (!save2){
                             throw new RuntimeException("添加失败");

src/main/java/com/cn/esermis/controller/PostMarkingController.java

@@ -16,7 +16,7 @@ import static com.cn.esermis.dpld.model.AjaxResult.success;
  * 事后标记
  */
 @RestController
-@RequestMapping("/post_markingC")
+@RequestMapping("/post_marking")
 public class PostMarkingController
 {
     @Resource

src/main/java/com/cn/esermis/dpld/business/MonitorBusiness.java

@@ -95,11 +95,13 @@ public class MonitorBusiness {
                             airMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
-                            if (!airMonitorMinuteRecord.getIsExceed().equals("Y") || !airMonitorMinuteRecord.getIsLose().equals("Y") || !airMonitorMinuteRecord.getIsSix().equals("Y")){
+                            if ((airMonitorMinuteRecord.getIsExceed()!=null && !airMonitorMinuteRecord.getIsExceed().equals("Y") )||
+                                    (airMonitorMinuteRecord.getIsLose()!=null && !airMonitorMinuteRecord.getIsLose().equals("Y") )||
+                                    (airMonitorMinuteRecord.getIsSix()!=null && !airMonitorMinuteRecord.getIsSix().equals("Y"))){
                                 saveExcepLog(x, airMonitorMinuteRecord);
                             }
                         } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
+                            log.error("调用 ExceptionDataDispose1 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
                         }
                         listData.add(airMonitorMinuteRecord);
                     });
@@ -131,11 +133,13 @@ public class MonitorBusiness {
                             airMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
-                            if (!airMonitorMinuteRecord.getIsExceed().equals("Y") || !airMonitorMinuteRecord.getIsLose().equals("Y") || !airMonitorMinuteRecord.getIsSix().equals("Y")){
+                            if ((airMonitorMinuteRecord.getIsExceed()!=null && !airMonitorMinuteRecord.getIsExceed().equals("Y") )||
+                                    (airMonitorMinuteRecord.getIsLose()!=null && !airMonitorMinuteRecord.getIsLose().equals("Y") )||
+                                    (airMonitorMinuteRecord.getIsSix()!=null && !airMonitorMinuteRecord.getIsSix().equals("Y"))){
                                 saveExcepLog(x, airMonitorMinuteRecord);
                             }
                         } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
+                            log.error("调用 ExceptionDataDispose2 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
                         }
                         listData.add(airMonitorMinuteRecord);
                     });
@@ -170,11 +174,14 @@ public class MonitorBusiness {
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
                             airMonitorHourRecord.setIsSix(exceptionDataDispose.SixData(factorModel.getMN(), x.getFactor(),x.getAvg()!=null?x.getAvg().doubleValue():0, factorModel.getDataTime()));
-                            if (!airMonitorHourRecord.getIsExceed().equals("Y") || !airMonitorHourRecord.getIsLose().equals("Y") || !airMonitorHourRecord.getIsSix().equals("Y")){
+//                            if (!airMonitorHourRecord.getIsExceed().equals("Y") || !airMonitorHourRecord.getIsLose().equals("Y") || !airMonitorHourRecord.getIsSix().equals("Y")){
+                            if ((airMonitorHourRecord.getIsExceed()!=null && !airMonitorHourRecord.getIsExceed().equals("Y") )||
+                                    (airMonitorHourRecord.getIsLose()!=null && !airMonitorHourRecord.getIsLose().equals("Y") )||
+                                    (airMonitorHourRecord.getIsSix()!=null && !airMonitorHourRecord.getIsSix().equals("Y"))){
                                 saveExcepLog(x, airMonitorHourRecord);
                             }
                         } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose 方法异常{} 当前参数为:{}",e,airMonitorHourRecord);
+                            log.error("调用 ExceptionDataDispose3 方法异常{} 当前参数为:{}",e,airMonitorHourRecord);
                         }
                         listData.add(airMonitorHourRecord);
                     });
@@ -206,11 +213,13 @@ public class MonitorBusiness {
                             waterMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
-                            if (!waterMonitorMinuteRecord.getIsExceed().equals("Y") || !waterMonitorMinuteRecord.getIsLose().equals("Y") || !waterMonitorMinuteRecord.getIsSix().equals("Y")){
+                            if ((waterMonitorMinuteRecord.getIsExceed()!=null && !waterMonitorMinuteRecord.getIsExceed().equals("Y") )||
+                                    (waterMonitorMinuteRecord.getIsLose()!=null && !waterMonitorMinuteRecord.getIsLose().equals("Y") )||
+                                    (waterMonitorMinuteRecord.getIsSix()!=null && !waterMonitorMinuteRecord.getIsSix().equals("Y"))){
                                 saveExcepLog(x, waterMonitorMinuteRecord);
                             }
                         } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose 方法异常{} 当前参数为:{}",e,waterMonitorMinuteRecord);
+                            log.error("调用 ExceptionDataDispose4 方法异常{} 当前参数为:{}",e,waterMonitorMinuteRecord);
                         }
                         listData.add(waterMonitorMinuteRecord);
                     });
@@ -239,11 +248,13 @@ public class MonitorBusiness {
                             waterMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
-                            if (!waterMonitorMinuteRecord.getIsExceed().equals("Y") || !waterMonitorMinuteRecord.getIsLose().equals("Y") || !waterMonitorMinuteRecord.getIsSix().equals("Y")){
+                            if ((waterMonitorMinuteRecord.getIsExceed()!=null && !waterMonitorMinuteRecord.getIsExceed().equals("Y") )||
+                                    (waterMonitorMinuteRecord.getIsLose()!=null && !waterMonitorMinuteRecord.getIsLose().equals("Y") )||
+                                    (waterMonitorMinuteRecord.getIsSix()!=null && !waterMonitorMinuteRecord.getIsSix().equals("Y"))){
                                 saveExcepLog(x, waterMonitorMinuteRecord);
                             }
                         } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose 方法异常{} 当前参数为:{}",e,waterMonitorMinuteRecord);
+                            log.error("调用 ExceptionDataDispose5 方法异常{} 当前参数为:{}",e,waterMonitorMinuteRecord);
                         }
 
                         listData.add(waterMonitorMinuteRecord);
@@ -277,11 +288,13 @@ public class MonitorBusiness {
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
                             waterMonitorHourRecord.setIsSix(exceptionDataDispose.SixData(factorModel.getMN(), x.getFactor(),x.getAvg()!=null?x.getAvg().doubleValue():0, factorModel.getDataTime()));
-                            if (!waterMonitorHourRecord.getIsExceed().equals("Y") || !waterMonitorHourRecord.getIsLose().equals("Y") || !waterMonitorHourRecord.getIsSix().equals("Y")){
+                            if ((waterMonitorHourRecord.getIsExceed()!=null && !waterMonitorHourRecord.getIsExceed().equals("Y") )||
+                                    (waterMonitorHourRecord.getIsLose()!=null && !waterMonitorHourRecord.getIsLose().equals("Y") )||
+                                    (waterMonitorHourRecord.getIsSix()!=null && !waterMonitorHourRecord.getIsSix().equals("Y"))){
                                 saveExcepLog(x, waterMonitorHourRecord);
                             }
                         } catch (Exception e) {
-                            log.error("调用 ExceptionDataDispose 方法异常{} 当前参数为:{}",e,waterMonitorHourRecord);
+                            log.error("调用 ExceptionDataDispose6 方法异常{} 当前参数为:{}",e,waterMonitorHourRecord);
                         }
                         listData.add(waterMonitorHourRecord);
                     });

src/main/java/com/cn/esermis/dpld/entity/AnalyticalInstruments.java

@@ -40,12 +40,12 @@ public class AnalyticalInstruments {
     /**
      *监测污染物因子及限值（小时均值、月排放总量、年排放总量）
      */
-    @TableField(value = "factorInfor")
-    private Date factorInfor;
+    @TableField(value = "factor_infor")
+    private String factorInfor;
     /**
      * 量程
      */
-    @TableField(value = "range")
+    @TableField(value = "range_str")
     private String range;
 
     /**
@@ -68,8 +68,8 @@ public class AnalyticalInstruments {
     /**
      * 皮托管系数
      */
-    @TableField(value = "pitotTubeCoefficient")
-    private String pitot_tube_coefficient;
+    @TableField(value = "pitot_tube_coefficient")
+    private String pitotTubeCoefficient;
     /**
      * k值
      */

src/main/java/com/cn/esermis/dpld/entity/DataAcquisitionInstrument.java

@@ -42,7 +42,7 @@ public class DataAcquisitionInstrument {
      *建设投用日期
      */
     @TableField(value = "use_data")
-    private Date use_data;
+    private Date useData;
     /**
      * 是否完成验收备案(0否 1是)
      */
@@ -58,6 +58,11 @@ public class DataAcquisitionInstrument {
     /**
      * 数采仪品牌
      */
+    @TableField(value = "collection_name")
+    private String collectionName;
+    /**
+     * 数采仪品牌
+     */
     @TableField(value = "collection_brand")
     private String collectionBrand;
     /**

src/main/java/com/cn/esermis/dpld/entity/DetectMonitoringFactor.java

@@ -12,7 +12,7 @@ import java.util.Date;
  * 监测因子表
  */
 @Data
-@TableName("analytical_instruments")
+@TableName("monitoring_factor")
 public class DetectMonitoringFactor {
 
     private static final long serialVersionUID = 8887499842971074427L;
@@ -26,7 +26,7 @@ public class DetectMonitoringFactor {
      * 分析仪主键ID
      */
     @TableField(value = "analytical_instrument_id")
-    private String analytical_instrument_id;
+    private String analyticalInstrumentId;
     /**
      * 检测因子编码
      */
@@ -68,7 +68,7 @@ public class DetectMonitoringFactor {
     /**
      * 量程
      */
-    @TableField(value = "range")
+    @TableField(value = "range_str")
     private String range;
     /**
      * 量程单位

src/main/java/com/cn/esermis/dpld/entity/PostMarking.java

@@ -58,7 +58,7 @@ public class PostMarking {
      * 管理员核实状态  1属实、2不属实
      */
     @TableField(value = "verifies_status")
-    private String verifiesStatus;
+    private Integer verifiesStatus;
     /**
      * 管理员分类  1停炉、2故障
      */

src/main/java/com/cn/esermis/dpld/mapper/AnalyticalInstrumentsMapper.java

@@ -3,9 +3,15 @@ package com.cn.esermis.dpld.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.dpld.entity.AnalyticalInstruments;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface AnalyticalInstrumentsMapper extends BaseMapper<AnalyticalInstruments> {
 
+    List<AnalyticalInstruments> getByDataAcquisitionInstrumentid(@Param("productId") String productId);
 
+    boolean saveOb(AnalyticalInstruments analyticalInstruments);
 }

src/main/java/com/cn/esermis/dpld/mapper/DetectMonitoringFactorMapper.java

@@ -3,9 +3,13 @@ package com.cn.esermis.dpld.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cn.esermis.dpld.entity.DetectMonitoringFactor;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface DetectMonitoringFactorMapper extends BaseMapper<DetectMonitoringFactor> {
 
 
+    List<DetectMonitoringFactor> listByParentId(@Param("parentId") String parentId);
 }

src/main/java/com/cn/esermis/dpld/service/IAnalyticalInstrumentsService.java

@@ -4,6 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.cn.esermis.dpld.entity.AnalyticalInstruments;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public interface IAnalyticalInstrumentsService extends IService<AnalyticalInstruments> {
+    List<AnalyticalInstruments> getByDataAcquisitionInstrumentid(String id);
+
+    boolean saveOb(AnalyticalInstruments analyticalInstruments);
 }

src/main/java/com/cn/esermis/dpld/service/IDetectMonitoringFactorService.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.cn.esermis.dpld.entity.DetectMonitoringFactor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public interface IDetectMonitoringFactorService extends IService<DetectMonitoringFactor> {
+    List<DetectMonitoringFactor> listByParentId(String id);
 }

src/main/java/com/cn/esermis/dpld/service/impl/AnalyticalInstrumentsServiceImpl.java

@@ -6,6 +6,23 @@ import com.cn.esermis.dpld.mapper.AnalyticalInstrumentsMapper;
 import com.cn.esermis.dpld.service.IAnalyticalInstrumentsService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
 @Service
 public class AnalyticalInstrumentsServiceImpl extends ServiceImpl<AnalyticalInstrumentsMapper, AnalyticalInstruments> implements IAnalyticalInstrumentsService {
+
+
+    @Resource
+    private AnalyticalInstrumentsMapper analyticalInstrumentsMapper;
+    @Override
+    public List<AnalyticalInstruments> getByDataAcquisitionInstrumentid(String id) {
+        return analyticalInstrumentsMapper.getByDataAcquisitionInstrumentid(id);
+    }
+
+    @Override
+    public boolean saveOb(AnalyticalInstruments analyticalInstruments) {
+        return analyticalInstrumentsMapper.saveOb(analyticalInstruments);
+    }
 }

src/main/java/com/cn/esermis/dpld/service/impl/DetectMonitoringFactorImpl.java

@@ -6,6 +6,18 @@ import com.cn.esermis.dpld.mapper.DetectMonitoringFactorMapper;
 import com.cn.esermis.dpld.service.IDetectMonitoringFactorService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
 @Service
 public class DetectMonitoringFactorImpl extends ServiceImpl<DetectMonitoringFactorMapper, DetectMonitoringFactor> implements IDetectMonitoringFactorService {
+
+    @Resource
+    private DetectMonitoringFactorMapper detectMonitoringFactorMapper;
+
+    @Override
+    public List<DetectMonitoringFactor> listByParentId(String parentId) {
+        return detectMonitoringFactorMapper.listByParentId(parentId);
+    }
 }

src/main/java/com/cn/esermis/model/FactorModel.java

@@ -1,5 +1,6 @@
 package com.cn.esermis.model;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.Data;
 
@@ -9,11 +10,30 @@ import java.util.List;
 @Data
 public class FactorModel {
 
+    public static void main(String[] args) {
 
-    public FactorModel factorModel(JSONObject msg){
-        FactorModel javaObject = msg.toJavaObject(FactorModel.class);
-
+        String json = "{\n" +
+                "\t\"SIZE\": \"0114\",\n" +
+                "\t\"QN\": \"20241015151000142\",\n" +
+                "\t\"ST\": \"59\",\n" +
+                "\t\"CN\": \"2011\",\n" +
+                "\t\"PW\": \"123456\",\n" +
+                "\t\"MN\": \"399435X0017503\",\n" +
+                "\t\"Flag\": \"5\",\n" +
+                "\t\"DataTime\": \"20241015151000\",\n" +
+                "\t\"CP\": [{\n" +
+                "\t\t\"Rtd\": \"Fb\",\n" +
+                "\t\t\"factor\": \"p10103\"\n" +
+                "\t}],\n" +
+                "\t\"End\": \"4DC0\\r\\n\"\n" +
+                "}";
+        FactorModel javaObject = JSON.parseObject(JSON.toJSONString(json), FactorModel.class);
+        System.out.println(javaObject);
+    }
 
+    public FactorModel factorModel(JSONObject msg){
+//        FactorModel javaObject = msg.toJavaObject(FactorModel.class);
+        FactorModel javaObject = JSON.parseObject(JSON.toJSONString(msg), FactorModel.class);
         return javaObject;
     }
 

src/main/resources/application.yml

@@ -44,7 +44,12 @@ spring:
 
 mybatis-plus:
   mapper-locations: classpath:static/**/*.xml
-
+  configuration:
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl # 指定 MyBatis 使用 SLF4J 日志实现
+logging:
+  level:
+    cnooc.esermis: DEBUG
+    com.baomidou.mybatisplus.core.mapper: debug # 设置 Mapper 接口的日志级别为 DEBUG
   ## 工程设置
 #project:
 #  debug: false
@@ -86,9 +91,7 @@ mybatis-plus:
 #    cache-enabled: false
 
   ##日志配置
-logging:
-  level:
-    cnooc.esermis: DEBUG
+
 
 #线程池
 ##线程池维护线程的最少数量 -

src/main/resources/static/mybatis/AnalyticalInstrumentsMapper.xml

@@ -0,0 +1,22 @@
+<?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.cn.esermis.dpld.mapper.AnalyticalInstrumentsMapper">
+    <insert id="saveOb" parameterType="com.cn.esermis.dpld.entity.AnalyticalInstruments">
+        insert into analytical_instruments(id,brand,model,name,factorInfor,range,data_acquisition_instrument_id,reference_oxygen_content,velocity_field_coefficient,pitot_tube_coefficient,k_value,flue_area,dilution_ratio,type)
+        values(#{id},#{brand},#{model},#{name},#{factorInfor},#{range},#{dataAcquisitionInstrumentId},#{referenceOxygenContent},#{velocityFieldCoefficient},#{pitotTubeCoefficient},#{kValue},#{flueArea},#{dilutionRatio},#{type})
+
+    </insert>
+
+    <select id="getByDataAcquisitionInstrumentid" resultType="com.cn.esermis.dpld.entity.AnalyticalInstruments"
+            parameterType="java.lang.String">
+        select * from analytical_instruments
+            <where>
+            <if test="productId != null">
+                and data_acquisition_instrument_id = #{productId}
+            </if>
+            </where>
+    </select>
+</mapper>
+

src/main/resources/static/mybatis/DetectMonitoringFactorMapper.xml

@@ -0,0 +1,17 @@
+<?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.cn.esermis.dpld.mapper.DetectMonitoringFactorMapper">
+
+
+    <select id="listByParentId" resultType="com.cn.esermis.dpld.entity.DetectMonitoringFactor">
+        select * from monitoring_factor
+        <where>
+            <if test="parentId != null">
+                and analytical_instrument_id = #{parentId}
+            </if>
+        </where>
+    </select>
+</mapper>
+