6.15修改接口，将根据公司名查询改为根据公司编号查询

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

@@ -5,10 +5,20 @@ public class ResultRegionVo {
 
     private String regionName;
 
+    private String companyNo;
+
     private String companyName;
 
     private String remark;
 
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getRegionNo() {
         return regionNo;
     }
@@ -25,12 +35,12 @@ public class ResultRegionVo {
         this.regionName = regionName;
     }
 
-    public String getCompanyName() {
-        return companyName;
+    public String getCompanyNo() {
+        return companyNo;
     }
 
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
     }
 
     public String getRemark() {

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

@@ -9,8 +9,18 @@ public class ResultRoleVo {
 
     private String remark;
 
+    private String companyNo;
+
     private String companyName;
 
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
     public String getRoleName() {
         return roleName;
     }

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

@@ -13,8 +13,18 @@ public class ResultUserVo {
 
     private String roleName;
 
+    private String companyNo;
+
     private String companyName;
 
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
     public String getCompanyName() {
         return companyName;
     }

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

@@ -42,10 +42,20 @@ public class ResultWarehouseVo {
 
     private String warehouseInfo;//基础描述
 
+    private String companyNo;
+
     private String companyName;
 
     private String remark;
 
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
     public String getWarehouseNo() {
         return warehouseNo;
     }

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

@@ -5,16 +5,16 @@ public class UpdateRegionVo {
 
     private String regionName;
 
-    private String companyName;
+    private String companyNo;
 
     private String remark;
 
-    public String getCompanyName() {
-        return companyName;
+    public String getCompanyNo() {
+        return companyNo;
     }
 
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
     }
 
     public String getRegionNo() {

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

@@ -9,7 +9,7 @@ public class UpdateRoleVo {
 
     private String remark;
 
-    private String companyName;
+    private String companyNo;
 
     public String getOldRoleName() {
         return oldRoleName;
@@ -43,11 +43,11 @@ public class UpdateRoleVo {
         this.remark = remark;
     }
 
-    public String getCompanyName() {
-        return companyName;
+    public String getCompanyNo() {
+        return companyNo;
     }
 
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
     }
 }

src/main/java/com/example/tdl/mapper/CompanyMapper.java

 package com.example.tdl.mapper;
 
 
-import com.example.tdl.domain.vo.AddCompanyVo;
-import com.example.tdl.domain.vo.AlarmContactsVo;
 import com.example.tdl.domain.vo.ResultCompanyVo;
 import com.example.tdl.domain.vo.UpdateCompanyVo;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/tdl/mapper/LoginLogMapper.java

@@ -11,9 +11,9 @@ import java.util.List;
 
 @Mapper
 public interface LoginLogMapper {
-    List<ResultLoginLogVo> getAll(String companyName);
+    List<ResultLoginLogVo> getAll(String companyNo);
 
     int addLoginLog(LoginLog loginLog);
 
-    List<ResultLoginLogVo> getByTime(@Param("startTime") Long startTime,@Param("stopTime") Long stopTime,@Param("companyName") String companyName);
+    List<ResultLoginLogVo> getByTime(@Param("startTime") Long startTime,@Param("stopTime") Long stopTime,@Param("companyNo") String companyNo);
 }

src/main/java/com/example/tdl/mapper/RegionMapper.java

@@ -9,11 +9,11 @@ import java.util.List;
 
 @Mapper
 public interface RegionMapper {
-    List<ResultRegionVo> getAll(String companyName);
+    List<ResultRegionVo> getAll(String companyNo);
 
-    ResultRegionVo getByRegionName(@Param("companyName") String companyName, @Param("regionName") String regionName);
+    ResultRegionVo getByRegionName(@Param("companyNo") String companyNo, @Param("regionName") String regionName);
 
-    ResultRegionVo getByRegionNo(@Param("companyName") String companyName, @Param("regionNo") String regionNo);
+    ResultRegionVo getByRegionNo(@Param("companyNo") String companyNo, @Param("regionNo") String regionNo);
 
     int addRegion(ResultRegionVo resultRegionVo);
 

src/main/java/com/example/tdl/mapper/RoleHasPermissionMapper.java

@@ -10,7 +10,7 @@ import java.util.Map;
 
 @Mapper
 public interface RoleHasPermissionMapper {
-    List<String> getByRoleName(@Param("roleName") String roleName, @Param("companyName") String companyName);
+    List<String> getByRoleName(@Param("roleName") String roleName, @Param("companyNo") String companyNo);
 
     int addRoleHasPermission(Map<String,Object> map);
 }

src/main/java/com/example/tdl/mapper/RoleMapper.java

@@ -14,9 +14,9 @@ import java.util.Map;
 public interface RoleMapper {
     List<RoleNameVo> getRoleNameByCompanyName(String companyName);
 
-    Integer getByRoleName(@Param("roleName") String roleName,@Param("companyName") String companyName);
+    Integer getByRoleName(@Param("roleName") String roleName,@Param("companyNo") String companyNo);
 
-    List<ResultRoleVo> getAll(String companyName);
+    List<ResultRoleVo> getAll(String companyNo);
 
     int addRole(ResultRoleVo resultRoleVo);
 

src/main/java/com/example/tdl/mapper/SideMapper.java

@@ -9,9 +9,9 @@ import java.util.List;
 
 @Mapper
 public interface SideMapper {
-    List<ResultSideVo> selectAllTitle(@Param("roleName") String roleName,@Param("companyName") String companyName);
+    List<ResultSideVo> selectAllTitle(@Param("roleName") String roleName,@Param("companyNo") String companyNo);
 
-    List<ResultSideVo> selectBySideTitle(@Param("roleName") String roleName,@Param("companyName") String companyName, @Param("sideTitle") String sideTitle);
+    List<ResultSideVo> selectBySideTitle(@Param("roleName") String roleName,@Param("companyNo") String companyNo, @Param("sideTitle") String sideTitle);
 
     List<String> getSideTitleParentName();
 

src/main/java/com/example/tdl/mapper/TransferModelMapper.java

@@ -11,7 +11,7 @@ import java.util.Map;
 @Mapper
 public interface TransferModelMapper {
 
-    List<ResultTransferModelVo> getAll(String companyName);
+    List<ResultTransferModelVo> getAll(String companyNo);
 
     int addTransferModel(Map<String, Object> map);
 

src/main/java/com/example/tdl/mapper/UserMapper.java

@@ -20,9 +20,9 @@ public interface UserMapper {
 
     List<ResultUserVo> getByTerm(UserTermVo userTermVo);
 
-    ResultUserVo getByPhone(@Param("phone") String phone,@Param("companyName") String companyName);
+    ResultUserVo getByPhone(@Param("phone") String phone,@Param("companyNo") String companyNo);
 
-    ResultUserVo getByEmail(@Param("email") String email,@Param("companyName") String companyName);
+    ResultUserVo getByEmail(@Param("email") String email,@Param("companyNo") String companyNo);
 
     ResultUserVo getByUserNumber(String userNumber);
 
@@ -36,7 +36,7 @@ public interface UserMapper {
 
     int updateImg(@Param("img") String img,@Param("userNumber") String userNumber);
 
-    int getByRoleName(@Param("roleName") String roleName,@Param("companyName") String companyName);
+    int getByRoleName(@Param("roleName") String roleName,@Param("companyNo") String companyNo);
 
     List<AlarmContactsVo> getAllByCompanyNo(String companyNo);
 }

src/main/java/com/example/tdl/mapper/WarehouseMapper.java

@@ -13,7 +13,7 @@ import java.util.Map;
 
 @Mapper
 public interface WarehouseMapper {
-    List<ResultWarehouseVo> getAll(String  companyName);
+    List<ResultWarehouseVo> getAll(String companyNo);
 
     List<ResultWarehouseVo> getAllWarehouse();
 

src/main/java/com/example/tdl/service/LoginLogService.java

@@ -16,15 +16,15 @@ public class LoginLogService {
     @Autowired
     private LoginLogMapper loginLogMapper;
 
-    public List<ResultLoginLogVo> getAll(String companyName){
-        return loginLogMapper.getAll(companyName);
+    public List<ResultLoginLogVo> getAll(String companyNo){
+        return loginLogMapper.getAll(companyNo);
     }
 
     public int addLoginLog(LoginLog loginLog){
         return loginLogMapper.addLoginLog(loginLog);
     }
 
-    public List<ResultLoginLogVo> getByTime(Long startTime,Long stopTime,String companyName){
-        return loginLogMapper.getByTime(startTime,stopTime,companyName);
+    public List<ResultLoginLogVo> getByTime(Long startTime,Long stopTime,String companyNo){
+        return loginLogMapper.getByTime(startTime,stopTime,companyNo);
     }
 }

src/main/java/com/example/tdl/service/RegionService.java

@@ -14,16 +14,16 @@ public class RegionService {
     @Autowired
     private RegionMapper regionMapper;
 
-    public List<ResultRegionVo> getAll(String companyName){
-        return regionMapper.getAll(companyName);
+    public List<ResultRegionVo> getAll(String companyNo){
+        return regionMapper.getAll(companyNo);
     }
 
-    public ResultRegionVo getByRegionName(String companyName,String regionName){
-        return regionMapper.getByRegionName(companyName,regionName);
+    public ResultRegionVo getByRegionName(String companyNo,String regionName){
+        return regionMapper.getByRegionName(companyNo,regionName);
     }
 
-    public ResultRegionVo getByRegionNo(String companyName,String regionNo){
-        return regionMapper.getByRegionNo(companyName,regionNo);
+    public ResultRegionVo getByRegionNo(String companyNo,String regionNo){
+        return regionMapper.getByRegionNo(companyNo,regionNo);
     }
 
     public int addRegion(ResultRegionVo resultRegionVo){

src/main/java/com/example/tdl/service/RoleHasPermissionService.java

@@ -14,8 +14,8 @@ public class RoleHasPermissionService {
     @Autowired
     private RoleHasPermissionMapper roleHasPermissionMapper;
 
-    public List<String> getByRoleName(String roleName,String companyName){
-        return roleHasPermissionMapper.getByRoleName(roleName,companyName);
+    public List<String> getByRoleName(String roleName,String companyNo){
+        return roleHasPermissionMapper.getByRoleName(roleName,companyNo);
     }
 
     public int addRoleHasPermission(Map<String,Object> map){

src/main/java/com/example/tdl/service/RoleService.java

@@ -20,12 +20,12 @@ public class RoleService {
         return roleMapper.getRoleNameByCompanyName(companyName);
     }
 
-    public Integer getByRoleName(String roleName,String companyName){
-        return roleMapper.getByRoleName(roleName,companyName);
+    public Integer getByRoleName(String roleName,String companyNo){
+        return roleMapper.getByRoleName(roleName,companyNo);
     }
 
-    public List<ResultRoleVo> getAll(String companyName){
-        return roleMapper.getAll(companyName);
+    public List<ResultRoleVo> getAll(String companyNo){
+        return roleMapper.getAll(companyNo);
     }
 
     public int addRole(ResultRoleVo resultRoleVo){

src/main/java/com/example/tdl/service/SideService.java

@@ -13,12 +13,12 @@ public class SideService {
     @Autowired
     private SideMapper sideMapper;
 
-    public List<ResultSideVo> selectAllTitle(String roleName,String companyName){
-        return sideMapper.selectAllTitle(roleName,companyName);
+    public List<ResultSideVo> selectAllTitle(String roleName,String companyNo){
+        return sideMapper.selectAllTitle(roleName,companyNo);
     }
 
-    public List<ResultSideVo> selectBySideTitle(String roleName,String companyName,String sideTitle){
-        return sideMapper.selectBySideTitle(roleName,companyName,sideTitle);
+    public List<ResultSideVo> selectBySideTitle(String roleName,String companyNo,String sideTitle){
+        return sideMapper.selectBySideTitle(roleName,companyNo,sideTitle);
     }
 
     public List<String> getSideTitleParentName(){

src/main/java/com/example/tdl/service/TransferModelService.java

@@ -15,8 +15,8 @@ public class TransferModelService {
     @Autowired
     private TransferModelMapper transferModelMapper;
 
-    public List<ResultTransferModelVo> getAll(String companyName){
-        return transferModelMapper.getAll(companyName);
+    public List<ResultTransferModelVo> getAll(String companyNo){
+        return transferModelMapper.getAll(companyNo);
     }
 
     public int addTransferModel(Map<String,Object> map){

src/main/java/com/example/tdl/service/UserService.java

@@ -35,8 +35,6 @@ public class UserService {
         return userMapper.getByUserName(userName);
     }
 
-
-
     public List<ResultUserVo> getAllUser(){
         return userMapper.getAllUser();
     }
@@ -45,12 +43,12 @@ public class UserService {
         return userMapper.getByTerm(userTermVo);
     }
 
-    public ResultUserVo getByPhone(String phone,String companyName){
-        return userMapper.getByPhone(phone,companyName);
+    public ResultUserVo getByPhone(String phone,String companyNo){
+        return userMapper.getByPhone(phone,companyNo);
     }
 
-    public ResultUserVo getByEmail(String email,String companyName){
-        return userMapper.getByEmail(email,companyName);
+    public ResultUserVo getByEmail(String email,String companyNo){
+        return userMapper.getByEmail(email,companyNo);
     }
 
     public ResultUserVo getByUserNumber(String userNumber){
@@ -95,8 +93,8 @@ public class UserService {
         return userMapper.updateImg(img,userNumber);
     }
 
-    public int getByRoleName(String roleName,String companyName){
-        return userMapper.getByRoleName(roleName,companyName);
+    public int getByRoleName(String roleName,String companyNo){
+        return userMapper.getByRoleName(roleName,companyNo);
     }
 
     public List<AlarmContactsVo> getAllByCompanyNo(String companyNo){

src/main/java/com/example/tdl/web/AlarmController.java

@@ -37,9 +37,6 @@ public class AlarmController {
     @Autowired
     private AlarmService alarmService=new AlarmService();
 
-    @Autowired
-    private WarehouseService warehouseService;
-
     @Autowired
     private TokenRedisService tokenRedisService;
 
@@ -96,7 +93,7 @@ public class AlarmController {
     }
 
     //添加预警信息
-    @ApiOperation(value = "添加预警信息",notes = "添加预警信息,companyName不用传，需要传递参数：" +
+    @ApiOperation(value = "添加预警信息",notes = "添加预警信息,companyNo不用传，需要传递参数：" +
             "   alarmType：预警类型，" +
             "   temMax：温度上限，" +
             "   temMin：温度下限，" +
@@ -178,7 +175,7 @@ public class AlarmController {
     }
 
     //修改预警信息
-    @ApiOperation(value = "修改预警信息",notes = "修改预警信息,companyName不用传，需要传递参数：" +
+    @ApiOperation(value = "修改预警信息",notes = "修改预警信息,companyNo不用传，需要传递参数：" +
             "   oldAlarmType：需要修改的预警类型，" +
             "   alarmType：预警类型，" +
             "   temMax：温度上限，" +
@@ -268,9 +265,8 @@ public class AlarmController {
 
 
     //删除预警信息
-    @ApiOperation(value = "删除预警信息",notes = "删除预警信息,companyName不用传，传值说明：" +
-            "   alarmType：需要删除的预警类型，" +
-            "   alarmScene：需要删除的预警场景" )
+    @ApiOperation(value = "删除预警信息",notes = "删除预警信息,companyNo不用传，传值说明：" +
+            "   alarmType：需要删除的预警类型" )
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
             @ApiImplicitParam(paramType="header", name = "AccountLanguage", value = "language", required = false, dataType = "String"),

src/main/java/com/example/tdl/web/CircuitController.java

@@ -1002,7 +1002,7 @@ public class CircuitController {
             return gson.toJson(fb);
         }
         //判断当前车牌是否已存在
-        if(carService.getByCarNo(user.getCompanyName(),addCircuitVo.getCargoNo()) == null){
+        if(carService.getByCarNo(user.getCompanyNo(),addCircuitVo.getCargoNo()) == null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"nonexistentTruck"));
             return gson.toJson(fb);

src/main/java/com/example/tdl/web/CompanyController.java

 package com.example.tdl.web;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
@@ -9,7 +8,6 @@ import com.example.tdl.domain.vo.ResultCompanyVo;
 import com.example.tdl.domain.vo.UpdateCompanyVo;
 import com.example.tdl.domain.vo.UserRedisVo;
 import com.example.tdl.service.CompanyService;
-import com.example.tdl.service.RoleService;
 import com.example.tdl.service.redis.TokenRedisService;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
@@ -28,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-
 @RestController
 @RequestMapping("/company")
 public class CompanyController {
@@ -90,6 +87,9 @@ public class CompanyController {
     })
     @RequestMapping(value="/addCompany",method = RequestMethod.POST)
     public Object addCompany(@RequestBody AddCompanyVo addCompanyVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         String port = request.getHeader("AccountLanguage");
         if (StringUtils.isEmpty(addCompanyVo.getCompanyName())){
             fb.setCode(0);
@@ -126,7 +126,7 @@ public class CompanyController {
             fb.setMessage(i18n.getMessage(request,"manager"));
             return gson.toJson(fb);
         }
-        if( !addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
+        if (!addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"wrongTel"));
             return gson.toJson(fb);
@@ -165,6 +165,7 @@ public class CompanyController {
         map.put("tel",addCompanyVo.getTel());
         map.put("manager",addCompanyVo.getManager());
         map.put("img",addCompanyVo.getImg());
+        map.put("parentCompanyNo",user.getCompanyNo());
         map.put("roleName",addCompanyVo.getRoleName());
         map.put("createTime",System.currentTimeMillis());
         companyService.addCompany(map);
@@ -263,8 +264,6 @@ public class CompanyController {
         return gson.toJson(fb);
     }
 
-
-
     //删除公司
     @ApiOperation(value = "删除公司",notes = "删除公司,传值说明：companyName:公司编号")
     @ApiImplicitParams({
@@ -279,6 +278,7 @@ public class CompanyController {
             fb.setMessage(i18n.getMessage(request,"companyNo"));
             return gson.toJson(fb);
         }
+
         JSONObject jsonObject= JSON.parseObject(companyNo);
         companyNo=(String) jsonObject.get("companyNo");
         Map<Object,Object> map=new HashMap<>();

src/main/java/com/example/tdl/web/HomePageController.java

@@ -107,10 +107,10 @@ public class HomePageController {
         //获取数量
         HomePageDataVo dataVo = new HomePageDataVo();
         //获取所有的线路数量
-        dataVo.setSum(circuitService.getCount(time,System.currentTimeMillis()/1000l,user.getCompanyName()));//总数量
+        dataVo.setSum(circuitService.getCount(time,System.currentTimeMillis()/1000l,user.getCompanyNo()));//总数量
         //获取近几天的线路信息
         dataVo.setOnRoute(circuitService.getOnRoute(user.getCompanyNo()));//在途数量
-       Integer delay =  circuitService.getDelayCount(System.currentTimeMillis(),time,user.getCompanyName());
+       Integer delay =  circuitService.getDelayCount(System.currentTimeMillis(),time,user.getCompanyNo());
         dataVo.setDelay(delay);//延误数量
         dataVo.setAlarmed( alarmLogServcie.getCount(time,user.getCompanyNo()));//报警数量
         dataVo.setBump(alarmLogServcie.getBumpCount(time,user.getCompanyNo())); //获取颠簸数量

src/main/java/com/example/tdl/web/LoginLogController.java

@@ -55,7 +55,7 @@ public class LoginLogController {
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        return loginLogService.getAll(user.getCompanyName());
+        return loginLogService.getAll(user.getCompanyNo());
     }
 
     //根据时间查询登录日志
@@ -90,6 +90,6 @@ public class LoginLogController {
             fb.setMessage(i18n.getMessage(request,"wrongTime"));
             return gson.toJson(fb);
         }
-        return loginLogService.getByTime(loginLogTermVo.getStartTime(),loginLogTermVo.getStopTime(),user.getCompanyName());
+        return loginLogService.getByTime(loginLogTermVo.getStartTime(),loginLogTermVo.getStopTime(),user.getCompanyNo());
     }
 }

src/main/java/com/example/tdl/web/PermissionController.java

@@ -67,7 +67,7 @@ public class PermissionController {
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         String name = "管理员";
-        List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyName());
+        List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyNo());
         //获取所有父侧边栏的名字
         List<String> parentSideLists=sideService.getSideTitleParentName();
         List<SideGroupVo> sideGroupVos=new ArrayList<>();
@@ -151,8 +151,8 @@ public class PermissionController {
         roleName= (String) json.get("roleName");
         //获取该公司的所有权限
         String name = "管理员";
-        List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyName());
-        List<String> rolePermission = roleHasPermissionService.getByRoleName(roleName,user.getCompanyName());
+        List<String> permissionLists = roleHasPermissionService.getByRoleName(name,user.getCompanyNo());
+        List<String> rolePermission = roleHasPermissionService.getByRoleName(roleName,user.getCompanyNo());
 
         //获取父侧边栏的名字
         List<String> parentSideLists=sideService.getSideTitleParentName();
@@ -249,7 +249,7 @@ public class PermissionController {
         try {
             Map<String,Object> map=new HashMap<>();
             map.put("roleName",addOrUpdatePermissionVo.getRoleName());
-            map.put("companyName",user.getCompanyName());
+            map.put("companyNo",user.getCompanyNo());
             map.put("permissionName",permissionVar);
             map.put("num",addOrUpdatePermissionVo.getPermissionGroupVos().size());
             roleHasPermissionService.addRoleHasPermission(map);

src/main/java/com/example/tdl/web/RegionController.java

@@ -29,8 +29,6 @@ public class RegionController {
 
     private Logger logger = LoggerFactory.getLogger(RegionController.class);
 
-    private WarehouseService warehouseService=new WarehouseService();
-
     CommFeedback fb=new CommFeedback();
 
     Gson gson=new Gson();
@@ -48,7 +46,7 @@ public class RegionController {
     @ApiOperation(value = "查询所有区域信息",notes = "查询所有区域信息,返回值说明：" +
             "   regionNo：区域编号，" +
             "   regionName：区域名，" +
-            "   companyName：所属公司，" +
+            "   companyNo：所属公司，" +
             "   remark：备注")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
@@ -59,11 +57,11 @@ public class RegionController {
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        return regionService.getAll(user.getCompanyName());
+        return regionService.getAll(user.getCompanyNo());
     }
 
     //添加区域信息
-    @ApiOperation(value = "添加区域信息",notes = "添加预警信息,regionNo,companyName不用传，需要传递参数：" +
+    @ApiOperation(value = "添加区域信息",notes = "添加预警信息,regionNo,companyNo不用传，需要传递参数：" +
             "   regionName：区域名，" +
             "   remark：备注")
     @ApiImplicitParams({
@@ -81,13 +79,13 @@ public class RegionController {
             fb.setMessage(i18n.getMessage(request,"regionName"));
             return gson.toJson(fb);
         }
-        if(regionService.getByRegionName(user.getCompanyName(),regionVo.getRegionName())!=null){
+        if(regionService.getByRegionName(user.getCompanyNo(),regionVo.getRegionName())!=null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repetitionRegionName"));
             return gson.toJson(fb);
         }
         regionVo.setRegionNo("RG"+System.currentTimeMillis());
-        regionVo.setCompanyName(user.getCompanyName());
+        regionVo.setCompanyNo(user.getCompanyNo());
         int a=regionService.addRegion(regionVo);
         if (a>0){
             fb.setCode(1);
@@ -100,7 +98,7 @@ public class RegionController {
     }
 
     //修改区域信息
-    @ApiOperation(value = "修改区域信息",notes = "修改区域信息,companyName不用传，需要传递参数：" +
+    @ApiOperation(value = "修改区域信息",notes = "修改区域信息,companyNo不用传，需要传递参数：" +
             "   regionNo：需要修改的区域编号，" +
             "   regionName：修改后的区域名，" +
             "   remark：修改后的备注")
@@ -124,12 +122,12 @@ public class RegionController {
             fb.setMessage(i18n.getMessage(request,"regionName"));
             return gson.toJson(fb);
         }
-        if(regionService.getByRegionName(user.getCompanyName(),updateRegionVo.getRegionName())!=null&&!regionService.getByRegionNo(user.getCompanyName(),updateRegionVo.getRegionNo()).getRegionName().equals(updateRegionVo.getRegionName())){
+        if(regionService.getByRegionName(user.getCompanyNo(),updateRegionVo.getRegionName())!=null&&!regionService.getByRegionNo(user.getCompanyNo(),updateRegionVo.getRegionNo()).getRegionName().equals(updateRegionVo.getRegionName())){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repetitionRegionName"));
             return gson.toJson(fb);
         }
-        updateRegionVo.setCompanyName(user.getCompanyName());
+        updateRegionVo.setCompanyNo(user.getCompanyNo());
         int a=regionService.updateRegion(updateRegionVo);
         if (a>0){
             fb.setCode(1);
@@ -143,7 +141,7 @@ public class RegionController {
     }
 
     //删除区域信息
-    @ApiOperation(value = "删除区域信息",notes = "删除区域信息,companyName不用传，传值说明：" +
+    @ApiOperation(value = "删除区域信息",notes = "删除区域信息,companyNo不用传，传值说明：" +
             "   regionNo：需要删除的区域编号" )
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),

src/main/java/com/example/tdl/web/RoleController.java

@@ -70,7 +70,7 @@ public class RoleController {
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        List<ResultRoleVo> list=roleService.getAll(user.getCompanyName());
+        List<ResultRoleVo> list=roleService.getAll(user.getCompanyNo());
         return list;
     }
 
@@ -107,7 +107,7 @@ public class RoleController {
             fb.setMessage(i18n.getMessage(request,"roleName"));
             return gson.toJson(fb);
         }
-        Integer a=roleService.getByRoleName(resultRoleVo.getRoleName(),user.getCompanyName());
+        Integer a=roleService.getByRoleName(resultRoleVo.getRoleName(),user.getCompanyNo());
         if (a>0){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repeatedRole"));
@@ -116,7 +116,7 @@ public class RoleController {
         try {
             resultRoleVo.setCreateTime(String.valueOf(System.currentTimeMillis()));
             resultRoleVo.setUpdateTime(String.valueOf(System.currentTimeMillis()));
-            resultRoleVo.setCompanyName(user.getCompanyName());
+            resultRoleVo.setCompanyNo(user.getCompanyNo());
             int s=roleService.addRole(resultRoleVo);
             if (s>0){
                 fb.setCode(1);
@@ -158,7 +158,7 @@ public class RoleController {
             fb.setMessage(i18n.getMessage(request,"adminInoperable"));
             return gson.toJson(fb);
         }
-        Integer a=roleService.getByRoleName(addRoleForPermissionVo.getRoleName(),user.getCompanyName());
+        Integer a=roleService.getByRoleName(addRoleForPermissionVo.getRoleName(),user.getCompanyNo());
         if (a>0){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repeatedRole"));
@@ -174,7 +174,7 @@ public class RoleController {
             map.put("createTime",System.currentTimeMillis());
             map.put("updateTime",System.currentTimeMillis());
             map.put("remark",addRoleForPermissionVo.getRemark());
-            map.put("companyName",user.getCompanyName());
+            map.put("companyNo",user.getCompanyNo());
             map.put("permissionName",permissionVar);
             map.put("num",addRoleForPermissionVo.getPermissions().size());
             roleService.addRoleAndPermission(map);
@@ -213,7 +213,7 @@ public class RoleController {
             fb.setMessage(i18n.getMessage(request,"roleName"));
             return gson.toJson(fb);
         }
-        if (roleService.getByRoleName(updateRoleVo.getRoleName(),user.getCompanyName())!=null&&!updateRoleVo.getOldRoleName().equals(updateRoleVo.getRoleName())){
+        if (roleService.getByRoleName(updateRoleVo.getRoleName(),user.getCompanyNo())!=null&&!updateRoleVo.getOldRoleName().equals(updateRoleVo.getRoleName())){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repeatedRole"));
             return gson.toJson(fb);
@@ -224,7 +224,7 @@ public class RoleController {
             return gson.toJson(fb);
         }
         try {
-            updateRoleVo.setCompanyName(user.getCompanyName());
+            updateRoleVo.setCompanyNo(user.getCompanyNo());
             int c=roleService.updateRole(updateRoleVo);
             if (c>0){
                 fb.setCode(1);
@@ -263,7 +263,7 @@ public class RoleController {
             fb.setMessage(i18n.getMessage(request,"adminInoperable"));
             return gson.toJson(fb);
         }
-        int f=userService.getByRoleName(roleName,user.getCompanyName());
+        int f=userService.getByRoleName(roleName,user.getCompanyNo());
         if (f>0){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"usedRole"));
@@ -272,7 +272,7 @@ public class RoleController {
         try {
             Map<String,Object> map=new HashMap<>();
             map.put("roleName",roleName);
-            map.put("companyName",user.getCompanyName());
+            map.put("companyNo",user.getCompanyNo());
             roleService.deleteRole(map);
             Map<String,Object> ms=new HashMap<>();
             ms.put("msg",map.get("msg"));
@@ -313,7 +313,7 @@ public class RoleController {
             fb.setMessage(i18n.getMessage(request,"roleName"));
             return gson.toJson(fb);
         }
-        if (!user.getCompanyName().equals("上海辉度")){
+        if (!user.getCompanyNo().equals("TM201803298320")){
             fb.setCode(0);
             fb.setMessage("只有辉度能修改其他公司的权限");
             return gson.toJson(fb);
@@ -362,7 +362,7 @@ 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("上海辉度")){
+        if (!user.getCompanyNo().equals("TM201803298320")){
             fb.setCode(0);
             fb.setMessage("只有辉度能添加其他公司的角色");
             return gson.toJson(fb);

src/main/java/com/example/tdl/web/RoleHasPermissionController.java

@@ -52,7 +52,7 @@ public class RoleHasPermissionController {
             fb.setMessage("您没有登录，请先登录");
             return gson.toJson(fb);
         }else{
-            return roleHasPermissionService.getByRoleName(user.getRoleName(),user.getCompanyName());
+            return roleHasPermissionService.getByRoleName(user.getRoleName(),user.getCompanyNo());
         }
     }
 

src/main/java/com/example/tdl/web/SideController.java

@@ -57,7 +57,7 @@ public class SideController {
 //        //获取用户角色编号
 //        String roleName = roleService.getRoleNameByUserName(user.getUserName());
         //获取该用户所有的权限及对应的界面
-        List<ResultSideVo> sliderTitleVoList=sideService.selectAllTitle(user.getRoleName(),user.getCompanyName());
+        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());
@@ -82,7 +82,7 @@ public class SideController {
             return gson.toJson(fb);
         }
         //获取该用户所有的权限及对应的界面
-        List<ResultSideVo> sliderTitleVoList=sideService.selectBySideTitle(user.getRoleName(),user.getCompanyName(),name);
+        List<ResultSideVo> sliderTitleVoList=sideService.selectBySideTitle(user.getRoleName(),user.getCompanyNo(),name);
         Set<String> l=new HashSet<>();
         for (int i=0;i<sliderTitleVoList.size();i++){
             l.add(sliderTitleVoList.get(i).getPermissionName());

src/main/java/com/example/tdl/web/TransferModelController.java

@@ -56,7 +56,7 @@ public class TransferModelController {
         String token = request.getHeader("Account_token");
         String datum = tokenRedisService.get("TOKEN_" +token);
         UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        return transferModelService.getAll(user.getCompanyName());
+        return transferModelService.getAll(user.getCompanyNo());
     }
 
     @ApiOperation(value = "添加模板",notes = "添加模板的同时添加通道配置信息，传递的参数:" +
@@ -158,7 +158,7 @@ public class TransferModelController {
             map.put("transferNo",transferNos);
             map.put("transferModelName",addTransferModelVo.getTransferModelName());
             map.put("counts",addTransferModelVo.getInfo().size());
-            map.put("companyName",user.getCompanyName());
+            map.put("companyNo",user.getCompanyNo());
             map.put("country",country);
             map.put("city",city);
             map.put("addressDetail",addressDetail);

src/main/java/com/example/tdl/web/UserController.java

@@ -269,13 +269,13 @@ public class UserController {
             fb.setMessage(i18n.getMessage(request,"phone"));
             return gson.toJson(fb);
         }
-        if( !userVo.getPhone().matches("^1[34578]\\d{9}$")){
+        if(!userVo.getPhone().matches("^1[34578]\\d{9}$")){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"phoneRule"));
             return gson.toJson(fb);
         }
         ResultUserVo userInfo=userService.getByUserNumber(userVo.getUserNumber());
-        if (userInfo!=null&& !userInfo.getPhone().equals(userVo.getPhone()) && userService.getByPhone(userVo.getPhone(),userInfo.getCompanyName()) !=null){
+        if (userInfo!=null&& !userInfo.getPhone().equals(userVo.getPhone()) && userService.getByPhone(userVo.getPhone(),userInfo.getCompanyNo()) !=null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repeatedRule"));
             return gson.toJson(fb);
@@ -290,7 +290,7 @@ public class UserController {
             fb.setMessage(i18n.getMessage(request,"emailRule"));
             return gson.toJson(fb);
         }
-        if (userInfo!=null && !userInfo.getEmail().equals(userVo.getEmail()) && userService.getByEmail(userVo.getEmail(),userInfo.getCompanyName()) !=null){
+        if (userInfo!=null && !userInfo.getEmail().equals(userVo.getEmail()) && userService.getByEmail(userVo.getEmail(),userInfo.getCompanyNo()) !=null){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"repeatedEmail"));
             return gson.toJson(fb);
@@ -300,7 +300,7 @@ public class UserController {
             fb.setMessage(i18n.getMessage(request,"roleName"));
             return gson.toJson(fb);
         }
-        if (roleService.getByRoleName(userVo.getRoleName(),userInfo.getCompanyName())==0){
+        if (roleService.getByRoleName(userVo.getRoleName(),userInfo.getCompanyNo())==0){
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"existRoleName"));
             return gson.toJson(fb);

src/main/java/com/example/tdl/web/WarehouseController.java

@@ -587,7 +587,7 @@ public class WarehouseController {
         map.put("office",addWarehouseVo.getOffice());
         map.put("timeZone",addWarehouseVo.getTimeZone());
         map.put("warehouseInfo",addWarehouseVo.getWarehouseInfo() == null ? "" :addWarehouseVo.getWarehouseInfo());
-        map.put("companyName",user.getCompanyName());
+        map.put("companyNo",user.getCompanyNo());
         map.put("createTime",System.currentTimeMillis());
         map.put("updateTime",System.currentTimeMillis());
         map.put("img",addWarehouseVo.getImg());
@@ -771,7 +771,7 @@ public class WarehouseController {
         map.put("office",updateWarehouseVo.getOffice());
         map.put("timeZone",updateWarehouseVo.getTimeZone());
         map.put("warehouseInfo",updateWarehouseVo.getWarehouseInfo());
-        map.put("companyName",user.getCompanyName());
+        map.put("companyNo",user.getCompanyNo());
         map.put("updateTime",System.currentTimeMillis());
         map.put("remark",updateWarehouseVo.getRemark());
         warehouseService.updateWarehouse(map);
@@ -813,7 +813,7 @@ public class WarehouseController {
         }
         Map<Object,Object> map=new HashMap<>();
         map.put("warehouseNo",warehouseNo);
-        map.put("companyName",user.getCompanyName());
+        map.put("companyNo",user.getCompanyNo());
         map.put("endTime",System.currentTimeMillis());
         warehouseService.delWarehouse(map);
         Map<Object,Object> msg=new HashMap<>();

src/main/resources/application.properties

-spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url=jdbc:mysql://47.97.184.225:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url=jdbc:mysql://192.168.1.16:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.1.53:3306/tdlcloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=37774020
+spring.datasource.password=root
+#spring.datasource.password=37774020
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
@@ -61,18 +64,17 @@ spring.influxdb.write-timeout=10
 spring.influxdb.gzip=true
 
 
-#tdl.core.add =http://192.168.1.16:8079/witium/addMount
-#tdl.core.delete =http://192.168.1.16:8079/witium/delMount
-#
-#mqtt.userName = ugen
-#mqtt.password = ugen
+#tdl.core.add =http://logisticscore-java:8079/witium/addMount
+#tdl.core.delete =http://logisticscore-java:8079/witium/delMount
 
+tdl.core.add =http://192.168.1.16:8079/witium/addMount
+tdl.core.delete =http://192.168.1.16:8079/witium/delMount
 
-tdl.core.add =http://logisticscore-java:8079/witium/addMount
-tdl.core.delete =http://logisticscore-java:8079/witium/delMount
+mqtt.userName = ugen
+mqtt.password = ugen
 
-mqtt.userName = wtlogistics
-mqtt.password = wtlogistics
+#mqtt.userName = wtlogistics
+#mqtt.password = wtlogistics
 
 
 

src/main/resources/mapper/CompanyMapper.xml

@@ -7,7 +7,7 @@
         from company
         WHERE state=1
         <if test="companyNo!='TM201803298320'">
-            and  companyNo=#{companyNo,jdbcType=VARCHAR}
+            and pid=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
         </if>
     </select>
 
@@ -24,6 +24,7 @@
                 #{tel,mode=IN,jdbcType=VARCHAR},
                 #{manager,mode=IN,jdbcType=VARCHAR},
                 #{img,mode=IN,jdbcType=VARCHAR},
+                #{parentCompanyNo,mode=IN,jdbcType=VARCHAR},
                 #{roleName,mode=IN,jdbcType=VARCHAR},
                 #{createTime,mode=IN,jdbcType=VARCHAR},
                 #{msg,mode=OUT,jdbcType=VARCHAR}

src/main/resources/mapper/LoginLogMapper.xml

@@ -4,7 +4,7 @@
     <select id="getAll" parameterType="java.lang.String" resultType="com.example.tdl.domain.vo.ResultLoginLogVo">
         SELECT userName,createTime,inet_ntoa(ipAddress) ipAddress
         from login_log
-        where userName in (select userName from user where company_id = (select id from company where companyName=#{companyName,jdbcType=VARCHAR}))
+        where userName in (select userName from user where company_id = (select id from company where companyNo=#{companyNo,jdbcType=VARCHAR}))
         order by createTime
     </select>
 
@@ -20,7 +20,7 @@
     <select id="getByTime" resultType="com.example.tdl.domain.vo.ResultLoginLogVo" >
         SELECT userName,createTime,inet_ntoa(ipAddress) ipAddress
         from login_log
-        where userName in (select userName from user where company_id = (select id from company where companyName=#{companyName,jdbcType=VARCHAR}))
+        where userName in (select userName from user where company_id = (select id from company where companyNo=#{companyNo,jdbcType=VARCHAR}))
         and createTime BETWEEN #{startTime,jdbcType=BIGINT}
         AND #{stopTime,jdbcType=BIGINT} ORDER BY createTime DESC
     </select>

src/main/resources/mapper/RegionMapper.xml

@@ -3,25 +3,25 @@
 <mapper namespace="com.example.tdl.mapper.RegionMapper">
     <!--查询所有区域信息-->
     <select id="getAll" resultType="com.example.tdl.domain.vo.ResultRegionVo">
-        SELECT regionNo,regionName,companyName,remark
+        SELECT regionNo,regionName,companyNo,companyName,remark
         from region r INNER JOIN company c ON r.company_id=c.id
-        AND companyName=#{companyName,jdbcType=VARCHAR}
+        AND companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>
 
     <!--通过区域名查询信息-->
     <select id="getByRegionName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultRegionVo">
-        SELECT regionNo,regionName,companyName,remark
+        SELECT regionNo,regionName,companyNo,companyName,remark
         from region r INNER JOIN company c ON r.company_id=c.id
         AND regionName=#{regionName,jdbcType=VARCHAR}
-        AND companyName=#{companyName,jdbcType=VARCHAR}
+        AND companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>
 
     <!--通过区域编号查询信息-->
     <select id="getByRegionNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultRegionVo">
-        SELECT regionNo,regionName,companyName,remark
+        SELECT regionNo,regionName,companyNo,companyName,remark
         from region r INNER JOIN company c ON r.company_id=c.id
         AND regionNo=#{regionNo,jdbcType=VARCHAR}
-        AND companyName=#{companyName,jdbcType=VARCHAR}
+        AND companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>
 
     <!--添加区域-->
@@ -30,7 +30,7 @@
             null,
             #{regionNo,jdbcType=VARCHAR},
             #{regionName,jdbcType=VARCHAR},
-            (SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR}),
+            (SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR}),
             #{remark,jdbcType=VARCHAR}
         );
     </insert>

src/main/resources/mapper/RoleHasPermissionMapper.xml

@@ -7,7 +7,7 @@
         WHERE rp.role_id=r.id
         AND rp.permission_id=p.id
         AND r.roleName=#{roleName,jdbcType=VARCHAR}
-        AND company_id=(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})
+        AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
     </select>
 
     <insert id="addRoleHasPermission" parameterType="java.util.Map" statementType="CALLABLE">
@@ -15,7 +15,7 @@
         {
            call pro_addRoleHasPermission(
                 #{roleName,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{permissionName,mode=IN,jdbcType=VARCHAR},
                 #{num,mode=IN,jdbcType=INTEGER},
                 #{msg,mode=OUT,jdbcType=VARCHAR}

src/main/resources/mapper/RoleMapper.xml

@@ -2,22 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.RoleMapper">
     <!--查询所有角色名-->
-    <select id="getRoleNameByCompanyName" resultType="com.example.tdl.domain.vo.RoleNameVo">
+    <select id="getRoleNameByCompanyName" resultType="com.example.tdl.domain.vo.RoleNameVo" parameterType="String">
         SELECT roleName from role r INNER JOIN company c ON r.company_id=c.id
         WHERE companyName=#{companyName,jdbcType=VARCHAR}
+        AND c.state=1
     </select>
 
     <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 companyName=#{companyName,jdbcType=VARCHAR}
+        WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
         AND roleName=#{roleName,jdbcType=VARCHAR}
     </select>
 
     <!--查询所有所有的角色信息-->
     <select id="getAll" resultType="com.example.tdl.domain.vo.ResultRoleVo">
-        SELECT roleName,createTime,updateTime,remark,companyName
+        SELECT roleName,createTime,updateTime,remark,companyNo,companyName
         from role r INNER JOIN company c ON r.company_id=c.id
-        WHERE companyName=#{companyName,jdbcType=VARCHAR}
+        WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>
 
     <!--添加角色-->
@@ -28,7 +29,7 @@
             #{createTime,jdbcType=VARCHAR},
             #{updateTime,jdbcType=VARCHAR},
             #{remark,jdbcType=VARCHAR},
-            (SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})
+            (SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
         );
     </insert>
 
@@ -41,7 +42,7 @@
                 #{createTime,mode=IN,jdbcType=VARCHAR},
                 #{updateTime,mode=IN,jdbcType=VARCHAR},
                 #{remark,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{permissionName,mode=IN,jdbcType=VARCHAR},
                 #{num,mode=IN,jdbcType=INTEGER},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
@@ -71,7 +72,7 @@
         updateTime=#{updateTime,jdbcType=VARCHAR},
         remark=#{remark,jdbcType=VARCHAR}
         WHERE roleName=#{oldRoleName,jdbcType=VARCHAR}
-        AND company_id=(SELECT id from company where companyName=#{companyName,jdbcType=VARCHAR})
+        AND company_id=(SELECT id from company where companyNo=#{companyNo,jdbcType=VARCHAR})
     </update>
 
     <!-- 删除角色 -->
@@ -80,7 +81,7 @@
         {
            call pro_delRole(
                 #{roleName,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
            )
         }

src/main/resources/mapper/SideMapper.xml

@@ -10,7 +10,7 @@
         where rp.role_id=r.id
         and rp.permission_id=p.id
         AND r.id =(select id from role where roleName =#{roleName,jdbcType=VARCHAR}
-            AND company_id=(SELECT id from company where companyName=#{companyName})))
+            AND company_id=(SELECT id from company where companyNo=#{companyNo})))
         ORDER BY s.id;
     </select>
 
@@ -24,7 +24,7 @@
         where rp.role_id=r.id
         and rp.permission_id=p.id
         AND r.id =(select id from role where roleName =#{roleName,jdbcType=VARCHAR}
-            AND company_id=(SELECT id from company where companyName=#{companyName})))
+            AND company_id=(SELECT id from company where companyNo=#{companyNo})))
         AND s.sideTitle=#{sideTitle,jdbcType=VARCHAR}
         ORDER BY s.id;
     </select>

src/main/resources/mapper/TDLLogMapper.xml

@@ -31,7 +31,7 @@
         where a.id=tgl.alarm_id
         and a.company_id =c.id
         AND a.alarmType=#{alarmType,jdbcType=VARCHAR}
-        and c.companyName=#{companyName,jdbcType=VARCHAR}
+        and c.companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>
 
     <select id="getByTdl" parameterType="String" resultType="com.example.tdl.domain.vo.ResultAlarmVo">

src/main/resources/mapper/TransferModelMapper.xml

@@ -4,7 +4,7 @@
     <select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultTransferModelVo">
         SELECT transferNo,transferModelName,counts,companyName
         from transfer_model t INNER JOIN company c ON t.company_id=c.id
-        WHERE companyName=#{companyName,jdbcType=VARCHAR}
+        WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
    </select>
 
     <insert id="addTransferModel" statementType="CALLABLE" parameterType="java.util.Map">
@@ -14,7 +14,7 @@
                 #{transferNo,mode=IN,jdbcType=VARCHAR},
                 #{transferModelName,mode=IN,jdbcType=VARCHAR},
                 #{counts,mode=IN,jdbcType=INTEGER},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{country,mode=IN,jdbcType=VARCHAR},
                 #{city,mode=IN,jdbcType=VARCHAR},
                 #{addressDetail,mode=IN,jdbcType=VARCHAR},

src/main/resources/mapper/UserMapper.xml

@@ -20,7 +20,7 @@
 
     <!--获取该公司所有用户信息-->
     <select id="getAll" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,password,nickName,phone,email,roleName,c.companyName
+        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
         <if test="companyNo!='TM201803298320'">
@@ -30,7 +30,7 @@
     </select>
 
     <select id="getAllUser" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,password,nickName,phone,email,roleName,c.companyName
+        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 u.state=1
@@ -38,7 +38,7 @@
 
     <!--根据条件查询-->
     <select id="getByTerm" resultType="com.example.tdl.domain.vo.ResultUserVo" parameterType="com.example.tdl.domain.vo.UserTermVo">
-        select userNumber, userName,password,nickName,phone,email,roleName,c.companyName
+        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
         <if test="userName!=null">
@@ -54,37 +54,38 @@
             AND phone like CONCAT(CONCAT('%',#{phone,jdbcType=VARCHAR}), '%')
         </if>
         <if test="companyName!=null">
-        AND c.companyName=#{companyName,jdbcType=VARCHAR}
+            AND c.companyName=#{companyName,jdbcType=VARCHAR}
         </if>
         <if test="companyNo!='TM201803298320'">
             and  c.companyNo=#{companyNo,jdbcType=VARCHAR}
         </if>
         AND u.state=1
+        AND c.state=1
     </select>
 
     <!--通过手机号查询用户信息-->
     <select id="getByPhone" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,password,nickName,phone,email,roleName,c.companyName
+        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.companyName=#{companyName,jdbcType=VARCHAR}
+        AND c.companyNo=#{companyNo,jdbcType=VARCHAR}
         AND phone=#{phone,jdbcType=VARCHAR}
         AND u.state=1
     </select>
 
     <!--通过邮箱查询用户信息-->
     <select id="getByEmail" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,password,nickName,phone,email,roleName,c.companyName
+        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.companyName=#{companyName,jdbcType=VARCHAR}
+        AND c.companyNo=#{companyNo,jdbcType=VARCHAR}
         AND email=#{email,jdbcType=VARCHAR}
         AND u.state=1
     </select>
 
     <!--通过用户编号查询用户信息-->
     <select id="getByUserNumber" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,password,nickName,phone,email,roleName,c.companyName
+        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 userNumber=#{userNumber,jdbcType=VARCHAR}
@@ -101,10 +102,11 @@
         #{nickName,jdbcType=VARCHAR},
         #{phone,jdbcType=VARCHAR},
         #{email,jdbcType=VARCHAR},
-        (SELECT id from role WHERE roleName=#{roleName,jdbcType=VARCHAR} and company_id=(SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR})),
+        (SELECT id from role WHERE roleName=#{roleName,jdbcType=VARCHAR} and company_id=(
+            SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR} AND state=1)),
         #{createTime,jdbcType=VARCHAR},
         #{updateTime,jdbcType=VARCHAR},
-        (SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR}),
+        (SELECT id from company WHERE companyNo=#{companyNo,jdbcType=VARCHAR}),
         1
         )
     </insert>
@@ -116,7 +118,8 @@
         nickName=#{nickName,jdbcType=VARCHAR},
         phone=#{phone,jdbcType=VARCHAR},
         email=#{email,jdbcType=VARCHAR},
-        role_id=(SELECT id from role WHERE roleName=#{roleName,jdbcType=VARCHAR} and company_id=(SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR})),
+        role_id=(SELECT id from role WHERE roleName=#{roleName,jdbcType=VARCHAR} and company_id=(
+            SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR} AND state=1)),
         updateTime=#{updateTime,jdbcType=VARCHAR}
         WHERE userNumber=#{userNumber,jdbcType=VARCHAR}
     </update>
@@ -140,7 +143,8 @@
 
     <select id="getByRoleName" parameterType="String" resultType="java.lang.Integer">
         select COUNT(id) from `user`
-        WHERE role_id=(select id from role where roleName=#{roleName,jdbcType=VARCHAR});
+        WHERE role_id=(select id from role where roleName=#{roleName,jdbcType=VARCHAR}
+            AND company_id=(select id from company where companyNo =#{companyNo,jdbcType=VARCHAR}));
     </select>
 
     <select id="getAllByCompanyNo" resultType="com.example.tdl.domain.vo.AlarmContactsVo" parameterType="String">

src/main/resources/mapper/WarehouseMapper.xml

@@ -4,7 +4,7 @@
     <!--查询所有仓库信息-->
     <select id="getAll" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
         select w.warehouseNo,w.img,warehouseName,ct.country,ct.city,CONCAT_WS("-",ct.country,ct.city) regions ,w.addressDetail,r.regionName,lng,lat,property,
-        type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyName,w.remark
+        type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyNo,companyName,w.remark
         from warehouse w,region r,city ct ,company c
         where c.id = w.company_id
         and r.id = w.region_id
@@ -14,8 +14,8 @@
     </select>
 
     <select  id="getAllWarehouse" resultType="com.example.tdl.domain.vo.ResultWarehouseVo">
-         select w.warehouseNo,w.img,warehouseName,ct.country,ct.city,CONCAT_WS("-",ct.country,ct.city) regions ,w.addressDetail,r.regionName,lng,lat,property,
-        type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyName,w.remark
+        select w.warehouseNo,w.img,warehouseName,ct.country,ct.city,CONCAT_WS("-",ct.country,ct.city) regions ,w.addressDetail,r.regionName,lng,lat,property,
+        type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyNo,companyName,w.remark
         from warehouse w,region r,city ct ,company c
         where c.id = w.company_id
         and r.id = w.region_id
@@ -27,7 +27,7 @@
     <!-- 根据条件查询仓库信息-->
     <select id="getAllByTerm" resultType="com.example.tdl.domain.vo.ResultWarehouseVo" parameterType="com.example.tdl.domain.vo.WarehouseTermVo">
         select warehouseNo,w.img,warehouseName,ct.country,ct.city,CONCAT_WS("-",ct.country,ct.city) regions ,w.addressDetail,r.regionName,lng,lat,property,
-        type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyName,w.remark
+        type,hardwareLevel,areaIndoor,areaRack,areaOutdoor,areaPlanIndoor,office,timeZone,warehouseInfo,companyNo,companyName,w.remark
         from warehouse w,region r,city ct ,company c
         where c.id = w.company_id
         and r.id = w.region_id
@@ -91,7 +91,7 @@
                 #{office,mode=IN,jdbcType=VARCHAR},
                 #{timeZone,mode=IN,jdbcType=VARCHAR},
                 #{warehouseInfo,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{createTime,mode=IN,jdbcType=BIGINT},
                 #{updateTime,mode=IN,jdbcType=BIGINT},
                 #{img,mode=IN,jdbcType=VARCHAR},
@@ -124,7 +124,7 @@
                 #{office,mode=IN,jdbcType=VARCHAR},
                 #{timeZone,mode=IN,jdbcType=VARCHAR},
                 #{warehouseInfo,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{updateTime,mode=IN,jdbcType=BIGINT},
                 #{remark,mode=IN,jdbcType=VARCHAR},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
@@ -138,7 +138,7 @@
         {
            call pro_deleteWarehouse(
                 #{warehouseNo,mode=IN,jdbcType=VARCHAR},
-                #{companyName,mode=IN,jdbcType=VARCHAR},
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
                 #{endTime,mode=IN,jdbcType=BIGINT},
                 #{msg,mode=OUT,jdbcType=VARCHAR}
            )
@@ -211,7 +211,6 @@
         and w.company_id= c.id
         and a.company_id =c.id
         AND a.alarmType=#{alarmType,jdbcType=VARCHAR}
-        AND a.alarmScene=#{alarmScene,jdbcType=VARCHAR}
         and c.companyNo=#{companyNo,jdbcType=VARCHAR}
     </select>