Skip to content

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

6.28-修改英文版仓库添加的bug；修复用户新增不了的bug，删除公司电话的校验

parent cae3e7c3
Show whitespace changes
Inline Side-by-side
Showing with 290 additions and 243 deletions
build.gradle
View file @ 924e3f32
...@@ -49,6 +49,7 @@ dependencies { ...@@ -49,6 +49,7 @@ dependencies {
compile ('com.github.miwurster:spring-data-influxdb:1.6') compile ('com.github.miwurster:spring-data-influxdb:1.6')
compile('com.aliyun.oss:aliyun-sdk-oss:2.5.0') compile('com.aliyun.oss:aliyun-sdk-oss:2.5.0')
compile('org.apache.poi:poi:3.9') compile('org.apache.poi:poi:3.9')
compile files('libs/javacsv-2.0.jar')
compile('org.springframework.boot:spring-boot-starter-mail') compile('org.springframework.boot:spring-boot-starter-mail')
} }
jar { jar {
......
src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java
View file @ 924e3f32
...@@ -24,12 +24,14 @@ public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter { ...@@ -24,12 +24,14 @@ public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter {
public void addInterceptors(InterceptorRegistry registry) { public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(loginInterceptor()) registry.addInterceptor(loginInterceptor())
.excludePathPatterns("/alarmLog/addAlarmLog") .excludePathPatterns("/alarmLog/addAlarmLog")
.excludePathPatterns("/login/**"); .excludePathPatterns("/login/**")
.excludePathPatterns("/getData");
registry.addInterceptor(permissionInterceptor()) registry.addInterceptor(permissionInterceptor())
.excludePathPatterns("/login/**") .excludePathPatterns("/login/**")
.excludePathPatterns("/alarmLog/addAlarmLog") .excludePathPatterns("/alarmLog/addAlarmLog")
.excludePathPatterns("/side/**") .excludePathPatterns("/side/**")
.excludePathPatterns("/test"); .excludePathPatterns("/test")
.excludePathPatterns("/getData");
super.addInterceptors(registry); super.addInterceptors(registry);
} }
......
src/main/java/com/example/tdl/domain/vo/AddUserVo.java
View file @ 924e3f32
...@@ -21,14 +21,6 @@ public class AddUserVo { ...@@ -21,14 +21,6 @@ public class AddUserVo {
private Long updateTime; private Long updateTime;
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getUserNumber() { public String getUserNumber() {
return userNumber; return userNumber;
} }
...@@ -37,22 +29,6 @@ public class AddUserVo { ...@@ -37,22 +29,6 @@ public class AddUserVo {
this.userNumber = userNumber; this.userNumber = userNumber;
} }
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
public Long getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Long updateTime) {
this.updateTime = updateTime;
}
public String getUserName() { public String getUserName() {
return userName; return userName;
} }
...@@ -100,4 +76,28 @@ public class AddUserVo { ...@@ -100,4 +76,28 @@ public class AddUserVo {
public void setRoleName(String roleName) { public void setRoleName(String roleName) {
this.roleName = roleName; this.roleName = roleName;
} }
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
public Long getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Long updateTime) {
this.updateTime = updateTime;
}
} }
src/main/java/com/example/tdl/mapper/RoleMapper.java
View file @ 924e3f32
...@@ -14,7 +14,7 @@ import java.util.Map; ...@@ -14,7 +14,7 @@ import java.util.Map;
public interface RoleMapper { public interface RoleMapper {
List<RoleNameVo> getRoleNameByCompanyName(String companyName); List<RoleNameVo> getRoleNameByCompanyName(String companyName);
Integer getByRoleName(@Param("roleName") String roleName,@Param("companyNo") String companyNo); Integer getByRoleName(@Param("roleName") String roleName,@Param("companyName") String companyName);
List<ResultRoleVo> getAll(String companyNo); List<ResultRoleVo> getAll(String companyNo);
......
src/main/java/com/example/tdl/service/RoleService.java
View file @ 924e3f32
...@@ -20,8 +20,8 @@ public class RoleService { ...@@ -20,8 +20,8 @@ public class RoleService {
return roleMapper.getRoleNameByCompanyName(companyName); return roleMapper.getRoleNameByCompanyName(companyName);
} }
public Integer getByRoleName(String roleName,String companyNo){ public Integer getByRoleName(String roleName,String companyName){
return roleMapper.getByRoleName(roleName,companyNo); return roleMapper.getByRoleName(roleName,companyName);
} }
public List<ResultRoleVo> getAll(String companyNo){ public List<ResultRoleVo> getAll(String companyNo){
......
src/main/java/com/example/tdl/util/DataUtil.java
View file @ 924e3f32
...@@ -28,7 +28,7 @@ public class DataUtil { ...@@ -28,7 +28,7 @@ public class DataUtil {
private static CommFeedback fb = new CommFeedback(); private static CommFeedback fb = new CommFeedback();
public static String getData(String transportationNo, HttpServletRequest request,I18nController i18n,String companyNo,CircuitService circuitService,TDLLogService tdlLogService,InfluxDBTemplate influxDBTemplate,String database,String field){ public static String getData(String transportationNo, HttpServletRequest request,I18nController i18n,String companyNo,CircuitService circuitService,TDLLogService tdlLogService,InfluxDBTemplate influxDBTemplate,String database,String field,String event ){
Long t1 = System.currentTimeMillis(); Long t1 = System.currentTimeMillis();
logger.info(t1+"---------t1"); logger.info(t1+"---------t1");
ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo); ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo);
...@@ -72,9 +72,9 @@ public class DataUtil { ...@@ -72,9 +72,9 @@ public class DataUtil {
List<HistoryData> historyData = new ArrayList<>(); List<HistoryData> historyData = new ArrayList<>();
String sqls = ""; String sqls = "";
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sqls = "SELECT count("+field+") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l; sqls = "SELECT count("+field+") FROM \"tdl_policy\".\"" + device + "\" WHERE \"event\" = '"+event+"' and \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l;
} else { } else {
sqls = "SELECT count("+field+") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + System.currentTimeMillis() * 1000000l; sqls = "SELECT count("+field+") FROM \"tdl_policy\".\"" + device + "\" WHERE \"event\" = '"+event+"' and \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + System.currentTimeMillis() * 1000000l;
} }
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database)); QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
Integer count; Integer count;
...@@ -90,9 +90,9 @@ public class DataUtil { ...@@ -90,9 +90,9 @@ public class DataUtil {
if (count > 500) { if (count > 500) {
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sql = getSQL( gatewayVo.getgSN(),field, device, devList.get(i), startTime, resultCircuitVo.getEndTime() * 1000000l); sql = getSQL( gatewayVo.getgSN(),field, device, devList.get(i), event,startTime, resultCircuitVo.getEndTime() * 1000000l);
} else { } else {
sql = getSQL(gatewayVo.getgSN(), field, device, devList.get(i), startTime, t1 * 1000000l); sql = getSQL(gatewayVo.getgSN(), field, device, devList.get(i),event, startTime, t1 * 1000000l);
} }
QueryResult queryResult = influxDBTemplate.query(new Query(sql, database,false)); QueryResult queryResult = influxDBTemplate.query(new Query(sql, database,false));
if (queryResult.getResults() != null) { if (queryResult.getResults() != null) {
...@@ -119,19 +119,19 @@ public class DataUtil { ...@@ -119,19 +119,19 @@ public class DataUtil {
return gson.toJson(historyDataVoList); return gson.toJson(historyDataVoList);
} }
public static String getSQL(String SN,String field, String device, String tdl, Long startTime, Long endTime) { public static String getSQL(String SN,String field, String device, String tdl,String event, Long startTime, Long endTime) {
String sql = ""; String sql = "";
long times = (endTime - startTime) / 500; long times = (endTime - startTime) / 500;
for (int i = 0; i < 500; i++) { for (int i = 0; i < 500; i++) {
Long maxTime = startTime + times; Long maxTime = startTime + times;
sql = sql + "Select " + field + " From \"tdl_policy\".\"" + device + "\" where " + sql = sql + "Select " + field + " From \"tdl_policy\".\"" + device + "\" where " +
" \"SN\" = '"+SN+"' " + " \"event\" = '"+event+"' " +
" AND \"tdl\"='" + tdl + "' " + " AND \"tdl\"='" + tdl + "' " +
"and time >= "+startTime +" and time <= " + maxTime + " order by time limit 1;"; "and time >= "+startTime +" and time <= " + maxTime + " order by time limit 1;";
startTime = maxTime; startTime = maxTime;
} }
sql = sql + "Select " + field + " From \"tdl_policy\".\"" + device + "\" where " + sql = sql + "Select " + field + " From \"tdl_policy\".\"" + device + "\" where " +
" \"SN\" = '"+SN+"' " + " \"event\" = '"+event+"' " +
" AND \"tdl\"='" + tdl + "' " + " AND \"tdl\"='" + tdl + "' " +
"and time >= "+startTime+" and time <= " + endTime + " order by time desc limit 1;"; "and time >= "+startTime+" and time <= " + endTime + " order by time desc limit 1;";
return sql; return sql;
......
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ 924e3f32
...@@ -370,13 +370,13 @@ public class AlarmLogController { ...@@ -370,13 +370,13 @@ public class AlarmLogController {
//经纬度数据 //经纬度数据
public CircuitAlarmDataVo parseLocation(QueryResult queryResult,Long time){ public CircuitAlarmDataVo parseLocation(QueryResult queryResult,Long time){
String t1 =""; String t1 ="";
if(queryResult.getResults().get(0) == null){ if(queryResult.getResults().get(0)==null || queryResult.getResults().get(0) .getSeries() == null){
t1 = "0"; t1 = "0";
}else { }else {
t1 = queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0) == null ? "" : queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString(); t1 = queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0) == null ? "" : queryResult.getResults().get(0).getSeries().get(0).getValues().get(0).get(0).toString();
} }
String t2=""; String t2="";
if(queryResult.getResults().get(1) == null){ if(queryResult.getResults().get(1) == null ||queryResult.getResults().get(1).getSeries()== null){
t2="0"; t2="0";
}else{ }else{
t2 = queryResult.getResults().get(1).getSeries().get(0).getValues().get(0).get(0) == null ? "" : queryResult.getResults().get(1).getSeries().get(0).getValues().get(0).get(0).toString(); t2 = queryResult.getResults().get(1).getSeries().get(0).getValues().get(0).get(0) == null ? "" : queryResult.getResults().get(1).getSeries().get(0).getValues().get(0).get(0).toString();
...@@ -398,7 +398,6 @@ public class AlarmLogController { ...@@ -398,7 +398,6 @@ public class AlarmLogController {
e.printStackTrace(); e.printStackTrace();
logger.info(e.toString()); logger.info(e.toString());
} }
return circuitAlarmDataVo; return circuitAlarmDataVo;
} }
......
src/main/java/com/example/tdl/web/CompanyController.java
View file @ 924e3f32
...@@ -126,11 +126,11 @@ public class CompanyController { ...@@ -126,11 +126,11 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"manager")); fb.setMessage(i18n.getMessage(request,"manager"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){ // if (!addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTel")); // fb.setMessage(i18n.getMessage(request,"wrongTel"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
if (StringUtils.isEmpty(addCompanyVo.getRoleName())){ if (StringUtils.isEmpty(addCompanyVo.getRoleName())){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"roleName")); fb.setMessage(i18n.getMessage(request,"roleName"));
...@@ -181,6 +181,7 @@ public class CompanyController { ...@@ -181,6 +181,7 @@ public class CompanyController {
return gson.toJson(fb); return gson.toJson(fb);
} }
//修改公司信息 //修改公司信息
@ApiOperation(value = "修改公司信息",notes = "修改公司信息，需要传的值：" + @ApiOperation(value = "修改公司信息",notes = "修改公司信息，需要传的值：" +
" companyNo:需要修改的公司编号，" + " companyNo:需要修改的公司编号，" +
...@@ -232,11 +233,11 @@ public class CompanyController { ...@@ -232,11 +233,11 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"tel")); fb.setMessage(i18n.getMessage(request,"tel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if( !updateCompanyVo.getTel().matches("^1[34578]\\d{9}$")){ // if( !updateCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTel")); // fb.setMessage(i18n.getMessage(request,"wrongTel"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
if (StringUtils.isEmpty(updateCompanyVo.getManager())){ if (StringUtils.isEmpty(updateCompanyVo.getManager())){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"manager")); fb.setMessage(i18n.getMessage(request,"manager"));
...@@ -264,6 +265,7 @@ public class CompanyController { ...@@ -264,6 +265,7 @@ public class CompanyController {
return gson.toJson(fb); return gson.toJson(fb);
} }
//删除公司 //删除公司
@ApiOperation(value = "删除公司",notes = "删除公司,传值说明：companyName:公司编号") @ApiOperation(value = "删除公司",notes = "删除公司,传值说明：companyName:公司编号")
@ApiImplicitParams({ @ApiImplicitParams({
......
src/main/java/com/example/tdl/web/DataController.java
View file @ 924e3f32
...@@ -112,10 +112,10 @@ public class DataController { ...@@ -112,10 +112,10 @@ public class DataController {
return gson.toJson(locationDataVoList); return gson.toJson(locationDataVoList);
} }
Long startTime = resultCircuitVo.getStartTime() * 1000000l; Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// if(resultCircuitVo.getEndTime() !=null && infoRedisService.hasHashKey("TransportConfig",searchLocationVo.getTransportationNo())){ if(resultCircuitVo.getEndTime() !=null && infoRedisService.hasHashKey("TransportConfig",searchLocationVo.getTransportationNo())){
// Object ret = infoRedisService.getHash("TransportConfig",searchLocationVo.getTransportationNo()); Object ret = infoRedisService.getHash("TransportConfig",searchLocationVo.getTransportationNo());
// return ret; return ret;
// } }
//获取gateway的信息 //获取gateway的信息
TDLLogVo tdlLogVo = tdlLogService.getByTransportationNo(searchLocationVo.getTransportationNo()); TDLLogVo tdlLogVo = tdlLogService.getByTransportationNo(searchLocationVo.getTransportationNo());
if (tdlLogVo == null) { if (tdlLogVo == null) {
...@@ -126,17 +126,15 @@ public class DataController { ...@@ -126,17 +126,15 @@ public class DataController {
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
Long time = resultCircuitVo.getEndTime() * 1000000l; Long time = resultCircuitVo.getEndTime() * 1000000l;
if ("baidu".equals(searchLocationVo.getType())) { if ("baidu".equals(searchLocationVo.getType())) {
sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + " and time<= " + time + " ORDER BY time "; sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time ";
} else { } else {
sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + " and time<= " + time + " ORDER BY time "; sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " and time<= " + time + " ORDER BY time ";
} }
} else { } else {
if ("baidu".equals(searchLocationVo.getType())) { if ("baidu".equals(searchLocationVo.getType())) {
sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + " ORDER BY time "; sql = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
} else { } else {
sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + " ORDER BY time "; sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\"where \"data_type\" = 'location' and time >= " + startTime + " ORDER BY time ";
} }
} }
//获取tdl信息 //获取tdl信息
...@@ -150,11 +148,10 @@ public class DataController { ...@@ -150,11 +148,10 @@ public class DataController {
String sql2 = ""; String sql2 = "";
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
Long time = resultCircuitVo.getEndTime() * 1000000l; Long time = resultCircuitVo.getEndTime() * 1000000l;
sql2 = "SELECT \"a0\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + " and time<=" + time + " ORDER BY time"; sql2 = "SELECT \"a0\" FROM \"tdl_policy\".\"" + device + "\"where \"event\" = 'Shock event' and time >= " + startTime + " and time<=" + time + " ORDER BY time";
} else { } else {
sql2 = "SELECT \"a0\" FROM \"tdl_policy\".\"" + device + "\"where time >= " + startTime + " ORDER BY time"; sql2 = "SELECT \"a0\" FROM \"tdl_policy\".\"" + device + "\"where \"event\" = 'Shock event' and time >= " + startTime + " ORDER BY time";
} }
QueryResult queryResult2 = influxDBTemplate.query(new Query(sql2, database)); QueryResult queryResult2 = influxDBTemplate.query(new Query(sql2, database));
List<String> timeList = new ArrayList<>(); List<String> timeList = new ArrayList<>();
if (queryResult2.getResults().get(0).getSeries() != null) { if (queryResult2.getResults().get(0).getSeries() != null) {
...@@ -167,9 +164,9 @@ public class DataController { ...@@ -167,9 +164,9 @@ public class DataController {
for (String time : timeList) { for (String time : timeList) {
Long t = Long.valueOf(time) * 1000000l; Long t = Long.valueOf(time) * 1000000l;
if ("baidu".equals(searchLocationVo.getType())) { if ("baidu".equals(searchLocationVo.getType())) {
sql3 = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\" where time >= " + startTime + " and time<=" + t + " ORDER BY time desc limit 1;" + sql3; sql3 = "SELECT \"bdlng\",\"bdlat\" FROM \"tdl_policy\".\"" + device + "\" where \"data_type\" = 'location' and time >= " + startTime + " and time<=" + t + " ORDER BY time desc limit 1;" + sql3;
} else { } else {
sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\" where time >= " + startTime + " and time<=" + t + " ORDER BY time desc limit 1;" + sql3; sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\"" + device + "\" where \"data_type\" = 'location' and time >= " + startTime + " and time<=" + t + " ORDER BY time desc limit 1;" + sql3;
} }
} }
QueryResult queryResult3 = influxDBTemplate.query(new Query(sql3, database)); QueryResult queryResult3 = influxDBTemplate.query(new Query(sql3, database));
...@@ -194,137 +191,137 @@ public class DataController { ...@@ -194,137 +191,137 @@ public class DataController {
} }
return gson.toJson(locationDataVoList); return gson.toJson(locationDataVoList);
} else { } else {
// //如果是已经完结保存到redis中 //如果是已经完结保存到redis中
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// Map<Object, Object> map = new HashMap<>(); Map<Object, Object> map = new HashMap<>();
// map.put(searchLocationVo.getTransportationNo(), locationDataVos.toString()); map.put(searchLocationVo.getTransportationNo(), locationDataVos.toString());
// infoRedisService.setHash("TransportConfig", map,System.currentTimeMillis()); infoRedisService.setHash("TransportConfig", map,System.currentTimeMillis());
// } }
return gson.toJson(locationDataVos); return gson.toJson(locationDataVos);
} }
} }
//获取历史数据 //获取历史数据
@ApiOperation(value = "获取历史数据", notes = "获取历史数据:") // @ApiOperation(value = "获取历史数据", notes = "获取历史数据:")
@PostMapping("/getHistoryData") // @PostMapping("/getHistoryData")
@ApiImplicitParams({ // @ApiImplicitParams({
@ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"), // @ApiImplicitParam(paramType = "header", name = "Account_token", value = "token", required = true, dataType = "String"),
@ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = false, dataType = "String"), // @ApiImplicitParam(paramType = "header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
}) // })
public Object getHistoryData(@RequestBody String transportationNo, HttpServletRequest request) { // public Object getHistoryData(@RequestBody String transportationNo, HttpServletRequest request) {
String token = request.getHeader("Account_token"); // String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" + token); // String datum = tokenRedisService.get("TOKEN_" + token);
UserRedisVo user = gson.fromJson(datum, UserRedisVo.class); // UserRedisVo user = gson.fromJson(datum, UserRedisVo.class);
String port = request.getHeader("AccountLanguage"); // String port = request.getHeader("AccountLanguage");
JSONObject jsonObject = JSON.parseObject(transportationNo); // JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); // transportationNo = jsonObject.getString("transportationNo");
List<DataVo> dataVoList = new ArrayList<>(); // List<DataVo> dataVoList = new ArrayList<>();
if (StringUtils.isEmpty(transportationNo)) { // if (StringUtils.isEmpty(transportationNo)) {
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "transportationNo")); // fb.setMessage(i18n.getMessage(request, "transportationNo"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, user.getCompanyNo()); // ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, user.getCompanyNo());
if (resultCircuitVo == null) { // if (resultCircuitVo == null) {
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "noCircuit")); // fb.setMessage(i18n.getMessage(request, "noCircuit"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) { // if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "notStarted")); // fb.setMessage(i18n.getMessage(request, "notStarted"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
Long startTime = resultCircuitVo.getStartTime() * 1000000l; // Long startTime = resultCircuitVo.getStartTime() * 1000000l;
TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo); // TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo);
if (gatewayVo == null) { // if (gatewayVo == null) {
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "noCircuit")); // fb.setMessage(i18n.getMessage(request, "noCircuit"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN(); // String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
//获取tdl信息 // //获取tdl信息
List<String> devList = tdlLogService.getTdlSN(transportationNo); // List<String> devList = tdlLogService.getTdlSN(transportationNo);
if (devList.size() == 0) { // if (devList.size() == 0) {
fb.setCode(0); // fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "noCircuit")); // fb.setMessage(i18n.getMessage(request, "noCircuit"));
return gson.toJson(fb); // return gson.toJson(fb);
} // }
Map<String, String> map = new HashMap<>(); // Map<String, String> map = new HashMap<>();
map.put("\"T\"", "temp"); // map.put("\"T\"", "temp");
map.put("\"h\"", "humidity"); // map.put("\"h\"", "humidity");
map.put("\"p\"", "pressure"); // map.put("\"p\"", "pressure");
map.put("\"a0\"", "shockEnergy"); // map.put("\"a0\"", "shockEnergy");
map.put("\"a1\"", "shock"); // map.put("\"a1\"", "shock");
map.put("\"ta\"", "tilt"); // map.put("\"ta\"", "tilt");
for (int j = 0; j < list.size(); j++) { // for (int j = 0; j < list.size(); j++) {
DataVo dataVo = new DataVo(); // DataVo dataVo = new DataVo();
dataVo.setDescription(map.get(list.get(j))); // dataVo.setDescription(map.get(list.get(j)));
List<HistoryDataVo> historyDataVoList = new ArrayList<>(); // List<HistoryDataVo> historyDataVoList = new ArrayList<>();
for (int i = 0; i < devList.size(); i++) { // for (int i = 0; i < devList.size(); i++) {
HistoryDataVo historyDataVo = new HistoryDataVo(); // HistoryDataVo historyDataVo = new HistoryDataVo();
String TDLSN = devList.get(i).replace("TDL-", "").trim(); // String TDLSN = devList.get(i).replace("TDL-", "").trim();
historyDataVo.setTDLSN(TDLSN); // historyDataVo.setTDLSN(TDLSN);
ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN); // ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
if (list.get(j).equals("\"T\"")) { // if (list.get(j).equals("\"T\"")) {
//根据tdl货物报警信息 // //根据tdl货物报警信息
historyDataVo.setMax(resultAlarmVo.getTemMax().toString()); // historyDataVo.setMax(resultAlarmVo.getTemMax().toString());
historyDataVo.setMin(resultAlarmVo.getTemMin().toString()); // historyDataVo.setMin(resultAlarmVo.getTemMin().toString());
} else if (list.get(j).equals("\"h\"")) { // } else if (list.get(j).equals("\"h\"")) {
historyDataVo.setMax(resultAlarmVo.getHumidityMax().toString()); // historyDataVo.setMax(resultAlarmVo.getHumidityMax().toString());
historyDataVo.setMin(resultAlarmVo.getHumidityMin().toString()); // historyDataVo.setMin(resultAlarmVo.getHumidityMin().toString());
} // }
List<HistoryData> historyData = new ArrayList<>(); // List<HistoryData> historyData = new ArrayList<>();
String sqls = ""; // String sqls = "";
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { // if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sqls = "SELECT count(" + list.get(j) + ") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l; // sqls = "SELECT count(" + list.get(j) + ") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + resultCircuitVo.getEndTime() * 1000000l;
} else { // } else {
sqls = "SELECT count(" + list.get(j) + ") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + System.currentTimeMillis() * 1000000l; // sqls = "SELECT count(" + list.get(j) + ") FROM \"tdl_policy\".\"" + device + "\" WHERE \"tdl\"='" + devList.get(i) + "' and time>=" + startTime + " and time <=" + System.currentTimeMillis() * 1000000l;
} // }
QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database)); // QueryResult queryResults = influxDBTemplate.query(new Query(sqls, database));
Integer count; // Integer count;
if (queryResults.getResults().get(0).getSeries() != null) { // if (queryResults.getResults().get(0).getSeries() != null) {
count = Double.valueOf(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()).intValue(); // count = Double.valueOf(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()).intValue();
} else { // } else {
historyDataVo.setDataList(historyData); // historyDataVo.setDataList(historyData);
historyDataVoList.add(historyDataVo); // historyDataVoList.add(historyDataVo);
continue; // continue;
} // }
String sql = ""; // String sql = "";
if (count > 500) { // if (count > 500) {
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { // if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, resultCircuitVo.getEndTime() * 1000000l); // sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, resultCircuitVo.getEndTime() * 1000000l);
} else { // } else {
sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, System.currentTimeMillis() * 1000000l); // sql = DataUtil.getSQL(gatewayVo.getgSN(),list.get(j), device, devList.get(i), startTime, System.currentTimeMillis() * 1000000l);
} // }
QueryResult queryResult = influxDBTemplate.query(new Query(sql, database)); // QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
if (queryResult.getResults() != null) { // if (queryResult.getResults() != null) {
historyData =DataUtil.getHistoryDatas(queryResult, list.get(j)); // historyData =DataUtil.getHistoryDatas(queryResult, list.get(j));
} // }
historyDataVo.setDataList(historyData); // historyDataVo.setDataList(historyData);
historyDataVoList.add(historyDataVo); // historyDataVoList.add(historyDataVo);
} else { // } else {
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) { // if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
sql = "SELECT " + list.get(j) + " FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " and time<=" + resultCircuitVo.getEndTime() * 1000000l + " ORDER BY time "; // sql = "SELECT " + list.get(j) + " FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " and time<=" + resultCircuitVo.getEndTime() * 1000000l + " ORDER BY time ";
} else { // } else {
sql = "SELECT " + list.get(j) + " FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " ORDER BY time"; // sql = "SELECT " + list.get(j) + " FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " ORDER BY time";
} // }
QueryResult queryResult = influxDBTemplate.query(new Query(sql, database)); // QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
if (queryResult.getResults().get(0).getSeries() != null) { // if (queryResult.getResults().get(0).getSeries() != null) {
//解析数据 // //解析数据
historyData = DataUtil.getHistoryData(queryResult, list.get(j)); // historyData = DataUtil.getHistoryData(queryResult, list.get(j));
} // }
historyDataVo.setDataList(historyData); // historyDataVo.setDataList(historyData);
historyDataVoList.add(historyDataVo); // historyDataVoList.add(historyDataVo);
} // }
//
} // }
dataVo.setDataList(historyDataVoList); // dataVo.setDataList(historyDataVoList);
dataVoList.add(dataVo); // dataVoList.add(dataVo);
} // }
return gson.toJson(dataVoList); // return gson.toJson(dataVoList);
} // }
@ApiOperation(value = "获取温度数据", notes = "获取温度数据:" + @ApiOperation(value = "获取温度数据", notes = "获取温度数据:" +
...@@ -347,7 +344,7 @@ public class DataController { ...@@ -347,7 +344,7 @@ public class DataController {
} }
JSONObject jsonObject = JSON.parseObject(transportationNo); JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"T\""); return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"T\"","Regular measurement");
} }
...@@ -372,7 +369,7 @@ public class DataController { ...@@ -372,7 +369,7 @@ public class DataController {
} }
JSONObject jsonObject = JSON.parseObject(transportationNo); JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"h\""); return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"h\"","Regular measurement");
} }
...@@ -394,9 +391,10 @@ public class DataController { ...@@ -394,9 +391,10 @@ public class DataController {
} }
JSONObject jsonObject = JSON.parseObject(transportationNo); JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"ta\""); return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"ta\"","Tilt event");
} }
//获取震动能量 //获取震动能量
@ApiOperation(value = "获取震动能量", notes = "获取震动能量") @ApiOperation(value = "获取震动能量", notes = "获取震动能量")
@PostMapping("/getShockEnergy") @PostMapping("/getShockEnergy")
...@@ -414,7 +412,7 @@ public class DataController { ...@@ -414,7 +412,7 @@ public class DataController {
} }
JSONObject jsonObject = JSON.parseObject(transportationNo); JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a0\""); return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a0\"","Shock event");
} }
...@@ -434,7 +432,7 @@ public class DataController { ...@@ -434,7 +432,7 @@ public class DataController {
} }
JSONObject jsonObject = JSON.parseObject(transportationNo); JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a1\""); return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"a1\"","Shock event");
} }
...@@ -454,7 +452,7 @@ public class DataController { ...@@ -454,7 +452,7 @@ public class DataController {
} }
JSONObject jsonObject = JSON.parseObject(transportationNo); JSONObject jsonObject = JSON.parseObject(transportationNo);
transportationNo = jsonObject.getString("transportationNo"); transportationNo = jsonObject.getString("transportationNo");
return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"p\""); return DataUtil.getData(transportationNo,request,i18n,user.getCompanyNo(),circuitService,tdlLogService,influxDBTemplate,database,"\"p\"","Regular measurement");
} }
......
src/main/java/com/example/tdl/web/PicUploadController.java
View file @ 924e3f32
...@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletRequest;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
...@@ -45,6 +46,10 @@ public class PicUploadController { ...@@ -45,6 +46,10 @@ public class PicUploadController {
@Autowired @Autowired
private CompanyService companyService; private CompanyService companyService;
@Autowired
private I18nController i18n;
// 允许上传的格式 // 允许上传的格式
private static final String[] IMAGE_TYPE = new String[]{".jpg",".png" }; private static final String[] IMAGE_TYPE = new String[]{".jpg",".png" };
...@@ -54,15 +59,15 @@ public class PicUploadController { ...@@ -54,15 +59,15 @@ public class PicUploadController {
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"), @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
}) })
@RequestMapping(value = "/upload",method = RequestMethod.POST) @RequestMapping(value = "/upload",method = RequestMethod.POST)
public String upload(MultipartFile multipartFile, @RequestParam(value = "imageType",required = true) String imageType) { public String upload(MultipartFile multipartFile, @RequestParam(value = "imageType",required = true) String imageType, HttpServletRequest request) {
if (multipartFile == null ||multipartFile.isEmpty() || StringUtils.isBlank(multipartFile.getOriginalFilename())) { if (multipartFile == null ||multipartFile.isEmpty() || StringUtils.isBlank(multipartFile.getOriginalFilename())) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("图片不能为空"); fb.setMessage(i18n.getMessage(request,"nonePicture"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (multipartFile.getSize() > 512000) { if (multipartFile.getSize() > 512000) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片大小不能超过500K！"); fb.setMessage(i18n.getMessage(request,"pictureSize"));
return gson.toJson(fb); return gson.toJson(fb);
} }
try { try {
...@@ -70,40 +75,40 @@ public class PicUploadController { ...@@ -70,40 +75,40 @@ public class PicUploadController {
// 仓库 150*120 //货车 90*60 // 仓库 150*120 //货车 90*60
if(sourceImg == null){ if(sourceImg == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片格式不正确"); fb.setMessage(i18n.getMessage(request,"pictureFormat"));
return gson.toJson(fb); return gson.toJson(fb);
}else{ }else{
if("truck".equals(imageType)){ if("truck".equals(imageType)){
if(sourceImg.getWidth()>90){ if(sourceImg.getWidth()>90){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(sourceImg.getHeight()>60){ if(sourceImg.getHeight()>60){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
}else if("warehouse".equals(imageType)){ }else if("warehouse".equals(imageType)){
if(sourceImg.getWidth()>150){ if(sourceImg.getWidth()>150){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(sourceImg.getHeight()>120){ if(sourceImg.getHeight()>120){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
}else if("company".equals(imageType)){ }else if("company".equals(imageType)){
if(sourceImg.getWidth()>24){ if(sourceImg.getWidth()>24){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(sourceImg.getHeight()>24){ if(sourceImg.getHeight()>24){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
} }
...@@ -111,7 +116,7 @@ public class PicUploadController { ...@@ -111,7 +116,7 @@ public class PicUploadController {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片格式不正确"); fb.setMessage(i18n.getMessage(request,"pictureFormat"));
return gson.toJson(fb); return gson.toJson(fb);
} }
// 校验图片格式 // 校验图片格式
...@@ -130,7 +135,7 @@ public class PicUploadController { ...@@ -130,7 +135,7 @@ public class PicUploadController {
LOGGER.info(multipartFile.getOriginalFilename()); LOGGER.info(multipartFile.getOriginalFilename());
String url = AliyunOSSClientUtil.uploadImg2Oss(ossClient, multipartFile,System.currentTimeMillis()+"TM",imageType); String url = AliyunOSSClientUtil.uploadImg2Oss(ossClient, multipartFile,System.currentTimeMillis()+"TM",imageType);
if (url == null) { if (url == null) {
fb.setMessage("上传失败"); fb.setMessage(i18n.getMessage(request,"uploadFailure"));
fb.setCode(0); fb.setCode(0);
} else { } else {
if("user".equals(imageType)){ if("user".equals(imageType)){
...@@ -149,13 +154,13 @@ public class PicUploadController { ...@@ -149,13 +154,13 @@ public class PicUploadController {
} }
} catch (Exception e) { } catch (Exception e) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传失败"); fb.setMessage(i18n.getMessage(request,"uploadFailure"));
e.printStackTrace(); e.printStackTrace();
LOGGER.info(e.toString()); LOGGER.info(e.toString());
} }
} else { } else {
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片格式不正确"); fb.setMessage(i18n.getMessage(request,"pictureFormat"));
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
...@@ -166,15 +171,15 @@ public class PicUploadController { ...@@ -166,15 +171,15 @@ public class PicUploadController {
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"), @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
}) })
@RequestMapping(value = "/updateImg",method = RequestMethod.POST) @RequestMapping(value = "/updateImg",method = RequestMethod.POST)
public String updateImg(MultipartFile multipartFile, @RequestParam(value = "imageType",required = true) String imageType,@RequestParam(value = "number",required = true) String number){ public String updateImg(MultipartFile multipartFile, @RequestParam(value = "imageType",required = true) String imageType,@RequestParam(value = "number",required = true) String number,HttpServletRequest request){
if (multipartFile.isEmpty() || StringUtils.isBlank(multipartFile.getOriginalFilename())) { if (multipartFile.isEmpty() || StringUtils.isBlank(multipartFile.getOriginalFilename())) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("图片不能为空"); fb.setMessage(i18n.getMessage(request,"nonePicture"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (multipartFile.getSize() > 512000) { if (multipartFile.getSize() > 512000) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片大小不能超过500K！"); fb.setMessage(i18n.getMessage(request,"pictureSize"));
return gson.toJson(fb); return gson.toJson(fb);
} }
try { try {
...@@ -182,47 +187,47 @@ public class PicUploadController { ...@@ -182,47 +187,47 @@ public class PicUploadController {
// 仓库 150*120 //货车 90*60 // 仓库 150*120 //货车 90*60
if(sourceImg == null){ if(sourceImg == null){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片格式不正确"); fb.setMessage(i18n.getMessage(request,"pictureFormat"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if("truck".equals(imageType)){ if("truck".equals(imageType)){
if(sourceImg.getWidth()>90){ if(sourceImg.getWidth()>90){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(sourceImg.getHeight()>60){ if(sourceImg.getHeight()>60){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
}else if("warehouse".equals(imageType)){ }else if("warehouse".equals(imageType)){
if(sourceImg.getWidth()>150){ if(sourceImg.getWidth()>150){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(sourceImg.getHeight()>120){ if(sourceImg.getHeight()>120){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
}else if("company".equals(imageType)){ }else if("company".equals(imageType)){
if(sourceImg.getWidth()>24){ if(sourceImg.getWidth()>24){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if(sourceImg.getHeight()>24){ if(sourceImg.getHeight()>24){
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片尺寸不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
return gson.toJson(fb); return gson.toJson(fb);
} }
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
fb.setCode(0); fb.setCode(0);
fb.setMessage("上传图片格式不正确"); fb.setMessage(i18n.getMessage(request,"pictureDimension"));
} }
boolean isLegal = false; boolean isLegal = false;
// 判断文件后缀名是否符合 // 判断文件后缀名是否符合
...@@ -238,7 +243,7 @@ public class PicUploadController { ...@@ -238,7 +243,7 @@ public class PicUploadController {
LOGGER.info(multipartFile.getOriginalFilename()); LOGGER.info(multipartFile.getOriginalFilename());
String url = AliyunOSSClientUtil.uploadImg2Oss(ossClient, multipartFile,number,imageType); String url = AliyunOSSClientUtil.uploadImg2Oss(ossClient, multipartFile,number,imageType);
if (url == null) { if (url == null) {
fb.setMessage("图片上传失败"); fb.setMessage(i18n.getMessage(request,"uploadFailure"));
fb.setCode(0); fb.setCode(0);
} else { } else {
fb.setCode(1); fb.setCode(1);
...@@ -263,18 +268,18 @@ public class PicUploadController { ...@@ -263,18 +268,18 @@ public class PicUploadController {
fb.setMessage(img); fb.setMessage(img);
}else{ }else{
fb.setCode(0); fb.setCode(0);
fb.setMessage("修改图片失败"); fb.setMessage(i18n.getMessage(request,"uploadFailure"));
} }
} }
} catch (Exception e) { } catch (Exception e) {
fb.setCode(0); fb.setCode(0);
fb.setMessage("图片修改失败"); fb.setMessage(i18n.getMessage(request,"pictureFormat"));
e.printStackTrace(); e.printStackTrace();
LOGGER.info(e.toString()); LOGGER.info(e.toString());
} }
} else { } else {
fb.setCode(0); fb.setCode(0);
fb.setMessage("图片格式不正确"); fb.setMessage(i18n.getMessage(request,"pictureFormat"));
} }
return gson.toJson(fb); return gson.toJson(fb);
} }
......
src/main/java/com/example/tdl/web/UserController.java
View file @ 924e3f32
...@@ -300,7 +300,7 @@ public class UserController { ...@@ -300,7 +300,7 @@ public class UserController {
fb.setMessage(i18n.getMessage(request,"roleName")); fb.setMessage(i18n.getMessage(request,"roleName"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (roleService.getByRoleName(userVo.getRoleName(),userInfo.getCompanyNo())==0){ if (roleService.getByRoleName(userVo.getRoleName(),userInfo.getCompanyName())==0){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"existRoleName")); fb.setMessage(i18n.getMessage(request,"existRoleName"));
return gson.toJson(fb); return gson.toJson(fb);
......
src/main/java/com/example/tdl/web/WarehouseController.java
View file @ 924e3f32
...@@ -512,8 +512,9 @@ public class WarehouseController { ...@@ -512,8 +512,9 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"property")); fb.setMessage(i18n.getMessage(request,"property"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!"供应中心".equals(addWarehouseVo.getProperty())&&!"冷藏库".equals(addWarehouseVo.getProperty())&& if (!i18n.getMessage(request,"warehouseProperty1").equals(addWarehouseVo.getProperty())
!"中心库".equals(addWarehouseVo.getProperty())){ &&!i18n.getMessage(request,"warehouseProperty2").equals(addWarehouseVo.getProperty())
&& !i18n.getMessage(request,"warehouseProperty3").equals(addWarehouseVo.getProperty())){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongProperty")); fb.setMessage(i18n.getMessage(request,"wrongProperty"));
return gson.toJson(fb); return gson.toJson(fb);
...@@ -523,7 +524,8 @@ public class WarehouseController { ...@@ -523,7 +524,8 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"warehouseType")); fb.setMessage(i18n.getMessage(request,"warehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!addWarehouseVo.getType().equals("平面仓")&&!addWarehouseVo.getType().equals("立体仓")){ if (!addWarehouseVo.getType().equals(i18n.getMessage(request,"warehouseType1"))
&&!addWarehouseVo.getType().equals(i18n.getMessage(request,"warehouseType2"))){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongWarehouseType")); fb.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
...@@ -533,8 +535,10 @@ public class WarehouseController { ...@@ -533,8 +535,10 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"hardwareLevel")); fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!addWarehouseVo.getHardwareLevel().equals("优")&&!addWarehouseVo.getHardwareLevel().equals("良")&& if (!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1"))
!addWarehouseVo.getHardwareLevel().equals("中")&&!addWarehouseVo.getHardwareLevel().equals("差")){ &&!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel2"))
&& !addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel3"))
&&!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel4"))){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel")); fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
...@@ -700,8 +704,10 @@ public class WarehouseController { ...@@ -700,8 +704,10 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"property")); fb.setMessage(i18n.getMessage(request,"property"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!updateWarehouseVo.getProperty().equals("供应中心")&&!updateWarehouseVo.getProperty().equals("冷藏库")&&
!updateWarehouseVo.getProperty().equals("中心库")){ if (!updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty1"))
&&!updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty2"))
&& !updateWarehouseVo.getProperty().equals(i18n.getMessage(request,"warehouseProperty3"))){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongProperty")); fb.setMessage(i18n.getMessage(request,"wrongProperty"));
return gson.toJson(fb); return gson.toJson(fb);
...@@ -711,7 +717,8 @@ public class WarehouseController { ...@@ -711,7 +717,8 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"warehouseType")); fb.setMessage(i18n.getMessage(request,"warehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!"平面仓".equals(updateWarehouseVo.getType())&&!"立体仓".equals(updateWarehouseVo.getType())){ if (!i18n.getMessage(request,"warehouseType1").equals(updateWarehouseVo.getType())
&&!i18n.getMessage(request,"warehouseType2").equals(updateWarehouseVo.getType())){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongWarehouseType")); fb.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb); return gson.toJson(fb);
...@@ -721,8 +728,10 @@ public class WarehouseController { ...@@ -721,8 +728,10 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"hardwareLevel")); fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
} }
if (!updateWarehouseVo.getHardwareLevel().equals("优")&&!updateWarehouseVo.getHardwareLevel().equals("良")&& if (!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1"))
!updateWarehouseVo.getHardwareLevel().equals("中")&&!updateWarehouseVo.getHardwareLevel().equals("差")){ &&!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel2"))
&& !updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel3"))
&&!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel4"))){
fb.setCode(0); fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel")); fb.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb); return gson.toJson(fb);
...@@ -1011,7 +1020,6 @@ public class WarehouseController { ...@@ -1011,7 +1020,6 @@ public class WarehouseController {
}else { }else {
warehouseGatewayDateVo.setBattery("NA"); warehouseGatewayDateVo.setBattery("NA");
} }
Object data = infoRedisService.getHash("DeviceOnline", device ); Object data = infoRedisService.getHash("DeviceOnline", device );
if(data !=null){ if(data !=null){
OnlineVo onlineVo = gson.fromJson(data.toString(),OnlineVo.class); OnlineVo onlineVo = gson.fromJson(data.toString(),OnlineVo.class);
...@@ -1023,7 +1031,6 @@ public class WarehouseController { ...@@ -1023,7 +1031,6 @@ public class WarehouseController {
}else{ }else{
warehouseGatewayDateVo.setState(6); warehouseGatewayDateVo.setState(6);
} }
List<String> tdls=tdlDeviceService.getByGatewaySN(gatewayOnLineVos.get(a).getgSN(),gatewayOnLineVos.get(a).getType()); List<String> tdls=tdlDeviceService.getByGatewaySN(gatewayOnLineVos.get(a).getgSN(),gatewayOnLineVos.get(a).getType());
List<WarehouseDataVo> warehouseDataVos=new ArrayList<>(); List<WarehouseDataVo> warehouseDataVos=new ArrayList<>();
......
src/main/resources/application-docker.properties
View file @ 924e3f32
...@@ -12,7 +12,6 @@ server.port=8092 ...@@ -12,7 +12,6 @@ server.port=8092
spring.influxdb.url=http://housetest-influxdb:8086 spring.influxdb.url=http://housetest-influxdb:8086
#spring.datasource.url=jdbc:mysql://witcloud-mysql:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false #spring.datasource.url=jdbc:mysql://witcloud-mysql:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=37774020 #spring.datasource.password=37774020
......
src/main/resources/application.properties
View file @ 924e3f32
...@@ -52,7 +52,7 @@ tdl.mqtt.clientcrt = witcd.crt ...@@ -52,7 +52,7 @@ tdl.mqtt.clientcrt = witcd.crt
# InfluxDB # InfluxDB
spring.influxdb.username=admin spring.influxdb.username=admin
spring.influxdb.password=37774020 spring.influxdb.password=37774020
spring.influxdb.url=http://192.168.1.16:8086 spring.influxdb.url=http://47.97.184.225:8086
spring.influxdb.database=original spring.influxdb.database=original
spring.influxdb.retentionPolicy = tdl_policy spring.influxdb.retentionPolicy = tdl_policy
spring.influxdb.connent-timeout=10 spring.influxdb.connent-timeout=10
......
src/main/resources/i18n/messages_en.properties
View file @ 924e3f32
...@@ -248,3 +248,17 @@ adminInoperable=You can't operate the administrator account ...@@ -248,3 +248,17 @@ adminInoperable=You can't operate the administrator account
downloadStartTime=Query start time must not be null downloadStartTime=Query start time must not be null
downloadEndTime=Query end time must not be null downloadEndTime=Query end time must not be null
TDL=Sensor's serial number must not be null TDL=Sensor's serial number must not be null
nonePicture=Image cannot be empty
pictureSize=Upload image size can't exceed 500K!
pictureFormat=Upload image format is incorrect
pictureDimension=Upload image size is incorrect
uploadFailure=Image upload failed
warehouseProperty1=Supply Center
warehouseProperty2=Walk-in cooler
warehouseProperty3=Central Warehouse
warehouseType1=Flat Warehouse
warehouseType2=Multi-layered Warehouse
warehouseHardwareLevel1=Excelent
warehouseHardwareLevel2=Good
warehouseHardwareLevel3=Fair
warehouseHardwareLevel4=Poor
\ No newline at end of file
src/main/resources/i18n/messages_zh_CN.properties
View file @ 924e3f32
...@@ -260,7 +260,27 @@ downloadStartTime=\u67E5\u8BE2\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A ...@@ -260,7 +260,27 @@ downloadStartTime=\u67E5\u8BE2\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
#\u4F20\u611F\u5668 #\u4F20\u611F\u5668
TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A TDL =\u4F20\u611F\u5668\u7F16\u53F7\u4E0D\u80FD\u4E3A\u7A7A
#\u56FE\u7247
nonePicture= \u56FE\u7247\u4E0D\u80FD\u4E3A\u7A7A
pictureSize = \u4E0A\u4F20\u56FE\u7247\u5927\u5C0F\u4E0D\u80FD\u8D85\u8FC7500K\uFF01
pictureFormat = \u4E0A\u4F20\u56FE\u7247\u683C\u5F0F\u4E0D\u6B63\u786E
pictureDimension = \u4E0A\u4F20\u56FE\u7247\u5C3A\u5BF8\u4E0D\u6B63\u786E
uploadFailure = \u4E0A\u4F20\u5931\u8D25
#\u89D2\u8272\u540D\u79F0
systemManage=\u7CFB\u7EDF\u7BA1\u7406\u5458 systemManage=\u7CFB\u7EDF\u7BA1\u7406\u5458
superManage=\u8D85\u7EA7\u7BA1\u7406\u5458 superManage=\u8D85\u7EA7\u7BA1\u7406\u5458
warehouse=\u4ED3\u5E93\u7BA1\u7406\u5458 warehouse=\u4ED3\u5E93\u7BA1\u7406\u5458
transportManage=\u8FD0\u8F93\u7BA1\u7406\u5458 transportManage=\u8FD0\u8F93\u7BA1\u7406\u5458
#\u4ED3\u5E93\u5C5E\u6027
warehouseProperty1 = \u4F9B\u5E94\u4E2D\u5FC3
warehouseProperty2 = \u51B7\u85CF\u5E93
warehouseProperty3 =\u4E2D\u5FC3\u5E93
#\u4ED3\u5E93\u7C7B\u578B
warehouseType1 = \u5E73\u9762\u4ED3
warehouseType2 = \u7ACB\u4F53\u4ED3
#\u786C\u4EF6\u7B49\u7EA7
warehouseHardwareLevel1 = \u4F18
warehouseHardwareLevel2 = \u826F
warehouseHardwareLevel3 =\u4E2D
warehouseHardwareLevel4 = \u5DEE
src/main/resources/mapper/RoleMapper.xml
View file @ 924e3f32
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<select id="getByRoleName" resultType="java.lang.Integer" parameterType="String"> <select id="getByRoleName" resultType="java.lang.Integer" parameterType="String">
SELECT COUNT(*) from role r INNER JOIN company c ON r.company_id=c.id SELECT COUNT(*) from role r INNER JOIN company c ON r.company_id=c.id
WHERE companyNo=#{companyNo,jdbcType=VARCHAR} WHERE companyName=#{companyName,jdbcType=VARCHAR}
AND roleName=#{roleName,jdbcType=VARCHAR} AND roleName=#{roleName,jdbcType=VARCHAR}
</select> </select>
......
src/main/resources/mapper/UserMapper.xml
View file @ 924e3f32
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR} AND state=1)), SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR} AND state=1)),
#{createTime,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR},
#{updateTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
(SELECT id from company WHERE companyNo=#{companyNo,jdbcType=VARCHAR}), (SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR}),
1 1
) )
</insert> </insert>
......
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