信息牌接口 测试修改 2023-03-29

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/xxp/feign/RemoteXxpService.java

@@ -0,0 +1,24 @@
+package com.zd.algorithm.api.xxp.feign;
+
+import com.zd.algorithm.api.alarm.feign.fallback.RemoteAlarmFallbackFactory;
+import com.zd.algorithm.api.xxp.feign.fallback.RemoteXxpFallBack;
+import com.zd.model.constant.ApplicationConstants;
+import com.zd.model.domain.ResultData;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(contextId = "remoteXxpService", value = ApplicationConstants.ALGORITHM_SERVICE, fallbackFactory = RemoteXxpFallBack.class)
+public interface RemoteXxpService {
+    /**
+     * 通过实验室id获取信息类目列表
+     * @param deviceIds
+     * @param dpi
+     * @param page
+     * @param count
+     * @return
+     */
+    @GetMapping("/api/play/startList")
+    ResultData selectSubjectCameraList(@RequestParam("deviceIds") String deviceIds, @RequestParam("dpi") Integer dpi, @RequestParam("page") int page, @RequestParam("count") int count);
+
+}

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/xxp/feign/fallback/RemoteXxpFallBack.java

@@ -0,0 +1,25 @@
+package com.zd.algorithm.api.xxp.feign.fallback;
+
+import com.zd.algorithm.api.xxp.feign.RemoteXxpService;
+import com.zd.model.domain.ResultData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RemoteXxpFallBack implements FallbackFactory<RemoteXxpService> {
+
+    private static final Logger log = LoggerFactory.getLogger(RemoteXxpFallBack.class);
+
+    @Override
+    public RemoteXxpService create(Throwable cause) {
+        return new RemoteXxpService(){
+            @Override
+            public ResultData selectSubjectCameraList(String deviceIds, Integer dpi, int page, int count) {
+                log.error("获取实验室摄像头编号信息失败:{}", cause.getMessage());
+                return ResultData.fail("获取实验室摄像头编号信息失败：" + cause.getMessage());
+            }
+        };
+    }
+}

zd-api/zd-algorithm-api/src/main/resources/META-INF/spring.factories

@@ -6,5 +6,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.zd.algorithm.api.rfid.feign.fallback.RemoteRfidFallbackFactory,\
   com.zd.algorithm.api.smartlock.feign.fallback.RemoteSmartlockFallbackFactory,\
   com.zd.algorithm.api.speaker.feign.fallback.RemoteSpeakFallbackFactory,\
-  com.zd.algorithm.api.fire.feign.fallback.RemoteFireDeviceFallbackFactory
+  com.zd.algorithm.api.fire.feign.fallback.RemoteFireDeviceFallbackFactory,\
+  com.zd.algorithm.api.xxp.feign.fallback.RemoteXxpFallBack
 

zd-api/zd-api-system/zd-api-system.iml

@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="zd-common-core" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.1" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.12" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.12" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-loadbalancer:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-loadbalancer:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.8" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor.addons:reactor-extra:3.4.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.10.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.14.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.14.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.32" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.7" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.50" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.0.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.4" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.76" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.6.2" level="project" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.11" level="project" />
-    <orderEntry type="library" name="Maven: com.baidubce:bce-java-sdk:0.10.154" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.32" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.32" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.4" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:17.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.14" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.14" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
-    <orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-multipart:2.33" level="project" />
-    <orderEntry type="library" name="Maven: org.jvnet.mimepull:mimepull:1.9.14" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.connectors:jersey-apache-connector:2.33" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-client:2.33" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.ws.rs:jakarta.ws.rs-api:2.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-server:2.33" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2.external:jakarta.inject:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.core:jersey-common:2.33" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.hk2:osgi-resource-locator:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.media:jersey-media-json-jackson:2.33" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish.jersey.ext:jersey-entity-filtering:2.33" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.4" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-client:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-annotations:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-common:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hbase:hbase-protocol:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.66.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.32" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.htrace:htrace-core:3.1.0-incubating" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
-    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jruby.jcodings:jcodings:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.jruby.joni:joni:2.1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.yammer.metrics:metrics-core:2.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.api:api-asn1-api:1.0.0-M20" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.directory.api:api-util:1.0.0-M20" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.5.1" level="project" />
-    <orderEntry type="module-library">
-      <library name="Maven: jdk.tools:jdk.tools:1.6">
-        <CLASSES>
-          <root url="jar://D:/Java/jdk1.8.0_181/lib/tools.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="library" name="Maven: xmlenc:xmlenc:0.52" level="project" />
-    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-el:commons-el:1.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.6" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.avro:avro:1.7.4" level="project" />
-    <orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.0.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.55" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-core:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-common:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-api:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
-    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty:3.6.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.59" level="project" />
-    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.20" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-bootstrap:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.10.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
-  </component>
-</module>

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/RemoteDutyService.java

