5.29修改仓库和线路

src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://192.168.1.16:3306/cy?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.1.53:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=37774020
+spring.datasource.password=root
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 

src/main/resources/mapper/CircuitMapper.xml

@@ -5,10 +5,8 @@
    <select id="getAll" resultType="com.example.tdl.domain.vo.CircuitResultVo" parameterType="String">
         SELECT c.transportationNo,cargoNo,cargoName,(SELECT city from city WHERE id =(SELECT city_id from circuit_transfer WHERE circuit_id=c.id ORDER BY sequence LIMIT 1)) startCity,startTime,
             (SELECT city from city WHERE id =(SELECT city_id from circuit_transfer WHERE circuit_id=c.id ORDER BY sequence DESC LIMIT 1)) endCity,endTime,circuitState,
-          (SELECT alarmType FROM alarm WHERE id IN (SELECT alarm_id from tdl_gateway_log WHERE transportationNo=c.transportationNo)) alarmType,
-          (select GROUP_CONCAT( DISTINCT classify) from alarm_log al where al.transportationNo = c.transportationNo) alarm,evaluate,transportation,plateNo,
-          (select DISTINCT  gatewaySN from tdl_gateway_log WHERE transportationNo=c.transportationNo) gSN,
-          (select DISTINCT gatewayType from tdl_gateway_log WHERE transportationNo=c.transportationNo) gType
+            (SELECT GROUP_CONCAT(alarmType) FROM alarm WHERE id IN (SELECT alarm_id from tdl_gateway_log WHERE transportationNo=c.transportationNo)) alarmType,
+            (select GROUP_CONCAT( DISTINCT classify) from alarm_log al where al.transportationNo = c.transportationNo) alarm,evaluate,transportation,plateNo,(select DISTINCT  gatewaySN from tdl_gateway_log WHERE transportationNo=c.transportationNo) gSN,(select DISTINCT gatewayType from tdl_gateway_log WHERE transportationNo=c.transportationNo) gType
         from circuit c
         where c.state=1
         AND company_id=(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})