2023-11-9 移除todo注释。

zd-auth/src/main/java/com/zd/auth/controller/TokenController.java

@@ -208,7 +208,7 @@ public class TokenController {
         int aioType = params.get("aioType") == null ? UserConstants.USER_LOGIN_AIO : Integer.parseInt(params.get("aioType") + "");
         logger.error("学习机登录，加密前：" + username + "，设备编码：" + machineCode);
         if (UserConstants.USER_LOGIN_HXP == aioType) {
-            // TODO 终端传参数据有问题，暂临时后端处理
+            // 终端传参数据有问题，暂临时后端处理
             //通过des生成对称加密卡号
             username = DESUtils.encrypt(DESUtils.completeMissing(username));
 

zd-common/common-core/src/main/java/com/zd/common/core/datascope/DataScopeAspect.java

@@ -178,7 +178,7 @@ public class DataScopeAspect {
             // 3：本部门以及指定部门（指定部门关联表中查询）
             List<Long> deptIds = permitInfo.getDeptIds();
             if(CollectionUtils.isEmpty(deptIds)){
-                // TODO 数据问题暂这样处理
+                // 数据问题暂这样处理
                 throw new PreAuthorizeException();
             }else {
 

zd-gateway/src/main/java/com/zd/gateway/filter/XssFilter.java

@@ -165,7 +165,7 @@ public class XssFilter implements GlobalFilter, Ordered {
      */
     public static String stripXSS(String value) {
         if (value != null) {
-            // TODO ESAPI library
+            // ESAPI library
             // NOTE: It's highly recommended to use the ESAPI library and uncomment the following line to
             // avoid encoded attacks.
             // value = ESAPI.encoder().canonicalize(value);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/alarm/utils/AlarmUtil.java

@@ -115,7 +115,7 @@ public class AlarmUtil {
                                 logger.info("数据data： "+  alarmLog.toString());
                                 if("失败".equals(map.get("status"))){
                                     logger.info("重发数据： "+  alarmLog.toString());
-                                    // TODO 运行异常 需记录 重拨ID或手机号 避免一次运行多次拨号
+                                    // 运行异常 需记录 重拨ID或手机号 避免一次运行多次拨号
                                     if(!failPhones.contains(alarmLog.getPhone()) && redisService.getCacheObject("retry" + alarmLog.getPhone()) == null){
                                         failPhones.add(alarmLog.getPhone());
                                         redisService.setCacheObject("retry" + alarmLog.getPhone(), alarmLog.getPhone(),150L, TimeUnit.SECONDS);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/forward/serivce/SendSginAccessLogService.java

@@ -227,7 +227,7 @@ public class SendSginAccessLogService {
         params.put("hardwareNum", properties.getHardwareNum());
         params.put("subId", properties.getLabId());
         params.put("val", 1);
-        // todo 发送火焰预警时，在缓存中存储redis数据，供小程序端展示使用  是否需要在redis中表明是哪个项目 方便后面查询
+        // 发送火焰预警时，在缓存中存储redis数据，供小程序端展示使用  是否需要在redis中表明是哪个项目 方便后面查询
         String jsonString = JSON.toJSONString(params);
         String key = CacheDevice.FIRE_CAMERA_KEY.getRedisKey()+":"+properties.getLabId();
         redisTemplate.opsForValue().set(key, jsonString, CacheDevice.FIRE_CAMERA_KEY.getRedisTime(), TimeUnit.HOURS);

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

@@ -89,7 +89,7 @@ public class ImageBioChangeUtil {
 //		try {
 //			imageBinary = getImageBinaryFromUrl("");
 //		} catch (Exception e) {
-//			// TODO Auto-generated catch block
+//			// Auto-generated catch block
 //			e.printStackTrace();
 //		}
         String outFilePath= "E://huoyan.jpg";

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

@@ -159,7 +159,7 @@ public class SipLayer implements SipListener {
 			try {
 				processor.process(evt, this, sipConfig);
 			} catch (ParseException e) {
-				// TODO Auto-generated catch block
+				// Auto-generated catch block
 				e.printStackTrace();
 			}
 
@@ -200,7 +200,7 @@ public class SipLayer implements SipListener {
 	 */
 	@Override
 	public void processTimeout(TimeoutEvent timeoutEvent) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 
 	}
 
@@ -216,7 +216,7 @@ public class SipLayer implements SipListener {
 	 */
 	@Override
 	public void processIOException(IOExceptionEvent exceptionEvent) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 	}
 
 	/**
@@ -231,7 +231,7 @@ public class SipLayer implements SipListener {
 	 */
 	@Override
 	public void processTransactionTerminated(TransactionTerminatedEvent transactionTerminatedEvent) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 	}
 
 	/**
@@ -246,7 +246,7 @@ public class SipLayer implements SipListener {
 	 */
 	@Override
 	public void processDialogTerminated(DialogTerminatedEvent dialogTerminatedEvent) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 	}
 
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java

@@ -144,7 +144,7 @@ public class SIPRequestHeaderPlarformProvider {
 				cNonce = UUID.randomUUID().toString();
 
 			}else if ("auth-int".equals(qop)){
-				// TODO
+				//
 			}
 		}
 		String HA1 = DigestUtils.md5DigestAsHex((parentPlatform.getDeviceGBId() + ":" + realm + ":" + parentPlatform.getPassword()).getBytes());

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

@@ -1004,7 +1004,7 @@ public class SIPCommander implements ISIPCommander {
 	 */
 	@Override
 	public boolean deviceConfigCmd(Device device) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 		return false;
 	}
 

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

@@ -205,8 +205,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
                 catalogXml.append("<Owner>" + channel.getOwner() + "</Owner>\r\n");
                 catalogXml.append("<CivilCode>" + channel.getCivilCode() + "</CivilCode>\r\n");
                 catalogXml.append("<Address>" + channel.getAddress() + "</Address>\r\n");
-                catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// TODO 当前不能添加分组， 所以暂时没有父节点
-                catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // TODO 当前不能添加分组， 所以暂时没有父节点
+                catalogXml.append("<Parental>" + channel.getParental() + "</Parental>\r\n");// 当前不能添加分组， 所以暂时没有父节点
+                catalogXml.append("<ParentID>" + channel.getParentId() + "</ParentID>\r\n"); // 当前不能添加分组， 所以暂时没有父节点
                 catalogXml.append("<Secrecy>" + channel.getSecrecy() + "</Secrecy>\r\n");
                 catalogXml.append("<RegisterWay>" + channel.getRegisterWay() + "</RegisterWay>\r\n");
                 catalogXml.append("<Status>" + (channel.getStatus() == 0?"OFF":"ON") + "</Status>\r\n");

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

@@ -21,7 +21,7 @@ public class CancelRequestProcessor extends SIPRequestAbstractProcessor {
 	 */
 	@Override
 	public void process(RequestEvent evt, Integer dpi) {
-		// TODO 优先级99 Cancel Request消息实现，此消息一般为级联消息，上级给下级发送请求取消指令
+		// 优先级99 Cancel Request消息实现，此消息一般为级联消息，上级给下级发送请求取消指令
 
 	}
 

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

@@ -208,7 +208,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
 						// if (sendRtpItem == null) return;
 						sendRtpItem.setStatus(1);
 						redisCatchStorage.updateSendRTPSever(sendRtpItem);
-						// TODO 添加对tcp的支持
+						// 添加对tcp的支持
 
 						StringBuffer content = new StringBuffer(200);
 						content.append("v=0\r\n");
@@ -266,7 +266,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
 
 					sendRtpItem.setStatus(1);
 					redisCatchStorage.updateSendRTPSever(sendRtpItem);
-					// TODO 添加对tcp的支持
+					// 添加对tcp的支持
 					StringBuffer content = new StringBuffer(200);
 					content.append("v=0\r\n");
 					content.append("o="+"00000"+" 0 0 IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");

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

@@ -520,7 +520,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 			String platformId = uri.getUser();
 			// if (deviceListElement == null) { // 存在DeviceList则为响应 catalog， 不存在DeviceList则为查询请求
 			if (name.equalsIgnoreCase("Query")) { // 区分是Response——查询响应，还是Query——查询请求
-				// TODO 后续将代码拆分
+				// 后续将代码拆分
 				ParentPlatform parentPlatform = storager.queryParentPlatByServerGBId(platformId);
 				if (parentPlatform == null) {
 					response404Ack(evt);

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

@@ -196,7 +196,7 @@ public class NotifyRequestProcessor extends SIPRequestAbstractProcessor {
 				}
 				storager.insertMobilePosition(mobilePosition);
 			}
-			// TODO: 需要实现存储报警信息、报警分类
+			//: 需要实现存储报警信息、报警分类
 
 			// 回复200 OK
 			response200Ok(evt);

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

@@ -24,7 +24,7 @@ public class ByeResponseProcessor implements ISIPResponseProcessor {
 	 */
 	@Override
 	public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 	}
 
 }

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

@@ -25,7 +25,7 @@ public class CancelResponseProcessor implements ISIPResponseProcessor {
 	 */
 	@Override
 	public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 
 	}
 

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

@@ -24,7 +24,7 @@ public class OtherResponseProcessor implements ISIPResponseProcessor {
 	 */
 	@Override
 	public void process(ResponseEvent evt, SipLayer layer, SipConfig config) {
-		// TODO Auto-generated method stub
+		// Auto-generated method stub
 
 	}
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -229,7 +229,7 @@ public class ZLMHttpHookListener {
 		if (logger.isDebugEnabled()) {
 			logger.debug("ZLM HOOK on_shell_login API调用，参数：" + json.toString());
 		}
-		// TODO 如果是带有rtpstream则开启按需拉流
+		// 如果是带有rtpstream则开启按需拉流
 		// String app = json.getString("app");
 		// String stream = json.getString("stream");
 		String mediaServerId = json.getString("mediaServerId");

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/media/zlm/ZLMRTPServerFactory.java

@@ -133,7 +133,7 @@ public class ZLMRTPServerFactory {
         String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
         int localPort = createRTPServer(serverItem, playSsrc);
         if (localPort != -1) {
-            // TODO 高并发时可能因为未放入缓存而ssrc冲突
+            // 高并发时可能因为未放入缓存而ssrc冲突
             serverItem.getSsrcConfig().releaseSsrc(playSsrc);
             closeRTPServer(serverItem, playSsrc);
         }else {
@@ -168,7 +168,7 @@ public class ZLMRTPServerFactory {
         String playSsrc = serverItem.getSsrcConfig().getPlaySsrc();
         int localPort = createRTPServer(serverItem, playSsrc);
         if (localPort != -1) {
-            // TODO 高并发时可能因为未放入缓存而ssrc冲突
+            // 高并发时可能因为未放入缓存而ssrc冲突
             serverItem.getSsrcConfig().releaseSsrc(ssrc);
             closeRTPServer(serverItem, playSsrc);
         }else {

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/media/zlm/ZLMRunner.java

@@ -88,7 +88,7 @@ public class ZLMRunner implements CommandLineRunner {
                 }
                 startGetMedia = null;
             }
-            //  TODO 清理数据库中与redis不匹配的zlm
+            // 清理数据库中与redis不匹配的zlm
             }
         }, 60 * 1000 * 2);*/
     }

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

@@ -235,7 +235,7 @@ public class PlayServiceImpl implements IPlayService {
                 }
             } else {
                 logger.info("==================rtpInfo不满足条件=================",rtpInfo);
-                // TODO 点播前是否重置状态
+                // 点播前是否重置状态
                 redisCatchStorage.stopPlay(streamInfo);
                 storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
                 logger.info("==================RTP 关闭流=================",rtpInfo);

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

@@ -159,7 +159,7 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
                 // 如果关联了国标那么移除关联
                 gbStreamMapper.del(app, stream);
                 platformGbStreamMapper.delByAppAndStream(app, stream);
-                // TODO 如果关联的推流， 那么状态设置为离线
+                // 如果关联的推流， 那么状态设置为离线
             }
         }
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -577,7 +577,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
 		if (streamPushItems == null || streamPushItems.size() == 0) return;
 		logger.info("updateMediaList:  " + streamPushItems.size());
 		streamPushMapper.addAll(streamPushItems);
-		// TODO 待优化
+		// 待优化
 		for (int i = 0; i < streamPushItems.size(); i++) {
 			gbStreamMapper.setStatus(streamPushItems.get(i).getApp(), streamPushItems.get(i).getStream(), true);
 		}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/platform/PlatformController.java

@@ -105,7 +105,7 @@ public class PlatformController {
         ){
             return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST);
         }
-        // TODO 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册
+        // 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册
 
         // ParentPlatform parentPlatformOld = storager.queryParentPlatById(parentPlatform.getDeviceGBId());
         ParentPlatform parentPlatformOld = storager.queryParentPlatByServerGBId(parentPlatform.getServerGBId());

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/web/ApiDeviceController.java

@@ -119,11 +119,11 @@ public class ApiDeviceController {
             deviceJOSNChannel.put("DeviceID", device.getDeviceId());
             deviceJOSNChannel.put("DeviceName", device.getName());
             deviceJOSNChannel.put("DeviceOnline", device.getOnline() == 1);
-            deviceJOSNChannel.put("Channel", 0); // TODO 自定义序号
+            deviceJOSNChannel.put("Channel", 0); // 自定义序号
             deviceJOSNChannel.put("Name", deviceChannel.getName());
             deviceJOSNChannel.put("Custom", false);
             deviceJOSNChannel.put("CustomName", "");
-            deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // TODO ? 子节点数, SubCount > 0 表示该通道为子目录
+            deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // ? 子节点数, SubCount > 0 表示该通道为子目录
             deviceJOSNChannel.put("SnapURL", "");
             deviceJOSNChannel.put("Manufacturer ", deviceChannel.getManufacture());
             deviceJOSNChannel.put("Model", deviceChannel.getModel());

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

@@ -176,7 +176,7 @@ public class MqttConfig {
         return new MessageHandler() {
             @Override
             public void handleMessage(Message<?> message) throws MessagingException {
-                // TODO 不使用mqtt方式打电话发短信，测试完成之后删除该代码
+                // 不使用mqtt方式打电话发短信，测试完成之后删除该代码
 //                logger.info("预警消息接收内容： message={}", message);
 //                String receivedTopic = (String) message.getHeaders().get(MqttHeaders.RECEIVED_TOPIC);
 //                String msg = (String) message.getPayload();
@@ -246,4 +246,4 @@ public class MqttConfig {
             logger.error("报警电话推送错误：" + JSON.toJSONString(map));
         }
     }
-}
+}

zd-modules/zd-algorithm/src/main/java/com/zd/alg/rfid/handler/SocketHandler.java

@@ -55,7 +55,7 @@ public class SocketHandler extends ChannelInboundHandlerAdapter {
         log.info("需要存入数据");
         synchronized (this){
             // 根据实际业务应用实现下方接口,进行业务操作，可根据type多方实现，多方发送接收到的编码
-            // TODO document why this method is empty
+            // document why this method is empty
 
 //            ISendService sendService = SpringUtils.getBean(ISendService.class);
 //            sendService.send(upperCase,0);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/rfid/sdk/WuYuanRFIDServiceImpl.java

@@ -119,7 +119,7 @@
 //
 //    @Override
 //    public boolean alarm(RemoteLabHardware hardware) {
-//        // TODO document why this method is empty
+//        // document why this method is empty
 //        return false;
 //    }
 //

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

@@ -234,7 +234,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
         // 查询用户信息
         logger.info("双卡验证，用户卡号：" + userValidationVo.getCardNum());
 //        String cardNum = Long.toHexString(Long.parseLong(userValidationVo.getCardNum())).toUpperCase();
-        // TODO 终端传参数据有问题，暂临时后端处理
+        // 终端传参数据有问题，暂临时后端处理
         String cardNum = DESUtils.encrypt(DESUtils.completeMissing(userValidationVo.getCardNum()));
 
         R<SysUser> user = remoteUserService.getUserInfoByCardNum(cardNum, SecurityConstants.INNER);
@@ -253,7 +253,7 @@ public class HxpUserecordServiceImpl implements IHxpUserecordService {
         if(count > 0){
 
         }/*else if(){
-            // TODO 判断是否有申请门禁开锁
+            // 判断是否有申请门禁开锁
         }*/
         else {
             throw new ServiceException("您当前无权限验证，请联系管理员！");

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

@@ -156,7 +156,7 @@ public class SmsSydUtil {
         sydSmsLog.setReply(0);
         List<SydSmsLog> list = sydSmsLogService.selectSydSmsLogList(sydSmsLog);
 
-        // TODO 测试原因，咱注释掉
+        // 测试原因，咱注释掉
         /*if(list.size() == 0){
             return;
         }*/

zd-modules/zd-exam/src/main/java/com/zd/exam/domain/ElCourse.java

@@ -480,7 +480,7 @@ public class ElCourse extends BaseEntity{//  implements QCInterface
 //    @Override
     public String getQrCodeUrl() {
         return "";
-        // TODO 二维码 下个版本做
+        // 二维码 下个版本做
 //        return StrUtil.format(SysProperties.getQrcodeFormat(),id, 4) ;
     }
 

zd-modules/zd-exam/src/main/java/com/zd/exam/service/convert/ConvertTimingService.java

@@ -165,7 +165,7 @@ public class ConvertTimingService {
                 channelType = ConvertType.rewardType.PRACTISE.toString();
                 deductPoints = convertRecord.getBusinessNum() * rpactiseRule;
                 convertRecord.setUseNum(convertRecord.getBusinessNum());
-                // TODO 考核的课程章节
+                // 考核的课程章节
                 reason = "考核得分";
             }
 
@@ -186,7 +186,7 @@ public class ConvertTimingService {
                     convertRecordService.updateElConvertRecord(convertRecord);
 
                     if(isLegacy && legacyNum > 0){
-                        // TODO 如果有，则先遗留记录，欠缺 触发的实际换算，
+                        // 如果有，则先遗留记录，欠缺 触发的实际换算，
                         ElConvertRecord convertLegacy = new ElConvertRecord();
                         convertLegacy.setType(convertRecord.getType());
                         // 此处业务ID 为父级ID

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElChapterLearnRecordServiceImpl.java

@@ -202,7 +202,7 @@ public class ElChapterLearnRecordServiceImpl implements IElChapterLearnRecordSer
                 convertRecordId = elConvertRecord.getId();
             }
 
-            // TODO 区分黑名单和负面清单
+            // 区分黑名单和负面清单
 
             //  练习结束 恢复黑名单
             LabBlackConfig blackConfig = bonusPointsService.getBlackTimeArea(learnRecord.getJoinUserId());

zd-modules/zd-exam/src/main/java/com/zd/exam/service/impl/ElPaperServiceImpl.java

@@ -622,7 +622,7 @@ public class ElPaperServiceImpl implements IElPaperService {
         Long convertRecordId = null;
         if(Integer.parseInt(map.get("accuracy") + "") == 100){
 
-            // TODO 未学习完成，不可获得考核奖励分 且考核分值不算数
+            // 未学习完成，不可获得考核奖励分 且考核分值不算数
             Long correctly = Long.parseLong(map.get("correctly")+"");
             ElConvertRecord elConvertRecord = new ElConvertRecord();
             elConvertRecord.setType(ConvertType.ASSESS);

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

@@ -469,7 +469,7 @@ public class LabCheckRecordController extends BaseController {
         List<Long> deptIds= listdeptids.getData();
         map.put("deptIds", deptIds);
 
-         // TODO 白老师证号特殊处理
+         // 白老师证号特殊处理
         if(sysUser.getUserId() == 92612){
             map.put("deptId", sysUser.getDept().getDeptId());
             map.put("remark", null);

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

@@ -140,7 +140,7 @@ public class LabSafeBookController extends BaseController {
 //    @PreAuthorize(hasPermi = "laboratory:safe_book:query")
     @GetMapping(value = "/{id}")
     public ResultData<LabSafeBook> getInfo(@PathVariable("id") Long id, HttpServletRequest request) {
-        // TODO: 2022/3/25  基于内外网访问先做成这个样子，后期优化
+        //: 2022/3/25  基于内外网访问先做成这个样子，后期优化
         //String baseUrl=request.getServerName();
         //String baseUrl=request.getHeader("X-Real-IP");
         //String baseUrls=request.getHeader("X-Forwarded-For");

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

@@ -165,7 +165,7 @@ public class RedisExpiredAndWorkListener extends KeyExpirationEventMessageListen
                     }
                 }
                 log.info("2------------------------------------》信标丢失："+beaconStr[1]+",实验室id："+beaconStr[2]);
-                // todo 这里需要根据实验室id查询对应的网关，通过网关查询redis，排查是不是有网关掉线了，如果有，就不通知报警，如果没有，发出报警
+                // 这里需要根据实验室id查询对应的网关，通过网关查询redis，排查是不是有网关掉线了，如果有，就不通知报警，如果没有，发出报警
                 Boolean flag = Boolean.TRUE;
                 ResultData<List<Map<String,Object>>> resultData = remoteAirBottleService.getBluetoothBySubId(Long.parseLong(beaconStr[2]));
                 if(resultData.getCode()==200){

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

@@ -359,7 +359,7 @@ public class MqttConfig {
                     logger.info("topic:" + receivedTopic);
                     ReturnMessageProcessing(message, receivedTopic);
                 }
-                // TODO
+                //
 //                MessageBody messageBody = JSONObject.parseObject(messageStr, MessageBody.class);
 //                mqttResHandler.deal(JSONUtil.toBean(msg,com.ffy.mqtt.model.Message.class));
                 List<LabMessageEvent> labMessageEvents = labMessMap.get(receivedTopic);

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

@@ -260,7 +260,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
                 } else {
                     //是否有拍照检查记录
                     LabPhotoInspection labPhotoInspection = labPhotoInspectionService.selectLabPhotoInspectionById(sigInAndGet.getId());
-                    // TODO 白向玉 92612 不需要签到和签出验证
+                    // 白向玉 92612 不需要签到和签出验证
                     if (labPhotoInspection == null && signInfoVO.getSingInUser().getUserId() != 92612) {
                         //检验实验室是否配置了检查项，如果没有，直接签退离开
                         if(StringUtils.isEmpty(subject.getCheckOut())){

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

@@ -306,7 +306,7 @@ public class LabCheckOptionServiceImpl implements ILabCheckOptionService {
             if(CollectionUtils.isNotEmpty(labCheckOptionMapper.selectLabCheckOptionList(labCheckOption))){
                 throw new ServiceException("删除失败，请先删除子节点！");
             }
-            // TODO 校验该检查性是否使用，如果使用则不能删除
+            // 校验该检查性是否使用，如果使用则不能删除
         }
 
         return labCheckOptionMapper.deleteLabCheckOptionByIds(ids);

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -297,7 +297,7 @@ public class SysUserController extends BaseController {
                 if (sysUser.getUserType().equals(list.get(0).getUserType()) && "-1".equals(list.get(0).getUserType())) {
                     return R.fail("登录失败，没有使用权限！");
                 }
-                // TODO 校验是否有柜锁权限
+                // 校验是否有柜锁权限
                 Optional.ofNullable(list.get(0).getSmartLock()).ifPresent(a -> {
                     sysUserVo.setCabinetLock(a != null && a == 1 ? true : false);
                 });

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

@@ -51,7 +51,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
             perms.add("*:*:*");
         } else {
             if (UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())) {
-                // TODO 学生权限暂处理，项目拆分之后需要删除
+                // 学生权限暂处理，项目拆分之后需要删除
                 perms.addAll(menuService.selectMenuByStudent());
             } else {
                 Set<String> data = menuService.selectNewMenuPermsByUserId(sysUser.getUserId());