代码漏洞修改

zd-modules/zd-algorithm/src/main/java/com/zd/alg/mqtt/entiy/MessageBody.java

@@ -11,7 +11,7 @@ import java.time.format.DateTimeFormatter;
  */
 public class MessageBody<T> {
 
-    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     T data;
 
     String msg;

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -419,7 +419,7 @@ public class LabBoardApi {
         cardNum= HexStrUtils.decode(cardNum);
         logger.info("转换后cardNum:"+cardNum);
         ResultData resultData=remoteDutyService.securityNumList(labId,cardNum);
-        if(resultData==null && resultData.getCode()!=HttpStatus.SUCCESS){
+        if(resultData==null || resultData.getCode()!=HttpStatus.SUCCESS){
             return ResultData.fail("未识别到身份信息，请联系管理人员录入卡号信息");
         }
         Object resultObj=resultData.getData();
@@ -445,7 +445,7 @@ public class LabBoardApi {
         cardNum= HexStrUtils.decode(cardNum);
         logger.info("转换后cardNum:"+cardNum);
         ResultData resultData=remoteDutyService.securityNumList(labId,cardNum);
-        if(resultData==null && resultData.getCode()!=HttpStatus.SUCCESS){
+        if(resultData==null || resultData.getCode()!=HttpStatus.SUCCESS){
             return ResultData.fail("未识别到身份信息，请联系管理人员录入卡号信息");
         }
         Object resultObj=resultData.getData();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabExitLineController.java

@@ -173,7 +173,8 @@ public class LabExitLineController extends BaseController {
     @ApiOperation(value = "获取逃生线路缓存数据")
     @GetMapping(value = "/getRedis")
     public ResultData getRedis() {
-        return ResultData.success(labExitLineService.getRedis());
+        //return ResultData.success(labExitLineService.getRedis());
+        return ResultData.success();
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/entiy/MessageBody.java

@@ -11,7 +11,7 @@ import java.time.format.DateTimeFormatter;
  */
 public class MessageBody<T> {
 
-    public static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     T data;
 
     String msg;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/netty/NettyServer.java

@@ -15,7 +15,7 @@ import javax.annotation.PostConstruct;
 @Slf4j
 @Order(-999)
 public class NettyServer {
-    public static int inetPort = 12323;
+    public static final int inetPort = 12323;
 
     /**
      * Netty 服务端

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageContentServiceImpl.java

@@ -98,7 +98,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
     @Autowired
     private LabHardwareStateMapper hardwareStateMapper;
 
-    public Integer phoneMode;
+    private Integer phoneMode;
 
     @Value("${phoneMode:0}")
     private void setPhoneMode(Integer phoneMode) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabNotifyplanServiceImpl.java

@@ -18,6 +18,8 @@ import com.zd.laboratory.mqtt.service.impl.CommonSend;
 import com.zd.laboratory.service.ILabNotifyplanService;
 import com.zd.model.entity.SysUser;
 import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
@@ -39,6 +41,7 @@ import java.util.Locale;
 @Service
 public class LabNotifyplanServiceImpl implements ILabNotifyplanService
 {
+    private static final Logger logger = LoggerFactory.getLogger(ILabNotifyplanService.class);
     @Autowired
     private LabNotifyplanMapper labNotifyplanMapper;
 
@@ -155,22 +158,20 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
             }
 
         } catch (IOException e) {
-            //e.printStackTrace();
             if(intstream!=null){
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件解析异常："+ex);
                 }
             }
             throw new ServiceException("文件解析异常！");
         } catch (Exception e) {
-            //e.printStackTrace();
             if(intstream!=null){
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件解析异常："+ex);
                 }
             }
             throw new ServiceException("文件解析异常！");
@@ -233,22 +234,20 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
             }
 
         } catch (IOException e) {
-            //e.printStackTrace();
             if(intstream!=null){
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件解析异常！"+ex);
                 }
             }
             throw new ServiceException("文件解析异常！");
         } catch (Exception e) {
-            //e.printStackTrace();
             if(intstream!=null){
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件解析异常！"+ex);
                 }
             }
             throw new ServiceException("文件解析异常！");
@@ -298,12 +297,11 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
                 intstream.close();
             }
         }catch (Exception e) {
-            //e.printStackTrace();
             if(intstream!=null){
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件上传异常："+ex);
                 }
             }
             throw new ServiceException("上传文件格式解析异常！");
@@ -397,17 +395,16 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件解析异常："+ex);
                 }
             }
             throw new ServiceException("文件解析异常！");
         } catch (Exception e) {
-            //e.printStackTrace();
             if(intstream!=null){
                 try {
                     intstream.close();
                 } catch (IOException ex) {
-                    ex.printStackTrace();
+                    logger.error("文件解析异常："+ex);
                 }
             }
             throw new ServiceException("文件解析异常！");