添加外单位设备以及用户添加错误bug

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

@@ -73,6 +73,14 @@ public class ExternalUnitEquipController {
     }
 
 
+    @ApiOperation(value = "根据需要查询是否存在", notes = "登记信息")
+    @GetMapping("/selectNum/{num}")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity queryById(@PathVariable String num) {
+
+        return ResponseEntity.ok(externalUnitEquipService.queryNum(num));
+    }
+
 
     @ApiOperation(value = "条件查询相关数据列表", notes = "登记信息")
     @PostMapping("/queryPage")

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

@@ -20,4 +20,6 @@ public interface ExternalUnitEquipDao  extends JpaRepository<ExternalUnitEquip,
 
     List<ExternalUnitEquip> findAllByUnitName(String name);
 
+    boolean existsByNum(String num);
+
 }

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

@@ -30,6 +30,8 @@ public interface ExternalUnitEquipService {
 
     ExternalUnitEquip queryById(Integer id);
 
+    boolean queryNum(String num);
+
 
 
 }

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

@@ -62,6 +62,11 @@ public class ExternalUnitEquipServiceImpl implements ExternalUnitEquipService {
         return externalUnitEquipDao.findById(id).get();
     }
 
+    @Override
+    public boolean queryNum(String num) {
+        return externalUnitEquipDao.existsByNum(num);
+    }
+
 
     private PredicateBuilder<ExternalUnitEquip> getPredicateBuilder(ExternalSelectVo externalSelectVo) {
         PredicateBuilder<ExternalUnitEquip> predicateBuilder = Specifications.and();

dev-union/src/main/resources/application-test.properties

@@ -5,7 +5,6 @@ spring.datasource.username=SYSDBA
 spring.datasource.password=szoscar55
 spring.jpa.database-platform=org.hibernate.dialect.OscarDialect
 file.path=/opt/zb/
-#preview.path=http://10.153.4.11:8088/equip/file/
 preview.path=http://10.153.4.80:8088/equip/file/
 
 spring.boot.admin.client.url=http://localhost:8769
@@ -25,4 +24,5 @@ block.carrier.ip=http://10.153.4.80:8088/block
 
 check.time.last=/opt/zb/check
 
-ven.http=http://10.153.4.80:8081
+ven.http=http://10.153.4.81:8081
+

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UserDao.java

@@ -33,7 +33,8 @@ public interface UserDao extends JpaRepository<User, Integer>, JpaSpecificationE
 
     User findByName(String name);
 
-    User findByNameAndUnitsId(String name,Integer unitsId);
+    User findByNameAndUnitsIdAndIsDel(String name,Integer unitsId,Integer del);
+
 
     List<User> findBySubordinateId(Integer userID);
 

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -93,7 +93,7 @@ public class UserServiceImpl implements UserService {
         }
         user.setShowOrder(maxShowOrder+1);
         //先判断用户名是否被注册
-        User byName= userDao.findByNameAndUnitsId(user.getName(),user.getUnitsId());
+        User byName= userDao.findByNameAndUnitsIdAndIsDel(user.getName(),user.getUnitsId(),0);
         if (byName != null){
             if (byName.getTrainStatus()==5 && byName.getUsername()==null){
                 user.setUserId(byName.getUserId());

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/VenitalisServiceImpl.java

@@ -16,6 +16,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -93,7 +95,7 @@ public class VenitalisServiceImpl implements VenitalisService {
         if (contrastRet.getResult_code().equals("ok") && contrastRet.getAuth_result()){
             return Integer.valueOf(contrastRet.getPersonVoList().get(0).getUid());
         }else {
-          throw new ApiException(ResponseEntity.status(500).body(contrastRet));
+          throw new BadCredentialsException(ret);
         }
 
     }