还原代码

jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/configuration/GardsNuclearfacility.java

@@ -47,6 +47,8 @@ public class GardsNuclearfacility implements Serializable {
     @TableField(value = "LONGITUDE")
     private String longitude;
 
+    @TableField(exist = false)
+    private Double lonValue;
     /**
      *  纬度
      */
@@ -54,7 +56,8 @@ public class GardsNuclearfacility implements Serializable {
     @TableField(value = "LATITUDE")
     private String latitude;
 
-
+    @TableField(exist = false)
+    private Double latValue;
     /**
      *  状态
      */

jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java

@@ -64,7 +64,11 @@ public class DataAnalysisController {
 
     @GetMapping("/getNuclideActConcChartData")
     @ApiOperation(value = "样品统计分析-核素等级时序分析", notes = "样品统计分析-核素等级时序分析")
-    public Result getNuclideActConcChartData(String sampleType,String station, String nuclideName, Integer dataSource, @RequestParam("startDate")
+    public Result getNuclideActConcChartData(@RequestParam("sampleType")String sampleType,
+                                            @RequestParam("station") String station,
+                                            @RequestParam("nuclideName") String nuclideName,
+                                            @RequestParam("dataSource") Integer dataSource,
+                                             @RequestParam("startDate")
                                              @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
                                              @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) throws JsonProcessingException {
         return sampleStatAnalysisService.getNuclideActConcChartData(sampleType,station, nuclideName, dataSource, startDate, endDate);

jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java

@@ -271,6 +271,11 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
             result.error500("Station Code cannot be null");
             return result;
         }
+        if (StringUtils.isBlank(nuclideName)) {
+            result.error500("nuclideName cannot be null");
+            return result;
+        }
+
         if (Objects.isNull(startDate)) {
             result.error500("The start time cannot be empty");
             return result;