Skip to content

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

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

parent cae3e7c3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 290 additions and 243 deletions
build.gradle
View file @ 924e3f32
......@@ -49,6 +49,7 @@ dependencies {
compile ('com.github.miwurster:spring-data-influxdb:1.6')
compile('com.aliyun.oss:aliyun-sdk-oss:2.5.0')
compile('org.apache.poi:poi:3.9')
compile files('libs/javacsv-2.0.jar')
compile('org.springframework.boot:spring-boot-starter-mail')
}
jar {
......
src/main/java/com/example/tdl/config/MyWebMvcConfigurer.java
View file @ 924e3f32
......@@ -24,12 +24,14 @@ public class MyWebMvcConfigurer extends WebMvcConfigurerAdapter {
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(loginInterceptor())
.excludePathPatterns("/alarmLog/addAlarmLog")
.excludePathPatterns("/login/**");
.excludePathPatterns("/login/**")
.excludePathPatterns("/getData");
registry.addInterceptor(permissionInterceptor())
.excludePathPatterns("/login/**")
.excludePathPatterns("/alarmLog/addAlarmLog")
.excludePathPatterns("/side/**")
.excludePathPatterns("/test");
.excludePathPatterns("/test")
.excludePathPatterns("/getData");
super.addInterceptors(registry);
}
......
src/main/java/com/example/tdl/domain/vo/AddUserVo.java
View file @ 924e3f32
......@@ -21,14 +21,6 @@ public class AddUserVo {
private Long updateTime;
public String getCompanyName() {
return companyName;
}
public void setCompanyName(String companyName) {
this.companyName = companyName;
}
public String getUserNumber() {
return userNumber;
}
......@@ -37,22 +29,6 @@ public class AddUserVo {
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() {
return userName;
}
......@@ -100,4 +76,28 @@ public class AddUserVo {
public void setRoleName(String 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;
public interface RoleMapper {
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);
......
src/main/java/com/example/tdl/service/RoleService.java
View file @ 924e3f32
......@@ -20,8 +20,8 @@ public class RoleService {
return roleMapper.getRoleNameByCompanyName(companyName);
}
public Integer getByRoleName(String roleName,String companyNo){
return roleMapper.getByRoleName(roleName,companyNo);
public Integer getByRoleName(String roleName,String companyName){
return roleMapper.getByRoleName(roleName,companyName);
}
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 {
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();
logger.info(t1+"---------t1");
ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo);
......@@ -72,9 +72,9 @@ public class DataUtil {
List<HistoryData> historyData = new ArrayList<>();
String sqls = "";
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 {
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));
Integer count;
......@@ -90,9 +90,9 @@ public class DataUtil {
if (count > 500) {
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 {
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));
if (queryResult.getResults() != null) {
......@@ -119,19 +119,19 @@ public class DataUtil {
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 = "";
long times = (endTime - startTime) / 500;
for (int i = 0; i < 500; i++) {
Long maxTime = startTime + times;
sql = sql + "Select " + field + " From \"tdl_policy\".\"" + device + "\" where " +
" \"SN\" = '"+SN+"' " +
" \"event\" = '"+event+"' " +
" AND \"tdl\"='" + tdl + "' " +
"and time >= "+startTime +" and time <= " + maxTime + " order by time limit 1;";
startTime = maxTime;
}
sql = sql + "Select " + field + " From \"tdl_policy\".\"" + device + "\" where " +
" \"SN\" = '"+SN+"' " +
" \"event\" = '"+event+"' " +
" AND \"tdl\"='" + tdl + "' " +
"and time >= "+startTime+" and time <= " + endTime + " order by time desc limit 1;";
return sql;
......
src/main/java/com/example/tdl/web/AlarmLogController.java
View file @ 924e3f32
......@@ -370,13 +370,13 @@ public class AlarmLogController {
//经纬度数据
public CircuitAlarmDataVo parseLocation(QueryResult queryResult,Long time){
String t1 ="";
if(queryResult.getResults().get(0) == null){
if(queryResult.getResults().get(0)==null || queryResult.getResults().get(0) .getSeries() == null){
t1 = "0";
}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();
}
String t2="";
if(queryResult.getResults().get(1) == null){
if(queryResult.getResults().get(1) == null ||queryResult.getResults().get(1).getSeries()== null){
t2="0";
}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();
......@@ -398,7 +398,6 @@ public class AlarmLogController {
e.printStackTrace();
logger.info(e.toString());
}
return circuitAlarmDataVo;
}
......
src/main/java/com/example/tdl/web/CompanyController.java
View file @ 924e3f32
......@@ -126,11 +126,11 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"manager"));
return gson.toJson(fb);
}
if (!addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTel"));
return gson.toJson(fb);
}
// if (!addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"wrongTel"));
// return gson.toJson(fb);
// }
if (StringUtils.isEmpty(addCompanyVo.getRoleName())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"roleName"));
......@@ -181,6 +181,7 @@ public class CompanyController {
return gson.toJson(fb);
}
//修改公司信息
@ApiOperation(value = "修改公司信息",notes = "修改公司信息，需要传的值：" +
" companyNo:需要修改的公司编号，" +
......@@ -232,11 +233,11 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"tel"));
return gson.toJson(fb);
}
if( !updateCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongTel"));
return gson.toJson(fb);
}
// if( !updateCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request,"wrongTel"));
// return gson.toJson(fb);
// }
if (StringUtils.isEmpty(updateCompanyVo.getManager())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"manager"));
......@@ -264,6 +265,7 @@ public class CompanyController {
return gson.toJson(fb);
}
//删除公司
@ApiOperation(value = "删除公司",notes = "删除公司,传值说明：companyName:公司编号")
@ApiImplicitParams({
......
src/main/java/com/example/tdl/web/UserController.java
View file @ 924e3f32
......@@ -300,7 +300,7 @@ public class UserController {
fb.setMessage(i18n.getMessage(request,"roleName"));
return gson.toJson(fb);
}
if (roleService.getByRoleName(userVo.getRoleName(),userInfo.getCompanyNo())==0){
if (roleService.getByRoleName(userVo.getRoleName(),userInfo.getCompanyName())==0){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"existRoleName"));
return gson.toJson(fb);
......
src/main/java/com/example/tdl/web/WarehouseController.java
View file @ 924e3f32
......@@ -512,8 +512,9 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"property"));
return gson.toJson(fb);
}
if (!"供应中心".equals(addWarehouseVo.getProperty())&&!"冷藏库".equals(addWarehouseVo.getProperty())&&
!"中心库".equals(addWarehouseVo.getProperty())){
if (!i18n.getMessage(request,"warehouseProperty1").equals(addWarehouseVo.getProperty())
&&!i18n.getMessage(request,"warehouseProperty2").equals(addWarehouseVo.getProperty())
&& !i18n.getMessage(request,"warehouseProperty3").equals(addWarehouseVo.getProperty())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"wrongProperty"));
return gson.toJson(fb);
......@@ -523,7 +524,8 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"warehouseType"));
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.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb);
......@@ -533,8 +535,10 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb);
}
if (!addWarehouseVo.getHardwareLevel().equals("优")&&!addWarehouseVo.getHardwareLevel().equals("良")&&
!addWarehouseVo.getHardwareLevel().equals("中")&&!addWarehouseVo.getHardwareLevel().equals("差")){
if (!addWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1"))
&&!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.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb);
......@@ -700,8 +704,10 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"property"));
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.setMessage(i18n.getMessage(request,"wrongProperty"));
return gson.toJson(fb);
......@@ -711,7 +717,8 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"warehouseType"));
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.setMessage(i18n.getMessage(request,"wrongWarehouseType"));
return gson.toJson(fb);
......@@ -721,8 +728,10 @@ public class WarehouseController {
fb.setMessage(i18n.getMessage(request,"hardwareLevel"));
return gson.toJson(fb);
}
if (!updateWarehouseVo.getHardwareLevel().equals("优")&&!updateWarehouseVo.getHardwareLevel().equals("良")&&
!updateWarehouseVo.getHardwareLevel().equals("中")&&!updateWarehouseVo.getHardwareLevel().equals("差")){
if (!updateWarehouseVo.getHardwareLevel().equals(i18n.getMessage(request,"warehouseHardwareLevel1"))
&&!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.setMessage(i18n.getMessage(request,"wrongHardwareLevel"));
return gson.toJson(fb);
......@@ -1011,7 +1020,6 @@ public class WarehouseController {
}else {
warehouseGatewayDateVo.setBattery("NA");
}
Object data = infoRedisService.getHash("DeviceOnline", device );
if(data !=null){
OnlineVo onlineVo = gson.fromJson(data.toString(),OnlineVo.class);
......@@ -1023,7 +1031,6 @@ public class WarehouseController {
}else{
warehouseGatewayDateVo.setState(6);
}
List<String> tdls=tdlDeviceService.getByGatewaySN(gatewayOnLineVos.get(a).getgSN(),gatewayOnLineVos.get(a).getType());
List<WarehouseDataVo> warehouseDataVos=new ArrayList<>();
......
src/main/resources/application-docker.properties
View file @ 924e3f32
......@@ -12,7 +12,6 @@ server.port=8092
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.username=root
#spring.datasource.password=37774020
......
src/main/resources/application.properties
View file @ 924e3f32
......@@ -52,7 +52,7 @@ tdl.mqtt.clientcrt = witcd.crt
# InfluxDB
spring.influxdb.username=admin
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.retentionPolicy = tdl_policy
spring.influxdb.connent-timeout=10
......
src/main/resources/i18n/messages_en.properties
View file @ 924e3f32
......@@ -247,4 +247,18 @@ deleteFailure=Failed to delete the user
adminInoperable=You can't operate the administrator account
downloadStartTime=Query start time must not be null
downloadEndTime=Query end time must not be null
TDL=Sensor's serial number must not be null
\ No newline at end of file
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
downloadEndTime=\u67E5\u8BE2\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
#\u4F20\u611F\u5668
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
superManage=\u8D85\u7EA7\u7BA1\u7406\u5458
warehouse=\u4ED3\u5E93\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 @@
<select id="getByRoleName" resultType="java.lang.Integer" parameterType="String">
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}
</select>
......
src/main/resources/mapper/UserMapper.xml
View file @ 924e3f32
......@@ -106,7 +106,7 @@
SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR} AND state=1)),
#{createTime,jdbcType=VARCHAR},
#{updateTime,jdbcType=VARCHAR},
(SELECT id from company WHERE companyNo=#{companyNo,jdbcType=VARCHAR}),
(SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR}),
1
)
</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