dongdingding
付刚 3 years ago
parent 4251d1048c
commit dcec172a92

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="RuoYiApplication" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="ALTERNATIVE_JRE_PATH" value="1.8" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="com.ruoyi.RuoYiApplication" />
<module name="ruoyi-admin" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="com.ruoyi.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>

@ -31,7 +31,25 @@ public class GpsData {
private String car_no;
public String getBegincreatetime() {
return begincreatetime;
}
public void setBegincreatetime(String begincreatetime) {
this.begincreatetime = begincreatetime;
}
private String begincreatetime;
public String getEndcreatetime() {
return endcreatetime;
}
public void setEndcreatetime(String endcreatetime) {
this.endcreatetime = endcreatetime;
}
private String endcreatetime;

@ -88,6 +88,25 @@ public class WujiangData extends BaseEntity
private String car_no;
public String getBegincreatetime() {
return begincreatetime;
}
public void setBegincreatetime(String begincreatetime) {
this.begincreatetime = begincreatetime;
}
private String begincreatetime;
public String getEndcreatetime() {
return endcreatetime;
}
public void setEndcreatetime(String endcreatetime) {
this.endcreatetime = endcreatetime;
}
private String endcreatetime;
private Integer shen_state;
private String shen_zb;

@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWujianggpsDataVo">
select id, begaintime, number, lng, lat, angle,filename,speed,car_no, begain_time,create_time from wujiang_gpsdata where TO_DAYS(create_time) = TO_DAYS(NOW())
select id, begaintime, number, lng, lat, angle,filename,speed,car_no, begain_time,create_time from wujiang_gpsdata
</sql>
<select id="selectGpsDataList" parameterType="GpsData" resultMap="GpsDataResult">
@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="car_no != null"> and car_no = #{car_no}</if>
<if test="d_id != null"> and id &lt; #{d_id}</if>
<if test="x_id != null"> and id > #{x_id}</if>
<if test="params.begincreatetime != null and params.begincreatetime != '' and params.endcreatetime != null and params.endcreatetime != ''">
and create_time between #{params.begincreatetime} and #{params.endcreatetime}
<if test="begincreatetime != null and begincreatetime != '' and endcreatetime != null and endcreatetime != ''">
and create_time between #{begincreatetime} and #{endcreatetime}
</if>
</where>

@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectWujiangDataVo">
select id, imgname, begaintime, imgtime, number, eventname, lng, lat, angle, zb,filename, begain_time, img_time,create_time,car_no,shen_state,
shen_zb,shen_remark,shen_time from wujiang_data where TO_DAYS(create_time) = TO_DAYS(NOW())
shen_zb,shen_remark,shen_time from wujiang_data
</sql>
<select id="selectWujiangDataList" parameterType="WujiangData" resultMap="WujiangDataResult">
@ -38,15 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="eventname != null and eventname != ''"> and eventname like concat('%', #{eventname}, '%')</if>
<if test="begaintime != null "> and begain_time = #{begaintime}</if>
<if test="imgtime != null "> and img_time = #{imgtime}</if>
<if test="params.begincreatetime != null and params.begincreatetime != '' and params.endcreatetime != null and params.endcreatetime != ''">
and create_time between #{params.begincreatetime} and #{params.endcreatetime}
</if>
<if test="car_no != null"> and car_no = #{car_no}</if>
<if test="shen_state != null"> and shen_state = #{shen_state}</if>
<if test="d_id != null"> and id &lt; #{d_id}</if>
<if test="x_id != null"> and id > #{x_id}</if>
<if test="begincreatetime != null and begincreatetime != '' and endcreatetime != null and endcreatetime != ''">
and create_time between #{begincreatetime} and #{endcreatetime}
</if>
${params.dataScope}
</where>
</select>

Loading…
Cancel
Save