生成代码是，使用自定义ID

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AfterAnalysisResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.AfterAnalysisResult;
 import com.phm.manage.mapper.AfterAnalysisResultMapper;
 import com.phm.manage.service.IAfterAnalysisResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AfterAnalysisResultServiceImpl implements IAfterAnalysisResultServi
     @Autowired
     private AfterAnalysisResultMapper afterAnalysisResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询维修测试控制解析后数据
      *
@@ -49,6 +53,7 @@ public class AfterAnalysisResultServiceImpl implements IAfterAnalysisResultServi
      */
     @Override
     public int insertAfterAnalysisResult(AfterAnalysisResult afterAnalysisResult) {
+        afterAnalysisResult.setId(snowFlakeIdGenerator.nextId());
         return afterAnalysisResultMapper.insertAfterAnalysisResult(afterAnalysisResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AircraftServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.Aircraft;
 import com.phm.manage.mapper.AircraftMapper;
 import com.phm.manage.service.IAircraftService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AircraftServiceImpl implements IAircraftService {
     @Autowired
     private AircraftMapper aircraftMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询单机信息
      *
@@ -49,6 +53,7 @@ public class AircraftServiceImpl implements IAircraftService {
      */
     @Override
     public int insertAircraft(Aircraft aircraft) {
+        aircraft.setId(snowFlakeIdGenerator.nextId());
         return aircraftMapper.insertAircraft(aircraft);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeCourseLogServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.AnalyzeCourseLog;
 import com.phm.manage.mapper.AnalyzeCourseLogMapper;
 import com.phm.manage.service.IAnalyzeCourseLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
     @Autowired
     private AnalyzeCourseLogMapper analyzeCourseLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询分析过程日志
      *
@@ -51,6 +55,7 @@ public class AnalyzeCourseLogServiceImpl implements IAnalyzeCourseLogService {
     @Override
     public int insertAnalyzeCourseLog(AnalyzeCourseLog analyzeCourseLog) {
         analyzeCourseLog.setCreateTime(DateUtils.getNowDate());
+        analyzeCourseLog.setId(snowFlakeIdGenerator.nextId());
         return analyzeCourseLogMapper.insertAnalyzeCourseLog(analyzeCourseLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeDownLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.AnalyzeDownLog;
 import com.phm.manage.mapper.AnalyzeDownLogMapper;
 import com.phm.manage.service.IAnalyzeDownLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AnalyzeDownLogServiceImpl implements IAnalyzeDownLogService {
     @Autowired
     private AnalyzeDownLogMapper analyzeDownLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据解析下载日志
      *
@@ -49,6 +53,7 @@ public class AnalyzeDownLogServiceImpl implements IAnalyzeDownLogService {
      */
     @Override
     public int insertAnalyzeDownLog(AnalyzeDownLog analyzeDownLog) {
+        analyzeDownLog.setId(snowFlakeIdGenerator.nextId());
         return analyzeDownLogMapper.insertAnalyzeDownLog(analyzeDownLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/AnalyzeResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.AnalyzeResult;
 import com.phm.manage.mapper.AnalyzeResultMapper;
 import com.phm.manage.service.IAnalyzeResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class AnalyzeResultServiceImpl implements IAnalyzeResultService {
     @Autowired
     private AnalyzeResultMapper analyzeResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据解析结果
      *
@@ -49,6 +53,7 @@ public class AnalyzeResultServiceImpl implements IAnalyzeResultService {
      */
     @Override
     public int insertAnalyzeResult(AnalyzeResult analyzeResult) {
+        analyzeResult.setId(snowFlakeIdGenerator.nextId());
         return analyzeResultMapper.insertAnalyzeResult(analyzeResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DataDownResultServiceImpl.java

@@ -1,96 +1,95 @@
 package com.phm.manage.service.impl;
 
-import java.util.List;
 import com.phm.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.phm.manage.mapper.DataDownResultMapper;
 import com.phm.manage.domain.DataDownResult;
+import com.phm.manage.mapper.DataDownResultMapper;
 import com.phm.manage.service.IDataDownResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 数据下载Service业务层处理
- * 
+ *
  * @author phm
  * @date 2023-08-24
  */
 @Service
-public class DataDownResultServiceImpl implements IDataDownResultService 
-{
+public class DataDownResultServiceImpl implements IDataDownResultService {
     @Autowired
     private DataDownResultMapper dataDownResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据下载
-     * 
+     *
      * @param id 数据下载主键
      * @return 数据下载
      */
     @Override
-    public DataDownResult selectDataDownResultById(Long id)
-    {
+    public DataDownResult selectDataDownResultById(Long id) {
         return dataDownResultMapper.selectDataDownResultById(id);
     }
 
     /**
      * 查询数据下载列表
-     * 
+     *
      * @param dataDownResult 数据下载
      * @return 数据下载
      */
     @Override
-    public List<DataDownResult> selectDataDownResultList(DataDownResult dataDownResult)
-    {
+    public List<DataDownResult> selectDataDownResultList(DataDownResult dataDownResult) {
         return dataDownResultMapper.selectDataDownResultList(dataDownResult);
     }
 
     /**
      * 新增数据下载
-     * 
+     *
      * @param dataDownResult 数据下载
      * @return 结果
      */
     @Override
-    public int insertDataDownResult(DataDownResult dataDownResult)
-    {
+    public int insertDataDownResult(DataDownResult dataDownResult) {
         dataDownResult.setCreateTime(DateUtils.getNowDate());
+        dataDownResult.setId(snowFlakeIdGenerator.nextId());
         return dataDownResultMapper.insertDataDownResult(dataDownResult);
     }
 
     /**
      * 修改数据下载
-     * 
+     *
      * @param dataDownResult 数据下载
      * @return 结果
      */
     @Override
-    public int updateDataDownResult(DataDownResult dataDownResult)
-    {
+    public int updateDataDownResult(DataDownResult dataDownResult) {
         dataDownResult.setUpdateTime(DateUtils.getNowDate());
         return dataDownResultMapper.updateDataDownResult(dataDownResult);
     }
 
     /**
      * 批量删除数据下载
-     * 
+     *
      * @param ids 需要删除的数据下载主键
      * @return 结果
      */
     @Override
-    public int deleteDataDownResultByIds(Long[] ids)
-    {
+    public int deleteDataDownResultByIds(Long[] ids) {
         return dataDownResultMapper.deleteDataDownResultByIds(ids);
     }
 
     /**
      * 删除数据下载信息
-     * 
+     *
      * @param id 数据下载主键
      * @return 结果
      */
     @Override
-    public int deleteDataDownResultById(Long id)
-    {
+    public int deleteDataDownResultById(Long id) {
         return dataDownResultMapper.deleteDataDownResultById(id);
     }
 }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DeepIsolationModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.DeepIsolationModel;
 import com.phm.manage.mapper.DeepIsolationModelMapper;
 import com.phm.manage.service.IDeepIsolationModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class DeepIsolationModelServiceImpl implements IDeepIsolationModelService
     @Autowired
     private DeepIsolationModelMapper deepIsolationModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询深度隔离模型
      *
@@ -49,6 +53,7 @@ public class DeepIsolationModelServiceImpl implements IDeepIsolationModelService
      */
     @Override
     public int insertDeepIsolationModel(DeepIsolationModel deepIsolationModel) {
+        deepIsolationModel.setId(snowFlakeIdGenerator.nextId());
         return deepIsolationModelMapper.insertDeepIsolationModel(deepIsolationModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DeriveParameterServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.DeriveParameter;
 import com.phm.manage.mapper.DeriveParameterMapper;
 import com.phm.manage.service.IDeriveParameterService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class DeriveParameterServiceImpl implements IDeriveParameterService {
     @Autowired
     private DeriveParameterMapper deriveParameterMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询衍生参数信息
      *
@@ -49,6 +53,7 @@ public class DeriveParameterServiceImpl implements IDeriveParameterService {
      */
     @Override
     public int insertDeriveParameter(DeriveParameter deriveParameter) {
+        deriveParameter.setId(snowFlakeIdGenerator.nextId());
         return deriveParameterMapper.insertDeriveParameter(deriveParameter);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/DiagnoseResultServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.DiagnoseResult;
 import com.phm.manage.mapper.DiagnoseResultMapper;
 import com.phm.manage.service.IDiagnoseResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class DiagnoseResultServiceImpl implements IDiagnoseResultService {
     @Autowired
     private DiagnoseResultMapper diagnoseResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询诊断结果
      *
@@ -50,6 +54,7 @@ public class DiagnoseResultServiceImpl implements IDiagnoseResultService {
      */
     @Override
     public int insertDiagnoseResult(DiagnoseResult diagnoseResult) {
+        diagnoseResult.setId(snowFlakeIdGenerator.nextId());
         diagnoseResult.setCreateTime(DateUtils.getNowDate());
         return diagnoseResultMapper.insertDiagnoseResult(diagnoseResult);
     }

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ExternalInterfaceLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.ExternalInterfaceLog;
 import com.phm.manage.mapper.ExternalInterfaceLogMapper;
 import com.phm.manage.service.IExternalInterfaceLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class ExternalInterfaceLogServiceImpl implements IExternalInterfaceLogSer
     @Autowired
     private ExternalInterfaceLogMapper externalInterfaceLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询外部接口日志
      *
@@ -49,6 +53,7 @@ public class ExternalInterfaceLogServiceImpl implements IExternalInterfaceLogSer
      */
     @Override
     public int insertExternalInterfaceLog(ExternalInterfaceLog externalInterfaceLog) {
+        externalInterfaceLog.setId(snowFlakeIdGenerator.nextId());
         return externalInterfaceLogMapper.insertExternalInterfaceLog(externalInterfaceLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FalseAlarmRestrainModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FalseAlarmRestrainModel;
 import com.phm.manage.mapper.FalseAlarmRestrainModelMapper;
 import com.phm.manage.service.IFalseAlarmRestrainModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class FalseAlarmRestrainModelServiceImpl implements IFalseAlarmRestrainMo
     @Autowired
     private FalseAlarmRestrainModelMapper falseAlarmRestrainModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询虚警抑制模型
      *
@@ -49,6 +53,7 @@ public class FalseAlarmRestrainModelServiceImpl implements IFalseAlarmRestrainMo
      */
     @Override
     public int insertFalseAlarmRestrainModel(FalseAlarmRestrainModel falseAlarmRestrainModel) {
+        falseAlarmRestrainModel.setId(snowFlakeIdGenerator.nextId());
         return falseAlarmRestrainModelMapper.insertFalseAlarmRestrainModel(falseAlarmRestrainModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FaultAnalyzeResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FaultAnalyzeResult;
 import com.phm.manage.mapper.FaultAnalyzeResultMapper;
 import com.phm.manage.service.IFaultAnalyzeResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class FaultAnalyzeResultServiceImpl implements IFaultAnalyzeResultService
     @Autowired
     private FaultAnalyzeResultMapper faultAnalyzeResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询故障分析结果
      *
@@ -49,6 +52,7 @@ public class FaultAnalyzeResultServiceImpl implements IFaultAnalyzeResultService
      */
     @Override
     public int insertFaultAnalyzeResult(FaultAnalyzeResult faultAnalyzeResult) {
+        faultAnalyzeResult.setId(snowFlakeIdGenerator.nextId());
         return faultAnalyzeResultMapper.insertFaultAnalyzeResult(faultAnalyzeResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FaultCaseServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FaultCase;
 import com.phm.manage.mapper.FaultCaseMapper;
 import com.phm.manage.service.IFaultCaseService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class FaultCaseServiceImpl implements IFaultCaseService {
     @Autowired
     private FaultCaseMapper faultCaseMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询故障案例信息
      *
@@ -49,6 +52,7 @@ public class FaultCaseServiceImpl implements IFaultCaseService {
      */
     @Override
     public int insertFaultCase(FaultCase faultCase) {
+        faultCase.setId(snowFlakeIdGenerator.nextId());
         return faultCaseMapper.insertFaultCase(faultCase);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FeedbackRawDataServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.FeedbackRawData;
 import com.phm.manage.mapper.FeedbackRawDataMapper;
 import com.phm.manage.service.IFeedbackRawDataService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class FeedbackRawDataServiceImpl implements IFeedbackRawDataService {
     @Autowired
     private FeedbackRawDataMapper feedbackRawDataMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询反馈的源数据
      *
@@ -49,6 +53,7 @@ public class FeedbackRawDataServiceImpl implements IFeedbackRawDataService {
      */
     @Override
     public int insertFeedbackRawData(FeedbackRawData feedbackRawData) {
+        feedbackRawData.setId(snowFlakeIdGenerator.nextId());
         return feedbackRawDataMapper.insertFeedbackRawData(feedbackRawData);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/FleetServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.Fleet;
 import com.phm.manage.mapper.FleetMapper;
 import com.phm.manage.service.IFleetService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class FleetServiceImpl implements IFleetService {
     @Autowired
     private FleetMapper fleetMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询机队信息
      *
@@ -49,6 +52,7 @@ public class FleetServiceImpl implements IFleetService {
      */
     @Override
     public int insertFleet(Fleet fleet) {
+        fleet.setId(snowFlakeIdGenerator.nextId());
         return fleetMapper.insertFleet(fleet);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ForecastModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.ForecastModel;
 import com.phm.manage.mapper.ForecastModelMapper;
 import com.phm.manage.service.IForecastModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,8 @@ public class ForecastModelServiceImpl implements IForecastModelService {
     @Autowired
     private ForecastModelMapper forecastModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询预测模型信息
      *
@@ -49,6 +52,7 @@ public class ForecastModelServiceImpl implements IForecastModelService {
      */
     @Override
     public int insertForecastModel(ForecastModel forecastModel) {
+        forecastModel.setId(snowFlakeIdGenerator.nextId());
         return forecastModelMapper.insertForecastModel(forecastModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ForecastResultServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.ForecastResult;
 import com.phm.manage.mapper.ForecastResultMapper;
 import com.phm.manage.service.IForecastResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class ForecastResultServiceImpl implements IForecastResultService {
     @Autowired
     private ForecastResultMapper forecastResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询预测结果
      *
@@ -51,6 +55,7 @@ public class ForecastResultServiceImpl implements IForecastResultService {
     @Override
     public int insertForecastResult(ForecastResult forecastResult) {
         forecastResult.setCreateTime(DateUtils.getNowDate());
+        forecastResult.setId(snowFlakeIdGenerator.nextId());
         return forecastResultMapper.insertForecastResult(forecastResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/GroundDiagnosisModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.GroundDiagnosisModel;
 import com.phm.manage.mapper.GroundDiagnosisModelMapper;
 import com.phm.manage.service.IGroundDiagnosisModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class GroundDiagnosisModelServiceImpl implements IGroundDiagnosisModelSer
     @Autowired
     private GroundDiagnosisModelMapper groundDiagnosisModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询地面诊断模型信息
      *
@@ -49,6 +53,7 @@ public class GroundDiagnosisModelServiceImpl implements IGroundDiagnosisModelSer
      */
     @Override
     public int insertGroundDiagnosisModel(GroundDiagnosisModel groundDiagnosisModel) {
+        groundDiagnosisModel.setId(snowFlakeIdGenerator.nextId());
         return groundDiagnosisModelMapper.insertGroundDiagnosisModel(groundDiagnosisModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ImportExportLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.ImportExportLog;
 import com.phm.manage.mapper.ImportExportLogMapper;
 import com.phm.manage.service.IImportExportLogService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class ImportExportLogServiceImpl implements IImportExportLogService {
     @Autowired
     private ImportExportLogMapper importExportLogMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询导入导出日志;
      *
@@ -49,6 +53,7 @@ public class ImportExportLogServiceImpl implements IImportExportLogService {
      */
     @Override
     public int insertImportExportLog(ImportExportLog importExportLog) {
+        importExportLog.setId(snowFlakeIdGenerator.nextId());
         return importExportLogMapper.insertImportExportLog(importExportLog);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/InstructionInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.InstructionInfo;
 import com.phm.manage.mapper.InstructionInfoMapper;
 import com.phm.manage.service.IInstructionInfoService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class InstructionInfoServiceImpl implements IInstructionInfoService {
     @Autowired
     private InstructionInfoMapper instructionInfoMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询指令信息
      *
@@ -49,6 +53,7 @@ public class InstructionInfoServiceImpl implements IInstructionInfoService {
      */
     @Override
     public int insertInstructionInfo(InstructionInfo instructionInfo) {
+        instructionInfo.setId(snowFlakeIdGenerator.nextId());
         return instructionInfoMapper.insertInstructionInfo(instructionInfo);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/LifePartConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.LifePartConfig;
 import com.phm.manage.mapper.LifePartConfigMapper;
 import com.phm.manage.service.ILifePartConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class LifePartConfigServiceImpl implements ILifePartConfigService {
     @Autowired
     private LifePartConfigMapper lifePartConfigMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询寿命件配置库信息
      *
@@ -49,6 +53,7 @@ public class LifePartConfigServiceImpl implements ILifePartConfigService {
      */
     @Override
     public int insertLifePartConfig(LifePartConfig lifePartConfig) {
+        lifePartConfig.setId(snowFlakeIdGenerator.nextId());
         return lifePartConfigMapper.insertLifePartConfig(lifePartConfig);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/MaintenanceServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.Maintenance;
 import com.phm.manage.mapper.MaintenanceMapper;
 import com.phm.manage.service.IMaintenanceService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class MaintenanceServiceImpl implements IMaintenanceService {
     @Autowired
     private MaintenanceMapper maintenanceMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询维护信息
      *
@@ -49,6 +53,7 @@ public class MaintenanceServiceImpl implements IMaintenanceService {
      */
     @Override
     public int insertMaintenance(Maintenance maintenance) {
+        maintenance.setId(snowFlakeIdGenerator.nextId());
         return maintenanceMapper.insertMaintenance(maintenance);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/MaintenanceTestControlServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.MaintenanceTestControl;
 import com.phm.manage.mapper.MaintenanceTestControlMapper;
 import com.phm.manage.service.IMaintenanceTestControlService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class MaintenanceTestControlServiceImpl implements IMaintenanceTestContro
     @Autowired
     private MaintenanceTestControlMapper maintenanceTestControlMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询维修测试控制
      *
@@ -49,6 +53,7 @@ public class MaintenanceTestControlServiceImpl implements IMaintenanceTestContro
      */
     @Override
     public int insertMaintenanceTestControl(MaintenanceTestControl maintenanceTestControl) {
+        maintenanceTestControl.setId(snowFlakeIdGenerator.nextId());
         return maintenanceTestControlMapper.insertMaintenanceTestControl(maintenanceTestControl);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/MonitorParameterConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.MonitorParameterConfig;
 import com.phm.manage.mapper.MonitorParameterConfigMapper;
 import com.phm.manage.service.IMonitorParameterConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class MonitorParameterConfigServiceImpl implements IMonitorParameterConfi
     @Autowired
     private MonitorParameterConfigMapper monitorParameterConfigMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询状态监控参数配置信息
      *
@@ -49,6 +53,7 @@ public class MonitorParameterConfigServiceImpl implements IMonitorParameterConfi
      */
     @Override
     public int insertMonitorParameterConfig(MonitorParameterConfig monitorParameterConfig) {
+        monitorParameterConfig.setId(snowFlakeIdGenerator.nextId());
         return monitorParameterConfigMapper.insertMonitorParameterConfig(monitorParameterConfig);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/OrderInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.OrderInfo;
 import com.phm.manage.mapper.OrderInfoMapper;
 import com.phm.manage.service.IOrderInfoService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,9 @@ public class OrderInfoServiceImpl implements IOrderInfoService {
     @Autowired
     private OrderInfoMapper orderInfoMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询系统指令信息
      *
@@ -51,6 +55,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService {
     @Override
     public int insertOrderInfo(OrderInfo orderInfo) {
         orderInfo.initCreatInfo();
+        orderInfo.setId(snowFlakeIdGenerator.nextId());
         return orderInfoMapper.insertOrderInfo(orderInfo);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/PerformanceMonitorModelServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.PerformanceMonitorModel;
 import com.phm.manage.mapper.PerformanceMonitorModelMapper;
 import com.phm.manage.service.IPerformanceMonitorModelService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class PerformanceMonitorModelServiceImpl implements IPerformanceMonitorMo
     @Autowired
     private PerformanceMonitorModelMapper performanceMonitorModelMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询性能监测模型信息
      *
@@ -49,6 +53,7 @@ public class PerformanceMonitorModelServiceImpl implements IPerformanceMonitorMo
      */
     @Override
     public int insertPerformanceMonitorModel(PerformanceMonitorModel performanceMonitorModel) {
+        performanceMonitorModel.setId(snowFlakeIdGenerator.nextId());
         return performanceMonitorModelMapper.insertPerformanceMonitorModel(performanceMonitorModel);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/PreHandleResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.PreHandleResult;
 import com.phm.manage.mapper.PreHandleResultMapper;
 import com.phm.manage.service.IPreHandleResultService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class PreHandleResultServiceImpl implements IPreHandleResultService {
     @Autowired
     private PreHandleResultMapper preHandleResultMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询数据预处理结果
      *
@@ -49,6 +53,7 @@ public class PreHandleResultServiceImpl implements IPreHandleResultService {
      */
     @Override
     public int insertPreHandleResult(PreHandleResult preHandleResult) {
+        preHandleResult.setId(snowFlakeIdGenerator.nextId());
         return preHandleResultMapper.insertPreHandleResult(preHandleResult);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/ProductServiceImpl.java

@@ -4,6 +4,7 @@ import com.phm.common.utils.DateUtils;
 import com.phm.manage.domain.Product;
 import com.phm.manage.mapper.ProductMapper;
 import com.phm.manage.service.IProductService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +22,8 @@ public class ProductServiceImpl implements IProductService {
     @Autowired
     private ProductMapper productMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
     /**
      * 查询产品树信息
      *
@@ -58,6 +61,7 @@ public class ProductServiceImpl implements IProductService {
             product.setAncestors(pr.getAncestors() + "," + product.getParentId());
         }
         product.initCreatInfo();
+        product.setId(snowFlakeIdGenerator.nextId());
         return productMapper.insertProduct(product);
     }
 

PHM-admin/phm-manage/src/main/java/com/phm/manage/service/impl/SoftwareConfigServiceImpl.java

@@ -3,6 +3,7 @@ package com.phm.manage.service.impl;
 import com.phm.manage.domain.SoftwareConfig;
 import com.phm.manage.mapper.SoftwareConfigMapper;
 import com.phm.manage.service.ISoftwareConfigService;
+import com.phm.manage.util.SnowFlakeIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,6 +20,9 @@ public class SoftwareConfigServiceImpl implements ISoftwareConfigService {
     @Autowired
     private SoftwareConfigMapper softwareConfigMapper;
 
+    @Autowired
+    private SnowFlakeIdGenerator snowFlakeIdGenerator;
+
     /**
      * 查询软件配置库信息
      *
@@ -49,6 +53,7 @@ public class SoftwareConfigServiceImpl implements ISoftwareConfigService {
      */
     @Override
     public int insertSoftwareConfig(SoftwareConfig softwareConfig) {
+        softwareConfig.setId(snowFlakeIdGenerator.nextId());
         return softwareConfigMapper.insertSoftwareConfig(softwareConfig);
     }
 

PHM-admin/phm-manage/src/main/resources/mapper/manage/AfterAnalysisResultMapper.xml

@@ -15,18 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAfterAnalysisResultVo">
-        select id, is_delete, created_by, created_time, updated_by, updated_time from phm_after_analysis_result
+        select id, remark, is_delete, create_by, create_time, update_by, update_time from phm_after_analysis_result
     </sql>
 
     <select id="selectAfterAnalysisResultList" parameterType="AfterAnalysisResult" resultMap="AfterAnalysisResultResult">
         <include refid="selectAfterAnalysisResultVo"/>
         <where>  
-            <if test="remark != null "> and remark = #{remark}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-            <if test="createdTime != null "> and created_time = #{createdTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
         </where>
     </select>
     
@@ -35,9 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertAfterAnalysisResult" parameterType="AfterAnalysisResult">
         insert into phm_after_analysis_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="remark != null">remark,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createdBy != null">created_by,</if>
             <if test="createdTime != null">created_time,</if>
@@ -45,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedTime != null">updated_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createdBy != null">#{createdBy},</if>
             <if test="createdTime != null">#{createdTime},</if>
@@ -56,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAfterAnalysisResult" parameterType="AfterAnalysisResult">
         update phm_after_analysis_result
         <trim prefix="SET" suffixOverrides=",">
+            <if test="remark != null">remark = #{remark},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createdBy != null">created_by = #{createdBy},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AircraftMapper.xml

@@ -35,10 +35,11 @@
         <include refid="selectAircraftVo"/>
         where id = #{id}
     </select>
-
-    <insert id="insertAircraft" parameterType="Aircraft" useGeneratedKeys="true" keyProperty="id">
+        
+    <insert id="insertAircraft" parameterType="Aircraft">
         insert into phm_aircraft
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="number != null">number,</if>
             <if test="fleetId != null">fleet_id,</if>
@@ -50,6 +51,7 @@
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="number != null">#{number},</if>
             <if test="fleetId != null">#{fleetId},</if>
@@ -79,13 +81,11 @@
     </update>
 
     <delete id="deleteAircraftById" parameterType="Long">
-        delete
-        from phm_aircraft
-        where id = #{id}
+        delete from phm_aircraft where id = #{id}
     </delete>
 
     <delete id="deleteAircraftByIds" parameterType="String">
-        delete from phm_aircraft where id in
+        delete from phm_aircraft where id in 
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeCourseLogMapper.xml

@@ -36,9 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertAnalyzeCourseLog" parameterType="AnalyzeCourseLog" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertAnalyzeCourseLog" parameterType="AnalyzeCourseLog">
         insert into phm_analyze_course_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="moduleName != null">module_name,</if>
             <if test="moduleType != null">module_type,</if>
             <if test="courseContent != null">course_content,</if>
@@ -50,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="moduleName != null">#{moduleName},</if>
             <if test="moduleType != null">#{moduleType},</if>
             <if test="courseContent != null">#{courseContent},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeDownLogMapper.xml

@@ -29,10 +29,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="fault != null  and fault != ''"> and fault = #{fault}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     
@@ -41,9 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertAnalyzeDownLog" parameterType="AnalyzeDownLog" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertAnalyzeDownLog" parameterType="AnalyzeDownLog">
         insert into phm_analyze_down_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="path != null">path,</if>
             <if test="status != null">status,</if>
@@ -55,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="path != null">#{path},</if>
             <if test="status != null">#{status},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/AnalyzeResultMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="AnalyzeResult" id="AnalyzeResultResult">
         <result property="id"    column="id"    />
+        <result property="remark"    column="remark"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -14,17 +15,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAnalyzeResultVo">
-        select id, is_delete, create_by, create_time, update_by, update_time from phm_analyze_result
+        select id, remark, is_delete, create_by, create_time, update_by, update_time from phm_analyze_result
     </sql>
 
     <select id="selectAnalyzeResultList" parameterType="AnalyzeResult" resultMap="AnalyzeResultResult">
         <include refid="selectAnalyzeResultVo"/>
         <where>  
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     
@@ -33,9 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertAnalyzeResult" parameterType="AnalyzeResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertAnalyzeResult" parameterType="AnalyzeResult">
         insert into phm_analyze_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="remark != null">remark,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -43,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAnalyzeResult" parameterType="AnalyzeResult">
         update phm_analyze_result
         <trim prefix="SET" suffixOverrides=",">
+            <if test="remark != null">remark = #{remark},</if>
             <if test="isDelete != null">is_delete = #{isDelete},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DataDownResultMapper.xml

@@ -27,11 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="order != null  and order != ''"> and order = #{order}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="path != null  and path != ''"> and path = #{path}</if>
-            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
         </where>
     </select>
     
@@ -40,9 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertDataDownResult" parameterType="DataDownResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDataDownResult" parameterType="DataDownResult">
         insert into phm_data_down_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="order != null">order,</if>
             <if test="name != null">name,</if>
             <if test="path != null">path,</if>
@@ -54,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="order != null">#{order},</if>
             <if test="name != null">#{name},</if>
             <if test="path != null">#{path},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DeepIsolationModelMapper.xml

@@ -27,10 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultEquation != null  and faultEquation != ''"> and fault_equation = #{faultEquation}</if>
             <if test="faultLru != null  and faultLru != ''"> and fault_lru = #{faultLru}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     
@@ -39,9 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertDeepIsolationModel" parameterType="DeepIsolationModel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDeepIsolationModel" parameterType="DeepIsolationModel">
         insert into phm_deep_isolation_model
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="faultEquation != null">fault_equation,</if>
             <if test="faultLru != null">fault_lru,</if>
@@ -52,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
             <if test="faultEquation != null">#{faultEquation},</if>
             <if test="faultLru != null">#{faultLru},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DeriveParameterMapper.xml

@@ -25,10 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="expression != null  and expression != ''"> and expression = #{expression}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     
@@ -37,9 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertDeriveParameter" parameterType="DeriveParameter" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDeriveParameter" parameterType="DeriveParameter">
         insert into phm_derive_parameter
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="expression != null">expression,</if>
             <if test="isDelete != null">is_delete,</if>
@@ -49,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="expression != null">#{expression},</if>
             <if test="isDelete != null">#{isDelete},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/DiagnoseResultMapper.xml

@@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultCode != null  and faultCode != ''"> and fault_code = #{faultCode}</if>
             <if test="faultSource != null  and faultSource != ''"> and fault_source = #{faultSource}</if>
             <if test="analysisTime != null "> and analysis_time = #{analysisTime}</if>
+            <if test="comment != null  and comment != ''"> and comment = #{comment}</if>
+            <if test="isDelete != null "> and is_delete = #{isDelete}</if>
         </where>
     </select>
     
@@ -39,9 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertDiagnoseResult" parameterType="DiagnoseResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertDiagnoseResult" parameterType="DiagnoseResult">
         insert into phm_diagnose_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="faultMode != null">fault_mode,</if>
             <if test="faultObject != null">fault_object,</if>
             <if test="faultCode != null">fault_code,</if>
@@ -55,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="faultMode != null">#{faultMode},</if>
             <if test="faultObject != null">#{faultObject},</if>
             <if test="faultCode != null">#{faultCode},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ExternalInterfaceLogMapper.xml

@@ -39,9 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertExternalInterfaceLog" parameterType="ExternalInterfaceLog" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertExternalInterfaceLog" parameterType="ExternalInterfaceLog">
         insert into sys_external_interface_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="result != null">result,</if>
             <if test="name != null">name,</if>
             <if test="url != null">url,</if>
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="result != null">#{result},</if>
             <if test="name != null">#{name},</if>
             <if test="url != null">#{url},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FalseAlarmRestrainModelMapper.xml

@@ -27,10 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="restrainCriteria != null  and restrainCriteria != ''"> and restrain_criteria = #{restrainCriteria}</if>
             <if test="minDuration != null  and minDuration != ''"> and min_duration = #{minDuration}</if>
             <if test="isDelete != null "> and is_delete = #{isDelete}</if>
-            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
         </where>
     </select>
     
@@ -39,9 +35,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFalseAlarmRestrainModel" parameterType="FalseAlarmRestrainModel">
         insert into phm_false_alarm_restrain_model
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="restrainCriteria != null">restrain_criteria,</if>
             <if test="minDuration != null">min_duration,</if>
@@ -52,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
             <if test="restrainCriteria != null">#{restrainCriteria},</if>
             <if test="minDuration != null">#{minDuration},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultAnalyzeResultMapper.xml

@@ -41,9 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertFaultAnalyzeResult" parameterType="FaultAnalyzeResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFaultAnalyzeResult" parameterType="FaultAnalyzeResult" >
         insert into phm_fault_analyze_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="moduleName != null">module_name,</if>
             <if test="moduleType != null">module_type,</if>
             <if test="analyzeInfo != null">analyze_info,</if>
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="moduleName != null">#{moduleName},</if>
             <if test="moduleType != null">#{moduleType},</if>
             <if test="analyzeInfo != null">#{analyzeInfo},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FaultCaseMapper.xml

@@ -46,9 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertFaultCase" parameterType="FaultCase" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFaultCase" parameterType="FaultCase">
         insert into phm_fault_case
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="caseFileName != null">case_file_name,</if>
             <if test="caseName != null">case_name,</if>
             <if test="description != null">description,</if>
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="solution != null">solution,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="caseFileName != null">#{caseFileName},</if>
             <if test="caseName != null">#{caseName},</if>
             <if test="description != null">#{description},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FeedbackRawDataMapper.xml

@@ -33,9 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertFeedbackRawData" parameterType="FeedbackRawData" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFeedbackRawData" parameterType="FeedbackRawData">
         insert into phm_feedback_raw_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/FleetMapper.xml

@@ -39,9 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertFleet" parameterType="Fleet" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFleet" parameterType="Fleet">
         insert into phm_fleet
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="fleetName != null">fleet_name,</if>
             <if test="fleetCode != null">fleet_code,</if>
             <if test="gather != null">gather,</if>
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="fleetName != null">#{fleetName},</if>
             <if test="fleetCode != null">#{fleetCode},</if>
             <if test="gather != null">#{gather},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastModelMapper.xml

@@ -41,9 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertForecastModel" parameterType="ForecastModel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertForecastModel" parameterType="ForecastModel">
         insert into phm_forecast_model
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="object != null">object,</if>
             <if test="method != null">method,</if>
             <if test="trainsRange != null">trains_range,</if>
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="object != null">#{object},</if>
             <if test="method != null">#{method},</if>
             <if test="trainsRange != null">#{trainsRange},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ForecastResultMapper.xml

@@ -39,9 +39,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertForecastResult" parameterType="ForecastResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertForecastResult" parameterType="ForecastResult">
         insert into phm_forecast_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="unitName != null">unit_name,</if>
             <if test="studyObject != null">study_object,</if>
             <if test="snsCode != null">sns_code,</if>
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="unitName != null">#{unitName},</if>
             <if test="studyObject != null">#{studyObject},</if>
             <if test="snsCode != null">#{snsCode},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/GlobalIdRegisterMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectGlobalIdRegister" parameterType="Long" resultMap="GlobalIdRegisterResult">
         <include refid="selectGlobalIdRegisterVo"/>
-        order by id desc limit 1
+        order by machine_id,datacenter_id limit 1
     </select>
         
     <insert id="insertGlobalIdRegister" parameterType="GlobalIdRegister" useGeneratedKeys="true" keyProperty="id">

PHM-admin/phm-manage/src/main/resources/mapper/manage/GroundDiagnosisModelMapper.xml

@@ -43,9 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertGroundDiagnosisModel" parameterType="GroundDiagnosisModel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertGroundDiagnosisModel" parameterType="GroundDiagnosisModel">
         insert into phm_ground_diagnosis_model
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="criteria != null">criteria,</if>
             <if test="minDuration != null">min_duration,</if>
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
             <if test="criteria != null">#{criteria},</if>
             <if test="minDuration != null">#{minDuration},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ImportExportLogMapper.xml

@@ -41,9 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertImportExportLog" parameterType="ImportExportLog" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertImportExportLog" parameterType="ImportExportLog">
         insert into sys_import_export_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="modelName != null">model_name,</if>
             <if test="name != null">name,</if>
             <if test="error != null">error,</if>
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="modelName != null">#{modelName},</if>
             <if test="name != null">#{name},</if>
             <if test="error != null">#{error},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/InstructionInfoMapper.xml

@@ -37,9 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertInstructionInfo" parameterType="InstructionInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertInstructionInfo" parameterType="InstructionInfo">
         insert into phm_instruction_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="attribute != null">attribute,</if>
             <if test="content != null">content,</if>
             <if test="isDelete != null">is_delete,</if>
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="attribute != null">#{attribute},</if>
             <if test="content != null">#{content},</if>
             <if test="isDelete != null">#{isDelete},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/LifePartConfigMapper.xml

@@ -29,14 +29,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertLifePartConfig" parameterType="LifePartConfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertLifePartConfig" parameterType="LifePartConfig">
         insert into phm_life_part_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="monitorName != null">monitor_name,</if>
             <if test="unit != null">unit,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="monitorName != null">#{monitorName},</if>
             <if test="unit != null">#{unit},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceMapper.xml

@@ -45,9 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertMaintenance" parameterType="Maintenance" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMaintenance" parameterType="Maintenance">
         insert into phm_maintenance
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="code != null">code,</if>
             <if test="description != null">description,</if>
             <if test="grade != null">grade,</if>
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="code != null">#{code},</if>
             <if test="description != null">#{description},</if>
             <if test="grade != null">#{grade},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/MaintenanceTestControlMapper.xml

@@ -45,9 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertMaintenanceTestControl" parameterType="MaintenanceTestControl" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMaintenanceTestControl" parameterType="MaintenanceTestControl">
         insert into phm_maintenance_test_control
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="maintenanceControl != null">maintenance_control,</if>
             <if test="object != null">object,</if>
             <if test="name != null">name,</if>
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="maintenanceControl != null">#{maintenanceControl},</if>
             <if test="object != null">#{object},</if>
             <if test="name != null">#{name},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/MonitorParameterConfigMapper.xml

@@ -41,9 +41,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertMonitorParameterConfig" parameterType="MonitorParameterConfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMonitorParameterConfig" parameterType="MonitorParameterConfig">
         insert into phm_monitor_parameter_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="name != null">name,</if>
             <if test="busRotocol != null">bus_rotocol,</if>
             <if test="dataBlock != null">data_block,</if>
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
             <if test="busRotocol != null">#{busRotocol},</if>
             <if test="dataBlock != null">#{dataBlock},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -41,9 +41,10 @@
         where id = #{id}
     </select>
 
-    <insert id="insertOrderInfo" parameterType="OrderInfo" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertOrderInfo" parameterType="OrderInfo">
         insert into phm_order_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="orderName != null">order_name,</if>
             <if test="orderType != null">order_type,</if>
             <if test="content != null">content,</if>
@@ -55,6 +56,7 @@
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="orderName != null">#{orderName},</if>
             <if test="orderType != null">#{orderType},</if>
             <if test="content != null">#{content},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/PerformanceMonitorModelMapper.xml

@@ -45,9 +45,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertPerformanceMonitorModel" parameterType="PerformanceMonitorModel" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertPerformanceMonitorModel" parameterType="PerformanceMonitorModel">
         insert into phm_performance_monitor_model
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="object != null">object,</if>
             <if test="parameter != null">parameter,</if>
             <if test="stateCondition != null">state_condition,</if>
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="object != null">#{object},</if>
             <if test="parameter != null">#{parameter},</if>
             <if test="stateCondition != null">#{stateCondition},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/PreHandleResultMapper.xml

@@ -33,9 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertPreHandleResult" parameterType="PreHandleResult" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertPreHandleResult" parameterType="PreHandleResult" >
         insert into phm_pre_handle_result
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="isDelete != null">is_delete,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="isDelete != null">#{isDelete},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/ProductMapper.xml

@@ -23,11 +23,6 @@
         select t.id,
                t.parent_id,
                t.aircraft_id,
-<!--               (CASE-->
-<!--                    when t.parent_id = 0 THEN-->
-<!--                        t2.`name`-->
-<!--                    ELSE p2.`name`-->
-<!--                   END) parent_name,-->
                p2.name as parent_name,
                t.ancestors,
                t.name,
@@ -59,9 +54,10 @@
         where t.id = #{id}
     </select>
 
-    <insert id="insertProduct" parameterType="Product" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertProduct" parameterType="Product">
         insert into phm_product
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="parentId != null">parent_id,</if>
             <if test="aircraftId != null">aircraft_id,</if>
             <if test="parentName != null">parent_name,</if>
@@ -75,6 +71,7 @@
             <if test="updateTime != null">update_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="parentId != null">#{parentId},</if>
             <if test="aircraftId != null">#{aircraftId},</if>
             <if test="parentName != null">#{parentName},</if>

PHM-admin/phm-manage/src/main/resources/mapper/manage/SoftwareConfigMapper.xml

@@ -37,9 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
         
-    <insert id="insertSoftwareConfig" parameterType="SoftwareConfig" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSoftwareConfig" parameterType="SoftwareConfig">
         insert into phm_software_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
             <if test="serialNumber != null">serial_number,</if>
             <if test="name != null">name,</if>
             <if test="isDelete != null">is_delete,</if>
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
             <if test="serialNumber != null">#{serialNumber},</if>
             <if test="name != null">#{name},</if>
             <if test="isDelete != null">#{isDelete},</if>