bug 配套设备库：修改序列号

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/MatchingDeviceController.java

@@ -646,6 +646,7 @@ public class MatchingDeviceController {
             MatchingDeviceModel matchingDeviceModel1 = new MatchingDeviceModel();
             matchingDeviceModel1.setModel(model);
             matchingDeviceModel1.setName(createSeqVo.getName());
+            matchingDeviceModel1.setStyle(createSeqVo.getStyle());
             MatchingDeviceModel addEntity = matchingDeviceModelService.addEntity(matchingDeviceModel1);
             idString = addEntity.getId().toString();
         }

dev-matching/src/main/java/com/tykj/dev/device/matching/repository/MatchingDeviceModelDao.java

@@ -4,12 +4,16 @@ import com.tykj.dev.device.matching.subject.domin.MatchingDeviceModel;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 /**
  * @author zsp
  */
 public interface MatchingDeviceModelDao extends JpaRepository<MatchingDeviceModel, Integer>, JpaSpecificationExecutor<MatchingDeviceModel> {
 
         MatchingDeviceModel findByModel(String model);
-        MatchingDeviceModel findByModelAndName(String model,String name);
+//        MatchingDeviceModel findByModelAndName(String model,String name);
+        List<MatchingDeviceModel> findByModelAndName(String model, String name);
+
         MatchingDeviceModel findByModelAndNameAndStyle(String model,String name,String style);
 }

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/MatchingDeviceModelServiceImpl.java

@@ -6,6 +6,8 @@ import com.tykj.dev.device.matching.subject.domin.MatchingDeviceModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.stream.Collectors;
+
 @Service
 public class MatchingDeviceModelServiceImpl implements MatchingDeviceModelService {
 
@@ -24,7 +26,9 @@ public class MatchingDeviceModelServiceImpl implements MatchingDeviceModelServic
 
     @Override
     public MatchingDeviceModel findByModelAndName(String model, String name) {
-        return matchingDeviceModelDao.findByModelAndName(model,name);
+
+        return matchingDeviceModelDao.findByModelAndName(model,name).stream().filter(matchingDeviceModel -> !"0".equals(matchingDeviceModel.getStyle()))
+                .collect(Collectors.toList()).get(0);
     }
 
     @Override