Skip to content

H
hzsomms
Commit 8528b20d authored by hkl's avatar hkl
Browse files
Options

Merge branch 'dev-hkl' into 'dev' 

feat:1.修改bug38

See merge request !32
parents 379a4e18 c061e4f8
Hide whitespace changes
Inline Side-by-side
Showing with 1647 additions and 46 deletions
jeecg-boot-base-core/src/main/java/org/jeecg/config/AsyncTask.java 0 → 100644
View file @ 8528b20d
package org.jeecg.config;
import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
import org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurer;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor;
// 当一个任务通过execute(Runnable)方法欲添加到线程池时：
// 1:如果此时线程池中的数量小于corePoolSize，即使线程池中的线程都处于空闲状态,也要创建新的线程来处理被添加的任务。
// 2:如果此时线程池中的数量等于 corePoolSize，但是缓冲队列 workQueue未满，那么任务被放入缓冲队列。
// 3:如果此时线程池中的数量大于corePoolSize，缓冲队列workQueue满，并且线程池中的数量小于maximumPoolSize，建新的线程来处理被添加的任务。
// 4:如果此时线程池中的数量大于corePoolSize，缓冲队列workQueue满，并且线程池中的数量等于maximumPoolSize，那么通过 handler所指定的策略来处理此任务。
// 也就是：处理任务的优先级为：核心线程corePoolSize、任务队列workQueue、最大线程 maximumPoolSize，如果三者都满了，使用handler处理被拒绝的任务。
// 5:当线程池中的线程数量大于 corePoolSize时，如果某线程空闲时间超过keepAliveTime，线程将被终止。这样，线程池可以动态的调整池中的线程数。
// allowCoreThreadTimeout：允许核心线程超时
// rejectedExecutionHandler：任务拒绝处理器
@Configuration
@EnableAsync
public class AsyncTask implements AsyncConfigurer {
@Override
@Bean
public Executor getAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
// 设置核心线程数
executor.setCorePoolSize(10);
// 设置最大线程数
executor.setMaxPoolSize(100);
// 线程池所使用的缓冲队列
executor.setQueueCapacity(10);
// 等待任务在关机时完成-- 表明等待所有线程执行完
executor.setWaitForTasksToCompleteOnShutdown(true);
// 等待时间(默认为0，此时立即停止) ，并没等待XX秒后强制停止
executor.setAwaitTerminationSeconds(60);
// 指定用于新创建的线程名称的前缀
executor.setThreadNamePrefix("async-");
// 初始化线程
executor.initialize();
// 拒绝策略
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); // 拒绝策略
return executor;
}
/**
* 异常处理
*/
public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
return new SimpleAsyncUncaughtExceptionHandler();
}
}
jeecg-module-system/src/main/java/org/jeecg/codegenerate/CodeGenerate.java
View file @ 8528b20d
......@@ -25,14 +25,14 @@ public class CodeGenerate {
String outputDir = projectPath + "\\jeecg-module-system\\src\\main\\java\\";
// 模块名
String moduleName = "checkData.dynamicStaticGeometricData";
String moduleName = "dynamicStaticAnalysis";
// 表名
String[] tables = {
"t_dsg_rail_inspection_equipment",
"t_dsg_rail_inspection_equipment_item",
"t_dsg_rail_inspection_equipment_item_detail",
"t_dsa_config_static",
"t_dsa_config_static_biz",
"t_dsa_config_dynamics",
"t_dsa_config_dynamics_biz",
};
......@@ -60,7 +60,7 @@ public class CodeGenerate {
// 设置过滤前缀
.strategyConfig(builder -> {
builder.addInclude(tables) // 设置需要生成的表名
.addTablePrefix("t_sn", "t_da","t_ek","t_xd","t_dsg"); // 设置过滤表前缀
.addTablePrefix("t_sn", "t_da","t_ek","t_xd","t_dsg","t_dsa"); // 设置过滤表前缀
// entity实体策略
builder.entityBuilder()
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/dynamicStaticGeometricData/service/impl/RailInspectionEquipmentItemServiceImpl.java
View file @ 8528b20d
......@@ -200,6 +200,7 @@ public class RailInspectionEquipmentItemServiceImpl extends ServiceImpl<RailInsp
@Override
public void saveRecord(RailInspectionEquipmentItem record) {
// 保存item表
record.setId(UUIDGenerator.generate());
record.setDelFlag("0");
......@@ -211,6 +212,13 @@ public class RailInspectionEquipmentItemServiceImpl extends ServiceImpl<RailInsp
int measurePoint = 1;
int sort = 1;
for (int i = 2; i < 32; i++) {
if (measurePoint % 8 == 0) {
measurePoint = 1;
i = i + 2;
continue;
} else {
measurePoint++;
}
RailInspectionEquipmentItemDetail itemDetail = new RailInspectionEquipmentItemDetail();
itemDetail.setId(UUIDGenerator.generate());
itemDetail.setRailInspectionEquipmentId(record.getRailInspectionEquipmentId());
......
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/controller/RailManagementController.java
View file @ 8528b20d
......@@ -5,6 +5,8 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
......@@ -76,9 +78,11 @@ public class RailManagementController extends JeecgController<RailManagement, IR
@AutoLog(value = "资产管理-钢轨管理-智能生成")
@ApiOperation(value = "资产管理-钢轨管理-智能生成", notes = "资产管理-钢轨管理-智能生成")
@GetMapping(value = "/intelligentGeneration")
public Result<String> intelligentGeneration() {
String id = "1671390979417616386"; // 线路id
this.service.intelligentGeneration(id);
@ApiImplicitParams({
@ApiImplicitParam(name = "lightRailId", value = "线路id")
})
public Result<String> intelligentGeneration(String lightRailId) {
this.service.intelligentGeneration(lightRailId);
return Result.OK("生成成功");
}
......
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/RailManagementMapper.xml
View file @ 8528b20d
......@@ -26,7 +26,6 @@
<if test="dto.lineAliasId != null and dto.lineAliasId != ''">
AND t1.line_alias_id = #{dto.lineAliasId}
</if>
AND t3.status = 1
</where>
</select>
<select id="getLineSpecialRail" resultType="java.util.Map">
......
jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/service/impl/RailManagementServiceImpl.java
View file @ 8528b20d
......@@ -3,7 +3,11 @@ package org.jeecg.modules.deviceAsset.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import ognl.IntHashMap;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.deviceAsset.dto.RailManagementDTO;
import org.jeecg.modules.deviceAsset.entity.RailManagement;
......@@ -12,17 +16,16 @@ import org.jeecg.modules.deviceAsset.service.IRailManagementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.deviceAsset.vo.RailManagementVO;
import org.jeecg.modules.subwayNetwork.entity.LightRail;
import org.jeecg.modules.subwayNetwork.entity.SubwaySection;
import org.jeecg.modules.subwayNetwork.mapper.LightRailMapper;
import org.jeecg.modules.subwayNetwork.mapper.SubwaySectionMapper;
import org.jeecg.modules.utils.UnitCodeUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* <p>
......@@ -43,6 +46,9 @@ public class RailManagementServiceImpl extends ServiceImpl<RailManagementMapper,
@Resource
private LightRailMapper lightRailMapper;
@Resource
private SubwaySectionMapper subwaySectionMapper;
@Override
public Page<RailManagementVO> queryPageList(Page<RailManagementVO> pageData, RailManagementDTO dto) {
return this.baseMapper.queryPageList(pageData, dto);
......@@ -86,32 +92,90 @@ public class RailManagementServiceImpl extends ServiceImpl<RailManagementMapper,
String unitCode = "SXXGG" + UnitCodeUtil.supplementZero(4, i + 1);
railManagement.setUnitCode(unitCode);
railManagement.setRailOrderNum(i + 1);
railManagement.setCreateTime(new Date());
railManagement.setUpdateTime(new Date());
railManagement.setCreateBy("系统生成");
railManagement.setUpdateBy("系统生成");
}
this.saveBatch(allRailList);
// 3.2 计算区间
this.calcSection(lightRailId, sdkId, allRailList);
// 4.处理下行
allRailList.clear();
List<RailManagement> downRailList = new ArrayList<>();
String xdkId = "2"; // 下行线id
generationCore(lightRail, allRailList, xdkId);
generationCore(lightRail, downRailList, xdkId);
for (int i = 0; i < allRailList.size(); i++) {
RailManagement railManagement = allRailList.get(i);
for (int i = 0; i < downRailList.size(); i++) {
RailManagement railManagement = downRailList.get(i);
String railCode = "钢轨[下行]" + UnitCodeUtil.supplementZero(4, i + 1);
railManagement.setRailCode(railCode);
String unitCode = "DXXGG" + UnitCodeUtil.supplementZero(4, i + 1);
railManagement.setUnitCode(unitCode);
railManagement.setRailOrderNum(i + 1);
railManagement.setCreateTime(new Date());
railManagement.setUpdateTime(new Date());
railManagement.setCreateBy("系统生成");
railManagement.setUpdateBy("系统生成");
}
this.calcSection(lightRailId, xdkId, downRailList);
allRailList.addAll(downRailList);
this.saveBatch(allRailList);
}
/**
* 计算区间
*
* @param allRailList
*/
private void calcSection(String lightRailId, String lineAliasId, List<RailManagement> allRailList) {
// 查询该线路下面所有的区间
LambdaQueryWrapper<SubwaySection> subwaySectionQw = Wrappers.lambdaQuery();
subwaySectionQw.eq(SubwaySection::getLightRailId, lightRailId)
.eq(SubwaySection::getLineAliasId, lineAliasId);
List<SubwaySection> subwaySections = subwaySectionMapper.selectList(subwaySectionQw);
// 计算单元格归属
Map<String, SubwaySection> optimalSolutionMap = new HashMap<>();
for (RailManagement railManagement : allRailList) {
for (SubwaySection subwaySection : subwaySections) {
// 如果钢轨单元的中心里程属于区间，则钢轨单元属于这个区间
BigDecimal centerMileage = railManagement.getCenterMileage();
if (subwaySection.getSectionStartingMileage().compareTo(centerMileage) <= 0 &&
subwaySection.getSectionEndMileage().compareTo(centerMileage) > 0) {
// 用来判断区间是不是最小区间,最优解
SubwaySection optimalSolution = optimalSolutionMap.get(railManagement.getId());
if (null == optimalSolution) {
optimalSolutionMap.put(railManagement.getId(), subwaySection);
} else {
// 检查第一个区间的端点是否在第二个区间内
boolean startInRange = subwaySection.getSectionStartingMileage().compareTo(optimalSolution.getSectionStartingMileage()) >= 0
&& subwaySection.getSectionStartingMileage().compareTo(optimalSolution.getSectionEndMileage()) <= 0;
boolean endInRange = subwaySection.getSectionEndMileage().compareTo(optimalSolution.getSectionStartingMileage()) >= 0
&& subwaySection.getSectionEndMileage().compareTo(optimalSolution.getSectionEndMileage()) <= 0;
if (startInRange && endInRange) {
optimalSolutionMap.put(railManagement.getId(), subwaySection);
}
}
}
}
SubwaySection optimalSolution = optimalSolutionMap.get(railManagement.getId());
if (optimalSolution != null) {
railManagement.setSectionId(optimalSolution.getId());
}
optimalSolutionMap.remove(railManagement.getId());
}
}
/**
* 生成核心
......
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/ConfigDynamicsController.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.controller;
import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamics;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigDynamicsService;
import org.springframework.web.bind.annotation.*;
import org.jeecg.common.system.base.controller.JeecgController;
import java.util.Arrays;
import java.util.List;
/**
* <p>
* 动静态分析-动态分析-参数配置 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@RestController
@RequestMapping("/dynamicStaticAnalysis/config/dynamics")
@Api("动静态分析-动态分析-参数配置")
public class ConfigDynamicsController extends JeecgController<ConfigDynamics, IConfigDynamicsService> {
@AutoLog(value = "动静态分析-动态分析-参数配置-列表查询")
@ApiOperation(value = "动静态分析-动态分析-参数配置-列表查询", notes = "动静态分析-动态分析-参数配置-列表查询")
@GetMapping(value = "/list")
public Result<List<ConfigDynamics>> queryPageList() {
return Result.OK(this.service.list());
}
@AutoLog(value = "动静态分析-动态分析-参数配置-编辑")
@ApiOperation(value = "资产管理-曲线管理-编辑", notes = "资产管理-曲线管理-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody ConfigDynamics record) {
if (ObjectUtil.isEmpty(record.getId())) {
record.setId(UUIDGenerator.generate());
}
this.service.saveOrUpdate(record);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "动静态分析-动态分析-参数配置-通过id删除")
@ApiOperation(value = "动静态分析-动态分析-参数配置-通过id删除", notes = "动静态分析-动态分析-参数配置-通过id删除")
@GetMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
this.service.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "动静态分析-动态分析-参数配置-批量删除")
@ApiOperation(value = "动静态分析-动态分析-参数配置-批量删除", notes = "动静态分析-动态分析-参数配置-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.service.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/controller/ConfigStaticController.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.controller;
import cn.hutool.core.util.ObjectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStatic;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigStaticService;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
/**
* <p>
* 动静态分析-静态分析-参数配置 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@RestController
@RequestMapping("/dynamicStaticAnalysis/config-static")
@Api("动静态分析-静态分析-参数配置")
public class ConfigStaticController extends JeecgController<ConfigStatic, IConfigStaticService> {
@AutoLog(value = "动静态分析-动态分析-参数配置-列表查询")
@ApiOperation(value = "动静态分析-动态分析-参数配置-列表查询", notes = "动静态分析-动态分析-参数配置-列表查询")
@GetMapping(value = "/list")
public Result<List<ConfigStatic>> queryPageList() {
return Result.OK(this.service.list());
}
@AutoLog(value = "动静态分析-动态分析-参数配置-编辑")
@ApiOperation(value = "资产管理-曲线管理-编辑", notes = "资产管理-曲线管理-编辑")
@PostMapping(value = "/edit")
public Result<String> edit(@RequestBody ConfigStatic record) {
if (ObjectUtil.isEmpty(record.getId())) {
record.setId(UUIDGenerator.generate());
}
this.service.saveOrUpdate(record);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "动静态分析-动态分析-参数配置-通过id删除")
@ApiOperation(value = "动静态分析-动态分析-参数配置-通过id删除", notes = "动静态分析-动态分析-参数配置-通过id删除")
@GetMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
this.service.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "动静态分析-动态分析-参数配置-批量删除")
@ApiOperation(value = "动静态分析-动态分析-参数配置-批量删除", notes = "动静态分析-动态分析-参数配置-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.service.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigDynamics.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-动态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@TableName("t_dsa_config_dynamics")
@ApiModel(value = "ConfigDynamics对象", description = "动静态分析-动态分析-参数配置")
public class ConfigDynamics implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("速度下限值")
@TableField("speed_floor")
private BigDecimal speedFloor;
@ApiModelProperty("速度上限值")
@TableField("speed_ceiling")
private BigDecimal speedCeiling;
@ApiModelProperty("超限等级")
@TableField("grade")
private Integer grade;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("垂直加速度(g)")
@TableField("vertical_acceleration")
private Integer verticalAcceleration;
@ApiModelProperty("横向加速度(g)")
@TableField("lateral_acceleration")
private Integer lateralAcceleration;
@ApiModelProperty("规矩变化率")
@TableField("track_gauge_change")
private Integer trackGaugeChange;
@ApiModelProperty("曲率变化率")
@TableField("curvature_change")
private Integer curvatureChange;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigDynamicsBiz.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-动态分析-参数配置(业务表)
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@TableName("t_dsa_config_dynamics_biz")
@ApiModel(value = "ConfigDynamicsBiz对象", description = "动静态分析-动态分析-参数配置(业务表)")
public class ConfigDynamicsBiz implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("速度下限值")
@TableField("speed_floor")
private BigDecimal speedFloor;
@ApiModelProperty("速度上限值")
@TableField("speed_ceiling")
private BigDecimal speedCeiling;
@ApiModelProperty("超限等级")
@TableField("grade")
private Integer grade;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("垂直加速度(g)")
@TableField("vertical_acceleration")
private Integer verticalAcceleration;
@ApiModelProperty("横向加速度(g)")
@TableField("lateral_acceleration")
private Integer lateralAcceleration;
@ApiModelProperty("规矩变化率")
@TableField("track_gauge_change")
private Integer trackGaugeChange;
@ApiModelProperty("曲率变化率")
@TableField("curvature_change")
private Integer curvatureChange;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigStatic.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-静态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@TableName("t_dsa_config_static")
@ApiModel(value = "ConfigStatic对象", description = "动静态分析-静态分析-参数配置")
public class ConfigStatic implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/ConfigStaticBiz.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-静态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@TableName("t_dsa_config_static_biz")
@ApiModel(value = "ConfigStaticBiz对象", description = "动静态分析-静态分析-参数配置")
public class ConfigStaticBiz implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/ConfigDynamicsBizMapper.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamicsBiz;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 动静态分析-动态分析-参数配置(业务表) Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface ConfigDynamicsBizMapper extends BaseMapper<ConfigDynamicsBiz> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/ConfigDynamicsMapper.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamics;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 动静态分析-动态分析-参数配置 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface ConfigDynamicsMapper extends BaseMapper<ConfigDynamics> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/ConfigStaticBizMapper.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStaticBiz;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 动静态分析-静态分析-参数配置 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface ConfigStaticBizMapper extends BaseMapper<ConfigStaticBiz> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/ConfigStaticMapper.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.mapper;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStatic;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 动静态分析-静态分析-参数配置 Mapper 接口
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface ConfigStaticMapper extends BaseMapper<ConfigStatic> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/ConfigDynamicsBizMapper.xml 0 → 100644
View file @ 8528b20d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigDynamicsBizMapper">
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/ConfigDynamicsMapper.xml 0 → 100644
View file @ 8528b20d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigDynamicsMapper">
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/ConfigStaticBizMapper.xml 0 → 100644
View file @ 8528b20d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigStaticBizMapper">
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/ConfigStaticMapper.xml 0 → 100644
View file @ 8528b20d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigStaticMapper">
</mapper>
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigDynamicsBizDTO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-动态分析-参数配置(业务表)
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigDynamicsBiz对象", description = "动静态分析-动态分析-参数配置(业务表)")
public class ConfigDynamicsBizDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("速度下限值")
private BigDecimal speedFloor;
@ApiModelProperty("速度上限值")
private BigDecimal speedCeiling;
@ApiModelProperty("超限等级")
private Integer grade;
@ApiModelProperty("大轨距(mm)")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
private Integer level;
@ApiModelProperty("三角坑(mm)")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
private Integer direction;
@ApiModelProperty("垂直加速度(g)")
private Integer verticalAcceleration;
@ApiModelProperty("横向加速度(g)")
private Integer lateralAcceleration;
@ApiModelProperty("规矩变化率")
private Integer trackGaugeChange;
@ApiModelProperty("曲率变化率")
private Integer curvatureChange;
@ApiModelProperty("高低(mm)")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigDynamicsBizVO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-动态分析-参数配置(业务表)
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigDynamicsBiz对象", description = "动静态分析-动态分析-参数配置(业务表)")
public class ConfigDynamicsBizVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("速度下限值")
@TableField("speed_floor")
private BigDecimal speedFloor;
@ApiModelProperty("速度上限值")
@TableField("speed_ceiling")
private BigDecimal speedCeiling;
@ApiModelProperty("超限等级")
@TableField("grade")
private Integer grade;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("垂直加速度(g)")
@TableField("vertical_acceleration")
private Integer verticalAcceleration;
@ApiModelProperty("横向加速度(g)")
@TableField("lateral_acceleration")
private Integer lateralAcceleration;
@ApiModelProperty("规矩变化率")
@TableField("track_gauge_change")
private Integer trackGaugeChange;
@ApiModelProperty("曲率变化率")
@TableField("curvature_change")
private Integer curvatureChange;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigDynamicsDTO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-动态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigDynamics对象", description = "动静态分析-动态分析-参数配置")
public class ConfigDynamicsDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("速度下限值")
private BigDecimal speedFloor;
@ApiModelProperty("速度上限值")
private BigDecimal speedCeiling;
@ApiModelProperty("超限等级")
private Integer grade;
@ApiModelProperty("大轨距(mm)")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
private Integer level;
@ApiModelProperty("三角坑(mm)")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
private Integer direction;
@ApiModelProperty("垂直加速度(g)")
private Integer verticalAcceleration;
@ApiModelProperty("横向加速度(g)")
private Integer lateralAcceleration;
@ApiModelProperty("规矩变化率")
private Integer trackGaugeChange;
@ApiModelProperty("曲率变化率")
private Integer curvatureChange;
@ApiModelProperty("高低(mm)")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigDynamicsVO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-动态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigDynamics对象", description = "动静态分析-动态分析-参数配置")
public class ConfigDynamicsVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("速度下限值")
@TableField("speed_floor")
private BigDecimal speedFloor;
@ApiModelProperty("速度上限值")
@TableField("speed_ceiling")
private BigDecimal speedCeiling;
@ApiModelProperty("超限等级")
@TableField("grade")
private Integer grade;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("垂直加速度(g)")
@TableField("vertical_acceleration")
private Integer verticalAcceleration;
@ApiModelProperty("横向加速度(g)")
@TableField("lateral_acceleration")
private Integer lateralAcceleration;
@ApiModelProperty("规矩变化率")
@TableField("track_gauge_change")
private Integer trackGaugeChange;
@ApiModelProperty("曲率变化率")
@TableField("curvature_change")
private Integer curvatureChange;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigStaticBizDTO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-静态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigStaticBiz对象", description = "动静态分析-静态分析-参数配置")
public class ConfigStaticBizDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("大轨距(mm)")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
private Integer level;
@ApiModelProperty("三角坑(mm)")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
private Integer direction;
@ApiModelProperty("高低(mm)")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigStaticBizVO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-静态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigStaticBiz对象", description = "动静态分析-静态分析-参数配置")
public class ConfigStaticBizVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigStaticDTO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-静态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigStatic对象", description = "动静态分析-静态分析-参数配置")
public class ConfigStaticDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private String id;
@ApiModelProperty("创建人")
private String createBy;
@ApiModelProperty("创建日期")
private Date createTime;
@ApiModelProperty("更新人")
private String updateBy;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("大轨距(mm)")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
private Integer level;
@ApiModelProperty("三角坑(mm)")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
private Integer direction;
@ApiModelProperty("高低(mm)")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/other/ConfigStaticVO.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 动静态分析-静态分析-参数配置
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Getter
@Setter
@ApiModel(value = "ConfigStatic对象", description = "动静态分析-静态分析-参数配置")
public class ConfigStaticVO {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
@TableId("id")
private String id;
@ApiModelProperty("创建人")
@TableField("create_by")
private String createBy;
@ApiModelProperty("创建日期")
@TableField("create_time")
private Date createTime;
@ApiModelProperty("更新人")
@TableField("update_by")
private String updateBy;
@ApiModelProperty("更新时间")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty("大轨距(mm)")
@TableField("big_track_gauge")
private Integer bigTrackGauge;
@ApiModelProperty("小轨距(mm)")
@TableField("small_track_gauge")
private Integer smallTrackGauge;
@ApiModelProperty("水平(mm)")
@TableField("level")
private Integer level;
@ApiModelProperty("三角坑(mm)")
@TableField("triangular_pit")
private Integer triangularPit;
@ApiModelProperty("轨向(mm)")
@TableField("direction")
private Integer direction;
@ApiModelProperty("高低(mm)")
@TableField("height")
private Integer height;
@ApiModelProperty("是否派工 0-否 1-是(默认值)")
@TableField("is_work")
private Integer isWork;
@ApiModelProperty("是否启用 0-否 1-启用(默认值)")
@TableField("is_enable")
private Integer isEnable;
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IConfigDynamicsBizService.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamicsBiz;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 动静态分析-动态分析-参数配置(业务表) 服务类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface IConfigDynamicsBizService extends IService<ConfigDynamicsBiz> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IConfigDynamicsService.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamics;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 动静态分析-动态分析-参数配置 服务类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface IConfigDynamicsService extends IService<ConfigDynamics> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IConfigStaticBizService.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStaticBiz;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 动静态分析-静态分析-参数配置 服务类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface IConfigStaticBizService extends IService<ConfigStaticBiz> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/IConfigStaticService.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStatic;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 动静态分析-静态分析-参数配置 服务类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
public interface IConfigStaticService extends IService<ConfigStatic> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/ConfigDynamicsBizServiceImpl.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamicsBiz;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigDynamicsBizMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigDynamicsBizService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 动静态分析-动态分析-参数配置(业务表) 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Service
public class ConfigDynamicsBizServiceImpl extends ServiceImpl<ConfigDynamicsBizMapper, ConfigDynamicsBiz> implements IConfigDynamicsBizService {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/ConfigDynamicsServiceImpl.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigDynamics;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigDynamicsMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigDynamicsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 动静态分析-动态分析-参数配置 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Service
public class ConfigDynamicsServiceImpl extends ServiceImpl<ConfigDynamicsMapper, ConfigDynamics> implements IConfigDynamicsService {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/ConfigStaticBizServiceImpl.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStaticBiz;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigStaticBizMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigStaticBizService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 动静态分析-静态分析-参数配置 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Service
public class ConfigStaticBizServiceImpl extends ServiceImpl<ConfigStaticBizMapper, ConfigStaticBiz> implements IConfigStaticBizService {
}
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/service/impl/ConfigStaticServiceImpl.java 0 → 100644
View file @ 8528b20d
package org.jeecg.modules.dynamicStaticAnalysis.service.impl;
import org.jeecg.modules.dynamicStaticAnalysis.entity.ConfigStatic;
import org.jeecg.modules.dynamicStaticAnalysis.mapper.ConfigStaticMapper;
import org.jeecg.modules.dynamicStaticAnalysis.service.IConfigStaticService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 动静态分析-静态分析-参数配置 服务实现类
* </p>
*
* @author hkl
* @since 2023-07-21
*/
@Service
public class ConfigStaticServiceImpl extends ServiceImpl<ConfigStaticMapper, ConfigStatic> implements IConfigStaticService {
}
jeecg-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
View file @ 8528b20d
......@@ -78,19 +78,9 @@ public class SysDictController {
public Result<IPage<SysDict>> queryPageList(SysDict sysDict,@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,HttpServletRequest req) {
Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
//------------------------------------------------------------------------------------------------
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
sysDict.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
}
//------------------------------------------------------------------------------------------------
QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
log.debug("查询当前页："+pageList.getCurrent());
log.debug("查询当前页数量："+pageList.getSize());
log.debug("查询结果数量："+pageList.getRecords().size());
log.debug("数据总数："+pageList.getTotal());
result.setSuccess(true);
result.setResult(pageList);
return result;
......
jeecg-module-system/src/main/java/org/jeecg/modules/system/entity/SysDict.java
View file @ 8528b20d
......@@ -82,9 +82,12 @@ public class SysDict implements Serializable {
private Date updateTime;
/**租户ID*/
private java.lang.Integer tenantId;
private Integer tenantId;
/** 关联的低代码应用ID */
private java.lang.String lowAppId;
private String lowAppId;
/**0-编辑 1-冻结 2-可编辑不可删除*/
private String operateType;
}
jeecg-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java
View file @ 8528b20d
......@@ -88,17 +88,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override
public Map<String, List<DictModel>> queryAllDictItems() {
Map<String, List<DictModel>> res = new HashMap(5);
LambdaQueryWrapper<SysDict> sysDictQueryWrapper = new LambdaQueryWrapper<SysDict>();
//------------------------------------------------------------------------------------------------
//是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
sysDictQueryWrapper.eq(SysDict::getTenantId, oConvertUtils.getInt(TenantContext.getTenant(), 0))
.or().eq(SysDict::getTenantId,0);
}
//------------------------------------------------------------------------------------------------
LambdaQueryWrapper<SysDict> sysDictQueryWrapper = new LambdaQueryWrapper<>();
List<SysDict> ls = sysDictMapper.selectList(sysDictQueryWrapper);
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDictItem::getStatus, 1);
queryWrapper.orderByAsc(SysDictItem::getSortOrder);
List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment