2023-11-9 移除todo注释，以及移除system相关的输出。

zd-api/zd-airbottle-api/src/main/java/com/zd/Main.java

@@ -7,6 +7,5 @@ package com.zd;
  */
 public class Main {
     public static void main(String[] args) {
-        System.out.println("Hello world!");
     }
-}
+}

zd-common/common-core/src/main/java/com/zd/common/core/launch/constant/LauncherConstant.java

@@ -19,8 +19,8 @@ public interface LauncherConstant {
 	 * Nacos各环境服务地址
 	 */
 	String NACOS_DEV_ADDR = "127.0.0.1:8848";
-	String NACOS_TEST_ADDR = "192.168.1.88:8848";
-	String NACOS_PRO_ADDR = "192.168.1.88:8848";
+	String NACOS_TEST_ADDR = "127.0.0.1:8848";
+	String NACOS_PRO_ADDR = "127.0.0.1:8848";
 
 	/**
 	 * Nacos各环境命名空间

zd-common/common-core/src/main/java/com/zd/common/core/mybatisplus/MybatisPlusGenerator.java

@@ -60,7 +60,6 @@ public class MybatisPlusGenerator {
          * 添加忽略字段
          */
         String[] ignoreColumns = {};
-        System.out.println("====================>>> start generator code......");
         // 生成器
         FastAutoGenerator.create(url, username, password)
                 // 全局配置
@@ -139,7 +138,6 @@ public class MybatisPlusGenerator {
                         .build())
                 .templateEngine(new FreemarkerTemplateEngine())
                 .execute();
-        System.out.println("====================>>> generator code done  <<<======================");
     }
 
     /**

zd-common/common-core/src/main/java/com/zd/common/core/utils/DESUtils.java

@@ -110,9 +110,7 @@ public class DESUtils {
     public static void main(String[] args) {
         String data = "05367892";
         String key = DESUtils.encrypt(data);
-        System.out.println("加密内容="+key);
         String res = DESUtils.decrypt(key);
-        System.out.println("解密内容="+res);
         //随机生成八位字符串
         getRandomNum();
     }
@@ -120,7 +118,6 @@ public class DESUtils {
 
     public static String getRandomNum() {
         String randomNum = getRandomPassword(8);
-        System.out.println(randomNum);
         return randomNum;
     }
 

zd-common/common-core/src/main/java/com/zd/common/core/utils/DateUtils.java

@@ -170,7 +170,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
             calBegin.add(Calendar.DAY_OF_MONTH, 1);
             allDate.add(sdf.format(calBegin.getTime()));
         }
-        System.out.println("时间==" + allDate);
         return allDate;
     }
 }

zd-common/common-core/src/main/java/com/zd/common/core/utils/EscapeUtil.java

@@ -123,8 +123,5 @@ public class EscapeUtil {
         // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
         // String html = "<123";
         // String html = "123>";
-        System.out.println(EscapeUtil.clean(html));
-        System.out.println(EscapeUtil.escape(html));
-        System.out.println(EscapeUtil.unescape(html));
     }
 }

zd-common/common-core/src/main/java/com/zd/common/core/utils/HttpUtils.java

@@ -14,8 +14,8 @@ import java.util.Map;
 
 /**
 * <p>Http工具类</p>
-* 
-* @author lft  
+*
+* @author lft
 * @date 2018年8月28日
 * @since jdk1.8
 * @version 1.0
@@ -27,7 +27,7 @@ public class HttpUtils {
 
     /**
      * 发送POST请求
-     * 
+     *
      * @param urlStr
      * @param data
      * @param contentType
@@ -67,7 +67,6 @@ public class HttpUtils {
             	sbui.append("\r\n");
             }
         } catch (IOException e) {
-            //System.out.println("Error connecting to " + urlStr + ": " + e.getMessage());
         } finally {
             try {
                 if (reader != null)
@@ -79,14 +78,14 @@ public class HttpUtils {
     }
     /**
      * 发起Get请确认
-     * 
+     *
      * @param url
      * @return
      */
     public static String sendGet(String url){
     	return sendGet(url, null);
     }
-    
+
     public static String sendGet(String url,Integer timeOut){
  		String result="";//访问返回结果
  		BufferedReader read=null;//读取访问结果
@@ -125,7 +124,7 @@ public class HttpUtils {
  		   }
  		   return result;
  	}
-    
+
     /**
 	 * SHA1 哈希计算
 	 */
@@ -139,7 +138,7 @@ public class HttpUtils {
             throw new RuntimeException(ex);
         }
     }
-    
+
     public static String byteToHexString(byte[] bytes) {
         return String.valueOf(Hex.encodeHex(bytes));
     }

zd-common/face-component/src/main/java/com/zd/common/face/config/FaceEngineFactory.java

@@ -133,7 +133,6 @@ public class FaceEngineFactory {
 
     public void afterPropertiesSet() throws IOException {
         CACHE_LIB_FOLDER = USER_HOME + "/.arcface/cache/" + ARC_FACE_VERSION + "/" + PLATFORM + "/";
-        System.out.println("CACHE_LIB_FOLDER:"+CACHE_LIB_FOLDER);
         loadLibrary();
     }
 
@@ -265,6 +264,5 @@ public class FaceEngineFactory {
     }
 
     public static void main(String[] args) {
-        System.out.println(System.getProperty("user.home"));
     }
 }

zd-model/src/main/java/com/zd/model/domain/tool/SnowFlake.java

@@ -114,6 +114,5 @@ public class SnowFlake {
 
     public static void main(String[] args) {
         SnowFlake snowFlake = new SnowFlake(1, 1);
-        System.out.println(snowFlake.nextId());
     }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/ZdAirbottleApplication.java

@@ -55,7 +55,7 @@ public class ZdAirbottleApplication implements ApplicationRunner {
         for(String key:cllKey){
             redisService.deleteObject(key);
         }
-        //TODO 启动气瓶服务的时候，需要把信标全部载入redis一次，（主要防止服务器断电重启后，被带离的气瓶无法知道）
+        // 启动气瓶服务的时候，需要把信标全部载入redis一次，（主要防止服务器断电重启后，被带离的气瓶无法知道）
         List <DbStock> list = dbStockService.list();
         for(DbStock db:list){
             DbBluetoothGateway dbBluetoothGateway = new DbBluetoothGateway();

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStatisticsController.java

@@ -116,7 +116,5 @@ public class DbStatisticsController extends BaseController {
 
     public static void main(String[] args) {
         String[] str = "01月".split("月");
-        System.out.println(Integer.valueOf(str[0]));
-        System.out.println(str[0]+"||"+str[0]);
     }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbStockController.java

@@ -116,7 +116,7 @@ public class DbStockController extends AbstractController {
             dbInOutRecord.setType(1);
             dbInOutRecordService.save(dbInOutRecord);
             dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbInOutRecord.getBeaconTag()).set(DbBeacon::getState, Boolean.TRUE).set(DbBeacon::getBindingTime, LocalDateTime.now()));
-            //todo 重新加载入库的信标到redis  chai
+            // 重新加载入库的信标到redis  chai
             new Thread(() -> loadBeaconDate(dbStock)).start();
             return ResultData.success("操作成功");
         }
@@ -153,7 +153,7 @@ public class DbStockController extends AbstractController {
             dbInOutRecordService.save(dbInOutRecord);
             //解除信标
             dbBeaconService.update(new LambdaUpdateWrapper<DbBeacon>().eq(DbBeacon::getBeaconTag, dbInOutRecord.getBeaconTag()).set(DbBeacon::getState, 0));
-            //todo 重新加载入库的信标到redis  chai
+            // 重新加载入库的信标到redis  chai
             new Thread(() -> remBeaconDate(stock)).start();
             return ResultData.success("出库成功");
         }
@@ -192,7 +192,7 @@ public class DbStockController extends AbstractController {
             if(beaconNoticeList!=null){
                 newNoticeList.addAll(beaconNoticeList);
             }
-            //todo 循环信标通知，修改的信标提示语移除。
+            // 循环信标通知，修改的信标提示语移除。
             if(beaconNoticeList != null){
                 for(Map notice:beaconNoticeList){
                     if(notice.get("beaconTag").equals(oldDbStock.getBeaconTag())){
@@ -206,7 +206,7 @@ public class DbStockController extends AbstractController {
                 //判断通知消息集合有数据，说明信标有变动，需要重新变更加通知
                 redisService.setCacheObject(BaseConstants.BEACON_MATE_NOTICE+"~"+ oldDbStock.getSubjectId(),newNoticeList, 30L, TimeUnit.MINUTES);
             }
-            //todo 重新加载入库的信标到redis  chai
+            // 重新加载入库的信标到redis  chai
             DbStock newDbStock = dbStockService.getById(dbStockBo.getId());
             new Thread(() -> loadBeaconDate(newDbStock)).start();
             return ResultData.success("操作成功");
@@ -417,7 +417,7 @@ public class DbStockController extends AbstractController {
         if(beaconNoticeList!=null){
             newNoticeList.addAll(beaconNoticeList);
         }
-        //todo 循环信标通知，修改的信标提示语移除。
+        // 循环信标通知，修改的信标提示语移除。
         if(beaconNoticeList != null){
             for(Map notice:beaconNoticeList){
                 if(notice.get("beaconTag").equals(dbStock.getBeaconTag())){

zd-modules/zd-algorithm/src/main/java/com/zd/alg/face/FaceApi.java

@@ -37,7 +37,7 @@ public class FaceApi {
     private static final int taskSize = 50;
 
     private static ExecutorService pool = Executors.newFixedThreadPool(taskSize);
-    
+
     private Logger logger = LoggerFactory.getLogger(FaceApi.class);
 
     //@Autowired
@@ -181,7 +181,6 @@ public class FaceApi {
                 ResultData r=(ResultData)future.get();
                 if(r.getCode()==200){
                     long time2=System.currentTimeMillis();
-                    System.out.println("执行时间："+(time2-time));
                     return r;
                 }
             }
@@ -274,9 +273,7 @@ public class FaceApi {
                     .collect(Collectors.toList());
             for(Future future:lists){
                 String r=(String)future.get();
-                System.out.println(r);
             }
         long time2=System.currentTimeMillis();
-        System.out.println(time2-time);
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/controller/FireDeviceController.java

@@ -643,6 +643,5 @@ public class FireDeviceController extends BaseController {
     public static void main(String[] args) {
         Map<String,Object> map = new HashMap<>();
         map.put("fireStatus",1);
-        System.out.println(JSON.toJSONString(map));
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/service/impl/FireDeviceLogServiceImpl.java

@@ -110,9 +110,6 @@ public class FireDeviceLogServiceImpl implements IFireDeviceLogService {
     @Override
     public String insertFireAutomatic(String code){
         String str=null;
-        /*SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date date = new Date(System.currentTimeMillis());
-        System.out.println(sdf.format(date));*/
 
         // redis取值，当天日志是否添加
         String isExist = redisService.getCacheObject(CacheConstants.FIRE_LOG_IS_EXIST);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/utils/FireLaborUtil.java

@@ -93,11 +93,8 @@ public class FireLaborUtil {
         int fireNumber=0;
         //returnCodes="02 03 48 00 00 00 00 02 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 40 3D ";
         returnCodes=returnCodes.replace(" ","");
-        System.out.println("returnCodes length:"+returnCodes.length());
         String registerCode=returnCodes.substring(6,returnCodes.length()-20);
-        System.out.println("registerCode:"+registerCode);
         String mainCode=returnCodes.substring(134,returnCodes.length()-4);
-        System.out.println("mainCode:"+mainCode);
         List<String> registerCodeList=parseArrayList(registerCode);
         Set<String> statusSet=statusMap.keySet();
         if(registerCodeList.contains("01")){
@@ -202,8 +199,6 @@ public class FireLaborUtil {
 
     public static void main(String[] args) {
         String msg="";
-        System.out.println(getFireActiveOrder(2));
         JSONObject jsonObject=getFireStatus("0");
-        System.out.println(jsonObject.toJSONString());
     }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/utils/ImageBioChangeUtil.java

@@ -1,5 +1,5 @@
 package com.zd.alg.forward.utils;
- 
+
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -8,36 +8,36 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
- 
+
 import javax.imageio.ImageIO;
 
 import com.github.pagehelper.util.StringUtil;
 import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
- 
+
 public class ImageBioChangeUtil {
-	
-	static BASE64Encoder encoder = new sun.misc.BASE64Encoder();   
+
+	static BASE64Encoder encoder = new sun.misc.BASE64Encoder();
     static BASE64Decoder decoder = new sun.misc.BASE64Decoder();
-    
+
     //从文件路径中获取图片转为二进制
 	public static String getImageBinary(String filePath){
 		if(StringUtil.isEmpty(filePath)) {
 			return null;
 		}
         File f = new File(filePath);	//这里gif动态图不可以，虽然在后面也能输出gif格式，但是却不是动图
-        BufferedImage bi;   
-        try {   
-            bi = ImageIO.read(f);   
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();   
-            ImageIO.write(bi, "jpg", baos);   
-            byte[] bytes = baos.toByteArray();   
-               
-            return encoder.encodeBuffer(bytes).trim();   
-        } catch (IOException e) {   
-            e.printStackTrace();   
-        }   
-        return null;   
+        BufferedImage bi;
+        try {
+            bi = ImageIO.read(f);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ImageIO.write(bi, "jpg", baos);
+            byte[] bytes = baos.toByteArray();
+
+            return encoder.encodeBuffer(bytes).trim();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 	//从URl中获取图片转为二进制
 	public static String getImageBinaryFromUrl(String urlPath) throws Exception{
@@ -50,9 +50,9 @@ public class ImageBioChangeUtil {
         conn.setConnectTimeout(3000);//超时提示1秒=1000毫秒
         InputStream inStream=conn.getInputStream();//获取输出流
         byte[] data=readInputStream(inStream);
-		return encoder.encodeBuffer(data).trim();   
-		
-	}   
+		return encoder.encodeBuffer(data).trim();
+
+	}
 	 //readInputStream方法
     private static byte[] readInputStream(InputStream inStream) throws Exception{
         ByteArrayOutputStream outStream=new ByteArrayOutputStream();
@@ -66,24 +66,24 @@ public class ImageBioChangeUtil {
     //将二进制转为图片
     public static void base64StringToImage(String base64String,String outFilePath){
     	if(StringUtil.isNotEmpty(base64String)&&StringUtil.isNotEmpty(outFilePath)) {
-    		try {   
-                byte[] bytes1 = decoder.decodeBuffer(base64String);   
-                   
-                ByteArrayInputStream bais = new ByteArrayInputStream(bytes1);   
-                BufferedImage bi1 =ImageIO.read(bais);   
-                File w2 = new File(outFilePath);//可以是jpg,png格式   
+    		try {
+                byte[] bytes1 = decoder.decodeBuffer(base64String);
+
+                ByteArrayInputStream bais = new ByteArrayInputStream(bytes1);
+                BufferedImage bi1 =ImageIO.read(bais);
+                File w2 = new File(outFilePath);//可以是jpg,png格式
                 if (!w2.exists()) {   //文件不存在则创建文件，先创建目录
                     File dir = new File(w2.getParent());
                     dir.mkdirs();
                     w2.createNewFile(); // 创建新文件
                 }
-                ImageIO.write(bi1, "jpg", w2);//不管输出什么格式图片，此处不需改动   
-            } catch (IOException e) {   
-                e.printStackTrace();   
-            }   
+                ImageIO.write(bi1, "jpg", w2);//不管输出什么格式图片，此处不需改动
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
 		}
     }
-    
+
     public static void main(String[] args) {
 //    	String imageBinary=null;
 //		try {
@@ -92,10 +92,8 @@ public class ImageBioChangeUtil {
 //			// TODO Auto-generated catch block
 //			e.printStackTrace();
 //		}
-//        System.out.println(imageBinary);
         String outFilePath= "E://huoyan.jpg";
 //        base64StringToImage(imageBinary,outFilePath);
         String imageBinary1 = getImageBinary(outFilePath);
-        System.out.println(imageBinary1);
     }
-}
+}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/session/SsrcConfig.java

@@ -81,7 +81,6 @@ public class SsrcConfig {
             isUsed.remove(sn);
             notUsed.add(sn);
         }catch (NullPointerException e){
-            System.out.printf("11111");
         }
     }
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -747,7 +747,6 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 						storager.insertMobilePosition(mobilePosition);
 					}
 				}
-				System.out.println("存储报警信息、报警分类");
 				// 存储报警信息、报警分类
 				deviceAlarmService.add(deviceAlarm);
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/onvif/impl/ONVIFServerIMpl.java

@@ -263,7 +263,6 @@ public class ONVIFServerIMpl implements IONVIFServer {
         List<String> list=new ArrayList<>();
         File f = new File(path);//获取路径  F:测试目录
         if (!f.exists()) {
-            System.out.println(path + " not exists");//不存在就输出
             return null;
         }
         File fa[] = f.listFiles();//用数组接收  F:笔记总结C#, F:笔记总结if语句.txt

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/service/impl/PlayServiceImpl.java

@@ -133,7 +133,6 @@ public class PlayServiceImpl implements IPlayService {
             // 点播结束时调用截图接口
             try {
                 String classPath = ResourceUtils.getURL("classpath:").getPath();
-                // System.out.println(classPath);
                 logger.info("=====================classPath=====================",classPath);
                 // 兼容打包为jar的class路径
                 if(classPath.contains("jar")) {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/service/impl/SlSubjectRelationServiceImpl.java

@@ -75,7 +75,6 @@ public class SlSubjectRelationServiceImpl implements ISlSubjectRelationService {
         if (list == null || list.size() == 0) {
             throw new ServiceException("没有要关联的数据！");
         }
-        System.out.println(SecurityUtils.getUsername());
         //校验本次提交是否存在已绑定情况
         SlSubjectRelationVo subjectRelation = new SlSubjectRelationVo();
         for (SlSubjectRelation sl : list) {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/smartlock/utils/SmartlockUtil.java

@@ -108,7 +108,6 @@ public class SmartlockUtil {
             String url = SERVICE_URL + "/build/1/getbuild?buildfatherid=0&page=1&rows=10&token=" + token;
             HttpRequest request = SmartlockUtil.httpSendPost(url, "");
             HttpResponse response = request.execute();
-            // System.out.println(response.body());
             String resultMsg = JSON.parseObject(response.body().toString()).get("resultMsg").toString();
             if (RESULT_MSG.equals(resultMsg)) {
                 List<SlBuild> list = JSON.parseArray(JSON.parseObject(response.body().toString()).get("result").toString(), SlBuild.class);
@@ -130,7 +129,6 @@ public class SmartlockUtil {
         SlBuild slBuild = null;
         String token = getToken();
         List<SlRoom> listRoom = new ArrayList<>();
-        // System.out.println(token);
         try {
             //获取楼层建筑id
             String urlLc = SERVICE_URL + "/build/1/getbuild?buildid=0&page=1&rows=30&token=" + token;
@@ -225,7 +223,6 @@ public class SmartlockUtil {
             lockOnline.setOnLine(roomnetquality);
             lockOnline.setLockCode(lockCode);
             lockOnline.setOnLineStatus("在线".equals(roomnetquality) ? 1 : 0);
-            // System.out.println("房间详情，门锁状态 roomnetquality: " + roomnetquality + " lockCode: " + lockCode);
         } catch (Exception e) {
             logger.error("获取房间详情失败2：" + e);
         }
@@ -259,7 +256,6 @@ public class SmartlockUtil {
                     + "&search=" + openDoorSearch.getSearch() + "&sdate=" + sdate + "&edate=" + edate;
             HttpRequest request = SmartlockUtil.httpSendPost(url, "");
             HttpResponse response = request.execute();
-            // System.out.println(response.body());
             //查询失败直接返回
             String resultMsg = JSON.parseObject(response.body()).get("resultMsg").toString();
             if (!RESULT_MSG.equals(resultMsg)) {
@@ -456,14 +452,12 @@ public class SmartlockUtil {
             //postUser.setEmpsdate(sdf.format(new Date()));//授权开始时间
             postUser.setEmpedate(sdf.format(getTime(AUTHS_LENGTH)));  //授权结束时间，当前时间加1小时
             postlist.add(postUser);
-            //System.out.println("开始时间：" + sdf.format(new Date()) + "结束时间：" + sdf.format(getTime(1)));
 
             //将对象转为json
             //JSONObject jsonStr = JSON.parseObject(JSONObject.toJSONString( postlist ));
             String url2 = SERVICE_URL + "/lockauth/save/4/saveauths?token=" + token + "&roomid=" + roomId;
             HttpRequest request2 = SmartlockUtil.httpSendPost(url2, JSONObject.toJSONString(postlist));
             HttpResponse response2 = request2.execute();
-            //System.out.println(response2.body());
             //查询失败直接返回
             String resultMsg = JSON.parseObject(response2.body().toString()).get("resultMsg").toString();
             if (!RESULT_MSG.equals(resultMsg)) {
@@ -508,10 +502,8 @@ public class SmartlockUtil {
                     "&persontype=" + user.getPersontype() + "&pgid=" + pgid + "&token=" + token;
             HttpRequest request = SmartlockUtil.httpSendPost(url, "");
             HttpResponse response = request.execute();
-            //System.out.println(response.body());
             //查询失败直接返回
             String resultMsg = JSON.parseObject(response.body().toString()).get("resultMsg").toString();
-            //System.out.println(resultMsg);
             if (!RESULT_MSG.equals(resultMsg)) {
                 logger.error("人员添加失败1：" + resultMsg);
                 map.put("resultMsg", resultMsg);
@@ -564,7 +556,6 @@ public class SmartlockUtil {
         String urlexis = SERVICE_URL + "/card/save/8/getcardperson?token=" + token + "&cardtype=" + cardtype + "&page=1&rows=20&search=" + personcode;
         HttpRequest requestexis = SmartlockUtil.httpSendPost(urlexis, "");
         HttpResponse responseexis = requestexis.execute();
-        //System.out.println(responseexis.body());
         String data = JSON.parseObject(JSON.parseObject(responseexis.body()).get("result").toString()).get("data").toString();
         JSONArray array = JSON.parseArray(data);
         if (array.size() > 0) {
@@ -587,12 +578,10 @@ public class SmartlockUtil {
                 "personcode=" + personcode + "&page=1" + "&rows=50&token=" + token;
         HttpRequest requestauth = SmartlockUtil.httpSendPost(urlauth, "");
         HttpResponse responseauth = requestauth.execute();
-        //System.out.println(responseauth.body());
 
         String data = JSON.parseObject(JSON.parseObject(responseauth.body()).get("result").toString()).get("data").toString();
         JSONArray array = JSON.parseArray(data);
         for (int i = 0; i < array.size(); i++) {
-            //System.out.println(array.get(i) + "");
             String empedate = JSON.parseObject(array.get(i).toString()).get("empedate").toString();
             String authtype = JSON.parseObject(array.get(i).toString()).get("authtype").toString();
             if ("3".equals(authtype)) {
@@ -634,14 +623,11 @@ public class SmartlockUtil {
     public static void main(String[] args) {
         //getTopBuild();//获取顶级建筑
         /*List<SlRoom> listRoom =  getRoom( new SlRoom());
-        System.out.println(listRoom.size());
         for (SlRoom slroom:listRoom ) {
-            System.out.println(slroom.getRoomid()+"== "+slroom.getRoomcode());
         }*/
 
         /*List<SlUser> listUser  = getUser(new SlUser());
         for (SlUser user:listUser ) {
-            System.out.println(user.getPersoncode()+"== "+user.getPersonname());
         }*/
 
         //getRoomDetails("109");
@@ -650,7 +636,6 @@ public class SmartlockUtil {
         search.setRoomid("109");
         List<SlOpenAndClosLog> list = getOpenDoorLog(search);
         for (SlOpenAndClosLog oplog:list) {
-            System.out.println(oplog.getPersonname()+"=="+oplog.getUnlockingtype()+" =="+oplog.getUnlockingdate());
         }*/
 
         //getGroup(new SlGroup());
@@ -661,14 +646,12 @@ public class SmartlockUtil {
 
         //addUser(new SlUser() , "");
 
-        // System.out.println(checkUserExis("C008","1"));
 
         //String token =  SmartlockUtil.getToken();
         //updateAuths( token,"109", 32);
 
         //getRoomDetails("109");
 
-        //System.out.println(getRandom(6));
 
 
     }

zd-modules/zd-base/src/main/java/com/zd/base/files/bigupload/utils/FileUtils.java

@@ -55,7 +55,6 @@ public class FileUtils {
      */
     public static String getFormatter() {
         Date d = new Date();
-        System.out.println(d);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHH");
         String dateNowStr = sdf.format(d);
         return dateNowStr;

zd-modules/zd-base/src/main/java/com/zd/base/files/file/service/LocalSysFileServiceImpl.java

@@ -31,7 +31,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
     @Override
     public String uploadFile(MultipartFile file, Boolean ifAsy) throws Exception {
         String name = FileUploadUtils.upload(ResourcesConfig.filePath, file, ifAsy);
-        //TODO 去掉拼接前缀
+        // 去掉拼接前缀
 //        String urlPrefix = domain;
 //        String localIP = "127.0.0.1";
 //        if (urlPrefix.contains(localIP)) {

zd-modules/zd-base/src/main/java/com/zd/base/job/task/RyTask.java

@@ -17,16 +17,13 @@ public class RyTask {
     private ISysJobService jobService;
 
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
-        System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
 
     public void ryParams(String params) {
         SysJob job = new SysJob();
         jobService.selectJobList(job);
-        System.out.println("执行有参方法：" + params);
     }
 
     public void ryNoParams() {
-        System.out.println("执行无参方法");
     }
 }

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/UseRecordServiceImpl.java

@@ -189,7 +189,7 @@ public class UseRecordServiceImpl extends ServiceImpl<UseRecordMapper, UseRecord
         LambdaQueryWrapper<UsegasApply> queryWrapper = Wrappers.lambdaQuery(UsegasApply.class);
         queryWrapper.eq(UsegasApply::getUserId, sysUser.getUserId())
                 .ge(UsegasApply::getEndTime, new Date())
-                //todo 气体ID待确认
+                // 气体ID待确认
                 .eq(UsegasApply::getUseGasName, recordDto.getBottleName())
                 .eq(UsegasApply::getLeadAuditStaus, 1);
         List<UsegasApply> list = usegasApplyService.list(queryWrapper);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/ActHxpapplyServiceImpl.java

@@ -450,7 +450,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
-            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            // 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
             ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
             actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
             actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);
@@ -466,7 +466,7 @@ public class ActHxpapplyServiceImpl implements IActHxpapplyService
             actApplytaskNode.setNodeStatus(1);
             actApplytaskNode.setApplyUserid(SecurityUtils.getUserId());
             actApplytaskNode.setUpdateTime(new Date());
-            //todo 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
+            // 这里如果是当前用户跳过的，需要把事情的化学品全部修改为勾选
             ActHxpapplyDetail actHxpapplyDetail = new ActHxpapplyDetail();
             actHxpapplyDetail.setHxpapplyId(actApplytask.getTaskId());
             actHxpapplyDetailMapper.updateActHxpapplyDetailByPass(actHxpapplyDetail);

zd-modules/zd-chemical/src/main/java/com/zd/chemical/util/ChemicalUtils.java

@@ -72,6 +72,5 @@ public class ChemicalUtils {
         //String str = "武汉0.133300g；北京10.25001g, 是1.0000个，这个2";
         //String str = "dasddsa11.10000";
         String str = "J00036-申购:1.00000oz";
-        System.out.println("str = "+removeZeroForAfterPoint(str));
     }
 }

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

@@ -98,7 +98,7 @@ public class LabBuildFloorController  extends BaseController<LabBuildFloor> {
     @GetMapping("/getTreeSonList")
     @ApiOperation(value = "查询楼栋(楼层)子集列表")
     public TableDataInfo <LabBuildFloor> getTreeSonList(LabBuildFloor labBuildFloor) {
-//        //todo 如果选中的是楼层下的布局图，则需要分页，如果不是，不需要分页
+//        // 如果选中的是楼层下的布局图，则需要分页，如果不是，不需要分页
 //        if(labBuildFloor.getType()==3){
 //            startPage();
 //        }

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

@@ -519,7 +519,6 @@ public class LabCheckRecordController extends BaseController {
         //判断负责人是否第一次查看
         if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
             int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
         }
 
         //隐患详情
@@ -589,7 +588,6 @@ public class LabCheckRecordController extends BaseController {
         //判断负责人是否第一次查看
         if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
             int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
         }
 
         //隐患详情
@@ -732,11 +730,6 @@ public class LabCheckRecordController extends BaseController {
         if(labCheckRecord==null){
             throw new ServiceException("未获取到相关信息");
         }
-        //判断负责人是否第一次查看
-        /*if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
-        }*/
 
         //待整改
         LabCheckRecordDetailsVO dzgDetailsVo = new LabCheckRecordDetailsVO();
@@ -788,11 +781,6 @@ public class LabCheckRecordController extends BaseController {
         if(labCheckRecord==null){
             throw new ServiceException("未获取到相关信息");
         }
-        //判断负责人是否第一次查看
-        /*if(sysUser.getUserId().equals(labCheckRecord.getFzrId()) && labCheckRecord.getFirstTime()==null ){
-            int flg= labCheckRecordService.updateFirstTimeById(labCheckRecord.getId());
-            System.out.println(flg);
-        }*/
 
         //待整改
         LabCheckRecordDetailsVO dzgDetailsVo = new LabCheckRecordDetailsVO();

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

@@ -103,9 +103,9 @@ public class LabExitLineVertexController extends BaseController {
     @ApiOperation(value = "查询逃生线路主列表")
     public ResultData executeEvacuation(@RequestBody LabExitLineEvacuationVo labExitLineEvacuationVo) {
         Map <String, Object> joinPointVOS = labExitLineVertexService.executeEvacuation(labExitLineEvacuationVo);
-        //todo redis把计算的逃生线路相关信息存储起来
+        // redis把计算的逃生线路相关信息存储起来
         redisService.setCacheObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId(), JSON.toJSONString(joinPointVOS), 3L, TimeUnit.HOURS);
-        //todo 下发前端页面通知
+        // 下发前端页面通知
         messageSendService.exitLineToFloor(labExitLineEvacuationVo.getFloorId());
         return ResultData.success(joinPointVOS);
     }
@@ -118,9 +118,9 @@ public class LabExitLineVertexController extends BaseController {
     @ApiOperation(value = "结束疏散")
     public ResultData endEvacuation(@RequestBody LabExitLineEvacuationVo labExitLineEvacuationVo) {
         new Thread(()->labExitLineVertexService.endEvacuation(labExitLineEvacuationVo)).start();
-        //todo 结束疏散清空redis，以及下发通知
+        // 结束疏散清空redis，以及下发通知
         redisService.deleteObject("exitLineBy"+labExitLineEvacuationVo.getBuildId()+""+labExitLineEvacuationVo.getFloorId());
-        //todo 下发前端页面通知
+        // 下发前端页面通知
         messageSendService.overExitLineToFloor(labExitLineEvacuationVo.getFloorId());
         return ResultData.success();
     }

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

@@ -117,13 +117,11 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
     }*/
 
     public static void main(String[] args) {
-        System.out.println(Integer.valueOf("09"));
         // 获取当前年第一天
         Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
         calendar.clear();
         calendar.set(Calendar.YEAR, year);
         Date yearBegin = calendar.getTime();
-        System.out.println(DateUtils.dateTime(yearBegin));
     }
 }

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

@@ -80,7 +80,7 @@ public class WarningNoticeLogController extends AbstractController {
         boolean b = warningNoticeLogService.updateById(warningNoticeLog);
         if (b) {
             WarningNoticeLog noticeLog = warningNoticeLogService.getById(warningNoticeLog.getId());
-            //todo 这里处置后，需要把处置的信标存入redis
+            // 这里处置后，需要把处置的信标存入redis
             Map <String,Long> stockMap = new HashMap <>();
             stockMap.put("keyId",noticeLog.getKeyId());
             remoteAirBottleService.beaconUpdate(stockMap);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -421,9 +421,9 @@ public class BigViewController extends BaseController {
         labHornMessageVo.setSendName(tokenService.getLoginUser().getNickName());
         labHornMessageVo.setNowTime(localDateTime.format(DateTimeFormatter.ofPattern("HH:mm")));
         redisService.setCacheObject("sendHornMess"+labHornMessageVo.getFloorId(), labHornMessageVo, 3L, TimeUnit.HOURS);
-        //todo 消息下发，告诉前端
+        // 消息下发，告诉前端
         messageSendService.sendHornMessToFloor(labHornMessageVo.getFloorId());
-        //todo 调用喇叭服务
+        // 调用喇叭服务
         remoteSpeakService.textParseUrlIps(labHornMessageVo.getMessageContext(),labHornMessageVo.getPlayVo());
         return ResultData.success();
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/OnecStatusListener.java

@@ -36,7 +36,7 @@ public class OnecStatusListener implements ApplicationListener<OnecStatusEvent>
         EquipmentStatus source = onecStatusEvent.getSource();
         int i = labHardwareService.updateStatus(source);
         //推送硬件状态数据 ，推送不存在微应用状态不一致的问题，就算其多个实例，也会因feign负载均衡后只有一个实例实际监听事件
-        //todo 这里需要优化 每次推送都要反查一次数据库，非常耗费资源
+        // 这里需要优化 每次推送都要反查一次数据库，非常耗费资源
         if (i > 0) {
             LabHardware labHardware = new LabHardware();
             labHardware.setHardwareNum(source.getNum());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisDelAndAddListener.java

@@ -20,7 +20,6 @@ public class RedisDelAndAddListener implements MessageListener {
     public void onMessage(Message message, byte[] bytes) {
         String topic = new String(bytes);
         String msg = new String(message.getBody());
-        System.out.println("收到key删除，消息主题是："+ topic+",消息内容是："+msg);
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RelayStatusListener.java

@@ -40,7 +40,7 @@ public class RelayStatusListener implements ApplicationListener<RelayHardwareSta
         EquipmentStatus source = relayHardwareStatusEvent.getSource();
         int i = labHardwareService.updateRelayStatus(source);
         //推送硬件状态数据 ，推送不存在微应用状态不一致的问题，就算其多个实例，也会因feign负载均衡后只有一个实例实际监听事件
-        //todo 这里需要优化 每次推送都要反查一次数据库，非常耗费资源
+        // 这里需要优化 每次推送都要反查一次数据库，非常耗费资源
         //这里不管是继电器下的哪一个设备变化，都把继电器下的所有设备查出来
         if (i > 0) {
             //这里的前提是继电器下的设备都是属于一个实验室的 切记！！！

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/VideoStatusListener.java

@@ -36,10 +36,10 @@ public class VideoStatusListener implements ApplicationListener<VideoHardwareSta
     @Override
     public void onApplicationEvent(VideoHardwareStatusEvent relayHardwareStatusEvent) {
         //视频一直再推送 ，每次修改都很耗费资源，
-        //todo 优化：需要加入缓存
+        // 优化：需要加入缓存
         EquipmentStatus source = relayHardwareStatusEvent.getSource();
         int i = labHardwareService.updateStatus(source);
-        //todo 这里需要优化 每次推送都要反查一次数据库，非常耗费资源
+        // 这里需要优化 每次推送都要反查一次数据库，非常耗费资源
         if (i > 0) {
             LabHardware labHardware = new LabHardware();
             labHardware.setHardwareNum(source.getNum());

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

@@ -334,7 +334,7 @@ public class MqttConfig {
                         String command = replaceMess.substring(8, 10);
                         //表示坨机成功
                         if (HexUtils.hexToInteger(command) == 0) {
-                            //TODO 成功逻辑、、
+                            // 成功逻辑、、
                             Long lockId = Long.parseLong(HexUtils.hexToInteger(replaceMess.substring(4, 6)) + "");
                             String[] prefix = steerPublishPrefix.split("/");
                             if (prefix != null && prefix.length > 0) {
@@ -347,7 +347,6 @@ public class MqttConfig {
                     } else if (replaceMess.length() == 16) {
 //                        String command=replaceMess.substring(4,6);
 //                        Long lockId = Long.parseLong(HexUtils.hexToInteger(command) + "");
-//                        System.out.println("坨机编号");
                         String[] prefix = steerPublishPrefix.split("/");
                         if (prefix != null && prefix.length > 0) {
                             // 采集器编号

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

@@ -210,7 +210,7 @@ public class SubMessageSendManager {
         if (subFunction == null) {
             return;
         }
-        //todo 这里是零时处理一下甲烷传感器没有上报describe 数据，这里先用funName代替describe，后期修复好了，在删除这块代码
+        // 这里是零时处理一下甲烷传感器没有上报describe 数据，这里先用funName代替describe，后期修复好了，在删除这块代码
 //        List<SensorFunctionStatus> functionStatuses = subFunction.getFunctionStatuses();
 //        List<SensorFunctionStatus> newFunctionStatuses = new ArrayList <>();
 //        for(SensorFunctionStatus sensor:functionStatuses){
@@ -218,7 +218,7 @@ public class SubMessageSendManager {
 //            newFunctionStatuses.add(sensor);
 //        }
 //        subFunction.setFunctionStatuses(newFunctionStatuses);
-        //todo 到这里结束
+        // 到这里结束
         //发送事件
         logger.info("采集器数据接收={}",JSON.toJSONString(subFunction));
         //本来使用mqtt接收，因为mqtt 每个客户端接受到都会处理，

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/controller/OneMachineController.java

@@ -125,7 +125,7 @@ public class OneMachineController extends BaseController {
         Long aLong = labHardwareService.querySubIdByNum(num);
         Assert.isNotNull(aLong, "无法获取一体机对应实验室信息");
 
-        //todo 根据接收的参数 :设备ID 获取一体机绑定实验室ID
+        // 根据接收的参数 :设备ID 获取一体机绑定实验室ID
         SubSimpleVO subSimpleVO = subjectManagerService.querySubSimpleVO(aLong);
         //获取一体机logo图片信息
         R<SysLogoConfigVO> configLogoResult = userService.getConfigLogo();
@@ -151,7 +151,7 @@ public class OneMachineController extends BaseController {
     @GetMapping("/{subId}/sensor/val/list")
     public ResultData<List<SenseValVO>> querySubValList(@PathVariable("subId") Long subId) {
         List<SenseValVO> senseValVOS = subjectManagerService.querySenseValVOSBySubId(subId);
-        //todo 设备来了完善
+        // 设备来了完善
         return ResultData.success(senseValVOS);
     }
 
@@ -164,7 +164,7 @@ public class OneMachineController extends BaseController {
                 sensorFunctionStatus.setDescribe(sensorFunctionStatus.getFuncName());
             }
         }
-        //todo 设备来了完善
+        // 设备来了完善
         return ResultData.success(list);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -197,7 +197,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                 }
             }
 
-            //todo 获取人脸信息 现在还不确定（已完成）
+            // 获取人脸信息 现在还不确定（已完成）
             //2、判断是否录入人脸，如没有录入人脸进行提示(语音+浮层):验证失败，您需要通过小程序录入人脸后才能签到。
             Long userId = signInfoVO.getSingInUser().getUserId();
             LabStudentsInfo labStudentsInfo = studentsInfoService.selectLabStudentsInfoByJoinStudentsId(userId);
@@ -382,15 +382,15 @@ public class OneMachineService implements ValidationSignInPerInfo {
                         redisService.deleteObject(verifyKey);
                         //增加一个key 用记录ID作为key，值是实验室ID 有效期两分钟
                         redisService.setCacheObject(BaseConstants.SINGIN_id_KEY + subjectAccessRecord.getId(), Long.parseLong(s), 2L, TimeUnit.MINUTES);
-                        //todo 这里通过实验室id查询楼层id
+                        // 这里通过实验室id查询楼层id
                         LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
                         labBuildFloorLayout.setSubId(Long.parseLong(s));
                         List <LabBuildFloorLayoutVo> floorLayoutVoList = labBuildFloorLayoutService.selectLabBuildFloorLayoutList(labBuildFloorLayout);
                         if(floorLayoutVoList.size()>0){
                             LabBuildFloorLayoutVo floorVo = floorLayoutVoList.get(0);
-                            //todo 这里需要给管控页面推送一个消息
+                            // 这里需要给管控页面推送一个消息
                             messageSendService.subUserByChange(floorVo.getFloorId(),Long.parseLong(s));
-                            //todo 这里需要给管控页面推送一个消息
+                            // 这里需要给管控页面推送一个消息
                             messageSendService.builUserByChange(floorVo.getBuildId());
                         }
                     }else{
@@ -442,15 +442,15 @@ public class OneMachineService implements ValidationSignInPerInfo {
                         }
                     }
 
-                    //todo 这里通过实验室id查询楼层id
+                    // 这里通过实验室id查询楼层id
                     LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
                     labBuildFloorLayout.setSubId(Long.parseLong(s));
                     List <LabBuildFloorLayoutVo> floorLayoutVoList = labBuildFloorLayoutService.selectLabBuildFloorLayoutList(labBuildFloorLayout);
                     if(floorLayoutVoList.size()>0){
                         LabBuildFloorLayoutVo floorVo = floorLayoutVoList.get(0);
-                        //todo 这里需要给管控页面推送一个消息
+                        // 这里需要给管控页面推送一个消息
                         messageSendService.subUserByChange(floorVo.getFloorId(),Long.parseLong(s));
-                        //todo 这里需要给管控页面推送一个消息
+                        // 这里需要给管控页面推送一个消息
                         messageSendService.builUserByChange(floorVo.getBuildId());
                     }
                     return ResultData.result(true);
@@ -555,7 +555,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
 
         /*if (user == null) return null;
 
-        //todo 现在是串行处理， 影响大的话可以改为异步处理
+        // 现在是串行处理， 影响大的话可以改为异步处理
         //1 获取验证安全准入凭证
         List<LabApprovalVO> labApprovals = getLabApprovals(subId, user);
         SingInUser singInUser = new SingInUser(user, labApprovals);
@@ -637,7 +637,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                 for(int i=0;i<los.length;i++){
                     String lo = los[i];
                     if("1".equals(lo)){
-                        //todo 实验室负责人
+                        // 实验室负责人
                         LabSubject labSubject = labSubjectMapper.selectLabSubjectById(subId);
                         if(StringUtils.isNotNull(labSubject)){
                             if(userId.longValue() == labSubject.getAdminId().longValue()){
@@ -646,7 +646,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                             }
                         }
                     }else if("2".equals(lo)){
-                        //todo 实验室负责人
+                        // 实验室负责人
                         LabSubject labSubject = labSubjectMapper.selectLabSubjectById(subId);
                         if(StringUtils.isNotNull(labSubject)){
                             String[] safeUsers = labSubject.getSafeUserId().split(",");
@@ -658,7 +658,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                             }
                         }
                     }else if("3".equals(lo)){
-                        //todo 安全准入人员
+                        // 安全准入人员
                         //1 获取验证安全准入凭证
                         LabSecurityApplyVO labSecurityApply = new LabSecurityApplyVO();
                         labSecurityApply.setSubjectId(subId);
@@ -670,7 +670,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                             break;
                         }
                     }else if("4".equals(lo)){
-                        //todo 白名单
+                        // 白名单
                         LabWhitelistVO labWhitelistVO = new LabWhitelistVO();
                         labWhitelistVO.setUserId(userId);
                         labWhitelistVO.setSubId(subId);

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

@@ -180,9 +180,7 @@ public class LabApprovalServiceImpl implements ILabApprovalService {
         GregorianCalendar now = new GregorianCalendar();
         SimpleDateFormat fmtrq = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         DateFormat df = DateFormat.getDateInstance();
-        System.out.println(fmtrq.format(now.getTime()));
         now.add(GregorianCalendar.MONTH, Integer.parseInt(security.getEffectiveTime() + ""));   //可以是天数或月数  数字自定 -6前6个月
-        System.out.println(fmtrq.format(now.getTime()));
 
         Date date = now.getTime();
         labApproval.setExpirationDate(date);

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

@@ -159,7 +159,6 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
 
     public void exec(String cmd) {
         try {
-            System.out.println("系统开始执行命令：\n" + cmd);
             runtime = Runtime.getRuntime();
             log.error("cmdBegin:"+cmd);
             pro = runtime.exec(new String[]{"sh", "-c", cmd});
@@ -172,7 +171,6 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             e.printStackTrace();
         }finally {
             //            Thread.sleep(1000*10);
-            System.out.println("已经停止");
             //            Thread.sleep(1000*5);
         }
     }
@@ -193,7 +191,6 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             String str;
             // 通过readLine()方法按行读取字符串
             while ((str = br.readLine()) != null) {
-                System.out.println(str);
             }
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -61,7 +61,7 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean setBackUser(LabBlacklist labBlacklist) {
         //判断是否已有黑名单
-        //todo 该判断方式 并发时存在问题
+        // 该判断方式 并发时存在问题
         LabBlacklist labBlacklist1 = selectLabBlacklistById(labBlacklist.getJoinUserId());
         Assert.isNull(labBlacklist1, "黑名单已存在不能重复添加");
         //添加

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

@@ -66,7 +66,7 @@ public class LabBuildFloorServiceImpl implements ILabBuildFloorService {
         List <LabBuildFloor> labBuildFloors = labBuildFloorMapper.selectLabBuildFloorList(labBuildFloor);
         LabBuildFloorVo buildFloorVo = new LabBuildFloorVo();
 
-        //todo 返回父级下的所有子集列表
+        // 返回父级下的所有子集列表
         Function <LabBuildFloorVo,List <LabBuildFloorVo>> function = x->Optional.ofNullable(labBuildFloors).orElseGet(Collections::emptyList)
                 .stream()
                 .filter(y->y.getParentId()==x.getId())
@@ -77,7 +77,7 @@ public class LabBuildFloorServiceImpl implements ILabBuildFloorService {
                 })
                 .sorted(Comparator.comparing(LabBuildFloorVo::getSortNo))
                 .collect(Collectors.toList());
-        //todo 赛选过滤院校数据
+        // 赛选过滤院校数据
         Optional.ofNullable(labBuildFloors).orElseGet(Collections::emptyList)
                 .stream()
                 .filter(a->a.getType()==1)
@@ -96,7 +96,7 @@ public class LabBuildFloorServiceImpl implements ILabBuildFloorService {
                 .forEach(d->{
                     d.getBuildFloorVoList().addAll(function.apply(d));
                 });
-        //todo 重新给组织结构排序，因为上面的是并发收集数据
+        // 重新给组织结构排序，因为上面的是并发收集数据
         List <LabBuildFloorVo> collect = Optional.ofNullable(buildFloorVo.getBuildFloorVoList()).orElseGet(Collections::emptyList)
                 .stream()
                 .sorted(Comparator.comparing(LabBuildFloorVo::getSortNo))

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

@@ -519,8 +519,6 @@ public class LabCheckRecordServiceImpl implements ILabCheckRecordService
             str1.append(value);
             str1.append(",");
         });
-        //System.out.println(str1);
-        //System.out.println(str1.substring(0,str1.lastIndexOf(",")));
 
         //修改发布表数据
         String checkId=str1.substring(0,str1.lastIndexOf(","));

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

@@ -99,7 +99,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         labExitLineJoin.setSubjectId(subId);
         labExitLineJoin.setLightDirection(dire);
         List<LabExitLineJoinVO> labExitLineJoinVOList = labExitLineJoinMapper.selectLabExitLineIntelligentGuidance(labExitLineJoin);
-        //todo 这里临时调用一下处理LightId的办法，以后如果变动，需要重新设计调整，这个方法就不用了。
+        // 这里临时调用一下处理LightId的办法，以后如果变动，需要重新设计调整，这个方法就不用了。
         changeLightId(labExitLineJoinVOList);
         //验证是否在双向疏散时，都有配置双向线路 如没有 则置空
         if(dire==0){
@@ -362,7 +362,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         exitLineMap.put("EXIT_LINE_MESSAGE",false);
         messageSendService.SendExitLineUpdate(exitLineMap);
 
-        //todo 关闭喇叭
+        // 关闭喇叭
         try{
             LabAudioSynthesis audioSyn = new LabAudioSynthesis();
             audioSyn.setSceneType(2);
@@ -515,7 +515,7 @@ public class LabExitLineServiceImpl implements ILabExitLineService
         exitLineMap.put("EXIT_LINE_MESSAGE",true);
         messageSendService.SendExitLineUpdate(exitLineMap);
 
-        //todo 这里先写死一个喇叭播报，如果后期需要改动，在重新调整。
+        // 这里先写死一个喇叭播报，如果后期需要改动，在重新调整。
         //这里查询预案下的合成音乐
         if(redisService.getCacheObject("subjectByExit"+subId)==null){
             try{

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

@@ -140,7 +140,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
      */
     @Override
     public Map<String,Object> executeEvacuation(LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        //todo 根据实验室id查询出对应的pointName数据
+        // 根据实验室id查询出对应的pointName数据
         LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
         labBuildFloorLayout.setBuildId(labExitLineEvacuationVo.getBuildId());
         labBuildFloorLayout.setFloorId(labExitLineEvacuationVo.getFloorId());
@@ -157,7 +157,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
             if (labExitLineVOList.size() > 0) {
                 String relationData = labExitLineVOList.get(0).getRelationalData();
                 List <LabExitLineJoinPointVO> newRelationalData = JSONArray.parseArray(relationData, LabExitLineJoinPointVO.class);
-                //todo 这里赛选出pointName 的对应的key 的真实pointName 这里赛选门对应的坏点和实验室对应的起点标记坏点
+                // 这里赛选出pointName 的对应的key 的真实pointName 这里赛选门对应的坏点和实验室对应的起点标记坏点
                 Optional.ofNullable(newRelationalData)
                         .orElseGet(Collections::emptyList)
                         .stream()
@@ -182,7 +182,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
 
                 //这里需要在通过floyd计算一次原始数据，作为发生预案的楼层，只有一个疏散口，那么所有的实验室，都向这个疏散口撤离。
                 List <LabExitLineJoinPointVO> oldRelationalData = JSONArray.parseArray(relationData, LabExitLineJoinPointVO.class);
-                //todo 这里只赛选门对应的坏点的数据，用作计算备用线路用
+                // 这里只赛选门对应的坏点的数据，用作计算备用线路用
                 Optional.ofNullable(oldRelationalData)
                         .orElseGet(Collections::emptyList)
                         .stream()
@@ -211,7 +211,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
         exitPointRelay.setBuildId(labExitLineEvacuationVo.getBuildId());
         exitPointRelay.setFloorId(labExitLineEvacuationVo.getFloorId());
         List <LabExitPointRelay> labExitPointRelays = labExitPointRelayMapper.selectLabExitPointRelayList(exitPointRelay);
-        //todo  关闭继电器开关
+        //  关闭继电器开关
         for(LabExitPointRelay relay : labExitPointRelays) {
             try {
                 if (relay.getRelayType().intValue() == 1) {
@@ -235,11 +235,11 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                 e.printStackTrace();
             }
         }
-        //todo 关闭喇叭
+        // 关闭喇叭
         closeHorn(labExitLineEvacuationVo);
     }
 
-    //todo 计算坏点(目前只有发生预案的实验室需要标记为坏点)，需要把非坏点关联坏点点位全部改成无限大
+    // 计算坏点(目前只有发生预案的实验室需要标记为坏点)，需要把非坏点关联坏点点位全部改成无限大
     public void badPoints(List <LabExitLineJoinPointVO> newRelationalData, String badPointName) {
         //这里计算预案发生的实验室坏点
         Optional.ofNullable(newRelationalData).orElseGet(Collections::emptyList)
@@ -252,7 +252,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                 );
     }
 
-    //todo 计算交通点，把所有关闭的逃生口，全部标记为通道
+    // 计算交通点，把所有关闭的逃生口，全部标记为通道
     public void crossPoints(List <LabExitLineJoinPointVO> newRelationalData, String badPointName) {
         //这里计算预案发生的实验室坏点
         Optional.ofNullable(newRelationalData).orElseGet(Collections::emptyList)
@@ -265,7 +265,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                 );
     }
 
-    //todo  计算完成的路线，灯的数据
+    //  计算完成的路线，灯的数据
     public Map <String, Object> displayPath(ArrayList <Integer[][]> list, List <LabExitLineJoinPointVO> linePointVOList, LabExitLineEvacuationVo labExitLineEvacuationVo, ArrayList <Integer[][]> oldList, List <LabExitLineJoinPointVO> oldRelationalData) {
 
         logger.info("当前线程:{}", Thread.currentThread().getName());
@@ -295,9 +295,9 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
         return filterLinePoint(completableFutures, labExitLineEvacuationVo.getStartPointName(), labExitLineEvacuationVo);
     }
 
-    //todo 预案触发实验室的主线路到逃生点全部返回，其他实验室赛选过滤最优线路，如果和主线路有重叠或者逆向，需要移除重叠以后的数据点。
+    // 预案触发实验室的主线路到逃生点全部返回，其他实验室赛选过滤最优线路，如果和主线路有重叠或者逆向，需要移除重叠以后的数据点。
     public Map <String, Object> filterLinePoint(List <CompletableFuture <Map <String, Object>>> completableFutures, final String startPointName, LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        //todo 断言名字是否相同
+        // 断言名字是否相同
         Predicate <String> checkPointName = x -> startPointName.equals(x);
         List <List <LabExitLineJoinPointVO>> startPointList = new ArrayList <>();
         Map <String, Integer> sortKeyMap = new LinkedHashMap <>();
@@ -326,13 +326,13 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                 });
 
 
-        //todo 将过滤好的otherPointMap转换成list
+        // 将过滤好的otherPointMap转换成list
         Function <Map <String, List <LabExitLineJoinPointVO>>, List <List <LabExitLineJoinPointVO>>> otherPointList =
                 a -> a.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList());
 
         Map <String, Object> allPointMap = new LinkedHashMap <>();
         joinLine(allPointMap, startPointList, labExitLineEvacuationVo).accept(otherPointList.apply(otherPointMap));
-        //todo 开启逃生灯绑定继电器的数据 采用线程异步调用
+        // 开启逃生灯绑定继电器的数据 采用线程异步调用
         new Thread(()->openLightJoinRelay((Set <LabExitLineJoinPointVO>) allPointMap.get("lightPointSet"),labExitLineEvacuationVo)).start();
         return allPointMap;
     }
@@ -351,7 +351,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
         labExitPointRelay.setBuildId(labExitLineEvacuationVo.getBuildId());
         labExitPointRelay.setFloorId(labExitLineEvacuationVo.getFloorId());
         List <LabExitPointRelay> labExitPointRelays = labExitPointRelayMapper.selectLabExitPointRelayList(labExitPointRelay);
-        //todo 这里需要两层for循环，比对点名称一样的，开启继电器开关
+        // 这里需要两层for循环，比对点名称一样的，开启继电器开关
         Consumer<LabExitPointRelay> consumer = a->Optional.ofNullable(lightPointList).orElseGet(Collections::emptySet)
                 .stream()
                 .filter(b->b.getKey().equals(a.getPointName()))
@@ -381,7 +381,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
         Optional.ofNullable(labExitPointRelays).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->consumer.accept(a));
-        //todo 调用楼层的喇叭
+        // 调用楼层的喇叭
         openHorn(labExitLineEvacuationVo);
     }
 
@@ -474,11 +474,11 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
         Set <LabExitLineJoinPointVO> lightPointSet = new LinkedHashSet <>();
         List <List <LabExitLineJoinPointVO>> groupPointList = new ArrayList <>();
 
-        //todo 添加一个过滤只有灯点的消费者
+        // 添加一个过滤只有灯点的消费者
         Consumer <List <LabExitLineJoinPointVO>> lightPoint = a -> Optional.ofNullable(a).orElseGet(Collections::emptyList)
                 .stream()
                 .filter(b -> b.getPointAttribute() == 2).forEach(b -> lightPointSet.add(b));
-        //todo 预案点保存线路和灯
+        // 预案点保存线路和灯
         Consumer <List <List <LabExitLineJoinPointVO>>> consumer1 = a -> Optional.ofNullable(a)
                 .orElseGet(Collections::emptyList)
                 .stream()
@@ -486,13 +486,13 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                     linePointSet.addAll(b);
                     //属性是2，说明只返回灯点
                     lightPoint.accept(b);
-                    //todo 在添加一个完成线路点的集合
+                    // 在添加一个完成线路点的集合
                     suppleBuildAndFloor(b.stream().collect(Collectors.toSet()), labExitLineEvacuationVo);
                     groupPointList.add(b);
                 });
         consumer1.accept(startPointList);
 
-        //todo 加一个子线路的消费者，如果子线路和主线路重合，需要给删除的delAdder添加1，否则0
+        // 加一个子线路的消费者，如果子线路和主线路重合，需要给删除的delAdder添加1，否则0
         LongAdder delAdder = new LongAdder();
         Consumer <LabExitLineJoinPointVO> checkSonPoint = x -> startPointList.stream().forEach(b -> {
             Optional.ofNullable(b).orElseGet(Collections::emptyList)
@@ -504,12 +504,12 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                         }
                     });
         });
-        //todo 其他点保存线路和灯
+        // 其他点保存线路和灯
         Consumer <List <List <LabExitLineJoinPointVO>>> consumer2 = a -> Optional.ofNullable(a)
                 .orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(b -> {
-                    //todo 这里判断是否一直删除，boolean不能传入，暂时用这个校验
+                    // 这里判断是否一直删除，boolean不能传入，暂时用这个校验
                     delAdder.reset();
                     Optional.ofNullable(b).orElseGet(Collections::emptyList)
                             .stream()
@@ -523,7 +523,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                                     }
                                 }
                             });
-                    //todo 在添加一个完成线路点的集合
+                    // 在添加一个完成线路点的集合
                     suppleBuildAndFloor(b.stream().collect(Collectors.toSet()), labExitLineEvacuationVo);
                     groupPointList.add(b);
                 });
@@ -550,18 +550,16 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
     }
 
 
-    //todo 针对实验室计算出当前实验室的各种线路，过滤到最优线路
+    // 针对实验室计算出当前实验室的各种线路，过滤到最优线路
     public CompletableFuture <Map <String, Object>> optimalRoute(List <LabExitLineJoinPointVO> linePointVOList, Integer[][] path, Integer[] chain, int i, int j, ArrayList <Integer[][]> oldList, List <LabExitLineJoinPointVO> oldRelationalData,LabExitLineEvacuationVo labExitLineEvacuationVo) {
-        //输出源到目的地
-        System.out.println("\n   " + (linePointVOList.get(i).getPointName()) + "->" + (linePointVOList.get(i).getPointVOList().get(j).getPointName()) + "     ");
         //保存两个点之间的途径点。
         List <LabExitLineJoinPointVO> joinPointVOS = new ArrayList <>();
-        //todo 这里用map保存三个结果，一个是计算好的线路，一个是顶点名称，一个是计算的顶点到最优线路距离.
+        // 这里用map保存三个结果，一个是计算好的线路，一个是顶点名称，一个是计算的顶点到最优线路距离.
         Map <String, Object> joinPointMap = new HashMap <>();
         //输出最短路径的长度
         if (linePointVOList.get(i).getPointVOList().get(j).getPointDistance() == M) {
             logger.info(" NA ");
-            //todo 这里原来是NA，也就是说没有匹配到线路，如果线路出现坏点，并且没有其他备用线路，那么就选择坏点线路
+            // 这里原来是NA，也就是说没有匹配到线路，如果线路出现坏点，并且没有其他备用线路，那么就选择坏点线路
             LongAdder adder = new LongAdder();
             Optional.ofNullable(labExitLineEvacuationVo.getBadPointNames())
                     .orElseGet(Collections::emptyList)
@@ -634,7 +632,7 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
         SaveUtil.setCommonAttr(labExitLineVertex);
         labExitLineVertexMapper.insertLabExitLineVertex(labExitLineVertex);
 
-        //todo 循环插入点和实验室id关系布局数据
+        // 循环插入点和实验室id关系布局数据
         Consumer<List<LabBuildFloorLayout>> consumer = a -> Optional.ofNullable(a)
                 .orElseGet(Collections::emptyList)
                 .stream()
@@ -646,21 +644,21 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
                     SaveUtil.setCommonAttr(b);
                     labBuildFloorLayoutMapper.insertLabBuildFloorLayout(b);
                 });
-        //todo 删除布局图点和实验室id关系数据
+        // 删除布局图点和实验室id关系数据
         LabBuildFloorLayout labBuildFloorLayout = new LabBuildFloorLayout();
         labBuildFloorLayout.setBuildId(lineVertexVo.getBuildId());
         labBuildFloorLayout.setFloorId(lineVertexVo.getFloorId());
         labBuildFloorLayoutMapper.deleteLabBuildFloorLayout(labBuildFloorLayout);
-        //todo 消费者调用函数
+        // 消费者调用函数
         consumer.accept(lineVertexVo.getBuildFloorLayouts());
 
 
-        //todo 删除点和继电器绑定关系
+        // 删除点和继电器绑定关系
         LabExitPointRelay exitPointRelay = new LabExitPointRelay();
         exitPointRelay.setBuildId(lineVertexVo.getBuildId());
         exitPointRelay.setFloorId(lineVertexVo.getFloorId());
         labExitPointRelayMapper.deleteLabExitPointRelay(exitPointRelay);
-        //todo 点和继电器绑定关系
+        // 点和继电器绑定关系
         Optional.ofNullable(lineVertexVo.getExitPointRelayList())
                 .orElseGet(Collections::emptyList)
                 .stream()
@@ -683,12 +681,12 @@ public class LabExitLineVertexServiceImpl implements ILabExitLineVertexService {
 //                    SaveUtil.setCommonAttr(b);
 //                    labExitJoinSubpointMapper.insertLabExitJoinSubpoint(b);
 //                });
-//        //todo 删除楼层的点和实验室id关系数据
+//        // 删除楼层的点和实验室id关系数据
 //        LabExitJoinSubpoint labExitJoinSubpoint = new LabExitJoinSubpoint();
 //        labExitJoinSubpoint.setBuildId(lineVertexVo.getBuildId());
 //        labExitJoinSubpoint.setFloorId(lineVertexVo.getFloorId());
 //        labExitJoinSubpointMapper.deleteLabExitJoinSubpointByFloorId(labExitJoinSubpoint);
-//        //todo 消费者调用函数
+//        // 消费者调用函数
 //        consumer.accept(lineVertexVo.getJoinSubpointList());
         return 1;
     }

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

@@ -81,7 +81,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
             JSONObject jsonObj = (JSONObject) JSONObject.parseObject(joinPointVOSStr, Object.class, Feature.OrderedField);
             lightPointSet = jsonObj.getObject("lightPointSet", new TypeReference <Set <LabExitLineJoinPointVO>>(){});
         }
-        //todo  开启继电器开关
+        //  开启继电器开关
         for(LabExitPointRelay relay : labExitPointRelays){
             try {
                 if(relay.getRelayType().intValue()==1){
@@ -125,7 +125,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
         }
         relayListMap.put("lightPointSet",lightPointSet);
         redisService.setCacheObject("exitLineBy"+labExitPointRelay.getBuildId()+""+labExitPointRelay.getFloorId(), JSON.toJSONString(relayListMap), 3L, TimeUnit.HOURS);
-        //todo  发送前端消息
+        //  发送前端消息
         messageSendService.exitLineToFloor(labExitPointRelay.getFloorId());
         return 1;
     }
@@ -145,7 +145,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
             lightPointSet = jsonObj.getObject("lightPointSet", new TypeReference <Set <LabExitLineJoinPointVO>>(){});
             newLightPointSet.addAll(lightPointSet) ;
         }
-        //todo  开启继电器开关
+        //  开启继电器开关
         for(LabExitPointRelay relay : labExitPointRelays) {
             try {
                 if (relay.getRelayType().intValue() == 1) {
@@ -179,7 +179,7 @@ public class LabExitPointRelayServiceImpl implements ILabExitPointRelayService {
         }
         relayListMap.put("lightPointSet",newLightPointSet);
         redisService.setCacheObject("exitLineBy"+labExitPointRelay.getBuildId()+""+labExitPointRelay.getFloorId(), JSON.toJSONString(relayListMap), 3L, TimeUnit.HOURS);
-        //todo  发送前端消息
+        //  发送前端消息
         messageSendService.exitLineToFloor(labExitPointRelay.getFloorId());
         return 1;
     }

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

@@ -521,8 +521,8 @@ public class LabHardwareServiceImpl implements ILabHardwareService {
     @Override
     public int updateRelayStatus(EquipmentStatus equipmentStatus)
     {
-        //todo  现在更新起来很麻烦， 需要通过继电器找到继电器下的设备，修改所有关联设备的状态,
-        //todo  建议 维护继电器数据，关联继电器硬件数据直接取继电器状态
+        //  现在更新起来很麻烦， 需要通过继电器找到继电器下的设备，修改所有关联设备的状态,
+        //  建议 维护继电器数据，关联继电器硬件数据直接取继电器状态
 
         if(HardwareOperate.OFFLINE.equals(equipmentStatus.getHardwareOperate()))
         {

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

@@ -179,7 +179,7 @@ public class LabHazardSubjectRelationServiceImpl implements ILabHazardSubjectRel
                     return 1;
                 }));
 
-        //todo 先循环处理,不考虑性能， 已经对数据分类，此处可以优化
+        // 先循环处理,不考虑性能， 已经对数据分类，此处可以优化
         collect.entrySet().forEach(a -> {
             if (a.getKey().equals(0)) {
                 a.getValue().forEach(b -> {

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

@@ -250,7 +250,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
         warningNoticeLog.setCollegeName(subject.getDeptName());
         warningNoticeLog.setWarningType(4);
         warningNoticeLog.setWarningWay("2,4");
-        //TODO 语音播报通知
+        // 语音播报通知
         warningNoticeLog.setVoiceBroadcast(1);
         String riskPlanName = "";
         if(labRiskPlanLevel.getRiskPlanLevel() ==1 ){
@@ -294,8 +294,8 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 .collect(Collectors.joining(","))
                 .split(",");
 
-        //todo 发送最多支持200个电话号码 ， 这里不会超过200人 所以没有验证， 切割
-        //todo 这里判断电话类型，如果是0，发送短信，如果是1,是四医大内部短信接口。
+        // 发送最多支持200个电话号码 ， 这里不会超过200人 所以没有验证， 切割
+        // 这里判断电话类型，如果是0，发送短信，如果是1,是四医大内部短信接口。
         if (phoneMode == 0) {
             if (strings != null) {
                 logger.info("打印发送人电话号码！{}",JSON.toJSONString(strings));

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

@@ -48,7 +48,7 @@ public class LabNewnoticeSendmodeServiceImpl implements ILabNewnoticeSendmodeSer
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertLabNewnoticeSendmode(List<LabNewnoticeSendmodeVo> labNewnoticeSendmodeVoList) {
-        //todo 删除发送方式的数据和发送内容的数据。
+        // 删除发送方式的数据和发送内容的数据。
         if(labNewnoticeSendmodeVoList.size()>0){
             LabNewnoticeSendmodeVo newnoticeSendmodeVo = labNewnoticeSendmodeVoList.get(0);
             List <LabNewnoticeSendmode> newnoticeSendmodeList = labNewnoticeSendmodeMapper.selectNewnoticeSendModeList(newnoticeSendmodeVo);
@@ -77,9 +77,9 @@ public class LabNewnoticeSendmodeServiceImpl implements ILabNewnoticeSendmodeSer
 
 
 
-            //todo 字符串保存发送方式
+            // 字符串保存发送方式
             StringBuffer buffer = new StringBuffer();
-            //todo 这里插入发送方式的数据
+            // 这里插入发送方式的数据
             Optional.ofNullable(labNewnoticeSendmodeVoList)
                     .orElseGet(Collections::emptyList)
                     .stream()
@@ -91,7 +91,7 @@ public class LabNewnoticeSendmodeServiceImpl implements ILabNewnoticeSendmodeSer
                         SaveUtil.setCommonAttr(labNewnoticeSendmode);
                         labNewnoticeSendmodeMapper.insertLabNewnoticeSendmode(labNewnoticeSendmode);
 
-                        //todo 这里需要插入发送内容的数据
+                        // 这里需要插入发送内容的数据
                         LongAdder count = new LongAdder();
                         Optional.ofNullable(t.getContentList())
                                 .orElseGet(Collections::emptyList)
@@ -105,7 +105,7 @@ public class LabNewnoticeSendmodeServiceImpl implements ILabNewnoticeSendmodeSer
                                     labNewnoticeContentMapper.insertLabNewnoticeContent(a);
                                 });
                     });
-            //todo 修改组通知的选项卡数据
+            // 修改组通知的选项卡数据
             if(StringUtils.isNotNull(newnoticeSendmodeVo)){
                 LabNewnoticeGroup labNewnoticeGroup = new LabNewnoticeGroup();
                 labNewnoticeGroup.setId(newnoticeSendmodeVo.getGroupId());

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

@@ -233,7 +233,6 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
                         //String ss = sdf.format(Date.parse(excelList.get(0).getCreateDate()));
                         *//*Date date = (Date) sdf.parse("Sat Jan 01 10:20:00 CST 2022");
                         String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);*//*
-                        //System.out.println(DateUtils.dateTime("YYYY-mm-dd HH:mm",excelList.get(0).getCreateDate()));
                         //list.get(0).setCreateTime(formatStr);
                         excelList.get(0).setCreateDate(formatStr);
                         list.get(0).setExcelList(excelList);
@@ -432,11 +431,8 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
     }
 
     public static void main(String[] args) throws ParseException {
-        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
         Date date = (Date) sdf.parse("Sat Jan 01 10:20:00 CST 2022");
         String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
-       //String ss = sdf.format(Date.parse("Sat Jan 01 10:20:00 CST 2022"));
-        System.out.println(formatStr);
     }
 }

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

@@ -113,7 +113,7 @@ public class LabPhotoInspectionServiceImpl implements ILabPhotoInspectionService
 //    @Transactional(rollbackFor = Exception.class)
     public int savaPhotoFj(LabPhotoInspection photo) {
         int flag = 0;
-        //todo  这些验证查询在高并发环境下都有问题, 在当前用调度任务检查24小时违规打卡的时间差也会导致这里出现脏数据
+        //  这些验证查询在高并发环境下都有问题, 在当前用调度任务检查24小时违规打卡的时间差也会导致这里出现脏数据
         if(photo.getId()==null)
         {
             //保存，保存时获取记录ID

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

@@ -107,7 +107,7 @@ public class LabRiskPlanAbnormalGroupServiceImpl implements ILabRiskPlanAbnormal
             List<LabHardware> hardwareList = labHardwareMapper.selectLabHardwareListBySubject(labHardware);
             a.setHardwareList(hardwareList);
 
-            //todo 这里查看预案下是不是有疏散线路，返回true和false
+            // 这里查看预案下是不是有疏散线路，返回true和false
             try{
                 labExitLineService.getRoute(a.getSubjectId(),0);
                 a.setWhetherRoute(true);

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

@@ -348,7 +348,7 @@ public class LabRiskPlanAbnormalLogServiceImpl implements ILabRiskPlanAbnormalLo
                     });
                 }
         );
-        //todo 这里尝试组合预案和气瓶预警
+        // 这里尝试组合预案和气瓶预警
         Collection <String> cllKey = redisService.keys(BaseConstants.BEACON_MATE_NOTICE + "*");
         for(String key:cllKey){
             List <Map<String,Object>> beaconNoticeList = redisService.getCacheObject(key);

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

@@ -1226,7 +1226,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                         try {
                             //插入风险硬件日志
                             operateHardWareInfo(labRiskPlanLevel, labRiskPlanAbnormalGroup.getSubjectId(), groupList.get(0).getId(), riskPlanJson.toString());
-                            //todo 后面放入老柴的事件中 或者订阅老柴的事件处理
+                            // 后面放入老柴的事件中 或者订阅老柴的事件处理
                             //增加预警缓存
                             Optional.ofNullable(labRiskPlanLevel.getRiskPlanSensorList()).ifPresent(f -> {
                                 Set<String> funSet = labRiskPlanLevel.getRiskPlanSensorList().stream().map(d -> d.getFunNum()).collect(Collectors.toSet());

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

@@ -151,7 +151,7 @@ public class LabSensorServiceImpl implements ILabSensorService {
             subId=Long.parseLong(subjectStr.toString());
         }
 
-        //todo 当前单机部署不需要考虑， 否则要放开下部分代码
+        // 当前单机部署不需要考虑， 否则要放开下部分代码
 //        if(subId==null)
 //        {
         //这里存在分布式问题

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

@@ -593,7 +593,7 @@ public class LabSubjectManagerService {
     public List<LabSubjectVO> querySubCListVO(LabSubListQuery labSubListQuery) {
         LabSubject subject = new LabSubject();
         BeanUtils.copyProperties(labSubListQuery, subject);
-        //todo 暂未实现负责人数据权限，所以数据不包括负责人数据
+        // 暂未实现负责人数据权限，所以数据不包括负责人数据
 
         //1.获取权限的分页数据
         PageHelperUtil.startPage();
@@ -1626,7 +1626,7 @@ public class LabSubjectManagerService {
         senseValVO.setSubId(a.getSubjectId());
         senseValVO.setHardwareName(a.getName());
         senseValVO.setSenseType(a.getType());
-        //todo 这里需要考虑设备唯一码从哪里来
+        // 这里需要考虑设备唯一码从哪里来
 //                senseValVO.setHardwareNUM();
         return senseValVO;
     }
@@ -1638,7 +1638,7 @@ public class LabSubjectManagerService {
      * @return
      */
     public HardwareCVO getHardwareCVO(LabHardware a) {
-        //todo 这里需要考虑设备唯一码从哪里来
+        // 这里需要考虑设备唯一码从哪里来
         // hardware.setHardwareNUM();
         HardwareCVO hardware = new HardwareCVO();
         hardware.setId(a.getId().toString());

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

@@ -37,7 +37,7 @@ public class LabTimedExhaustJoinsubServiceImpl implements ILabTimedExhaustJoinsu
     @Transactional(rollbackFor = Exception.class)
     public int insertLabTimedExhaustJoinsub(LabTimedExhaustJoinsubVo labTimedExhaustJoinsubVo) {
 
-        //todo 这里需要删除做两步，第一步删除选中的实验室，第二部删除要插入的相关数据
+        // 这里需要删除做两步，第一步删除选中的实验室，第二部删除要插入的相关数据
         for(LabTimedExhaustJoinsub joinsub : labTimedExhaustJoinsubVo.getJoinsubList()){
             labTimedExhaustJoinsubVo.getDelSubIds().add(joinsub.getSubId());
         }
@@ -46,7 +46,7 @@ public class LabTimedExhaustJoinsubServiceImpl implements ILabTimedExhaustJoinsu
             labTimedExhaustJoinsubMapper.deleteLabTimedExhaustJoinsubByIds(labTimedExhaustJoinsubVo.getDelSubIds());
         }
 
-        //todo 循环插入
+        // 循环插入
         for(LabTimedExhaustJoinsub joinsub : labTimedExhaustJoinsubVo.getJoinsubList()){
             joinsub.setUserId(tokenService.getLoginUser().getUserid());
             joinsub.setCreateBy(tokenService.getLoginUser().getNickName());

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

@@ -160,7 +160,6 @@ public class LabTimedExhaustServiceImpl implements ILabTimedExhaustService {
 
         Calendar calendar = Calendar.getInstance();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        System.out.println(formatter.format(calendar.getTime()));
         //后去年
         int year = calendar.get(Calendar.YEAR);
         int monthInt = calendar.get(Calendar.MONTH)+1;
@@ -179,7 +178,7 @@ public class LabTimedExhaustServiceImpl implements ILabTimedExhaustService {
         }
         Integer newDateInt = Integer.parseInt(year+""+monthStr+""+""+dateStr);
         log.info("定时排风日期转换，获取年月日------------------"+newDateInt);
-        //todo 函数校验当日是否落选到时间区间   这里由于需求变动，在跳过节假日的时候，数据上报是不是节假日的日期时间段
+        // 函数校验当日是否落选到时间区间   这里由于需求变动，在跳过节假日的时候，数据上报是不是节假日的日期时间段
         Predicate<List <LabExecutionDateVo>> predicate = a->a.stream()
                 .map(b->{
                     Integer beginDate = Integer.parseInt(b.getBeginDate().replaceAll("-",""));
@@ -208,7 +207,7 @@ public class LabTimedExhaustServiceImpl implements ILabTimedExhaustService {
                     }
                 })
                 .collect(Collectors.toList());
-        //todo 函数校验当日落选后，根据时间段，执行对应的
+        // 函数校验当日落选后，根据时间段，执行对应的
         Optional.ofNullable(joinsubList).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->Optional.ofNullable(consumer.apply(timedExhaustVoList)).orElseGet(Collections::emptyList)

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

@@ -72,7 +72,7 @@ public class LabViolationSiteServiceImpl implements ILabViolationSiteService
          if (map.get("violationType")!=null) {
 //            List<Map<String, String>> siteList = (List<Map<String, String>>) map.get("violationType");
              labViolationSiteMapper.deleteLabViolationSiteAll();
-             //todo 需求变动，取消了原来的violationType字段类型参数
+             // 需求变动，取消了原来的violationType字段类型参数
 //            siteList.forEach(s->{
 //                LabViolationSite site = new LabViolationSite();
 //                site.setViolationVal(s.get("violationVal"));

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

@@ -195,8 +195,8 @@ public class SubQueryManager {
         //实验室ids ,这样再拿一边剔除了重复数据
         Long[] longs = labSubjects.stream().map(a -> a.getId()).toArray(Long[]::new);
         //因为当前采用注解的方式没有手动加入线程池，所以这里需要把异步方法写入其他的类中，这样才可以通过代理类执行，否则注解不会生效
-        //todo 这里需要重新配置线程池，不能用原生的默认线程池。
-        //todo 需要解决子线程异常
+        // 这里需要重新配置线程池，不能用原生的默认线程池。
+        // 需要解决子线程异常
         //先这么写 后面重构成自动匹配。
         //查询危险等级,
         sw.stop();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/SocketRunner.java

@@ -45,7 +45,6 @@ public class SocketRunner implements CommandLineRunner {
         Socket socket ;
         try {
             server = new ServerSocket(properties.getPort());
-            System.out.println("设备服务器已经开启, 监听端口:" + properties.getPort());
             ThreadPoolExecutor pool = new ThreadPoolExecutor(
                     properties.getPoolCore(),
                     properties.getPoolMax(),

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/runner/TCPServer.java

@@ -237,40 +237,10 @@ public class TCPServer implements Runnable {
 
 
     public static void main(String[] args) throws Exception {
-        // fe dc 固定头
-        // 11  去头尾 的字节长度
-        // 04 dd 80 b6 3c 17   第一位表示是几路继电器
-        // 00 功能码
-
-        // 00 00 位号
-        // 15 0a
-        // 0e 0e
-        // 13 1c
-
-        // e0 41  校验码
-        // ac db  规定尾
-
-//        String str = "40";
-//        System.out.println(Integer.parseInt(str, Character.FORMAT));
-//
-//        byte[] a = TCPServer.parseHexStr2Byte(str);
-//
-//        Integer num = Integer.parseInt(str, Character.FORMAT);
-//        System.out.println(Integer.toBinaryString(num));
-        // gb2312   gb18030
-//        String out = TCPServer.bytesToHexString("二维码内容".getBytes("gbk"));
-//        System.out.println(out);
-//
-//
-//        String qrCode = "68 74 74 70 73 3A 2F 2F 75 2E 77 65 63 68 61 74 2E 63 6F 6D 2F 4D 46 77 41 75 6D 75 63 2D 41 6F 52 5F 4C 64 59 49 48 64 38 43 5F 45";
-//        byte[] b = TCPServer.parseHexStr2Byte(qrCode.replaceAll(" ", ""));
-//
-//        System.out.println(TCPServer.byte2hex(b));
 
         String str = "fe dc 01 78 99 4c 6c 61 88 00 02 64 30 03 00 34 00 00 00 00 00 00 00 00 00 00 01 2d 00 00 01 55 00 01 88 f6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00";
 
         TransmissionVo transmissionVo = new TransmissionVo(str);
 
-        System.out.println(JSONUtil.toJsonStr(transmissionVo));
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/service/SocketService.java

@@ -258,7 +258,6 @@ public class SocketService {
     public void sendWriteHelmCommand(@NotNull String id,@NotNull String position,@NotNull String time,@NotNull String speed) {
         byte[] command=HexUtils.generateCommand(id,position,time,speed);
         String topic=steerSubscriptPrefix + "/285E3E7AE93D";
-        System.out.println(topic);
         commonSend.send(steerSubscriptPrefix + "/285E3E7AE93D",command);
     }
 

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

@@ -43,24 +43,24 @@ public class BeaconMateImpl implements BeaconMate {
         JSONObject jsonObject=JSONObject.parseObject(dataStr);
         String mac = jsonObject.getString("mac");
         if(mac!=null && !"".equals(mac)){
-            //todo 这里用线程去修改网关的具体在线状态
+            // 这里用线程去修改网关的具体在线状态
             Boolean initFlag = Boolean.FALSE;
             if(redisService.getCacheObject(BaseConstants.BEACON_MAC+"~"+ mac)==null){
                 setOpenBluetoothGateway(mac);
-                //todo 这里每次重启网关，或者第一次开启网关，需要把信标全部重新加载一次
+                // 这里每次重启网关，或者第一次开启网关，需要把信标全部重新加载一次
                 initFlag = Boolean.TRUE;
             }
 
             ResultData<Map<String,Object>> resultData = remoteAirBottleService.getSubByMac(mac);
             if(resultData.getCode()==200 && resultData.getData() != null){
-                //todo redis存储蓝牙网关mac地址，用于在线离线问题。
+                // redis存储蓝牙网关mac地址，用于在线离线问题。
                 redisService.setCacheObject(BaseConstants.BEACON_MAC+"~"+ mac,mac, 60L, TimeUnit.SECONDS);
                 log.info("2=====================================》获取实验室id："+resultData.getData().get("subId"));
                 Long subId = Long.parseLong(resultData.getData().get("subId")+"");
                 List <Map<String,Object>> beaconList = redisService.getCacheObject(BaseConstants.BEACON_MATE_INFO+"~"+subId);
                 if(beaconList==null || initFlag){
                     log.info("2.1=====================================》初始化实验室信标列表和实验室下的所有信标生命周期");
-                    //todo 根据实验室id获取蓝牙信标列表
+                    // 根据实验室id获取蓝牙信标列表
                     remoteAirBottleService.setBeaconBySubId(subId);
                 }
 
@@ -68,28 +68,28 @@ public class BeaconMateImpl implements BeaconMate {
                     log.info("3=====================================》上报信标列表："+jsonObject.getJSONArray("devices"));
                     JSONArray array = jsonObject.getJSONArray("devices");
 
-                    //todo 这里需要查看信标通知列表，移除通知列表对应的信标气瓶数据
+                    // 这里需要查看信标通知列表，移除通知列表对应的信标气瓶数据
                     List <Map<String,Object>> beaconNoticeList = redisService.getCacheObject(BaseConstants.BEACON_MATE_NOTICE+"~"+subId);
                     List <Map<String,Object>> newNoticeList = new ArrayList <>();
                     if(beaconNoticeList!=null){
                         newNoticeList.addAll(beaconNoticeList);
                     }
                     StringBuilder beaconTagBuild = new StringBuilder();
-                    //todo 循环检查实验室的信标比对上报的信标，将配对好的信标重新设置默认时间
+                    // 循环检查实验室的信标比对上报的信标，将配对好的信标重新设置默认时间
                     for(int x=0;x<beaconList.size();x++){
                         if(array.size()>0){
-                            //todo 这里需要比对redis存储的蓝牙信息列表和上报的列表信息 稍后补全这块
+                            // 这里需要比对redis存储的蓝牙信息列表和上报的列表信息 稍后补全这块
                             for(int i=0;i<array.size();i++){
                                 String beaconStr = array.getString(i);
                                 //初步过滤只有b5的数据
                                 if(beaconStr.endsWith("b5")){
-                                    //todo 这里需要处理信标字符串
+                                    // 这里需要处理信标字符串
                                     beaconStr = checkBeacon(beaconStr);
                                     if(beaconList.get(x).get("beaconTag").equals(beaconStr)){
                                         log.info("4.=====================================》上报的信标处理后返回信标编码："+beaconStr+";实验室下匹配后的信标："+beaconList.get(x).get("beaconTag"));
-                                        //todo redis存储蓝牙信标编码和实验室id和mac地址
+                                        // redis存储蓝牙信标编码和实验室id和mac地址
                                         redisService.setCacheObject(BaseConstants.BEACON_MATE_DET+"~"+ beaconStr+"~"+subId+"~"+beaconList.get(x).get("gasName"),beaconStr, 120L, TimeUnit.SECONDS);
-                                        //todo 循环信标通知，把还回来的气瓶提示移除。
+                                        // 循环信标通知，把还回来的气瓶提示移除。
                                         if(beaconNoticeList != null){
                                             for(Map notice:beaconNoticeList){
                                                 if(notice.get("beaconTag").equals(beaconStr)){

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/socket/vo/TransmissionVo.java

@@ -277,9 +277,6 @@ public class TransmissionVo {
 
         // 01 03 02 00 00 03 7a d1 01
         String str = "02fffd";
-//        System.out.println(Integer.parseInt(str, Character.FORMAT));
-
-        System.out.println(Integer.parseInt(str, Character.FORMAT));
 
         // 4路 数据  fe dc 01 83 54 40 6e 6b 6b 00 00 21 6a 03 00 10 00 00 00 b2 00 00 02 76 00 01 8c 9a 00 00 00 00 00
         // 8路 数据  fe dc 01 83 62 40 6e 6b 6b 00 05 84 90 03 00 20 00 00 00 00 00 00 00 d4 00 00 01 a1 00 00 00 00 00 01 7a 15 00 00 00 d1 00 00 00 00 00 00 00 00 00

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/CRCCHECK.java

@@ -46,13 +46,6 @@ public class CRCCHECK {
 
     public static void main(String args[]){
         Integer bit=5;
-        System.out.println(getOpenLockOrder(bit));
-        System.out.println(getCloseLockOrder(bit));
-        System.out.println(getReadLockOrder(bit));
-        System.out.println(getLockStatus("02 01 01 00 51 CC"));
-        System.out.println(getLockStatus("02 01 01 01 90 0C"));
-        System.out.println(getLockStatus("02 01 00 01 00 01 AC 39"));
-        System.out.println(getBitByCommand("FE 01 01 01 90 0C"));
     }
 
     /**

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/FireLaborUtil.java

@@ -95,11 +95,8 @@ public class FireLaborUtil {
         int fireNumber=0;
         //String returnCodes="02 03 48 00 00 00 00 02 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 40 3D ";
         returnCodes=returnCodes.replace(" ","");
-        //System.out.println("returnCodes length:"+returnCodes.length());
         String registerCode=returnCodes.substring(6,returnCodes.length()-20);
-        //System.out.println("registerCode:"+registerCode);
         String mainCode=returnCodes.substring(134,returnCodes.length()-4);
-        //System.out.println("mainCode:"+mainCode);
         List<String> registerCodeList=parseArrayList(registerCode);
         Set<String> statusSet=statusMap.keySet();
         if(registerCodeList.contains("01")){
@@ -171,8 +168,6 @@ public class FireLaborUtil {
         boolean fireStatus=false;
         String msg="";
         String str = "02 03 48 00 00 00 00 02 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0A 00 00 00 40 3D ";
-        System.out.println(getFireActiveOrder(2));
         JSONObject jsonObject=getFireStatus(str);
-        System.out.println(jsonObject.toJSONString());
     }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/FunctionMapperUtil.java

@@ -225,7 +225,7 @@ public class FunctionMapperUtil {
         Long  cacheSubByGateway = labSensorService.getCacheSubByGateway(transmissionVo.getA3());
         return subFunction.setSubId(cacheSubByGateway);
     }
-    //todo 先写死有时间优化下
+    // 先写死有时间优化下
     public List<SensorFunctionStatus> confiSensorData(TransmissionVo transmissionVo, SensorConfig sensorConfig) {
         List<SensorFunctionStatus> collect = map.entrySet()
                 .stream()
@@ -273,7 +273,7 @@ public class FunctionMapperUtil {
             newFunctionStatus.setRouteNum(Integer.parseInt(num));
             //切割数据
             newFunctionStatus.setVal(s);
-            //todo 单位改为手动给
+            // 单位改为手动给
             }
         return list;
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/utils/HexUtils.java

@@ -88,16 +88,13 @@ public class HexUtils {
         List<String> list=new ArrayList<>();
         File f = new File(path);//获取路径  F:测试目录
         if (!f.exists()) {
-            System.out.println(path + " not exists");//不存在就输出
             return null;
         }
         File fa[] = f.listFiles();//用数组接收  F:笔记总结C#, F:笔记总结if语句.txt
         for (int i = 0; i < fa.length; i++) {//循环遍历
             File fs = fa[i];//获取数组中的第i个
             if (fs.isDirectory()) {
-                System.out.println(fs.getName() + " [目录]");//如果是目录就输出
             } else {
-                System.out.println(fs.getName());//否则直接输出
             }
             list.add(fs.getName());
         }
@@ -204,10 +201,8 @@ public class HexUtils {
         String abc= getHexCardNum(String.valueOf(sum),4);
         String javaStr=abc.substring(0,2);
         stb.append(hextoString(javaStr));
-        System.out.println(stb.toString());
 
         return ReUtil.hexStringToByteArray(stb.toString());
-//        return stb.toString().getBytes(StandardCharsets.UTF_8);
     }
 
     /**
@@ -241,7 +236,6 @@ public class HexUtils {
         String abc= getHexCardNum(String.valueOf(sum),4);
         String javaStr=abc.substring(0,2);
         stb.append(hextoString(javaStr));
-        System.out.println(stb.toString());
         return stb.toString();
     }
 
@@ -274,7 +268,6 @@ public class HexUtils {
         String abc= getHexCardNum(String.valueOf(sum),4);
         String javaStr=abc.substring(0,2);
         stb.append(hextoString(javaStr));
-        System.out.println(stb.toString());
         return ReUtil.hexStringToByteArray(stb.toString());
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysTeacherServiceImpl.java

@@ -439,7 +439,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
     public Map <String, Object> updateCardNum(List <SysUser> userList) {
         LongAdder count = new LongAdder();
         String[] cardNums = new String[userList.size()];
-        //todo 将所有的卡号转换成加密后的卡号
+        // 将所有的卡号转换成加密后的卡号
         Optional.ofNullable(userList).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{
@@ -448,7 +448,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
                     cardNums[count.intValue()] = a.getCardNumSimple();
                     count.increment();
                 });
-        //todo 将所有的加密后卡号，查询校验是否有除自己以外的卡号重复
+        // 将所有的加密后卡号，查询校验是否有除自己以外的卡号重复
         List<SysUser> resutUserList = userMapper.queryCardNumByIds(cardNums);
 
         List<String> repeatList = new ArrayList <>();
@@ -471,7 +471,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
             allMap.put("repeatCard",-1);
             allMap.put("repeatList",repeatList);
         }else{
-            //todo 批量修改卡号
+            // 批量修改卡号
             Optional.ofNullable(userList).orElseGet(Collections::emptyList)
                     .stream()
                     .forEach(a->{

zd-modules/zd-security/src/main/java/com/zd/security/service/impl/CheckHazardServiceImpl.java

@@ -39,7 +39,7 @@ public class CheckHazardServiceImpl extends ServiceImpl<CheckHazardMapper, Check
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int addHazard(CheckHazardBo checkHazardBo) {
-        //todo 这里需要删除子项的数据
+        // 这里需要删除子项的数据
         delHazardAndRectify(checkHazardBo);
         //图片保存函数consumer
         Consumer<CheckHazardDto> imgcsu = upl -> Optional.ofNullable(upl.getUploadDtoList()).orElseGet(Collections::emptyList)

zd-visual/zd-monitor/src/main/java/com/zd/modules/monitor/ZdMonitorApplication.java

@@ -14,6 +14,5 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer;
 public class ZdMonitorApplication {
     public static void main(String[] args) {
         SpringApplication.run(ZdMonitorApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  监控中心启动成功   ლ(´ڡ`ლ)ﾞ");
     }
 }

zd-visual/zd-monitor/src/main/java/com/zd/modules/monitor/config/SocketRunner.java

@@ -20,7 +20,6 @@ public class SocketRunner {
         Socket socket ;
         try {
             server = new ServerSocket(5000);
-            System.out.println("设备服务器已经开启, 监听端口:" + 5000);
             ThreadPoolExecutor pool = new ThreadPoolExecutor(
                     5,
                     10,
@@ -32,11 +31,9 @@ public class SocketRunner {
             while (true) {
                 socket = server.accept();
                 pool.execute(new TCPServer(socket));
-                System.out.println("打印："+pool.toString()+"当前线程："+Thread.currentThread().getName());
             }
         } catch (IOException e) {
             e.printStackTrace();
-            System.out.println("********************************************************");
         }
     }
 }

zd-visual/zd-monitor/src/main/java/com/zd/modules/monitor/config/TCPServer.java

@@ -68,8 +68,6 @@ public class TCPServer implements Runnable {
         synchronized(this) {
             CacheUtils.cacheMap.put(data.trim(),socket);
             CacheUtils.mStringThreadLocal.set((Map<String, Socket>) new ConcurrentHashMap<>().put(data.trim(),socket));
-            //System.out.println("CacheUtils.mStringThreadLocal:"+CacheUtils.mStringThreadLocal.get());
-            System.out.println(CacheUtils.cacheMap.get("TcpClient01"));
         }
         OutputStream out=socket.getOutputStream();
         Scanner input=new Scanner(System.in);

zd-visual/zd-monitor/src/main/java/com/zd/modules/monitor/config/TcpClient.java

@@ -9,7 +9,6 @@ import java.net.Socket;
 public class TcpClient {
     public static void main(String[] args){
        //for(int i=0;i<5;i++){
-           //System.out.println("==========================执行第"+i+"次=========================");
            //socket对象初始化
            Socket socket = null;
            //输出流 os对象初始化
@@ -26,12 +25,10 @@ public class TcpClient {
                for(int j=0;j<10;j++){
                    os.write("TcpClient".getBytes());
                    Thread.sleep(100);
-                   System.out.println(in.read());
                }
            } catch (IOException | InterruptedException e) {
                e.printStackTrace();
            } finally {
-               System.out.println("TcpClient:执行了");
                //4、释放资源,别忘了哦！！！！
 //               if(socket!=null){
 //                   try {

zd-visual/zd-monitor/src/main/java/com/zd/modules/monitor/config/TcpClient01.java

@@ -9,7 +9,6 @@ import java.net.Socket;
 public class TcpClient01 {
     public static void main(String[] args){
        //for(int i=0;i<5;i++){
-           //System.out.println("==========================执行第"+i+"次=========================");
            //socket对象初始化
            Socket socket = null;
            //输出流 os对象初始化
@@ -26,12 +25,10 @@ public class TcpClient01 {
                for(int j=0;j<10;j++){
                    os.write("TcpClient01".getBytes());
                    Thread.sleep(100);
-                   System.out.println(in.read());
                }
            } catch (IOException | InterruptedException e) {
                e.printStackTrace();
            } finally {
-               System.out.println("TcpClient01:执行了");
                //4、释放资源,别忘了哦！！！！
 //               if(socket!=null){
 //                   try {

zd-visual/zd-monitor/src/main/java/com/zd/modules/monitor/config/replyClient.java

@@ -10,9 +10,7 @@ import java.util.Map;
 public class replyClient {
     public static void main(String[] args) {
         Map<String, Socket> cacheMap= CacheUtils.mStringThreadLocal.get();
-        System.out.println("replyClient cacheMap.keySet().size():"+cacheMap.keySet().size());
         for(String cache:cacheMap.keySet()){
-            System.out.println("replyClient cache:"+cache);
             try {
                 OutputStream out=cacheMap.get(cache).getOutputStream();
                 out.write(("huifu"+cache).getBytes());