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

src/main/java/com/example/tdl/domain/vo/AddCompanyVo.java

@@ -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/web/CompanyController.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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}
            )