Skip to content

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

2018.7.26修改权限

parent 924e3f32
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 61 deletions
src/main/java/com/example/tdl/mqtt/MqttListener.java
View file @ ed7bc3e7
......@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
public class MqttListener implements MqttCallback {
private static final int INIT_DELAY_DEFAULT = 1000; // unit:ms
private static final int SCH_PERIOD_DEFAULT = 10 * INIT_DELAY_DEFAULT; // unit:ms
private static final String CHECKIN_TOPIC = "TDL/+/+/CheckIn";
private static final String CHECKIN_TOPIC = "CY/+/+/CheckIn";
private MqttTemlateAsync mqttAsyncClient;
......
src/main/java/com/example/tdl/web/PermissionController.java
View file @ ed7bc3e7
......@@ -73,7 +73,7 @@ public class PermissionController {
List<SideGroupVo> sideGroupVos=new ArrayList<>();
for (String parentSideName: parentSideLists){
SideGroupVo sideGroupVo = new SideGroupVo();
//获取子侧边栏的名字
//获取子侧边栏的名字str.replace(" ", "")
List<String> sideTitles = sideService.getSideTitleByParentName(parentSideName);
List<SideAndPermissionVo> sideAndPermissionVos = new ArrayList<>();
for(String sideName:sideTitles){
......@@ -81,7 +81,7 @@ public class PermissionController {
//获取侧边栏对应的父权限名
String permissionName=sideService.getParentPermissionBySideTitle(sideName);
PermissionGroupVo permissionGroupVo=new PermissionGroupVo();
permissionGroupVo.setParentName(permissionName);
permissionGroupVo.setParentName(i18n.getMessage(request,permissionName.replace(" ","")));
//获取父权限对应的子权限
List<String> permissionNames=permissionService.getPermissionByPermissionName(permissionName);
List<PermissionShowVo> permissionShowVoList = new ArrayList<>();
......@@ -94,40 +94,17 @@ public class PermissionController {
}
}
if(permissionShowVoList.size() >0){
sideAndPermissionVo.setSideTitle(sideName);
sideAndPermissionVo.setSideTitle(i18n.getMessage(request,sideName.replace(" ","")));
sideAndPermissionVo.setPermissionShowVos(permissionShowVoList);
sideAndPermissionVos.add(sideAndPermissionVo);
}
}
if(sideAndPermissionVos.size() >0){
sideGroupVo.setParentSide(parentSideName);
sideGroupVo.setParentSide(i18n.getMessage(request,parentSideName.replace(" ","")));
sideGroupVo.setSideAndPermissionVos(sideAndPermissionVos);
sideGroupVos.add(sideGroupVo);
}
}
// List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyName());
// List<String> parentLists =permissionService.getPermissionParentName();
// List<PermissionGroupVo> vo =new ArrayList<>();
// //遍历取出每一个action匹配权限组
// for (String parentName: parentLists){
// List<String> permissions = permissionService.getPermissionByPermissionName(parentName);
// PermissionGroupVo permissionNameGroupVo = new PermissionGroupVo();
// List<PermissionShowVo> permissionShowVoList = new ArrayList<>();
// for(String permissionName:permissions){
// if(permissionLists.contains(permissionName)){
// PermissionShowVo permissionShowVo =new PermissionShowVo();
// permissionShowVo.setPermissionName(permissionName);
// permissionShowVo.setChecked(false);
// permissionShowVoList.add(permissionShowVo);
// permissionNameGroupVo.setParentName(parentName);
// }
// }
// permissionNameGroupVo.setPermissionShowVoList(permissionShowVoList);
// if(permissionShowVoList.size() >0){
// vo.add(permissionNameGroupVo);
// }
// }
// return vo;
return sideGroupVos;
}
......@@ -167,7 +144,7 @@ public class PermissionController {
//获取侧边栏对应的父权限名
String permissionName=sideService.getParentPermissionBySideTitle(sideName);
PermissionGroupVo permissionGroupVo=new PermissionGroupVo();
permissionGroupVo.setParentName(permissionName);
permissionGroupVo.setParentName(i18n.getMessage(request,permissionName.replace(" ","")));
//获取父权限对应的子权限
List<String> permissionNames=permissionService.getPermissionByPermissionName(permissionName);
List<PermissionShowVo> permissionShowVoList = new ArrayList<>();
......@@ -184,40 +161,17 @@ public class PermissionController {
}
}
if (permissionShowVoList.size() > 0) {
sideAndPermissionVo.setSideTitle(sideName);
sideAndPermissionVo.setSideTitle(i18n.getMessage(request,sideName.replace(" ","")));
sideAndPermissionVo.setPermissionShowVos(permissionShowVoList);
sideAndPermissionVos.add(sideAndPermissionVo);
}
}
if (sideAndPermissionVos.size() > 0) {
sideGroupVo.setParentSide(parentSideName);
sideGroupVo.setParentSide(i18n.getMessage(request,parentSideName.replace(" ","")));
sideGroupVo.setSideAndPermissionVos(sideAndPermissionVos);
sideGroupVos.add(sideGroupVo);
}
}
// for (String parentName : parentLists) {
// List<String> permissions = permissionService.getPermissionByPermissionName(parentName);
// PermissionGroupVo permissionGroupVo = new PermissionGroupVo();
// permissionGroupVo.setParentName(parentName);
// List<PermissionShowVo> permissionShowVosList = new ArrayList<>();
// for (String permission : permissions) {
// PermissionShowVo permissionShowVo = new PermissionShowVo();
// if (permissionLists.contains(permission)) {
// permissionShowVo.setPermissionName(permission);
// if (rolePermission.contains(permission)) {
// permissionShowVo.setChecked(true);
// } else {
// permissionShowVo.setChecked(false);
// }
// permissionShowVosList.add(permissionShowVo);
// }
// }
// permissionGroupVo.setPermissionShowVoList(permissionShowVosList);
// if (permissionShowVosList.size() > 0) {
// vo.add(permissionGroupVo);
// }
// }
return sideGroupVos;
}
......@@ -244,7 +198,7 @@ public class PermissionController {
}
String permissionVar="";
for(int i=0;i<addOrUpdatePermissionVo.getPermissionGroupVos().size();i++){
permissionVar+=addOrUpdatePermissionVo.getPermissionGroupVos().get(i)+" ";
permissionVar+=addOrUpdatePermissionVo.getPermissionGroupVos().get(i)+"&";
}
try {
Map<String,Object> map=new HashMap<>();
......
src/main/java/com/example/tdl/web/SideController.java
View file @ ed7bc3e7
......@@ -60,8 +60,8 @@ public class SideController {
List<ResultSideVo> sliderTitleVoList=sideService.selectAllTitle(user.getRoleName(),user.getCompanyNo());
Set<String> l=new HashSet<>();
for (int i=0;i<sliderTitleVoList.size();i++){
l.add(sliderTitleVoList.get(i).getpName());
l.add(sliderTitleVoList.get(i).getSideTitle());
l.add(i18n.getMessage(request,sliderTitleVoList.get(i).getpName().replace(" ","")));
l.add(i18n.getMessage(request,sliderTitleVoList.get(i).getSideTitle().replace(" ","")));
}
return l;
}
......
src/main/resources/i18n/messages_en.properties
View file @ ed7bc3e7
......@@ -261,4 +261,26 @@ warehouseType2=Multi-layered Warehouse
warehouseHardwareLevel1=Excelent
warehouseHardwareLevel2=Good
warehouseHardwareLevel3=Fair
warehouseHardwareLevel4=Poor
\ No newline at end of file
warehouseHardwareLevel4=Poor
DataOverview=Data Overview
TransportationState=Transportation State
SystemSetup=System Setup
WarehouseStatus=Warehouse Status
InformationManagement=Information Management
Devicemanagement=Device management
DataOverviewDetails=Data Overview Details
TransportationList=Transportation List
Usermanagement=User management
Commonaddress=Common address
CompanyManagement=Company Management
Warningmanagement=Warning management
AlarmManagement=Alarm Management
WarehouseList=Warehouse List
WarehouseManagement=Warehouse Management
RegionManagement=Region Management
GatewayManagement=Gateway Management
SensorManagement=Sensor Management
AccountManagement=Account Management
VehicleManagement=Vehicle Management
src/main/resources/i18n/messages_zh_CN.properties
View file @ ed7bc3e7
......@@ -284,3 +284,24 @@ warehouseHardwareLevel2 = \u826F
warehouseHardwareLevel3 =\u4E2D
warehouseHardwareLevel4 = \u5DEE
DataOverview=\u6570\u636E\u6982\u89C8
TransportationState=\u8FD0\u8F93\u72B6\u6001
SystemSetup=\u7CFB\u7EDF\u8BBE\u7F6E
WarehouseStatus=\u4ED3\u5E93\u72B6\u6001
InformationManagement=\u4FE1\u606F\u7BA1\u7406
Devicemanagement=\u8BBE\u5907\u7BA1\u7406
DataOverviewDetails=\u6570\u636E\u6982\u89C8\u8BE6\u60C5
TransportationList=\u8FD0\u8F93\u5217\u8868
Usermanagement=\u7528\u6237\u7BA1\u7406
Commonaddress=\u5E38\u7528\u5730\u5740
CompanyManagement=\u516C\u53F8\u7BA1\u7406
Warningmanagement=\u9884\u8B66\u7BA1\u7406
AlarmManagement=\u62A5\u8B66\u7BA1\u7406
WarehouseList=\u4ED3\u5E93\u5217\u8868
WarehouseManagement=\u4ED3\u5E93\u7BA1\u7406
RegionManagement=\u533A\u57DF\u7BA1\u7406
GatewayManagement=\u7F51\u5173\u7BA1\u7406
SensorManagement=\u4F20\u611F\u5668\u7BA1\u7406
AccountManagement=\u89D2\u8272\u7BA1\u7406
VehicleManagement=\u8F66\u8F86\u7BA1\u7406
src/main/resources/mapper/UserMapper.xml
View file @ ed7bc3e7
......@@ -4,7 +4,7 @@
<!--登录-->
<select id="login" parameterType="com.example.tdl.domain.vo.LoginUserVo" resultType="java.lang.Integer">
SELECT COUNT(userName) from USER
WHERE userName=#{userName,jdbcType=VARCHAR}
WHERE BINARY userName=#{userName,jdbcType=VARCHAR}
AND password=#{password,jdbcType=VARCHAR}
AND state=1
</select>
......@@ -68,7 +68,9 @@
select userNumber, userName,password,nickName,phone,email,roleName,c.companyNo,c.companyName
from company c,`user` u INNER JOIN role r ON u.role_id=r.id
WHERE u.company_id=c.id
AND c.companyNo=#{companyNo,jdbcType=VARCHAR}
<if test="companyNo!='TM201803298320'">
and c.companyNo=#{companyNo,jdbcType=VARCHAR}
</if>
AND phone=#{phone,jdbcType=VARCHAR}
AND u.state=1
</select>
......@@ -78,7 +80,9 @@
select userNumber, userName,password,nickName,phone,email,roleName,c.companyNo,c.companyName
from company c,`user` u INNER JOIN role r ON u.role_id=r.id
WHERE u.company_id=c.id
AND c.companyNo=#{companyNo,jdbcType=VARCHAR}
<if test="companyNo!='TM201803298320'">
and c.companyNo=#{companyNo,jdbcType=VARCHAR}
</if>
AND email=#{email,jdbcType=VARCHAR}
AND u.state=1
</select>
......
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