whycxzp
2023-11-22 ce8e80c1ccb5f097b065b11dba02794020888227
更新测控电源接口
1个文件已删除
5个文件已添加
12个文件已修改
342 ■■■■ 已修改文件
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/LoginController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/UserInfController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/dto/Response.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/CKPowerDevRtMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/CKPowerDevSignalMapper.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/Response.java 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevRt.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevRtSet.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevSignal.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevSignalSet.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/CKPowerDevRtService.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/CKPowerDevSignalService.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/UserInfService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/websocket/CKRtAndSignalSocket.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/websocket/WebSocketEncoder.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/config/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -52,7 +52,7 @@
        <dependency>
            <groupId>mysql</groupId>
            <artifactId>mysql-connector-java</artifactId>
            <version>6.0.6</version>
            <version>8.0.11</version>
        </dependency>
        <dependency>
            <groupId>com.google.code.gson</groupId>
src/main/java/com/whyc/controller/LoginController.java
@@ -1,7 +1,7 @@
package com.whyc.controller;
import com.whyc.pojo.Response;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.UserInfService;
import com.whyc.util.UserUtil;
src/main/java/com/whyc/controller/UserInfController.java
@@ -1,6 +1,6 @@
package com.whyc.controller;
import com.whyc.pojo.Response;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.service.UserInfService;
import io.swagger.annotations.Api;
src/main/java/com/whyc/dto/Response.java
@@ -1,18 +1,13 @@
package com.whyc.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
/**
 * 接口数据响应对象
 */
