Skip to content

C
cloud-platform
Commit 84dbb58c authored by hezhen's avatar hezhen
Browse files
Options

添加后台用户列表

parent 922fc7e9
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 458 deletions
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java
View file @ 84dbb58c
package com.github.wxiaoqi.security.admin.entity; package com.github.wxiaoqi.security.admin.entity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
...@@ -9,6 +10,7 @@ import javax.persistence.Table; ...@@ -9,6 +10,7 @@ import javax.persistence.Table;
import java.util.Date; import java.util.Date;
@Table(name = "base_user") @Table(name = "base_user")
@Data
public class User { public class User {
@Id @Id
@GeneratedValue(generator = "JDBC")//此处加上注解 @GeneratedValue(generator = "JDBC")//此处加上注解
...@@ -46,7 +48,7 @@ public class User { ...@@ -46,7 +48,7 @@ public class User {
@Column(name = "corporation_id") @Column(name = "corporation_id")
@ApiModelProperty("公司id") @ApiModelProperty("公司id")
private Integer corporationId; private Long corporationId;
@Column(name = "company_id") @Column(name = "company_id")
@ApiModelProperty("门店id") @ApiModelProperty("门店id")
...@@ -87,6 +89,10 @@ public class User { ...@@ -87,6 +89,10 @@ public class User {
@Column(name = "data_company") @Column(name = "data_company")
private String dataCompany; private String dataCompany;
@Column(name = "data_corporation")
private String dataCorporation;
private String attr1; private String attr1;
private String attr2; private String attr2;
...@@ -103,445 +109,5 @@ public class User { ...@@ -103,445 +109,5 @@ public class User {
private String attr8; private String attr8;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return username
*/
public String getUsername() {
return username;
}
/**
* @param username
*/
public void setUsername(String username) {
this.username = username;
}
/**
* @return password
*/
public String getPassword() {
return password;
}
/**
* @param password
*/
public void setPassword(String password) {
this.password = password;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return birthday
*/
public String getBirthday() {
return birthday;
}
/**
* @param birthday
*/
public void setBirthday(String birthday) {
this.birthday = birthday;
}
/**
* @return address
*/
public String getAddress() {
return address;
}
/**
* @param address
*/
public void setAddress(String address) {
this.address = address;
}
/**
* @return mobile_phone
*/
public String getMobilePhone() {
return mobilePhone;
}
/**
* @param mobilePhone
*/
public void setMobilePhone(String mobilePhone) {
this.mobilePhone = mobilePhone;
}
/**
* @return tel_phone
*/
public String getTelPhone() {
return telPhone;
}
/**
* @param telPhone
*/
public void setTelPhone(String telPhone) {
this.telPhone = telPhone;
}
/**
* @return email
*/
public String getEmail() {
return email;
}
/**
* @param email
*/
public void setEmail(String email) {
this.email = email;
}
/**
* @return sex
*/
public String getSex() {
return sex;
}
/**
* @param sex
*/
public void setSex(String sex) {
this.sex = sex;
}
/**
* @return type
*/
public String getType() {
return type;
}
/**
* @param type
*/
public void setType(String type) {
this.type = type;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getZoneId() {
return zoneId;
}
public void setZoneId(Integer zoneId) {
this.zoneId = zoneId;
}
public Integer getCompanyId() {
return companyId;
}
public void setCompanyId(Integer companyId) {
this.companyId = companyId;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return upd_time
*/
public Date getUpdTime() {
return updTime;
}
/**
* @param updTime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* @return upd_user
*/
public String getUpdUser() {
return updUser;
}
/**
* @param updUser
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* @return upd_name
*/
public String getUpdName() {
return updName;
}
/**
* @param updName
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* @return upd_host
*/
public String getUpdHost() {
return updHost;
}
/**
* @param updHost
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
public Integer getDataAll() {
return dataAll;
}
public void setDataAll(Integer dataAll) {
this.dataAll = dataAll;
}
public String getDataZone() {
return dataZone;
}
public void setDataZone(String dataZone) {
this.dataZone = dataZone;
}
public String getDataCompany() {
return dataCompany;
}
public void setDataCompany(String dataCompany) {
this.dataCompany = dataCompany;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
} }
\ No newline at end of file
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseUserVo.java 0 → 100644
View file @ 84dbb58c
package com.github.wxiaoqi.security.admin.vo;
import com.github.wxiaoqi.security.admin.entity.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/7/8 16:08
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BaseUserVo extends User {
private String companyName;
private String corporationName;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java
View file @ 84dbb58c
...@@ -7,20 +7,28 @@ import com.github.pagehelper.PageHelper; ...@@ -7,20 +7,28 @@ import com.github.pagehelper.PageHelper;
import com.github.wxiaoqi.security.admin.entity.User; import com.github.wxiaoqi.security.admin.entity.User;
import com.github.wxiaoqi.security.admin.mapper.MenuMapper; import com.github.wxiaoqi.security.admin.mapper.MenuMapper;
import com.github.wxiaoqi.security.admin.mapper.UserMapper; import com.github.wxiaoqi.security.admin.mapper.UserMapper;
import com.github.wxiaoqi.security.admin.vo.BaseUserVo;
import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil; import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import com.github.wxiaoqi.security.common.biz.BaseBiz; import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.constant.UserConstant; import com.github.wxiaoqi.security.common.constant.UserConstant;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.msg.TableResultResponse; import com.github.wxiaoqi.security.common.msg.TableResultResponse;
import com.github.wxiaoqi.security.common.util.Query; import com.github.wxiaoqi.security.common.util.Query;
import com.xxfc.platform.vehicle.entity.CompanyInfo;
import com.xxfc.platform.vehicle.feign.VehicleFeign;
import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
import com.xxfc.platform.vehicle.pojo.CompanySearchVO;
import com.xxfc.platform.vehicle.pojo.dto.CompanyInfoFindDTO;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example; import tk.mybatis.mapper.entity.Example;
import java.util.Arrays;
import java.util.List; import java.util.*;
import java.util.Map; import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE; import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
...@@ -39,6 +47,11 @@ public class UserBiz extends BaseBiz<UserMapper,User> { ...@@ -39,6 +47,11 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
@Autowired @Autowired
private UserAuthUtil userAuthUtil; private UserAuthUtil userAuthUtil;
@Autowired
private VehicleFeign vehicleFeign;
@Override @Override
public void insertSelective(User entity) { public void insertSelective(User entity) {
String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword()); String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());
...@@ -70,7 +83,10 @@ public class UserBiz extends BaseBiz<UserMapper,User> { ...@@ -70,7 +83,10 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
return mapper.selectOne(user); return mapper.selectOne(user);
} }
public TableResultResponse<User> selectPage(Query query, User currentUser) { public TableResultResponse<BaseUserVo> selectPage(Query query, User currentUser) {
List<BaseUserVo> userVos=new ArrayList<>();
List<User> list =new ArrayList<>();
Page<Object> result;
if(DATA_ALL_TRUE.equals(currentUser.getDataAll())) { if(DATA_ALL_TRUE.equals(currentUser.getDataAll())) {
Example example = new Example(User.class); Example example = new Example(User.class);
if(query.entrySet().size()>0) { if(query.entrySet().size()>0) {
...@@ -80,9 +96,8 @@ public class UserBiz extends BaseBiz<UserMapper,User> { ...@@ -80,9 +96,8 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
} }
} }
example.createCriteria().andGreaterThan("id",1); example.createCriteria().andGreaterThan("id",1);
Page<Object> result = PageHelper.startPage(query.getPage(), query.getLimit()); result = PageHelper.startPage(query.getPage(), query.getLimit());
List<User> list = mapper.selectByExample(example); list = mapper.selectByExample(example);
return new TableResultResponse<User>(result.getTotal(), list);
}else { }else {
Example example = new Example(User.class); Example example = new Example(User.class);
if(query.entrySet().size()>0) { if(query.entrySet().size()>0) {
...@@ -97,11 +112,58 @@ public class UserBiz extends BaseBiz<UserMapper,User> { ...@@ -97,11 +112,58 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
if(StringUtils.isNotBlank(currentUser.getDataZone())){ if(StringUtils.isNotBlank(currentUser.getDataZone())){
example.createCriteria().andIn("zoneId", Arrays.asList(currentUser.getDataZone().split(","))); example.createCriteria().andIn("zoneId", Arrays.asList(currentUser.getDataZone().split(",")));
} }
if(StringUtils.isNotBlank(currentUser.getDataCorporation())){
example.createCriteria().andIn("corporationId", Arrays.asList(currentUser.getDataCorporation().split(",")));
}
example.createCriteria().andGreaterThan("id",1); example.createCriteria().andGreaterThan("id",1);
Page<Object> result = PageHelper.startPage(query.getPage(), query.getLimit()); result = PageHelper.startPage(query.getPage(), query.getLimit());
List<User> list = mapper.selectByExample(example); list = mapper.selectByExample(example);
return new TableResultResponse<User>(result.getTotal(), list);
}
if (list.size() > 0){
List<Long> corporationIds=list.stream().map(User::getCorporationId).distinct().collect(Collectors.toList());
CompanyInfoFindDTO companyInfoFindDTO=new CompanyInfoFindDTO();
companyInfoFindDTO.setIds(corporationIds);
ObjectRestResponse< List<CompanyInfo>> restResponse = vehicleFeign.listByIds(companyInfoFindDTO);
Map<Long,CompanyInfo> companyInfoMaps=new HashMap<>();
if (restResponse.getData() != null){
List<CompanyInfo> companyInfos=restResponse.getData();
if (companyInfos != null && companyInfos.size() > 0){
for (CompanyInfo companyInfo:companyInfos){
companyInfoMaps.put(companyInfo.getId(),companyInfo);
}
}
}
List<Integer> companyIds=list.stream().map(User::getCompanyId).distinct().collect(Collectors.toList());
CompanySearchDTO companySearchDTO=new CompanySearchDTO();
companySearchDTO.setCompanyIds(companyIds);
ObjectRestResponse<List<CompanySearchVO>> restResponse1= vehicleFeign.listByIds(companySearchDTO);
Map<Integer,CompanySearchVO> companyMaps=new HashMap<>();
if (restResponse1.getData() != null){
List<CompanySearchVO> companySearchVOS=restResponse1.getData();
if (companySearchVOS != null && companySearchVOS.size() > 0){
for (CompanySearchVO companySearchVO:companySearchVOS){
companyMaps.put(companySearchVO.getId(),companySearchVO);
}
}
}
for (User user : list){
BaseUserVo userVo=new BaseUserVo();
BeanUtils.copyProperties(user,userVo);
CompanyInfo companyInfo=companyInfoMaps.get(userVo.getCorporationId());
if (companyInfo != null ){
userVo.setCorporationName(companyInfo.getName());
}
CompanySearchVO companySearchVO= companyMaps.get(userVo.getCompanyId());
if (companySearchVO != null ){
userVo.setCompanyName(companySearchVO.getName());
}
userVos.add(userVo);
}
} }
return new TableResultResponse<BaseUserVo>(result.getTotal(), userVos);
} }
public List<User> getCountByUsername(String username){ public List<User> getCountByUsername(String username){
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java
View file @ 84dbb58c
...@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.entity.Menu; ...@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.entity.Menu;
import com.github.wxiaoqi.security.admin.entity.User; import com.github.wxiaoqi.security.admin.entity.User;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO; import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.rpc.service.PermissionService; import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
import com.github.wxiaoqi.security.admin.vo.BaseUserVo;
import com.github.wxiaoqi.security.admin.vo.FrontUser; import com.github.wxiaoqi.security.admin.vo.FrontUser;
import com.github.wxiaoqi.security.admin.vo.GroupUsers; import com.github.wxiaoqi.security.admin.vo.GroupUsers;
import com.github.wxiaoqi.security.admin.vo.MenuTree; import com.github.wxiaoqi.security.admin.vo.MenuTree;
...@@ -147,15 +148,10 @@ public class UserController extends CommonBaseController { ...@@ -147,15 +148,10 @@ public class UserController extends CommonBaseController {
@RequestMapping(value = "/page",method = RequestMethod.GET) @RequestMapping(value = "/page",method = RequestMethod.GET)
@ResponseBody @ResponseBody
public TableResultResponse<User> list(@RequestParam Map<String, Object> params){ public TableResultResponse<BaseUserVo> list(@RequestParam Map<String, Object> params)throws Exception{
//查询列表数据 //查询列表数据
Query query = new Query(params); Query query = new Query(params);
try { return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
}catch (Exception e) {
log.error(e.getMessage());
return new TableResultResponse<User>();
}
} }
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
View file @ 84dbb58c
...@@ -8,10 +8,12 @@ import com.xxfc.platform.vehicle.entity.*; ...@@ -8,10 +8,12 @@ import com.xxfc.platform.vehicle.entity.*;
import com.xxfc.platform.vehicle.pojo.*; import com.xxfc.platform.vehicle.pojo.*;
import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO; import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO;
import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO; import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
import com.xxfc.platform.vehicle.pojo.dto.CompanyInfoFindDTO;
import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO; import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo; import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo; import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO; import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -217,4 +219,12 @@ public interface VehicleFeign { ...@@ -217,4 +219,12 @@ public interface VehicleFeign {
@GetMapping("/branchCompany/compnays_area") @GetMapping("/branchCompany/compnays_area")
public List<BranchCompanyAreaDTO> findBranchCompnayAreaByIds(@RequestParam("companyIds") List<Integer> compnayIds); public List<BranchCompanyAreaDTO> findBranchCompnayAreaByIds(@RequestParam("companyIds") List<Integer> compnayIds);
@ApiOperation("列表")
@RequestMapping(value = "company/info/app/unauth/listByIds", method = RequestMethod.POST)
ObjectRestResponse<List<CompanyInfo>> listByIds(@RequestBody CompanyInfoFindDTO companyInfoFindDTO);
@PostMapping("branchCompany/app/unauth/listByIds")
ObjectRestResponse<List<CompanySearchVO>> listByIds(@RequestBody CompanySearchDTO vo);
} }
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchDTO.java
View file @ 84dbb58c
...@@ -3,6 +3,8 @@ package com.xxfc.platform.vehicle.pojo; ...@@ -3,6 +3,8 @@ package com.xxfc.platform.vehicle.pojo;
import com.github.wxiaoqi.security.common.vo.PageParam; import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class CompanySearchDTO extends PageParam { public class CompanySearchDTO extends PageParam {
Integer addrCity; Integer addrCity;
...@@ -19,4 +21,6 @@ public class CompanySearchDTO extends PageParam { ...@@ -19,4 +21,6 @@ public class CompanySearchDTO extends PageParam {
Integer id; Integer id;
List<Integer> companyIds;
} }
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/CompanyInfoFindDTO.java
View file @ 84dbb58c
...@@ -3,6 +3,8 @@ package com.xxfc.platform.vehicle.pojo.dto; ...@@ -3,6 +3,8 @@ package com.xxfc.platform.vehicle.pojo.dto;
import com.github.wxiaoqi.security.common.vo.PageParam; import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @author libin * @author libin
* @version 1.0 * @version 1.0
...@@ -14,4 +16,6 @@ public class CompanyInfoFindDTO extends PageParam { ...@@ -14,4 +16,6 @@ public class CompanyInfoFindDTO extends PageParam {
private String name; private String name;
private List<Long> ids;
} }
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyInfoBiz.java
View file @ 84dbb58c
...@@ -40,6 +40,9 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{ ...@@ -40,6 +40,9 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
if (StringUtils.isNotBlank(companyInfoFindDTO.getName()) ){ if (StringUtils.isNotBlank(companyInfoFindDTO.getName()) ){
criteria.andLike("name","%" + companyInfoFindDTO.getName() + "%"); criteria.andLike("name","%" + companyInfoFindDTO.getName() + "%");
} }
if (companyInfoFindDTO.getIds() != null && companyInfoFindDTO.getIds().size() > 0){
criteria.andIn("id",companyInfoFindDTO.getIds());
}
example.setOrderByClause("crt_time desc "); example.setOrderByClause("crt_time desc ");
return selectByExample(example); return selectByExample(example);
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java
View file @ 84dbb58c
...@@ -19,6 +19,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompany; ...@@ -19,6 +19,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompany;
import com.xxfc.platform.vehicle.pojo.BranchCompanyVo; import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
import com.xxfc.platform.vehicle.pojo.CompanyDetail; import com.xxfc.platform.vehicle.pojo.CompanyDetail;
import com.xxfc.platform.vehicle.pojo.CompanySearchDTO; import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
import com.xxfc.platform.vehicle.pojo.CompanySearchVO;
import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO; import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO;
import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO; import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo; import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
...@@ -234,4 +235,11 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> { ...@@ -234,4 +235,11 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
return ObjectRestResponse.succ(baseBiz.getList(vo)); return ObjectRestResponse.succ(baseBiz.getList(vo));
} }
@PostMapping("app/unauth/listByIds")
@IgnoreUserToken
public ObjectRestResponse<List<CompanySearchVO>> listByIds(@RequestBody CompanySearchDTO vo){
return ObjectRestResponse.succ(baseBiz.getList(vo));
}
} }
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyInfoController.java
View file @ 84dbb58c
package com.xxfc.platform.vehicle.rest.admin; package com.xxfc.platform.vehicle.rest.admin;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.vehicle.biz.CompanyInfoBiz; import com.xxfc.platform.vehicle.biz.CompanyInfoBiz;
...@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController @RestController
@RequestMapping("company/info") @RequestMapping("company/info")
public class CompanyInfoController extends BaseController<CompanyInfoBiz,CompanyInfo> { public class CompanyInfoController extends BaseController<CompanyInfoBiz,CompanyInfo> {
...@@ -43,6 +46,14 @@ public class CompanyInfoController extends BaseController<CompanyInfoBiz,Company ...@@ -43,6 +46,14 @@ public class CompanyInfoController extends BaseController<CompanyInfoBiz,Company
} }
@ApiOperation("列表")
@RequestMapping(value = "app/unauth/listByIds", method = RequestMethod.POST)
@IgnoreUserToken
public ObjectRestResponse<List<CompanyInfo>> listByIds(@RequestBody CompanyInfoFindDTO companyInfoFindDTO){
return ObjectRestResponse.succ(baseBiz.getList(companyInfoFindDTO));
}
@ApiOperation("删除") @ApiOperation("删除")
@RequestMapping(value = "/del", method = RequestMethod.POST) @RequestMapping(value = "/del", method = RequestMethod.POST)
public ObjectRestResponse delCompany(@RequestBody CompanyInfo companyInfo){ public ObjectRestResponse delCompany(@RequestBody CompanyInfo companyInfo){
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml
View file @ 84dbb58c
...@@ -57,6 +57,12 @@ ...@@ -57,6 +57,12 @@
<if test="name != null and name != '' "> <if test="name != null and name != '' ">
and ( c.name like concat('%',#{name},'%') or c.short_name like concat('%',#{name},'%') ) and ( c.name like concat('%',#{name},'%') or c.short_name like concat('%',#{name},'%') )
</if> </if>
<if test="companyIds != null and companyIds.size > 0">
and c.id in
<foreach collection="companyIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where> </where>
<choose> <choose>
<when test="lon != null and lat != null"> <when test="lon != null and lat != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment