Merge branch 'dev_ALlen' into dev-rmd

meas-system/src/main/java/com/meas/system/controller/MeasDataResultsController.java

@@ -73,7 +73,12 @@ public class MeasDataResultsController extends BaseController {
     @Log(title = "数据结果", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeasDataResults measDataResults) {
-        return toAjax(measDataResultsService.insertMeasDataResults(measDataResults));
+        MeasDataResults returnValue = measDataResultsService.insertMeasDataResults(measDataResults);
+        if(returnValue == null){
+            return error();
+        } else {
+            return success(returnValue);
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/controller/MeasEnvDataController.java

@@ -73,7 +73,12 @@ public class MeasEnvDataController extends BaseController {
     @Log(title = "测量环境数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeasEnvData measEnvData) {
-        return success(measEnvDataService.insertMeasEnvData(measEnvData));
+        MeasEnvData returnValue = measEnvDataService.insertMeasEnvData(measEnvData);
+        if(returnValue == null){
+            return error();
+        } else {
+            return success(returnValue);
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/controller/MeasSpectralRadiationController.java

@@ -73,7 +73,12 @@ public class MeasSpectralRadiationController extends BaseController {
     @Log(title = "光谱辐射", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeasSpectralRadiation measSpectralRadiation) {
-        return toAjax(measSpectralRadiationService.insertMeasSpectralRadiation(measSpectralRadiation));
+        MeasSpectralRadiation returnValue = measSpectralRadiationService.insertMeasSpectralRadiation(measSpectralRadiation);
+        if (returnValue == null) {
+            return error();
+        } else {
+            return success(returnValue);
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/controller/MeasThermalImagerTestDataController.java

@@ -73,7 +73,12 @@ public class MeasThermalImagerTestDataController extends BaseController {
     @Log(title = "热像仪测试数据", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeasThermalImagerTestData measThermalImagerTestData) {
-        return toAjax(measThermalImagerTestDataService.insertMeasThermalImagerTestData(measThermalImagerTestData));
+        MeasThermalImagerTestData returnValue = measThermalImagerTestDataService.insertMeasThermalImagerTestData(measThermalImagerTestData);
+        if (returnValue == null) {
+            return error();
+        } else {
+            return success(returnValue);
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/controller/MeasTransmissionRateController.java

@@ -73,7 +73,12 @@ public class MeasTransmissionRateController extends BaseController {
     @Log(title = "透过率", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody MeasTransmissionRate measTransmissionRate) {
-        return toAjax(measTransmissionRateService.insertMeasTransmissionRate(measTransmissionRate));
+        MeasTransmissionRate returnValue = measTransmissionRateService.insertMeasTransmissionRate(measTransmissionRate);
+        if (returnValue == null) {
+            return error();
+        } else {
+            return success(returnValue);
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/service/IMeasDataResultsService.java

@@ -33,7 +33,7 @@ public interface IMeasDataResultsService {
      * @param measDataResults 数据结果
      * @return 结果
      */
-    public int insertMeasDataResults(MeasDataResults measDataResults);
+    public MeasDataResults insertMeasDataResults(MeasDataResults measDataResults);
 
     /**
      * 修改数据结果

meas-system/src/main/java/com/meas/system/service/IMeasSpectralRadiationService.java

@@ -33,7 +33,7 @@ public interface IMeasSpectralRadiationService {
      * @param measSpectralRadiation 光谱辐射
      * @return 结果
      */
-    public int insertMeasSpectralRadiation(MeasSpectralRadiation measSpectralRadiation);
+    public MeasSpectralRadiation insertMeasSpectralRadiation(MeasSpectralRadiation measSpectralRadiation);
 
     /**
      * 修改光谱辐射

meas-system/src/main/java/com/meas/system/service/IMeasThermalImagerTestDataService.java

@@ -33,7 +33,7 @@ public interface IMeasThermalImagerTestDataService {
      * @param measThermalImagerTestData 热像仪测试数据
      * @return 结果
      */
-    public int insertMeasThermalImagerTestData(MeasThermalImagerTestData measThermalImagerTestData);
+    public MeasThermalImagerTestData insertMeasThermalImagerTestData(MeasThermalImagerTestData measThermalImagerTestData);
 
     /**
      * 修改热像仪测试数据

meas-system/src/main/java/com/meas/system/service/IMeasTransmissionRateService.java

@@ -33,7 +33,7 @@ public interface IMeasTransmissionRateService {
      * @param measTransmissionRate 透过率
      * @return 结果
      */
-    public int insertMeasTransmissionRate(MeasTransmissionRate measTransmissionRate);
+    public MeasTransmissionRate insertMeasTransmissionRate(MeasTransmissionRate measTransmissionRate);
 
     /**
      * 修改透过率

meas-system/src/main/java/com/meas/system/service/impl/MeasDataResultsServiceImpl.java

@@ -49,9 +49,14 @@ public class MeasDataResultsServiceImpl implements IMeasDataResultsService {
      * @return 结果
      */
     @Override
-    public int insertMeasDataResults(MeasDataResults measDataResults) {
+    public MeasDataResults insertMeasDataResults(MeasDataResults measDataResults) {
         measDataResults.setCreateTime(DateUtils.getNowDate());
-        return measDataResultsMapper.insertMeasDataResults(measDataResults);
+        int i = measDataResultsMapper.insertMeasDataResults(measDataResults);
+        if (i > 0) {
+            return measDataResults;
+        } else {
+            return null;
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/service/impl/MeasSpectralRadiationServiceImpl.java

@@ -49,9 +49,14 @@ public class MeasSpectralRadiationServiceImpl implements IMeasSpectralRadiationS
      * @return 结果
      */
     @Override
-    public int insertMeasSpectralRadiation(MeasSpectralRadiation measSpectralRadiation) {
+    public MeasSpectralRadiation insertMeasSpectralRadiation(MeasSpectralRadiation measSpectralRadiation) {
         measSpectralRadiation.setCreateTime(DateUtils.getNowDate());
-        return measSpectralRadiationMapper.insertMeasSpectralRadiation(measSpectralRadiation);
+        int i = measSpectralRadiationMapper.insertMeasSpectralRadiation(measSpectralRadiation);
+        if (i > 0) {
+            return measSpectralRadiation;
+        } else {
+            return null;
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/service/impl/MeasThermalImagerTestDataServiceImpl.java

@@ -49,9 +49,14 @@ public class MeasThermalImagerTestDataServiceImpl implements IMeasThermalImagerT
      * @return 结果
      */
     @Override
-    public int insertMeasThermalImagerTestData(MeasThermalImagerTestData measThermalImagerTestData) {
+    public MeasThermalImagerTestData insertMeasThermalImagerTestData(MeasThermalImagerTestData measThermalImagerTestData) {
         measThermalImagerTestData.setCreateTime(DateUtils.getNowDate());
-        return measThermalImagerTestDataMapper.insertMeasThermalImagerTestData(measThermalImagerTestData);
+        int i = measThermalImagerTestDataMapper.insertMeasThermalImagerTestData(measThermalImagerTestData);
+        if (i > 0) {
+            return measThermalImagerTestData;
+        } else {
+            return null;
+        }
     }
 
     /**

meas-system/src/main/java/com/meas/system/service/impl/MeasTransmissionRateServiceImpl.java

@@ -49,9 +49,14 @@ public class MeasTransmissionRateServiceImpl implements IMeasTransmissionRateSer
      * @return 结果
      */
     @Override
-    public int insertMeasTransmissionRate(MeasTransmissionRate measTransmissionRate) {
+    public MeasTransmissionRate insertMeasTransmissionRate(MeasTransmissionRate measTransmissionRate) {
         measTransmissionRate.setCreateTime(DateUtils.getNowDate());
-        return measTransmissionRateMapper.insertMeasTransmissionRate(measTransmissionRate);
+        int i = measTransmissionRateMapper.insertMeasTransmissionRate(measTransmissionRate);
+        if (i > 0) {
+            return measTransmissionRate;
+        } else {
+            return null;
+        }
     }
 
     /**