diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java new file mode 100644 index 00000000..0ea15ed1 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -0,0 +1,33 @@ +package org.jeecg.modules.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.QueryRequest; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.service.ISpectrumAnalysisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; + +@RestController +@RequestMapping("spectrumAnalysis") +@Api(value = "人工交互分析管理", tags = "人工交互分析管理") +public class SpectrumAnalysesController { + + @Autowired + private ISpectrumAnalysisService spectrumAnalysisService; + + @GetMapping("getDBSpectrumList") + @ApiOperation(value = "获取数据库中交互分析基础数据", notes = "获取数据库中交互分析基础数据") + public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String menuType,boolean CollectStop, boolean AcqStart, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { + return spectrumAnalysisService.getDBSpectrumList(queryRequest, gardsSampleData, dbName, menuType, CollectStop, AcqStart, startDate, endDate); + } + + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java new file mode 100644 index 00000000..060064a6 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsAnalyses.java @@ -0,0 +1,112 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("GARDS_ANALYSES") +public class GardsAnalyses implements Serializable { + + @TableField(value = "IDANALYSIS") + private Integer IDANALYSIS; + + @TableField(value = "SAMPLE_ID") + private Integer sampleId; + + @TableField(value = "ANALYSISBEGIN") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date analysisBegin; + + @TableField(value = "ANALYSISEND") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date analysisEnd; + + @TableField(value = "TYPE") + private String type; + + @TableField(value = "SOFTWARE") + private String software; + + @TableField(value = "SWVERSION") + private String swversion; + + @TableField(value = "ANALYST") + private String analyst; + + @TableField(value = "BASELINEMETHOD") + private String baselineMethod; + + @TableField(value = "PEAKSMETHOD") + private String peaksMethod; + + @TableField(value = "NUCLIDEMETHOD") + private String nuclideMethod; + + @TableField(value = "UNCCALCMETHOD") + private String unccalcMethod; + + @TableField(value = "LCMETHOD") + private String lcMethod; + + @TableField(value = "SEARCHSTARTCHANNEL") + private Integer searchStartChannel; + + @TableField(value = "SEARCHENDCHANNEL") + private Integer searchEndChannel; + + @TableField(value = "SEARCHTHRESHOLD") + private Double searchThreshold; + + @TableField(value = "NUMBEROFPEAKS") + private Integer numberOfPeaks; + + @TableField(value = "TOTALCOUNTS") + private Double totalCounts; + + @TableField(value = "CATEGORY") + private Integer category; + + @TableField(value = "COMMENTS") + private String comments; + + @TableField(value = "MODDATE") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; + + @TableField(value = "USEDGASPHD") + private String usedGasPHD; + + @TableField(value = "USEDDETPHD") + private String usedDetPHD; + + @TableField(value = "USEDGASPHD_ID") + private Integer usedGasPHDId; + + @TableField(value = "USEDDETPHD_ID") + private Integer usedDetPHDId; + + @TableField(value = "BASELINE_PATH") + private String baseLinePath; + + @TableField(value = "LC_PATH") + private String lcPath; + + @TableField(value = "SCAC_PATH") + private String scacPath; + + @TableField(value = "LOG_PATH") + private String logPath; + + @TableField(value = "REPORT_PAHT") + private String reportPath; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java new file mode 100644 index 00000000..8bca9136 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDict.java @@ -0,0 +1,50 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName(value = "sys_dict") +public class SysDict implements Serializable { + + @TableField(value = "id") + private String id; + + @TableField(value = "dict_name") + private String dictName; + + @TableField(value = "dict_code") + private String dictCode; + + @TableField(value = "description") + private String description; + + @TableField(value = "del_flag") + private Integer delFlag; + + @TableField(value = "create_by") + private String createBy; + + @TableField(value = "create_time") + private Date createTime; + + @TableField(value = "update_by") + private String updateBy; + + @TableField(value = "update_time") + private Date updateTime; + + @TableField(value = "type") + private Integer type; + + @TableField(value = "tenant_id") + private Integer tenantId; + + @TableField(value = "low_app_id") + private String lowAppId; + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java new file mode 100644 index 00000000..776d4aa4 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/SysDictItem.java @@ -0,0 +1,80 @@ +package org.jeecg.modules.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

+ * + *

+ * + * @Author zhangweijian + * @since 2018-12-28 + */ +@Data +@TableName(value = "sys_dict_item") +public class SysDictItem implements Serializable { + + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + /** + * 字典id + */ + @TableField(value = "dict_id") + private String dictId; + + /** + * 字典项文本 + */ + @TableField(value = "item_text") + private String itemText; + + /** + * 字典项值 + */ + @TableField(value = "item_value") + private String itemValue; + + /** + * 描述 + */ + @TableField(value = "description") + private String description; + + /** + * 排序 + */ + @TableField(value = "sort_order") + private Integer sortOrder; + + + /** + * 状态（1启用 0不启用） + */ + @TableField(value = "status") + private Integer status; + + @TableField(value = "create_by") + private String createBy; + + @TableField(value = "create_time") + private Date createTime; + + @TableField(value = "update_by") + private String updateBy; + + @TableField(value = "update_time") + private Date updateTime; + + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java new file mode 100644 index 00000000..8619195c --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.modules.base.entity.GardsSampleData; + +import java.util.List; + +public interface SpectrumAnalysisMapper { + + Page getDBSpectrumList(IPage page, GardsSampleData gardsSampleData, String dbName, List stationTypes, boolean CollectStop, boolean AcqStart, String startTime, String endTime); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemMapper.java new file mode 100644 index 00000000..a84dba66 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictItemMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.entity.SysDictItem; + +public interface SysDictItemMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictMapper.java new file mode 100644 index 00000000..948c1789 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SysDictMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.entity.SysDict; + +public interface SysDictMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml new file mode 100644 index 00000000..0dc66d45 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml @@ -0,0 +1,68 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java new file mode 100644 index 00000000..8150e6fd --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.service; + +import org.jeecg.common.api.QueryRequest; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.base.entity.GardsSampleData; + +import java.util.Date; + +public interface ISpectrumAnalysisService { + + Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String menuType, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictService.java new file mode 100644 index 00000000..26c8eff8 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISysDictService.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.entity.SysDict; + +import java.util.List; + +public interface ISysDictService extends IService { + + List findStationType(String menuType); + + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java new file mode 100644 index 00000000..a5e3a7ff --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -0,0 +1,79 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.jeecg.common.api.QueryRequest; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.DateUtils; +import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.mapper.SpectrumAnalysisMapper; +import org.jeecg.modules.service.ISpectrumAnalysisService; +import org.jeecg.modules.service.ISysDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +@Service("spectrumAnalysisService") +@DS("auo") +public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { + + @Autowired + private SpectrumAnalysisMapper spectrumAnalysisMapper; + @Autowired + private RedisUtil redisUtil; + @Autowired + private ISysDictService sysDictService; + + @Override + public Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleData gardsSampleData, String dbName, String menuType, boolean CollectStop, boolean AcqStart, Date startDate, Date endDate) { + Result result = new Result(); + if (Objects.isNull(startDate)){ + result.error500("开始时间不能为空"); + return result; + } + String startTime = DateUtils.formatDate(startDate, "yyyy-MM-dd") + " 00:00:00"; + if (Objects.isNull(endDate)) { + result.error500("结束时间不能为空"); + return result; + } + String endTime = DateUtils.formatDate(endDate, "yyyy-MM-dd") + " 23:59:59"; + if (StringUtils.isBlank(menuType)){ + result.error500("谱类型不能为空"); + return result; + } + List stationTypes = sysDictService.findStationType(menuType); + if (CollectionUtils.isEmpty(stationTypes)) { + result.error500("请先补充数据字典中当前系统类型对应的台站类型信息"); + return result; + } + if (StringUtils.isBlank(dbName)){ + result.error500("请勾选数据库类型"); + return result; + } + if (dbName.equalsIgnoreCase("auto")){ + dbName = "RNAUTO.GARDS_ANALYSES"; + }else if (dbName.equalsIgnoreCase("man")){ + dbName = "RNMAN.GARDS_ANALYSES"; + }else { + result.error500("数据库类型不存在"); + return result; + } + //从redis中获取台站信息 + Map stationMap = (Map)redisUtil.get("stationMap"); + //从redis中获取探测器信息 + Map detectorsMap = (Map)redisUtil.get("detectorsMap"); + //声明分页page + Page page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); + Page sampleDataPage = spectrumAnalysisMapper.getDBSpectrumList(page, gardsSampleData, dbName, stationTypes, CollectStop, AcqStart, startTime, endTime); + result.setSuccess(true); + result.setResult(sampleDataPage); + return result; + } +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SysDictServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SysDictServiceImpl.java new file mode 100644 index 00000000..9a7b2889 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SysDictServiceImpl.java @@ -0,0 +1,57 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.entity.SysDict; +import org.jeecg.modules.entity.SysDictItem; +import org.jeecg.modules.mapper.SysDictItemMapper; +import org.jeecg.modules.mapper.SysDictMapper; +import org.jeecg.modules.service.ISysDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +@Service("sysDictService") +@DS("master") +public class SysDictServiceImpl extends ServiceImpl implements ISysDictService { + + @Autowired + private SysDictItemMapper sysDictItemMapper; + + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW) + public List findStationType(String menuType) { + List menuTypes = new LinkedList<>(); + if (menuType.equals("B")) { + menuTypes.add("Noble Gas Beta-Gamma"); + }else if (menuType.equals("G")) { + menuTypes.add("Particulate"); + menuTypes.add("Noble Gas HPGe"); + } + LambdaQueryWrapper dictQueryWrapper = new LambdaQueryWrapper<>(); + dictQueryWrapper.in(SysDict::getDictName, menuTypes); + List sysDicts = this.baseMapper.selectList(dictQueryWrapper); + if (CollectionUtils.isNotEmpty(sysDicts)) { + List dictIds = sysDicts.stream().map(SysDict::getId).distinct().collect(Collectors.toList()); + LambdaQueryWrapper dictItemQueryWrapper = new LambdaQueryWrapper<>(); + dictItemQueryWrapper.in(SysDictItem::getDictId, dictIds); + List sysDictItems = sysDictItemMapper.selectList(dictItemQueryWrapper); + if (CollectionUtils.isNotEmpty(sysDictItems)){ + List result = sysDictItems.stream().map(SysDictItem::getItemValue).distinct().collect(Collectors.toList()); + return result; + } + } + return Collections.emptyList(); + } + +} diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/application.yml new file mode 100644 index 00000000..16026513 --- /dev/null +++ b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/application.yml @@ -0,0 +1,18 @@ +server: + port: 7007 + +spring: + application: + name: jeecg-spectrum-analysis + cloud: + nacos: + config: + server-addr: @config.server-addr@ + group: @config.group@ + namespace: @config.namespace@ + discovery: + server-addr: ${spring.cloud.nacos.config.server-addr} + config: + import: + - optional:nacos:jeecg.yaml + - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties new file mode 100644 index 00000000..44618ab8 --- /dev/null +++ b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_config.properties @@ -0,0 +1,29 @@ +#code_generate_project_path +project_path=E:\\workspace\\jeecg-boot +#bussi_package[User defined] +bussi_package=org.jeecg.modules.demo + + +#default code path +#source_root_package=src +#webroot_package=WebRoot + +#maven code path +source_root_package=src.main.java +webroot_package=src.main.webapp + +#ftl resource url +templatepath=/jeecg/code-template +system_encoding=utf-8 + +#db Table id [User defined] +db_table_id=id + +#db convert flag[true/false] +db_filed_convert=true + +#page Search Field num [User defined] +page_search_filed_num=1 +#page_filter_fields +page_filter_fields=create_time,create_by,update_time,update_by +exclude_table=act_,ext_act_,design_,onl_,sys_,qrtz_ diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties new file mode 100644 index 00000000..45b49f60 --- /dev/null +++ b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/jeecg/jeecg_database.properties @@ -0,0 +1,27 @@ +#mysql +diver_name=com.mysql.jdbc.Driver +url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8 +username=root +password=root +database_name=jeecg-boot + +#oracle +#diver_name=oracle.jdbc.driver.OracleDriver +#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL +#username=scott +#password=tiger +#database_name=ORCL + +#postgre +#diver_name=org.postgresql.Driver +#url=jdbc:postgresql://localhost:5432/jeecg +#username=postgres +#password=postgres +#database_name=jeecg + +#SQLServer2005\u4ee5\u4e0a +#diver_name=org.hibernate.dialect.SQLServerDialect +#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg +#username=sa +#password=SA +#database_name=jeecg \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/logback-spring.xml b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..60d4c7df --- /dev/null +++ b/jeecg-server-cloud/jeecg-spectrum-analysis-start/src/main/resources/logback-spring.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n + + + + + + + + ${LOG_HOME}/jeecg-system-%d{yyyy-MM-dd}.%i.log + + 30 + 10MB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n + + + + + + + + ERROR + + + + %p%d%msg%M%F{32}%L + + + ${LOG_HOME}/error-log.html + + + + + + + + ${LOG_HOME}/jeecg-system-%d{yyyy-MM-dd}.%i.html + + 30 + 10MB + + + + %p%d%msg%M%F{32}%L + + + + + + + + + + + + + + + + + + + + \ No newline at end of file