Browse Source

打包配置:指定可执行的打包

王苗苗 2 weeks ago
parent
commit
c31d148eca

+ 31 - 23
.idea/workspace.xml

@@ -6,7 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="494e7e12-0e43-41f1-b914-44d06666de04" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZQualityValue.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZQualityValue.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssay.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssayResult.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/robot/remote/smartrobotremote/domain/ZAssayResult.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/ZAssayMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/ZAssayMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/mapper/ZAssayResultMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/mapper/ZAssayResultMapper.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -23,6 +26,9 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MavenRunner">
+    <option name="skipTests" value="true" />
+  </component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 6
 }</component>
@@ -32,28 +38,30 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
-    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
-    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
-    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;Spring Boot.SmartRobotRemoteApplication.executor&quot;: &quot;Debug&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/resources/mapper&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Maven.smart-robot-remote [clean].executor": "Run",
+    "Maven.smart-robot-remote [package].executor": "Run",
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "Spring Boot.SmartRobotRemoteApplication.executor": "Debug",
+    "git-widget-placeholder": "master",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/resources/mapper",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Modules",
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.2",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/mapper" />
@@ -108,7 +116,7 @@
       <workItem from="1736989247063" duration="600000" />
       <workItem from="1739515108280" duration="1054000" />
       <workItem from="1741251749291" duration="27359000" />
-      <workItem from="1741568241263" duration="6037000" />
+      <workItem from="1741568241263" duration="37913000" />
     </task>
     <servers />
   </component>

+ 2 - 1
pom.xml

@@ -83,7 +83,8 @@
                 <version>${spring-boot.version}</version>
                 <configuration>
                     <mainClass>com.robot.remote.smartrobotremote.SmartRobotRemoteApplication</mainClass>
-                    <skip>true</skip>
+                    <!--<skip>true</skip>-->
+                    <executable>true</executable> <!-- 指定可执行的打包 -->
                 </configuration>
                 <executions>
                     <execution>

BIN
target/.DS_Store


BIN
target/classes/.DS_Store


BIN
target/classes/com/robot/remote/smartrobotremote/domain/ZAssay.class


BIN
target/classes/com/robot/remote/smartrobotremote/domain/ZAssayResult.class


+ 1 - 0
target/classes/mapper/ZAssayMapper.xml

@@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assayStatus != null  and assayStatus != ''"> and assay_status = #{assayStatus}</if>
             <if test="assayMethod != null  and assayMethod != ''"> and assay_method = #{assayMethod}</if>
             <if test="cPangusyncsourcetimestamp != null "> and C_PanguSyncSourceTimestamp = #{cPangusyncsourcetimestamp}</if>
+            <if test="id != null "> and assay_id > #{id}</if>
         </where>
     </select>
     

+ 1 - 0
target/classes/mapper/ZAssayResultMapper.xml

@@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="curveNo != null  and curveNo != ''"> and curve_no = #{curveNo}</if>
             <if test="readFlag != null  and readFlag != ''"> and read_flag = #{readFlag}</if>
             <if test="cPangusyncsourcetimestamp != null "> and C_PanguSyncSourceTimestamp = #{cPangusyncsourcetimestamp}</if>
+            <if test="id != null "> and result_id > #{id}</if>
         </where>
     </select>
     

+ 3 - 0
target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=smart-robot-remote
+groupId=com.robot.remote
+version=0.0.1-SNAPSHOT

+ 21 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,21 @@
+com/robot/remote/smartrobotremote/mapper/ZAssayMapper.class
+com/robot/remote/smartrobotremote/domain/BizDevice.class
+com/robot/remote/smartrobotremote/mapper/ZQualityValueMapper.class
+com/robot/remote/smartrobotremote/domain/ZAssay.class
+com/robot/remote/smartrobotremote/domain/ZQualityValue.class
+com/robot/remote/smartrobotremote/demos/web/PathVariableController.class
+com/robot/remote/smartrobotremote/controller/TestController.class
+com/robot/remote/smartrobotremote/mapper/BizWaterWorkMapper.class
+com/robot/remote/smartrobotremote/mapper/SysAssayItemMapper.class
+com/robot/remote/smartrobotremote/mapper/BizDeviceMapper.class
+com/robot/remote/smartrobotremote/domain/SysAssayItem.class
+com/robot/remote/smartrobotremote/mapper/ZAssayResultMapper.class
+com/robot/remote/smartrobotremote/domain/ZDeviceSample.class
+com/robot/remote/smartrobotremote/domain/BizWaterWork.class
+com/robot/remote/smartrobotremote/conf/JdbcConfig.class
+com/robot/remote/smartrobotremote/demos/web/User.class
+com/robot/remote/smartrobotremote/domain/ZAssayResult.class
+com/robot/remote/smartrobotremote/controller/DataController.class
+com/robot/remote/smartrobotremote/SmartRobotRemoteApplication.class
+com/robot/remote/smartrobotremote/demos/web/BasicController.class
+com/robot/remote/smartrobotremote/mapper/ZDeviceSampleMapper.class

+ 21 - 0
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,21 @@
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/controller/TestController.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/BizWaterWork.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/BizDeviceMapper.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/controller/DataController.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/BizDevice.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/ZAssayResult.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/demos/web/User.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/demos/web/PathVariableController.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/SysAssayItemMapper.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/ZAssay.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/SysAssayItem.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/ZAssayResultMapper.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/ZQualityValueMapper.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/ZDeviceSample.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/BizWaterWorkMapper.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/ZAssayMapper.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/SmartRobotRemoteApplication.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/conf/JdbcConfig.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/domain/ZQualityValue.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/demos/web/BasicController.java
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/main/java/com/robot/remote/smartrobotremote/mapper/ZDeviceSampleMapper.java

+ 1 - 0
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1 @@
+com/robot/remote/smartrobotremote/SmartRobotRemoteApplicationTests.class

+ 1 - 0
target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1 @@
+/Users/wangmiaomiao/IdeaProjects/smart-robot-remote/src/test/java/com/robot/remote/smartrobotremote/SmartRobotRemoteApplicationTests.java

File diff suppressed because it is too large
+ 16832 - 0
target/smart-robot-remote-0.0.1-SNAPSHOT.jar


BIN
target/smart-robot-remote-0.0.1-SNAPSHOT.jar.original


BIN
target/test-classes/com/robot/remote/smartrobotremote/SmartRobotRemoteApplicationTests.class


Some files were not shown because too many files changed in this diff