feat(装备模块): 根据单位名称查询设备

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryController.java

@@ -1366,6 +1366,12 @@ public class DeviceLibraryController {
         return ResponseEntity.ok(deviceLibraries);
     }
 
+    @PostMapping("/queryByOwnUnit")
+    @ApiOperation(value = "根据单位名称查询单位所属设备")
+    public ResponseEntity<List<DeviceLibrary>> queryByOwnUnit(@RequestBody DevNameVO devNameVO){
+        return ResponseEntity.ok(deviceLibraryService.queryByOwnUniName(devNameVO.getName()));
+    }
+
 
 //    @ApiOperation(value = "修改单位名称", notes = "修改单位名称")
 //    @PostMapping("/updateDeviceLocationAndOwnUnit")

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java

@@ -592,5 +592,12 @@ public interface DeviceLibraryService {
      */
     List<PartsVo> findAllParts(Integer deviceId);
 
+    /**
+     * 根据所属单位名称查询
+     * @param ownUniName
+     * @return
+     */
+    List<DeviceLibrary> queryByOwnUniName(String ownUniName);
+
 
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java

@@ -1756,6 +1756,15 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
         return partsVos;
     }
 
+    @Override
+    public List<DeviceLibrary> queryByOwnUniName(String ownUniName) {
+        List<DeviceLibrary> deviceLibraryList = deviceLibraryDao.findAllByOwnUnit(ownUniName);
+        if (deviceLibraryList != null && deviceLibraryList.size() >0){
+            deviceLibraryList.forEach(DeviceLibrary::setConfigName);
+        }
+        return deviceLibraryList;
+    }
+
     private Specification<DeviceLibrary> getSelectSpecification(DeviceLibrarySelectVo deviceLibrarySelectVo) {
         PredicateBuilder<DeviceLibrary> predicateBuilder = getPredicateBuilder(deviceLibrarySelectVo);
         //unitId为空，默认查询当前单位

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/DevNameVO.java

+package com.tykj.dev.device.library.subject.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("查询dev名称vo")
+@Repository
+public class DevNameVO {
+
+
+    private String name;
+}

dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java

@@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/packageVersion/getVersion","/equip/packageVersion/getVersion").permitAll()//
                 .antMatchers("/equip/file/llq/**").permitAll()
                 .antMatchers("/code/**","/equip/code/**").permitAll()
-                .antMatchers("/upload").permitAll()
+                .antMatchers("/upload","/device/queryByOwnUnit").permitAll()
                 .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
 //                .withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() {
 //                    @Override