代码调整

pqs-job/job-executor/pom.xml

@@ -61,6 +61,11 @@
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>harmonic-prepare</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

pqs-prepare/harmonic-prepare/Dockerfile

@@ -0,0 +1,5 @@
+FROM openjdk:8-jdk-alpine
+ADD target/harmonicprepare.jar harmonicprepare.jar
+ENTRYPOINT ["java","-jar","/harmonicprepare.jar"]
+EXPOSE 10221
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone

pqs-prepare/harmonic-prepare/pom.xml

@@ -101,4 +101,63 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>harmonicprepare</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <compilerArgument>-Xlint:unchecked</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <id>build-image</id>
+                        <phase>${docker.operate}</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!--<serverId>36dockerHarbor</serverId>-->
+                    <registryUrl>http://${docker.repostory}</registryUrl>
+                    <!-- 镜像名称 -->
+                    <imageName>${docker.repostory}/${docker.registry.name}/${project.artifactId}</imageName>
+                    <imageTags>
+                        <imageTag>latest</imageTag>
+                    </imageTags>
+                    <dockerHost>${docker.url}</dockerHost>
+                    <dockerDirectory>${basedir}/</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/ROOT</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/service/Impl/line/NormalLimitServiceImpl.java

@@ -48,7 +48,8 @@ public class NormalLimitServiceImpl implements NormalLimitService {
 
         List<String> lineIds = new ArrayList<>();
         DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
-        deviceInfoParam.setDeptIndex(RequestUtil.getDeptIndex());
+//        deviceInfoParam.setDeptIndex(RequestUtil.getDeptIndex());
+        deviceInfoParam.setDeptIndex("5699e5916a18a6381e1ac92da5bd2628");
         deviceInfoParam.setPowerFlag(2);
         deviceInfoParam.setMonitorFlag(2);
         deviceInfoParam.setServerName(ServerEnum.HARMONIC.getName());