Skip to content

N
New MineTRS_java
Commit 5678dc1b authored by Administrator's avatar Administrator
Browse files
Options

2025-1.06 地磅数据转存以及报警灯

parent ce929bfd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1026 additions and 198 deletions
eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
View file @ 5678dc1b
......@@ -156,7 +156,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
/**
* inputStream 转 File
*/
static File inputStreamToFile(InputStream ins, String name) {
public static File inputStreamToFile(InputStream ins, String name) {
File file = new File(SYS_TEM_DIR + name);
if (file.exists()) {
return file;
......
eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java
View file @ 5678dc1b
......@@ -15,12 +15,11 @@
*/
package me.zhengjie.utils;
import cn.hutool.db.PageResult;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.data.domain.Page;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* 分页工具
......@@ -53,7 +52,12 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
map.put("totalElements",page.getTotalElements());
return map;
}
public static <T> Map toPage(IPage<T> page) {
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
stringObjectHashMap.put("list",page.getRecords());
stringObjectHashMap.put("total",page.getTotal());
return stringObjectHashMap;
}
/**
* 自定义分页
*/
......
eladmin-common/src/main/java/me/zhengjie/utils/StringUtils.java
View file @ 5678dc1b
......@@ -18,14 +18,17 @@ package me.zhengjie.utils;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import lombok.extern.slf4j.Slf4j;
import me.zhengjie.config.ElAdminProperties;
import net.dreamlu.mica.ip2region.core.Ip2regionSearcher;
import net.dreamlu.mica.ip2region.core.IpInfo;
import nl.basjes.parse.useragent.UserAgent;
import nl.basjes.parse.useragent.UserAgentAnalyzer;
import org.lionsoul.ip2region.DataBlock;
import org.lionsoul.ip2region.DbConfig;
import org.lionsoul.ip2region.DbSearcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.UnknownHostException;
......@@ -37,25 +40,95 @@ import java.util.Enumeration;
* @author Zheng Jie
* 字符串工具类, 继承org.apache.commons.lang3.StringUtils类
*/
@Slf4j
public class StringUtils extends org.apache.commons.lang3.StringUtils {
private static final Logger log = LoggerFactory.getLogger(StringUtils.class);
private static boolean ipLocal = false;
private static File file = null;
private static DbConfig config;
private static final char SEPARATOR = '_';
private static final char YAML_SEPARATOR = '-';
private static final String UNKNOWN = "unknown";
/**
* 注入bean
* * 判断一个对象是否非空
*
* @param object Object
* @return true：非空 false：空
*/
private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class);
public static boolean isNotNull(Object object) {
return !isNull(object);
}
/**
* * 判断一个对象是否为空
*
* @param object Object
* @return true：为空 false：非空
*/
public static boolean isNull(Object object) {
return object == null;
}
private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer
private static final UserAgentAnalyzer userAgentAnalyzer = UserAgentAnalyzer
.newBuilder()
.hideMatcherLoadStats()
.withCache(10000)
.withField(UserAgent.AGENT_NAME_VERSION)
.build();
static {
SpringContextHolder.addCallBacks(() -> {
StringUtils.ipLocal = SpringContextHolder.getProperties("ip.local-parsing", false, Boolean.class);
if (ipLocal) {
/*
* 此文件为独享 ，不必关闭
*/
String path = "ip2region/ip2region.db";
String name = "ip2region.db";
try {
config = new DbConfig();
file = FileUtil.inputStreamToFile(new ClassPathResource(path).getInputStream(), name);
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
});
}
/**
* Yaml key 驼峰命名法工具
*
* @return yamlToCamelCase(" hello - world ") == "helloWorld"
*/
public static String yamlToCamelCase(String s) {
if (s == null) {
return null;
}
if (StringUtils.containsAny(s, YAML_SEPARATOR)) {
s = s.toLowerCase();
StringBuilder sb = new StringBuilder(s.length());
boolean yamlUpperCase = false;
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
if (c == YAML_SEPARATOR) {
yamlUpperCase = true;
} else if (yamlUpperCase) {
sb.append(Character.toUpperCase(c));
yamlUpperCase = false;
} else {
sb.append(c);
}
}
return sb.toString();
}
return s;
}
/**
* 驼峰命名法工具
*
......@@ -175,15 +248,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* 根据ip获取详细地址
*/
public static String getCityInfo(String ip) {
try {
if (ElAdminProperties.ipLocal) {
return getLocalCityInfo(ip);
} else {
return getHttpCityInfo(ip);
}
} catch (Exception e) {
return "解析失败";
}
// if (ipLocal) {
// return getLocalCityInfo(ip);
// } else {
// return getHttpCityInfo(ip);
// }
return "";
}
/**
......@@ -191,7 +261,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
*/
public static String getHttpCityInfo(String ip) {
String api = String.format(ElAdminConstant.Url.IP_URL, ip);
System.out.println("api = " + api);
JSONObject object = JSONUtil.parseObj(HttpUtil.get(api));
return object.get("addr", String.class);
}
......@@ -200,16 +269,24 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* 根据ip获取详细地址
*/
public static String getLocalCityInfo(String ip) {
IpInfo ipInfo = IP_SEARCHER.memorySearch(ip);
if(ipInfo != null){
return ipInfo.getAddress();
try {
DataBlock dataBlock = new DbSearcher(config, file.getPath())
.binarySearch(ip);
String region = dataBlock.getRegion();
String address = region.replace("0|", "");
char symbol = '|';
if (address.charAt(address.length() - 1) == symbol) {
address = address.substring(0, address.length() - 1);
}
return address.equals(ElAdminConstant.REGION) ? "内网IP" : address;
} catch (Exception e) {
log.error(e.getMessage(), e);
}
return null;
return "";
}
public static String getBrowser(HttpServletRequest request) {
UserAgent.ImmutableUserAgent userAgent = USER_AGENT_ANALYZER.parse(request.getHeader("User-Agent"));
UserAgent.ImmutableUserAgent userAgent = userAgentAnalyzer.parse(request.getHeader("User-Agent"));
return userAgent.get(UserAgent.AGENT_NAME_VERSION).getValue();
}
......@@ -237,10 +314,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
try {
InetAddress candidateAddress = null;
// 遍历所有的网络接口
for (Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements();) {
for (Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements(); ) {
NetworkInterface anInterface = interfaces.nextElement();
// 在所有的接口下再遍历IP
for (Enumeration<InetAddress> inetAddresses = anInterface.getInetAddresses(); inetAddresses.hasMoreElements();) {
for (Enumeration<InetAddress> inetAddresses = anInterface.getInetAddresses(); inetAddresses.hasMoreElements(); ) {
InetAddress inetAddr = inetAddresses.nextElement();
// 排除loopback类型地址
if (!inetAddr.isLoopbackAddress()) {
......
eladmin-ruibo/pom.xml 0 → 100644
View file @ 5678dc1b
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin</artifactId>
<version>2.6</version>
</parent>
<artifactId>eladmin-ruibo</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin-common</artifactId>
<version>2.6</version>
<scope>compile</scope>
</dependency>
<!-- tools 模块包含了 common 和 logging 模块 -->
<dependency>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin-tools</artifactId>
<version>2.6</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/controller/DiBangController.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.controller;
import me.zhengjie.annotation.AnonymousAccess;
import me.zhengjie.rbscreen.util.AjaxResult;
import me.zhengjie.ruibo.domain.DiBang;
import me.zhengjie.ruibo.domain.DiBangMysql;
import me.zhengjie.ruibo.service.DiBangMysqlService;
import me.zhengjie.ruibo.service.DiBangService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("api/diBang")
public class DiBangController {
@Autowired
private DiBangMysqlService diBangMysqlService;
@RequestMapping("list")
@AnonymousAccess
public ResponseEntity getDiBang() {
List<DiBangMysql> list = diBangMysqlService.list();
return ResponseEntity.ok(AjaxResult.success(list));
}
/**
* 分页查询
* @return
*/
@GetMapping("page")
public ResponseEntity getDiBangPage() {
return ResponseEntity.ok(AjaxResult.success(diBangMysqlService.page(null)));
}
@GetMapping("real")
public ResponseEntity getRealDiBang() {
DiBangMysql diBang = diBangMysqlService.getRealDiBang();
return ResponseEntity.ok(AjaxResult.success(diBang));
}
@GetMapping("cycleStatistics")
public ResponseEntity cycleStatistics(String dateRange) {
return ResponseEntity.ok(AjaxResult.success(diBangMysqlService.cycleStatistics(dateRange)));
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/controller/ScreenAlarmController.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.controller;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import me.zhengjie.annotation.AnonymousAccess;
import me.zhengjie.base.AjaxResult;
import me.zhengjie.rbscreen.domain.vo.BadRequestException;
import me.zhengjie.ruibo.netty.NettyServerHandler;
import me.zhengjie.ruibo.service.ScreenAlarmService;
import me.zhengjie.ruibo.utils.StringUtils;
import me.zhengjie.utils.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
@RestController
@RequestMapping("api/screenAlarm")
public class ScreenAlarmController {
@Autowired
private ScreenAlarmService screenAlarmService;
@Autowired
RedisUtils redisUtils;
//报警器状态
public static final String STATUS_CODE = "STATUS_CODE";
//启动命令
public static final String OPEN_COMMAND = "010600100003C80E";
//停止指令
public static final String STOP_COMMAND = "010600100000880F";
//关闭音量
public static final String CLOSE_VOLUME = "010600110000D9CF";
//音量最大
public static final String MAX_VOLUME = "01060011001E59C7";
//音量最小
public static final String MIN_VOLUME = "010600110001180F";
// 开启报警器声光报警
@PostMapping("openAlarm")
public ResponseEntity<Object> openAlarm(String command) {
boolean status = false;
// toDo 查询报警设备编号
// 获取netty 记录的链接对象信息
HashMap<ChannelHandlerContext, String> nettyChannelMap = NettyServerHandler.nettyChannelMap;
// 非空判断
if (ObjectUtils.isNull(nettyChannelMap)) {
return ResponseEntity.ok(AjaxResult.error("请求失败", "未查询到设备链接"));
}
// 收集失效 的链接
ArrayList<Channel> objects = new ArrayList<>();
// 遍历链接对象 发送指令
nettyChannelMap.forEach((key, value) -> {
// 拼接redis key 默认为 2
String redisKey = STATUS_CODE + ":" + value;
redisUtils.set(redisKey, "2");
// 非空判断
if (ObjectUtils.isNotNull(key)) {
Channel channel = key.channel();
// 活跃判断
if (channel.isActive()) {
channel
.writeAndFlush(Unpooled.wrappedBuffer(StringUtils.hexString2Bytes(ObjectUtils.isNotNull(command) ? command : OPEN_COMMAND)));
} else {
objects.add(channel);
}
}
}
);
if (ObjectUtils.isNotNull(objects) )objects.forEach(item -> item.close());
// 启动超时检查
try {
if (!checkClientResponses(2, TimeUnit.SECONDS)) {
String unresponsiveClients = nettyChannelMap.entrySet().stream()
.filter(entry -> {
String value = entry.getValue();
String redisKey = STATUS_CODE + ":" + value;
Object o = redisUtils.get(redisKey);
if (org.springframework.util.ObjectUtils.isEmpty(o)) {
return true;
}
if (!"1".equals(o.toString())) {
return true;
}
return false;
})
.map(entry -> entry.getKey().channel().remoteAddress().toString())
.collect(Collectors.joining(","));
return ResponseEntity.ok(AjaxResult.error("请求完成", "但有以下客户端未响应: " + unresponsiveClients));
}
} catch (TimeoutException e) {
return ResponseEntity.ok(AjaxResult.error("请求失败", "超时: " + e.getMessage()));
}
return ResponseEntity.ok(AjaxResult.success("请求成功", "报警器已打开"));
}
//关闭声光报警
@PostMapping("closeAlarm")
public ResponseEntity<Object> closeAlarm(String command) {
boolean status = false;
// toDo 查询报警设备编号
//获取netty 记录的链接对象信息
HashMap<ChannelHandlerContext, String> nettyChannelMap = NettyServerHandler.nettyChannelMap;
// 非空判断
if (ObjectUtils.isNull(nettyChannelMap)) {
return ResponseEntity.ok(AjaxResult.error("请求失败", "未查询到设备链接"));
}
// 收集失效 的链接
ArrayList<Channel> objects = new ArrayList<>();
// 遍历链接对象 发送指令
nettyChannelMap.forEach((key, value) -> {
// 拼接redis key 默认为 2
String redisKey = STATUS_CODE + ":" + value;
redisUtils.set(redisKey, "2");
// 非空判断
if (ObjectUtils.isNotNull(key)) {
Channel channel = key.channel();
// 活跃判断
if (channel.isActive()) {
channel
.writeAndFlush(Unpooled.wrappedBuffer(StringUtils.hexString2Bytes(ObjectUtils.isNotNull(command) ? command : STOP_COMMAND)));
}else {
objects.add(channel);
}
}
}
);
if (ObjectUtils.isNotNull(objects) )objects.forEach(item -> item.close());
// 启动超时检查
try {
if (!checkClientResponses(2, TimeUnit.SECONDS)) {
String unresponsiveClients = nettyChannelMap.entrySet().stream()
.filter(entry -> {
String value = entry.getValue();
String redisKey = STATUS_CODE + ":" + value;
Object o = redisUtils.get(redisKey);
if (org.springframework.util.ObjectUtils.isEmpty(o)) {
return true;
}
if (!"0".equals(o.toString())) {
return true;
}
return false;
})
.map(entry -> entry.getKey().channel().remoteAddress().toString())
.collect(Collectors.joining(","));
return ResponseEntity.ok(AjaxResult.error("请求完成", "但有以下客户端未响应: " + unresponsiveClients));
}
} catch (TimeoutException e) {
return ResponseEntity.ok(AjaxResult.error("请求失败", "超时: " + e.getMessage()));
}
return ResponseEntity.ok(AjaxResult.success("请求成功", "报警器已关闭"));
}
private boolean checkClientResponses(long timeout, TimeUnit unit) throws TimeoutException {
Object lock = new Object();
try {
synchronized (lock) {
unit.timedWait(lock, timeout);
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
throw new BadRequestException("检查客户端响应时被中断");
}
for (Map.Entry<ChannelHandlerContext, String> entry : NettyServerHandler.nettyChannelMap.entrySet()) {
String value = entry.getValue();
String redisKey = STATUS_CODE + ":" + value;
Object o = redisUtils.get(redisKey);
if (org.springframework.util.ObjectUtils.isEmpty(o)) {
return false;
}
if (!"1".equals(o.toString()) && !"0".equals(o.toString())) {
return false;
}
}
return true;
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/domain/DiBang.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName(value = "tbl_back_record")
public class DiBang {
@TableField("ID")
private Integer id;
@TableField("Weight")
private String weight;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@TableField("Weight_time")
private LocalDateTime weightTime;
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/domain/DiBangMysql.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.domain;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName(value = "tbl_back_record")
public class DiBangMysql {
private Integer id;
@TableField(value = "weight")
private String weight;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "weight_time")
private LocalDateTime weightTime;
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/netty/NettyServer.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.netty;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioServerSocketChannel;
import lombok.extern.slf4j.Slf4j;
import java.net.InetSocketAddress;
@Slf4j
public class NettyServer {
public void start(String ip,Integer port) {
InetSocketAddress socketAddress = new InetSocketAddress(ip,port );
//new 一个主线程组
EventLoopGroup bossGroup = new NioEventLoopGroup(1);
//new 一个工作线程组
EventLoopGroup workGroup = new NioEventLoopGroup(200);
ServerBootstrap bootstrap = new ServerBootstrap()
.group(bossGroup, workGroup)
.channel(NioServerSocketChannel.class)
.childHandler(new ServerChannelInitializer())
.localAddress(socketAddress)
//设置队列大小
.option(ChannelOption.SO_BACKLOG, 1024)
// 两小时内没有数据的通信时,TCP会自动发送一个活动探测数据报文
.childOption(ChannelOption.SO_KEEPALIVE, true);
//绑定端口,开始接收进来的连接
try {
ChannelFuture future = bootstrap.bind(socketAddress).sync();
log.info("服务器启动开始监听端口: {}", socketAddress.getPort());
future.channel().closeFuture().sync();
} catch (InterruptedException e) {
log.error("服务器开启失败", e);
} finally {
//关闭主线程组
bossGroup.shutdownGracefully();
//关闭工作线程组
workGroup.shutdownGracefully();
}
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/netty/NettyServerHandler.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.netty;
import com.github.yulichang.toolkit.SpringContentUtils;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import lombok.extern.slf4j.Slf4j;
import me.zhengjie.ruibo.controller.ScreenAlarmController;
import me.zhengjie.ruibo.utils.StringUtils;
import me.zhengjie.utils.RedisUtils;
import java.io.IOException;
import java.util.HashMap;
/**
* netty服务端处理器
**/
@Slf4j
public class NettyServerHandler extends ChannelInboundHandlerAdapter {
private RedisUtils redisUtils;
public NettyServerHandler() {
this.redisUtils = SpringContentUtils.getBean(RedisUtils.class);
}
// 创建线程安全的map对象存储 存储客户端连接信息
public static HashMap<ChannelHandlerContext, String> nettyChannelMap = new HashMap<>();
/**
* 客户端连接会触发
*/
@Override
public void channelActive(ChannelHandlerContext ctx) throws Exception {
//打印链接信息 ip 等
log.info("Channel 通道连接：{}", ctx.channel().remoteAddress().toString());
//ctx.writeAndFlush(StringUtils.hexString2Bytes("完成连接！"));
}
/**
* 客户端发消息会触发
*/
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
//String msgString = msg.toString();
ByteBuf byteBuf = (ByteBuf) msg;
String msgString = StringUtils.convertByteBufToString(byteBuf);
log.info("服务器收到消息: {}", msgString);
// TODO 业务处理
String string = ByteBufUtil.hexDump(byteBuf).toUpperCase();
if (ScreenAlarmController.OPEN_COMMAND.equals(string)) {
String string1 = nettyChannelMap.get(ctx);
String redisKey = ScreenAlarmController.STATUS_CODE + ":" + string1;
redisUtils.set(redisKey, "1");
} else if (ScreenAlarmController.STOP_COMMAND.equals(string)) {
String string1 = nettyChannelMap.get(ctx);
String redisKey = ScreenAlarmController.STATUS_CODE + ":" + string1;
redisUtils.set(redisKey, "0");
} else {
// 判断链接是否保存 如果没有就存储链接
if (!nettyChannelMap.containsKey(ctx)) {
nettyChannelMap.put(ctx, msgString);
}
}
}
/**
* 发生异常触发
*/
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
cause.printStackTrace();
ctx.close();
}
/**
* 客户端与服务端 断连时 执行
*
* @param ctx
* @throws Exception
*/
@Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception, IOException {
nettyChannelMap.remove(ctx);
log.info("客户端断开连接：{}", ctx.channel().remoteAddress().toString());
ctx.close(); //断开连接时，必须关闭，否则造成资源浪费，并发量很大情况下可能造成宕机
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/netty/ServerChannelInitializer.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.netty;
import io.netty.channel.ChannelInitializer;
import io.netty.channel.socket.SocketChannel;
import io.netty.handler.codec.string.StringDecoder;
import io.netty.handler.codec.string.StringEncoder;
import sun.nio.cs.ext.GBK;
import java.nio.charset.Charset;
/**
* netty服务初始化器
**/
public class ServerChannelInitializer extends ChannelInitializer<SocketChannel> {
@Override
protected void initChannel(SocketChannel socketChannel) throws Exception {
//添加编解码
// socketChannel.pipeline().addLast("decoder", new StringDecoder(Charset.forName("GBK")));
// 添加编码器
socketChannel.pipeline().addLast("encoder", new StringEncoder(Charset.forName("GBK")));
socketChannel.pipeline().addLast(new NettyServerHandler());
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/DiBangMysqlService.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.ruibo.domain.DiBangMysql;
import java.util.HashMap;
import java.util.List;
public interface DiBangMysqlService extends IService<DiBangMysql> {
DiBangMysql getRealDiBang();
void insertBatch(List<DiBangMysql> diBangMysqlList);
List<HashMap> cycleStatistics(String dateRange);
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/DiBangService.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.ruibo.domain.DiBang;
public interface DiBangService extends IService<DiBang> {
DiBang getRealDiBang();
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/ScreenAlarmService.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service;
import org.springframework.stereotype.Service;
public interface ScreenAlarmService {
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/impl/DiBangMysqlServiceImpl.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import me.zhengjie.ruibo.domain.DiBangMysql;
import me.zhengjie.ruibo.service.DiBangMysqlService;
import me.zhengjie.ruibo.service.mapper.DiBangMysqlMapper;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
@RequiredArgsConstructor
@Service
public class DiBangMysqlServiceImpl extends ServiceImpl<DiBangMysqlMapper, DiBangMysql> implements DiBangMysqlService {
private final DiBangMysqlMapper diBangMysqlMapper;
@Override
public DiBangMysql getRealDiBang() {
DiBangMysql realDiBangMysql = diBangMysqlMapper.getRealDiBang();
return realDiBangMysql;
}
@Override
public void insertBatch(List<DiBangMysql> diBangMysqlList) {
diBangMysqlMapper.insertBatch(diBangMysqlList);
}
@Override
public List<HashMap> cycleStatistics(String dateRange) {
return diBangMysqlMapper.cycleStatistics(dateRange);
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/impl/DiBangServiceImpl.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import me.zhengjie.ruibo.domain.DiBang;
import me.zhengjie.ruibo.service.DiBangService;
import me.zhengjie.ruibo.service.mapper.DiBangMapper;
import org.springframework.stereotype.Service;
@RequiredArgsConstructor
@Service
@DS("slave")
public class DiBangServiceImpl extends ServiceImpl<DiBangMapper, DiBang> implements DiBangService {
private final DiBangMapper diBangMapper;
@Override
public DiBang getRealDiBang() {
DiBang realDiBang = diBangMapper.getRealDiBang();
return realDiBang;
}
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/impl/ScreenAlarmServiceIml.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service.impl;
import me.zhengjie.ruibo.service.ScreenAlarmService;
import org.springframework.stereotype.Service;
@Service
public class ScreenAlarmServiceIml implements ScreenAlarmService {
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/mapper/DiBangMapper.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import me.zhengjie.ruibo.domain.DiBang;
import java.util.HashMap;
import java.util.List;
public interface DiBangMapper extends BaseMapper<DiBang> {
DiBang getRealDiBang();
List<HashMap> cycleStatistics(String dateRange);
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/service/mapper/DiBangMysqlMapper.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.service.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import me.zhengjie.ruibo.domain.DiBang;
import me.zhengjie.ruibo.domain.DiBangMysql;
import java.util.HashMap;
import java.util.List;
public interface DiBangMysqlMapper extends BaseMapper<DiBangMysql> {
DiBangMysql getRealDiBang();
List<HashMap> cycleStatistics(String dateRange);
void insertBatch(List<DiBangMysql> diBangMysqlList);
}
eladmin-ruibo/src/main/java/me/zhengjie/ruibo/task/DataTask.java 0 → 100644
View file @ 5678dc1b
package me.zhengjie.ruibo.task;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import me.zhengjie.ruibo.domain.DiBang;
import me.zhengjie.ruibo.domain.DiBangMysql;
import me.zhengjie.ruibo.service.DiBangMysqlService;
import me.zhengjie.ruibo.service.DiBangService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Component
public class DataTask {
@Autowired
private DiBangService diBangService;
@Autowired
private DiBangMysqlService diBangMysqlService;
public void sqlServerTransferMysql() {
// 地磅数据从sqlServer 数据转存到 mysql
// 从读取最新的mysql 数据
DiBangMysql realDiBangMysql = diBangMysqlService.getRealDiBang();
QueryWrapper<DiBang> diBangQueryWrapper = new QueryWrapper<>();
if (realDiBangMysql != null) {
// 不为空 读取sqlServer内数据时间大于 mysql最新数据的
diBangQueryWrapper.ge("Weight_time", realDiBangMysql.getWeightTime()).orderByAsc("Weight_time");
}
List<DiBang> list =
diBangService.list(diBangQueryWrapper);
if (!ObjectUtils.isEmpty(list)) {
// 为空说明没有数据,不为空才说明有新数据需要新增
ArrayList<DiBangMysql> diBangMysqls = new ArrayList<DiBangMysql>();
list.forEach(item -> {
DiBangMysql diBangMysql = new DiBangMysql();
BeanUtils.copyProperties(item, diBangMysql);
diBangMysqls.add(diBangMysql);
// 超过一千条存储一次
if (diBangMysqls.size() >= 1000) {
diBangMysqlService.insertBatch(diBangMysqls);
diBangMysqls.clear();
}
});
// 剩余不满足一千的最后存储一次
if (diBangMysqls.size() > 0) {
diBangMysqlService.insertBatch(diBangMysqls);
}
}else{
log.debug("地磅暂未产生新的数据！！");
}
}
}
eladmin-ruibo/src/main/resources/mapper/DiBangMapper.xml 0 → 100644
View file @ 5678dc1b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="me.zhengjie.ruibo.service.mapper.DiBangMapper">
<select id="getRealDiBang" resultType="me.zhengjie.ruibo.domain.DiBang">
select TOP (1) * from tbl_back_record order by Weight_time desc
</select>
<select id="cycleStatistics" resultType="hashmap">
</select>
</mapper>
\ No newline at end of file
eladmin-ruibo/src/main/resources/mapper/DiBangMysqlMapper.xml 0 → 100644
View file @ 5678dc1b
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"https://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="me.zhengjie.ruibo.service.mapper.DiBangMysqlMapper">
<select id="getRealDiBang" resultType="me.zhengjie.ruibo.domain.DiBangMysql">
select * from tbl_back_record order by Weight_time desc limit 1
</select>
<select id="cycleStatistics" resultType="hashmap">
</select>
<insert id="insertBatch">
insert into tbl_back_record (weight,weight_time) values
<foreach collection="list" item="item" separator=",">
(#{item.weight},#{item.weightTime})
</foreach>
</insert>
</mapper>
\ No newline at end of file
eladmin-system/pom.xml
View file @ 5678dc1b
......@@ -38,6 +38,11 @@
<artifactId>eladmin-tools</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>me.zhengjie</groupId>
<artifactId>eladmin-ruibo</artifactId>
<version>2.6</version>
</dependency>
<!-- Spring boot websocket -->
<dependency>
......@@ -91,11 +96,7 @@
<artifactId>mybatis-plus-generator</artifactId>
<version>3.5.1</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.4.3</version>
</dependency>
<!--swragger ui-->
<dependency>
<groupId>io.springfox</groupId>
......@@ -113,21 +114,17 @@
<version>2.0</version>
</dependency>
<!--netty-->
<!-- <dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.17.Final</version>
</dependency>-->
<version>4.1.75.Final</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
</dependencies>
<!-- 打包 -->
......
eladmin-system/src/main/java/me/zhengjie/AppRun.java
View file @ 5678dc1b
......@@ -17,7 +17,9 @@ package me.zhengjie;
import io.swagger.annotations.Api;
import me.zhengjie.annotation.rest.AnonymousGetMapping;
import me.zhengjie.ruibo.netty.NettyServer;
import me.zhengjie.utils.SpringContextHolder;
import me.zhengjie.utils.StringUtils;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
......@@ -45,10 +47,12 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@SpringBootApplication
@EnableTransactionManagement
@EnableJpaAuditing(auditorAwareRef = "auditorAware")
@MapperScan("me.zhengjie.gemho.mapper")
@MapperScan({"me.zhengjie.gemho.mapper","me.zhengjie.ruibo.service.mapper","me.zhengjie.rbscreen.mapper","me.zhengjie.video.mapper"})
public class AppRun implements CommandLineRunner {
@Value("${netty.tcp.server.port}")
private String port;
@Value("${netty.tcp.server.ip}")
private String ip;
public static void main(String[] args) {
SpringApplication.run(AppRun.class, args);
......@@ -78,7 +82,9 @@ public class AppRun implements CommandLineRunner {
@Override
public void run(String... args) throws Exception {
// new NettyServer().start(port);
//System.out.println("======服务已经启动========");
if (StringUtils.isNotNull(port)&& StringUtils.isNotEmpty(ip)){
new NettyServer().start(ip,Integer.valueOf(port));
System.out.println("======服务已经启动========");
}
}
}
eladmin-system/src/main/java/me/zhengjie/gemho/controller/artificial/ArtificialDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.entity.artificial.ArtificialData;
import me.zhengjie.gemho.service.artificial.ArtificialDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/artificial/ArtificialPointController.java
View file @ 5678dc1b
......@@ -9,7 +9,7 @@ import me.zhengjie.gemho.service.artificial.ArtificialPointService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/DbDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.data.DbDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/DmDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.data.DmDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/MpDataController.java
View file @ 5678dc1b
......@@ -4,14 +4,13 @@ package me.zhengjie.gemho.controller.data;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import me.zhengjie.annotation.AnonymousAccess;
import me.zhengjie.gemho.entity.data.MpData;
import me.zhengjie.gemho.service.data.MpDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......@@ -120,6 +119,7 @@ public class MpDataController {
return new ResponseEntity<>(new PostOrPutResult().failed(), HttpStatus.INTERNAL_SERVER_ERROR);
}
/**
* 删除表面位移人工巡检数据
*
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/PslDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.data.PslDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/RgDataController.java
View file @ 5678dc1b
......@@ -10,7 +10,7 @@ import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/SlDataController.java
View file @ 5678dc1b
......@@ -4,11 +4,11 @@ package me.zhengjie.gemho.controller.data;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.service.data.SlDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......@@ -49,10 +49,7 @@ public class SlDataController {
*/
@ApiOperation(value = "获取指定日期的渗流量数据", response = DataVo.class)
@GetMapping
public ResponseEntity<Object> getall(@ApiParam("日期范围") String range,
@ApiParam("监测值") String values,
@ApiParam("设备id") String deviceid,
@ApiParam("检测项") String subitem) {
public ResponseEntity<Object> getall(@ApiParam("日期范围") String range, @ApiParam("监测值") String values, @ApiParam("设备id") String deviceid, @ApiParam("检测项") String subitem) {
DataVo dataVo = new DataVo();
String date = range;
try {
......@@ -97,5 +94,6 @@ public class SlDataController {
public void download(HttpServletResponse response, DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
slDataService.download(response, dataQueryCriteria, request);
}
}
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/StDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.data.StDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/SzDataController.java
View file @ 5678dc1b
package me.zhengjie.gemho.controller.data;
import cn.hutool.http.HttpRequest;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
......@@ -9,7 +8,7 @@ import me.zhengjie.gemho.service.data.SzDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/WpbDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.data.WpbDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/WtDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.data.WtDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.RealVo;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/data/ZhidianController.java
View file @ 5678dc1b
......@@ -7,7 +7,7 @@ import me.zhengjie.gemho.entity.data.Zhidian;
import me.zhengjie.gemho.service.data.ZhidianService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/ins/InsChildrenController.java
View file @ 5678dc1b
......@@ -7,7 +7,7 @@ import me.zhengjie.gemho.entity.ins.InsChildren;
import me.zhengjie.gemho.service.ins.InsChildrenService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/ins/InsDataController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.ins.InsDataService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/ins/InsProjectController.java
View file @ 5678dc1b
......@@ -7,7 +7,7 @@ import me.zhengjie.gemho.entity.ins.InsProject;
import me.zhengjie.gemho.service.ins.InsProjectService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/sys/SysSummaryController.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.service.sys.SysSummaryService;
import me.zhengjie.gemho.service.tab.MonitorvideoService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_generato.modules.security.service.OnlineUserService;
import me.zhengjie.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/AbnormalController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.tab.DrybeachequipinforService;
import me.zhengjie.gemho.service.tab.TabAbnormalService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/DataBack.java
View file @ 5678dc1b
......@@ -36,7 +36,7 @@ public class DataBack {
String filepath;
@Autowired
private DataSource dataSource;
@Value(value = "${spring.datasource.druid.password}")
@Value(value = "${spring.datasource.dynamic.datasource.master.password}")
String password;
@Value(value = "${environment.path}")
private String envPath;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/DrybeachequipinforController.java
View file @ 5678dc1b
......@@ -17,7 +17,7 @@ import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.tab.dry.DryVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.DrybeachequipinforVo;
import me.zhengjie.gemho.x_generato.modules.security.service.OnlineUserService;
import me.zhengjie.utils.RedisUtils;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/JrxDissectController.java
View file @ 5678dc1b
......@@ -9,7 +9,7 @@ import me.zhengjie.gemho.service.tab.JrxDissectService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.JrxQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxDissectVisualVO;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxStepsListVo;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/JrxStepsController.java
View file @ 5678dc1b
......@@ -7,7 +7,7 @@ import me.zhengjie.gemho.entity.tab.JrxSteps;
import me.zhengjie.gemho.service.tab.IJrxStepsService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxStepsListVo;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/JrxWaterController.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.service.tab.JrxWaterService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/TailpondinforController.java
View file @ 5678dc1b
......@@ -12,7 +12,7 @@ import me.zhengjie.gemho.service.tab.TailpondinforService;
import me.zhengjie.gemho.util.PageResult;
import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_generato.modules.security.service.OnlineUserService;
import me.zhengjie.utils.SecurityUtils;
import me.zhengjie.utils.ThrowableUtil;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/artificial/ArtificialDataService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.artificial;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.artificial.ArtificialData;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/artificial/ArtificialPointService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.artificial;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.artificial.ArtificialPoint;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/artificial/impl/ArtificialDataServiceImpl.java
View file @ 5678dc1b
......@@ -14,7 +14,7 @@ import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.artificial.ADataVo;
import me.zhengjie.gemho.x_datavo.artificial.ArtificialDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/artificial/impl/ArtificialPointServiceImpl.java
View file @ 5678dc1b
......@@ -9,7 +9,7 @@ import me.zhengjie.gemho.service.artificial.ArtificialPointService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.artificial.PointListVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/DbDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.DbData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/DmDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.DmData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/MpDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.MpData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/PslDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.PslData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/RgDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.RgData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/SlDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.SlData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/StDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.StData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/SzDataService.java
View file @ 5678dc1b
......@@ -3,7 +3,7 @@ package me.zhengjie.gemho.service.data;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.SzData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/WpbDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.WpbData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/WtDataService.java
View file @ 5678dc1b
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.data.WtData;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/ZhidianService.java
View file @ 5678dc1b
......@@ -3,12 +3,10 @@ package me.zhengjie.gemho.service.data;
import me.zhengjie.gemho.entity.data.Zhidian;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.HashMap;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import com.baomidou.mybatisplus.core.metadata.IPage;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
* <p>
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DbDataServiceImpl.java
View file @ 5678dc1b
......@@ -17,7 +17,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DmDataServiceImpl.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/MpDataServiceImpl.java
View file @ 5678dc1b
......@@ -16,7 +16,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/PslDataServiceImpl.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/RgDataServiceImpl.java
View file @ 5678dc1b
......@@ -16,7 +16,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/SlDataServiceImpl.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/StDataServiceImpl.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/SzDataServiceImpl.java
View file @ 5678dc1b
......@@ -12,7 +12,7 @@ import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/WpbDataServiceImpl.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/WtDataServiceImpl.java
View file @ 5678dc1b
......@@ -15,7 +15,7 @@ import me.zhengjie.gemho.x_datavo.DataVo;
import me.zhengjie.gemho.x_datavo.NameVo;
import me.zhengjie.gemho.x_datavo.RealDataVo;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/ZhidianServiceImpl.java
View file @ 5678dc1b
package me.zhengjie.gemho.service.data.impl;
import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import me.zhengjie.gemho.entity.data.WtData;
import me.zhengjie.gemho.entity.data.Zhidian;
import me.zhengjie.gemho.entity.tab.Drybeachequipinfor;
import me.zhengjie.gemho.mapper.data.ZhidianMapper;
......@@ -12,7 +10,7 @@ import me.zhengjie.gemho.mapper.tab.DrybeachequipinforMapper;
import me.zhengjie.gemho.service.data.ZhidianService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/ins/InsChildrenService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.ins;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.ins.InsChildren;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import java.util.HashMap;
import java.util.List;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/ins/InsDataService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.ins;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.ins.InsData;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/ins/InsProjectService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.ins;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.ins.InsProject;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import java.util.HashMap;
import java.util.List;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/ins/impl/InsChildrenServiceImpl.java
View file @ 5678dc1b
......@@ -7,7 +7,7 @@ import me.zhengjie.gemho.entity.ins.InsChildren;
import me.zhengjie.gemho.mapper.ins.InsChildrenMapper;
import me.zhengjie.gemho.service.ins.InsChildrenService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/ins/impl/InsDataServiceImpl.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.entity.ins.InsData;
import me.zhengjie.gemho.mapper.ins.InsDataMapper;
import me.zhengjie.gemho.service.ins.InsDataService;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.ins.InsDataVo;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/ins/impl/InsProjectServiceImpl.java
View file @ 5678dc1b
......@@ -7,7 +7,7 @@ import me.zhengjie.gemho.entity.ins.InsProject;
import me.zhengjie.gemho.mapper.ins.InsProjectMapper;
import me.zhengjie.gemho.service.ins.InsProjectService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/sys/SysSummaryService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.sys;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.sys.SysSummary;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/sys/impl/SysSummaryServiceImpl.java
View file @ 5678dc1b
......@@ -10,7 +10,7 @@ import me.zhengjie.gemho.mapper.tab.DrybeachequipinforMapper;
import me.zhengjie.gemho.mapper.tab.UserTailponMapper;
import me.zhengjie.gemho.service.sys.SysSummaryService;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.sys.SysSummaryVo;
import me.zhengjie.gemho.x_generato.modules.security.service.OnlineUserService;
import me.zhengjie.utils.SecurityUtils;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/DrybeachequipinforService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.tab;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.tab.Drybeachequipinfor;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.DrybeachequipinforVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/IJrxStepsService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.tab;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.tab.JrxSteps;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxStepsListVo;
import javax.servlet.http.HttpServletRequest;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/JrxDissectService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.tab;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.tab.JrxDissect;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.JrxQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxDissectVisualVO;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxStepsListVo;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/JrxWaterService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.tab;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.tab.JrxWater;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import java.util.HashMap;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/TabAbnormalService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.tab;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.tab.Abnormal;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/TailpondinforService.java
View file @ 5678dc1b
......@@ -2,7 +2,7 @@ package me.zhengjie.gemho.service.tab;
import com.baomidou.mybatisplus.extension.service.IService;
import me.zhengjie.gemho.entity.tab.Tailpondinfor;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/DrybeachequipinforServiceImpl.java
View file @ 5678dc1b
......@@ -11,7 +11,7 @@ import me.zhengjie.gemho.mapper.tab.DrybeachequipinforMapper;
import me.zhengjie.gemho.service.tab.DrybeachequipinforService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.DrybeachequipinforVo;
import me.zhengjie.gemho.x_datavo.tab.dry.LevelVo;
import me.zhengjie.gemho.x_generato.modules.security.service.OnlineUserService;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/JrxDissectServiceImpl.java
View file @ 5678dc1b
......@@ -13,7 +13,7 @@ import me.zhengjie.gemho.service.tab.JrxDissectService;
import me.zhengjie.gemho.util.DataUtil;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.JrxQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.JrxDissectDto;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxDissectVisualVO;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/JrxStepsServiceImpl.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.mapper.tab.JrxStepsMapper;
import me.zhengjie.gemho.service.tab.IJrxStepsService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxStepsListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/JrxWaterServiceImpl.java
View file @ 5678dc1b
......@@ -8,7 +8,7 @@ import me.zhengjie.gemho.mapper.tab.JrxWaterMapper;
import me.zhengjie.gemho.service.tab.JrxWaterService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/TabAbnormalServiceImpl.java
View file @ 5678dc1b
......@@ -16,7 +16,7 @@ import me.zhengjie.gemho.service.dic.IAlarmStateService;
import me.zhengjie.gemho.service.tab.TabAbnormalService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.utils.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/TailpondinforServiceImpl.java
View file @ 5678dc1b
......@@ -9,7 +9,7 @@ import me.zhengjie.gemho.mapper.tab.UserTailponMapper;
import me.zhengjie.gemho.service.tab.TailpondinforService;
import me.zhengjie.gemho.util.ServiceUtil;
import me.zhengjie.gemho.util.TailNoForInfoUtil;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.utils.RedisUtils;
import me.zhengjie.utils.SecurityUtils;
import me.zhengjie.utils.SpringContextHolder;
......
eladmin-system/src/main/java/me/zhengjie/gemho/util/ServiceUtil.java
View file @ 5678dc1b
......@@ -11,7 +11,7 @@ import me.zhengjie.gemho.mapper.artificial.ArtificialPointMapper;
import me.zhengjie.gemho.mapper.dic.JczxMapper;
import me.zhengjie.gemho.service.tab.DrybeachequipinforService;
import me.zhengjie.gemho.x_datavo.Result;
import me.zhengjie.gemho.x_datavo.data.DataQueryCriteria;
import me.zhengjie.base.DataQueryCriteria;
import me.zhengjie.gemho.x_datavo.data.ImgDataVo;
import me.zhengjie.gemho.x_datavo.tab.DrybeachequipinforVo;
import me.zhengjie.utils.SpringContextHolder;
......
eladmin-system/src/main/resources/config/application-dev.yml
View file @ 5678dc1b
#配置数据源
spring:
datasource:
dynamic:
primary: master
datasource:
master:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.2.37}:${DB_PORT:3310}/${DB_NAME:ruibo}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true&requireSSL=true
username: root
#password: ${DB_PWD:jinghe2021//}
password: jinghe2023
slave:
#配置 sqlServer
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://${DB_HOST:192.168.2.37}:1451;databaseName=demo01;encrypt=false
username: root
password: jinghe2022
druid:
connectionProperties: druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3310}/${DB_NAME:zhonghe}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=true&requireSSL=true
username: ${DB_USER:root}
#password: ${DB_PWD:jinghe2021//}
password: ${DB_PWD:jinghe2023}
# 初始连接数
initial-size: 5
# 最小连接数
......@@ -113,8 +125,8 @@ file:
path: /home/eladmin/file/
avatar: /home/eladmin/avatar/
windows:
path: C:\eladmin\file\
avatar: C:\eladmin\avatar\
path: F:\RuShanRuiBo\file\
avatar: F:\RuShanRuiBo\avatar\
# 文件大小 /M
maxSize: 100
avatarMaxSize: 5
eladmin-system/src/main/resources/config/application-pro.yml
View file @ 5678dc1b
#配置数据源
spring:
datasource:
druid:
connectionProperties: druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:mdm_1_db}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:jinghe2021//}
# 初始连接数
initial-size: 5
# 最小连接数
min-idle: 15
# 最大连接数
max-active: 60
# 获取连接超时时间
max-wait: 5000
# 连接有效性检测时间
time-between-eviction-runs-millis: 60000
# 连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
# 连接在池中最大生存的时间
max-evictable-idle-time-millis: 900000
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
test-while-idle: true
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
test-on-borrow: true
# 是否在归还到池中前进行检验
test-on-return: false
# 检测连接是否有效
validation-query: select 1
# 配置监控统计
webStatFilter:
enabled: true
stat-view-servlet:
enabled: true
# 控制台管理用户名和密码
url-pattern: /druid/*
reset-enable: false
login-username: admin
login-password: 123456
filter:
stat:
dynamic:
primary: master
datasource:
master:
#driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
#url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:10101}/${DB_NAME:ruibo}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
#username: ${DB_USER:root}
#password: ${DB_PWD:jinghe2022}
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:10101}/${DB_NAME:ruibo}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:jinghe2022}
slave:
#配置 sqlServer
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://${DB_HOST:192.168.10.50}:1433;databaseName=WEIGHT90;encrypt=false
username: sa
password: 00123
druid:
# 初始连接数
initial-size: 5
# 最小连接数
min-idle: 15
# 最大连接数
max-active: 60
# 获取连接超时时间
max-wait: 5000
# 连接有效性检测时间
time-between-eviction-runs-millis: 60000
# 连接在池中最小生存的时间
min-evictable-idle-time-millis: 300000
# 连接在池中最大生存的时间
max-evictable-idle-time-millis: 900000
# 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
test-while-idle: true
# 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
test-on-borrow: true
# 是否在归还到池中前进行检验
test-on-return: false
# 检测连接是否有效
validation-query: select 1
# 配置监控统计
webStatFilter:
enabled: true
# 记录慢SQL
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
stat-view-servlet:
enabled: true
# 控制台管理用户名和密码
url-pattern: /druid/*
reset-enable: false
login-username: admin
login-password: 123456
filter:
stat:
enabled: true
# 记录慢SQL
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true
# 登录相关配置
login:
......@@ -94,7 +107,7 @@ jwt:
# IP 本地解析
ip:
local-parsing: false
local-parsing: true
#是否允许生成代码，生产环境设置为false
generator:
......@@ -120,8 +133,8 @@ file:
path: /home/eladmin/file/
avatar: /home/eladmin/avatar/
windows:
path: C:\eladmin\file\
avatar: C:\eladmin\avatar\
path: D:\RuiBo\file\
avatar: D:\RuiBo\avatar\
# 文件大小 /M
maxSize: 100
avatarMaxSize: 5
eladmin-system/src/main/resources/config/application.yml
View file @ 5678dc1b
server:
port: 9003
port: 9005
spring:
freemarker:
......@@ -27,7 +27,7 @@ spring:
redis:
#数据库索引
database: ${REDIS_DB:0}
database: ${REDIS_DB:3}
host: ${REDIS_HOST:127.0.0.1}
port: ${REDIS_PORT:6399}
password: ${REDIS_PWD:R#9Xz&2Lp$Wq8v!u}
......@@ -72,7 +72,8 @@ logging:
netty:
tcp:
server:
port: 502
ip: localhost
port: 9006
filepath: d:/file/
......
pom.xml
View file @ 5678dc1b
This diff is collapsed.
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