Skip to content

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

6.13修改添加公司接口，修改角色权限接口

parent bf136da7
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 100 deletions
src/main/java/com/example/tdl/domain/vo/AddCompanyVo.java
View file @ ee4e5dbe
......@@ -19,6 +19,16 @@ public class AddCompanyVo {
private String img;
private String roleName;
public String getRoleName() {
return roleName;
}
public void setRoleName(String roleName) {
this.roleName = roleName;
}
public String getAlias() {
return alias;
}
......
src/main/java/com/example/tdl/util/DataUtil.java
View file @ ee4e5dbe
......@@ -2,7 +2,7 @@ package com.example.tdl.util;
import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.*;
import com.example.tdl.service.CircuitService;
import com.example.tdl.service.InfluxDBService;
//import com.example.tdl.service.InfluxDBService;
import com.example.tdl.service.TDLLogService;
import com.example.tdl.web.I18nController;
import com.google.gson.Gson;
......@@ -120,109 +120,109 @@ public class DataUtil {
}
public static String getHistoryData(String transportationNo, HttpServletRequest request, I18nController i18n, String companyNo, CircuitService circuitService, TDLLogService tdlLogService, InfluxDBService influxDBService, String field){
Long t1 = System.currentTimeMillis();
logger.info(t1+"---------t1");
ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo);
if (resultCircuitVo == null) {
fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "noCircuit"));
return gson.toJson(fb);
}
if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "notStarted"));
return gson.toJson(fb);
}
Long startTime = resultCircuitVo.getStartTime() * 1000000l;
TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo);
if (gatewayVo == null) {
fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "noCircuit"));
return gson.toJson(fb);
}
String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
//获取tdl信息
List<String> devList = tdlLogService.getTdlSN(transportationNo);
if (devList.size() == 0) {
fb.setCode(0);
fb.setMessage(i18n.getMessage(request, "noCircuit"));
return gson.toJson(fb);
}
Long t2 = System.currentTimeMillis();
logger.info(t2-t1+"--------------t2-t1");
List<HistoryDataVo> historyDataVoList = new ArrayList<>();
for (int i = 0; i < devList.size(); i++) {
HistoryDataVo historyDataVo = new HistoryDataVo();
String TDLSN = devList.get(i).replace("TDL-", "").trim();
historyDataVo.setTDLSN(TDLSN);
if("\"T\"".equals(field) || "\"h\"".equals(field)){
ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
//根据tdl货物报警信息
historyDataVo.setMax(resultAlarmVo.getTemMax().toString());
historyDataVo.setMin(resultAlarmVo.getTemMin().toString());
}
List<HistoryData> historyData = new ArrayList<>();
String sqls = "";
Long t3 = System.currentTimeMillis();
logger.info(t3-t2+"------t3");
QueryResult queryResults = null;
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
queryResults = influxDBService.getData(device,devList.get(i),field,startTime,resultCircuitVo.getEndTime() * 1000000l);
} else {
queryResults = influxDBService.getData(device,devList.get(i),field,startTime,System.currentTimeMillis() * 1000000l);
}
Long t4 = System.currentTimeMillis();
logger.info(t4-t3+"------t4");
Integer count;
if (queryResults.getResults().get(0).getSeries() != null) {
count = Double.valueOf(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()).intValue();
} else {
historyDataVo.setDataList(historyData);
historyDataVoList.add(historyDataVo);
continue;
}
Long t5 = System.currentTimeMillis();
logger.info(t5-t4+"------t5-----"+ count);
String sql = "";
if (count > 500) {
Long t6 = System.currentTimeMillis();
logger.info(t6 - t5 + "------t6");
QueryResult queryResult = null;
if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
queryResult = influxDBService.getHistoryData(device, devList.get(i), field, startTime, resultCircuitVo.getEndTime() * 1000000l);
} else {
queryResult = influxDBService.getHistoryData(device, devList.get(i), field, startTime, resultCircuitVo.getEndTime() * 1000000l);
}
Long t7 = System.currentTimeMillis();
logger.info(t7 - t6 + "------t7-------" + t7);
if (queryResult.getResults() != null) {
historyData = getHistoryDatas(queryResult, field);
}
Long t8 = System.currentTimeMillis();
logger.info(t8 - t7 + "------t8-------" + t8);
historyDataVo.setDataList(historyData);
historyDataVoList.add(historyDataVo);
logger.info(System.currentTimeMillis() + "");
}
// public static String getHistoryData(String transportationNo, HttpServletRequest request, I18nController i18n, String companyNo, CircuitService circuitService, TDLLogService tdlLogService, InfluxDBService influxDBService, String field){
// Long t1 = System.currentTimeMillis();
// logger.info(t1+"---------t1");
// ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo, companyNo);
// if (resultCircuitVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// if (resultCircuitVo.getStartTime() == null || resultCircuitVo.getStartTime() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "notStarted"));
// return gson.toJson(fb);
// }
// Long startTime = resultCircuitVo.getStartTime() * 1000000l;
// TDLLogVo gatewayVo = tdlLogService.getByTransportationNo(transportationNo);
// if (gatewayVo == null) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// String device = gatewayVo.getgType() + "_" + gatewayVo.getgSN();
// //获取tdl信息
// List<String> devList = tdlLogService.getTdlSN(transportationNo);
// if (devList.size() == 0) {
// fb.setCode(0);
// fb.setMessage(i18n.getMessage(request, "noCircuit"));
// return gson.toJson(fb);
// }
// Long t2 = System.currentTimeMillis();
// logger.info(t2-t1+"--------------t2-t1");
// List<HistoryDataVo> historyDataVoList = new ArrayList<>();
// for (int i = 0; i < devList.size(); i++) {
// HistoryDataVo historyDataVo = new HistoryDataVo();
// String TDLSN = devList.get(i).replace("TDL-", "").trim();
// historyDataVo.setTDLSN(TDLSN);
// if("\"T\"".equals(field) || "\"h\"".equals(field)){
// ResultAlarmVo resultAlarmVo = tdlLogService.getByTdl(transportationNo, TDLSN);
// //根据tdl货物报警信息
// historyDataVo.setMax(resultAlarmVo.getTemMax().toString());
// historyDataVo.setMin(resultAlarmVo.getTemMin().toString());
// }
// List<HistoryData> historyData = new ArrayList<>();
// String sqls = "";
// Long t3 = System.currentTimeMillis();
// logger.info(t3-t2+"------t3");
// QueryResult queryResults = null;
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// queryResults = influxDBService.getData(device,devList.get(i),field,startTime,resultCircuitVo.getEndTime() * 1000000l);
// } else {
// queryResults = influxDBService.getData(device,devList.get(i),field,startTime,System.currentTimeMillis() * 1000000l);
// }
// Long t4 = System.currentTimeMillis();
// logger.info(t4-t3+"------t4");
// Integer count;
// if (queryResults.getResults().get(0).getSeries() != null) {
// count = Double.valueOf(queryResults.getResults().get(0).getSeries().get(0).getValues().get(0).get(1).toString()).intValue();
// } else {
// historyDataVo.setDataList(historyData);
// historyDataVoList.add(historyDataVo);
// continue;
// }
// Long t5 = System.currentTimeMillis();
// logger.info(t5-t4+"------t5-----"+ count);
// String sql = "";
// if (count > 500) {
// Long t6 = System.currentTimeMillis();
// logger.info(t6 - t5 + "------t6");
// QueryResult queryResult = null;
// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
// sql = "SELECT "+field+" FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " and time<=" + resultCircuitVo.getEndTime() * 1000000l + " ORDER BY time ";
// queryResult = influxDBService.getHistoryData(device, devList.get(i), field, startTime, resultCircuitVo.getEndTime() * 1000000l);
// } else {
// sql = "SELECT "+field+" FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " ORDER BY time";
// queryResult = influxDBService.getHistoryData(device, devList.get(i), field, startTime, resultCircuitVo.getEndTime() * 1000000l);
// }
// QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
// if (queryResult.getResults().get(0).getSeries() != null) {
// //解析数据
// historyData = getHistoryData(queryResult, field);
// Long t7 = System.currentTimeMillis();
// logger.info(t7 - t6 + "------t7-------" + t7);
// if (queryResult.getResults() != null) {
// historyData = getHistoryDatas(queryResult, field);
// }
// Long t8 = System.currentTimeMillis();
// logger.info(t8 - t7 + "------t8-------" + t8);
// historyDataVo.setDataList(historyData);
// historyDataVoList.add(historyDataVo);
// logger.info(System.currentTimeMillis() + "");
// }
//// } else {
//// if (resultCircuitVo.getEndTime() != null && resultCircuitVo.getEndTime() != 0) {
//// sql = "SELECT "+field+" FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " and time<=" + resultCircuitVo.getEndTime() * 1000000l + " ORDER BY time ";
//// } else {
//// sql = "SELECT "+field+" FROM \"tdl_policy\".\"" + device + "\" where \"tdl\"='" + devList.get(i) + "' and time >=" + startTime + " ORDER BY time";
//// }
//// QueryResult queryResult = influxDBTemplate.query(new Query(sql, database));
//// if (queryResult.getResults().get(0).getSeries() != null) {
//// //解析数据
//// historyData = getHistoryData(queryResult, field);
//// }
//// historyDataVo.setDataList(historyData);
//// historyDataVoList.add(historyDataVo);
//// }
// }
// logger.info(System.currentTimeMillis()-t1+"____________");
// return gson.toJson(historyDataVoList);
// }
}
logger.info(System.currentTimeMillis()-t1+"____________");
return gson.toJson(historyDataVoList);
}
public static String getSQL(String field, String device, String tdl, Long startTime, Long endTime) {
String sql = "";
......
src/main/java/com/example/tdl/web/CompanyController.java
View file @ ee4e5dbe
......@@ -82,7 +82,8 @@ public class CompanyController {
" addressDetail:具体地址，" +
" tel:电话号码，" +
" manager:负责人，" +
" img:图片地址")
" img:图片地址," +
" roleName:辉度给该公司分配权限的角色名")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
@ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),
......@@ -130,6 +131,11 @@ public class CompanyController {
fb.setMessage(i18n.getMessage(request,"wrongTel"));
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCompanyVo.getRoleName())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"roleName"));
return gson.toJson(fb);
}
if (companyService.getByCompanyName(addCompanyVo.getCompanyName())!=null){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"repeateCompanyName"));
......@@ -159,6 +165,7 @@ public class CompanyController {
map.put("tel",addCompanyVo.getTel());
map.put("manager",addCompanyVo.getManager());
map.put("img",addCompanyVo.getImg());
map.put("roleName",addCompanyVo.getRoleName());
map.put("createTime",System.currentTimeMillis());
companyService.addCompany(map);
Map<String,Object> msg=new HashMap<>();
......
src/main/java/com/example/tdl/web/DataController.java
View file @ ee4e5dbe
......@@ -67,8 +67,8 @@ public class DataController {
@Autowired
private ProbesService probesService;
@Autowired
private InfluxDBService influxDBService;
// @Autowired
// private InfluxDBService influxDBService;
@Autowired
private I18nController i18n;
......
src/main/java/com/example/tdl/web/RoleController.java
View file @ ee4e5dbe
......@@ -153,6 +153,11 @@ public class RoleController {
fb.setMessage(i18n.getMessage(request,"roleName"));
return gson.toJson(fb);
}
if (addRoleForPermissionVo.getRoleName().equals("管理员")){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"adminInoperable"));
return gson.toJson(fb);
}
Integer a=roleService.getByRoleName(addRoleForPermissionVo.getRoleName(),user.getCompanyName());
if (a>0){
fb.setCode(0);
......@@ -213,6 +218,11 @@ public class RoleController {
fb.setMessage(i18n.getMessage(request,"repeatedRole"));
return gson.toJson(fb);
}
if (updateRoleVo.getRoleName().equals("管理员")){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"adminInoperable"));
return gson.toJson(fb);
}
try {
updateRoleVo.setCompanyName(user.getCompanyName());
int c=roleService.updateRole(updateRoleVo);
......@@ -248,6 +258,11 @@ public class RoleController {
fb.setMessage(i18n.getMessage(request,"roleName"));
return gson.toJson(fb);
}
if (roleName.equals("管理员")){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"adminInoperable"));
return gson.toJson(fb);
}
int f=userService.getByRoleName(roleName,user.getCompanyName());
if (f>0){
fb.setCode(0);
......@@ -301,6 +316,11 @@ public class RoleController {
fb.setMessage(i18n.getMessage(request,"roleName"));
return gson.toJson(fb);
}
if (!user.getCompanyName().equals("上海辉度")){
fb.setCode(0);
fb.setMessage("只有辉度能修改其他公司的权限");
return gson.toJson(fb);
}
String companyNameVar="";
for(int i=0;i<updateRoleForWitiumVo.getCompanyNameVar().size();i++){
companyNameVar+=updateRoleForWitiumVo.getCompanyNameVar().get(i)+"&";
......@@ -329,7 +349,7 @@ public class RoleController {
return gson.toJson(fb);
}
//添加角色
//辉度添加其他公司角色
@ApiOperation(value = "辉度添加其他公司角色",notes = "辉度添加其他公司角色，传递参数：" +
" roleName:角色名," +
" companyName:需要添加的公司," +
......@@ -345,6 +365,11 @@ public class RoleController {
String token = request.getHeader("Account_token");
String datum = tokenRedisService.get("TOKEN_" +token);
UserRedisVo user = gson.fromJson(datum,UserRedisVo.class);
if (!user.getCompanyName().equals("上海辉度")){
fb.setCode(0);
fb.setMessage("只有辉度能添加其他公司的角色");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRoleForWitiumVo.getCompanyName())){
fb.setCode(0);
fb.setMessage(i18n.getMessage(request,"companyName"));
......
src/main/resources/i18n/messages_zh_CN.properties
View file @ ee4e5dbe
......@@ -252,6 +252,7 @@ updateSuccess=\u4FEE\u6539\u89D2\u8272\u6210\u529F
updateFailure=\u4FEE\u6539\u89D2\u8272\u5931\u8D25
deleteSuccess=\u5220\u9664\u89D2\u8272\u6210\u529F
deleteFailure=\u5220\u9664\u89D2\u8272\u5931\u8D25
adminInoperable=\u7BA1\u7406\u5458\u89D2\u8272\u4E0D\u80FD\u64CD\u4F5C
#\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
......
src/main/resources/mapper/CompanyMapper.xml
View file @ ee4e5dbe
......@@ -24,6 +24,7 @@
#{tel,mode=IN,jdbcType=VARCHAR},
#{manager,mode=IN,jdbcType=VARCHAR},
#{img,mode=IN,jdbcType=VARCHAR},
#{roleName,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=VARCHAR},
#{msg,mode=OUT,jdbcType=VARCHAR}
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment