Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

 package com.github.wxiaoqi.security.auth.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.auth.service.AuthService;
+import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationChwRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -17,6 +19,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.RequestTypeConstants.BUSINESS;
+import static com.github.wxiaoqi.security.common.constant.RequestTypeConstants.OPERATE;
+
 @Api(tags = "用户登录")
 @RestController
 @RequestMapping("jwt")
@@ -54,7 +59,7 @@ public class AuthController {
 
     @RequestMapping(value = "/chw/token", method = RequestMethod.POST)
     public ObjectRestResponse<String> chwCreateAuthenticationToken(
-            @RequestBody JwtAuthenticationRequest authenticationRequest,
+            @RequestBody JwtAuthenticationChwRequest authenticationRequest,
             HttpServletRequest request) throws Exception {
         log.info(authenticationRequest.getUsername()+" require logging...");
         // keliii 分请求类型处理token
@@ -63,10 +68,15 @@ public class AuthController {
             requestType = RequestTypeConstants.BASE;
         }
         final String token;
-        if (RequestTypeConstants.APP.equals(requestType)) {
-            token = appAuthService.login(authenticationRequest);
-        } else {
-            token = authService.login(authenticationRequest);
+        if(StrUtil.isNotBlank(requestType)) {
+            if(OPERATE.equals(requestType)) {
+                authenticationRequest.setBizType(1);
+            }else if (BUSINESS.equals(requestType)) {
+                authenticationRequest.setBizType(2);
+            }
+            token = authService.loginChw(authenticationRequest);
+        }else {
+            token = "";
         }
         return new ObjectRestResponse<String>().data(token);
     }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
 import com.github.wxiaoqi.security.auth.configuration.FeignConfiguration;
+import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationChwRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import io.swagger.annotations.ApiModelProperty;
@@ -22,6 +23,9 @@ public interface IUserService {
     @RequestMapping(value = "/api/user/validate", method = RequestMethod.POST)
     public UserInfo validate(@RequestBody JwtAuthenticationRequest authenticationRequest);
 
+    @RequestMapping(value = "/api/user/chw/validate", method = RequestMethod.POST)
+    public UserInfo validateChw(@RequestBody JwtAuthenticationChwRequest authenticationRequest);
+
     @RequestMapping(value = "/api/user/validate/small", method = RequestMethod.POST)
     public UserInfo validateSmall(@RequestBody JwtAuthenticationRequest authenticationRequest);
 

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java

@@ -2,11 +2,13 @@ package com.github.wxiaoqi.security.auth.service;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationChwRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 
 public interface AuthService {
     String login(JwtAuthenticationRequest authenticationRequest) throws Exception;
+    String loginChw(JwtAuthenticationChwRequest authenticationRequest) throws Exception;
     ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception;
     String refresh(String oldToken) throws Exception;
     void validate(String token) throws Exception;

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
+import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationChwRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
@@ -42,6 +43,11 @@ public class AppAuthServiceImpl implements AuthService {
         throw new UserInvalidException("用户不存在或账户密码错误!");
     }
 
+    @Override
+    public String loginChw(JwtAuthenticationChwRequest authenticationRequest) throws Exception {
+        return null;
+    }
+
     @Override
     public ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception {
         UserInfo info = userService.validateSmall(authenticationRequest);

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
+import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationChwRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtAuthenticationRequest;
 import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
@@ -41,6 +42,15 @@ public class AuthServiceImpl implements AuthService {
         throw new UserInvalidException("用户不存在或账户密码错误!");
     }
 
+    @Override
+    public String loginChw(JwtAuthenticationChwRequest authenticationRequest) throws Exception {
+        UserInfo info = userService.validateChw(authenticationRequest);
+        if (!StringUtils.isEmpty(info.getId())) {
+            return jwtTokenUtil.generateToken(new JWTInfo(info.getUsername(), info.getId() + "", info.getName()));
+        }
+        throw new UserInvalidException("用户不存在或账户密码错误!");
+    }
+
     @Override
     public ObjectRestResponse loginSmall(JwtAuthenticationRequest authenticationRequest) throws Exception {
         UserInfo info = userService.validateSmall(authenticationRequest);

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/util/user/JwtAuthenticationChwRequest.java

+package com.github.wxiaoqi.security.auth.util.user;
+
+import java.io.Serializable;
+
+public class JwtAuthenticationChwRequest implements Serializable {
+
+    private static final long serialVersionUID = -8445943548965154778L;
+
+    private String username;
+    private String password;
+    private Integer bizType;
+
+
+    public JwtAuthenticationChwRequest(String username, String password, Integer bizType) {
+        this.username = username;
+        this.password = password;
+        this.bizType = bizType;
+    }
+
+    public JwtAuthenticationChwRequest() {
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getBizType() {
+        return bizType;
+    }
+
+    public void setBizType(Integer bizType) {
+        this.bizType = bizType;
+    }
+}

ace-common/src/main/java/com/ace/cache/parser/impl/DefaultKeyGenerator.java

@@ -53,6 +53,9 @@ public class DefaultKeyGenerator extends IKeyGenerator {
                 if (express.length > 1) {
                     String field = express[1];
                     value = ReflectionUtils.getFieldValue(value, field);
+                    if (value == null || value.equals("null")) {
+                        value = "";
+                    }
                 }
 
                 if (isFirst) {

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/RequestTypeConstants.java

@@ -10,5 +10,7 @@ public class RequestTypeConstants {
     public static final String BASE = "BASE";
     public static final String APP = "APP";
     public static final String WX = "WX";
+    public static final String OPERATE = "OPERATE";
+    public static final String BUSINESS = "BUSINESS";
 
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 
@@ -56,6 +57,14 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
         return new ObjectRestResponse<Entity>();
     }
 
+    @ApiOperation("修改")
+    @RequestMapping(value = "/",method = RequestMethod.PUT)
+    @ResponseBody
+    public ObjectRestResponse<Entity> update2(@RequestBody Entity entity) throws Exception {
+        baseBiz.updateSelectiveById(entity);
+        return new ObjectRestResponse<Entity>();
+    }
+
     @ApiOperation("删除")
     @RequestMapping(value = "/{id}",method = RequestMethod.DELETE)
     @ResponseBody
@@ -101,7 +110,16 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
     @RequestMapping(value = "/del",method = RequestMethod.DELETE)
     @ResponseBody
     public ObjectRestResponse del( Entity entity){
+        Field field = ReflectionUtils.getAccessibleField(entity, "isDel");
+        Field field2 = ReflectionUtils.getAccessibleField(entity, "delete");
+
+        if(null != field) {
             ReflectionUtils.setFieldValue(entity,"isDel",1);
+        }
+        if(null != field2) {
+            ReflectionUtils.setFieldValue(entity,"delete",1);
+        }
+
         baseBiz.updateSelectiveById(entity);
         return ObjectRestResponse.succ();
     }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java

@@ -102,6 +102,9 @@ public class User {
     @Column(name = "biz_type")
     private Integer bizType;
 
+    @Column(name = "is_del")
+    private Integer isDel;
+
     private String attr1;
 
     private String attr2;
@@ -121,5 +124,4 @@ public class User {
     @Transient
     private List<Integer> companyIds;
 
-
 }
\ No newline at end of file

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/rest/UserRestInterface.java

@@ -51,6 +51,10 @@ public interface UserRestInterface  {
         }
     }
 
+    default UserDTO getAdminUserInfoV2() {
+        return getAdminUserInfoV2(Boolean.TRUE);
+    }
+
     default void checkAdminUser(){
         if(null == getAdminUserInfo()) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/CompanyInfoBiz.java

@@ -164,10 +164,12 @@ public class CompanyInfoBiz extends BaseBiz<CompanyInfoMapper, CompanyInfo>{
         String password=username.substring(5);
         user =new User();
         user.setUsername(username);
+        user.setMobilePhone(username);
         user.setName(companyInfo.getName());
         user.setPassword(password);
         user.setStatus(1);
         user.setCorporationId(branchId);
+        user.setCompanyId(companyInfo.getId().intValue());
         user.setDataAll(2);
         user.setDataCorporation(branchId+"");
         user.setAppUserId(appUserId);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.pagehelper.Page;
@@ -33,6 +35,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
 /**
  * ${DESCRIPTION}
@@ -85,9 +89,20 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
     public User getUserByUsername(String username){
         User user = new User();
         user.setUsername(username);
+        user.setIsDel(SYS_FALSE);
         return mapper.selectOne(user);
     }
 
+//    /**
+//     * 根据用户名获取用户信息
+//     * @param userId
+//     * @return
+//     */
+//    @Cache(key="user{1}")
+//    public User getUserByUserId(Integer userId){
+//        return mapper.selectByPrimaryKey(userId);
+//    }
+
     public TableResultResponse<BaseUserVo> selectPage(Query query, User currentUser) {
         List<BaseUserVo> userVos=new ArrayList<>();
         List<User> list =new  ArrayList<>();
@@ -180,6 +195,25 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
         return mapper.select(user);
     }
 
+    public List<User> getCountByUsernameBiz(String username, Integer bizType, String mobilePhone){
+//        User user = new User();
+//        user.setUsername(username);
+//        user.setBizType(bizType);
+//        user.setStatus(SYS_TRUE);
+//        user.setIsDel(SYS_FALSE);
+        //        return mapper.select(user);
+        return selectByWeekend(w -> {
+            w.andEqualTo(User::getUsername, username);
+            w.andEqualTo(User::getBizType, bizType);
+            w.andEqualTo(User::getIsDel, SYS_FALSE);
+            w.andEqualTo(User::getStatus, SYS_TRUE);
+            if(StrUtil.isNotBlank(mobilePhone)) {
+                w.andEqualTo(User::getMobilePhone, mobilePhone);
+            }
+            return w;
+        });
+    }
+
     public User getUserByUid(Integer userId){
         return mapper.selectByPrimaryKey(userId);
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/CurrentController.java

@@ -46,6 +46,7 @@ public class CurrentController {
     public @ResponseBody
     BaseResponse getGroups() throws Exception  {
         String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName();
+        //String userIdStr = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
         if (username == null) {
             throw new Exception();
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/ElementController.java

@@ -46,7 +46,7 @@ public class ElementController extends BaseController<ElementBiz, Element> {
   @RequestMapping(value = "/user", method = RequestMethod.GET)
   @ResponseBody
   public ObjectRestResponse<Element> getAuthorityElement(String menuId) {
-    int userId = userBiz.getUserByUsername(getCurrentUserName()).getId();
+    int userId = getCurrentUserIdInt();
     List<Element> elements = baseBiz.getAuthorityElementByUserId(userId + "",menuId);
     return new ObjectRestResponse<List<Element>>().data(elements);
   }
@@ -54,7 +54,7 @@ public class ElementController extends BaseController<ElementBiz, Element> {
   @RequestMapping(value = "/user/menu", method = RequestMethod.GET)
   @ResponseBody
   public ObjectRestResponse<Element> getAuthorityElement() {
-    int userId = userBiz.getUserByUsername(getCurrentUserName()).getId();
+    int userId = getCurrentUserIdInt();
     List<Element> elements = baseBiz.getAuthorityElementByUserId(userId + "");
     return new ObjectRestResponse<List<Element>>().data(elements);
   }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MenuController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
 import com.github.wxiaoqi.security.admin.entity.Element;
 import com.github.wxiaoqi.security.admin.entity.Menu;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -102,7 +103,8 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
     @RequestMapping(value = "/user/authorityTree", method = RequestMethod.GET)
     @ResponseBody
     public List<MenuTree> listUserAuthorityMenu(Integer parentId){
-        int userId = userBiz.getUserByUsername(getCurrentUserName()).getId();
+
+        int userId = getCurrentUserIdInt();
         try {
             if (parentId == null) {
                 parentId = this.getSystem().get(0).getId();
@@ -116,7 +118,7 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
     @RequestMapping(value = "/user/system", method = RequestMethod.GET)
     @ResponseBody
     public List<Menu> listUserAuthoritySystem() {
-        int userId = userBiz.getUserByUsername(getCurrentUserName()).getId();
+        int userId = getCurrentUserIdInt();
         return baseBiz.getUserAuthoritySystemByUserId(userId);
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

@@ -66,6 +66,7 @@ public class PublicController {
     public @ResponseBody
     ObjectRestResponse userinfoByToken(String token) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
+        //String userIdStr = userAuthUtil.getInfoFromToken(token).getId();
         if (username == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
@@ -80,6 +81,7 @@ public class PublicController {
     public @ResponseBody
     ObjectRestResponse userinfoByTokenV2(String token,boolean flag) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
+        //String userIdStr = userAuthUtil.getInfoFromToken(token).getId();
         if (username == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/chw/ChwUserController.java

 package com.github.wxiaoqi.security.admin.rest.chw;
 
+import cn.hutool.core.collection.CollUtil;
 import com.github.wxiaoqi.security.admin.biz.GroupBiz;
 import com.github.wxiaoqi.security.admin.biz.MenuBiz;
 import com.github.wxiaoqi.security.admin.biz.UserBiz;
@@ -16,9 +17,13 @@ import com.github.wxiaoqi.security.admin.vo.MenuTree;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.github.wxiaoqi.security.common.util.ReflectionUtils;
+import com.github.wxiaoqi.security.common.vo.DataInterBean;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -26,12 +31,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.lang.reflect.Field;
 import java.util.List;
 
+import static com.github.wxiaoqi.security.admin.entity.User.BIZ_TYPE_BUSINESS;
 import static com.github.wxiaoqi.security.admin.entity.User.BIZ_TYPE_OPERATE;
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.github.wxiaoqi.security.common.util.process.ResultCode.PARAM_ILLEGAL_CODE;
 
 /**
  * ${DESCRIPTION}
@@ -102,10 +110,36 @@ public class ChwUserController extends CommonBaseController implements UserRestI
         vo.setBizType(BIZ_TYPE_OPERATE);
         vo.setStatus(SYS_TRUE);
         if (StringUtils.isNotBlank(username)) {
-            List<User> list = userBiz.getCountByUsername(username);
+            List<User> list = userBiz.getCountByUsernameBiz(username, BIZ_TYPE_OPERATE, null);
+            if (list.size() > 0) {
+                return ObjectRestResponse.createFailedResult(ResCode.USER_IS_EXIST.getCode(), ResCode.USER_IS_EXIST.getDesc());
+            }
+        }
+        userBiz.insertSelective(vo);
+        //添加权限关系
+        groupBiz.modifyUserGroups(vo.getId(), vo.getMembers());
+        return ObjectRestResponse.succ();
+    }
+
+    @RequestMapping(value = "/business/addUser", method = RequestMethod.POST)
+    @IgnoreClientToken
+    public ObjectRestResponse<User> businessAdd(@RequestBody UserController.UserVO vo) {
+        DataInterBean dataInterBean = getDataInter();
+        String username = vo.getUsername();
+        vo.setBizType(BIZ_TYPE_BUSINESS);
+        vo.setStatus(SYS_TRUE);
+        vo.setCorporationId(getAdminUserInfoV2().getCorporationId());
+        if(CollUtil.isNotEmpty(dataInterBean.getDataCompanyIds())) {
+            vo.setCompanyId(dataInterBean.getDataCompanyIds().get(0));
+        }
+
+        if (StringUtils.isNotBlank(username)) {
+            List<User> list = userBiz.getCountByUsernameBiz(username, BIZ_TYPE_BUSINESS, vo.getMobilePhone());
             if (list.size() > 0) {
                 return ObjectRestResponse.createFailedResult(ResCode.USER_IS_EXIST.getCode(), ResCode.USER_IS_EXIST.getDesc());
             }
+        }else {
+            throw new BaseException("手机号已被使用", PARAM_ILLEGAL_CODE);
         }
         userBiz.insertSelective(vo);
         //添加权限关系
@@ -116,31 +150,63 @@ public class ChwUserController extends CommonBaseController implements UserRestI
     @RequestMapping(value = "/operate/{id}", method = RequestMethod.PUT)
     @ResponseBody
     public ObjectRestResponse<User> update(@RequestBody UserController.UserVO vo) {
+        if (!edit(vo, BIZ_TYPE_OPERATE)){
+            return ObjectRestResponse.createFailedResult(ResCode.USER_IS_EXIST.getCode(), ResCode.USER_IS_EXIST.getDesc());
+        }
+        return new ObjectRestResponse<User>();
+    }
+
+    @RequestMapping(value = "/business/{id}", method = RequestMethod.PUT)
+    @ResponseBody
+    public ObjectRestResponse<User> businessUpdate(@RequestBody UserController.UserVO vo) {
+        if (!edit(vo, BIZ_TYPE_BUSINESS)){
+            return ObjectRestResponse.createFailedResult(ResCode.USER_IS_EXIST.getCode(), ResCode.USER_IS_EXIST.getDesc());
+        }
+        return new ObjectRestResponse<User>();
+    }
+
+    private boolean edit(UserController.UserVO vo, Integer bizType) {
         handleDataLimit(vo);
         String username = vo.getUsername();
         if (StringUtils.isNotBlank(username)) {
             List<User> list = userBiz.getCountByUsername(username);
             if (list.size() > 1) {
-                return ObjectRestResponse.createFailedResult(ResCode.USER_IS_EXIST.getCode(), ResCode.USER_IS_EXIST.getDesc());
+                return false;
             }
             if (list.size() == 1) {
                 User user = list.get(0);
-                if (!user.getId().equals(vo.getId())) {
-                    return ObjectRestResponse.createFailedResult(ResCode.USER_IS_EXIST.getCode(), ResCode.USER_IS_EXIST.getDesc());
+                if (!user.getId().equals(vo.getId()) && bizType != user.getBizType()) {
+                    return false;
                 }
             }
         }
         userBiz.updateSelectiveById(vo);
         //添加权限关系
         groupBiz.modifyUserGroups(vo.getId(), vo.getMembers());
-        return new ObjectRestResponse<User>();
+        return true;
     }
 
     @RequestMapping(value = "/operate/{id}", method = RequestMethod.DELETE)
     @ResponseBody
     public ObjectRestResponse<User> remove(@PathVariable int id) {
-        userBiz.deleteById(id);
-        return new ObjectRestResponse<User>();
+        del(id, BIZ_TYPE_OPERATE);
+        return new ObjectRestResponse();
+    }
+
+    @RequestMapping(value = "/business/{id}", method = RequestMethod.DELETE)
+    @ResponseBody
+    public ObjectRestResponse businessRemove(@PathVariable int id) {
+        del(id, BIZ_TYPE_BUSINESS);
+        return new ObjectRestResponse();
+    }
+
+    private void del (int id, Integer bizType) {
+        User user = userBiz.selectById(id);
+        if(null != user && user.getBizType() == bizType) {
+            del(new User(){{
+                setId(id);
+            }});
+        }
     }
 
     private void handleDataLimit(@RequestBody UserController.UserVO dto) {
@@ -160,4 +226,18 @@ public class ChwUserController extends CommonBaseController implements UserRestI
             }
         }
     }
+
+   private void del(User entity) {
+       Field field = ReflectionUtils.getAccessibleField(entity, "isDel");
+       Field field2 = ReflectionUtils.getAccessibleField(entity, "delete");
+
+       if(null != field) {
+           ReflectionUtils.setFieldValue(entity,"isDel",1);
+       }
+       if(null != field2) {
+           ReflectionUtils.setFieldValue(entity,"delete",1);
+       }
+
+       userBiz.updateSelectiveById(entity);
+   }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/UserRest.java

@@ -43,7 +43,7 @@ public class UserRest {
 
     @RequestMapping(value = "/user/chw/validate", method = RequestMethod.POST)
     public @ResponseBody UserInfo chwValidate(@RequestBody Map<String,String> body){
-        return permissionService.validate(body.get("username"),body.get("password"));
+        return permissionService.validateChw(body.get("username"), body.get("password"), Integer.valueOf(body.get("bizType")));
     }
 
     @RequestMapping(value = "/user/validate/small", method = RequestMethod.POST)

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/PermissionService.java

@@ -66,6 +66,24 @@ public class PermissionService {
         }
         return info;
     }
+
+    public UserInfo validateChw(String username,String password, Integer bizType){
+        UserInfo info = new UserInfo();
+        //User user = userBiz.getUserByUsername(username);
+        User user = userBiz.selectOne(new User(){{
+            setUsername(username);
+            setBizType(bizType);
+            setIsDel(0);
+        }});
+        if (user!=null){
+            if (encoder.matches(password, user.getPassword())) {
+                BeanUtils.copyProperties(user, info);
+                info.setId(user.getId().toString());
+            }
+        }
+        return info;
+    }
+
      //小程序登录
     public UserInfo validateSmall(String username,String password){
         UserInfo info = new UserInfo();
@@ -153,9 +171,11 @@ public class PermissionService {
 
     public FrontUser getUserInfo(String token) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
+        //String userIdStr = userAuthUtil.getInfoFromToken(token).getId();
         if (username == null) {
             return null;
         }
+//        Integer userId = Integer.valueOf(userIdStr);
         UserInfo user = this.getUserByUsername(username);
         FrontUser frontUser = new FrontUser();
         BeanUtils.copyProperties(user, frontUser);
@@ -173,6 +193,7 @@ public class PermissionService {
 
     public List<MenuTree> getMenusByUsername(String token,String state) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
+        //String userIdStr = userAuthUtil.getInfoFromToken(token).getId();
         if (username == null) {
             return null;
         }

ace-modules/ace-admin/src/main/resources/mapper/UserMapper.xml

@@ -71,6 +71,7 @@
     LEFT JOIN company_info i ON c.company_id=i.id
     LEFT JOIN company_info ci ON u.corporation_id=ci.id
     <where>
+        u.is_del = 0
       <if test="bizType != null">
         and u.biz_type = #{bizType}
       </if>

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/DictionaryKey.java

@@ -92,4 +92,9 @@ public class DictionaryKey {
      * 取消时间缓冲(分钟)
      */
     public static final String CANCEL_TIME_BUFFER = "CANCEL_TIME_BUFFER";
+
+    /**
+     * 商品类别
+     */
+    public static final String VEHICLE_GOODS_TYPE = "VEHICLE_GOODS_TYPE";
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBrand.java

@@ -48,13 +48,6 @@ public class VehicleBrand implements Serializable {
 	@ApiModelProperty(value = "品牌英文名称")
     private String enName;
 	
-	    /**
-     *  品牌首字母
-     */
-    @Column(name = "index")
-	@ApiModelProperty(value = "品牌首字母")
-    private String index;
-	
 	    /**
      *  品牌logo
      */
@@ -107,9 +100,9 @@ public class VehicleBrand implements Serializable {
 	    /**
      *  品牌删除状态 1：正常 2：删除
      */
-    @Column(name = "delete")
-	@ApiModelProperty(value = "品牌删除状态 1：正常 2：删除")
-    private Integer delete;
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "品牌删除状态 0：正常 1：删除")
+    private Integer isDel;
 	
 	    /**
      *  品牌审核备注

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCata.java

@@ -30,6 +30,11 @@ public class VehicleCata implements Serializable {
 	@ApiModelProperty(value = "车型id")
 	private Integer vehicleModelId;
 
+	    //车辆id
+    @Column(name = "vehicle_id")
+	@ApiModelProperty(value = "车辆id")
+    private Integer vehicleId;
+	
 	    //分类id
     @Column(name = "cata_id")
 	@ApiModelProperty(value = "分类id")

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCategory.java

@@ -32,14 +32,14 @@ public class VehicleCategory implements Serializable {
      */
     @Column(name = "brand_id")
 	@ApiModelProperty(value = "")
-    private Long brandId;
+    private Integer brandId;
 	
 	    /**
      *  
      */
     @Column(name = "brand_name")
 	@ApiModelProperty(value = "")
-    private Long brandName;
+    private String brandName;
 	
 	    /**
      *  
@@ -65,9 +65,9 @@ public class VehicleCategory implements Serializable {
 	    /**
      *  品牌删除状态 1：正常 2：删除
      */
-    @Column(name = "delete")
-	@ApiModelProperty(value = "品牌删除状态 1：正常 2：删除")
-    private Integer delete;
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "品牌删除状态 0：正常 1：删除")
+    private Integer isDel;
 	
 	    /**
      *  创建时间

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehiclePlatCata.java

@@ -71,7 +71,7 @@ public class VehiclePlatCata implements Serializable {
     private Long updTime;
 
     //是否多选
-	@Column(name = "isMore")
+	@Column(name = "is_more")
 	@ApiModelProperty(value = "多选 0:单选 1:多选" )
 	private Integer isMore;
 
@@ -81,4 +81,13 @@ public class VehiclePlatCata implements Serializable {
 	@ApiModelProperty(value = "是否作为客户端查询条件:0-否,1-是" )
 	private Integer startUsing;
 
+	//商家录入是否多选 0--否；1--是
+	@Column(name = "is_input_more")
+	@ApiModelProperty(value = "商家录入是否多选 0--否；1--是" )
+	private Integer isInputMore;
+
+	//类型 1--房车；2--机车；3--游艇
+	@Column(name = "goods_type")
+	@ApiModelProperty(value = "类型 1--房车；2--机车；3--游艇" )
+	private Integer goodsType;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchOldDTO.java

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+@Data
+public class CompanySearchOldDTO {
+    Integer page;
+    Integer limit;
+    Integer addrCity;
+    String lon;
+    String lat;
+    Integer state;
+    Integer isShow = 1;
+    Integer isDel = 0;
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/VehicleApplication.java

@@ -8,6 +8,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {
@@ -23,6 +24,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableFeignClients(value = {"com.github.wxiaoqi.security","com.xxfc.platform.*.feign"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @AddBasicConfiguration
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.vehicle.mapper")
 public class VehicleApplication {
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -24,10 +24,7 @@ import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
-import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
-import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
-import com.xxfc.platform.vehicle.pojo.CompanySearchVO;
+import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO;
@@ -231,6 +228,11 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return PageDataVO.pageInfo(branchCompanyPageInfo);
     }
 
+    public PageDataVO<BranchCompany> searchOld(CompanySearchOldDTO vo) {
+        PageHelper.startPage(vo.getPage(), vo.getLimit());
+        PageInfo<BranchCompany> branchCompanyPageInfo = new PageInfo<>(mapper.searchOld(vo.getLon(), vo.getLat(), vo.getAddrCity(), vo.getState(), vo.getIsShow(), vo.getIsDel()));
+        return PageDataVO.pageInfo(branchCompanyPageInfo);
+    }
 
     public  List<CompanySearchVO>  getList(CompanySearchDTO vo){
         return  mapper.search(vo);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Arrays;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -178,7 +179,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param parentId
      * @return
      */
-    public ObjectRestResponse fingCatasByParentId(Integer parentId) {
+    public ObjectRestResponse<List<VehiclePlatCata>> fingCatasByParentId(Integer parentId) {
 
         Example example = Example.builder(VehiclePlatCata.class)
                 .where(WeekendSqls.<VehiclePlatCata>custom()
@@ -199,11 +200,11 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param limit
      * @return
      */
-    public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort) {
+    public ObjectRestResponse getCascades(Integer page, Integer limit, Integer sort, Integer goodsType) {
         try {
             //标签列表页面
             if (sort == null || sort == 0) {
-                return getPage(page, limit);
+                return getPage(page, limit, goodsType);
             }
 
             //增加车型页面
@@ -235,12 +236,16 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
     }
 
     @Cache(key = RedisKey.BRANCH_COMPANY_CATA_PAGE)
-    private ObjectRestResponse getPage(Integer page, Integer limit) {
+    private ObjectRestResponse getPage(Integer page, Integer limit, Integer goodsType) {
         //获取一级标签
+        WeekendSqls<VehiclePlatCata> weekendSqls = WeekendSqls.<VehiclePlatCata>custom();
+        if(null != goodsType){
+            weekendSqls.andEqualTo(VehiclePlatCata::getGoodsType, goodsType);
+        }
+        weekendSqls.andEqualTo(VehiclePlatCata::getParentId, 0)
+                .andEqualTo(VehiclePlatCata::getState, 0);
         Example example = Example.builder(VehiclePlatCata.class)
-                .where(WeekendSqls.<VehiclePlatCata>custom()
-                        .andEqualTo(VehiclePlatCata::getParentId, 0)
-                        .andEqualTo(VehiclePlatCata::getState, 0))
+                .where(weekendSqls)
                 .orderByAsc("rank")
                 .build();
 
@@ -511,4 +516,8 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         });
         return cataVos;
     }
+
+    private VehiclePlatCataBiz getMyBiz() {
+        return AopContext.currentProxy() != null ? (VehiclePlatCataBiz) AopContext.currentProxy() : this;
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java

@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdListMapper<BranchCompany,Integer> {
+    List<BranchCompany> searchOld(@Param("lon") String lon, @Param("lat") String lat, @Param("addrCity") Integer addrCity, Integer state, Integer isShow, Integer isDel);
     List<CompanySearchVO> search(CompanySearchDTO companySearchDTO);
     List<BranchCompany> selectByZoneId(Map<String, Object> param);
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -16,10 +16,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
-import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
-import com.xxfc.platform.vehicle.pojo.CompanySearchVO;
+import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyAreaDTO;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
@@ -248,4 +245,11 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         return ObjectRestResponse.succ(baseBiz.getList(vo));
     }
 
+    @RequestMapping(value ="/search",method = RequestMethod.GET)
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public RestResponse<PageDataVO<BranchCompany>> search(@Validated CompanySearchOldDTO vo) {
+        return RestResponse.data(baseBiz.searchOld(vo));
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/PublicController.java

+package com.xxfc.platform.vehicle.rest;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONException;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.collect.Maps;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.biz.*;
+import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
+import com.xxfc.platform.vehicle.entity.*;
+import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
+import com.xxfc.platform.vehicle.pojo.*;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleFindDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
+import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
+import com.xxfc.platform.vehicle.rest.admin.BgVehicleCategoryController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.VEHICLE;
+
+@RestController
+@RequestMapping("/public")
+@Slf4j
+@IgnoreClientToken
+@Api(value="公共controller",tags={"公共controller"})
+public class PublicController {
+
+    @Autowired
+    ThirdFeign thirdFeign;
+
+    @Data
+    public static class GoodsType {
+        private Integer id;
+        private String name;
+    }
+
+    @ApiOperation("查询所有类别")
+    @IgnoreUserToken
+    @RequestMapping(value = "/app/unauth/goodsType/all",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse<List<GoodsType>> goodsTypeAll() {
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        String jsonStr = dictionaryMap.get(VEHICLE+ "_"+ DictionaryKey.VEHICLE_GOODS_TYPE).getDetail();
+        return ObjectRestResponse.succ(JSONUtil.toList(JSONUtil.parseArray(jsonStr), GoodsType.class));
+    }
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCataController.java

@@ -98,7 +98,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
           ,@PathVariable Integer limit
           ,@PathVariable Integer sort){
 
-        return   baseBiz.getCascades(page,limit,sort);
+        return   baseBiz.getCascades(page,limit,sort,null);
     }
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/BgVehicleBrandController.java

+package com.xxfc.platform.vehicle.rest.admin;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.vehicle.biz.VehicleBrandBiz;
+import com.xxfc.platform.vehicle.entity.VehicleBrand;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("backstage/vehicleBrand")
+public class BgVehicleBrandController extends BaseController<VehicleBrandBiz, VehicleBrand> {
+
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/BgVehicleCataController.java

+package com.xxfc.platform.vehicle.rest.admin;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
+import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.common.VehicleBaseController;
+import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
+import com.xxfc.platform.vehicle.pojo.Cascade;
+import com.xxfc.platform.vehicle.pojo.CataVo;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePlatCataVo;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/backstage/cata")
+@Slf4j
+@IgnoreClientToken
+
+public class BgVehicleCataController extends VehicleBaseController<VehiclePlatCataBiz> {
+
+    @Autowired
+    VehicleCataBiz vehicleCataBiz;
+
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public RestResponse update(@RequestBody CataVo cataVo) throws Exception {
+        return baseBiz.update(cataVo);
+    }
+    @RequestMapping(value = "/app/all", method = RequestMethod.POST)
+    public RestResponse test() throws Exception {
+        AppUserDTO userDTO =getUserInfo();
+
+        return RestResponse.data(userDTO);
+    }
+
+    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.POST)
+    @IgnoreUserToken
+    public RestResponse all() throws Exception {
+        return RestResponse.data(baseBiz.findTypeTree());
+    }
+
+    @RequestMapping(value = "/bind", method = RequestMethod.POST)
+    public RestResponse bind(
+            @RequestParam(value = "ids",defaultValue = "") String  ids,
+            @RequestParam(value = "modelId",defaultValue = "0") Integer  modelId
+    ) throws Exception {
+        return vehicleCataBiz.updateCataByModel(ids,modelId);
+    }
+
+
+    /**
+     * 根据父类id获取子标签
+     * @param parentId
+     * @return
+     */
+    @GetMapping(value = "/add/fingCatasByParentId/{parentId}")
+    public ObjectRestResponse<List<VehiclePlatCata>> fingCatasByParentId(@PathVariable("parentId") Integer parentId ){
+        return   baseBiz.fingCatasByParentId(parentId);
+
+    }
+
+    /**
+     * 查询一个一级标签及其子标签
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/findCascade")
+    public ObjectRestResponse findCascade(Integer id){
+        return baseBiz.findCascade(id);
+
+    }
+
+
+    /**
+     * 分页或不分页,获取一级标签及其子标签
+     * #@param dto.page 当前页
+     * #@param dto.limit 每页条数
+     * #@param dto.sort 分类 0-标签管理页面,1-增加车辆页面
+     * @return
+     */
+    @GetMapping(value = "/operation/getCascades")
+    public ObjectRestResponse getCascades(PageDTO dto){
+        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType());
+    }
+
+    /**
+     * 分页或不分页,获取一级标签及其子标签
+     * #@param dto.page 当前页
+     * #@param dto.limit 每页条数
+     * #@param dto.sort 分类 0-标签管理页面,1-增加车辆页面
+     * @return
+     */
+    @GetMapping(value = "/business/getCascades")
+    public ObjectRestResponse getBusinessCascades(PageDTO dto){
+        dto.setSort(1);
+        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort(), dto.getGoodsType());
+    }
+
+    @Data
+    public static class PageDTO extends PageParam {
+        Integer sort;
+        Integer goodsType;
+    }
+
+
+    /**
+     * 级联添加
+     * @param cascade
+     * @return
+     */
+    @PostMapping(value = "/add/addCascade/")
+    @Transactional
+    public ObjectRestResponse addCascade(@RequestBody Cascade<VehiclePlatCata> cascade){
+
+            return baseBiz.addCascade(cascade);
+
+
+    }
+
+
+    /**
+     * 修改和增加一二级标签
+     * @param cas
+     * @return
+     */
+    @PostMapping("/operation/updateAndAdd")
+    public ObjectRestResponse save(@RequestBody Cascade<VehiclePlatCata> cas){
+
+        return  baseBiz.updateAndAdd(cas);
+    }
+
+
+    /**
+     * 修改标签排序
+     * @param id
+     * @param rank
+     * @return
+     */
+    @PutMapping("/add/updateParentRank/{id}/{rank}")
+    public ObjectRestResponse updateParentRank(@PathVariable("id")  Integer id,@PathVariable("rank") Integer rank){
+
+        return  baseBiz.updateParentRank(id,rank);
+    }
+
+
+    /**
+     * 查询当前车型拥有的标签
+     * @param ids
+     * @return
+     */
+    @GetMapping("/add/getCatasByIds/{ids}")
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable String ids){
+        return  baseBiz.getCatasByIds(ids);
+    }
+
+    /**
+     * 删除一级标签及其子标签
+     * #@param vehiclePlatCata.id 标签id
+     * @return
+     */
+    @DeleteMapping("/operation/deleteCascadeById")
+    public ObjectRestResponse deleteCascadeById(@RequestBody VehiclePlatCata vehiclePlatCata){
+        return  baseBiz.deleteCascadeById(vehiclePlatCata.getId());
+    }
+
+
+    /**
+     * 修改客户端查询条件
+     * @param id
+     * @param startUsing
+     * @return
+     */
+    @PutMapping("/add/setStartUsingById/{id}/{startUsing}")
+    public ObjectRestResponse setStartUsingById(@PathVariable("id") Integer id,@PathVariable("startUsing") Integer startUsing){
+        return  baseBiz.setStartUsingById(id,startUsing);
+    }
+
+    /**
+     * 修改单选还是多选
+     * @param id
+     * @param isMore
+     * @return
+     */
+    @PutMapping("/add/setIsMore/{id}/{isMore}")
+    public ObjectRestResponse setIsMore (@PathVariable("id") Integer id,@PathVariable("isMore") Integer isMore){
+        return  baseBiz.setIsore(id,isMore);
+    }
+
+    /**
+     * 根据类型id查询分类
+     * @param type
+     * @return
+     */
+    @GetMapping("/app/unauth/types")
+    public ObjectRestResponse<List<VehiclePlatCataVo>> findVehiclePlatCate(@RequestParam(value = "type",required = false,defaultValue = "7") Integer type){
+        List<VehiclePlatCataVo> category = baseBiz.findVehicleCategoryByParentId(type);
+        return ObjectRestResponse.succ(category);
+    }
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/BgVehicleCategoryController.java

 package com.xxfc.platform.vehicle.rest.admin;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.biz.VehicleCategoryBiz;
 import com.xxfc.platform.vehicle.entity.VehicleCategory;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+import static com.xxfc.platform.universal.constant.DictionaryKey.VEHICLE;
 
 @RestController
-@RequestMapping("admin/vehicleCategory")
+@RequestMapping("backstage/vehicleCategory")
 public class BgVehicleCategoryController extends BaseController<VehicleCategoryBiz, VehicleCategory> {
 
+
+    @ApiOperation("添加")
+    @RequestMapping(value = "addCategory",method = RequestMethod.POST)
+    @ResponseBody
+    public ObjectRestResponse<VehicleCategory> addCategory(@RequestBody VehicleCategory entity) {
+        baseBiz.insertSelective(entity);
+        return new ObjectRestResponse<VehicleCategory>();
+    }
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -24,6 +24,34 @@
         <result column="state" property="state"/>
     </resultMap>
 
+    <select id="searchOld" resultType="com.xxfc.platform.vehicle.pojo.CompanySearchVO">
+        select *
+        <if test="lon != null and lat != null">
+            , st_distance_sphere(point(#{lon}, #{lat}), point(longitude, latitude)) as distance
+        </if>
+        from branch_company
+        <where>
+            <if test="addrCity != null">
+                and (addr_city = #{addrCity} or addr_province = #{addrCity} or addr_town = #{addrCity})
+            </if>
+            <if test="lon != null and lat != null">
+                and longitude is not null and latitude is not null
+            </if>
+            <if test="state != null">
+                and state = #{state}
+            </if>
+            <if test="isShow != null">
+                and is_show = #{isShow}
+            </if>
+            <if test="isDel != null">
+                and is_del = #{isDel}
+            </if>
+        </where>
+        <if test="lon != null and lat != null">
+            order by distance asc
+        </if>
+    </select>
+
     <select id="search" parameterType="com.xxfc.platform.vehicle.pojo.CompanySearchDTO" resultType="com.xxfc.platform.vehicle.pojo.CompanySearchVO">
         select c.*,i.name as companyName
         <if test="lon != null and lat != null">

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBrandMapper.xml

@@ -9,7 +9,6 @@
         <result property="code" column="code"/>
         <result property="cnName" column="cn_name"/>
         <result property="enName" column="en_name"/>
-        <result property="index" column="index"/>
         <result property="logo" column="logo"/>
         <result property="banner" column="banner"/>
         <result property="story" column="story"/>
@@ -17,7 +16,7 @@
         <result property="status" column="status"/>
         <result property="recommend" column="recommend"/>
         <result property="audit" column="audit"/>
-        <result property="delete" column="delete"/>
+        <result property="isDel" column="is_del"/>
         <result property="auditRemark" column="audit_remark"/>
         <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCataMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="com.xxfc.platform.vehicle.entity.VehicleCata" id="vehicleCataMap">
         <result property="id" column="id"/>
         <result property="vehicleModelId" column="vehicle_model_id"/>
+        <result property="vehicleId" column="vehicle_id"/>
         <result property="cataId" column="cata_id"/>
         <result property="isdel" column="isdel"/>
         <result property="crtTime" column="crt_time"/>