bug修复

docker/mysql/update/lab-update.sql

@@ -1,2 +1,3 @@
 ALTER TABLE lab_hardware ADD manufacturer_type TINYINT(4) COMMENT '供应厂商';
 ALTER TABLE lab_notifyplan ADD execution_time datetime COMMENT '执行时间';
+alter table lab_hardware modify column uniform_power varchar(100);

pom.xml

@@ -45,10 +45,11 @@
         <pinyin4j.version>2.5.1</pinyin4j.version>
 
         <!-- docker -->
-        <docker.maven.verion>1.4.10</docker.maven.verion>
-        <docker.registry>zd.harbor.com</docker.registry>
-        <docker.namespace>zd</docker.namespace>
-        <scanner.maven.version>3.3.0.603</scanner.maven.version>
+        <docker.maven.verion>0.40.2</docker.maven.verion>
+        <docker.registry>registry.cn-hangzhou.aliyuncs.com</docker.registry>
+        <docker.registry.username>zd-push@1603061150808095.onaliyun.com</docker.registry.username>
+        <docker.registry.password>zd123456..</docker.registry.password>
+        <docker.namespace>zd-yun</docker.namespace>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     </properties>
 

zd-api/zd-api-system/src/main/java/com/zd/system/api/laboratory/domain/RemoteLabHardware.java

@@ -5,6 +5,7 @@ import com.zd.common.core.annotation.Excel;
 import com.zd.common.core.enums.HardwareOperate;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 /**
@@ -13,6 +14,7 @@ import org.hibernate.validator.constraints.Length;
  * @author zd
  */
 @ApiModel("硬件表")
