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/AlarmLogMapper.xml

@@ -9,8 +9,8 @@
     </select>
 
     <select id="getByTransportationNo" resultType="com.example.tdl.domain.vo.ResultAlarmLog" parameterType="String">
-          select transportationNo,TDLSN,description,ifnull(data,"") data,alarmTime,classify from alarm_log
-          where transportationNo=#{transportationNo,jdbcType=VARCHAR}
+        select transportationNo,TDLSN,description,ifnull(data,"") data,alarmTime,classify from alarm_log
+        where transportationNo=#{transportationNo,jdbcType=VARCHAR}
     </select>
 
     <!--根据条件获取报警数据-->
@@ -25,31 +25,31 @@
     <insert id="addAlarmLog" parameterType="com.example.tdl.entity.AlarmLog">
         insert into alarm_log
         values(
-          null,
-          #{transportationNo,jdbcType=VARCHAR},
-          #{startCity,jdbcType=VARCHAR},
-          #{endCity,jdbcType=VARCHAR},
-          #{TDLSN,jdbcType=VARCHAR},
-          #{description,jdbcType=VARCHAR},
-          #{data,jdbcType=FLOAT},
-          #{alarmTime,jdbcType=INTEGER},
-          #{classify,jdbcType=VARCHAR},
-          #{desp,jdbcType=VARCHAR},
-          #{alarmNo,jdbcType=VARCHAR}
+        null,
+        #{transportationNo,jdbcType=VARCHAR},
+        #{startCity,jdbcType=VARCHAR},
+        #{endCity,jdbcType=VARCHAR},
+        #{TDLSN,jdbcType=VARCHAR},
+        #{description,jdbcType=VARCHAR},
+        #{data,jdbcType=FLOAT},
+        #{alarmTime,jdbcType=INTEGER},
+        #{classify,jdbcType=VARCHAR},
+        #{desp,jdbcType=VARCHAR},
+        #{alarmNo,jdbcType=VARCHAR}
         )
     </insert>
 
     <select id="getCount" parameterType="String" resultType="java.lang.Integer">
-       select count(DISTINCT transportationNo) from alarm_log
+        select count(DISTINCT transportationNo) from alarm_log
         where  transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyName =#{companyName,jdbcType=VARCHAR}))
         and DATE_SUB(CURDATE(),  INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
     </select>
 
     <select id="getBumpCount"  resultType="java.lang.Integer" >
-       select count(DISTINCT transportationNo) from alarm_log
-       where  classify =  "3"
-       and transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyName =#{companyName,jdbcType=VARCHAR}))
-       and DATE_SUB(CURDATE(),  INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
+        select count(DISTINCT transportationNo) from alarm_log
+        where  classify =  "3"
+        and transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyName =#{companyName,jdbcType=VARCHAR}))
+        and DATE_SUB(CURDATE(),  INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
     </select>
 
     <select id = "getByCount" parameterType="String" resultType="com.example.tdl.domain.vo.HistogramData" >
@@ -75,9 +75,9 @@
     </select>
 
     <select id="getByTime" resultType="java.lang.Integer">
-      select count(id) from alarm_log
-      where transportationNo= #{transportationNo,jdbcType=VARCHAR}
-      and alarmTime between #{startTime,jdbcType=BIGINT}  and #{endTime,jdbcType=BIGINT}
+        select count(id) from alarm_log
+        where transportationNo= #{transportationNo,jdbcType=VARCHAR}
+        and alarmTime between #{startTime,jdbcType=BIGINT}  and #{endTime,jdbcType=BIGINT}
     </select>
 
     <select id="getAlarm" parameterType="com.example.tdl.domain.vo.AlarmTermVo" resultType="com.example.tdl.domain.vo.ResultAlarmLogVo">
@@ -87,7 +87,7 @@
         and   c.company_id = co.id
         and  co.companyName =#{companyName,jdbcType=VARCHAR}
         <if test="transportationNo!=null">
-        AND c.transportationNo = #{transportationNo,jdbcType=VARCHAR}
+            AND c.transportationNo = #{transportationNo,jdbcType=VARCHAR}
         </if>
         <if test="description!=null">
             AND al.description = #{description,jdbcType=VARCHAR}

src/main/resources/mapper/CircuitMapper.xml

@@ -3,16 +3,14 @@
 <mapper namespace="com.example.tdl.mapper.CircuitMapper">
    <!--获取所有线路的信息-->
    <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
-      from circuit c
-      where c.state=1
-      AND company_id=(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})
-      order by c.createTime desc
+        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 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})
+        order by c.createTime desc
    </select>