wwh 1 年之前
父节点
当前提交
1ec401dc9a

+ 14 - 0
huimv-env-admin/pom.xml

@@ -150,4 +150,18 @@
 
 
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>

+ 1 - 1
huimv-env-admin/src/main/java/com/huimv/env/admin/config/ApiPrefixAutoConfiguration.java

@@ -10,7 +10,7 @@ public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
 
     @Override
     public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.addPathPrefix("/huimvEnv",  c -> c.isAnnotationPresent(RestController.class));
+        configurer.addPathPrefix("/smarteleApi",  c -> c.isAnnotationPresent(RestController.class));
     }
 
 }

+ 1 - 1
huimv-env-admin/src/main/java/com/huimv/env/admin/config/InterceptorConfig.java

@@ -21,6 +21,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/huimvEnv/admin/my/*");
+                excludePathPatterns("/smarteleApi/admin/my/*");
     }
 }

+ 1 - 1
huimv-env-admin/src/main/java/com/huimv/env/admin/service/impl/BasePigpenServiceImpl.java

@@ -175,7 +175,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         });
 
         QueryWrapper<TerminalPort> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.in("terminal_id", idList);
+        queryWrapper2.in("terminal_id", idList2).ne("location_id",null);
         List<TerminalPort> terminalPorts = portMapper.selectList(queryWrapper2);
         for (TerminalPort terminal : terminalPorts) {
             if (terminal.getStatus() == 0) {