@@ -4,10 +4,7 @@ import com.zd.laboratory.api.feign.fallback.RemoteDutyFailback;
 import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.domain.ResultData;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -17,7 +14,7 @@ import java.util.Map;
  * @author  donggaosheng
  * @time 2023/03/24
  */
-@FeignClient(contextId = "remoteDutyService", value = ApplicationConstants.XXP_SERVICE, fallbackFactory = RemoteDutyFailback.class)
+@FeignClient(contextId = "remoteDutyService", value = ApplicationConstants.LABORATORY_SERVICE, fallbackFactory = RemoteDutyFailback.class)
 public interface RemoteDutyService {
     /**
      * 通过实验室id当前时间查询值班人员
@@ -26,7 +23,7 @@ public interface RemoteDutyService {
      * @return
      */
     @GetMapping("/XxpDuty/api/selectDutyUser")
-    ResultData<List<Map<String, Object>>> selectDutyUser(Long labId, String dateTime);
+    ResultData<List<Map<String, Object>>> selectDutyUser(@RequestParam("labId") Long labId, @RequestParam("dateTime") String dateTime);
 
     /**
      * 通过实验室id查询实验室信息
@@ -44,24 +41,13 @@ public interface RemoteDutyService {
     @GetMapping("/XxpClassifyDet/classifyDetail/{id}")
     ResultData classifyDetailSubjectById(@PathVariable("id") Long id);
 
-    /**
-     * 通过实验室id获取信息类目列表
-     * @param deviceIds
-     * @param dpi
-     * @param page
-     * @param count
-     * @return
-     */
-    @GetMapping("/api/play/startList")
-    ResultData selectSubjectCameraList(String deviceIds, Integer dpi, int page, int count);
-
     /***
      * 根据实验室id查询摄像头编号
      * @param subId
      * @return
      */
     @GetMapping("/hardware/getCameraBySubjectId")
-    ResultData getCameraBySubjectId(Long subId);
+    ResultData getCameraBySubjectId(@RequestParam("subId") Long subId);
 
     /**
      * 根据实验室id获取实验室详情
@@ -79,7 +65,7 @@ public interface RemoteDutyService {
      * @return
      */
     @GetMapping("/apply/app/securityApplyList")
-    ResultData securityApplyList(Integer pageNumber,Integer pageSize,Long subjectId);
+    ResultData securityApplyList(@RequestParam("subjectId") Long subjectId,@RequestParam("pageNumber") Integer pageNumber,@RequestParam("pageSize") Integer pageSize);
 
     /**
      * 根据实验室获取签到未签退人员
@@ -87,7 +73,7 @@ public interface RemoteDutyService {
      * @return
      */
     @RequestMapping("/record/selectSubjectSignList")
-    ResultData selectSubjectSignList(Long subjectId);
+    ResultData selectSubjectSignList(@RequestParam("subjectId") Long subjectId);
 
     /**
      * 获取实验室所有值班人员的信息
@@ -96,8 +82,8 @@ public interface RemoteDutyService {
      * @param endTime
      * @return
      */
-    @RequestMapping("/api/selectDutyUserList")
-    ResultData<List<Map<String,Object>>> selectDutyUserList(Long labId,String startTime,String endTime);
+    @RequestMapping("/XxpDuty/api/selectDutyUserList")
+    ResultData<List<Map<String,Object>>> selectDutyUserList(@RequestParam("labId") Long labId,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime);
 
     /**
      * 根据实验室id和当前时间查询签到记录
@@ -106,6 +92,21 @@ public interface RemoteDutyService {
      * @param endTime
      * @return
      */
-    @PostMapping("/app/selectUserXxpInspectionList")
-    public ResultData selectUserXxpInspectionList(Long labId,String startTime,String endTime);
+    @PostMapping("/XxpInspection/app/selectUserXxpInspectionList")
+    ResultData selectUserXxpInspectionList(@RequestParam("labId") Long labId,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime);
+
+    /**
+     * 根据一体机编号查询实验室编号
+     * @param num
+     * @return
+     */
+    @RequestMapping("/onemachine/getSubjectIdByNum/{num}")
+    ResultData querySubInfoByNumber(@PathVariable("num") String num);
+
+
+    /**
+     * 获取信息牌首页实验室的信息
+     */
+    @RequestMapping(value = "/subject/getSubjectName/{id}")
+    ResultData getSubjectName(@PathVariable("id") Long id);
 }

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/feign/fallback/RemoteDutyFailback.java

