Merge remote-tracking branch 'origin/demo_' into demo_

platform-service/src/main/java/com/platform/service/remote/impl/RemoteOpcServiceImpl.java

@@ -63,14 +63,14 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
     @Override
     public RemoteOpc saveModelByDTO(RemoteOpcDTO model) {
         // 新增判断点位是否已经存在了
-        Weekend<RemoteOpc> weekend = new Weekend<>(RemoteOpc.class);
+        /*Weekend<RemoteOpc> weekend = new Weekend<>(RemoteOpc.class);
         WeekendCriteria<RemoteOpc, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(RemoteOpc::getDescription, model.getDescription()).andEqualTo(RemoteOpc::getLine, model.getLine());
         int count = mapper.selectCountByExample(weekend);
         // 不存在在设置点位信息
         if (count > 0) {
             throw new BusinessException("该点位已经存在，无法新增，请点击查询进行修改，数量：" + count);
-        }
+        }*/
         if (model.getType() == RemoteOpcTypeEnum.PUTONG.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
             model.setAvFlag(YesNoEnum.YES.getValue());
@@ -102,7 +102,7 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
     @Override
     public void modModelByDTO(RemoteOpcDTO model) {
         // 新增判断点位是否已经存在了
-        Weekend<RemoteOpc> weekend = new Weekend<>(RemoteOpc.class);
+       /* Weekend<RemoteOpc> weekend = new Weekend<>(RemoteOpc.class);
         WeekendCriteria<RemoteOpc, Object> weekendCriteria = weekend.weekendCriteria();
         weekendCriteria.andEqualTo(RemoteOpc::getDescription, model.getDescription()).andEqualTo(RemoteOpc::getLine, model.getLine());
         List<RemoteOpc> list = mapper.selectByExample(weekend);
@@ -115,7 +115,7 @@ public class RemoteOpcServiceImpl extends BaseServiceImpl<RemoteOpcMapper, Remot
                     throw new BusinessException("该点位已经重复，无法修改");
                 }
             }
-        }
+        }*/
         if (model.getType() == RemoteOpcTypeEnum.PUTONG.getValue()) {
             model.setPositionNum(model.getDescription() + "_AV");
             model.setAvFlag(YesNoEnum.YES.getValue());