Sfoglia il codice sorgente

化验结果表和化验明细表 新增字段ID,用于筛选上次同步完以后最新的待同步的数据

王苗苗 3 settimane fa
parent
commit
ef72892fb8

+ 24 - 23
.idea/workspace.xml

@@ -6,7 +6,7 @@
   <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$/src/main/java/com/robot/remote/smartrobotremote/domain/ZQualityValue.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/robot/remote/smartrobotremote/domain/ZQualityValue.java" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,28 +32,28 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "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 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>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/mapper" />
@@ -107,7 +107,8 @@
       <workItem from="1736944947909" duration="5000" />
       <workItem from="1736989247063" duration="600000" />
       <workItem from="1739515108280" duration="1054000" />
-      <workItem from="1741251749291" duration="21551000" />
+      <workItem from="1741251749291" duration="27359000" />
+      <workItem from="1741568241263" duration="6037000" />
     </task>
     <servers />
   </component>

+ 12 - 0
src/main/java/com/robot/remote/smartrobotremote/domain/ZAssay.java

@@ -89,6 +89,18 @@ public class ZAssay
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    //2025年03月10日11:24:24 新增请求参数
+    //记录ID 用于筛选大于此ID的数据
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getCreateBy() {
         return createBy;
     }

+ 12 - 0
src/main/java/com/robot/remote/smartrobotremote/domain/ZAssayResult.java

@@ -131,6 +131,18 @@ public class ZAssayResult
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    //2025年03月10日11:24:24 新增请求参数
+    //记录ID 用于筛选大于此ID的数据
+    private Long id;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getCreateBy() {
         return createBy;
     }

+ 1 - 0
src/main/resources/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
src/main/resources/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>
     

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