xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：合并

Browse Source
This commit is contained in:
nieziyan 2023-08-01 10:57:33 +08:00
parent 3c1b3f2c80
commit e390fda254
28 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/DatabaseDto.java
View File

@ -8,6 +8,7 @@ import java.io.Serializable;
@Data
@Accessors(chain = true)
public class DatabaseDto implements Serializable {
private String id;
private String name;

1
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/feignclient/SystemClient.java
View File

@ -3,6 +3,7 @@ package org.jeecg.modules.feignclient;
import org.jeecg.modules.base.entity.postgre.SysUser;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import java.util.Map;

1
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java
View File

@ -16,7 +16,6 @@ import org.jeecg.modules.base.dto.SourceDto;
import org.jeecg.modules.base.vo.SourceVo;
import org.jeecg.modules.entity.AlarmHistory;
import org.jeecg.modules.base.entity.postgre.SysDatabase;
import org.jeecg.modules.entity.SysDatabase;
import org.jeecg.modules.feignclient.SystemClient;
import org.jeecg.modules.mapper.SysDatabaseMapper;
import org.jeecg.modules.service.ISysDatabaseService;

4
jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java
View File

@ -20,14 +20,14 @@ public class StationOperationController {
private IStationOperationService stationOperationService;
@GetMapping("findStationType")
@ApiOperation(value = "查询台站，核设施类型", notes = "查询台站，核设施类型")
@ApiOperation(value = "查询台站/核设施类型", notes = "查询台站/核设施类型")
public List<String> findStationType(){
List<String> result = stationOperationService.findStationType();
return result;
}
@GetMapping("findList")
@ApiOperation(value = "查询所有台站，核设施信息", notes = "查询所有台站，核设施信息")
@ApiOperation(value = "查询所有台站/核设施信息", notes = "查询所有台站/核设施信息")
public List<StationOperation> findList(String status, String stationType){
List<StationOperation> result = stationOperationService.findList(status, stationType);
return result;

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDictService.java
View File

@ -279,4 +279,5 @@ public interface ISysDictService extends IService<SysDict> {
List<GardsStations> findStationListByMenuName(String menuName);
List<DatabaseTypeDto> dataBaseType();
}

6
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
View File

@ -9,11 +9,9 @@ import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.Prompt;
import org.jeecg.common.util.ReadLineUtil;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.jeecg.modules.base.enums.PageType;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.jeecg.modules.entity.GardsAnalysesMan;
import org.jeecg.modules.service.*;
import org.jeecg.modules.system.entity.GardsStations;
import org.jeecgframework.poi.excel.ExcelExportUtil;

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsBgEfficiencyPairs;
import org.jeecg.modules.base.entity.original.GardsBgEfficiencyPairs;
public interface GardsBgEfficiencyPairsMapper extends BaseMapper<GardsBgEfficiencyPairs> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsCalibrationPairsOrig;
import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig;
public interface GardsCalibrationPairsOrigMapper extends BaseMapper<GardsCalibrationPairsOrig> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsHistogram;
import org.jeecg.modules.base.entity.original.GardsHistogram;
public interface GardsHistogramMapper extends BaseMapper<GardsHistogram> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.base.entity.original.GardsMetData;
public interface GardsMetDataMapper extends BaseMapper<GardsMetData> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsRoiLimits;
import org.jeecg.modules.base.entity.original.GardsRoiLimits;
public interface GardsRoiLimitsMapper extends BaseMapper<GardsRoiLimits> {
}

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleAuxMapper.java
View File

@ -1,7 +1,8 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsSampleAux;
import org.jeecg.modules.base.entity.original.GardsSampleAux;
public interface GardsSampleAuxMapper extends BaseMapper<GardsSampleAux> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsSampleCertLine;
import org.jeecg.modules.base.entity.original.GardsSampleCertLine;
public interface GardsSampleCertLineMapper extends BaseMapper<GardsSampleCertLine> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsSampleCert;
import org.jeecg.modules.base.entity.original.GardsSampleCert;
public interface GardsSampleCertMapper extends BaseMapper<GardsSampleCert> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java
View File

@ -2,7 +2,7 @@ package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import java.util.Date;
import java.util.List;

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsSampleDescription;
import org.jeecg.modules.base.entity.original.GardsSampleDescription;
public interface GardsSampleDescriptionMapper extends BaseMapper<GardsSampleDescription> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsSampleRatios;
import org.jeecg.modules.base.entity.original.GardsSampleRatios;
public interface GardsSampleRatiosMapper extends BaseMapper<GardsSampleRatios> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.original.GardsSohData;
public interface GardsSohDataMapper extends BaseMapper<GardsSohData> {
}

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.GardsSpectrum;
import org.jeecg.modules.base.entity.original.GardsSpectrum;
public interface GardsSpectrumMapper extends BaseMapper<GardsSpectrum> {
}

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mapper.GardsSampleDataWebMapper">
<select id="findAutoPage" resultType="org.jeecg.modules.base.entity.GardsSampleData">
<select id="findAutoPage" resultType="org.jeecg.modules.base.entity.original.GardsSampleData">
SELECT
sam.SITE_DET_CODE,
sam.SAMPLE_ID,
@ -41,7 +41,7 @@
</where>
</select>
<select id="findReviewedPage" resultType="org.jeecg.modules.base.entity.GardsSampleData">
<select id="findReviewedPage" resultType="org.jeecg.modules.base.entity.original.GardsSampleData">
SELECT
sam.SITE_DET_CODE,
sam.SAMPLE_ID,

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java
View File

@ -3,9 +3,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsMetData;
import org.springframework.web.bind.annotation.RequestParam;
import org.jeecg.modules.base.entity.original.GardsMetData;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import javax.servlet.http.HttpServletResponse;
import java.util.Date;

2
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.RequestParam;

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java
View File

@ -17,8 +17,7 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.dto.SampleDataDto;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.jeecg.modules.mapper.GardsAnalysesAutoMapper;
import org.jeecg.modules.mapper.GardsSampleDataWebMapper;

4
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java
View File

@ -12,14 +12,12 @@ import org.jeecg.common.api.QueryRequest;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.entity.GardsAlertData;
import org.jeecg.modules.base.entity.original.GardsMetData;
import org.jeecg.modules.mapper.GardsMetDataMapper;
import org.jeecg.modules.service.IGardsMetDataService;
import org.jeecgframework.poi.excel.ExcelExportUtil;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;

15
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
View File

@ -21,8 +21,17 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.ReadLineUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.original.*;
import org.jeecg.modules.base.entity.original.GardsBgEfficiencyPairs;
import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig;
import org.jeecg.modules.base.entity.original.GardsHistogram;
import org.jeecg.modules.base.entity.original.GardsRoiLimits;
import org.jeecg.modules.base.entity.original.GardsSampleAux;
import org.jeecg.modules.base.entity.original.GardsSampleCert;
import org.jeecg.modules.base.entity.original.GardsSampleCertLine;
import org.jeecg.modules.base.entity.original.GardsSampleDescription;
import org.jeecg.modules.base.entity.original.GardsSampleRatios;
import org.jeecg.modules.base.entity.original.GardsSpectrum;
import org.jeecg.modules.base.enums.PageType;
import org.jeecg.modules.entity.*;
import org.jeecg.modules.entity.data.*;
@ -265,7 +274,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
gEnergySubBlock = new LinkedList<>();
for (GardsCalibrationPairsOrig orig:gardsCalibrationPairsOrigs) {
GEnergy gEnergy = new GEnergy();
if (Objects.nonNull(orig.getYvalue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){
if (Objects.nonNull(orig.getYValue()) && Objects.nonNull(orig.getXvalue()) && Objects.nonNull(orig.getUncyvalue())){
gEnergy.setEnergy(orig.getYvalue());
gEnergy.setCentroid(orig.getXvalue());
gEnergy.setUncertainty(orig.getUncyvalue());

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java
View File

@ -15,7 +15,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.jeecg.modules.entity.GardsAlertData;
import org.jeecg.modules.mapper.GardsAlertDataMapper;
import org.jeecg.modules.mapper.GardsSohDataMapper;
@ -37,6 +37,7 @@ public class GardsSohDataServiceImpl extends ServiceImpl<GardsSohDataMapper, Gar
@Autowired
private RedisUtil redisUtil;
@Autowired
private GardsAlertDataMapper gardsAlertDataMapper;

3
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/ReviewedServiceImpl.java
View File

@ -15,8 +15,7 @@ import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.ExportUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.dto.SampleDataDto;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.entity.GardsAnalysesAuto;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.entity.GardsAnalysesMan;
import org.jeecg.modules.mapper.GardsAnalysesManMapper;
import org.jeecg.modules.mapper.GardsSampleDataWebMapper;