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

台站运行管理模块下实体类移动到base-core下

Browse Source
This commit is contained in:
qiaoqinzheng 2023-07-31 17:22:47 +08:00
parent 016cca95f0
commit 1667b43218
32 changed files with 44 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationReceivingConfig.java → jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/StationReceivingConfig.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.base.entity.postgre;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java → jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/SysUserFocusStation.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.base.entity.postgre;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;

2
jeecg-module-station-operation/src/main/java/org/jeecg/common/StationTypeUtil.java
View File

@ -1,7 +1,7 @@
package org.jeecg.common;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.entity.StationType;
import org.jeecg.modules.entity.data.StationType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

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

@ -3,8 +3,8 @@ package org.jeecg.modules.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.PointVo;
import org.jeecg.modules.entity.StationOperation;
import org.jeecg.modules.entity.data.PointVo;
import org.jeecg.modules.entity.data.StationOperation;
import org.jeecg.modules.service.IStationOperationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

6
jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/SysUserFocusStationController.java
View File

@ -3,12 +3,10 @@ package org.jeecg.modules.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.config.valid.InsertGroup;
import org.jeecg.modules.entity.SysUserFocusStation;
import org.jeecg.modules.entity.UserFocusStation;
import org.jeecg.modules.base.entity.postgre.SysUserFocusStation;
import org.jeecg.modules.entity.data.UserFocusStation;
import org.jeecg.modules.service.ISysUserFocusStationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;

33
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUser.java
View File

@ -1,33 +0,0 @@
package org.jeecg.modules.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
@Data
@TableName("sys_user")
public class SysUser implements Serializable {
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
private String id;
/**
* 登录账号
*/
@Excel(name = "登录账号", width = 15)
private String username;
/**
* 真实姓名
*/
@Excel(name = "真实姓名", width = 15)
private String realname;
}

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/DataInfoVo.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/DataInfoVo.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/DetectorData.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/DetectorData.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/Point.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/Point.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/PointVo.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/PointVo.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;

3
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationData.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/StationData.java
View File

@ -1,7 +1,6 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;
import org.jeecg.modules.system.entity.GardsDetectors;
import java.io.Serializable;
import java.util.List;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationOperation.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/StationOperation.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;

3
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationTree.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/StationTree.java
View File

@ -1,7 +1,6 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;
import org.jeecg.modules.system.entity.GardsStations;
import java.util.List;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationType.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/StationType.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/UserFocusStation.java → jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/data/UserFocusStation.java
View File

@ -1,4 +1,4 @@
package org.jeecg.modules.entity;
package org.jeecg.modules.entity.data;
import lombok.Data;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.base.entity.original.GardsMetData;
import java.util.List;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationOperationMapper.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.entity.StationOperation;
import org.jeecg.modules.entity.data.StationOperation;
public interface StationOperationMapper extends BaseMapper<StationOperation> {
}

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationReceivingConfigMapper.java
View File

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

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSampleDataMapper.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import java.util.List;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.mapper;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import java.util.List;

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/SysUserFocusStationMapper.java
View File

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

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/stationMetDataMapper.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.StationMetDataMapper">
<select id="findMetDataList" resultType="org.jeecg.modules.base.entity.GardsMetData">
<select id="findMetDataList" resultType="org.jeecg.modules.base.entity.original.GardsMetData">
select
STATION_ID,
START_TIME,

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/stationSampleDataMapper.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.StationSampleDataMapper">
<select id="findSampleDataList" resultType="org.jeecg.modules.base.entity.GardsSampleData">
<select id="findSampleDataList" resultType="org.jeecg.modules.base.entity.original.GardsSampleData">
select
DETECTOR_ID,
DATA_TYPE,

2
jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/stationSohDataMapper.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.StationSohDataMapper">
<select id="findSohDataList" resultType="org.jeecg.modules.base.entity.GardsSohData">
<select id="findSohDataList" resultType="org.jeecg.modules.base.entity.original.GardsSohData">
select
DETECTOR_ID,
START_TIME,

4
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.service;
import org.jeecg.modules.entity.SysUser;
import org.jeecg.modules.system.entity.GardsDetectors;
import org.jeecg.modules.base.entity.postgre.SysUser;
import org.jeecg.modules.base.entity.configuration.GardsDetectors;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;

4
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/IStationOperationService.java
View File

@ -2,8 +2,8 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.PointVo;
import org.jeecg.modules.entity.StationOperation;
import org.jeecg.modules.entity.data.PointVo;
import org.jeecg.modules.entity.data.StationOperation;
import java.util.List;

4
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ISysUserFocusStationService.java
View File

@ -2,8 +2,8 @@ package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.entity.SysUserFocusStation;
import org.jeecg.modules.entity.UserFocusStation;
import org.jeecg.modules.base.entity.postgre.SysUserFocusStation;
import org.jeecg.modules.entity.data.UserFocusStation;
import java.util.List;

17
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java
View File

