diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e0f15db --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 81e4098..a2f3f6d 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 3.6.1 UTF-8 UTF-8 - 1.8 + 17 2.7.3 2021.0.4 2021.0.4.0 diff --git a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysRecordLogService.java b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysRecordLogService.java index f851865..f3f89ab 100644 --- a/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysRecordLogService.java +++ b/securitycontrol-auth/src/main/java/com/securitycontrol/auth/service/SysRecordLogService.java @@ -10,12 +10,10 @@ import com.securitycontrol.system.api.RemoteLogService; import com.securitycontrol.system.api.domain.SysLog; import com.securitycontrol.system.api.domain.SysUser; import com.securitycontrol.system.api.model.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import sun.security.krb5.internal.PAData; + import javax.annotation.Resource; -import java.util.UUID; /** * 记录日志方法 diff --git a/securitycontrol-auth/src/main/resources/logback.xml b/securitycontrol-auth/src/main/resources/logback.xml index 0cd6870..3c1f28a 100644 --- a/securitycontrol-auth/src/main/resources/logback.xml +++ b/securitycontrol-auth/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -60,11 +60,6 @@ - - - 127.0.0.1:9601 - - @@ -78,7 +73,6 @@ - \ No newline at end of file diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/BASE64DecodedMultipartFile.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/BASE64DecodedMultipartFile.java index 88a2f0d..9a584a5 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/BASE64DecodedMultipartFile.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/BASE64DecodedMultipartFile.java @@ -1,12 +1,12 @@ package com.securitycontrol.common.core.utils; -import cn.hutool.core.codec.Base64; import org.springframework.web.multipart.MultipartFile; -import sun.misc.BASE64Decoder; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.*; +import java.util.Base64; + /** * @author：cwchen * @date：2024-06-11 17:53-10:10 @@ -64,24 +64,20 @@ public class BASE64DecodedMultipartFile implements MultipartFile { } public static MultipartFile base64ToMultipart(String base64) { - try { - String[] baseStrs = base64.split(","); + String[] baseStrs = base64.split(","); - BASE64Decoder decoder = new BASE64Decoder(); - byte[] b = new byte[0]; - b = decoder.decodeBuffer(baseStrs[1]); + String base64String = baseStrs[1]; + // byte[] b = new byte[0]; + // b = decoder.decodeBuffer(baseStrs[1]); + byte[] b = Base64.getDecoder().decode(base64String); - for (int i = 0; i < b.length; ++i) { - if (b[i] < 0) { - b[i] += 256; - } + for (int i = 0; i < b.length; ++i) { + if (b[i] < 0) { + b[i] += 256; } - - return new BASE64DecodedMultipartFile(b, baseStrs[0]); - } catch (IOException e) { - e.printStackTrace(); - return null; } + + return new BASE64DecodedMultipartFile(b, baseStrs[0]); } @@ -97,7 +93,11 @@ public class BASE64DecodedMultipartFile implements MultipartFile { //输出流 ByteArrayOutputStream stream = new ByteArrayOutputStream(); ImageIO.write(image, "png", stream); - base64 = Base64.encode(stream.toByteArray()); + // base64 = Base64.encode(stream.toByteArray()); + // byte[] base64Bytes = Base64.getEncoder().encode(stream.toByteArray()); + // String base64Str = new String(base64Bytes); + String base64Str = Base64.getEncoder().encodeToString(stream.toByteArray()); + System.out.println(base64); } catch (IOException e) { // TODO Auto-generated catch block diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ServletUtils.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ServletUtils.java index ec3b3cd..4da45a6 100644 --- a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ServletUtils.java +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/ServletUtils.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSON; import com.securitycontrol.common.core.constant.Constants; import com.securitycontrol.common.core.domain.Result; import com.securitycontrol.common.core.text.Convert; -import com.sun.org.apache.bcel.internal.generic.RETURN; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java index 7d1bea9..b241ed6 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceDataVo.java @@ -1,7 +1,6 @@ package com.securitycontrol.entity.background.vo; import lombok.Data; -import org.omg.CORBA.PRIVATE_MEMBER; /** * 数据维护u实体类 diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java index a5b763a..5913d0f 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/dto/AlarmMgeDto.java @@ -2,7 +2,7 @@ package com.securitycontrol.entity.screen.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.omg.CORBA.PRIVATE_MEMBER; + /** * 告警管理 diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/OrgVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/OrgVo.java index 5bc977f..8453bed 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/OrgVo.java +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/OrgVo.java @@ -3,7 +3,7 @@ package com.securitycontrol.entity.system.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.hibernate.validator.constraints.Length; -import org.omg.CORBA.PRIVATE_MEMBER; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; diff --git a/securitycontrol-commons/securitycontrol-commons-redis/src/main/java/com/securitycontrol/common/redis/service/RedisService.java b/securitycontrol-commons/securitycontrol-commons-redis/src/main/java/com/securitycontrol/common/redis/service/RedisService.java index 1f7cc85..dad2b34 100644 --- a/securitycontrol-commons/securitycontrol-commons-redis/src/main/java/com/securitycontrol/common/redis/service/RedisService.java +++ b/securitycontrol-commons/securitycontrol-commons-redis/src/main/java/com/securitycontrol/common/redis/service/RedisService.java @@ -8,7 +8,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import org.omg.CORBA.INTERNAL; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; diff --git a/securitycontrol-gateway/pom.xml b/securitycontrol-gateway/pom.xml index 7c43338..e54ebe7 100644 --- a/securitycontrol-gateway/pom.xml +++ b/securitycontrol-gateway/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-starter-gateway - 4.2.5 + com.github.ulisesbocchio diff --git a/securitycontrol-gateway/src/main/resources/logback.xml b/securitycontrol-gateway/src/main/resources/logback.xml index a970db7..42bdef4 100644 --- a/securitycontrol-gateway/src/main/resources/logback.xml +++ b/securitycontrol-gateway/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -59,13 +59,6 @@ DENY - - - - 127.0.0.1:9601 - - - @@ -78,7 +71,6 @@ - \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/FMSGCallBack_V31.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/FMSGCallBack_V31.java index 18b6e92..1624c8b 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/FMSGCallBack_V31.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/hksdk/FMSGCallBack_V31.java @@ -16,7 +16,6 @@ import com.sun.jna.Pointer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import sun.misc.BASE64Encoder; import java.io.File; import java.io.UnsupportedEncodingException; @@ -24,6 +23,7 @@ import java.nio.ByteBuffer; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Base64; import java.util.Date; import java.util.List; @@ -88,8 +88,16 @@ public class FMSGCallBack_V31 implements HCNetSDK.FMSGCallBack_V31 { try { long offset = 0; ByteBuffer bytes = strACSInfo.pPicData.getByteBuffer(offset, strACSInfo.dwPicDataLen); - BASE64Encoder encoder = new BASE64Encoder(); - String image = encoder.encode(bytes).replaceAll("\r|\n", "");//图片 + + // 创建与 ByteBuffer 内容长度一致的字节数组 + byte[] byteArray = new byte[bytes.remaining()]; + bytes.get(byteArray); // 将 ByteBuffer 中的数据读取到字节数组 + // 使用标准库进行Base64编码（默认无换行符，无需替换） + String image = Base64.getEncoder().encodeToString(byteArray); +// BASE64Encoder encoder = new BASE64Encoder(); +// String image = encoder.encode(bytes).replaceAll("\r|\n", "");//图片 +// String image = Base64.getEncoder().encodeToString(bytes); + imageUrl="doorimage/"+DateTimeHelper.getTodayTime()+"/"+ UUIDUtils.uuid(4)+ DateTimeHelper.getTodayTime()+".jpeg"; File file = new File(SystemUtils.getUploadPath() +imageUrl); //生成文件夹 diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/sdk/SwingDemo.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/sdk/SwingDemo.java deleted file mode 100644 index 5d12461..0000000 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/sdk/SwingDemo.java +++ /dev/null @@ -1,456 +0,0 @@ -package com.securitycontrol.inter.sdk; - -import rk.netDevice.sdk.p2.*; - -import javax.swing.*; -import javax.swing.border.TitledBorder; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class SwingDemo extends JFrame { - - /** - * - */ - private static final long serialVersionUID = -7855826301914463533L; - private JTextField txtPort; - private JScrollPane scrollPane; - private JTextArea textArea; - private JButton btnStart; - private JButton btnStop; - private JCheckBox chkRelay0; - private JCheckBox chkRelay1; - private JCheckBox chkRelay2; - private JCheckBox chkRelay3; - private JCheckBox chkRelay4; - private JCheckBox chkRelay5; - private JCheckBox chkRelay6; - private JCheckBox chkRelay7; - private JButton btnTimming; - private JButton btnCallStore; - private RSServer rsServer;// - private IDataListener listener = new IDataListener() { - - @Override - public void receiveTimmingAck(TimmingAck data) {// УʱָӦ - textArea.append("УʱӦ->豸:" + data.getDeviceId() + "\tִн" - + data.getStatus() + "\r\n"); - } - - @Override - public void receiveTelecontrolAck(TelecontrolAck data) {// ңָӦ - textArea.append("ңӦ->豸:" + data.getDeviceId() + "\t̵:" - + data.getRelayId() + "\tִн:" + data.getStatus() + "\r\n"); - } - - @Override - public void receiveStoreData(StoreData data) {// Ѵ洢ݽմ - // ڵݡݰ豸Լڵݡʪݴڽڵ - for (NodeData nd : data.getNodeList()) { - SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd HH:mm:ss"); - String str = sdf.format(nd.getRecordTime()); - - textArea.append("洢->豸ַ:" + data.getDeviceId() + "\tڵ:" - + nd.getNodeId() + "\t¶:" + nd.getTem() + "\tʪ:" - + nd.getHum() + "\t洢ʱ:" + str+"\tͣ"+nd.getCoordinateType()+"\t:"+nd.getLng()+"\tγȣ"+nd.getLat() + "\r\n"); - - - - } - - } - - @Override - public void receiveRealtimeData(RealTimeData data) {// ʵʱݽմ - // ڵݡݰ豸Լڵݡʪݴڽڵ - SimpleDateFormat sdf = new SimpleDateFormat("yy-MM-dd HH:mm:ss"); - String time = sdf.format(new Date()); - for (NodeData nd : data.getNodeList()) { - textArea.append(time+"\tʵʱ->豸ַ:" + data.getDeviceId() + "\tڵ:" - + nd.getNodeId() + "\t¶:" + nd.getTem() + "\tʪ:" - + nd.getHum() + "\tȣ" + data.getLng() + "\tγȣ" - + data.getLat() + "\tͣ" + data.getCoordinateType() - + "\t̵״̬" + data.getRelayStatus() + "\tݣ" - + nd.getFloatValue() + "\t32λзݣ" - + nd.getSignedInt32Value() + "\t32λ޷ݣ" - + nd.getUnSignedInt32Value() + "\r\n"); - } - - } - - @Override - public void receiveLoginData(LoginData data) {// ¼ݽմ - textArea.append("¼->豸ַ:" + data.getDeviceId() + "\r\n"); - - } - - @Override - public void receiveParamIds(ParamIdsData data) { - String str = "豸б->豸ţ" + data.getDeviceId() + "\t" - + data.getTotalCount() + "\t֡" + data.getCount() - + "\r\n"; - for (int paramId : data.getPararmIdList())// 豸вid - { - str += paramId + ","; - } - textArea.append(str + "\r\n"); - - } - - @Override - public void receiveParam(ParamData data) { - String str = "豸->豸ţ" + data.getDeviceId() + "\r\n"; - - for (ParamItem pararm : data.getParameterList()) { - str += "ţ" - + pararm.getParamId() - + "\t" - + pararm.getDescription() - + "\tֵ" - + (pararm.getValueDescription() == null ? pararm - .getValue() : pararm.getValueDescription().get( - pararm.getValue())) + "\r\n"; - } - textArea.append(str + "\r\n"); - - } - - @Override - public void receiveWriteParamAck(WriteParamAck data) { - String str = "豸->豸ţ" + data.getDeviceId() + "\t" - + data.getCount() + "\t" - + (data.isSuccess() ? "سɹ" : "ʧ"); - textArea.append(str + "\r\n"); - - } - - @Override - public void receiveTransDataAck(TransDataAck data) { - String str = "͸->豸ţ" + data.getDeviceId() + "\tӦ" - + data.getData() + "\r\nֽ" + data.getTransDataLen(); - textArea.append(str + "\r\n"); - - } - - @Override - public void receiveHeartbeatData(HeartbeatData heartbeatData) { - - } - }; - - private JTextField txtDeviceId; - private JTextField txtParamIds; - private JTextField txtParamId; - private JTextField txtParamVal; - private JPanel panel_2; - private JLabel label_4; - private JTextField txtTransData; - private JButton btnTrans; - - public SwingDemo() { - setTitle("Demo"); - setResizable(false); - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setSize(653, 710); - setLocationRelativeTo(null); - - JLabel lblNewLabel = new JLabel("\u7AEF\u53E3:"); - lblNewLabel.setBounds(10, 10, 40, 15); - - txtPort = new JTextField(); - txtPort.setBounds(45, 7, 66, 21); - txtPort.setText("2404"); - txtPort.setColumns(10); - - btnStart = new JButton("\u542F\u52A8"); - btnStart.setBounds(135, 6, 85, 23); - btnStart.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - - btnStart.setEnabled(false); - new Thread(new Runnable() { - - @Override - public void run() { - - rsServer = RSServer.Initiate(Integer.parseInt(txtPort - .getText()),"C:/param.dat");// ʼ - - rsServer.addDataListener(listener);// ݼ¼ - try { - rsServer.start(); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - }// - } - }).start(); - } - - }); - - btnStop = new JButton("\u505C\u6B62"); - btnStop.setBounds(237, 6, 85, 23); - btnStop.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - btnStart.setEnabled(true); - rsServer.stop(); - } - }); - - scrollPane = new JScrollPane(); - scrollPane.setBounds(10, 400, 624, 275); - - textArea = new JTextArea(); - scrollPane.setViewportView(textArea); - - JLabel label = new JLabel("\u8BBE\u5907\u5730\u5740:"); - label.setBounds(10, 48, 66, 15); - - txtDeviceId = new JTextField(); - txtDeviceId.setBounds(75, 45, 84, 21); - txtDeviceId.setText("10000000"); - txtDeviceId.setColumns(10); - - btnTimming = new JButton("\u6821\u65F6"); - btnTimming.setBounds(336, 6, 85, 23); - btnTimming.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - int deviceId = Integer.parseInt(txtDeviceId.getText()); - rsServer.timming(deviceId); - } - }); - - btnCallStore = new JButton("\u53EC\u5524\u6570\u636E"); - btnCallStore.setBounds(428, 6, 90, 23); - btnCallStore.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - int deviceId = Integer.parseInt(txtDeviceId.getText()); - - rsServer.callStoreData(deviceId); - } - }); - - JPanel panel = new JPanel(); - panel.setBounds(10, 84, 624, 57); - panel.setBorder(new TitledBorder(null, - "\u7EE7\u7535\u5668\u63A7\u5236", TitledBorder.LEADING, - TitledBorder.TOP, null, null)); - - JPanel panel_1 = new JPanel(); - panel_1.setBounds(10, 147, 624, 112); - panel_1.setBorder(new TitledBorder(null, "\u8BBE\u5907\u53C2\u6570", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - - panel_2 = new JPanel(); - panel_2.setBounds(10, 269, 624, 113); - panel_2.setBorder(new TitledBorder(null, "\u6570\u636E\u900F\u4F20", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_2.setLayout(null); - - label_4 = new JLabel( - "\u900F\u4F20\u6570\u636E\uFF0C16\u8FDB\u5236\u5B57\u7B26\u4E32"); - label_4.setBounds(10, 23, 419, 15); - panel_2.add(label_4); - - txtTransData = new JTextField(); - txtTransData.setBounds(10, 48, 604, 21); - panel_2.add(txtTransData); - txtTransData.setColumns(10); - - btnTrans = new JButton("\u6570\u636E\u900F\u4F20"); - btnTrans.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - int deviceId = Integer.parseInt(txtDeviceId.getText()); - - rsServer.trans(deviceId, txtTransData.getText()); - } - }); - btnTrans.setBounds(10, 79, 93, 23); - panel_2.add(btnTrans); - panel_1.setLayout(null); - - JLabel label_1 = new JLabel( - "\u53C2\u6570\u7F16\u53F7\uFF0C\u7528\u4E8E\u8BFB\u53D6\u8BBE\u5907\u53C2\u6570\uFF08\u591A\u4E2A\u7F16\u53F7\u7528\u82F1\u6587,\u5206\u9694\uFF09"); - label_1.setBounds(10, 22, 421, 15); - panel_1.add(label_1); - - txtParamIds = new JTextField(); - txtParamIds.setText("1,2,3,4,5,6,7,8,9,10"); - txtParamIds.setBounds(10, 47, 421, 21); - panel_1.add(txtParamIds); - txtParamIds.setColumns(10); - - JLabel label_2 = new JLabel("\u53C2\u6570\u7F16\u53F7"); - label_2.setBounds(10, 78, 54, 15); - panel_1.add(label_2); - - txtParamId = new JTextField(); - txtParamId.setBounds(68, 75, 66, 21); - panel_1.add(txtParamId); - txtParamId.setColumns(10); - - JLabel label_3 = new JLabel("\u53C2\u6570\u503C"); - label_3.setBounds(144, 78, 54, 15); - panel_1.add(label_3); - - txtParamVal = new JTextField(); - txtParamVal.setBounds(202, 75, 66, 21); - panel_1.add(txtParamVal); - txtParamVal.setColumns(10); - - JButton btnReadParametersList = new JButton( - "\u8BFB\u53D6\u8BBE\u5907\u53C2\u6570\u5217\u8868"); - btnReadParametersList.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - int deviceId = Integer.parseInt(txtDeviceId.getText()); - rsServer.callParamList(deviceId);// ٻ豸бָ - } - }); - btnReadParametersList.setBounds(460, 18, 142, 23); - panel_1.add(btnReadParametersList); - - JButton btnReadParameters = new JButton( - "\u8BFB\u53D6\u8BBE\u5907\u53C2\u6570"); - btnReadParameters.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - int deviceId = Integer.parseInt(txtDeviceId.getText()); - List ids = new ArrayList(); - String[] idArray = txtParamIds.getText().split(","); - for (String str : idArray) { - try { - ids.add(Integer.parseInt(str)); - } catch (Exception e) { - } - } - if (ids.size() >= 115) { - - JOptionPane.showMessageDialog(null, "һζȡܳ115", - "ʾ", JOptionPane.INFORMATION_MESSAGE); - return; - } - rsServer.callParam(deviceId, ids); - - } - }); - btnReadParameters.setBounds(460, 46, 142, 23); - panel_1.add(btnReadParameters); - - JButton btnWriteParameters = new JButton( - "\u4E0B\u8F7D\u8BBE\u5907\u53C2\u6570"); - btnWriteParameters.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - - int deviceId = Integer.parseInt(txtDeviceId.getText()); - List parameters = new ArrayList(); - - try { - - parameters.add(ParamItem.New( - Integer.parseInt(txtParamId.getText()), - txtParamVal.getText())); - } catch (Exception ex) { - JOptionPane.showMessageDialog(null, ex.getMessage(), "ʾ", - JOptionPane.INFORMATION_MESSAGE); - return; - } - if (parameters.size() > 115) { - - JOptionPane.showMessageDialog(null, "һ·ܳ115", - "ʾ", JOptionPane.INFORMATION_MESSAGE); - return; - } - rsServer.writeParam(deviceId, parameters); - } - }); - btnWriteParameters.setBounds(460, 74, 142, 23); - panel_1.add(btnWriteParameters); - - chkRelay0 = new JCheckBox("\u7EE7\u7535\u56680"); - panel.add(chkRelay0); - - chkRelay1 = new JCheckBox("\u7EE7\u7535\u56681"); - panel.add(chkRelay1); - - chkRelay2 = new JCheckBox("\u7EE7\u7535\u56682"); - panel.add(chkRelay2); - - chkRelay3 = new JCheckBox("\u7EE7\u7535\u56683"); - panel.add(chkRelay3); - - chkRelay4 = new JCheckBox("\u7EE7\u7535\u56684"); - panel.add(chkRelay4); - - chkRelay5 = new JCheckBox("\u7EE7\u7535\u56685"); - panel.add(chkRelay5); - - chkRelay6 = new JCheckBox("\u7EE7\u7535\u56686"); - panel.add(chkRelay6); - - chkRelay7 = new JCheckBox("\u7EE7\u7535\u56687"); - panel.add(chkRelay7); - chkRelay7.addItemListener(new ChkItemListener(7)); - chkRelay6.addItemListener(new ChkItemListener(6)); - chkRelay5.addItemListener(new ChkItemListener(5)); - chkRelay4.addItemListener(new ChkItemListener(4)); - chkRelay3.addItemListener(new ChkItemListener(3)); - chkRelay2.addItemListener(new ChkItemListener(2)); - chkRelay1.addItemListener(new ChkItemListener(1)); - chkRelay0.addItemListener(new ChkItemListener(0)); - getContentPane().setLayout(null); - getContentPane().add(txtPort); - getContentPane().add(lblNewLabel); - getContentPane().add(btnStart); - getContentPane().add(btnStop); - getContentPane().add(btnTimming); - getContentPane().add(btnCallStore); - getContentPane().add(txtDeviceId); - getContentPane().add(label); - getContentPane().add(panel_1); - getContentPane().add(panel); - getContentPane().add(panel_2); - getContentPane().add(scrollPane); - } - - class ChkItemListener implements ItemListener { - - private int relayId = 0; - - public ChkItemListener(int relayId) { - this.relayId = relayId; - } - - @Override - public void itemStateChanged(ItemEvent e) { - JCheckBox jcb = (JCheckBox) e.getItem(); - int deviceId = Integer.parseInt(txtDeviceId.getText()); - if (jcb.isSelected()) { - - try { - rsServer.telecontrol(deviceId, relayId, 0, 0); - } catch (Exception e1) { - e1.printStackTrace(); - } - - } else { - try { - rsServer.telecontrol(deviceId, relayId, 1, 0); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - } - } - - public static void main(String[] args) { - new SwingDemo().setVisible(true); - - } -} diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/DevResultVo.java b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/DevResultVo.java index 8cd9662..62f2a42 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/DevResultVo.java +++ b/securitycontrol-model/securitycontrol-Interface/src/main/java/com/securitycontrol/inter/vo/DevResultVo.java @@ -1,9 +1,7 @@ package com.securitycontrol.inter.vo; -import javafx.application.Application; -import javafx.stage.Stage; + import lombok.Data; -import org.apache.ibatis.annotations.Param; /** * 返回值设备 diff --git a/securitycontrol-model/securitycontrol-Interface/src/main/resources/logback.xml b/securitycontrol-model/securitycontrol-Interface/src/main/resources/logback.xml index e0b6a82..2f0bfb2 100644 --- a/securitycontrol-model/securitycontrol-Interface/src/main/resources/logback.xml +++ b/securitycontrol-model/securitycontrol-Interface/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -60,12 +60,6 @@ - - - 127.0.0.1:9601 - - - @@ -77,7 +71,6 @@ - diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EmergencyController.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EmergencyController.java index e069b14..aa1305d 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EmergencyController.java +++ b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/controller/EmergencyController.java @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import sun.misc.BASE64Decoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/logback.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/logback.xml index 1ec7f23..3869d5a 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/logback.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -60,11 +60,7 @@ - - - 127.0.0.1:9601 - - + @@ -77,7 +73,6 @@ - diff --git a/securitycontrol-model/securitycontrol-files/src/main/resources/logback.xml b/securitycontrol-model/securitycontrol-files/src/main/resources/logback.xml index 3a96898..2f2777d 100644 --- a/securitycontrol-model/securitycontrol-files/src/main/resources/logback.xml +++ b/securitycontrol-model/securitycontrol-files/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -60,11 +60,7 @@ - - - 127.0.0.1:9601 - - + @@ -77,7 +73,6 @@ - diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java index ef4c698..da977ea 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/XcIndexServiceImpl.java @@ -22,7 +22,6 @@ import com.securitycontrol.system.api.domain.SysFile; import com.securitycontrol.system.api.domain.TbSourceFile; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.omg.CORBA.TIMEOUT; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/securitycontrol-model/securitycontrol-screen/src/main/resources/logback.xml b/securitycontrol-model/securitycontrol-screen/src/main/resources/logback.xml index 1ec7f23..3869d5a 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/resources/logback.xml +++ b/securitycontrol-model/securitycontrol-screen/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -60,11 +60,7 @@ - - - 127.0.0.1:9601 - - + @@ -77,7 +73,6 @@ - diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/logback.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/logback.xml index 5bf2c5f..eb2ba74 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/logback.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - %red(%d{yyyy-MM-dd HH:mm:ss,CTT}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) + %red(%d{yyyy-MM-dd HH:mm:ss,Asia/Shanghai}) %green([%thread]) %highlight(%-5level) %highlight([${appName},%X{X-B3-TraceId},%X{X-B3-SpanId},%X{X-Span-Export}]) %boldMagenta(%logger.%method:%L) - %cyan(%msg%n) debug @@ -60,11 +60,7 @@ - - - 127.0.0.1:9601 - - + @@ -77,7 +73,6 @@ -