2024年11月22日 1.0.2 优化查询语句

OverLimitDetection/.idea/workspace.xml

@@ -9,7 +9,125 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="92fa9b1a-c127-44e9-8ca7-923ba67cfbb4" name="变更" comment="2024年11月11日    1.0.1      将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库" />
+    <list default="true" id="92fa9b1a-c127-44e9-8ca7-923ba67cfbb4" name="变更" comment="2024年11月11日    1.0.1      将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库">
+      <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/nmgs/mapper/LaneWeightStatusMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/nmgs/mapper/LaneWeightStatusMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/version/1.0.1.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/version/1.0.2.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection.war" beforeDir="false" afterPath="$PROJECT_DIR$/target/OverLimitDetection.war" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection.war.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/OverLimitDetection.war.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/classes/com/nmgs/mapper/LaneWeightStatusMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/classes/com/nmgs/mapper/LaneWeightStatusMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/classes/static/assets/index.3de6f3e4.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/EndPassJava-1.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/HikariCP-3.4.5.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/cxf-rt-wsdl-3.4.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/disruptor-3.4.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/dom4j-1.6.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/druid-1.1.20.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/druid-spring-boot-starter-1.1.10.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/fastjson-2.0.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/fastjson2-2.0.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/fastjson2-extension-2.0.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/gdb_mysql-connector-java-5.1.46.67.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/hibernate-validator-6.0.22.Final.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/httpclient-4.5.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/httpcore-4.4.14.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/httpmime-4.5.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/istack-commons-runtime-3.0.11.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jackson-annotations-2.11.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jackson-core-2.11.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jackson-databind-2.11.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jackson-datatype-jdk8-2.11.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jackson-datatype-jsr310-2.11.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jackson-module-parameter-names-2.11.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jakarta.activation-1.2.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jakarta.activation-api-1.2.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jakarta.validation-api-2.0.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jakarta.xml.bind-api-2.3.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/java-jwt-4.3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/javax.servlet-api-4.0.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jaxb-runtime-2.3.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jboss-logging-3.4.1.Final.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jedis-3.1.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/joda-time-2.10.13.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/json-20220320.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jsqlparser-4.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/jul-to-slf4j-1.7.30.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/kotlin-stdlib-1.3.72.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/kotlin-stdlib-common-1.3.72.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/kotlin-stdlib-jdk7-1.3.72.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/kotlin-stdlib-jdk8-1.3.72.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/log4j-api-2.13.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/log4j-to-slf4j-2.12.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/logback-classic-1.2.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/logback-core-1.2.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-3.5.10.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-plus-3.5.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-plus-annotation-3.5.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-plus-boot-starter-3.5.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-plus-core-3.5.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-plus-extension-3.5.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-plus-join-1.2.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mybatis-spring-2.0.7.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/mysql-connector-java-8.0.22.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/neethi-3.1.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/ojdbc6-11.2.0.4.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/ojdbc8-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/ons-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/oraclepki-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/orai18n-21.5.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/osdt_cert-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/osdt_core-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/simplefan-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/slf4j-api-1.7.30.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/snakeyaml-1.25.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-aop-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-beans-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-autoconfigure-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-jdbc-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-json-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-logging-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-redis-1.4.7.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-validation-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-web-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-boot-starter-websocket-2.2.13.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-context-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-context-support-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-core-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-data-commons-2.3.6.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-data-keyvalue-2.3.6.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-data-redis-2.3.6.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-expression-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-jcl-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-jdbc-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-messaging-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-oxm-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-session-core-2.3.1.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-session-data-redis-2.3.1.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-tx-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-web-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-webmvc-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/spring-websocket-5.2.12.RELEASE.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/sqljdbc4-3.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/stax2-api-4.2.1.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/tomcat-annotations-api-9.0.41.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/tomcat-embed-core-9.0.41.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/tomcat-embed-websocket-9.0.41.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/txw2-2.3.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/ucp-19.3.0.0.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/woodstox-core-6.2.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/wsdl4j-1.6.3.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/xml-apis-1.0.b2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/xml-resolver-1.2.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/OverLimitDetection/WEB-INF/lib/xmlschema-core-2.2.5.jar" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/LaneWeightStatusMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/nmgs/mapper/LaneWeightStatusMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/assets/index.243a5213.js" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/assets/index.243a5213.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/assets/index.3de6f3e4.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/static/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/version/1.0.1.txt" beforeDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -102,7 +220,7 @@
       </method>
     </configuration>
     <configuration name="Tomcat 9.0.68" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.68" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
-      <option name="OPEN_IN_BROWSER_URL" value="http://localhost:9988/OverLimitDetection/EntranceQuery" />
+      <option name="OPEN_IN_BROWSER_URL" value="http://localhost:9988/OverLimitDetection/DeviceStatus" />
       <option name="UPDATING_POLICY" value="restart-server" />
       <deployment>
         <artifact name="OverLimitDetection:war exploded">
@@ -263,6 +381,10 @@
       <workItem from="1731308981726" duration="851000" />
       <workItem from="1731312885286" duration="492000" />
       <workItem from="1731977944505" duration="6854000" />
+      <workItem from="1732093730698" duration="1266000" />
+      <workItem from="1732148306868" duration="817000" />
+      <workItem from="1732179645043" duration="612000" />
+      <workItem from="1732235925281" duration="3501000" />
     </task>
     <task id="LOCAL-00001" summary="123">
       <created>1705387715408</created>
@@ -327,15 +449,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="2024年11月11日    1.0.1      将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/LaneWeightStatusServiceImpl.java</url>
-          <line>38</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
     <pin-to-top-manager>
       <pinned-members>
         <PinnedItemInfo parentTag="com.baomidou.mybatisplus.extension.plugins.pagination.Page" memberName="records" />

OverLimitDetection/src/main/java/com/nmgs/mapper/LaneWeightStatusMapper.xml

@@ -6,11 +6,35 @@
 
 
     <select id="selectMyMapsPage" resultType="java.util.Map">
-        SELECT t.* FROM(select ROADNO,STANO,PORTNO,PORTTYPE,DT,WEIGHTSTATUS,
+        SELECT
-                               (select SUBCOMNAME from SUBCOMPANY_TABLE WHERE SUBCOMNO=(SELECT SUBCOMNO FROM NAME_TABLE WHERE STANO=L.STANO)) SUBCOMNAME,
+            L.ROADNO,
-                               (select STANAME FROM NAME_TABLE WHERE STANO=L.STANO) STANAME,
+            L.STANO,
-                               (select text from porttypegb_text where value=(select GBTYPE from setup_table where roadno=L.roadno and stano=L.stano and portno=L.portno)) PORTTYPETEXT,
+            L.PORTNO,
-                               (case WEIGHTSTATUS when '0' then '正常' else '故障' end) WEIGHTSTATUSTEXT
+            L.PORTTYPE,
-                        from LANE_WEIGHT_STATUS L ${sqlWhere}) t ORDER BY t.WEIGHTSTATUS desc, t.SUBCOMNAME, t.STANO, t.PORTNO
+            L.DT,
+            L.WEIGHTSTATUS,
+            S.SUBCOMNAME,
+            N.STANAME,
+            PT.TEXT as PORTTYPETEXT,
+            CASE L.WEIGHTSTATUS
+                WHEN '0' THEN '正常'
+                ELSE '故障'
+                END AS WEIGHTSTATUSTEXT
+        FROM
+            LANE_WEIGHT_STATUS L
+                LEFT JOIN
+            NAME_TABLE N ON L.STANO = N.STANO
+                LEFT JOIN
+            SUBCOMPANY_TABLE S ON S.SUBCOMNO = N.SUBCOMNO
+                LEFT JOIN
+                (SELECT GBTYPE, ROADNO, STANO, PORTNO FROM setup_table) SE ON L.ROADNO = SE.ROADNO AND L.STANO = SE.STANO AND L.PORTNO = SE.PORTNO
+                LEFT JOIN
+            porttypegb_text PT ON PT.value = SE.GBTYPE
+            ${sqlWhere}
+        ORDER BY
+            L.WEIGHTSTATUS DESC,
+            S.SUBCOMNAME,
+            L.STANO,
+            L.PORTNO
     </select>
 </mapper>

OverLimitDetection/src/main/resources/version/1.0.2.txt

@@ -1,5 +1,6 @@
 序号   日期              版本号      说明
 1      2024年03月04日    1.0.0       超限检测管理初始版本号
 2      2024年11月19日    1.0.1      将前端路由页面去掉，都由主框架路径跳转，同时兼容GoldenDB数据库
+3      2024年11月22日    1.0.2      优化查询语句
 
 

OverLimitDetection/target/OverLimitDetection/WEB-INF/classes/com/nmgs/mapper/LaneWeightStatusMapper.xml

@@ -6,11 +6,35 @@
 
 
     <select id="selectMyMapsPage" resultType="java.util.Map">
-        SELECT t.* FROM(select ROADNO,STANO,PORTNO,PORTTYPE,DT,WEIGHTSTATUS,
+        SELECT
-                               (select SUBCOMNAME from SUBCOMPANY_TABLE WHERE SUBCOMNO=(SELECT SUBCOMNO FROM NAME_TABLE WHERE STANO=L.STANO)) SUBCOMNAME,
+            L.ROADNO,
-                               (select STANAME FROM NAME_TABLE WHERE STANO=L.STANO) STANAME,
+            L.STANO,
-                               (select text from porttypegb_text where value=(select GBTYPE from setup_table where roadno=L.roadno and stano=L.stano and portno=L.portno)) PORTTYPETEXT,
+            L.PORTNO,
-                               (case WEIGHTSTATUS when '0' then '正常' else '故障' end) WEIGHTSTATUSTEXT
+            L.PORTTYPE,
-                        from LANE_WEIGHT_STATUS L ${sqlWhere}) t ORDER BY t.WEIGHTSTATUS desc, t.SUBCOMNAME, t.STANO, t.PORTNO
+            L.DT,
+            L.WEIGHTSTATUS,
+            S.SUBCOMNAME,
+            N.STANAME,
+            PT.TEXT as PORTTYPETEXT,
+            CASE L.WEIGHTSTATUS
+                WHEN '0' THEN '正常'
+                ELSE '故障'
+                END AS WEIGHTSTATUSTEXT
+        FROM
+            LANE_WEIGHT_STATUS L
+                LEFT JOIN
+            NAME_TABLE N ON L.STANO = N.STANO
+                LEFT JOIN
+            SUBCOMPANY_TABLE S ON S.SUBCOMNO = N.SUBCOMNO
+                LEFT JOIN
+                (SELECT GBTYPE, ROADNO, STANO, PORTNO FROM setup_table) SE ON L.ROADNO = SE.ROADNO AND L.STANO = SE.STANO AND L.PORTNO = SE.PORTNO
+                LEFT JOIN
+            porttypegb_text PT ON PT.value = SE.GBTYPE
+            ${sqlWhere}
+        ORDER BY
+            L.WEIGHTSTATUS DESC,
+            S.SUBCOMNAME,
+            L.STANO,
+            L.PORTNO
     </select>
 </mapper>