Skip to content

T
TDLCloud
Commit bf136da7 authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

6.13--优化数据查询，修改车辆bug,优化线路查询，增加首页仓库位置返回

parent 5c662b43
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 851 additions and 551 deletions
src/main/java/com/example/tdl/domain/vo/AddCarVo.java 0 → 100644
View file @ bf136da7
package com.example.tdl.domain.vo;
public class AddCarVo {
private String carNo;
private String type;
private String img;
private String companyNo;
private String remark;
public String getCarNo() {
return carNo;
}
public void setCarNo(String carNo) {
this.carNo = carNo;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public String getCompanyNo() {
return companyNo;
}
public void setCompanyNo(String companyNo) {
this.companyNo = companyNo;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/example/tdl/domain/vo/HomePageDataVo.java
View file @ bf136da7
......@@ -19,6 +19,8 @@ public class HomePageDataVo {
private List<CircuitVo> circuitList;
private List<ResultWarehouseVo> warehouseVoList;
private List<HistogramData> histogramDataList;
public Integer getSum() {
......@@ -77,6 +79,14 @@ public class HomePageDataVo {
this.circuitList = circuitList;
}
public List<ResultWarehouseVo> getWarehouseVoList() {
return warehouseVoList;
}
public void setWarehouseVoList(List<ResultWarehouseVo> warehouseVoList) {
this.warehouseVoList = warehouseVoList;
}
public List<HistogramData> getHistogramDataList() {
return histogramDataList;
}
......
src/main/java/com/example/tdl/domain/vo/TruckNo.java 0 → 100644
View file @ bf136da7
package com.example.tdl.domain.vo;
public class TruckNo {
private String carNo;
public String getCarNo() {
return carNo;
}
public void setCarNo(String carNo) {
this.carNo = carNo;
}
}
src/main/java/com/example/tdl/domain/vo/WarehouseDetailVo.java
View file @ bf136da7
......@@ -3,6 +3,9 @@ package com.example.tdl.domain.vo;
import java.util.List;
public class WarehouseDetailVo {
private String img;
private String warehouseNo;
private String warehouseName;
......@@ -27,6 +30,14 @@ public class WarehouseDetailVo {
private List<GatewayOnLineVo> gatewayOnLineVos;
public String getImg() {
return img;
}
public void setImg(String img) {
this.img = img;
}
public List<GatewayOnLineVo> getGatewayOnLineVos() {
return gatewayOnLineVos;
}
......
src/main/java/com/example/tdl/mapper/CarMapper.java
View file @ bf136da7
......@@ -9,13 +9,13 @@ import java.util.List;
@Mapper
public interface CarMapper {
List<ResultCarVo> getAll(String companyName);
List<ResultCarVo> getAll(String companyNo);
ResultCarVo getByCarNo(@Param("companyName") String companyName, @Param("carNo") String carNo);
ResultCarVo getByCarNo(@Param("companyNo") String companyNo, @Param("carNo") String carNo);
List<ResultCarVo> getByCarNoForLike(@Param("companyName") String companyName, @Param("carNo") String carNo);
List<ResultCarVo> getByCarNoForLike(@Param("companyNo") String companyNo, @Param("carNo") String carNo);
int addCar(ResultCarVo resultCarVo);
int addCar(AddCarVo resultCarVo);
int updateCar(UpdateCarVo updateAlarmVo);
......@@ -23,4 +23,6 @@ public interface CarMapper {
int updateImg(@Param("img") String img,@Param("carNo") String carNo);
List<TruckNo> getTruckNo(@Param("companyNo") String companyNo, @Param("carNo") String carNo);
}
src/main/java/com/example/tdl/service/CarService.java
View file @ bf136da7
......@@ -15,19 +15,19 @@ public class CarService {
@Autowired
private CarMapper carMapper;
public List<ResultCarVo> getAll(String companyName){
return carMapper.getAll(companyName);
public List<ResultCarVo> getAll(String companyNo){
return carMapper.getAll(companyNo);
}
public ResultCarVo getByCarNo(String companyName,String carNo){
return carMapper.getByCarNo(companyName,carNo);
public ResultCarVo getByCarNo(String companyNo,String carNo){
return carMapper.getByCarNo(companyNo,carNo);
}
public List<ResultCarVo> getByCarNoForLike(String companyName,String carNo){
return carMapper.getByCarNoForLike(companyName,carNo);
public List<ResultCarVo> getByCarNoForLike(String companyNo,String carNo){
return carMapper.getByCarNoForLike(companyNo,carNo);
}
public int addCar(ResultCarVo resultCarVo){
public int addCar(AddCarVo resultCarVo){
return carMapper.addCar(resultCarVo);
}
......@@ -43,5 +43,9 @@ public class CarService {
return carMapper.updateImg(img,carNo);
}
public List<TruckNo> getTruckNo(String companyNo,String carNo){
return carMapper.getTruckNo(companyNo,carNo);
}
}
src/main/java/com/example/tdl/util/DataUtil.java 0 → 100644
View file @ bf136da7
This diff is collapsed.
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ bf136da7
......@@ -151,7 +151,6 @@ public class AlarmLogController {
}
//新增报警消息
@ApiOperation(value = "增加报警",notes = "增加报警")
@RequestMapping(value = "/addAlarmLog",method = RequestMethod.POST)
......@@ -198,7 +197,7 @@ public class AlarmLogController {
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("h")){
desp = "湿度" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
classify = "2";
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a0")){
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("a1")){
desp = "震动" +map.get(addAlarmLogVo.getAlarm().get(i).getAlarmno());
classify = "3";
} else if(addAlarmLogVo.getAlarm().get(i).getAlias().contains("ta")) {
......@@ -252,7 +251,9 @@ public class AlarmLogController {
return gson.toJson(fb);
}
if(StringUtils.isEmpty(alarmMessageVo.getTDLSN())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"TDL"));
return gson.toJson(fb);
}
if(alarmMessageVo.getAlarmTime() == null){
fb.setCode(0);
......@@ -394,7 +395,6 @@ public class AlarmLogController {
}
public static String dateToStamp(String s) throws ParseException {
Date date =null ;
if(s.length() !=20 ) {
......
src/main/java/com/example/tdl/web/CarController.java
View file @ bf136da7
......@@ -59,7 +59,7 @@ public class CarController {
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
return carService.getAll(user.getCompanyName());
return carService.getAll(user.getCompanyNo());
}
//根据车牌号模糊查询
......@@ -77,9 +77,14 @@ public class CarController {
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(StringUtils.isEmpty(carNo)){
fb.setMessage(i18n.getMessage(request,"carNo"));
fb.setCode(0);
return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(carNo);
carNo=(String)jsonObject.get("carNo");
return carService.getByCarNoForLike(user.getCompanyName(),carNo);
return carService.getByCarNoForLike(user.getCompanyNo(),carNo);
}
//添加车辆信息
......@@ -93,7 +98,7 @@ public class CarController {
@ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
})
@RequestMapping(value="/addCar",method = RequestMethod.POST)
public Object addCar(@RequestBody ResultCarVo resultCarVo, HttpServletRequest request){
public Object addCar(@RequestBody AddCarVo resultCarVo, HttpServletRequest request){
String port =request.getHeader("AccountLanguage");
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
......@@ -108,12 +113,12 @@ public class CarController {
fb.setMessage(i18n.getMessage(request,"type"));
return gson.toJson(fb);
}
if (carService.getByCarNo(user.getCompanyName(),resultCarVo.getCarNo())!=null){
if (carService.getByCarNo(user.getCompanyNo(),resultCarVo.getCarNo())!=null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"repetitionCarNo"));
return gson.toJson(fb);
}
resultCarVo.setCompanyName(user.getCompanyName());
resultCarVo.setCompanyNo(user.getCompanyNo());
int a=carService.addCar(resultCarVo);
if (a>0){
fb.setCode(1);
......@@ -194,4 +199,27 @@ public class CarController {
return gson.toJson(fb);
}
//获取所有的车牌号
@ApiOperation(value = "获取所有的车牌号",notes = "获取所有的车牌号,需要传递参数：" +
" carNo：车牌号")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
@ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
})
@RequestMapping(value="/getTruckNo",method = RequestMethod.POST)
public Object getTruckNo(@RequestBody String carNo,HttpServletRequest request){
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if(StringUtils.isEmpty(carNo)){
fb.setMessage(i18n.getMessage(request,"carNo"));
fb.setCode(0);
return gson.toJson(fb);
}
JSONObject jsonObject= JSON.parseObject(carNo);
carNo=(String)jsonObject.get("carNo");
return carService.getTruckNo(user.getCompanyNo(),carNo);
}
}
src/main/java/com/example/tdl/web/CircuitController.java
View file @ bf136da7
......@@ -888,7 +888,7 @@ public class CircuitController {
return gson.toJson(fb);
}
//判断当前车牌是否已存在
if(carService.getByCarNo(user.getCompanyName(),addCircuitVo.getCargoNo()) == null){
if(carService.getByCarNo(user.getCompanyNo(),addCircuitVo.getPlateNo()) == null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"nonexistentTruck"));
return gson.toJson(fb);
......
src/main/java/com/example/tdl/web/HomePageController.java
View file @ bf136da7
......@@ -8,6 +8,7 @@ import com.example.tdl.service.AlarmLogService;
import com.example.tdl.service.CircuitService;
import com.example.tdl.service.TDLLogService;
import com.example.tdl.service.WarehouseService;
import com.example.tdl.service.redis.InfoRedisService;
import com.example.tdl.service.redis.TokenRedisService;
import com.google.gson.Gson;
......@@ -56,6 +57,9 @@ public class HomePageController {
@Autowired
private InfoRedisService infoRedisService;
@Autowired
private WarehouseService warehouseService;
private final static String database ="original";
@Autowired
......@@ -110,8 +114,10 @@ public class HomePageController {
dataVo.setDelay(delay);//延误数量
dataVo.setAlarmed( alarmLogServcie.getCount(time,user.getCompanyNo()));//报警数量
dataVo.setBump(alarmLogServcie.getBumpCount(time,user.getCompanyNo())); //获取颠簸数量
dataVo.setAlarmLogVoList(alarmLogServcie.getAlarmLog(time,user.getCompanyNo()));//报警列表
// dataVo.setAlarmLogVoList(alarmLogServcie.getAlarmLog(time,user.getCompanyNo()));//报警列表
dataVo.setWarehouseVoList(warehouseService.getAll(user.getCompanyNo()));
List<HistogramData> list = alarmLogServcie.getByCount(time,user.getCompanyNo());//获取报警柱状图
//获取所有的仓库数据
for(int j = 0,length = list.size();j<length;j++){
if(list.get(j).getClassify().equals("5")){
Integer count = list.get(j).getCount() +delay;
......
src/main/java/com/example/tdl/web/PicUploadController.java
View file @ bf136da7
......@@ -74,34 +74,34 @@ public class PicUploadController {
return gson.toJson(fb);
}else{
if("truck".equals(imageType)){
if(sourceImg.getHeight()>90){
if(sourceImg.getWidth()>90){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
if(sourceImg.getWidth()>60){
if(sourceImg.getHeight()>60){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
}else if("warehouse".equals(imageType)){
if(sourceImg.getHeight()>150){
if(sourceImg.getWidth()>150){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
if(sourceImg.getWidth()>120){
if(sourceImg.getHeight()>120){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
}else if("company".equals(imageType)){
if(sourceImg.getHeight()>24){
if(sourceImg.getWidth()>24){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
if(sourceImg.getWidth()>24){
if(sourceImg.getHeight()>24){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
......@@ -186,34 +186,34 @@ public class PicUploadController {
return gson.toJson(fb);
}
if("truck".equals(imageType)){
if(sourceImg.getHeight()>90){
if(sourceImg.getWidth()>90){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
if(sourceImg.getWidth()>60){
if(sourceImg.getHeight()>60){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
}else if("warehouse".equals(imageType)){
if(sourceImg.getHeight()>150){
if(sourceImg.getWidth()>150){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
if(sourceImg.getWidth()>120){
if(sourceImg.getHeight()>120){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
}else if("company".equals(imageType)){
if(sourceImg.getHeight()>24){
if(sourceImg.getWidth()>24){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
}
if(sourceImg.getWidth()>24){
if(sourceImg.getHeight()>24){
fb.setCode(0);
fb.setMessage("上传图片尺寸不正确");
return gson.toJson(fb);
......@@ -279,5 +279,4 @@ public class PicUploadController {
return gson.toJson(fb);
}
}
src/main/resources/i18n/messages_zh_CN.properties
View file @ bf136da7
......@@ -162,10 +162,6 @@ resetPasswordSuccess = \u91CD\u7F6E\u5BC6\u7801\u6210\u529F
resetPasswordFailure = \u91CD\u7F6E\u5BC6\u7801\u5931\u8D25
modifiedPasswordSuccess = \u4FEE\u6539\u5BC6\u7801\u6210\u529F
modifiedPasswordFailure = \u4FEE\u6539\u5BC6\u7801\u5931\u8D25
systemManage = \u7CFB\u7EDF\u7BA1\u7406\u5458
superManage = \u8D85\u7EA7\u7BA1\u7406\u5458
warehouse = \u4ED3\u5E93\u7BA1\u7406\u5458
transportManage = \u8FD0\u8F93\u7BA1\u7406\u5458
null = \u53D1\u751F\u7A7A\u6307\u9488\u5F02\u5E38
illegal = \u8BF7\u6C42\u53C2\u6570\u7C7B\u578B\u4E0D\u5339\u914D
sql = \u6570\u636E\u5E93\u8BBF\u95EE\u5F02\u5E38
......@@ -259,3 +255,5 @@ deleteFailure=\u5220\u9664\u89D2\u8272\u5931\u8D25
#\u4ED3\u5E93\u6570\u636E\u4E0B\u8F7D
downloadStartTime=\u67E5\u8BE2\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
#\u4F20\u611F\u5668
TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
src/main/resources/mapper/CarMapper.xml
View file @ bf136da7
......@@ -5,14 +5,14 @@
<select id="getAll" resultType="com.example.tdl.domain.vo.ResultCarVo" parameterType="String">
SELECT carNo,type,a.img,companyName,remark
from car a INNER JOIN company c ON a.company_id=c.id
WHERE c.companyName=#{companyName,jdbcType=VARCHAR}
WHERE c.companyNo=#{companyNo,jdbcType=VARCHAR}
</select>
<!--根据车牌号查询-->
<select id="getByCarNo" resultType="com.example.tdl.domain.vo.ResultCarVo" parameterType="String">
SELECT carNo,type,a.img,companyName,remark
from car a INNER JOIN company c ON a.company_id=c.id
WHERE c.companyName=#{companyName,jdbcType=VARCHAR}
WHERE c.companyNo=#{companyNo,jdbcType=VARCHAR}
AND carNo=#{carNo,jdbcType=VARCHAR}
</select>
......@@ -20,18 +20,18 @@
<select id="getByCarNoForLike" resultType="com.example.tdl.domain.vo.ResultCarVo" parameterType="String">
SELECT carNo,type,a.img,companyName,remark
from car a INNER JOIN company c ON a.company_id=c.id
WHERE c.companyName=#{companyName,jdbcType=VARCHAR}
WHERE c.companyNo=#{companyNo,jdbcType=VARCHAR}
AND carNo LIKE CONCAT(CONCAT('%',#{carNo,jdbcType=VARCHAR}), '%')
</select>
<!--添加车辆信息-->
<insert id="addCar" parameterType="com.example.tdl.domain.vo.ResultCarVo">
<insert id="addCar" parameterType="com.example.tdl.domain.vo.AddCarVo">
INSERT INTO car VALUES (
NULL ,
#{carNo,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR},
#{img,jdbcType=VARCHAR},
(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR}),
(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR}),
#{remark,jdbcType=VARCHAR}
)
</insert>
......@@ -54,4 +54,11 @@
update car set img=#{img,jdbcType=VARCHAR} WHERE carNo=#{carNo,jdbcType=VARCHAR}
</update>
<select id="getTruckNo" resultType="com.example.tdl.domain.vo.TruckNo" parameterType="String">
SELECT carNo
from car a INNER JOIN company c ON a.company_id=c.id
WHERE c.companyNo=#{companyNo,jdbcType=VARCHAR}
AND carNo LIKE CONCAT(CONCAT('%',#{carNo,jdbcType=VARCHAR}), '%')
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/GatewayMapper.xml
View file @ bf136da7
......@@ -89,8 +89,8 @@
</update>
<select id="getTransportationNo" parameterType="String" resultType="String">
select transportationNo from circuit
where id = (select circuit_id from tdldevice
select DISTINCT transportationNo from circuit
where id in (select circuit_id from tdldevice
where gateway_id =(SELECT id from gateway where SN=#{SN,jdbcType=VARCHAR}
AND type=#{type,jdbcType=VARCHAR}))
</select>
......
src/main/resources/mapper/WarehouseMapper.xml
View file @ bf136da7
......@@ -243,7 +243,7 @@
</select>
<select id="getWarehouseDetailByNo" parameterType="String" resultType="com.example.tdl.domain.vo.WarehouseDetailVo">
SELECT warehouseNo,warehouseName,c.country,c.city,addressDetail,(SELECT COUNT(DISTINCT gatewaySN) from tdl_gateway_log WHERE warehouseNo=w.warehouseNo and ISNULL(endTime)) gatewayCounts,
SELECT img,warehouseNo,warehouseName,c.country,c.city,addressDetail,(SELECT COUNT(DISTINCT gatewaySN) from tdl_gateway_log WHERE warehouseNo=w.warehouseNo and ISNULL(endTime)) gatewayCounts,
(SELECT COUNT(TDLSN) from tdl_gateway_log WHERE warehouseNo=w.warehouseNo and ISNULL(endTime)) tdlCounts,property,type,hardwareLevel,areaPlanIndoor
from warehouse w INNER JOIN city c ON w.city_id=c.id
where warehouseNo=#{warehouseNo,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