+@Data
 public class RemoteLabHardware{
 
     /**
@@ -122,7 +124,7 @@ public class RemoteLabHardware{
     private Integer port;
     /** 设备输出频率 33最大 */
     @ApiModelProperty(value = "设备输出频率 33最大")
-    private Integer uniformPower;
+    private String uniformPower;
     /** 设备推送频率，0最大，2最小 */
     @ApiModelProperty(value = "设备推送频率，0最大，2最小")
     private Byte sessionIndex;
@@ -130,23 +132,6 @@ public class RemoteLabHardware{
     @ApiModelProperty(value = "支持1通道、4通道、8通道、16通道")
     private Integer channels;
 
-
-    public Integer getManufacturerType() {
-        return manufacturerType;
-    }
-
-    public void setManufacturerType(Integer manufacturerType) {
-        this.manufacturerType = manufacturerType;
-    }
-
-    public String getHardwareNum() {
-        return hardwareNum;
-    }
-
-    public void setHardwareNum(String hardwareNum) {
-        this.hardwareNum = hardwareNum;
-    }
-
     /**
      * 功能状态： 不同设备的功能状态都是不一样的
      */
@@ -174,207 +159,4 @@ public class RemoteLabHardware{
 
     @ApiModelProperty(value = "报警器响铃时长")
     private Integer ringTime;
-
-    public Integer getRingTime() {
-        return ringTime;
-    }
-
-    public void setRingTime(Integer ringTime) {
-        this.ringTime = ringTime;
-    }
-
-    public Long getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getFunctionStatus() {
-        return functionStatus;
-    }
-
-    public void setFunctionStatus(String functionStatus) {
-        this.functionStatus = functionStatus;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setFactory(String factory) {
-        this.factory = factory;
-    }
-
-    public String getFactory() {
-        return factory;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setMacAdd(String macAdd) {
-        this.macAdd = macAdd;
-    }
-
-    public String getMacAdd() {
-        return macAdd;
-    }
-
-    public void setSubjectId(Long subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public Long getSubjectId() {
-        return subjectId;
-    }
-
-
-    public void setOperate(HardwareOperate operate) {
-        this.operate = operate;
-    }
-
-    public HardwareOperate getOperate() {
-        return operate;
-    }
-
-
-
-    public String getHorizontalAxis() {
-        return horizontalAxis;
-    }
-
-    public void setHorizontalAxis(String horizontalAxis) {
-        this.horizontalAxis = horizontalAxis;
-    }
-
-    public String getVerticalAxis() {
-        return verticalAxis;
-    }
-
-    public void setVerticalAxis(String verticalAxis) {
-        this.verticalAxis = verticalAxis;
-    }
-
-    public String getRelayCode() {
-        return relayCode;
-    }
-
-    public void setRelayCode(String relayCode) {
-        this.relayCode = relayCode;
-    }
-
-    public Integer getBit() {
-        if(this.bit != null && this.bit == -1){
-            this.bit = null;
-        }
-        return bit;
-    }
-
-    public void setBit(Integer bit) {
-        this.bit = bit;
-    }
-
-
-    public String getConfigName() {
-        return configName;
-    }
-
-    public void setConfigName(String configName) {
-        this.configName = configName;
-    }
-
-    public String getConfigStatus() {
-        return configStatus;
-    }
-
-    public void setConfigStatus(String configStatus) {
-        this.configStatus = configStatus;
-    }
-
-    public int getHardwareType() {
-        return hardwareType;
-    }
-
-    public void setHardwareType(int hardwareType) {
-        this.hardwareType = hardwareType;
-    }
-
-    public Integer getPcType() {        return pcType;    }
-
-    public void setPcType(Integer pcType) {        this.pcType = pcType;    }
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public Integer getPort() {
-        return port;
-    }
-
-    public void setPort(Integer port) {
-        this.port = port;
-    }
-
-    public Integer getUniformPower() {
-        return uniformPower;
-    }
-
-    public void setUniformPower(Integer uniformPower) {
-        this.uniformPower = uniformPower;
-    }
-
-    public Byte getSessionIndex() {
-        return sessionIndex;
-    }
-
-    public void setSessionIndex(Byte sessionIndex) {
-        this.sessionIndex = sessionIndex;
-    }
-
-    public Integer getChannels() {
-        return channels;
-    }
-
-    public void setChannels(Integer channels) {
-        this.channels = channels;
-    }
 }

zd-auth/pom.xml

@@ -102,7 +102,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-gateway/pom.xml

@@ -115,51 +115,88 @@
             </plugin>
 
             <!-- docker的maven插件 -->
-<!--            <plugin>-->
-<!--                <groupId>io.fabric8</groupId>-->
-<!--                <artifactId>docker-maven-plugin</artifactId>-->
-<!--                <version>${docker.maven.verion}</version>-->
-<!--                <executions>-->
-<!--                    &lt;!&ndash;执行 mvn package 时 自动构建docker镜像并推送到仓库 &ndash;&gt;-->
-<!--                    <execution>-->
-<!--                        <id>default</id>-->
-<!--                        <phase>package</phase>-->
-<!--                        <goals>-->
-<!--                            <goal>remove</goal>-->
-<!--                            <goal>build</goal>-->
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker.maven.verion}</version>
+                <executions>
+                    <!--执行 mvn package 时 自动构建docker镜像并推送到仓库 -->
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <!--删除老镜像-->
+                            <goal>remove</goal>
+                            <!--构建镜像-->
+                            <goal>build</goal>
+                            <!--推送镜像到阿里云-->
 <!--                            <goal>push</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--                <configuration>-->
-<!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
-<!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
-<!--                    <authConfig>-->
-<!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
-<!--                        <username>${docker.registry.username}</username>-->
-<!--                        <password>${docker.registry.password}</password>-->
-<!--                    </authConfig>-->
-<!--                    <images>-->
-<!--                        <image>-->
-<!--                            &lt;!&ndash; [命名空间] / [镜像名称：版本号] &ndash;&gt;-->
-<!--                            <name>${docker.registry}/${docker.namespace}/${project.artifactId}</name>-->
-<!--                            &lt;!&ndash; 仓库地址 &ndash;&gt;-->
-<!--                            <registry>${docker.registry}</registry>-->
-<!--                            <build>-->
-<!--                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>-->
-<!--                                <tags>-->
-<!--                                    <tag>${project.version}</tag>-->
-<!--                                </tags>-->
-<!--                            </build>-->
-<!--                        </image>-->
-<!--                    </images>-->
-<!--                    <buildArgs>-->
-<!--                        &lt;!&ndash; dockerfile参数，指定jar路径 &ndash;&gt;-->
-<!--                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>-->
-<!--                    </buildArgs>-->
-<!--                </configuration>-->
-<!--            </plugin>-->
+                            <!--运行镜像-->
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- docker主机 -->
+                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>
+                    <authConfig>
+                        <!-- registry服务的认证-->
+                        <username>${docker.registry.username}</username>
+                        <password>${docker.registry.password}</password>
+                    </authConfig>
+                    <images>
+                        <image>
+                            <!-- [命名空间] / [镜像名称：版本号] -->
+                            <name>${docker.registry}/${docker.namespace}/${project.artifactId}</name>
+                            <!-- 仓库地址 -->
+                            <registry>${docker.registry}</registry>
+                            <build>
+                                <!-- dockerFile文件路径-->
+                                <dockerFile>${project.basedir}/Dockerfile</dockerFile>
+                                <tags>
+                                    <!-- 构建版本-->
+                                    <tag>${project.version}</tag>
+                                </tags>
+                            </build>
+                            <run>
+                                <!-- 环境变量配置-->
+                                <env>
+                                    <!-- 次数可参考 docker/zd/docker-compose.env 下的变量根据实际关联地址配置 -->
+                                    <NACOS_HOST>192.168.1.88</NACOS_HOST>
+                                    <REDIS_HOST>192.168.1.43</REDIS_HOST>
+                                </env>
+                                <!-- 端口映射-->
+                                <ports>
+                                    <port>9081:8080</port>
+                                </ports>
+                                <!-- 挂载卷-->
+                                <volumes>
+                                    <bind>
+                                        <!-- 可多配置-->
+                                        <volume>
+                                            /zd/logs/${project.artifactId}:/logs/${project.artifactId}
+                                        </volume>
+                                    </bind>
+                                </volumes>
+                                <autoRemove>false</autoRemove>
+                                <!-- 重启策略-->
+                                <restartPolicy>
+                                    <!-- 总是-->
+                                    <name>always</name>
+                                    <!-- 失败时重启-->
+<!--                                    <name>on-failure</name>-->
+                                    <!-- 重启次数，当上方name配置采用on-failure时生效-->
+<!--                                    <retry>3</retry>-->
+                                </restartPolicy>
+                            </run>
+                        </image>
+                    </images>
+                    <buildArgs>
+                        <!-- dockerfile参数，指定jar路径 -->
+                        <JAR_FILE>${project.artifactId}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

zd-modules/zd-airbottle/pom.xml

@@ -164,7 +164,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-alarm/pom.xml

@@ -122,7 +122,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-chemical/pom.xml

@@ -180,7 +180,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-common-face/pom.xml

@@ -113,7 +113,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-exam/pom.xml

@@ -146,7 +146,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-forward/pom.xml

@@ -141,7 +141,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-message/pom.xml

@@ -172,7 +172,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-modules-app/pom.xml

@@ -108,7 +108,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-modules-file/pom.xml

@@ -136,7 +136,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-modules-gen/pom.xml

@@ -124,7 +124,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-modules-job/pom.xml

@@ -124,7 +124,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

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

@@ -184,7 +184,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabHardware.java

@@ -127,7 +127,7 @@ public class LabHardware extends BaseEntity {
     private Integer port;
     /** 设备输出频率 33最大 */
     @ApiModelProperty(value = "设备输出频率 33最大")
-    private Integer uniformPower;
+    private String uniformPower;
     /** 设备推送频率，0最大，2最小 */
     @ApiModelProperty(value = "设备推送频率，0最大，2最小")
     private Byte sessionIndex;
@@ -426,11 +426,11 @@ public class LabHardware extends BaseEntity {
         this.port = port;
     }
 
-    public Integer getUniformPower() {
+    public String getUniformPower() {
         return uniformPower;
     }
 
-    public void setUniformPower(Integer uniformPower) {
+    public void setUniformPower(String uniformPower) {
         this.uniformPower = uniformPower;
     }
 

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

@@ -139,7 +139,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-netty/pom.xml

@@ -193,7 +193,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-modules/zd-netty/src/main/java/com/zd/netty/properties/FRIDProperties.java

@@ -1,33 +0,0 @@
-package com.zd.netty.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Component;
-
-/**
- * 微信小程序属性配置
- */
-@RefreshScope
-@Data
-@Component
-@ConfigurationProperties(prefix = "sys.frid")
-public class FRIDProperties {
-
-    /**
-     * 设备IP
-     */
-    private String ip="192.168.1.178";
-    /**
-     * 设备端口号
-     */
-    private Integer port=4001;
-    /**
-     * 设备输出频率
-     */
-    private Integer uniformPower=33;
-    /**
-     * 设置session推送频率，0最大，2最小
-     */
-    private byte index=0;
-}

zd-modules/zd-netty/src/main/java/com/zd/netty/sdk/DeJuRFIDServiceImpl.java

@@ -11,6 +11,7 @@ import com.zd.system.api.laboratory.domain.RemoteLabHardware;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.util.*;
@@ -116,36 +117,46 @@ public class DeJuRFIDServiceImpl implements IService {
     }
 
     public static MsgBaseSetPower setPower(RemoteLabHardware hardware, GClient client) {
-        Integer uniformPower = hardware.getUniformPower();
+        String uniformPower = hardware.getUniformPower();
         MsgBaseGetPower msgBaseGetPower = new MsgBaseGetPower();
         client.sendSynMsg(msgBaseGetPower);
         MsgBaseSetPower msgBaseSetPower = new MsgBaseSetPower();
         if (0 == msgBaseGetPower.getRtCode()) {
-            Hashtable<Integer, Integer> dicPower = msgBaseGetPower.getDicPower();
-            Integer power = dicPower.get(1);
-            log.info("输出功率：==============》{}", power);
-            if (power == null || !Objects.equals(power, uniformPower)) {
-                Hashtable<Integer, Integer> hashtable = new Hashtable<>();
-                Integer channels = hardware.getChannels();
-                for (int i = 1; i <= channels; i++) {
-                    hashtable.put(i, uniformPower);
-                }
-                msgBaseSetPower.setDicPower(hashtable);
-                client.sendSynMsg(msgBaseSetPower);
-                if (0 == msgBaseSetPower.getRtCode()) {
-                    log.info("Power epc success.");
-                } else {
-                    log.info("==============设置输出功率失败==============");
-                }
-            } else {
-                msgBaseSetPower.setRtCode((byte) 0);
-            }
+            sendPower(hardware, client, uniformPower, msgBaseGetPower, msgBaseSetPower);
         } else {
             log.info("==============获取输出功率失败==============");
         }
         return msgBaseSetPower;
     }
 
+    private static void sendPower(RemoteLabHardware hardware, GClient client, String uniformPower, MsgBaseGetPower msgBaseGetPower, MsgBaseSetPower msgBaseSetPower) {
+        if (StringUtils.hasLength(uniformPower)) {
+            editAndSendPower(hardware, client, uniformPower, msgBaseSetPower, msgBaseGetPower);
+        } else {
+            msgBaseSetPower.setRtCode((byte) 0);
+        }
+    }
+
+    private static void editAndSendPower(RemoteLabHardware hardware, GClient client, String uniformPower, MsgBaseSetPower msgBaseSetPower, MsgBaseGetPower msgBaseGetPower) {
+        Hashtable<Integer, Integer> dicPower = msgBaseGetPower.getDicPower();
+        Integer channels = hardware.getChannels();
+        String[] uniformPowers = uniformPower.split(",");
+        for (int i = 1; i <= channels; i++) {
+            Integer power = dicPower.get(i);
+            String tempUniformPower = uniformPowers[i - 1];
+            if (power == null || !Objects.equals(power, Integer.valueOf(tempUniformPower))) {
+                dicPower.put(i, Integer.valueOf(tempUniformPower));
+            }
+            msgBaseSetPower.setDicPower(dicPower);
+            client.sendSynMsg(msgBaseSetPower);
+            if (0 == msgBaseSetPower.getRtCode()) {
+                log.info("Power epc success.");
+            } else {
+                log.info("==============设置输出功率失败==============");
+            }
+        }
+    }
+
     public static MsgBaseSetBaseband setSession(RemoteLabHardware hardware, GClient client) {
         MsgBaseGetBaseband msgBaseGetBaseband = new MsgBaseGetBaseband();
         MsgBaseSetBaseband msgBaseSetBaseband = new MsgBaseSetBaseband();

zd-modules/zd-speaker/pom.xml

@@ -109,7 +109,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->

zd-visual/zd-monitor/pom.xml

@@ -106,7 +106,6 @@
 <!--                <configuration>-->
 <!--                    &lt;!&ndash; docker主机 &ndash;&gt;-->
 <!--                    <dockerHost>tcp://192.168.1.88:2375</dockerHost>-->
-<!--                    <dockerfile>${project.basedir}/Dockerfile</dockerfile>-->
 <!--                    <authConfig>-->
 <!--                        &lt;!&ndash; registry服务的认证&ndash;&gt;-->
 <!--                        <username>${docker.registry.username}</username>-->