Skip to content

T
TDLCloud
Commit d5a5f3a0 authored by chenying's avatar chenying
Browse files
Options

6.14修改公司接口，修改报警-使用公司编号查询，修改线路接口，通过公司编号操作

parent 1fa8df64
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 152 deletions
src/main/java/com/example/tdl/domain/vo/AlarmTermVo.java
View file @ d5a5f3a0
......@@ -2,7 +2,7 @@ package com.example.tdl.domain.vo;
public class AlarmTermVo {
private String companyName;
private String companyNo;
private String transportationNo;
......@@ -16,12 +16,12 @@ public class AlarmTermVo {
private Long endTime;
public String getCompanyName() {
return companyName;
public String getCompanyNo() {
return companyNo;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
public void setCompanyNo(String companyNo) {
this.companyNo = companyNo;
}
public String getTransportationNo() {
......
src/main/java/com/example/tdl/mapper/AlarmLogMapper.java
View file @ d5a5f3a0
......@@ -11,7 +11,9 @@ import java.util.List;
@Mapper
public interface AlarmLogMapper {
//获取所有的数据
List<ResultAlarmLog> getAll();
List<ResultAlarmLog> getAll(String companyNo);
List<ResultAlarmLog> getByTransportationNo(String transportationNo);
//根据条件获取报警数据
List<AlarmLogVo> getAlarmLog(@Param("time") String time, @Param("companyNo") String companyNo);
......@@ -19,8 +21,6 @@ public interface AlarmLogMapper {
//新增报警数据
int addAlarmLog(AlarmLog addAlarmLogVo);
List<ResultAlarmLog> getByTransportationNo(String transportationNo);
Integer getCount(@Param("time") String time, @Param("companyNo") String companyNo);
Integer getBumpCount(@Param("time")String time,@Param("companyNo") String companyNo);
......
src/main/java/com/example/tdl/service/AlarmLogService.java
View file @ d5a5f3a0
......@@ -14,8 +14,8 @@ public class AlarmLogService {
@Autowired
private AlarmLogMapper alarmLogMapper;
public List<ResultAlarmLog> getAll(){
return alarmLogMapper.getAll();
public List<ResultAlarmLog> getAll(String companyNo){
return alarmLogMapper.getAll(companyNo);
}
public List<AlarmLogVo> getAlarmLog(String time,String companyNo){
......
src/main/java/com/example/tdl/service/CompanyService.java
View file @ d5a5f3a0
package com.example.tdl.service;
import com.example.tdl.domain.vo.AddCompanyVo;
import com.example.tdl.domain.vo.AlarmContactsVo;
import com.example.tdl.domain.vo.ResultCompanyVo;
import com.example.tdl.domain.vo.UpdateCompanyVo;
import com.example.tdl.mapper.CompanyMapper;
......@@ -12,7 +9,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class CompanyService {
@Autowired
......
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ d5a5f3a0
......@@ -111,7 +111,7 @@ public class AlarmLogController {
if(alarmTermVo.getDescription()==null){
alarmTermVo.setEndTime(null);
}
alarmTermVo.setCompanyName(user.getCompanyName());
alarmTermVo.setCompanyNo(user.getCompanyNo());
return alarmLogServcie.getAlarm(alarmTermVo);
}
......
src/main/java/com/example/tdl/web/CompanyController.java
View file @ d5a5f3a0
package com.example.tdl.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.example.tdl.domain.dto.CommFeedback;
......@@ -9,7 +8,6 @@ import com.example.tdl.domain.vo.ResultCompanyVo;
import com.example.tdl.domain.vo.UpdateCompanyVo;
import com.example.tdl.domain.vo.UserRedisVo;
import com.example.tdl.service.CompanyService;
import com.example.tdl.service.RoleService;
import com.example.tdl.service.redis.TokenRedisService;
import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam;
......@@ -28,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@RequestMapping("/company")
public class CompanyController {
......@@ -90,6 +87,9 @@ public class CompanyController {
})
@RequestMapping(value="/addCompany",method = RequestMethod.POST)
public Object addCompany(@RequestBody AddCompanyVo addCompanyVo,HttpServletRequest request){
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
String port = request.getHeader("AccountLanguage");
if (StringUtils.isEmpty(addCompanyVo.getCompanyName())){
fb.setCode(0);
......@@ -126,7 +126,7 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"manager"));
return gson.toJson(fb);
}
if( !addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
if (!addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTel"));
return gson.toJson(fb);
......@@ -165,6 +165,7 @@ public class CompanyController {
map.put("tel",addCompanyVo.getTel());
map.put("manager",addCompanyVo.getManager());
map.put("img",addCompanyVo.getImg());
map.put("parentCompanyNo",user.getCompanyNo());
map.put("roleName",addCompanyVo.getRoleName());
map.put("createTime",System.currentTimeMillis());
companyService.addCompany(map);
......@@ -277,6 +278,7 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"companyNo"));
return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(companyNo);
companyNo=(String) jsonObject.get("companyNo");
Map<Object,Object> map=new HashMap<>();
......
src/main/java/com/example/tdl/web/RoleController.java
View file @ d5a5f3a0
......@@ -294,10 +294,7 @@ public class RoleController {
//辉度修改其他公司的角色权限
@ApiOperation(value = "辉度修改其他公司的角色权限",notes = "辉度修改其他公司的角色权限，传递参数:" +
" roleName:角色名，" +
" permissions: [" +
" 权限名" +
" ]," +
" companyName:角色所属公司")
" companyNameVar:需要修改的公司")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
......
src/main/resources/mapper/AlarmLogMapper.xml
View file @ d5a5f3a0
......@@ -2,9 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.tdl.mapper.AlarmLogMapper">
<!--获取所有的报警数据-->
<select id="getAll" resultType="com.example.tdl.domain.vo.ResultAlarmLog">
<select id="getAll" resultType="com.example.tdl.domain.vo.ResultAlarmLog" parameterType="String">
select transportationNo,TDLSN,description,ifnull(data,"") data,alarmTime,classify from alarm_log
where transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}))
where transportationNo in (select transportationNo from circuit where company_id =(
select id from company where companyNo=#{companyNo,jdbcType=VARCHAR}))
order by alarmTime desc;
</select>
......@@ -16,41 +17,42 @@
<!--根据条件获取报警数据-->
<select id="getAlarmLog" parameterType="String" resultType="com.example.tdl.domain.vo.AlarmLogVo">
select transportationNo,description,ifnull(data,"") data,alarmTime
from alarm_log
where transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}))
select transportationNo,description,ifnull(data,"") data,alarmTime from alarm_log
where transportationNo in (select transportationNo from circuit where company_id =(
select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}))
and DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
order by alarmTime desc
</select>
<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}
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}
)
</insert>
<select id="getCount" parameterType="String" resultType="java.lang.Integer">
select count(DISTINCT transportationNo) from alarm_log
where transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}))
and DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
where transportationNo in (select transportationNo from circuit where company_id =(
select id from company where companyNo =#{companyNo,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 companyNo =#{companyNo,jdbcType=VARCHAR}))
and DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
where classify = "3"
and transportationNo in (select transportationNo from circuit where company_id =(
select id from company where companyNo =#{companyNo,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" >
......@@ -78,15 +80,15 @@
<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}
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">
select c.transportationNo,al.startCity,al.endCity,c.cargoNo,al.description,al.alarmTime
from alarm_log al,circuit c,company co
where al.transportationNo =c.transportationNo
and c.company_id = co.id
and co.companyName =#{companyName,jdbcType=VARCHAR}
where al.transportationNo =c.transportationNo
and c.company_id = co.id
and co.companyNo =#{companyNo,jdbcType=VARCHAR}
<if test="transportationNo!=null">
AND c.transportationNo = #{transportationNo,jdbcType=VARCHAR}
</if>
......@@ -109,16 +111,17 @@
</select>
<select id="getRealTimeAlarm" parameterType="java.lang.String" resultType="com.example.tdl.domain.vo.AlarmLogVo">
select transportationNo,description,ifnull(FORMAT(data,2),"") data,alarmTime
from alarm_log
where transportationNo in (select transportationNo from circuit where company_id =(select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}))
select transportationNo,description,ifnull(FORMAT(data,2),"") data,alarmTime from alarm_log
where transportationNo in (select transportationNo from circuit where company_id =(
select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}))
and DATE_SUB(CURDATE(), INTERVAL 1 HOUR ) &lt;= date(FROM_UNIXTIME(alarmTime/1000,'%Y-%m-%d %H:%i:%s'))
order by alarmTime desc limit 3
order by alarmTime desc limit 3
</select>
<select id="getAlarmCount" resultType="java.lang.Integer">
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 circuitState = 1)
select count(DISTINCT transportationNo) from alarm_log
where transportationNo in (select transportationNo from circuit where company_id = (
SELECT id from company where companyNo =#{companyNo,jdbcType=VARCHAR}) and circuitState = 1)
</select>
......
src/main/resources/mapper/CircuitMapper.xml
View file @ d5a5f3a0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.tdl.mapper.CircuitMapper">
<!--获取所有线路的信息-->
<select id="getAll" resultType="com.example.tdl.domain.vo.CircuitResultVo" parameterType="String">
<!--获取所有线路的信息-->
<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 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 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 companyNo=#{companyNo,jdbcType=VARCHAR})
order by c.createTime desc
</select>
<!--根据条件查询线路信息-->
<select id="getByTerm" resultType="com.example.tdl.domain.vo.CircuitResultVo" parameterType="com.example.tdl.domain.vo.CircuitTermVo">
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 companyNo=#{companyNo,jdbcType=VARCHAR})
<if test="time !=null">
AND DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(createTime/1000,'%Y-%m-%d %H:%i:%s'))
</if>
<if test="circuitState!=null">
AND c.circuitState=#{circuitState,jdbcType=INTEGER}
</if>
<if test="cargoNo!=null">
AND c.cargoNo like CONCAT(CONCAT('%',#{cargoNo,jdbcType=VARCHAR}),'%')
</if>
<if test="startTime!=null">
AND c.createTime &gt;= #{startTime,jdbcType=BIGINT}
</if>
<if test="endTime!=null">
AND c.createTime &lt;= #{endTime,jdbcType=BIGINT}
</if>
</select>
</select>
<!--根据条件查询线路信息-->
<select id="getByTerm" resultType="com.example.tdl.domain.vo.CircuitResultVo" parameterType="com.example.tdl.domain.vo.CircuitTermVo">
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 companyNo=#{companyNo,jdbcType=VARCHAR})
<if test="time !=null">
AND DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(createTime/1000,'%Y-%m-%d %H:%i:%s'))
</if>
<if test="circuitState!=null">
AND c.circuitState=#{circuitState,jdbcType=INTEGER}
</if>
<if test="cargoNo!=null">
AND c.cargoNo like CONCAT(CONCAT('%',#{cargoNo,jdbcType=VARCHAR}),'%')
</if>
<if test="startTime!=null">
AND c.createTime &gt;= #{startTime,jdbcType=BIGINT}
</if>
<if test="endTime!=null">
AND c.createTime &lt;= #{endTime,jdbcType=BIGINT}
</if>
</select>
<!--新增一条线路-->
<insert id="addCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
<!--新增一条线路-->
<insert id="addCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
call pro_addCircuit(
#{transportationNo,mode=IN,jdbcType=VARCHAR},
......@@ -62,7 +60,7 @@
#{transportationType,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=BIGINT},
#{remark,mode=IN,jdbcType=VARCHAR},
#{companyName,mode=IN,jdbcType=VARCHAR},
#{companyNo,mode=IN,jdbcType=VARCHAR},
#{counts,mode=IN,jdbcType=INTEGER},
#{countryVar,mode=IN,jdbcType=VARCHAR},
#{cityVar,mode=IN,jdbcType=VARCHAR},
......@@ -83,14 +81,13 @@
#{flag,mode=IN,jdbcType=INTEGER},
#{untie,mode=IN,jdbcType=INTEGER},
#{msg,mode=OUT,jdbcType=VARCHAR}
)
)
}
]]>
</insert>
</insert>
<insert id="add" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
<insert id="add" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
call pro_addOneCircuit(
#{transportationNo,mode=IN,jdbcType=VARCHAR},
......@@ -105,7 +102,7 @@
#{transportationType,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=BIGINT},
#{remark,mode=IN,jdbcType=VARCHAR},
#{companyName,mode=IN,jdbcType=VARCHAR},
#{companyNo,mode=IN,jdbcType=VARCHAR},
#{counts,mode=IN,jdbcType=INTEGER},
#{countryVar,mode=IN,jdbcType=VARCHAR},
#{cityVar,mode=IN,jdbcType=VARCHAR},
......@@ -120,13 +117,12 @@
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
</insert>
]]>
</insert>
<!--修改线路信息-->
<update id="updateCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
<!--修改线路信息-->
<update id="updateCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
call pro_updateCircuit(
#{transportationNo,mode=IN,jdbcType=VARCHAR},
......@@ -156,9 +152,8 @@
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
</update>
]]>
</update>
<update id="updateStartTime" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
......@@ -169,16 +164,15 @@
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
]]>
</update>
<!-- 修改结束时间-->
<update id="updateEndTime" parameterType="com.example.tdl.domain.vo.UpdateCircuitVo">
UPDATE circuit set
endTime=#{endTime,jdbcType=BIGINT},circuitState=2
WHERE transportationNo=#{transportationNo,jdbcType=VARCHAR}
</update>
<!-- 修改结束时间-->
<update id="updateEndTime" parameterType="com.example.tdl.domain.vo.UpdateCircuitVo">
UPDATE circuit set
endTime=#{endTime,jdbcType=BIGINT},circuitState=2
WHERE transportationNo=#{transportationNo,jdbcType=VARCHAR}
</update>
<update id="endCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
......@@ -197,12 +191,11 @@
]]>
</update>
<!--删除线路-->
<!--删除线路-->
<delete id="delCircuit" parameterType="String">
UPDATE circuit set state=0 WHERE transportationNo=#{transportationNo,jdbcType=VARCHAR}
</delete>
<delete id="deleteCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
......@@ -215,49 +208,49 @@
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
]]>
</delete>
<!--根据线路编号获取线路信息-->
<select id="getByTransportationNo" resultType="com.example.tdl.domain.vo.ResultCircuitVo" 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 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,ifnull(evaluate,"") evaluate,transportation,
(select DISTINCT gatewaySN FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR} ) SN,(SELECT GROUP_CONCAT(TDLSN) FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR}) TDLSN
from circuit c
where c.state=1
AND c.transportationNo=#{transportationNo,jdbcType=VARCHAR}
AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
</select>
<!--根据线路编号获取线路信息-->
<select id="getByTransportationNo" resultType="com.example.tdl.domain.vo.ResultCircuitVo" 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 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,ifnull(evaluate,"") evaluate,transportation,
(select DISTINCT gatewaySN FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR} ) SN,(SELECT GROUP_CONCAT(TDLSN) FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR}) TDLSN
from circuit c
where c.state=1
AND c.transportationNo=#{transportationNo,jdbcType=VARCHAR}
AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
</select>
<select id="getCircuit" resultType="com.example.tdl.domain.vo.ResultCircuitVo" 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 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,ifnull(evaluate,"") evaluate,transportation,
(select DISTINCT gatewaySN FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR} ) SN,(SELECT GROUP_CONCAT(TDLSN) FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR}) TDLSN
from circuit c
where c.state=1
and c.transportationNo=#{transportationNo,jdbcType=VARCHAR}
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,ifnull(evaluate,"") evaluate,transportation,
(select DISTINCT gatewaySN FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR} ) SN,(SELECT GROUP_CONCAT(TDLSN) FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR}) TDLSN
from circuit c
where c.state=1
and c.transportationNo=#{transportationNo,jdbcType=VARCHAR}
</select>
<!--根据线路编号获取线路信息 app-->
<select id="getByTransportationNoForApp" resultType="com.example.tdl.domain.vo.ResultCircuitForAppVo" parameterType="String">
SELECT c.transportationNo,cargoName,CONCAT_WS("-",(SELECT city from city WHERE id =(SELECT city_id from circuit_transfer WHERE circuit_id=c.id AND sequence =LEFT(s.sequence,1))),(SELECT city from city WHERE id =(SELECT city_id from circuit_transfer WHERE circuit_id=c.id AND sequence=RIGHT(s.sequence,1)))) city,
expTime,compTime,cargoNo,plateNo,deliveryAddress,transportation,transportationType,
(select DISTINCT gatewaySN FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR} ) SN,
(SELECT GROUP_CONCAT(TDLSN) FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR}) TDLSN,remark
from circuit c,(SELECT GROUP_CONCAT(sequence) sequence from circuit_transfer where circuit_id=(SELECT id from circuit where transportationNo=#{transportationNo,jdbcType=VARCHAR})) s
where c.state=1
AND c.transportationNo=#{transportationNo,jdbcType=VARCHAR}
AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
</select>
<!--根据线路编号获取线路信息 app-->
<select id="getByTransportationNoForApp" resultType="com.example.tdl.domain.vo.ResultCircuitForAppVo" parameterType="String">
SELECT c.transportationNo,cargoName,CONCAT_WS("-",(SELECT city from city WHERE id =(SELECT city_id from circuit_transfer WHERE circuit_id=c.id AND sequence =LEFT(s.sequence,1))),(SELECT city from city WHERE id =(SELECT city_id from circuit_transfer WHERE circuit_id=c.id AND sequence=RIGHT(s.sequence,1)))) city,
expTime,compTime,cargoNo,plateNo,deliveryAddress,transportation,transportationType,
(select DISTINCT gatewaySN FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR} ) SN,
(SELECT GROUP_CONCAT(TDLSN) FROM tdl_gateway_log WHERE transportationNo= #{transportationNo,jdbcType=VARCHAR}) TDLSN,remark
from circuit c,(SELECT GROUP_CONCAT(sequence) sequence from circuit_transfer where circuit_id=(SELECT id from circuit where transportationNo=#{transportationNo,jdbcType=VARCHAR})) s
where c.state=1
AND c.transportationNo=#{transportationNo,jdbcType=VARCHAR}
AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
</select>
<!-- 运输中数量-->
<!-- 运输中数量-->
<select id="getOnRoute" resultType="java.lang.Integer" parameterType="String">
select count(transportationNo) from circuit where circuitState=1 AND state = 1
AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
......
src/main/resources/mapper/CompanyMapper.xml
View file @ d5a5f3a0
......@@ -7,7 +7,7 @@
from company
WHERE state=1
<if test="companyNo!='TM201803298320'">
and companyNo=#{companyNo,jdbcType=VARCHAR}
and pid=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
</if>
</select>
......@@ -24,6 +24,7 @@
#{tel,mode=IN,jdbcType=VARCHAR},
#{manager,mode=IN,jdbcType=VARCHAR},
#{img,mode=IN,jdbcType=VARCHAR},
#{parentCompanyNo,mode=IN,jdbcType=VARCHAR},
#{roleName,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=VARCHAR},
#{msg,mode=OUT,jdbcType=VARCHAR}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment