3.30添加公司接口的增删改查，添加用户和线路模板的所属公司

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

+package com.example.tdl.domain.vo;
+
+public class AddCompanyVo {
+    private String companyNo;
+
+    private String companyName;
+
+    private String country;
+
+    private String city;
+
+    private String addressDetail;
+
+    private String tel;
+
+    private String manager;
+
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getManager() {
+        return manager;
+    }
+
+    public void setManager(String manager) {
+        this.manager = manager;
+    }
+}

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

@@ -15,10 +15,20 @@ public class AddUserVo {
 
     private String roleName;
 
+    private String companyName;
+
     private Long createTime;
 
     private Long updateTime;
 
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getUserNumber() {
         return userNumber;
     }

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

+package com.example.tdl.domain.vo;
+
+public class ResultCompanyVo {
+    private String companyNo;
+
+    private String companyName;
+
+    private String country;
+
+    private String city;
+
+    private String addressDetail;
+
+    private String tel;
+
+    private String manager;
+
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getManager() {
+        return manager;
+    }
+
+    public void setManager(String manager) {
+        this.manager = manager;
+    }
+}

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

@@ -7,6 +7,16 @@ public class ResultTransferModelVo {
 
     private Integer counts;
 
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getTransferNo() {
         return transferNo;
     }

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

@@ -13,6 +13,16 @@ public class ResultUserVo {
 
     private String roleName;
 
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getUserNumber() {
         return userNumber;
     }

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

+package com.example.tdl.domain.vo;
+
+public class TrackVo {
+    private String time;
+
+    private String lng;
+
+    private String lat;
+
+    private String T;
+
+    private String h;
+
+    private String a0;
+
+    private String b;
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getT() {
+        return T;
+    }
+
+    public void setT(String t) {
+        T = t;
+    }
+
+    public String getH() {
+        return h;
+    }
+
+    public void setH(String h) {
+        this.h = h;
+    }
+
+    public String getA0() {
+        return a0;
+    }
+
+    public void setA0(String a0) {
+        this.a0 = a0;
+    }
+
+    public String getB() {
+        return b;
+    }
+
+    public void setB(String b) {
+        this.b = b;
+    }
+}

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

+package com.example.tdl.domain.vo;
+
+public class UpdateCompanyVo {
+    private String companyNo;
+
+    private String oldCompanyName;
+
+    private String companyName;
+
+    private String country;
+
+    private String city;
+
+    private String addressDetail;
+
+    private String tel;
+
+    private String manager;
+
+    public String getOldCompanyName() {
+        return oldCompanyName;
+    }
+
+    public void setOldCompanyName(String oldCompanyName) {
+        this.oldCompanyName = oldCompanyName;
+    }
+
+    public String getCompanyNo() {
+        return companyNo;
+    }
+
+    public void setCompanyNo(String companyNo) {
+        this.companyNo = companyNo;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel;
+    }
+
+    public String getManager() {
+        return manager;
+    }
+
+    public void setManager(String manager) {
+        this.manager = manager;
+    }
+}

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

@@ -13,6 +13,16 @@ public class UserRedisVo {
 
     private String roleName;
 
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getUserName() {
         return UserName;
     }
@@ -61,12 +71,13 @@ public class UserRedisVo {
         this.roleName = roleName;
     }
 
-    public UserRedisVo(String userName, String userNumber, String nickName, String email, String phone, String roleName) {
+    public UserRedisVo(String userName, String userNumber, String nickName, String email, String phone, String roleName,String companyName) {
         UserName = userName;
         UserNumber = userNumber;
         this.nickName = nickName;
         this.email = email;
         this.phone = phone;
         this.roleName = roleName;
+        this.companyName=companyName;
     }
 }

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

@@ -17,6 +17,16 @@ public class UserVo {
 
     private String roleName;
 
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     public String getUserNumber() {
         return userNumber;
     }

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.ResultCompanyVo;
+import com.example.tdl.domain.vo.UpdateCompanyVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface CompanyMapper {
+    List<ResultCompanyVo> getAll();
+
+    int addCompany(AddCompanyVo addCompanyVo);
+
+    int updateCompany(UpdateCompanyVo updateCompanyVo);
+
+    int delCompany(Map<Object,Object> map);
+
+    ResultCompanyVo getByCompanyName(String companyName);
+
+    ResultCompanyVo getByCompanyNo(String companyNo);
+}

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

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

src/main/java/com/example/tdl/mqtt/MqttListener.java

@@ -36,7 +36,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 = "GW/+/+/CheckIn";
 
     private MqttTemlateAsync mqttAsyncClient;
 

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

+package com.example.tdl.service;
+
+
+import com.example.tdl.domain.vo.AddCompanyVo;
+import com.example.tdl.domain.vo.ResultCompanyVo;
+import com.example.tdl.domain.vo.UpdateCompanyVo;
+import com.example.tdl.mapper.CompanyMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class CompanyService {
+    @Autowired
+    private CompanyMapper companyMapper;
+
+    public List<ResultCompanyVo> getAll(){
+        return companyMapper.getAll();
+    }
+
+    public int addCompany(AddCompanyVo addCompanyVo){
+        return companyMapper.addCompany(addCompanyVo);
+    }
+
+    public int updateCompany(UpdateCompanyVo updateCompanyVo){
+        return companyMapper.updateCompany(updateCompanyVo);
+    }
+
+    public int delCompany(Map<Object,Object> map){
+        return companyMapper.delCompany(map);
+    }
+
+    public ResultCompanyVo getByCompanyName(String companyName){
+        return companyMapper.getByCompanyName(companyName);
+    }
+
+    public ResultCompanyVo getByCompanyNo(String companyNo){
+        return companyMapper.getByCompanyNo(companyNo);
+    }
+
+}

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

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

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

@@ -79,7 +79,7 @@ public class UserService {
             return null;
         }
         String token = DigestUtils.md5Hex(System.currentTimeMillis() + userVo.getUserName());
-        UserRedisVo redisVo = new UserRedisVo(userVo.getUserName(),userVo.getUserNumber(),userVo.getNickName(),userVo.getEmail(),userVo.getPhone(),userVo.getRoleName());
+        UserRedisVo redisVo = new UserRedisVo(userVo.getUserName(),userVo.getUserNumber(),userVo.getNickName(),userVo.getEmail(),userVo.getPhone(),userVo.getRoleName(),userVo.getCompanyName());
         //将用户数据保存到redis中
         redisService.set("TOKEN_" + token, gson.toJson(redisVo), 60 * 30);
         return  token;

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

@@ -3,10 +3,7 @@ package com.example.tdl.web;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
-import com.example.tdl.domain.vo.CircuitAlarmVo;
-import com.example.tdl.domain.vo.LocationDataVo;
-import com.example.tdl.domain.vo.LocationMessageVo;
-import com.example.tdl.domain.vo.ResultGatewayVo;
+import com.example.tdl.domain.vo.*;
 import com.example.tdl.service.CircuitService;
 import com.example.tdl.service.TDLDeviceService;
 import com.example.tdl.service.redis.RealRedisService;
@@ -42,12 +39,103 @@ public class AlarmDataController {
 
     private final static String database ="original";
 
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/getTrack",method = RequestMethod.GET)
+    public Object getTrack(){
+        String transportationNo="CHN20180323G1111";
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=(String)jsonObject.get("transportationNo");
+        ResultGatewayVo resultGatewayVo=circuitService.getByNo(transportationNo);
+        if (resultGatewayVo==null){
+            fb.setCode(0);
+            fb.setMessage("该线路没有绑定网关");
+            return gson.toJson(fb);
+        }
+        String device = resultGatewayVo.getType() +"_" +resultGatewayVo.getSN();
+        List<String> list=tdlDeviceService.getByGatewaySN(resultGatewayVo.getSN(),resultGatewayVo.getType());
+        String tdl="";
+        if (list.size()==1){
+            tdl="'tdl-"+list.get(0)+"'";
+        }else if(list.size()==0){
+            fb.setCode(0);
+            fb.setMessage("该网关下没有tdl设备");
+            return gson.toJson(fb);
+        }else{
+            for (int a=0;a<list.size();a++){
+                tdl=tdl+"'tdl-"+list.get(a)+"'";
+                if (a<list.size()-1){
+                    tdl=tdl+"or \"tdl\"=";
+                }
+            }
+        }
+        List<TrackVo> trackVos=new ArrayList<>();
+        String sqls = "SELECT \"tdl\",\"T\", \"b\", \"h\", \"p\" FROM \"tdl_policy\".\""+device+"\" where \"tdl\"= "+tdl+" order by time";
+        QueryResult queryResult  = influxDBTemplate.query(new Query(sqls,database));
+        if (queryResult.getResults().get(0).getSeries()!=null){
+            trackVos=getTrack(queryResult);
+        }
+        List<LocationDataVo>  locationDataVos = new ArrayList<>();
+        String sql ="SELECT \"time\",\"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" order by time";
+        QueryResult queryResults  = influxDBTemplate.query(new Query(sql,database));
+        if (queryResults.getResults().get(0).getSeries()!=null){
+            locationDataVos=getAllAddress(queryResults);
+        }
+        List<TrackVo> trackVos1=new ArrayList<>();
+        for (int a=0;a<locationDataVos.size();a++){
+            TrackVo trackVo=new TrackVo();
+            trackVo.setTime(locationDataVos.get(a).getTime());
+            trackVo.setLng(locationDataVos.get(a).getLng().toString());
+            trackVo.setLat(locationDataVos.get(a).getLat().toString());
+//            for (int b=0;b<trackVos.size();b++){
+//                if ()
+//            }
+        }
+
+
+
+//        SELECT "tdl","T", "b", "h", "p" FROM "tdl_policy"."WTD93LG_20180314" WHERE ("tdl" = 'tdl-0F0D0C0B0A') or "tdl" = 'tdl-0A0B0C0D0F' AND $timeFilter
+
+//            String sqls = "SELECT \"time\",\"b\",\"t\",\"h\",\"p\" FROM \"tdl_policy\".\""+device+"\" where \"tdl\"= "+tdl+" and \"time\"<='"+locationDataVos.get(a).getTime()+"' ORDER BY time desc limit 1;";
+
+
+
+
+
+        return gson.toJson(trackVos);
+//        List<LocationDataVo>  locationDataVos1 = new ArrayList<>();
+//        for(int a=0;a<locationDataVos.size();a++){
+//            String sqls="SELECT \"time\",\"T\",\"h\",\"b\",\"p\" FROM \"tdl_policy\".\""+device+"\" where time <='"+locationDataVos.get(a).getTime()+"' ORDER BY time desc limit 1;";
+//            QueryResult queryResults1  = influxDBTemplate.query(new Query(sqls,database));
+//            if (queryResults.getResults().get(0).getSeries()!=null){
+//                locationDataVos1=getAllAddress(queryResults1);
+//            }
+//        }
+
+//        String sql1="SELECT \"time\",\"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" order by time";
+//        QueryResult queryResult1  = influxDBTemplate.query(new Query(sql1,database));
+//        List<LocationDataVo>  locationDataVos1 = new ArrayList<>();
+//        if (queryResult1.getResults().get(0).getSeries()!=null){
+//            locationDataVos1=getAllAddress(queryResult1);
+//        }
+//        for (int a=0;a<locationDataVos1.size();a++){
+//            for (int b=0;b<locationDataVos.size();b++){
+//                if (locationDataVos1.get(a).getLng().equals(locationDataVos.get(b).getLng())&&locationDataVos1.get(a).getLat().equals(locationDataVos.get(b).getLat())){
+//                    locationDataVos1.get(a).setError(1);
+//                }
+//            }
+//        }
+    }
+
+
+
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
     @RequestMapping(value="/getAlarmCircuit",method = RequestMethod.POST)
     public Object getAlarmCircuit(@RequestBody String transportationNo){
-//        String transportationNo="CHN20180227G0505";
+//        String transportationNo="CHN20180323G1111";
         JSONObject jsonObject= JSON.parseObject(transportationNo);
         transportationNo=(String)jsonObject.get("transportationNo");
         ResultGatewayVo resultGatewayVo=circuitService.getByNo(transportationNo);
@@ -116,6 +204,21 @@ public class AlarmDataController {
 
     }
 
+    public List<TrackVo> getTrack(QueryResult queryResult){
+        List<List<Object>> lists=getValues(queryResult);
+        List<TrackVo> trackVos=new ArrayList<>();
+        for (List<Object> value:lists){
+            TrackVo trackVo=new TrackVo();
+            trackVo.setTime(dateToStamp(value.get(0).toString()));
+            trackVo.setB(value.get(1).toString());
+            trackVo.setT(value.get(2).toString());
+            trackVo.setH(value.get(3).toString());
+            trackVo.setA0(value.get(4).toString());
+            trackVos.add(trackVo);
+        }
+        return trackVos;
+    }
+
     public List<LocationDataVo> getAddress(QueryResult queryResult){
         List<List<Object>> lists=getValue(queryResult);
         List<LocationDataVo> locationDataVos=new ArrayList<>();
@@ -137,7 +240,7 @@ public class AlarmDataController {
             locationDataVo.setTime(dateToStamp(value.get(0).toString()));
             locationDataVo.setLng((Double)value.get(1));
             locationDataVo.setLat((Double)value.get(2));
-            locationDataVo.setError(0);
+//            locationDataVo.setError(0);
             locationDataVos.add(locationDataVo);
         }
         return locationDataVos;

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;
+import com.example.tdl.domain.vo.AddCompanyVo;
+import com.example.tdl.domain.vo.UpdateCompanyVo;
+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;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/company")
+public class CompanyController {
+
+    private Logger logger = LoggerFactory.getLogger(CompanyController.class);
+
+    CommFeedback fb=new CommFeedback();
+
+    Gson gson=new Gson();
+
+    @Autowired
+    private CompanyService companyService;
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
+
+    //查询所有公司信息
+    @ApiOperation(value = "查询所有公司信息",notes = "查询所有公司信息,返回值说明：" +
+            "   companyNo:公司编号，" +
+            "   companyName:公司名，" +
+            "   country:国家，" +
+            "   city:城市，" +
+            "   addressDetail:具体地址，" +
+            "   tel:电话号码，" +
+            "   manager:负责人")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/getAll",method = RequestMethod.GET)
+    public Object getAll(){
+        return companyService.getAll();
+    }
+
+    //添加公司信息
+    @ApiOperation(value = "添加公司信息",notes = "添加公司信息,companyNo公司编号不用传，需要传的值：" +
+            "   companyName:公司名，" +
+            "   country:国家，" +
+            "   city:城市，" +
+            "   addressDetail:具体地址，" +
+            "   tel:电话号码，" +
+            "   manager:负责人")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/addCompany",method = RequestMethod.POST)
+    public Object addCompany(@RequestBody AddCompanyVo addCompanyVo){
+        if (StringUtils.isEmpty(addCompanyVo.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("添加的公司名");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addCompanyVo.getCountry())){
+            fb.setCode(0);
+            fb.setMessage("添加的公司所在国家");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addCompanyVo.getCity())){
+            fb.setCode(0);
+            fb.setMessage("添加的公司所在城市");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addCompanyVo.getAddressDetail())){
+            fb.setCode(0);
+            fb.setMessage("添加的公司所在具体地址不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addCompanyVo.getTel())){
+            fb.setCode(0);
+            fb.setMessage("添加的公司联系电话不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addCompanyVo.getManager())){
+            fb.setCode(0);
+            fb.setMessage("添加的公司负责人不能为空");
+            return gson.toJson(fb);
+        }
+        if( !addCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
+            fb.setCode(0);
+            fb.setMessage("手机号不规范");
+            return gson.toJson(fb);
+        }
+        if (companyService.getByCompanyName(addCompanyVo.getCompanyName())!=null){
+            fb.setCode(0);
+            fb.setMessage("添加的公司名不能重复");
+            return gson.toJson(fb);
+        }
+        Date day=new Date();
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+        String companyNo="TM"+df.format(day);
+        String companyNos=companyNo+((int)(Math.random()*(9999-1000+1))+1000);
+        if (companyService.getByCompanyNo(companyNos)!=null) {
+            while (companyService.getByCompanyNo(companyNos) != null) {
+                companyNos = companyNo + ((int) (Math.random() * (9999 - 1000 + 1)) + 1000);
+            }
+        }
+        addCompanyVo.setCompanyNo(companyNos);
+        int a = companyService.addCompany(addCompanyVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("添加公司成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("添加公司失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    //修改公司信息
+    @ApiOperation(value = "修改公司信息",notes = "修改公司信息，需要传的值：" +
+            "   companyNo:需要修改的公司编号，" +
+            "   oldCompanyName:需要修改的公司名，" +
+            "   companyName:修改后的公司名，" +
+            "   country:国家，" +
+            "   city:城市，" +
+            "   addressDetail:具体地址，" +
+            "   tel:电话，" +
+            "   manager:负责人")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/updateCompany",method = RequestMethod.POST)
+    public Object updateCompany(@RequestBody UpdateCompanyVo updateCompanyVo){
+        if (StringUtils.isEmpty(updateCompanyVo.getCompanyNo())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的公司的公司编号");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getOldCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("修改之前的公司名");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司名");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getCountry())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司所在国家");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getCity())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司所在城市");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getAddressDetail())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司所在具体地址不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getTel())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司联系电话不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateCompanyVo.getManager())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司负责人不能为空");
+            return gson.toJson(fb);
+        }
+        if( !updateCompanyVo.getTel().matches("^1[34578]\\d{9}$")){
+            fb.setCode(0);
+            fb.setMessage("手机号不规范");
+            return gson.toJson(fb);
+        }
+        if (companyService.getByCompanyName(updateCompanyVo.getCompanyName())!=null&&!updateCompanyVo.getOldCompanyName().equals(updateCompanyVo.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("修改的公司名不能重复");
+            return gson.toJson(fb);
+        }
+        int a = companyService.updateCompany(updateCompanyVo);
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("修改公司成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("修改公司失败");
+        }
+        return gson.toJson(fb);
+    }
+
+    //删除公司
+    @ApiOperation(value = "删除公司",notes = "删除公司,传值说明：companyName:公司编号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/delCompany",method = RequestMethod.POST)
+    public Object delCompany(@RequestBody String companyNo){
+        JSONObject jsonObject= JSON.parseObject(companyNo);
+        companyNo=(String) jsonObject.get("companyNo");
+        Map<Object,Object> map=new HashMap<>();
+        map.put("companyNo",companyNo);
+        companyService.delCompany(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if (msg.get("msg").equals("删除公司成功")){
+            fb.setCode(1);
+            fb.setMessage("删除公司成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
+
+}

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

@@ -68,7 +68,7 @@ public class LoginController {
             SecurityUtils.getSubject().login(new UsernamePasswordToken(loginUserVo.getUserName(), loginUserVo.getPassword()));
             //生成token
             String token = DigestUtils.md5Hex(System.currentTimeMillis() + userVo.getUserName());
-            UserRedisVo redisVo = new UserRedisVo(userVo.getUserName(),userVo.getUserNumber(),userVo.getNickName(),userVo.getEmail(),userVo.getPhone(),userVo.getRoleName());
+            UserRedisVo redisVo = new UserRedisVo(userVo.getUserName(),userVo.getUserNumber(),userVo.getNickName(),userVo.getEmail(),userVo.getPhone(),userVo.getRoleName(),userVo.getCompanyName());
             //将用户数据保存到redis中
             tokenRedisService.set("TOKEN_" + token, gson.toJson(redisVo), 60 * 30);
             String ip = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest().getRemoteAddr();

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

@@ -3,8 +3,12 @@ package com.example.tdl.web;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
+import com.example.tdl.domain.vo.ResultTransferModelVo;
 import com.example.tdl.domain.vo.UpdateTransferModelConfigVo;
+import com.example.tdl.domain.vo.UserRedisVo;
 import com.example.tdl.service.TransferModelConfigService;
+import com.example.tdl.service.TransferModelService;
+import com.example.tdl.service.redis.TokenRedisService;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -34,6 +39,12 @@ public class TransferModelConfigController {
     @Autowired
     private TransferModelConfigService transferModelConfigService;
 
+    @Autowired
+    private TransferModelService transferModelService;
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
 
     @ApiOperation(value = "查询线路配置模板",notes = "查询线路配置模板的返回值对应的意义:" +
         "      transferNo：线路模板编号" +
@@ -50,9 +61,18 @@ public class TransferModelConfigController {
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public Object getAll(@RequestBody String transferNo){
+    public Object getAll(@RequestBody String transferNo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         JSONObject jsonObject= JSON.parseObject(transferNo);
         transferNo=(String)jsonObject.get("transferNo");
+        ResultTransferModelVo resultTransferModelVo=transferModelService.getByTransferNo(transferNo);
+        if (resultTransferModelVo!=null&&!resultTransferModelVo.getCompanyName().equals(user.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("只能查看自己公司的线路模板");
+            return gson.toJson(fb);
+        }
         return transferModelConfigService.getAll(transferNo);
     }
 
@@ -71,12 +91,21 @@ public class TransferModelConfigController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public Object updateTransferModelConfig(@RequestBody UpdateTransferModelConfigVo updateTransferModelConfigVo) {
+    public Object updateTransferModelConfig(@RequestBody UpdateTransferModelConfigVo updateTransferModelConfigVo,HttpServletRequest request) {
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         if (StringUtils.isEmpty(updateTransferModelConfigVo.getTransferNo())) {
             fb.setCode(0);
             fb.setMessage("需要修改的线路模板编号不能为空");
             return gson.toJson(fb);
         }
+        ResultTransferModelVo resultTransferModelVo=transferModelService.getByTransferNo(updateTransferModelConfigVo.getTransferNo());
+        if (resultTransferModelVo!=null&&!resultTransferModelVo.getCompanyName().equals(user.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("只能查看自己公司的线路模板");
+            return gson.toJson(fb);
+        }
         if (updateTransferModelConfigVo.getInfo().size() >= 2 && updateTransferModelConfigVo.getInfo().size() < 5) {
             String country = "";
             String city = "";

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

@@ -3,13 +3,11 @@ package com.example.tdl.web;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.example.tdl.domain.dto.CommFeedback;
-import com.example.tdl.domain.vo.AddModelVo;
-import com.example.tdl.domain.vo.AddTransferModelVo;
-import com.example.tdl.domain.vo.UpdateModelVo;
-import com.example.tdl.domain.vo.UpdateTransferModelVo;
+import com.example.tdl.domain.vo.*;
 import com.example.tdl.service.ProbesModelService;
 import com.example.tdl.service.TopicModelService;
 import com.example.tdl.service.TransferModelService;
+import com.example.tdl.service.redis.TokenRedisService;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -23,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -40,17 +39,24 @@ public class TransferModelController {
     @Autowired
     private TransferModelService transferModelService;
 
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
 
     @ApiOperation(value = "查询线路模板",notes = "查询线路模板的返回值对应的意义:" +
         "      transferNo: 线路途径地模板编号," +
         "      transferModelName: 线路途径地模板名," +
-        "      counts: 途径地个数")
+        "      counts: 途径地个数," +
+        "      companyName:模板所属公司")
     @RequestMapping(value = "/getAll",method = RequestMethod.GET)
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public Object getAll(){
-        return transferModelService.getAll();
+    public Object getAll(HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        return transferModelService.getAll(user.getCompanyName());
     }
 
     @ApiOperation(value = "添加模板",notes = "添加模板的同时添加通道配置信息，传递的参数:" +
@@ -68,7 +74,10 @@ public class TransferModelController {
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public String addTransferModel(@RequestBody AddTransferModelVo addTransferModelVo){
+    public String addTransferModel(@RequestBody AddTransferModelVo addTransferModelVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         if (StringUtils.isEmpty(addTransferModelVo.getTransferModelName())){
             fb.setCode(0);
             fb.setMessage("添加的线路模板名不能为空");
@@ -150,6 +159,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("country",country);
             map.put("city",city);
             map.put("addressDetail",addressDetail);
@@ -182,7 +192,10 @@ public class TransferModelController {
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public  String updateModel(@RequestBody UpdateTransferModelVo updateTransferModelVo){
+    public  String updateModel(@RequestBody UpdateTransferModelVo updateTransferModelVo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         if (StringUtils.isEmpty(updateTransferModelVo.getTransferNo())){
             fb.setCode(0);
             fb.setMessage("需要修改的线路模板编号不能为空");
@@ -193,13 +206,19 @@ public class TransferModelController {
             fb.setMessage("修改后的线路模板名不能为空");
             return gson.toJson(fb);
         }
+        ResultTransferModelVo resultTransferModelVo=transferModelService.getByTransferNo(updateTransferModelVo.getTransferNo());
+        if (resultTransferModelVo!=null&&!resultTransferModelVo.getCompanyName().equals(user.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("只能修改自己公司的模板");
+            return gson.toJson(fb);
+        }
         int a=transferModelService.updateTransferModel(updateTransferModelVo);
         if (a>0){
             fb.setCode(1);
-            fb.setMessage("修改模板成功");
+            fb.setMessage("修改线路模板成功");
         }else{
             fb.setCode(0);
-            fb.setMessage("修改模板失败");
+            fb.setMessage("修改线路模板失败");
         }
         return gson.toJson(fb);
     }
@@ -211,7 +230,10 @@ public class TransferModelController {
     @ApiImplicitParams({
         @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })
-    public String delModel(@RequestBody String transferNo){
+    public String delModel(@RequestBody String transferNo,HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
         JSONObject jsonObject= JSON.parseObject(transferNo);
         transferNo=(String)jsonObject.get("transferNo");
         if (StringUtils.isEmpty(transferNo)){
@@ -219,6 +241,12 @@ public class TransferModelController {
             fb.setMessage("删除的线路模板名不能为空");
             return gson.toJson(fb);
         }
+        ResultTransferModelVo resultTransferModelVo=transferModelService.getByTransferNo(transferNo);
+        if (resultTransferModelVo!=null&&!resultTransferModelVo.getCompanyName().equals(user.getCompanyName())){
+            fb.setCode(0);
+            fb.setMessage("只能删除自己公司的模板");
+            return gson.toJson(fb);
+        }
         Map<String,Object> map=new HashMap<>();
         map.put("transferNo",transferNo);
         transferModelService.delTransferModel(map);

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

@@ -38,9 +38,6 @@ public class UserController {
     @Autowired
     private UserService userService;
 
-    @Autowired
-    private RoleHasPermissionService roleHasPermissionService;
-
     @Autowired
     private TokenRedisService tokenRedisService;
 
@@ -75,7 +72,8 @@ public class UserController {
             "   nickName：昵称，" +
             "   phone：电话，" +
             "   email：邮件，" +
-            "   roleName：角色名")
+            "   roleName：角色名，" +
+            "   companyName：用户所属公司")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
     })

src/main/resources/mapper/CompanyMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.tdl.mapper.CompanyMapper">
+    <!--查询所有公司信息-->
+    <select id="getAll" resultType="com.example.tdl.domain.vo.ResultCompanyVo">
+        SELECT companyNo,companyName,country,city,addressDetail,tel,manager from company WHERE state=1
+    </select>
+
+    <insert id="addCompany" parameterType="com.example.tdl.domain.vo.AddCompanyVo">
+        INSERT INTO company VALUES (
+            NULL ,
+            #{companyNo,jdbcType=VARCHAR},
+            #{companyName,jdbcType=VARCHAR},
+            #{country,jdbcType=VARCHAR},
+            #{city,jdbcType=VARCHAR},
+            #{addressDetail,jdbcType=VARCHAR},
+            #{tel,jdbcType=VARCHAR},
+            #{manager,jdbcType=VARCHAR},
+            1
+        )
+    </insert>
+
+    <update id="updateCompany" parameterType="com.example.tdl.domain.vo.UpdateCompanyVo">
+        UPDATE company set
+        companyName=#{companyName,jdbcType=VARCHAR},
+        country=#{country,jdbcType=VARCHAR},
+        city=#{city,jdbcType=VARCHAR},
+        addressDetail=#{addressDetail,jdbcType=VARCHAR},
+        tel=#{tel,jdbcType=VARCHAR},
+        manager=#{manager,jdbcType=VARCHAR}
+        WHERE companyNo=#{companyNo,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="delCompany" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_delCompany(
+                #{companyNo,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </delete>
+
+    <select id="getByCompanyName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultCompanyVo">
+        SELECT companyNo,companyName,country,city,addressDetail,tel,manager
+        from company WHERE state=1 AND companyName=#{companyName,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getByCompanyNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultCompanyVo">
+        SELECT companyNo,companyName,country,city,addressDetail,tel,manager
+        from company WHERE state=1 AND companyNo=#{companyNo,jdbcType=VARCHAR}
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/TDLDeviceMapper.xml

@@ -35,7 +35,7 @@
         0,
         NULL ,
         NULL,
-        NULL ,
+        NULL
         )
     </insert>
 

src/main/resources/mapper/TransferModelMapper.xml

@@ -2,8 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.TransferModelMapper">
     <select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultTransferModelVo">
-        SELECT transferNo,transferModelName,counts
-        from transfer_model
+        SELECT transferNo,transferModelName,counts,companyName
+        from transfer_model t INNER JOIN company c ON t.company_id=c.id
+        WHERE companyName=#{companyName,jdbcType=VARCHAR}
    </select>
 
     <insert id="addTransferModel" statementType="CALLABLE" parameterType="java.util.Map">
@@ -13,6 +14,7 @@
                 #{transferNo,mode=IN,jdbcType=VARCHAR},
                 #{transferModelName,mode=IN,jdbcType=VARCHAR},
                 #{counts,mode=IN,jdbcType=INTEGER},
+                #{companyName,mode=IN,jdbcType=VARCHAR},
                 #{country,mode=IN,jdbcType=VARCHAR},
                 #{city,mode=IN,jdbcType=VARCHAR},
                 #{addressDetail,mode=IN,jdbcType=VARCHAR},
@@ -43,15 +45,15 @@
       ]]>
     </delete>
 
-    <select id="getByTransferNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultModelVo">
-        SELECT transferNo,transferModelName,counts
-        from transfer_model
+    <select id="getByTransferNo" 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 transferNo=#{transferNo,jdbcType=VARCHAR}
     </select>
 
-    <select id="getByTransferModelName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultModelVo">
-        SELECT transferNo,transferModelName,counts
-        from transfer_model
+    <select id="getByTransferModelName" 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 transferModelName=#{transferModelName,jdbcType=VARCHAR}
     </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/UserMapper.xml

@@ -11,7 +11,7 @@
 
     <!--通过用户名查询用户信息-->
     <select id="getByUserName" parameterType="String" resultType="com.example.tdl.domain.vo.UserVo">
-        select userNumber, userName,password,nickName,phone,email,roleName
+        select userNumber, userName,password,nickName,phone,email,roleName,(SELECT companyName from company WHERE id=u.company_id) companyName
         from `user` u INNER JOIN role r ON u.role_id=r.id
         WHERE userName=#{userName,jdbcType=VARCHAR}
         AND state=1
@@ -19,14 +19,14 @@
 
     <!--获取所有用户信息-->
     <select id="getAll" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber,userName,nickName,phone,email,roleName
+        select userNumber, userName,nickName,phone,email,roleName,(SELECT companyName from company WHERE id=u.company_id) companyName
         from `user` u INNER JOIN role r ON u.role_id=r.id
         WHERE state=1
     </select>
 
     <!--根据条件查询-->
     <select id="getByTerm" resultType="com.example.tdl.domain.vo.ResultUserVo" parameterType="com.example.tdl.domain.vo.UserTermVo">
-        select userNumber,userName,nickName,phone,email,roleName
+        select userNumber, userName,nickName,phone,email,roleName,(SELECT companyName from company WHERE id=u.company_id) companyName
         from `user` u INNER JOIN role r ON u.role_id=r.id WHERE 1=1
         <if test="userName!=null">
             AND userName like CONCAT(CONCAT('%',#{userName,jdbcType=VARCHAR}), '%')
@@ -45,7 +45,7 @@
 
     <!--通过手机号查询用户信息-->
     <select id="getByPhone" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,nickName,phone,email,roleName
+        select userNumber, userName,nickName,phone,email,roleName,(SELECT companyName from company WHERE id=u.company_id) companyName
         from `user` u INNER JOIN role r ON u.role_id=r.id
         WHERE phone=#{phone,jdbcType=VARCHAR}
         AND state=1
@@ -53,7 +53,7 @@
 
     <!--通过邮箱查询用户信息-->
     <select id="getByEmail" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,nickName,phone,email,roleName
+        select userNumber, userName,nickName,phone,email,roleName,(SELECT companyName from company WHERE id=u.company_id) companyName
         from `user` u INNER JOIN role r ON u.role_id=r.id
         WHERE email=#{email,jdbcType=VARCHAR}
         AND state=1
@@ -61,7 +61,7 @@
 
     <!--通过用户编号查询用户信息-->
     <select id="getByUserNumber" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserVo">
-        select userNumber, userName,nickName,phone,email,roleName
+        select userNumber, userName,nickName,phone,email,roleName,(SELECT companyName from company WHERE id=u.company_id) companyName
         from `user` u INNER JOIN role r ON u.role_id=r.id
         WHERE userNumber=#{userNumber,jdbcType=VARCHAR}
         AND state=1
@@ -80,6 +80,7 @@
         (SELECT id from role WHERE roleName=#{roleName,jdbcType=VARCHAR}),
         #{createTime,jdbcType=VARCHAR},
         #{updateTime,jdbcType=VARCHAR},
+        (SELECT id from company WHERE companyName=#{companyName,jdbcType=VARCHAR}),
         1
         )
     </insert>

src/main/resources/mybatis-config.xml

@@ -52,5 +52,6 @@
         <mapper resource="mapper/TransferModelConfigMapper.xml"/>
         <mapper resource="mapper/TransferModelMapper.xml"/>
         <mapper resource="mapper/CircuitTransferMapper.xml"/>
+        <mapper resource="mapper/CompanyMapper.xml"/>
     </mappers>
 </configuration>