@@ -41,11 +41,6 @@ public class RemoteDutyFailback implements FallbackFactory<RemoteDutyService> {
             }
 
             @Override
-            public ResultData selectSubjectCameraList(String deviceIds, Integer dpi, int page, int count) {
-                return ResultData.fail("获取实验室摄像头列表信息失败：" + cause.getMessage());
-            }
-
-            @Override
             public ResultData getCameraBySubjectId(Long subId) {
                 return ResultData.fail("获取实验室摄像头编号信息失败：" + cause.getMessage());
             }
@@ -56,7 +51,7 @@ public class RemoteDutyFailback implements FallbackFactory<RemoteDutyService> {
             }
 
             @Override
-            public ResultData securityApplyList(Integer pageNumber, Integer pageSize, Long subjectId) {
+            public ResultData securityApplyList(Long subjectId,Integer pageNumber, Integer pageSize) {
                 return ResultData.fail("获取安全准入人员列表信息失败：" + cause.getMessage());
             }
 
@@ -74,6 +69,16 @@ public class RemoteDutyFailback implements FallbackFactory<RemoteDutyService> {
             public ResultData selectUserXxpInspectionList(Long labId, String startTime, String endTime) {
                 return ResultData.fail("获取巡查记录列表信息失败：" + cause.getMessage());
             }
+
+            @Override
+            public ResultData querySubInfoByNumber(String num) {
+                return ResultData.fail("根据一体机编号获取实验室失败：" + cause.getMessage());
+            }
+
+            @Override
+            public ResultData getSubjectName(Long id) {
+                return ResultData.fail("获取实验室名称失败：" + cause.getMessage());
+            }
         };
     }
 }

zd-api/zd-laboratory-api/src/main/java/resources/META-INF/spring.factories

@@ -1,5 +1,6 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.zd.laboratory.api.feign.fallback.RemoteLaboratoryFallbackFactory,\
   com.zd.laboratory.api.feign.fallback.RemoteMessageContentFallbackFactory,\
-  com.zd.laboratory.api.feign.fallback.RemoteSubQueryFallbackFactory
+  com.zd.laboratory.api.feign.fallback.RemoteSubQueryFallbackFactory,\
+  com.zd.laboratory.api.feign.fallback.RemoteDutyFailback
 

zd-auth/pom.xml

@@ -16,6 +16,16 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->

zd-modules/zd-airbottle/pom.xml

@@ -17,6 +17,16 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->

zd-modules/zd-algorithm/pom.xml

@@ -23,6 +23,16 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->
@@ -173,6 +183,12 @@
         <dependency>
             <groupId>com.zd.base</groupId>
             <artifactId>zd-base-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jsqlparser</artifactId>
+                    <groupId>com.github.jsqlparser</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

zd-modules/zd-base/pom.xml

@@ -147,12 +147,6 @@
             <groupId>com.zd.algorithm</groupId>
             <artifactId>zd-algorithm-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.zd.system</groupId>
-            <artifactId>zd-xxp-api</artifactId>
-            <version>3.1.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>

zd-modules/zd-base/src/main/java/com/zd/base/app/controller/LabBoardApi.java

@@ -1,5 +1,6 @@
 package com.zd.base.app.controller;
 
+import com.zd.algorithm.api.xxp.feign.RemoteXxpService;
 import com.zd.base.app.domain.board.LabXxpSubjectVo;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.DateUtils;
