代码漏洞修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabGradeManageWorkService.java

@@ -15,6 +15,11 @@ import java.util.List;
  */
 public interface ILabGradeManageWorkService {
 
+    /***
+     *
+     * @param labGradeManage
+     * @return
+     */
     @Deprecated
     List<LabGradeManageWorkVO> selectMyGradeManageWorkList(LabGradeManage labGradeManage);
 

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

@@ -48,16 +48,6 @@ public class BigViewServiceImpl {
     @Autowired
     ILabSubjectLayoutService subjectLayoutService;
 
-//    /**
-//     * 获取设备状态echaerts图表
-//     * @return
-//     */
-//    public Option queryHardwareStateEcherts()
-//    {
-//        List<HardwareState> hardwareStates = queryHardwareState();
-//
-//
-//    }
 
     /**
      * 查询硬件状态统计
@@ -100,8 +90,6 @@ public class BigViewServiceImpl {
         labSubject.setIsDel(false);
         labSubject.setBuildId(buildId);
         List <LabSubjectVO> labSubjectVOS = labSubjectMapper.selectLabSubjectVOList(labSubject);
-//        List<LabSubject> labSubjects = hardwareStateMapper.queryFocusSub(size);
-
        return labSubjectManagerService.completeMainSubInfo(labSubjectVOS);
     }
 
@@ -124,17 +112,6 @@ public class BigViewServiceImpl {
                 .stream()
                 .collect(Collectors.toMap(SubAddrr::getId, Function.identity()));
 
-        /*return labSubjects.stream()
-                .map(a -> {
-                    SubSimpleVO simpleVO = new SubSimpleVO();
-                    simpleVO.setSubId(a.getId());
-                    simpleVO.setAddress(Optional.ofNullable(subAddrrMap.get(a.getLayoutId())).map(SubAddrr::addrrPlus).orElse(StrUtil.EMPTY));
-                    simpleVO.setOnline(a.getOnline());
-                    simpleVO.setSubName(a.getName());
-                    return simpleVO;
-                })
-                .collect(Collectors.toList());*/
-
         labSubjectEntities.forEach(sub -> {
             sub.setAddress(Optional.ofNullable(subAddrrMap.get(sub.getLayoutId())).map(SubAddrr::addrrPlus).orElse(StrUtil.EMPTY));
             // subDept 实验室分类

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

@@ -231,7 +231,6 @@ public class LabAbnormalServiceImpl implements ILabAbnormalService {
         logger.warn("传感器/采集器：" + expiredKey + " --  上报时长超过1分40秒");
 
         LabSensor labSensor = new LabSensor();
-        //labSensor.setGatewayId(expiredKey.replace(CacheConstants.SENSOR_LIFE, ""));
         labSensor.setGatewayId(expiredKey);
         List<LabSensorVO> list = labSensorMapper.selectLabSensorList(labSensor);
 

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

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

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

@@ -92,13 +92,11 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
         int flag = labAudioSynthesisMapper.insertLabAudioSynthesis(labAudioSynthesis);
         if(flag>0){
 
-//            FfmpegConsole console = new FfmpegConsole();
             String cmd ="/usr/bin/ffmpeg -i "+labAudioSynthesis.getMusicUrl()+" -i "+labAudioSynthesis.getBgmusicUrl()+" -filter_complex \"[0:a]aformat=sample_fmts=fltp:channel_layouts=stereo,volume="+labAudioSynthesis.getMusicVolume()+"[a0]; [1:a]aformat=sample_fmts=fltp:channel_layouts=stereo,volume="+labAudioSynthesis.getBgmusicVolume()+",adelay=5000|5000|5000,apad[a1]; [a0][a1]amerge=inputs=2[aout]\" -shortest -map \"[aout]\" -ac 2 "+localFilePath+"";
             log.error("cmd："+cmd);
             try {
                 new Thread(()->this.exec(cmd)).start();
             }catch (Exception e) {
-                //e.printStackTrace();
                 flag = 0;
             }
         }
@@ -161,7 +159,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             pro.waitFor();
             this.stop();
         } catch (Exception e) {
-            //e.printStackTrace();
+
         }
     }
 
@@ -183,7 +181,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             while ((str = br.readLine()) != null) {
             }
         } catch (IOException e) {
-            //e.printStackTrace();
+
         } finally {
             close(br, isr, stream);
         }
@@ -193,7 +191,7 @@ public class LabAudioSynthesisServiceImpl implements ILabAudioSynthesisService
             try {
                 ac.close();
             } catch (Exception e) {
-                //e.printStackTrace();
+
             }
         }
     }

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