@ApiModel
public class Response<T> implements Serializable {
    private Integer code;
    @ApiModelProperty
    private T data;
    private T data2;
    private T data3;
src/main/java/com/whyc/mapper/CKPowerDevRtMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRt;
public interface CKPowerDevRtMapper extends CustomMapper<CKPowerDevRt>{
}
src/main/java/com/whyc/mapper/CKPowerDevSignalMapper.java
New file
@@ -0,0 +1,6 @@
package com.whyc.mapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignal;
public interface CKPowerDevSignalMapper extends CustomMapper<CKPowerDevSignal>{
}
src/main/java/com/whyc/pojo/Response.java
File was deleted
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevAlmParam.java
@@ -13,18 +13,12 @@
import java.io.Serializable;
/**
 * <p>
 * 测控电源告警参数表
 * </p>
 *
 * @author lxw
 * @since 2023-11-21
 * 测控电源告警参数表
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_ckpowerdev_almparam")
@ApiModel(value="CkpowerdevAlmparam对象", description="测控电源告警参数表")
@TableName(schema = "db_ckpwrdev_data_rt",value = "tb_ckpowerdev_almparam")
@ApiModel("测控电源告警参数表")
public class CKPowerDevAlmParam implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevRt.java
@@ -14,18 +14,12 @@
import java.util.Date;
/**
 * <p>
 * 测控电源遥测实时数据表
 * </p>
 *
 * @author lxw
 * @since 2023-11-21
 * 测控电源遥测实时数据表
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_ckpowerdev_rt")
@ApiModel(value="CkpowerdevRt对象", description="测控电源遥测实时数据表")
@TableName(schema = "db_ckpwrdev_data_rt",value = "tb_ckpowerdev_rt")
@ApiModel("测控电源遥测实时数据表")
public class CKPowerDevRt implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevRtSet.java
@@ -13,18 +13,12 @@
import java.io.Serializable;
/**
 * <p>
 * 测控电源遥测量模拟设置表
 * </p>
 *
 * @author lxw
 * @since 2023-11-21
 * 测控电源遥测量模拟设置表
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_ckpowerdev_rt_set")
@ApiModel(value="CkpowerdevRtSet对象", description="测控电源遥测量模拟设置表")
@TableName(schema = "db_ckpwrdev_data_rt",value = "tb_ckpowerdev_rt_set")
@ApiModel("测控电源遥测量模拟设置表")
public class CKPowerDevRtSet implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevSignal.java
@@ -14,18 +14,12 @@
import java.util.Date;
/**
 * <p>
 * 测控电源遥信状态表
 * </p>
 *
 * @author lxw
 * @since 2023-11-21
 * 测控电源遥信状态表
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_ckpowerdev_signal")
@ApiModel(value="CkpowerdevSignal对象", description="测控电源遥信状态表")
@TableName(schema = "db_ckpwrdev_data_rt",value = "tb_ckpowerdev_signal")
@ApiModel("测控电源遥信状态表")
public class CKPowerDevSignal implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/pojo/db_ckpwrdev_data_rt/CKPowerDevSignalSet.java
@@ -13,18 +13,12 @@
import java.io.Serializable;
/**
 * <p>
 * 测控电源遥信状态遥调表
 * </p>
 *
 * @author lxw
 * @since 2023-11-21
 * 测控电源遥信状态遥调表
 */
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("tb_ckpowerdev_signal_set")
@ApiModel(value="CkpowerdevSignalSet对象", description="测控电源遥信状态遥调表")
@TableName(schema = "db_ckpwrdev_data_rt",value = "tb_ckpowerdev_signal_set")
@ApiModel("测控电源遥信状态遥调表")
public class CKPowerDevSignalSet implements Serializable {
    private static final long serialVersionUID = 1L;
src/main/java/com/whyc/service/CKPowerDevRtService.java
New file
@@ -0,0 +1,25 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.mapper.CKPowerDevRtMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRt;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * 测控电源遥测量
 */
@Service
public class CKPowerDevRtService {
    @Resource
    private CKPowerDevRtMapper mapper;
    public CKPowerDevRt get() {
        QueryWrapper<CKPowerDevRt> query = Wrappers.query();
        query.last(" limit 1");
        return mapper.selectOne(query);
    }
}
src/main/java/com/whyc/service/CKPowerDevSignalService.java
New file
@@ -0,0 +1,27 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.mapper.CKPowerDevSignalMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRt;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignal;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * 测控电源遥信量
 */
@Service
public class CKPowerDevSignalService {
    @Resource
    private CKPowerDevSignalMapper mapper;
    public CKPowerDevSignal get() {
        QueryWrapper<CKPowerDevSignal> query = Wrappers.query();
        query.last(" limit 1");
        return mapper.selectOne(query);
    }
}
src/main/java/com/whyc/service/UserInfService.java
@@ -5,7 +5,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.mapper.UserInfMapper;
import com.whyc.pojo.Response;
import com.whyc.dto.Response;
import com.whyc.pojo.db_user.UserInf;
import com.whyc.util.MD5Util;
import com.whyc.util.RSAUtil;
src/main/java/com/whyc/websocket/CKRtAndSignalSocket.java
New file
@@ -0,0 +1,81 @@
package com.whyc.websocket;
import com.whyc.config.WebSocketConfig;
import com.whyc.dto.Response;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRt;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevSignal;
import com.whyc.service.CKPowerDevRtService;
import com.whyc.service.CKPowerDevSignalService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
/**
 * 测控电源遥测量和遥信量
 */
@Component
@ServerEndpoint(value = "/ckRtAndSignal",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class)
public class CKRtAndSignalSocket {
    private Session session;
    private Thread thread;
    private static CKPowerDevRtService ckPowerDevRtService;
    private static CKPowerDevSignalService ckPowerDevSignalService;
    @Autowired
    public void setCkPowerDevRtService(CKPowerDevRtService ckPowerDevRtService) {
        CKRtAndSignalSocket.ckPowerDevRtService = ckPowerDevRtService;
    }
    @Autowired
    public void setCkPowerDevSignalService(CKPowerDevSignalService ckPowerDevSignalService) {
        CKRtAndSignalSocket.ckPowerDevSignalService = ckPowerDevSignalService;
    }
    @OnOpen
    public void onOpen(Session session, EndpointConfig config){
        this.session = session;
        Thread thread = new Thread() {
            @Override
            public void run() {
                try{
                    while (!currentThread().isInterrupted()) {
                        CKPowerDevRt ckPowerDevRt = ckPowerDevRtService.get();
                        CKPowerDevSignal ckPowerDevSignal = ckPowerDevSignalService.get();
                        session.getBasicRemote().sendObject(new Response<>().setII(1,ckPowerDevRt,ckPowerDevSignal,"查询完成"));
                        sleep(4000);
                    }
                } catch (Exception e) {
                    this.interrupt();
                }
            }
        };
        thread.start();
        this.thread = thread;
    }
    @OnClose
    public void onClose(CloseReason closeReason) throws IOException {
        System.err.println("closeReason = " + closeReason);
        if(session.isOpen()){
            session.close();
        }
    }
    @OnError
    public void onError(Throwable error) throws IOException {
        error.printStackTrace();
        thread.isInterrupted();
        if(session.isOpen()){
            session.close();
        }
    }
}
src/main/java/com/whyc/websocket/WebSocketEncoder.java
@@ -1,7 +1,7 @@
package com.whyc.websocket;
import com.google.gson.GsonBuilder;
import com.whyc.pojo.Response;
import com.whyc.dto.Response;
import javax.websocket.EncodeException;
import javax.websocket.Encoder;
src/main/resources/config/application-dev.yml
@@ -17,7 +17,7 @@
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.10.82:3381/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
    url: jdbc:mysql://192.168.10.82:3381/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
    username: root
    password: ENC(TCTafHgB8pLJhvf59unszvgwRS5M2AVq)
    maxIdel: 60