@@ -13,10 +14,7 @@ import com.zd.system.api.vo.SysLogoConfigVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
@@ -35,6 +33,8 @@ public class LabBoardApi {
     @Autowired
     private RemoteDutyService remoteDutyService;
     @Autowired
+    private RemoteXxpService remoteXxpService;
+    @Autowired
     private TokenService tokenService;
 
     /**
@@ -54,9 +54,14 @@ public class LabBoardApi {
         }
         map.put("schoolName", logoConfigVo.getSchoolName());
         map.put("circularLogo", logoConfigVo.getCircularLogo());
-        map.put("circularLogo", logoConfigVo.getCircularLogo());
-        map.put("currentTime", new Date());
-        return null;
+        ResultData resultData=remoteDutyService.getSubjectName(labId);
+        if (resultData == null || resultData.getCode() != 200) {
+            return ResultData.fail(500, "获取实验室名称失败！");
+        }
+        map.put("subjectName", resultData.getData());
+        map.put("currentTime", DateUtils.parseDateToStr("YYYY_MM_DD HH:MM:SS",new Date()));
+        map.put("messageList", "实验室发生火情，请注意");
+        return ResultData.success(map);
     }
 
     /**
@@ -125,7 +130,7 @@ public class LabBoardApi {
             return ResultData.fail("签到人员获取失败！");
         }
         map.put("tentativeUser", signData.getData());
-        ResultData securityData=remoteDutyService.securityApplyList(1,10,labId);
+        ResultData securityData=remoteDutyService.securityApplyList(labId,1,10);
         if(null==securityData || securityData.getCode()!=HttpStatus.SUCCESS){
             return ResultData.fail("安全准入人员获取失败！");
         }
@@ -146,9 +151,12 @@ public class LabBoardApi {
 
 
     @ApiOperation(value = "巡查人员列表")
-    @GetMapping(value = "/signUserList")
-    public ResultData signUserList(@RequestParam String startTime,@RequestParam String endTime,@RequestParam Long labId) {
-
+    @GetMapping(value = "/inspectUserList")
+    public ResultData inspectUserList(@RequestParam Long labId,@RequestParam String startTime,@RequestParam String endTime) {
+        ResultData<List<Map<String, Object>>> dutyData=remoteDutyService.selectUserXxpInspectionList(labId,startTime,endTime);
+        if(null==dutyData || dutyData.getCode()!=HttpStatus.SUCCESS){
+            return ResultData.fail("值班人员列表获取失败！");
+        }
         return ResultData.success();
     }
 
@@ -164,8 +172,8 @@ public class LabBoardApi {
 
     @ApiOperation(value = "安全准入人员列表")
     @GetMapping(value = "/securityUserList")
-    public ResultData securityUserList(@RequestParam Integer pageNumber,@RequestParam Integer pageSize,@RequestParam Long labId) {
-        ResultData securityData=remoteDutyService.securityApplyList(pageNumber,pageSize,labId);
+    public ResultData securityUserList(@RequestParam Long labId,@RequestParam Integer pageNumber,@RequestParam Integer pageSize) {
+        ResultData securityData=remoteDutyService.securityApplyList(labId,pageNumber,pageSize);
         if(null==securityData || securityData.getCode()!=HttpStatus.SUCCESS){
             return ResultData.fail("安全准入人员获取失败！");
         }
@@ -194,7 +202,25 @@ public class LabBoardApi {
         if(null==resultData || resultData.getCode()!=200){
             return ResultData.fail("获取摄像头编号失败！");
         }
-        ResultData data=remoteDutyService.selectSubjectCameraList(resultData.getData(),null,1,5000);
+        ResultData data=remoteXxpService.selectSubjectCameraList(resultData.getData(),null,1,5000);
         return data;
     }
+
+
+    /**
+     * 查询实验室视频监控列表信息
+     */
+    @ApiOperation(value = "根据一体机编号获取实验室id")
+    @GetMapping(value = "/getSubjectIdByNum/{num}")
+    public ResultData getSubjectIdByNum(@PathVariable("num") String num) {
+        ResultData<String> resultData=remoteDutyService.querySubInfoByNumber(num);
+        if(null==resultData || resultData.getCode()!=200){
+            return ResultData.fail("获取实验室编号失败！");
+        }
+
+        if(StringUtils.isNull(resultData.getData())){
+            return ResultData.fail("获取实验室编号失败！");
+        }
+        return ResultData.success(resultData.getData());
+    }
 }

zd-modules/zd-modules-laboratory/pom.xml

@@ -17,6 +17,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->
@@ -34,12 +40,24 @@
         <dependency>
             <groupId>com.zd.core</groupId>
             <artifactId>common-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis-spring</artifactId>