@@ -174,11 +174,7 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
                     userBlackNew.setJoinUserId(userBlack.getJoinUserId());
                     userBlackNew.setReason(labBlacklistVO.getReason());
                     userBlackNew.setCreditScore(labBlacklistVO.getCreditScore());
-//                    if(StringUtils.isNotNull(tokenService.getLoginUser())){
-//                        userBlackNew.setUpdateBy(tokenService.getLoginUser().getSysUser().getNickName());
-//                    }else{
-//                    userBlackNew.setUpdateBy("系统用户");
-//                    }
+
                     if(!labBlacklistVO.getFlagAction()){
                         if(tokenService.getLoginUser()!=null){
                             userBlackNew.setUpdateBy(tokenService.getLoginUser().getNickName());
@@ -202,9 +198,7 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
                     labBlacklistNew.setJoinUserId(labBlacklistVO.getJoinUserId());
                     labBlacklistNew.setBlacklistStatus(1);
                     labBlacklistNew.setReason(labBlacklistVO.getReason());
-                    //设置其他公共字段
-//                    SaveUtil.setCommonAttr(labBlacklistNew);
-//                    labBlacklistNew.setCreateBy("系统用户");
+
                     if(!labBlacklistVO.getFlagAction()){
                         if(tokenService.getLoginUser()!=null){
                             labBlacklistNew.setCreateBy(tokenService.getLoginUser().getNickName());
@@ -244,14 +238,12 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
             if(passConfigdetailVO.getWarningStatus()==1){
                 //这里需要通知警告
                 LabMessageContent labMessageContent = new LabMessageContent();
-//                labMessageContent.setSendMode(1);
                 labMessageContent.setSendRange(3);
                 labMessageContent.setMessClass(1);
                 labMessageContent.setContent("您由于多次违规，现已将你移入到黑名单，如需解除，需要根据黑名单规定，参加指定学习！！");
                 labMessageContent.setUserIds(labBlacklistNew.getJoinUserId()+"");
                 labMessageContent.setUserId(-2L);
                 labMessageContent.setCreateTime(new Date());
-//                labMessageContent.setCreateBy("系统用户");
                 if(!flagAction) {
                     if (tokenService.getLoginUser() != null) {
                         labMessageContent.setCreateBy(tokenService.getLoginUser().getNickName());
@@ -268,14 +260,12 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
             if(passConfigdetailVO.getInterviewStatus()==1){
                 //这里需要约谈通知，具体需不需要保存字段，等周一讨论
                 LabMessageContent labMessageContent = new LabMessageContent();
-//                labMessageContent.setSendMode(1);
                 labMessageContent.setSendRange(3);
                 labMessageContent.setMessClass(1);
                 labMessageContent.setContent("您由于违规，需要联系实验室老师进行沟通！！");
                 labMessageContent.setUserIds(labBlacklistNew.getJoinUserId()+"");
                 labMessageContent.setUserId(-2L);
                 labMessageContent.setCreateTime(new Date());
-//                labMessageContent.setCreateBy("系统用户");
                 if(!flagAction) {
                     if (tokenService.getLoginUser() != null) {
                         labMessageContent.setCreateBy(tokenService.getLoginUser().getNickName());
@@ -314,9 +304,6 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
             blackdetail.setOverStatus(0);
             blackdetail.setHandleDay(getExpireDate(passConfigdetailVO.getHandleDay()));
             blackdetail.setCreditScore(Long.parseLong(labBlacklistNew.getCreditScore()));
-            //设置其他公共字段
-//            SaveUtil.setCommonAttr(blackdetail);
-//            blackdetail.setCreateBy("系统用户");
             if(!flagAction) {
                 if(tokenService.getLoginUser()!=null){
                     blackdetail.setCreateBy(tokenService.getLoginUser().getNickName());
@@ -334,9 +321,6 @@ public class LabBlacklistServiceImpl implements ILabBlacklistService {
             LabBlackdetail blackdetail = new LabBlackdetail();
             blackdetail.setBlackId(labBlacklistNew.getId());
             blackdetail.setReason(labBlacklistNew.getReason());
-            //设置其他公共字段
-//            SaveUtil.setCommonAttr(blackdetail);
-//            blackdetail.setCreateBy("系统用户");
             if(!flagAction) {
                 if(tokenService.getLoginUser()!=null){
                     blackdetail.setCreateBy(tokenService.getLoginUser().getNickName());