[清退代码] 提交

dev-rfid/src/main/java/com/tykj/dev/rfid/service/impl/RfidServiceImpl.java

@@ -86,7 +86,7 @@ public class RfidServiceImpl implements RfidService {
     @Override
     public boolean printString(String makeNumber,String deviceNumber,String content) {
         try {
-            Connection connection = new TcpConnection("192.168.0.222", 6101);
+            Connection connection = new TcpConnection("10.153.4.16", 6101);
             connection.open();
             printer = ZebraPrinterFactory.getInstance(connection);
             String demoFile = createDemoFile(printer.getPrinterControlLanguage(),makeNumber,deviceNumber, content, 60, 55);

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelQueryServiceImpl.java

@@ -157,21 +157,22 @@ public class RepelQueryServiceImpl implements RepelQueryService {
     @Override
     public List<DevRepelVo> findRepelListModelNameGroup(ModelAndTypeVo modelAndTypeVo) {
         Units units=  unitsService.findById(modelAndTypeVo.getUnitId());
-        if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()==null){
-          return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
-                  .map(this::devRepelVo).collect(Collectors.toList());
-        }else if (modelAndTypeVo.getModel()!=null&&modelAndTypeVo.getType()==null){
-            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
-                    .map(this::devRepelVo).collect(Collectors.toList());
-        }else if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()!=null){
+//        if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()==null){
+//          return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
+//                  .map(this::devRepelVo).collect(Collectors.toList());
+//        }else if (modelAndTypeVo.getModel()!=null&&modelAndTypeVo.getType()==null){
+//            return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
+//                    .map(this::devRepelVo).collect(Collectors.toList());
+//        }else if (modelAndTypeVo.getModel()==null&&modelAndTypeVo.getType()!=null){
             return deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().map(DeviceLibrary::setConfigName)
-                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+                    .filter(deviceLibrary -> deviceLibrary.getType()==null ||deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+                    .filter(deviceLibrary -> deviceLibrary.getModel()==null|| deviceLibrary.getModel().equals(modelAndTypeVo.getModel()))
                     .map(this::devRepelVo).collect(Collectors.toList());
-        }else {
-          return  deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
-                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
-                   .map(this::devRepelVo).collect(Collectors.toList());
-        }
+//        }else {
+//          return  deviceLibraryDao.findAllByOwnUnitAndLocationUnitAndLifeStatus(units.getName(),units.getName(),15).stream().filter(deviceLibrary -> deviceLibrary.getModel().equals(modelAndTypeVo.getModel())).map(DeviceLibrary::setConfigName)
+//                    .filter(deviceLibrary -> deviceLibrary.getType().equals(modelAndTypeVo.getType()))
+//                   .map(this::devRepelVo).collect(Collectors.toList());
+//        }
     }