+                    <groupId>org.mybatis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- zd Common Swagger -->
         <dependency>
             <groupId>com.zd.swagger</groupId>
             <artifactId>common-swagger</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--mqtt客户端链接服务-->
@@ -60,6 +78,12 @@
             <groupId>com.deepoove</groupId>
             <artifactId>poi-tl</artifactId>
             <version>1.10.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>xml-apis</artifactId>
+                    <groupId>xml-apis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--jsonp解析html-->
         <dependency>
@@ -97,6 +121,16 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis</artifactId>
+                    <groupId>org.mybatis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jsqlparser</artifactId>
+                    <groupId>com.github.jsqlparser</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSecurityApplyController.java

@@ -795,7 +795,7 @@ public class LabSecurityApplyController extends BaseController
      */
     @RequestMapping("/app/securityApplyList")
     @ApiOperation(value = "查询安全准入申请列表")
-    public ResultData appList(Integer pageNumber,Integer pageSize,Long subjectId)
+    public ResultData appList(Long subjectId,Integer pageNumber,Integer pageSize)
     {
         startPage(pageNumber,pageSize);
         List<Map<String,Object>> list = labSecurityApplyService.selectLabSecurityApply(subjectId);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectController.java

@@ -448,4 +448,12 @@ public class LabSubjectController extends BaseController {
     public ResultData getSubjectDetails(@PathVariable("id") Long id) {
         return ResultData.success(labSubjectService.getSubjectDetailsById(id));
     }
+
+    /**
+     * 获取信息牌首页实验室的信息
+     */
+    @RequestMapping(value = "/getSubjectName/{id}")
+    public ResultData getSubjectName(@PathVariable("id") Long id) {
+        return ResultData.success(labSubjectService.getSubjectNameById(id));
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabSubjectMapper.java

@@ -306,4 +306,11 @@ public interface LabSubjectMapper {
      * @return
      */
     String getSubjectDetailsById(Long id);
+
+    /**
+     * 根据实验室id获取实验室名称
+     * @param id
+     * @return
+     */
+    String getSubjectNameById(Long id);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/controller/OneMachineController.java

@@ -509,4 +509,12 @@ public class OneMachineController extends BaseController {
                 .collect(Collectors.toList()));
     }
 
+
+    @RequestMapping("/getSubjectIdByNum/{num}")
+    public ResultData querySubInfoByNumber(@PathVariable("num") String num) {
+        //转换实验室ID
+        Long aLong = labHardwareService.querySubIdByNum(num);
+        return ResultData.success(aLong);
+    }
+
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabSubjectService.java

@@ -282,4 +282,12 @@ public interface ILabSubjectService {
      * @return
      */
     String getSubjectDetailsById(Long id);
+
+
+    /**
+     * 根据实验室id获取实验室名称
+     * @param id
+     * @return
+     */
+    String getSubjectNameById(Long id);
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectServiceImpl.java

@@ -521,4 +521,9 @@ public class LabSubjectServiceImpl implements ILabSubjectService {
     public String getSubjectDetailsById(Long id) {
         return labSubjectMapper.getSubjectDetailsById(id);
     }
+
+    @Override
+    public String getSubjectNameById(Long id) {
+        return labSubjectMapper.getSubjectNameById(id);
+    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -1183,4 +1183,7 @@
     <select id="getSubjectDetailsById" resultType="java.lang.String">
         SELECT details FROM  lab_subject WHERE id=#{id} AND is_del=0
     </select>
+    <select id="getSubjectNameById" resultType="java.lang.String">
+           SELECT name as subjectName FROM  lab_subject WHERE id=#{id} AND is_del=0
+    </select>
 </mapper>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpDutyMapper.xml

@@ -91,7 +91,7 @@
         <where>
             xxp.subject_id=#{labId}
             <if test="startTime!=null">
-                and duty_time<![CDATA[ >= ]]>#{dateTime}
+                and duty_time<![CDATA[ >= ]]>#{startTime}
             </if>
             <if test="endTime!=null">
                 and duty_time<![CDATA[ <= ]]>#{endTime}

zd-modules/zd-modules-system/pom.xml

@@ -17,6 +17,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos Config -->
@@ -39,6 +45,12 @@
         <dependency>
             <groupId>com.zd.swagger</groupId>
             <artifactId>common-swagger</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>