@ -13,18 +13,17 @@ import org.jeecg.common.PointUtil;
import org.jeecg.common.StationTypeUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.modules.base.entity.GardsMetData;
import org.jeecg.modules.base.entity.GardsSampleData;
import org.jeecg.modules.base.entity.GardsSohData;
import org.jeecg.modules.entity.*;
import org.jeecg.modules.entity.data.RateParam;
import org.jeecg.modules.entity.data.StationInfo;
import org.jeecg.modules.base.entity.original.GardsMetData;
import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.original.GardsSohData;
import org.jeecg.modules.base.entity.postgre.SysUserFocusStation;
import org.jeecg.modules.entity.data.*;
import org.jeecg.modules.mapper.*;
import org.jeecg.modules.service.ICacheTimeService;
import org.jeecg.modules.service.IStationOperationService;
import org.jeecg.modules.system.entity.GardsDetectors;
import org.jeecg.modules.system.entity.GardsNuclearfacility;
import org.jeecg.modules.system.entity.GardsStations;
import org.jeecg.modules.base.entity.configuration.GardsDetectors;
import org.jeecg.modules.base.entity.configuration.GardsNuclearfacility;
import org.jeecg.modules.base.entity.configuration.GardsStations;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

10
jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java
View File

@ -11,15 +11,15 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.modules.entity.StationReceivingConfig;
import org.jeecg.modules.entity.SysUser;
import org.jeecg.modules.entity.SysUserFocusStation;
import org.jeecg.modules.entity.UserFocusStation;
import org.jeecg.modules.base.entity.postgre.StationReceivingConfig;
import org.jeecg.modules.base.entity.postgre.SysUser;
import org.jeecg.modules.base.entity.postgre.SysUserFocusStation;
import org.jeecg.modules.entity.data.UserFocusStation;
import org.jeecg.modules.mapper.StationReceivingConfigMapper;
import org.jeecg.modules.mapper.SysUserFocusStationMapper;
import org.jeecg.modules.service.ICacheTimeService;
import org.jeecg.modules.service.ISysUserFocusStationService;
import org.jeecg.modules.system.entity.GardsStations;
import org.jeecg.modules.base.entity.configuration.GardsStations;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

73
jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java
View File

@ -1,73 +0,0 @@
package org.jeecg.modules.system.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.config.valid.InsertGroup;
import org.jeecg.config.valid.UpdateGroup;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
@Data
@TableName("CONFIGURATION.GARDS_DETECTORS")
public class GardsDetectors implements Serializable {
@TableField(value = "DETECTOR_ID")
private Integer detectorId;
@TableField(value = "DETECTOR_CODE")
private String detectorCode;
@TableField(value = "LON")
private Double lon;
@TableField(value = "LAT")
private Double lat;
@TableField(value = "TYPE")
private String type;
@TableField(value = "CHANNELS")
private Double channels;
@TableField(value = "RATED_EFFICIENCY")
private Double ratedEfficiency;
@TableField(value = "RATED_RESOLUTION")
private Double ratedResolution;
@TableField(value = "ECAL_RANGE_MAX")
private Double ecalRangeMax;
@TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dateBegin;
@TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dateEnd;
@TableField(value = "STATUS")
private String status;
@TableField(value = "DESCRIPTION")
private String description;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date moddate;
@TableField(value = "STATION_ID")
private Integer stationId;
@TableField(exist = false)
private String stationName;
}

81
jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsNuclearfacility.java
View File

@ -1,81 +0,0 @@
package org.jeecg.modules.system.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("CONFIGURATION.GARDS_NUCLEARFACILITY")
public class GardsNuclearfacility implements Serializable {
@TableField(value = "FACILITY_ID")
private Integer facilityId;
@TableField(value = "FACILITY_NAME")
private String facilityName;
@TableField(value = "TYPE")
private String type;
@TableField(value = "LOCATION")
private String location;
@TableField(value = "LONGITUDE")
private String longitude;
@TableField(value = "LATITUDE")
private String latitude;
@TableField(value = "STATUS")
private String status;
@TableField(value = "BUILDDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date buildDate;
@TableField(value = "CRITICALITYDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date criticalityDate;
@TableField(value = "RETIREDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date retireDate;
@TableField(value = "GRIDCONEETIONDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gridconeetionDate;
@TableField(value = "VENDOR")
private String vendor;
@TableField(value = "OWNER")
private String owner;
@TableField(value = "OPERARTOR")
private String operartor;
@TableField(value = "CAPACITYGROSS")
private Integer capacitygross;
@TableField(value = "CAPACITYNET")
private Integer capacitynet;
@TableField(value = "CAPACITYTHERMAL")
private Integer capacitythermal;
@TableField(value = "ACTIVITY_DAY")
private Integer activityDay;
@TableField(value = "ACTIVITY_YEAR")
private Integer activityYear;
}

58
jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java
View File

@ -1,58 +0,0 @@
package org.jeecg.modules.system.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(value = "CONFIGURATION.GARDS_STATIONS")
public class GardsStations implements Serializable {
@TableField(value = "STATION_ID")
private Integer stationId;
@TableField(value = "STATION_CODE")
private String stationCode;
@TableField(value = "COUNTRY_CODE")
private String countryCode;
@TableField(value = "TYPE")
private String type;
@TableField(value = "LON")
private Double lon;
@TableField(value = "LAT")
private Double lat;
@TableField(value = "ELEVATION")
private Double elevation;
@TableField(value = "DESCRIPTION")
private String description;
@TableField(value = "DATE_BEGIN")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateBegin;
@TableField(value = "DATE_END")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateEnd;
@TableField(value = "STATUS")
private String status;
@TableField(value = "MODDATE")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date moddate;
}