[1078] 代码整理

src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java

@@ -58,7 +58,7 @@ public class JwtUtils implements InitializingBean {
     private static IUserService userService;
 
     private static IUserApiKeyService userApiKeyService;
-    
+
     private static UserSetting userSetting;
 
     public static String getApiKeyHeader() {
@@ -236,7 +236,7 @@ public class JwtUtils implements InitializingBean {
                     jwtUser.setStatus(JwtUser.TokenStatus.EXPIRING_SOON);
                 } else {
                     jwtUser.setStatus(JwtUser.TokenStatus.NORMAL);
-                }
+               }
             } else {
                 jwtUser.setStatus(JwtUser.TokenStatus.NORMAL);
             }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTAreaAttribute.java

@@ -3,7 +3,11 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 @Schema(description = "区域属性")
 public class JTAreaAttribute {
 
@@ -96,91 +100,4 @@ public class JTAreaAttribute {
         return attribute;
     }
 
-    public boolean isRuleForTimeLimit() {
-        return ruleForTimeLimit;
-    }
-
-    public void setRuleForTimeLimit(boolean ruleForTimeLimit) {
-        this.ruleForTimeLimit = ruleForTimeLimit;
-    }
-
-    public boolean isRuleForSpeedLimit() {
-        return ruleForSpeedLimit;
-    }
-
-    public void setRuleForSpeedLimit(boolean ruleForSpeedLimit) {
-        this.ruleForSpeedLimit = ruleForSpeedLimit;
-    }
-
-    public boolean isRuleForAlarmToDriverWhenEnter() {
-        return ruleForAlarmToDriverWhenEnter;
-    }
-
-    public void setRuleForAlarmToDriverWhenEnter(boolean ruleForAlarmToDriverWhenEnter) {
-        this.ruleForAlarmToDriverWhenEnter = ruleForAlarmToDriverWhenEnter;
-    }
-
-    public boolean isRuleForAlarmToPlatformWhenEnter() {
-        return ruleForAlarmToPlatformWhenEnter;
-    }
-
-    public void setRuleForAlarmToPlatformWhenEnter(boolean ruleForAlarmToPlatformWhenEnter) {
-        this.ruleForAlarmToPlatformWhenEnter = ruleForAlarmToPlatformWhenEnter;
-    }
-
-    public boolean isRuleForAlarmToDriverWhenExit() {
-        return ruleForAlarmToDriverWhenExit;
-    }
-
-    public void setRuleForAlarmToDriverWhenExit(boolean ruleForAlarmToDriverWhenExit) {
-        this.ruleForAlarmToDriverWhenExit = ruleForAlarmToDriverWhenExit;
-    }
-
-    public boolean isRuleForAlarmToPlatformWhenExit() {
-        return ruleForAlarmToPlatformWhenExit;
-    }
-
-    public void setRuleForAlarmToPlatformWhenExit(boolean ruleForAlarmToPlatformWhenExit) {
-        this.ruleForAlarmToPlatformWhenExit = ruleForAlarmToPlatformWhenExit;
-    }
-
-    public boolean isSouthLatitude() {
-        return southLatitude;
-    }
-
-    public void setSouthLatitude(boolean southLatitude) {
-        this.southLatitude = southLatitude;
-    }
-
-    public boolean isWestLongitude() {
-        return westLongitude;
-    }
-
-    public void setWestLongitude(boolean westLongitude) {
-        this.westLongitude = westLongitude;
-    }
-
-    public boolean isProhibitOpeningDoors() {
-        return prohibitOpeningDoors;
-    }
-
-    public void setProhibitOpeningDoors(boolean prohibitOpeningDoors) {
-        this.prohibitOpeningDoors = prohibitOpeningDoors;
-    }
-
-    public boolean isRuleForTurnOffCommunicationWhenEnter() {
-        return ruleForTurnOffCommunicationWhenEnter;
-    }
-
-    public void setRuleForTurnOffCommunicationWhenEnter(boolean ruleForTurnOffCommunicationWhenEnter) {
-        this.ruleForTurnOffCommunicationWhenEnter = ruleForTurnOffCommunicationWhenEnter;
-    }
-
-    public boolean isRuleForGnssWhenEnter() {
-        return ruleForGnssWhenEnter;
-    }
-
-    public void setRuleForGnssWhenEnter(boolean ruleForGnssWhenEnter) {
-        this.ruleForGnssWhenEnter = ruleForGnssWhenEnter;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTCircleArea.java

@@ -5,10 +5,14 @@ import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 import java.util.Date;
 
+@Setter
+@Getter
 @Schema(description = "圆形区域")
 public class JTCircleArea implements JTAreaOrRoute{
 
@@ -87,91 +91,4 @@ public class JTCircleArea implements JTAreaOrRoute{
         return area;
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public JTAreaAttribute getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(JTAreaAttribute attribute) {
-        this.attribute = attribute;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public long getRadius() {
-        return radius;
-    }
-
-    public void setRadius(long radius) {
-        this.radius = radius;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public int getMaxSpeed() {
-        return maxSpeed;
-    }
-
-    public void setMaxSpeed(int maxSpeed) {
-        this.maxSpeed = maxSpeed;
-    }
-
-    public int getOverSpeedDuration() {
-        return overSpeedDuration;
-    }
-
-    public void setOverSpeedDuration(int overSpeedDuration) {
-        this.overSpeedDuration = overSpeedDuration;
-    }
-
-    public int getNighttimeMaxSpeed() {
-        return nighttimeMaxSpeed;
-    }
-
-    public void setNighttimeMaxSpeed(int nighttimeMaxSpeed) {
-        this.nighttimeMaxSpeed = nighttimeMaxSpeed;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTCommunicationModuleAttribute.java

@@ -1,10 +1,14 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * JT 通信模块属性
  */
+@Setter
+@Getter
 @Schema(description = "JT通信模块属性")
 public class JTCommunicationModuleAttribute {
 
@@ -38,62 +42,6 @@ public class JTCommunicationModuleAttribute {
         this.other = other;
     }
 
-    public boolean isGprs() {
-        return gprs;
-    }
-
-    public void setGprs(boolean gprs) {
-        this.gprs = gprs;
-    }
-
-    public boolean isCdma() {
-        return cdma;
-    }
-
-    public void setCdma(boolean cdma) {
-        this.cdma = cdma;
-    }
-
-    public boolean isTdScdma() {
-        return tdScdma;
-    }
-
-    public void setTdScdma(boolean tdScdma) {
-        this.tdScdma = tdScdma;
-    }
-
-    public boolean isWcdma() {
-        return wcdma;
-    }
-
-    public void setWcdma(boolean wcdma) {
-        this.wcdma = wcdma;
-    }
-
-    public boolean isCdma2000() {
-        return cdma2000;
-    }
-
-    public void setCdma2000(boolean cdma2000) {
-        this.cdma2000 = cdma2000;
-    }
-
-    public boolean isTdLte() {
-        return tdLte;
-    }
-
-    public void setTdLte(boolean tdLte) {
-        this.tdLte = tdLte;
-    }
-
-    public boolean isOther() {
-        return other;
-    }
-
-    public void setOther(boolean other) {
-        this.other = other;
-    }
-
     @Override
     public String toString() {
         return "JCommunicationModuleAttribute{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTConfirmationAlarmMessageType.java

@@ -1,7 +1,11 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 @Schema(description = "人工确认报警类型")
 public class JTConfirmationAlarmMessageType {
     @Schema(description = "确认紧急报警")
@@ -46,62 +50,6 @@ public class JTConfirmationAlarmMessageType {
     }
 
 
-    public boolean isUrgent() {
-        return urgent;
-    }
-
-    public void setUrgent(boolean urgent) {
-        this.urgent = urgent;
-    }
-
-    public boolean isAlarmDangerous() {
-        return alarmDangerous;
-    }
-
-    public void setAlarmDangerous(boolean alarmDangerous) {
-        this.alarmDangerous = alarmDangerous;
-    }
-
-    public boolean isAlarmRegion() {
-        return alarmRegion;
-    }
-
-    public void setAlarmRegion(boolean alarmRegion) {
-        this.alarmRegion = alarmRegion;
-    }
-
-    public boolean isAlarmRoute() {
-        return alarmRoute;
-    }
-
-    public void setAlarmRoute(boolean alarmRoute) {
-        this.alarmRoute = alarmRoute;
-    }
-
-    public boolean isAlarmTravelTime() {
-        return alarmTravelTime;
-    }
-
-    public void setAlarmTravelTime(boolean alarmTravelTime) {
-        this.alarmTravelTime = alarmTravelTime;
-    }
-
-    public boolean isAlarmIllegalIgnition() {
-        return alarmIllegalIgnition;
-    }
-
-    public void setAlarmIllegalIgnition(boolean alarmIllegalIgnition) {
-        this.alarmIllegalIgnition = alarmIllegalIgnition;
-    }
-
-    public boolean isAlarmIllegalDisplacement() {
-        return alarmIllegalDisplacement;
-    }
-
-    public void setAlarmIllegalDisplacement(boolean alarmIllegalDisplacement) {
-        this.alarmIllegalDisplacement = alarmIllegalDisplacement;
-    }
-
     @Override
     public String toString() {
         return "JConfirmationAlarmMessageType{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceAttribute.java

@@ -1,10 +1,14 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * JT 终端属性
  */
+@Setter
+@Getter
 @Schema(description = "JT终端属性")
 public class JTDeviceAttribute {
 
@@ -35,78 +39,6 @@ public class JTDeviceAttribute {
     @Schema(description = "通信模块属性")
     private JTCommunicationModuleAttribute communicationModuleAttribute ;
 
-    public JTDeviceType getType() {
-        return type;
-    }
-
-    public void setType(JTDeviceType type) {
-        this.type = type;
-    }
-
-    public String getMakerId() {
-        return makerId;
-    }
-
-    public void setMakerId(String makerId) {
-        this.makerId = makerId;
-    }
-
-    public String getDeviceModel() {
-        return deviceModel;
-    }
-
-    public void setDeviceModel(String deviceModel) {
-        this.deviceModel = deviceModel;
-    }
-
-    public String getTerminalId() {
-        return terminalId;
-    }
-
-    public void setTerminalId(String terminalId) {
-        this.terminalId = terminalId;
-    }
-
-    public String getIccId() {
-        return iccId;
-    }
-
-    public void setIccId(String iccId) {
-        this.iccId = iccId;
-    }
-
-    public String getHardwareVersion() {
-        return hardwareVersion;
-    }
-
-    public void setHardwareVersion(String hardwareVersion) {
-        this.hardwareVersion = hardwareVersion;
-    }
-
-    public String getFirmwareVersion() {
-        return firmwareVersion;
-    }
-
-    public void setFirmwareVersion(String firmwareVersion) {
-        this.firmwareVersion = firmwareVersion;
-    }
-
-    public JTGnssAttribute getGnssAttribute() {
-        return gnssAttribute;
-    }
-
-    public void setGnssAttribute(JTGnssAttribute gnssAttribute) {
-        this.gnssAttribute = gnssAttribute;
-    }
-
-    public JTCommunicationModuleAttribute getCommunicationModuleAttribute() {
-        return communicationModuleAttribute;
-    }
-
-    public void setCommunicationModuleAttribute(JTCommunicationModuleAttribute communicationModuleAttribute) {
-        this.communicationModuleAttribute = communicationModuleAttribute;
-    }
-
     @Override
     public String toString() {
         return "JTDeviceAttribute{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceType.java

@@ -1,10 +1,14 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * JT 终端类型
  */
+@Setter
+@Getter
 @Schema(description = "JT终端参数设置")
 public class JTDeviceType {
 
@@ -64,62 +68,6 @@ public class JTDeviceType {
         this.trailer = trailer;
     }
 
-    public boolean isPassengerVehicles() {
-        return passengerVehicles;
-    }
-
-    public void setPassengerVehicles(boolean passengerVehicles) {
-        this.passengerVehicles = passengerVehicles;
-    }
-
-    public boolean isDangerousGoodsVehicles() {
-        return dangerousGoodsVehicles;
-    }
-
-    public void setDangerousGoodsVehicles(boolean dangerousGoodsVehicles) {
-        this.dangerousGoodsVehicles = dangerousGoodsVehicles;
-    }
-
-    public boolean isFreightVehicles() {
-        return freightVehicles;
-    }
-
-    public void setFreightVehicles(boolean freightVehicles) {
-        this.freightVehicles = freightVehicles;
-    }
-
-    public boolean isRentalVehicles() {
-        return rentalVehicles;
-    }
-
-    public void setRentalVehicles(boolean rentalVehicles) {
-        this.rentalVehicles = rentalVehicles;
-    }
-
-    public boolean isHardDiskRecording() {
-        return hardDiskRecording;
-    }
-
-    public void setHardDiskRecording(boolean hardDiskRecording) {
-        this.hardDiskRecording = hardDiskRecording;
-    }
-
-    public boolean isSplittingMachine() {
-        return splittingMachine;
-    }
-
-    public void setSplittingMachine(boolean splittingMachine) {
-        this.splittingMachine = splittingMachine;
-    }
-
-    public boolean isTrailer() {
-        return trailer;
-    }
-
-    public void setTrailer(boolean trailer) {
-        this.trailer = trailer;
-    }
-
     @Override
     public String toString() {
         return "JTDeviceType{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTGnssAttribute.java

@@ -1,10 +1,14 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * JT GNSS 模块属性
  */
+@Setter
+@Getter
 @Schema(description = "JTGNSS 模块属性")
 public class JTGnssAttribute {
 
@@ -31,38 +35,6 @@ public class JTGnssAttribute {
         this.gaLiLeo = gaLiLeo;
     }
 
-    public boolean isGps() {
-        return gps;
-    }
-
-    public void setGps(boolean gps) {
-        this.gps = gps;
-    }
-
-    public boolean isBeidou() {
-        return beidou;
-    }
-
-    public void setBeidou(boolean beidou) {
-        this.beidou = beidou;
-    }
-
-    public boolean isGlonass() {
-        return glonass;
-    }
-
-    public void setGlonass(boolean glonass) {
-        this.glonass = glonass;
-    }
-
-    public boolean isGaLiLeo() {
-        return gaLiLeo;
-    }
-
-    public void setGaLiLeo(boolean gaLiLeo) {
-        this.gaLiLeo = gaLiLeo;
-    }
-
     @Override
     public String toString() {
         return "JGnssAttribute{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTMediaAttribute.java

@@ -3,10 +3,14 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import com.genersoft.iot.vmp.jt1078.bean.config.JTDeviceSubConfig;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 终端上传音视频属性
  */
+@Setter
+@Getter
 public class JTMediaAttribute implements JTDeviceSubConfig {
 
     /**
@@ -94,78 +98,6 @@ public class JTMediaAttribute implements JTDeviceSubConfig {
      */
     private int videoChannelMax;
 
-    public int getAudioEncoder() {
-        return audioEncoder;
-    }
-
-    public void setAudioEncoder(int audioEncoder) {
-        this.audioEncoder = audioEncoder;
-    }
-
-    public int getAudioChannels() {
-        return audioChannels;
-    }
-
-    public void setAudioChannels(int audioChannels) {
-        this.audioChannels = audioChannels;
-    }
-
-    public int getAudioSamplingRate() {
-        return audioSamplingRate;
-    }
-
-    public void setAudioSamplingRate(int audioSamplingRate) {
-        this.audioSamplingRate = audioSamplingRate;
-    }
-
-    public int getAudioFrameLength() {
-        return audioFrameLength;
-    }
-
-    public void setAudioFrameLength(int audioFrameLength) {
-        this.audioFrameLength = audioFrameLength;
-    }
-
-    public int getAudioOutputEnable() {
-        return audioOutputEnable;
-    }
-
-    public void setAudioOutputEnable(int audioOutputEnable) {
-        this.audioOutputEnable = audioOutputEnable;
-    }
-
-    public int getVideoEncoder() {
-        return videoEncoder;
-    }
-
-    public void setVideoEncoder(int videoEncoder) {
-        this.videoEncoder = videoEncoder;
-    }
-
-    public int getAudioChannelMax() {
-        return audioChannelMax;
-    }
-
-    public void setAudioChannelMax(int audioChannelMax) {
-        this.audioChannelMax = audioChannelMax;
-    }
-
-    public int getVideoChannelMax() {
-        return videoChannelMax;
-    }
-
-    public void setVideoChannelMax(int videoChannelMax) {
-        this.videoChannelMax = videoChannelMax;
-    }
-
-    public int getAudioSamplingBits() {
-        return audioSamplingBits;
-    }
-
-    public void setAudioSamplingBits(int audioSamplingBits) {
-        this.audioSamplingBits = audioSamplingBits;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPassengerNum.java

@@ -5,10 +5,14 @@ import com.genersoft.iot.vmp.jt1078.util.BCDUtil;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 终端上传乘客流量
  */
+@Setter
+@Getter
 public class JTPassengerNum implements JTDeviceSubConfig {
 
     /**
@@ -31,38 +35,6 @@ public class JTPassengerNum implements JTDeviceSubConfig {
      */
     private int getOut;
 
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public int getGetIn() {
-        return getIn;
-    }
-
-    public void setGetIn(int getIn) {
-        this.getIn = getIn;
-    }
-
-    public int getGetOut() {
-        return getOut;
-    }
-
-    public void setGetOut(int getOut) {
-        this.getOut = getOut;
-    }
-
     @Override
     public ByteBuf encode() {
         return null;

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPhoneBookContact.java

@@ -3,9 +3,13 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 
+@Setter
+@Getter
 @Schema(description = "电话本联系人")
 public class JTPhoneBookContact {
 
@@ -28,30 +32,6 @@ public class JTPhoneBookContact {
         return buffer;
     }
 
-    public int getSign() {
-        return sign;
-    }
-
-    public void setSign(int sign) {
-        this.sign = sign;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
     @Override
     public String toString() {
         return "JTPhoneBookContact{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPolygonArea.java

@@ -5,11 +5,15 @@ import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
+@Setter
+@Getter
 @Schema(description = "多边形区域")
 public class JTPolygonArea implements JTAreaOrRoute{
 
@@ -90,75 +94,4 @@ public class JTPolygonArea implements JTAreaOrRoute{
         return area;
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public JTAreaAttribute getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(JTAreaAttribute attribute) {
-        this.attribute = attribute;
-    }
-
-    public List<JTPolygonPoint> getPolygonPoints() {
-        return polygonPoints;
-    }
-
-    public void setPolygonPoints(List<JTPolygonPoint> polygonPoints) {
-        this.polygonPoints = polygonPoints;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public int getMaxSpeed() {
-        return maxSpeed;
-    }
-
-    public void setMaxSpeed(int maxSpeed) {
-        this.maxSpeed = maxSpeed;
-    }
-
-    public int getOverSpeedDuration() {
-        return overSpeedDuration;
-    }
-
-    public void setOverSpeedDuration(int overSpeedDuration) {
-        this.overSpeedDuration = overSpeedDuration;
-    }
-
-    public int getNighttimeMaxSpeed() {
-        return nighttimeMaxSpeed;
-    }
-
-    public void setNighttimeMaxSpeed(int nighttimeMaxSpeed) {
-        this.nighttimeMaxSpeed = nighttimeMaxSpeed;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPolygonPoint.java

@@ -3,7 +3,11 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 @Schema(description = "多边形区域的顶点")
 public class JTPolygonPoint {
 
@@ -20,19 +24,4 @@ public class JTPolygonPoint {
         return byteBuf;
     }
 
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPositionAdditionalInfo.java

@@ -1,7 +1,11 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
 @Schema(description = "位置附加信息")
 public class JTPositionAdditionalInfo {
 

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPositionBaseInfo.java

@@ -3,10 +3,14 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import com.genersoft.iot.vmp.jt1078.util.BCDUtil;
 import io.netty.buffer.ByteBuf;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
 import java.nio.ByteBuffer;
 
+@Setter
+@Getter
 @Slf4j
 @Schema(description = "位置基本信息")
 public class JTPositionBaseInfo {
@@ -68,7 +72,7 @@ public class JTPositionBaseInfo {
     public static JTPositionBaseInfo decode(ByteBuf buf) {
         JTPositionBaseInfo positionInfo = new JTPositionBaseInfo();
         if (buf.readableBytes() < 17) {
-            log.error("[位置基本信息] 解码失败，长度不足: ｛｝", buf.readableBytes());
+            log.error("[位置基本信息] 解码失败，长度不足: {}", buf.readableBytes());
             return positionInfo;
         }
         positionInfo.setAlarmSign(new JTAlarmSign(buf.readUnsignedInt()));
@@ -86,78 +90,6 @@ public class JTPositionBaseInfo {
         return positionInfo;
     }
 
-    public JTAlarmSign getAlarmSign() {
-        return alarmSign;
-    }
-
-    public void setAlarmSign(JTAlarmSign alarmSign) {
-        this.alarmSign = alarmSign;
-    }
-
-    public JTStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(JTStatus status) {
-        this.status = status;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public Integer getAltitude() {
-        return altitude;
-    }
-
-    public void setAltitude(Integer altitude) {
-        this.altitude = altitude;
-    }
-
-    public Integer getSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(Integer speed) {
-        this.speed = speed;
-    }
-
-    public Integer getDirection() {
-        return direction;
-    }
-
-    public void setDirection(Integer direction) {
-        this.direction = direction;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
-
-    public JTVideoAlarm getVideoAlarm() {
-        return videoAlarm;
-    }
-
-    public void setVideoAlarm(JTVideoAlarm videoAlarm) {
-        this.videoAlarm = videoAlarm;
-    }
-
 
     public String toSimpleString() {
         return "简略位置汇报信息： " +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTPositionInfo.java

@@ -1,7 +1,9 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
 
+@Getter
 @Schema(description = "位置信息")
 public class JTPositionInfo {
 
@@ -17,18 +19,10 @@ public class JTPositionInfo {
     @Schema(description = "位置附加信息")
     private JTPositionAdditionalInfo additional;
 
-    public JTPositionBaseInfo getBase() {
-        return base;
-    }
-
     public void setBase(JTPositionBaseInfo base) {
         this.base = base;
     }
 
-    public JTPositionAdditionalInfo getAdditional() {
-        return additional;
-    }
-
     public void setAdditional(JTPositionAdditionalInfo additional) {
         this.additional = additional;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTRectangleArea.java

@@ -5,9 +5,13 @@ import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 
+@Setter
+@Getter
 @Schema(description = "矩形区域")
 public class JTRectangleArea implements JTAreaOrRoute{
 
@@ -90,99 +94,4 @@ public class JTRectangleArea implements JTAreaOrRoute{
         return area;
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public JTAreaAttribute getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(JTAreaAttribute attribute) {
-        this.attribute = attribute;
-    }
-
-    public Double getLatitudeForUpperLeft() {
-        return latitudeForUpperLeft;
-    }
-
-    public void setLatitudeForUpperLeft(Double latitudeForUpperLeft) {
-        this.latitudeForUpperLeft = latitudeForUpperLeft;
-    }
-
-    public Double getLongitudeForUpperLeft() {
-        return longitudeForUpperLeft;
-    }
-
-    public void setLongitudeForUpperLeft(Double longitudeForUpperLeft) {
-        this.longitudeForUpperLeft = longitudeForUpperLeft;
-    }
-
-    public Double getLatitudeForLowerRight() {
-        return latitudeForLowerRight;
-    }
-
-    public void setLatitudeForLowerRight(Double latitudeForLowerRight) {
-        this.latitudeForLowerRight = latitudeForLowerRight;
-    }
-
-    public Double getLongitudeForLowerRight() {
-        return longitudeForLowerRight;
-    }
-
-    public void setLongitudeForLowerRight(Double longitudeForLowerRight) {
-        this.longitudeForLowerRight = longitudeForLowerRight;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public int getMaxSpeed() {
-        return maxSpeed;
-    }
-
-    public void setMaxSpeed(int maxSpeed) {
-        this.maxSpeed = maxSpeed;
-    }
-
-    public int getOverSpeedDuration() {
-        return overSpeedDuration;
-    }
-
-    public void setOverSpeedDuration(int overSpeedDuration) {
-        this.overSpeedDuration = overSpeedDuration;
-    }
-
-    public int getNighttimeMaxSpeed() {
-        return nighttimeMaxSpeed;
-    }
-
-    public void setNighttimeMaxSpeed(int nighttimeMaxSpeed) {
-        this.nighttimeMaxSpeed = nighttimeMaxSpeed;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTRoute.java

@@ -5,11 +5,15 @@ import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
+@Setter
+@Getter
 @Schema(description = "路线")
 public class JTRoute implements JTAreaOrRoute{
 
@@ -72,54 +76,6 @@ public class JTRoute implements JTAreaOrRoute{
         return route;
     }
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public JTRouteAttribute getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(JTRouteAttribute attribute) {
-        this.attribute = attribute;
-    }
-
-    public String getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public List<JTRoutePoint> getRoutePointList() {
-        return routePointList;
-    }
-
-    public void setRoutePointList(List<JTRoutePoint> routePointList) {
-        this.routePointList = routePointList;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     public String toString() {
         return "JTRoute{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTRouteAttribute.java

@@ -3,7 +3,11 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 @Schema(description = "路线属性")
 public class JTRouteAttribute {
 
@@ -54,46 +58,6 @@ public class JTRouteAttribute {
         return attribute;
     }
 
-    public boolean isRuleForTimeLimit() {
-        return ruleForTimeLimit;
-    }
-
-    public void setRuleForTimeLimit(boolean ruleForTimeLimit) {
-        this.ruleForTimeLimit = ruleForTimeLimit;
-    }
-
-    public boolean isRuleForAlarmToDriverWhenEnter() {
-        return ruleForAlarmToDriverWhenEnter;
-    }
-
-    public void setRuleForAlarmToDriverWhenEnter(boolean ruleForAlarmToDriverWhenEnter) {
-        this.ruleForAlarmToDriverWhenEnter = ruleForAlarmToDriverWhenEnter;
-    }
-
-    public boolean isRuleForAlarmToPlatformWhenEnter() {
-        return ruleForAlarmToPlatformWhenEnter;
-    }
-
-    public void setRuleForAlarmToPlatformWhenEnter(boolean ruleForAlarmToPlatformWhenEnter) {
-        this.ruleForAlarmToPlatformWhenEnter = ruleForAlarmToPlatformWhenEnter;
-    }
-
-    public boolean isRuleForAlarmToDriverWhenExit() {
-        return ruleForAlarmToDriverWhenExit;
-    }
-
-    public void setRuleForAlarmToDriverWhenExit(boolean ruleForAlarmToDriverWhenExit) {
-        this.ruleForAlarmToDriverWhenExit = ruleForAlarmToDriverWhenExit;
-    }
-
-    public boolean isRuleForAlarmToPlatformWhenExit() {
-        return ruleForAlarmToPlatformWhenExit;
-    }
-
-    public void setRuleForAlarmToPlatformWhenExit(boolean ruleForAlarmToPlatformWhenExit) {
-        this.ruleForAlarmToPlatformWhenExit = ruleForAlarmToPlatformWhenExit;
-    }
-
     @Override
     public String toString() {
         return "JTRouteAttribute{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTRoutePoint.java

@@ -1,13 +1,13 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
-import com.genersoft.iot.vmp.jt1078.util.BCDUtil;
-import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
-import java.nio.charset.Charset;
-
+@Setter
+@Getter
 @Schema(description = "路线拐点")
 public class JTRoutePoint {
 
@@ -79,94 +79,6 @@ public class JTRoutePoint {
         return point;
     }
 
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public long getRouteSectionId() {
-        return routeSectionId;
-    }
-
-    public void setRouteSectionId(long routeSectionId) {
-        this.routeSectionId = routeSectionId;
-    }
-
-    public int getRouteSectionAttributeWidth() {
-        return routeSectionAttributeWidth;
-    }
-
-    public void setRouteSectionAttributeWidth(int routeSectionAttributeWidth) {
-        this.routeSectionAttributeWidth = routeSectionAttributeWidth;
-    }
-
-    public JTRouteSectionAttribute getRouteSectionAttribute() {
-        return routeSectionAttribute;
-    }
-
-    public void setRouteSectionAttribute(JTRouteSectionAttribute routeSectionAttribute) {
-        this.routeSectionAttribute = routeSectionAttribute;
-    }
-
-    public int getRouteSectionMaxLength() {
-        return routeSectionMaxLength;
-    }
-
-    public void setRouteSectionMaxLength(int routeSectionMaxLength) {
-        this.routeSectionMaxLength = routeSectionMaxLength;
-    }
-
-    public int getRouteSectionMinLength() {
-        return routeSectionMinLength;
-    }
-
-    public void setRouteSectionMinLength(int routeSectionMinLength) {
-        this.routeSectionMinLength = routeSectionMinLength;
-    }
-
-    public int getRouteSectionMaxSpeed() {
-        return routeSectionMaxSpeed;
-    }
-
-    public void setRouteSectionMaxSpeed(int routeSectionMaxSpeed) {
-        this.routeSectionMaxSpeed = routeSectionMaxSpeed;
-    }
-
-    public int getRouteSectionOverSpeedDuration() {
-        return routeSectionOverSpeedDuration;
-    }
-
-    public void setRouteSectionOverSpeedDuration(int routeSectionOverSpeedDuration) {
-        this.routeSectionOverSpeedDuration = routeSectionOverSpeedDuration;
-    }
-
-    public int getRouteSectionNighttimeMaxSpeed() {
-        return routeSectionNighttimeMaxSpeed;
-    }
-
-    public void setRouteSectionNighttimeMaxSpeed(int routeSectionNighttimeMaxSpeed) {
-        this.routeSectionNighttimeMaxSpeed = routeSectionNighttimeMaxSpeed;
-    }
-
     @Override
     public String toString() {
         return "JTRoutePoint{" +

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTRouteSectionAttribute.java

@@ -3,7 +3,11 @@ package com.genersoft.iot.vmp.jt1078.bean;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 @Schema(description = "路段属性")
 public class JTRouteSectionAttribute {
 
@@ -45,35 +49,4 @@ public class JTRouteSectionAttribute {
         return attribute;
     }
 
-    public boolean isRuleForTimeLimit() {
-        return ruleForTimeLimit;
-    }
-
-    public void setRuleForTimeLimit(boolean ruleForTimeLimit) {
-        this.ruleForTimeLimit = ruleForTimeLimit;
-    }
-
-    public boolean isRuleForSpeedLimit() {
-        return ruleForSpeedLimit;
-    }
-
-    public void setRuleForSpeedLimit(boolean ruleForSpeedLimit) {
-        this.ruleForSpeedLimit = ruleForSpeedLimit;
-    }
-
-    public boolean isSouthLatitude() {
-        return southLatitude;
-    }
-
-    public void setSouthLatitude(boolean southLatitude) {
-        this.southLatitude = southLatitude;
-    }
-
-    public boolean isWestLongitude() {
-        return westLongitude;
-    }
-
-    public void setWestLongitude(boolean westLongitude) {
-        this.westLongitude = westLongitude;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTVehicleControl.java

@@ -1,12 +1,16 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Objects;
 
 /**
  * 车辆控制类型
  */
+@Setter
+@Getter
 public class JTVehicleControl {
 
     private int length;
@@ -18,17 +22,10 @@ public class JTVehicleControl {
             length ++;
         }
     }
-    public int getLength() {
-        return length;
-    }
 
     @ConfigAttribute(id = 0X0001, type="Byte", description = "车门, 0：车门锁闭 1：车门开启")
     private Integer controlCarDoor;
 
-    public Integer getControlCarDoor() {
-        return controlCarDoor;
-    }
-
     public void setControlCarDoor(Integer controlCarDoor) {
         this.controlCarDoor = controlCarDoor;
         setLength(controlCarDoor);

src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTVideoAlarm.java

@@ -1,10 +1,14 @@
 package com.genersoft.iot.vmp.jt1078.bean;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Setter
+@Getter
 @Schema(description = "视频报警上报")
 public class JTVideoAlarm {
 
@@ -85,75 +89,4 @@ public class JTVideoAlarm {
         return jtVideoAlarm;
     }
 
-    public List<Integer> getVideoLossChannels() {
-        return videoLossChannels;
-    }
-
-    public void setVideoLossChannels(List<Integer> videoLossChannels) {
-        this.videoLossChannels = videoLossChannels;
-    }
-
-    public List<Integer> getVideoOcclusionChannels() {
-        return videoOcclusionChannels;
-    }
-
-    public void setVideoOcclusionChannels(List<Integer> videoOcclusionChannels) {
-        this.videoOcclusionChannels = videoOcclusionChannels;
-    }
-
-    public List<Integer> getStorageFaultAlarm() {
-        return storageFaultAlarm;
-    }
-
-    public void setStorageFaultAlarm(List<Integer> storageFaultAlarm) {
-        this.storageFaultAlarm = storageFaultAlarm;
-    }
-
-    public boolean isDrivingForFatigue() {
-        return drivingForFatigue;
-    }
-
-    public void setDrivingForFatigue(boolean drivingForFatigue) {
-        this.drivingForFatigue = drivingForFatigue;
-    }
-
-    public boolean isDrivingForCall() {
-        return drivingForCall;
-    }
-
-    public void setDrivingForCall(boolean drivingForCall) {
-        this.drivingForCall = drivingForCall;
-    }
-
-    public boolean isDrivingSmoking() {
-        return drivingSmoking;
-    }
-
-    public void setDrivingSmoking(boolean drivingSmoking) {
-        this.drivingSmoking = drivingSmoking;
-    }
-
-    public boolean isOtherDeviceFailure() {
-        return otherDeviceFailure;
-    }
-
-    public void setOtherDeviceFailure(boolean otherDeviceFailure) {
-        this.otherDeviceFailure = otherDeviceFailure;
-    }
-
-    public boolean isOvercrowding() {
-        return overcrowding;
-    }
-
-    public void setOvercrowding(boolean overcrowding) {
-        this.overcrowding = overcrowding;
-    }
-
-    public boolean isSpecialRecordFull() {
-        return specialRecordFull;
-    }
-
-    public void setSpecialRecordFull(boolean specialRecordFull) {
-        this.specialRecordFull = specialRecordFull;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTAlarmRecordingParam.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 特殊报警录像参数
  */
+@Setter
+@Getter
 public class JTAlarmRecordingParam implements  JTDeviceSubConfig{
 
     /**
@@ -23,30 +27,6 @@ public class JTAlarmRecordingParam implements  JTDeviceSubConfig{
      */
     private int startTime;
 
-    public int getStorageLimit() {
-        return storageLimit;
-    }
-
-    public void setStorageLimit(int storageLimit) {
-        this.storageLimit = storageLimit;
-    }
-
-    public int getDuration() {
-        return duration;
-    }
-
-    public void setDuration(int duration) {
-        this.duration = duration;
-    }
-
-    public int getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(int startTime) {
-        this.startTime = startTime;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTAloneChanel.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 单独通道视频
  */
+@Setter
+@Getter
 public class JTAloneChanel implements JTDeviceSubConfig{
 
     /**
@@ -93,102 +97,6 @@ public class JTAloneChanel implements JTDeviceSubConfig{
      */
     private JTOSDConfig osd;
 
-    public int getLogicChannelId() {
-        return logicChannelId;
-    }
-
-    public void setLogicChannelId(int logicChannelId) {
-        this.logicChannelId = logicChannelId;
-    }
-
-    public int getLiveStreamCodeRateType() {
-        return liveStreamCodeRateType;
-    }
-
-    public void setLiveStreamCodeRateType(int liveStreamCodeRateType) {
-        this.liveStreamCodeRateType = liveStreamCodeRateType;
-    }
-
-    public int getLiveStreamResolving() {
-        return liveStreamResolving;
-    }
-
-    public void setLiveStreamResolving(int liveStreamResolving) {
-        this.liveStreamResolving = liveStreamResolving;
-    }
-
-    public int getLiveStreamIInterval() {
-        return liveStreamIInterval;
-    }
-
-    public void setLiveStreamIInterval(int liveStreamIInterval) {
-        this.liveStreamIInterval = liveStreamIInterval;
-    }
-
-    public int getLiveStreamFrameRate() {
-        return liveStreamFrameRate;
-    }
-
-    public void setLiveStreamFrameRate(int liveStreamFrameRate) {
-        this.liveStreamFrameRate = liveStreamFrameRate;
-    }
-
-    public long getLiveStreamCodeRate() {
-        return liveStreamCodeRate;
-    }
-
-    public void setLiveStreamCodeRate(long liveStreamCodeRate) {
-        this.liveStreamCodeRate = liveStreamCodeRate;
-    }
-
-    public int getStorageStreamCodeRateType() {
-        return storageStreamCodeRateType;
-    }
-
-    public void setStorageStreamCodeRateType(int storageStreamCodeRateType) {
-        this.storageStreamCodeRateType = storageStreamCodeRateType;
-    }
-
-    public int getStorageStreamResolving() {
-        return storageStreamResolving;
-    }
-
-    public void setStorageStreamResolving(int storageStreamResolving) {
-        this.storageStreamResolving = storageStreamResolving;
-    }
-
-    public int getStorageStreamIInterval() {
-        return storageStreamIInterval;
-    }
-
-    public void setStorageStreamIInterval(int storageStreamIInterval) {
-        this.storageStreamIInterval = storageStreamIInterval;
-    }
-
-    public int getStorageStreamFrameRate() {
-        return storageStreamFrameRate;
-    }
-
-    public void setStorageStreamFrameRate(int storageStreamFrameRate) {
-        this.storageStreamFrameRate = storageStreamFrameRate;
-    }
-
-    public long getStorageStreamCodeRate() {
-        return storageStreamCodeRate;
-    }
-
-    public void setStorageStreamCodeRate(long storageStreamCodeRate) {
-        this.storageStreamCodeRate = storageStreamCodeRate;
-    }
-
-    public JTOSDConfig getOsd() {
-        return osd;
-    }
-
-    public void setOsd(JTOSDConfig osd) {
-        this.osd = osd;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTAnalyzeAlarmParam.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 视频分析报警参数
  */
+@Setter
+@Getter
 public class JTAnalyzeAlarmParam implements JTDeviceSubConfig{
 
     /**
@@ -20,22 +24,6 @@ public class JTAnalyzeAlarmParam implements JTDeviceSubConfig{
     private int fatigueThreshold;
 
 
-    public int getNumberForPeople() {
-        return numberForPeople;
-    }
-
-    public void setNumberForPeople(int numberForPeople) {
-        this.numberForPeople = numberForPeople;
-    }
-
-    public int getFatigueThreshold() {
-        return fatigueThreshold;
-    }
-
-    public void setFatigueThreshold(int fatigueThreshold) {
-        this.fatigueThreshold = fatigueThreshold;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTAwakenParam.java

@@ -3,10 +3,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 import com.genersoft.iot.vmp.jt1078.util.BCDUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 终端休眠唤醒模式设置
  */
+@Setter
+@Getter
 public class JTAwakenParam implements JTDeviceSubConfig{
 
     /**
@@ -134,206 +138,6 @@ public class JTAwakenParam implements JTDeviceSubConfig{
      */
     private String time4EndTime;
 
-    public boolean isWakeUpModeByCondition() {
-        return wakeUpModeByCondition;
-    }
-
-    public void setWakeUpModeByCondition(boolean wakeUpModeByCondition) {
-        this.wakeUpModeByCondition = wakeUpModeByCondition;
-    }
-
-    public boolean isWakeUpModeByTime() {
-        return wakeUpModeByTime;
-    }
-
-    public void setWakeUpModeByTime(boolean wakeUpModeByTime) {
-        this.wakeUpModeByTime = wakeUpModeByTime;
-    }
-
-    public boolean isWakeUpModeByManual() {
-        return wakeUpModeByManual;
-    }
-
-    public void setWakeUpModeByManual(boolean wakeUpModeByManual) {
-        this.wakeUpModeByManual = wakeUpModeByManual;
-    }
-
-    public boolean isWakeUpConditionsByAlarm() {
-        return wakeUpConditionsByAlarm;
-    }
-
-    public void setWakeUpConditionsByAlarm(boolean wakeUpConditionsByAlarm) {
-        this.wakeUpConditionsByAlarm = wakeUpConditionsByAlarm;
-    }
-
-    public boolean isWakeUpConditionsByRollover() {
-        return wakeUpConditionsByRollover;
-    }
-
-    public void setWakeUpConditionsByRollover(boolean wakeUpConditionsByRollover) {
-        this.wakeUpConditionsByRollover = wakeUpConditionsByRollover;
-    }
-
-    public boolean isWakeUpConditionsByOpenTheDoor() {
-        return wakeUpConditionsByOpenTheDoor;
-    }
-
-    public void setWakeUpConditionsByOpenTheDoor(boolean wakeUpConditionsByOpenTheDoor) {
-        this.wakeUpConditionsByOpenTheDoor = wakeUpConditionsByOpenTheDoor;
-    }
-
-    public boolean isAwakeningDayForMonday() {
-        return awakeningDayForMonday;
-    }
-
-    public void setAwakeningDayForMonday(boolean awakeningDayForMonday) {
-        this.awakeningDayForMonday = awakeningDayForMonday;
-    }
-
-    public boolean isAwakeningDayForTuesday() {
-        return awakeningDayForTuesday;
-    }
-
-    public void setAwakeningDayForTuesday(boolean awakeningDayForTuesday) {
-        this.awakeningDayForTuesday = awakeningDayForTuesday;
-    }
-
-    public boolean isAwakeningDayForWednesday() {
-        return awakeningDayForWednesday;
-    }
-
-    public void setAwakeningDayForWednesday(boolean awakeningDayForWednesday) {
-        this.awakeningDayForWednesday = awakeningDayForWednesday;
-    }
-
-    public boolean isAwakeningDayForThursday() {
-        return awakeningDayForThursday;
-    }
-
-    public void setAwakeningDayForThursday(boolean awakeningDayForThursday) {
-        this.awakeningDayForThursday = awakeningDayForThursday;
-    }
-
-    public boolean isAwakeningDayForFriday() {
-        return awakeningDayForFriday;
-    }
-
-    public void setAwakeningDayForFriday(boolean awakeningDayForFriday) {
-        this.awakeningDayForFriday = awakeningDayForFriday;
-    }
-
-    public boolean isAwakeningDayForSaturday() {
-        return awakeningDayForSaturday;
-    }
-
-    public void setAwakeningDayForSaturday(boolean awakeningDayForSaturday) {
-        this.awakeningDayForSaturday = awakeningDayForSaturday;
-    }
-
-    public boolean isAwakeningDayForSunday() {
-        return awakeningDayForSunday;
-    }
-
-    public void setAwakeningDayForSunday(boolean awakeningDayForSunday) {
-        this.awakeningDayForSunday = awakeningDayForSunday;
-    }
-
-    public boolean isTime1Enable() {
-        return time1Enable;
-    }
-
-    public void setTime1Enable(boolean time1Enable) {
-        this.time1Enable = time1Enable;
-    }
-
-    public String getTime1StartTime() {
-        return time1StartTime;
-    }
-
-    public void setTime1StartTime(String time1StartTime) {
-        this.time1StartTime = time1StartTime;
-    }
-
-    public String getTime1EndTime() {
-        return time1EndTime;
-    }
-
-    public void setTime1EndTime(String time1EndTime) {
-        this.time1EndTime = time1EndTime;
-    }
-
-    public boolean isTime2Enable() {
-        return time2Enable;
-    }
-
-    public void setTime2Enable(boolean time2Enable) {
-        this.time2Enable = time2Enable;
-    }
-
-    public String getTime2StartTime() {
-        return time2StartTime;
-    }
-
-    public void setTime2StartTime(String time2StartTime) {
-        this.time2StartTime = time2StartTime;
-    }
-
-    public String getTime2EndTime() {
-        return time2EndTime;
-    }
-
-    public void setTime2EndTime(String time2EndTime) {
-        this.time2EndTime = time2EndTime;
-    }
-
-    public boolean isTime3Enable() {
-        return time3Enable;
-    }
-
-    public void setTime3Enable(boolean time3Enable) {
-        this.time3Enable = time3Enable;
-    }
-
-    public String getTime3StartTime() {
-        return time3StartTime;
-    }
-
-    public void setTime3StartTime(String time3StartTime) {
-        this.time3StartTime = time3StartTime;
-    }
-
-    public String getTime3EndTime() {
-        return time3EndTime;
-    }
-
-    public void setTime3EndTime(String time3EndTime) {
-        this.time3EndTime = time3EndTime;
-    }
-
-    public boolean isTime4Enable() {
-        return time4Enable;
-    }
-
-    public void setTime4Enable(boolean time4Enable) {
-        this.time4Enable = time4Enable;
-    }
-
-    public String getTime4StartTime() {
-        return time4StartTime;
-    }
-
-    public void setTime4StartTime(String time4StartTime) {
-        this.time4StartTime = time4StartTime;
-    }
-
-    public String getTime4EndTime() {
-        return time4EndTime;
-    }
-
-    public void setTime4EndTime(String time4EndTime) {
-        this.time4EndTime = time4EndTime;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTCameraTimer.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 定时拍照控制
  */
+@Setter
+@Getter
 public class JTCameraTimer implements JTDeviceSubConfig{
     /**
      * 摄像通道1 定时拍照开关标志
@@ -63,102 +67,6 @@ public class JTCameraTimer implements JTDeviceSubConfig{
      */
     private Integer timeInterval;
 
-    public boolean isSwitchForChannel1() {
-        return switchForChannel1;
-    }
-
-    public void setSwitchForChannel1(boolean switchForChannel1) {
-        this.switchForChannel1 = switchForChannel1;
-    }
-
-    public boolean isSwitchForChannel2() {
-        return switchForChannel2;
-    }
-
-    public void setSwitchForChannel2(boolean switchForChannel2) {
-        this.switchForChannel2 = switchForChannel2;
-    }
-
-    public boolean isSwitchForChannel3() {
-        return switchForChannel3;
-    }
-
-    public void setSwitchForChannel3(boolean switchForChannel3) {
-        this.switchForChannel3 = switchForChannel3;
-    }
-
-    public boolean isSwitchForChannel4() {
-        return switchForChannel4;
-    }
-
-    public void setSwitchForChannel4(boolean switchForChannel4) {
-        this.switchForChannel4 = switchForChannel4;
-    }
-
-    public boolean isSwitchForChannel5() {
-        return switchForChannel5;
-    }
-
-    public void setSwitchForChannel5(boolean switchForChannel5) {
-        this.switchForChannel5 = switchForChannel5;
-    }
-
-    public boolean isStorageFlagsForChannel1() {
-        return storageFlagsForChannel1;
-    }
-
-    public void setStorageFlagsForChannel1(boolean storageFlagsForChannel1) {
-        this.storageFlagsForChannel1 = storageFlagsForChannel1;
-    }
-
-    public boolean isStorageFlagsForChannel2() {
-        return storageFlagsForChannel2;
-    }
-
-    public void setStorageFlagsForChannel2(boolean storageFlagsForChannel2) {
-        this.storageFlagsForChannel2 = storageFlagsForChannel2;
-    }
-
-    public boolean isStorageFlagsForChannel3() {
-        return storageFlagsForChannel3;
-    }
-
-    public void setStorageFlagsForChannel3(boolean storageFlagsForChannel3) {
-        this.storageFlagsForChannel3 = storageFlagsForChannel3;
-    }
-
-    public boolean isStorageFlagsForChannel4() {
-        return storageFlagsForChannel4;
-    }
-
-    public void setStorageFlagsForChannel4(boolean storageFlagsForChannel4) {
-        this.storageFlagsForChannel4 = storageFlagsForChannel4;
-    }
-
-    public boolean isStorageFlagsForChannel5() {
-        return storageFlagsForChannel5;
-    }
-
-    public void setStorageFlagsForChannel5(boolean storageFlagsForChannel5) {
-        this.storageFlagsForChannel5 = storageFlagsForChannel5;
-    }
-
-    public boolean isTimeUnit() {
-        return timeUnit;
-    }
-
-    public void setTimeUnit(boolean timeUnit) {
-        this.timeUnit = timeUnit;
-    }
-
-    public Integer getTimeInterval() {
-        return timeInterval;
-    }
-
-    public void setTimeInterval(Integer timeInterval) {
-        this.timeInterval = timeInterval;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTChanel.java

@@ -2,12 +2,16 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.Stack;
 
 /**
  * 音视频通道
  */
+@Setter
+@Getter
 public class JTChanel implements JTDeviceSubConfig{
 
     /**
@@ -33,38 +37,6 @@ public class JTChanel implements JTDeviceSubConfig{
      */
     private int ptzEnable;
 
-    public int getPhysicalChannelId() {
-        return physicalChannelId;
-    }
-
-    public void setPhysicalChannelId(int physicalChannelId) {
-        this.physicalChannelId = physicalChannelId;
-    }
-
-    public int getLogicChannelId() {
-        return logicChannelId;
-    }
-
-    public void setLogicChannelId(int logicChannelId) {
-        this.logicChannelId = logicChannelId;
-    }
-
-    public int getChannelType() {
-        return channelType;
-    }
-
-    public void setChannelType(int channelType) {
-        this.channelType = channelType;
-    }
-
-    public int getPtzEnable() {
-        return ptzEnable;
-    }
-
-    public void setPtzEnable(int ptzEnable) {
-        this.ptzEnable = ptzEnable;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTChannelListParam.java

@@ -2,6 +2,8 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,6 +11,8 @@ import java.util.List;
 /**
  * 音视频通道列表设置
  */
+@Setter
+@Getter
 public class JTChannelListParam implements JTDeviceSubConfig{
 
     /**
@@ -29,38 +33,6 @@ public class JTChannelListParam implements JTDeviceSubConfig{
     private List<JTChanel> chanelList;
 
 
-    public int getVideoAndAudioCount() {
-        return videoAndAudioCount;
-    }
-
-    public void setVideoAndAudioCount(int videoAndAudioCount) {
-        this.videoAndAudioCount = videoAndAudioCount;
-    }
-
-    public int getAudioCount() {
-        return audioCount;
-    }
-
-    public void setAudioCount(int audioCount) {
-        this.audioCount = audioCount;
-    }
-
-    public int getVideoCount() {
-        return videoCount;
-    }
-
-    public void setVideoCount(int videoCount) {
-        this.videoCount = videoCount;
-    }
-
-    public List<JTChanel> getChanelList() {
-        return chanelList;
-    }
-
-    public void setChanelList(List<JTChanel> chanelList) {
-        this.chanelList = chanelList;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTChannelParam.java

@@ -2,6 +2,8 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,6 +11,8 @@ import java.util.List;
 /**
  * 单独视频通道参数设置
  */
+@Setter
+@Getter
 public class JTChannelParam implements JTDeviceSubConfig {
 
     /**
@@ -16,14 +20,6 @@ public class JTChannelParam implements JTDeviceSubConfig {
      */
     private List<JTAloneChanel> jtAloneChanelList;
 
-    public List<JTAloneChanel> getJtAloneChanelList() {
-        return jtAloneChanelList;
-    }
-
-    public void setJtAloneChanelList(List<JTAloneChanel> jtAloneChanelList) {
-        this.jtAloneChanelList = jtAloneChanelList;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTCollisionAlarmParams.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 碰撞报警参数设置
  */
+@Setter
+@Getter
 public class JTCollisionAlarmParams implements JTDeviceSubConfig{
 
     /**
@@ -18,22 +22,6 @@ public class JTCollisionAlarmParams implements JTDeviceSubConfig{
      */
     private int collisionAcceleration;
 
-    public int getCollisionAlarmTime() {
-        return collisionAlarmTime;
-    }
-
-    public void setCollisionAlarmTime(int collisionAlarmTime) {
-        this.collisionAlarmTime = collisionAlarmTime;
-    }
-
-    public int getCollisionAcceleration() {
-        return collisionAcceleration;
-    }
-
-    public void setCollisionAcceleration(int collisionAcceleration) {
-        this.collisionAcceleration = collisionAcceleration;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTGnssPositioningMode.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * GNSS 定位模式
  */
+@Setter
+@Getter
 public class JTGnssPositioningMode implements JTDeviceSubConfig{
 
     /**
@@ -25,38 +29,6 @@ public class JTGnssPositioningMode implements JTDeviceSubConfig{
      */
     private boolean gaLiLeo;
 
-    public boolean isGps() {
-        return gps;
-    }
-
-    public void setGps(boolean gps) {
-        this.gps = gps;
-    }
-
-    public boolean isBeidou() {
-        return beidou;
-    }
-
-    public void setBeidou(boolean beidou) {
-        this.beidou = beidou;
-    }
-
-    public boolean isGlonass() {
-        return glonass;
-    }
-
-    public void setGlonass(boolean glonass) {
-        this.glonass = glonass;
-    }
-
-    public boolean isGaLiLeo() {
-        return gaLiLeo;
-    }
-
-    public void setGaLiLeo(boolean gaLiLeo) {
-        this.gaLiLeo = gaLiLeo;
-    }
-
     @Override
     public ByteBuf encode() {
         ByteBuf byteBuf = Unpooled.buffer();

src/main/java/com/genersoft/iot/vmp/jt1078/bean/config/JTOSDConfig.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.bean.config;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * OSD字幕叠加设置
  */
+@Setter
+@Getter
 public class JTOSDConfig {
 
     /**
@@ -43,62 +47,6 @@ public class JTOSDConfig {
      */
     private boolean drivingTime;
 
-    public boolean isTime() {
-        return time;
-    }
-
-    public void setTime(boolean time) {
-        this.time = time;
-    }
-
-    public boolean isLicensePlate() {
-        return licensePlate;
-    }
-
-    public void setLicensePlate(boolean licensePlate) {
-        this.licensePlate = licensePlate;
-    }
-
-    public boolean isChannelId() {
-        return channelId;
-    }
-
-    public void setChannelId(boolean channelId) {
-        this.channelId = channelId;
-    }
-
-    public boolean isPosition() {
-        return position;
-    }
-
-    public void setPosition(boolean position) {
-        this.position = position;
-    }
-
-    public boolean isSpeed() {
-        return speed;
-    }
-
-    public void setSpeed(boolean speed) {
-        this.speed = speed;
-    }
-
-    public boolean isSpeedForGPS() {
-        return speedForGPS;
-    }
-
-    public void setSpeedForGPS(boolean speedForGPS) {
-        this.speedForGPS = speedForGPS;
-    }
-
-    public boolean isDrivingTime() {
-        return drivingTime;
-    }
-
-    public void setDrivingTime(boolean drivingTime) {
-        this.drivingTime = drivingTime;
-    }
-
     public ByteBuf encode(){
         ByteBuf byteBuf = Unpooled.buffer();
         byte content = 0;

src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java

@@ -40,7 +40,6 @@ public class Jt808Decoder extends ByteToMessageDecoder {
         this.service = service;
     }
 
-    Map<String, List<String>> dumpMap = new ConcurrentHashMap<>();
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
         in.retain();

src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/MultiPacket.java

@@ -1,64 +0,0 @@
-package com.genersoft.iot.vmp.jt1078.codec.decode;
-
-import com.genersoft.iot.vmp.jt1078.proc.Header;
-import io.netty.buffer.ByteBuf;
-import lombok.Data;
-
-/**
- * 分包消息
- */
-@Data
-public class MultiPacket {
-
-    /**
-     * 消息头
-     */
-    private Header header;
-
-    /**
-     * 包序号
-     */
-    private Integer number;
-
-    /**
-     * 分包数量
-     */
-    private Integer count;
-
-    /**
-     * 创建时间
-     */
-    private Long createTime;
-
-    /**
-     * 消息内容
-     */
-    private ByteBuf byteBuf;
-
-    /**
-     * 消息内容
-     */
-    private String bufStr;
-
-    public static MultiPacket getInstance(Header header, Integer number, Integer count, ByteBuf byteBuf) {
-        if (byteBuf == null) {
-            System.err.println("MultiPacket error byteBuf is null");
-        }
-        MultiPacket multiPacket = new MultiPacket();
-        multiPacket.setHeader(header);
-        multiPacket.setNumber(number);
-        multiPacket.setCount(count);
-        multiPacket.setCreateTime(System.currentTimeMillis());
-        multiPacket.setByteBuf(byteBuf);
-        return multiPacket;
-    }
-
-    @Override
-    public String toString() {
-        return "MultiPacket{" +
-                "消息头=" + header +
-                ", 包序号=" + number +
-                ", 分包数量=" + count +
-                '}';
-    }
-}

src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/MultiPacketManager.java

@@ -2,16 +2,16 @@ package com.genersoft.iot.vmp.jt1078.codec.decode;
 
 import com.genersoft.iot.vmp.jt1078.proc.Header;
 import io.netty.buffer.*;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+@Slf4j
 public enum MultiPacketManager {
     INSTANCE;
-    private final static Logger logger = LoggerFactory.getLogger(MultiPacketManager.class);
-
     // 用与消息的缓存
     private final Map<String, CompositeByteBuf> packetMap = new ConcurrentHashMap<>();
     private final Map<String, Long> packetTimeMap = new ConcurrentHashMap<>();
@@ -47,7 +47,7 @@ public enum MultiPacketManager {
                 if (!packetTimeMap.isEmpty()) {
                     for (String key : packetTimeMap.keySet()) {
                         if (packetTimeMap.get(key) < expireTime) {
-                            logger.info("分包消息超时 key: {}", key);
+                            log.info("分包消息超时 key: {}", key);
                             packetTimeMap.remove(key);
                             packetMap.remove(key);
                         }

src/main/java/com/genersoft/iot/vmp/jt1078/config/JT1078AutoConfiguration.java

@@ -1,6 +1,5 @@
 package com.genersoft.iot.vmp.jt1078.config;
 
-import com.genersoft.iot.vmp.jt1078.cmd.JT1078Template;
 import com.genersoft.iot.vmp.jt1078.codec.netty.TcpServer;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java

@@ -71,10 +71,6 @@ public class JT1078Controller {
     @Autowired
     private FtpSetting ftpSetting;
 
-    @Qualifier("taskExecutor")
-    @Autowired
-    private ThreadPoolTaskExecutor taskExecutor;
-
     @Operation(summary = "JT-开始点播", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "phoneNumber", description = "设备手机号", required = true)
     @Parameter(name = "channelId", description = "通道编号, 一般为从1开始的数字", required = true)

src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java

@@ -1,6 +1,5 @@
 package com.genersoft.iot.vmp.jt1078.controller;
 
-import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.security.JwtUtils;
 import com.genersoft.iot.vmp.jt1078.bean.*;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
@@ -9,30 +8,23 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 
+@Slf4j
 @ConditionalOnProperty(value = "jt1078.enable", havingValue = "true")
 @RestController
 @Tag(name  = "部标终端以及通道管理")
 @RequestMapping("/api/jt1078/terminal")
 public class JT1078TerminalController {
 
-    private final static Logger logger = LoggerFactory.getLogger(JT1078TerminalController.class);
-
     @Resource
     Ijt1078Service service;
 
-    @Autowired
-    UserSetting userSetting;
-
     @Operation(summary = "JT-分页查询部标设备", security = @SecurityRequirement(name = JwtUtils.HEADER))
     @Parameter(name = "page", description = "当前页", required = true)
     @Parameter(name = "count", description = "每页查询数量", required = true)

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/ConfirmationAlarmMessageParam.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.controller.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.JTConfirmationAlarmMessageType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 人工确认报警消息参数
  */
+@Setter
+@Getter
 @Schema(description = "人工确认报警消息参数")
 public class ConfirmationAlarmMessageParam {
 
@@ -16,30 +20,6 @@ public class ConfirmationAlarmMessageParam {
     @Schema(description = "人工确认报警类型")
     private JTConfirmationAlarmMessageType alarmMessageType;
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String PhoneNumber) {
-        this.phoneNumber = PhoneNumber;
-    }
-
-    public JTConfirmationAlarmMessageType getAlarmMessageType() {
-        return alarmMessageType;
-    }
-
-    public void setAlarmMessageType(JTConfirmationAlarmMessageType alarmMessageType) {
-        this.alarmMessageType = alarmMessageType;
-    }
-
-    public int getAlarmPackageNo() {
-        return alarmPackageNo;
-    }
-
-    public void setAlarmPackageNo(int alarmPackageNo) {
-        this.alarmPackageNo = alarmPackageNo;
-    }
-
     @Override
     public String toString() {
         return "ConfirmationAlarmMessageParam{" +

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/ConnectionControlParam.java

@@ -2,29 +2,17 @@ package com.genersoft.iot.vmp.jt1078.controller.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.JTDeviceConnectionControl;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 public class ConnectionControlParam {
 
     @Schema(description = "终端手机号")
     private String phoneNumber;
     private JTDeviceConnectionControl control;
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public JTDeviceConnectionControl getControl() {
-        return control;
-    }
-
-    public void setControl(JTDeviceConnectionControl control) {
-        this.control = control;
-    }
-
     @Override
     public String toString() {
         return "ConnectionControlParam{" +

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/SetAreaParam.java

@@ -2,9 +2,13 @@ package com.genersoft.iot.vmp.jt1078.controller.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.*;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
+@Setter
+@Getter
 @Schema(description = "设置区域参数")
 public class SetAreaParam {
 
@@ -24,46 +28,6 @@ public class SetAreaParam {
     private JTRoute route;
 
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public List<JTCircleArea> getCircleAreaList() {
-        return circleAreaList;
-    }
-
-    public void setCircleAreaList(List<JTCircleArea> circleAreaList) {
-        this.circleAreaList = circleAreaList;
-    }
-
-    public List<JTRectangleArea> getRectangleAreas() {
-        return rectangleAreas;
-    }
-
-    public void setRectangleAreas(List<JTRectangleArea> rectangleAreas) {
-        this.rectangleAreas = rectangleAreas;
-    }
-
-    public JTPolygonArea getPolygonArea() {
-        return polygonArea;
-    }
-
-    public void setPolygonArea(JTPolygonArea polygonArea) {
-        this.polygonArea = polygonArea;
-    }
-
-    public JTRoute getRoute() {
-        return route;
-    }
-
-    public void setRoute(JTRoute route) {
-        this.route = route;
-    }
-
     @Override
     public String toString() {
         return "SetAreaParam{" +

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/SetConfigParam.java

@@ -2,7 +2,11 @@ package com.genersoft.iot.vmp.jt1078.controller.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.JTDeviceConfig;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
+@Setter
+@Getter
 @Schema(description = "终端参数设置")
 public class SetConfigParam {
 
@@ -12,22 +16,6 @@ public class SetConfigParam {
     @Schema(description = "终端参数设置")
     private JTDeviceConfig config;
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public JTDeviceConfig getConfig() {
-        return config;
-    }
-
-    public void setConfig(JTDeviceConfig config) {
-        this.config = config;
-    }
-
     @Override
     public String toString() {
         return "SetConfigParam{" +

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/SetPhoneBookParam.java

@@ -3,9 +3,13 @@ package com.genersoft.iot.vmp.jt1078.controller.bean;
 import com.genersoft.iot.vmp.jt1078.bean.JTPhoneBookContact;
 import com.genersoft.iot.vmp.jt1078.bean.JTTextSign;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
+@Setter
+@Getter
 @Schema(description = "设置电话本")
 public class SetPhoneBookParam {
 
@@ -22,30 +26,6 @@ public class SetPhoneBookParam {
     @Schema(description = "联系人")
     private List<JTPhoneBookContact> phoneBookContactList;
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public List<JTPhoneBookContact> getPhoneBookContactList() {
-        return phoneBookContactList;
-    }
-
-    public void setPhoneBookContactList(List<JTPhoneBookContact> phoneBookContactList) {
-        this.phoneBookContactList = phoneBookContactList;
-    }
-
     @Override
     public String toString() {
         return "SetPhoneBookParam{" +

src/main/java/com/genersoft/iot/vmp/jt1078/controller/bean/TextMessageParam.java

@@ -2,10 +2,14 @@ package com.genersoft.iot.vmp.jt1078.controller.bean;
 
 import com.genersoft.iot.vmp.jt1078.bean.JTTextSign;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 文本信息下发参数
  */
+@Setter
+@Getter
 @Schema(description = "人工确认报警消息参数")
 public class TextMessageParam {
 
@@ -18,38 +22,6 @@ public class TextMessageParam {
     @Schema(description = "消息内容，最长为1024字节")
     private String content;
 
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public int getTextType() {
-        return textType;
-    }
-
-    public void setTextType(int textType) {
-        this.textType = textType;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public JTTextSign getSign() {
-        return sign;
-    }
-
-    public void setSign(JTTextSign sign) {
-        this.sign = sign;
-    }
-
     @Override
     public String toString() {
         return "TextMessageParam{" +

src/main/java/com/genersoft/iot/vmp/jt1078/event/ConnectChangeEvent.java

@@ -1,6 +1,8 @@
 package com.genersoft.iot.vmp.jt1078.event;
 
 import com.genersoft.iot.vmp.jt1078.bean.JTDevice;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 import java.time.Clock;
@@ -9,10 +11,10 @@ import java.time.Clock;
  * 链接断或者连接的事件
  */
 
+@Setter
+@Getter
 public class ConnectChangeEvent extends ApplicationEvent {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     public ConnectChangeEvent(Object source) {
@@ -24,19 +26,4 @@ public class ConnectChangeEvent extends ApplicationEvent {
 
     private String phoneNumber;
 
-    public boolean isConnected() {
-        return connected;
-    }
-
-    public void setConnected(boolean connected) {
-        this.connected = connected;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/event/FtpUploadEvent.java

@@ -1,7 +1,11 @@
 package com.genersoft.iot.vmp.jt1078.event;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
+@Setter
+@Getter
 public class FtpUploadEvent extends ApplicationEvent {
 
     public FtpUploadEvent(Object source) {
@@ -10,11 +14,4 @@ public class FtpUploadEvent extends ApplicationEvent {
 
     private String fileName;
 
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/event/MediaFileUploadEvent.java

@@ -1,22 +0,0 @@
-package com.genersoft.iot.vmp.jt1078.event;
-
-import com.genersoft.iot.vmp.jt1078.bean.JTMediaEventInfo;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.context.ApplicationEvent;
-
-public class MediaFileUploadEvent extends ApplicationEvent {
-
-    public MediaFileUploadEvent(Object source) {
-        super(source);
-    }
-
-    @Getter
-    @Setter
-    private JTMediaEventInfo mediaEventInfo;
-
-    @Getter
-    @Setter
-    private byte[] bytes;
-}

src/main/java/com/genersoft/iot/vmp/jt1078/event/RegisterEvent.java

@@ -1,6 +1,5 @@
 package com.genersoft.iot.vmp.jt1078.event;
 
-import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
 import com.genersoft.iot.vmp.jt1078.bean.JTDevice;
 import lombok.Getter;
 import lombok.Setter;
@@ -9,11 +8,8 @@ import org.springframework.context.ApplicationEvent;
 /**
  * 注册事件
  */
-
 public class RegisterEvent extends ApplicationEvent {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = 1L;
 
     public RegisterEvent(Object source) {

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0001.java

@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
+import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 
 /**
@@ -17,6 +18,7 @@ import org.springframework.context.ApplicationEvent;
  * @date 2023/4/27 18:04
  * @email qingtaij@163.com
  */
+@Getter
 @MsgId(id = "0001")
 public class J0001 extends Re {
     int respNo;
@@ -40,18 +42,6 @@ public class J0001 extends Re {
         return null;
     }
 
-    public int getRespNo() {
-        return respNo;
-    }
-
-    public String getRespId() {
-        return respId;
-    }
-
-    public int getResult() {
-        return result;
-    }
-
     @Override
     public ApplicationEvent getEvent() {
         return null;

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0002.java

@@ -7,6 +7,7 @@ import com.genersoft.iot.vmp.jt1078.proc.response.Rs;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEvent;
 
 /**
@@ -16,6 +17,7 @@ import org.springframework.context.ApplicationEvent;
  * @date 2023/4/27 18:04
  * @email qingtaij@163.com
  */
+@Slf4j
 @MsgId(id = "0002")
 public class J0002 extends Re {
     @Override
@@ -25,6 +27,7 @@ public class J0002 extends Re {
 
     @Override
     protected Rs handler(Header header, Session session, Ijt1078Service service) {
+        log.info("[终端心跳] {}", header.getPhoneNumber());
         J8001 j8001 = new J8001();
         j8001.setRespNo(header.getSn());
         j8001.setRespId(header.getMsgId());

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0003.java

@@ -8,17 +8,18 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEvent;
 
 /**
  * 终端注销
  */
+@Slf4j
+@Getter
 @MsgId(id = "0003")
 public class J0003 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0003.class);
     int respNo;
     String respId;
     int result;
@@ -38,18 +39,6 @@ public class J0003 extends Re {
         return null;
     }
 
-    public int getRespNo() {
-        return respNo;
-    }
-
-    public String getRespId() {
-        return respId;
-    }
-
-    public int getResult() {
-        return result;
-    }
-
     @Override
     public ApplicationEvent getEvent() {
         return null;

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java

@@ -12,6 +12,7 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.utils.CivilCodeUtil;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -27,10 +28,10 @@ import java.util.UUID;
  * @date 2023/4/27 18:06
  * @email qingtaij@163.com
  */
+@Slf4j
 @MsgId(id = "0100")
 public class J0100 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0100.class);
     private JTDevice device;
 
     @Override

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0107.java

@@ -10,6 +10,7 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import com.genersoft.iot.vmp.jt1078.util.BCDUtil;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -20,6 +21,7 @@ import java.nio.charset.Charset;
  * 查询终端属性应答
  *
  */
+@Slf4j
 @MsgId(id = "0107")
 public class J0107 extends Re {
 
@@ -54,7 +56,7 @@ public class J0107 extends Re {
 
         deviceAttribute.setGnssAttribute(JTGnssAttribute.getInstance(buf.readUnsignedByte()));
         deviceAttribute.setCommunicationModuleAttribute(JTCommunicationModuleAttribute.getInstance(buf.readUnsignedByte()));
-
+        log.info("[查询终端属性应答] {}， {}", header.getPhoneNumber(), deviceAttribute);
         SessionManager.INSTANCE.response(header.getPhoneNumber(), "0107", null, deviceAttribute);
         return null;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0200.java

@@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.jt1078.proc.response.Rs;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -16,16 +17,16 @@ import org.springframework.context.ApplicationEvent;
  * 位置信息汇报
  *
  */
+@Slf4j
 @MsgId(id = "0200")
 public class J0200 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0100.class);
     private JTPositionBaseInfo positionInfo;
 
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
         positionInfo = JTPositionBaseInfo.decode(buf);
-
+        log.info("[JT-位置汇报]: phoneNumber={}  {}", header.getPhoneNumber(), positionInfo.toSimpleString());
         // 读取附加信息
 //        JTPositionAdditionalInfo positionAdditionalInfo = new JTPositionAdditionalInfo();
 //        Map<Integer, byte[]> additionalMsg = new HashMap<>();

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0201.java

@@ -32,7 +32,7 @@ public class J0201 extends Re {
         int respNo = buf.readUnsignedShort();
 
         positionInfo = JTPositionBaseInfo.decode(buf);
-        log.info("[JT-位置信息查询应答]: {}", positionInfo.toString());
+        log.info("[JT-位置信息查询应答]: {}", positionInfo);
         SessionManager.INSTANCE.response(header.getPhoneNumber(), "0201", (long) respNo, positionInfo);
         return null;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0500.java

@@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -17,16 +18,17 @@ import org.springframework.context.ApplicationEvent;
  * 车辆控制应答
  *
  */
+@Slf4j
 @MsgId(id = "0500")
 public class J0500 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0100.class);
     private JTPositionBaseInfo positionInfo;
 
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
         int respNo = buf.readUnsignedShort();
         positionInfo = JTPositionBaseInfo.decode(buf);
+        log.info("[车辆控制应答] {}", header.getPhoneNumber());
         SessionManager.INSTANCE.response(header.getPhoneNumber(), "0500", (long) respNo, positionInfo);
         return null;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0608.java

@@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -18,14 +19,11 @@ import java.util.List;
 
 /**
  * 查询区域或线路数据应答
- *
  */
+@Slf4j
 @MsgId(id = "0608")
 public class J0608 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0100.class);
-    private JTPositionBaseInfo positionInfo;
-
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
         int type = buf.readByte();

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0702.java

@@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -17,15 +18,13 @@ import org.springframework.context.ApplicationEvent;
  * 驾驶员身份信息采集上报
  *
  */
+@Slf4j
 @MsgId(id = "0702")
 public class J0702 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0100.class);
-    private JTDriverInformation driverInformation;
-
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
-        driverInformation = JTDriverInformation.decode(buf, header.is2019Version());
+        JTDriverInformation driverInformation = JTDriverInformation.decode(buf, header.is2019Version());
         log.info("[JT-驾驶员身份信息采集上报]: {}", driverInformation.toString());
         SessionManager.INSTANCE.response(header.getPhoneNumber(), "0702", null, driverInformation);
         return null;

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0704.java

@@ -10,6 +10,7 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -19,19 +20,17 @@ import java.util.List;
 
 /**
  * 定位数据批量上传
- *
  */
+@Slf4j
 @MsgId(id = "0704")
 public class J0704 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0704.class);
-    private List<JTPositionBaseInfo> positionBaseInfoList = new ArrayList<>();
-    private int type;
+    private final List<JTPositionBaseInfo> positionBaseInfoList = new ArrayList<>();
 
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
         int length = buf.readUnsignedShort();
-        type = buf.readUnsignedByte();
+        int type = buf.readUnsignedByte();
         for (int i = 0; i < length; i++) {
             int dateLength = buf.readUnsignedShort();
             ByteBuf byteBuf = buf.readBytes(dateLength);

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0800.java

@@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.jt1078.proc.response.Rs;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -20,16 +21,13 @@ import java.util.List;
  * 多媒体事件信息上传
  *
  */
+@Slf4j
 @MsgId(id = "0800")
 public class J0800 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0800.class);
-
-    private JTMediaEventInfo mediaEventInfo;
-
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
-        mediaEventInfo = JTMediaEventInfo.decode(buf);
+        JTMediaEventInfo mediaEventInfo = JTMediaEventInfo.decode(buf);
         log.info("[JT-多媒体事件信息上传]: {}", mediaEventInfo);
         return null;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0801.java

@@ -10,6 +10,7 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -22,31 +23,29 @@ import java.io.IOException;
 
 /**
  * 多媒体数据上传
- *
  */
+@Slf4j
 @MsgId(id = "0801")
 public class J0801 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0801.class);
-
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
         JTMediaEventInfo mediaEventInfo = JTMediaEventInfo.decode(buf);
         log.info("[JT-多媒体数据上传]: {}", mediaEventInfo);
-        try {
-            if (mediaEventInfo.getMediaData() != null) {
-                File file = new File("/home/lin/source.jpg");
-                if (file.exists()) {
-                    file.delete();
-                }
-                FileOutputStream fileOutputStream = new FileOutputStream(file);
-                fileOutputStream.write(mediaEventInfo.getMediaData());
-                fileOutputStream.flush();
-                fileOutputStream.close();
-            }
-        }catch (Exception e) {
-            log.error("[JT-多媒体数据上传] 写入文件异常", e);
-        }
+//        try {
+//            if (mediaEventInfo.getMediaData() != null) {
+//                File file = new File("/home/lin/source.jpg");
+//                if (file.exists()) {
+//                    file.delete();
+//                }
+//                FileOutputStream fileOutputStream = new FileOutputStream(file);
+//                fileOutputStream.write(mediaEventInfo.getMediaData());
+//                fileOutputStream.flush();
+//                fileOutputStream.close();
+//            }
+//        }catch (Exception e) {
+//            log.error("[JT-多媒体数据上传] 写入文件异常", e);
+//        }
         SessionManager.INSTANCE.response(header.getPhoneNumber(), "0801", null, mediaEventInfo);
         return null;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0802.java

@@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationEvent;
@@ -20,24 +21,20 @@ import java.util.List;
  * 存储多媒体数据检索应答
  *
  */
+@Slf4j
 @MsgId(id = "0802")
 public class J0802 extends Re {
 
-    private final static Logger log = LoggerFactory.getLogger(J0802.class);
-
-    private int respNo;
-    private List<JTMediaDataInfo> mediaDataInfoList;
-
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
-        respNo = buf.readUnsignedShort();
+        int respNo = buf.readUnsignedShort();
         int length = buf.readUnsignedShort();
         if (length == 0) {
             log.info("[JT-存储多媒体数据检索应答]: {}", length);
             SessionManager.INSTANCE.response(header.getPhoneNumber(), "0802", (long) respNo, new ArrayList<>());
             return null;
         }
-        mediaDataInfoList = new ArrayList<>(length);
+        List<JTMediaDataInfo> mediaDataInfoList = new ArrayList<>(length);
         for (int i = 0; i < length; i++) {
             mediaDataInfoList.add(JTMediaDataInfo.decode(buf));
         }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0805.java

@@ -7,6 +7,8 @@ import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 import java.util.ArrayList;
@@ -15,6 +17,8 @@ import java.util.List;
 /**
  * 摄像头立即拍摄命令应答
  */
+@Setter
+@Getter
 @MsgId(id = "0805")
 public class J0805 extends Re {
 
@@ -49,30 +53,6 @@ public class J0805 extends Re {
         return null;
     }
 
-    public int getRespNo() {
-        return respNo;
-    }
-
-    public void setRespNo(int respNo) {
-        this.respNo = respNo;
-    }
-
-    public int getResult() {
-        return result;
-    }
-
-    public void setResult(int result) {
-        this.result = result;
-    }
-
-    public List<Long> getIds() {
-        return ids;
-    }
-
-    public void setIds(List<Long> ids) {
-        this.ids = ids;
-    }
-
     @Override
     public ApplicationEvent getEvent() {
         return null;

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0900.java

@@ -9,11 +9,15 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 /**
  * 数据上行透传
  */
+@Setter
+@Getter
 @MsgId(id = "0900")
 public class J0900 extends Re {
 
@@ -48,19 +52,4 @@ public class J0900 extends Re {
         return null;
     }
 
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public byte[] getContent() {
-        return content;
-    }
-
-    public void setContent(byte[] content) {
-        this.content = content;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0901.java

@@ -7,11 +7,15 @@ import com.genersoft.iot.vmp.jt1078.proc.response.Rs;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 /**
  * 数据压缩上报
  */
+@Setter
+@Getter
 @MsgId(id = "0901")
 public class J0901 extends Re {
 
@@ -46,19 +50,4 @@ public class J0901 extends Re {
         return null;
     }
 
-    public Long getE() {
-        return e;
-    }
-
-    public void setE(Long e) {
-        this.e = e;
-    }
-
-    public byte[] getN() {
-        return n;
-    }
-
-    public void setN(byte[] n) {
-        this.n = n;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0A00.java

@@ -7,11 +7,15 @@ import com.genersoft.iot.vmp.jt1078.proc.response.Rs;
 import com.genersoft.iot.vmp.jt1078.service.Ijt1078Service;
 import com.genersoft.iot.vmp.jt1078.session.Session;
 import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 /**
  * 终端 RSA公钥
  */
+@Setter
+@Getter
 @MsgId(id = "0900")
 public class J0A00 extends Re {
 
@@ -47,19 +51,4 @@ public class J0A00 extends Re {
         return null;
     }
 
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public byte[] getContent() {
-        return content;
-    }
-
-    public void setContent(byte[] content) {
-        this.content = content;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J1205.java

@@ -10,6 +10,8 @@ import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 import java.util.ArrayList;
@@ -22,11 +24,14 @@ import java.util.List;
  * @date 2023/4/28 10:36
  * @email qingtaij@163.com
  */
+@Setter
+@Getter
 @MsgId(id = "1205")
 public class J1205 extends Re {
+
     Integer respNo;
 
-    private List<JRecordItem> recordList = new ArrayList<JRecordItem>();
+    private List<JRecordItem> recordList = new ArrayList<>();
 
     @Override
     protected Rs decode0(ByteBuf buf, Header header, Session session) {
@@ -61,22 +66,8 @@ public class J1205 extends Re {
     }
 
 
-    public Integer getRespNo() {
-        return respNo;
-    }
-
-    public void setRespNo(Integer respNo) {
-        this.respNo = respNo;
-    }
-
-    public List<JRecordItem> getRecordList() {
-        return recordList;
-    }
-
-    public void setRecordList(List<JRecordItem> recordList) {
-        this.recordList = recordList;
-    }
-
+    @Setter
+    @Getter
     public static class JRecordItem {
 
         // 逻辑通道号
@@ -103,70 +94,6 @@ public class J1205 extends Re {
         // 文件大小
         private long size;
 
-        public int getChannelId() {
-            return channelId;
-        }
-
-        public void setChannelId(int channelId) {
-            this.channelId = channelId;
-        }
-
-        public String getStartTime() {
-            return startTime;
-        }
-
-        public void setStartTime(String startTime) {
-            this.startTime = startTime;
-        }
-
-        public String getEndTime() {
-            return endTime;
-        }
-
-        public void setEndTime(String endTime) {
-            this.endTime = endTime;
-        }
-
-        public long getAlarmSign() {
-            return alarmSign;
-        }
-
-        public void setAlarmSign(long alarmSign) {
-            this.alarmSign = alarmSign;
-        }
-
-        public int getMediaType() {
-            return mediaType;
-        }
-
-        public void setMediaType(int mediaType) {
-            this.mediaType = mediaType;
-        }
-
-        public int getStreamType() {
-            return streamType;
-        }
-
-        public void setStreamType(int streamType) {
-            this.streamType = streamType;
-        }
-
-        public int getStorageType() {
-            return storageType;
-        }
-
-        public void setStorageType(int storageType) {
-            this.storageType = storageType;
-        }
-
-        public long getSize() {
-            return size;
-        }
-
-        public void setSize(long size) {
-            this.size = size;
-        }
-
         @Override
         public String toString() {
             return "JRecordItem{" +

src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J1206.java

@@ -10,6 +10,8 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
 import com.genersoft.iot.vmp.jt1078.session.SessionManager;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.ApplicationEvent;
 
 import java.util.ArrayList;
@@ -19,8 +21,11 @@ import java.util.List;
  * 文件上传完成通知
  *
  */
+@Setter
+@Getter
 @MsgId(id = "1206")
 public class J1206 extends Re {
+
     Integer respNo;
 
     // 0：成功； 1：失败
@@ -43,23 +48,6 @@ public class J1206 extends Re {
     }
 
 
-    public Integer getRespNo() {
-        return respNo;
-    }
-
-    public void setRespNo(Integer respNo) {
-        this.respNo = respNo;
-    }
-
-    public int getResult() {
-        return result;
-    }
-
-    public void setResult(int result) {
-        this.result = result;
-    }
-
-
     @Override
     public String toString() {
         return "J1206{" +

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8001.java

@@ -4,12 +4,14 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
+import lombok.Setter;
 
 /**
  * @author QingtaiJiang
  * @date 2023/4/27 18:48
  * @email qingtaij@163.com
  */
+@Setter
 @MsgId(id = "8001")
 public class J8001 extends Rs {
 
@@ -36,15 +38,4 @@ public class J8001 extends Rs {
     }
 
 
-    public void setRespNo(Integer respNo) {
-        this.respNo = respNo;
-    }
-
-    public void setRespId(String respId) {
-        this.respId = respId;
-    }
-
-    public void setResult(Integer result) {
-        this.result = result;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8100.java

@@ -4,12 +4,14 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.CharsetUtil;
+import lombok.Setter;
 
 /**
  * @author QingtaiJiang
  * @date 2023/4/27 18:40
  * @email qingtaij@163.com
  */
+@Setter
 @MsgId(id = "8100")
 public class J8100 extends Rs {
     /**
@@ -35,15 +37,4 @@ public class J8100 extends Rs {
         return buffer;
     }
 
-    public void setRespNo(Integer respNo) {
-        this.respNo = respNo;
-    }
-
-    public void setResult(Integer result) {
-        this.result = result;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8103.java

@@ -7,6 +7,7 @@ import com.genersoft.iot.vmp.jt1078.bean.config.*;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,6 +24,7 @@ import java.util.Map;
 /**
  * 设置终端参数
  */
+@Getter
 @MsgId(id = "8103")
 public class J8103 extends Rs {
 
@@ -112,10 +114,6 @@ public class J8103 extends Rs {
         return buffer;
     }
 
-    public JTDeviceConfig getConfig() {
-        return config;
-    }
-
     public void setConfig(JTDeviceConfig config) {
         this.config = config;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8104.java

@@ -14,8 +14,7 @@ public class J8104 extends Rs {
 
     @Override
     public ByteBuf encode() {
-        ByteBuf buffer = Unpooled.buffer();
-        return buffer;
+        return Unpooled.buffer();
     }
 
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8105.java

@@ -4,6 +4,7 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTDeviceConnectionControl;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -11,6 +12,7 @@ import java.util.Arrays;
 /**
  * 终端控制
  */
+@Getter
 @MsgId(id = "8105")
 public class J8105 extends Rs {
 
@@ -56,26 +58,14 @@ public class J8105 extends Rs {
         return byteBuf;
     }
 
-    public JTDeviceConnectionControl getConnectionControl() {
-        return connectionControl;
-    }
-
     public void setConnectionControl(JTDeviceConnectionControl connectionControl) {
         this.connectionControl = connectionControl;
     }
 
-    public Boolean getReset() {
-        return reset;
-    }
-
     public void setReset(Boolean reset) {
         this.reset = reset;
     }
 
-    public Boolean getFactoryReset() {
-        return factoryReset;
-    }
-
     public void setFactoryReset(Boolean factoryReset) {
         this.factoryReset = factoryReset;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8106.java

@@ -4,12 +4,14 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.CharsetUtil;
+import lombok.Getter;
 
 import java.util.Arrays;
 
 /**
  * 查询指定终端参数
  */
+@Getter
 @MsgId(id = "8106")
 public class J8106 extends Rs {
 
@@ -25,10 +27,6 @@ public class J8106 extends Rs {
         return buffer;
     }
 
-    public long[] getParams() {
-        return params;
-    }
-
     public void setParams(long[] params) {
         this.params = params;
     }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8107.java

@@ -12,8 +12,7 @@ public class J8107 extends Rs {
 
     @Override
     public ByteBuf encode() {
-        ByteBuf buffer = Unpooled.buffer();
-        return buffer;
+        return Unpooled.buffer();
     }
 
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8201.java

@@ -12,8 +12,7 @@ public class J8201 extends Rs {
 
     @Override
     public ByteBuf encode() {
-        ByteBuf buffer = Unpooled.buffer();
-        return buffer;
+        return Unpooled.buffer();
     }
 
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8202.java

@@ -3,10 +3,14 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 临时位置跟踪控制
  */
+@Setter
+@Getter
 @MsgId(id = "8202")
 public class J8202 extends Rs {
 
@@ -30,19 +34,4 @@ public class J8202 extends Rs {
         return buffer;
     }
 
-    public int getTimeInterval() {
-        return timeInterval;
-    }
-
-    public void setTimeInterval(int timeInterval) {
-        this.timeInterval = timeInterval;
-    }
-
-    public long getValidityPeriod() {
-        return validityPeriod;
-    }
-
-    public void setValidityPeriod(long validityPeriod) {
-        this.validityPeriod = validityPeriod;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8203.java

@@ -4,10 +4,14 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTConfirmationAlarmMessageType;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 人工确认报警消息
  */
+@Setter
+@Getter
 @MsgId(id = "8203")
 public class J8203 extends Rs {
 
@@ -30,19 +34,4 @@ public class J8203 extends Rs {
         return buffer;
     }
 
-    public int getAlarmPackageNo() {
-        return alarmPackageNo;
-    }
-
-    public void setAlarmPackageNo(int alarmPackageNo) {
-        this.alarmPackageNo = alarmPackageNo;
-    }
-
-    public JTConfirmationAlarmMessageType getAlarmMessageType() {
-        return alarmMessageType;
-    }
-
-    public void setAlarmMessageType(JTConfirmationAlarmMessageType alarmMessageType) {
-        this.alarmMessageType = alarmMessageType;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8204.java

@@ -12,8 +12,7 @@ public class J8204 extends Rs {
 
     @Override
     public ByteBuf encode() {
-        ByteBuf buffer = Unpooled.buffer();
-        return buffer;
+        return Unpooled.buffer();
     }
 
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8400.java

@@ -4,12 +4,16 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTTextSign;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 
 /**
  * 电话回拨
  */
+@Setter
+@Getter
 @MsgId(id = "8400")
 public class J8400 extends Rs {
 
@@ -31,19 +35,4 @@ public class J8400 extends Rs {
         return buffer;
     }
 
-    public int getSign() {
-        return sign;
-    }
-
-    public void setSign(int sign) {
-        this.sign = sign;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8401.java

@@ -4,6 +4,8 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTPhoneBookContact;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.nio.charset.Charset;
 import java.util.List;
@@ -11,6 +13,8 @@ import java.util.List;
 /**
  * 设置电话本
  */
+@Setter
+@Getter
 @MsgId(id = "8401")
 public class J8401 extends Rs {
 
@@ -43,19 +47,4 @@ public class J8401 extends Rs {
         return buffer;
     }
 
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public List<JTPhoneBookContact> getPhoneBookContactList() {
-        return phoneBookContactList;
-    }
-
-    public void setPhoneBookContactList(List<JTPhoneBookContact> phoneBookContactList) {
-        this.phoneBookContactList = phoneBookContactList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8500.java

@@ -7,6 +7,8 @@ import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute;
 import com.genersoft.iot.vmp.jt1078.bean.config.JTDeviceSubConfig;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.lang.reflect.Field;
 import java.nio.charset.Charset;
@@ -17,6 +19,8 @@ import java.util.Map;
 /**
  * 车辆控制
  */
+@Setter
+@Getter
 @MsgId(id = "8500")
 public class J8500 extends Rs {
 
@@ -60,11 +64,4 @@ public class J8500 extends Rs {
         return buffer;
     }
 
-    public JTVehicleControl getVehicleControl() {
-        return vehicleControl;
-    }
-
-    public void setVehicleControl(JTVehicleControl vehicleControl) {
-        this.vehicleControl = vehicleControl;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8600.java

@@ -6,6 +6,8 @@ import com.genersoft.iot.vmp.jt1078.bean.JTVehicleControl;
 import com.genersoft.iot.vmp.jt1078.bean.common.ConfigAttribute;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -13,6 +15,8 @@ import java.util.List;
 /**
  * 设置圆形区域
  */
+@Setter
+@Getter
 @MsgId(id = "8600")
 public class J8600 extends Rs {
 
@@ -41,19 +45,4 @@ public class J8600 extends Rs {
         return buffer;
     }
 
-    public int getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(int attribute) {
-        this.attribute = attribute;
-    }
-
-    public List<JTCircleArea> getCircleAreaList() {
-        return circleAreaList;
-    }
-
-    public void setCircleAreaList(List<JTCircleArea> circleAreaList) {
-        this.circleAreaList = circleAreaList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8601.java

@@ -4,12 +4,16 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTCircleArea;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 删除圆形区域
  */
+@Setter
+@Getter
 @MsgId(id = "8601")
 public class J8601 extends Rs {
 
@@ -35,11 +39,4 @@ public class J8601 extends Rs {
         return buffer;
     }
 
-    public List<Long> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8602.java

@@ -5,12 +5,16 @@ import com.genersoft.iot.vmp.jt1078.bean.JTCircleArea;
 import com.genersoft.iot.vmp.jt1078.bean.JTRectangleArea;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 设置矩形区域
  */
+@Setter
+@Getter
 @MsgId(id = "8602")
 public class J8602 extends Rs {
 
@@ -39,19 +43,4 @@ public class J8602 extends Rs {
         return buffer;
     }
 
-    public int getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(int attribute) {
-        this.attribute = attribute;
-    }
-
-    public List<JTRectangleArea> getRectangleAreas() {
-        return rectangleAreas;
-    }
-
-    public void setRectangleAreas(List<JTRectangleArea> rectangleAreas) {
-        this.rectangleAreas = rectangleAreas;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8603.java

@@ -3,12 +3,16 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 删除矩形区域
  */
+@Setter
+@Getter
 @MsgId(id = "8603")
 public class J8603 extends Rs {
 
@@ -34,11 +38,4 @@ public class J8603 extends Rs {
         return buffer;
     }
 
-    public List<Long> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8604.java

@@ -5,12 +5,16 @@ import com.genersoft.iot.vmp.jt1078.bean.JTPolygonArea;
 import com.genersoft.iot.vmp.jt1078.bean.JTRectangleArea;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 设置多边形区域
  */
+@Setter
+@Getter
 @MsgId(id = "8604")
 public class J8604 extends Rs {
 
@@ -27,11 +31,4 @@ public class J8604 extends Rs {
         return buffer;
     }
 
-    public JTPolygonArea getPolygonArea() {
-        return polygonArea;
-    }
-
-    public void setPolygonArea(JTPolygonArea polygonArea) {
-        this.polygonArea = polygonArea;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8605.java

@@ -3,12 +3,16 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 删除多边形区域
  */
+@Setter
+@Getter
 @MsgId(id = "8605")
 public class J8605 extends Rs {
 
@@ -34,11 +38,4 @@ public class J8605 extends Rs {
         return buffer;
     }
 
-    public List<Long> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8606.java

@@ -5,10 +5,14 @@ import com.genersoft.iot.vmp.jt1078.bean.JTPolygonArea;
 import com.genersoft.iot.vmp.jt1078.bean.JTRoute;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 设置路线
  */
+@Setter
+@Getter
 @MsgId(id = "8606")
 public class J8606 extends Rs {
 
@@ -25,11 +29,4 @@ public class J8606 extends Rs {
         return buffer;
     }
 
-    public JTRoute getRoute() {
-        return route;
-    }
-
-    public void setRoute(JTRoute route) {
-        this.route = route;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8607.java

@@ -3,12 +3,16 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 删除路线
  */
+@Setter
+@Getter
 @MsgId(id = "8607")
 public class J8607 extends Rs {
 
@@ -34,11 +38,4 @@ public class J8607 extends Rs {
         return buffer;
     }
 
-    public List<Long> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8608.java

@@ -3,12 +3,16 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 查询区域或线路数据
  */
+@Setter
+@Getter
 @MsgId(id = "8608")
 public class J8608 extends Rs {
 
@@ -41,19 +45,4 @@ public class J8608 extends Rs {
         return buffer;
     }
 
-    public int getType() {
-        return type;
-    }
-
-    public void setType(int type) {
-        this.type = type;
-    }
-
-    public List<Long> getIdList() {
-        return idList;
-    }
-
-    public void setIdList(List<Long> idList) {
-        this.idList = idList;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8702.java

@@ -12,8 +12,7 @@ public class J8702 extends Rs {
 
     @Override
     public ByteBuf encode() {
-        ByteBuf buffer = Unpooled.buffer();
-        return buffer;
+        return Unpooled.buffer();
     }
 
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8801.java

@@ -5,12 +5,16 @@ import com.genersoft.iot.vmp.jt1078.bean.JTShootingCommand;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.List;
 
 /**
  * 摄像头立即拍摄命令
  */
+@Setter
+@Getter
 @MsgId(id = "8801")
 public class J8801 extends Rs {
 
@@ -21,11 +25,4 @@ public class J8801 extends Rs {
         return command.decode();
     }
 
-    public JTShootingCommand getCommand() {
-        return command;
-    }
-
-    public void setCommand(JTShootingCommand command) {
-        this.command = command;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8802.java

@@ -4,10 +4,14 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTQueryMediaDataCommand;
 import com.genersoft.iot.vmp.jt1078.bean.JTShootingCommand;
 import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 存储多媒体数据检索
  */
+@Setter
+@Getter
 @MsgId(id = "8802")
 public class J8802 extends Rs {
 
@@ -18,11 +22,4 @@ public class J8802 extends Rs {
         return command.decode();
     }
 
-    public JTQueryMediaDataCommand getCommand() {
-        return command;
-    }
-
-    public void setCommand(JTQueryMediaDataCommand command) {
-        this.command = command;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8803.java

@@ -3,10 +3,14 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTQueryMediaDataCommand;
 import io.netty.buffer.ByteBuf;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 存储多媒体数据上传命令
  */
+@Setter
+@Getter
 @MsgId(id = "8803")
 public class J8803 extends Rs {
 
@@ -17,11 +21,4 @@ public class J8803 extends Rs {
         return command.decode();
     }
 
-    public JTQueryMediaDataCommand getCommand() {
-        return command;
-    }
-
-    public void setCommand(JTQueryMediaDataCommand command) {
-        this.command = command;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8804.java

@@ -4,10 +4,14 @@ import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import com.genersoft.iot.vmp.jt1078.bean.JTQueryMediaDataCommand;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 录音开始/停止命令
  */
+@Setter
+@Getter
 @MsgId(id = "8804")
 public class J8804 extends Rs {
 
@@ -41,35 +45,4 @@ public class J8804 extends Rs {
         return byteBuf;
     }
 
-    public int getCommond() {
-        return commond;
-    }
-
-    public void setCommond(int commond) {
-        this.commond = commond;
-    }
-
-    public int getDuration() {
-        return duration;
-    }
-
-    public void setDuration(int duration) {
-        this.duration = duration;
-    }
-
-    public int getSave() {
-        return save;
-    }
-
-    public void setSave(int save) {
-        this.save = save;
-    }
-
-    public int getSamplingRate() {
-        return samplingRate;
-    }
-
-    public void setSamplingRate(int samplingRate) {
-        this.samplingRate = samplingRate;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8805.java

@@ -5,10 +5,14 @@ import com.genersoft.iot.vmp.jt1078.bean.JTQueryMediaDataCommand;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 单条存储多媒体数据检索上传命令
  */
+@Setter
+@Getter
 @MsgId(id = "8805")
 public class J8805 extends Rs {
 
@@ -30,19 +34,4 @@ public class J8805 extends Rs {
         return byteBuf;
     }
 
-    public Long getMediaId() {
-        return mediaId;
-    }
-
-    public void setMediaId(Long mediaId) {
-        this.mediaId = mediaId;
-    }
-
-    public Integer getDelete() {
-        return delete;
-    }
-
-    public void setDelete(Integer delete) {
-        this.delete = delete;
-    }
 }

src/main/java/com/genersoft/iot/vmp/jt1078/proc/response/J8900.java

@@ -3,10 +3,14 @@ package com.genersoft.iot.vmp.jt1078.proc.response;
 import com.genersoft.iot.vmp.jt1078.annotation.MsgId;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 数据下行透传
  */
+@Setter
+@Getter
 @MsgId(id = "8900")
 public class J8900 extends Rs {
 
@@ -28,19 +32,4 @@ public class J8900 extends Rs {
         return byteBuf;
     }
 
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public byte[] getContent() {
-        return content;
-    }
-
-    public void setContent(byte[] content) {
-        this.content = content;
-    }
 }