修改用户列表设置权限

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

@@ -14,6 +14,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import javafx.print.Collation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.collections.CollectionUtils;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
 
     @Autowired
@@ -74,7 +76,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         List<Integer> citysCode = pageInfo.getList().parallelStream().map(AppUserManageVo::getCityCode).collect(Collectors.toList());
         HashSet<Integer> set = new HashSet<>();
         set.addAll(citysCode);
-        ObjectRestResponse<List<SysRegion>> orr = vehicleFeign.getSysRegionByIds(set);
+        ObjectRestResponse<List<SysRegion>> orr = vehicleFeign.getSysRegion(set);
         List<SysRegion> sysRegions = orr.getData();
         if (CollectionUtils.isNotEmpty(sysRegions)) {
             HashMap<Long, String> map = new HashMap<>();
@@ -82,7 +84,9 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
                  map.put(sysRegion.getId(),sysRegion.getName());
             }
             for (AppUserManageVo appUserManageVo : pageInfo.getList()) {
-                  appUserManageVo.setCityName(map.get(appUserManageVo.getCityCode()));
+                Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
+                String crtyName = map.get(cityCode);
+                appUserManageVo.setCityName(crtyName);
             }
         }
         return pageInfo;

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

@@ -65,7 +65,6 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
     }
 
 
-
     @DeleteMapping("/manage/delMembershipGrade/{id}")
     public ObjectRestResponse delMembershipGrade(@PathVariable Integer id){
         BaseUserMemberLevel baseUserMemberLevel = new BaseUserMemberLevel();

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -87,11 +87,11 @@ public interface VehicleFeign {
    RestResponse getSysRegionById(@PathVariable(value = "id") Integer id);
     /**
      * 多个城市code获取城市代码
-     * @param ids
+     * @param idSet
      * @return
      */
-    @PostMapping("/sysRegion/getSysRegionByIds")
-    ObjectRestResponse<List<SysRegion>> getSysRegionByIds(@RequestBody Set<Integer> ids);
+    @PostMapping("/sysRegion/getSysRegion")
+    ObjectRestResponse<List<SysRegion>> getSysRegion(Set<Integer> idSet);
 
     /**
      * 获取公司所在的城市

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

@@ -38,11 +38,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -332,6 +328,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      */
     public Set<Integer> getCity(String zoneList, String companyList) {
         List<Integer> list = vehicleBiz.dataCompany(zoneList, companyList);
+        if (CollectionUtils.isEmpty(list)) {
+            return new HashSet<>();
+        }
         Example exa =new Example(BranchCompany.class);
         Example.Criteria criteria = exa.createCriteria();
         criteria.andIn("id",list);

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

@@ -12,11 +12,13 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.assertj.core.util.Arrays;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -29,35 +31,37 @@ public class SysRegionController extends BaseController<SysRegionBiz> {
 
     /**
      * 父类id获取子类对象
+     *
      * @param id
      * @return
      */
     @IgnoreUserToken
-    @RequestMapping(value ="/sons/{id}",method = RequestMethod.GET)
-    public RestResponse<List<SysRegion>> getSonRegion(@PathVariable Long id){
+    @RequestMapping(value = "/sons/{id}", method = RequestMethod.GET)
+    public RestResponse<List<SysRegion>> getSonRegion(@PathVariable Long id) {
         return RestResponse.data(baseBiz.getSonRegion(id));
     }
 
     /**
      * 通过属性获取省
+     *
      * @param type
      * @return
      */
     @IgnoreUserToken
-    @RequestMapping(value ="/getSonRegionByType/{type}",method = RequestMethod.GET)
-    public RestResponse<List<SysRegion>> getSysRegionByType(@PathVariable Integer type){
+    @RequestMapping(value = "/getSonRegionByType/{type}", method = RequestMethod.GET)
+    public RestResponse<List<SysRegion>> getSysRegionByType(@PathVariable Integer type) {
         return RestResponse.data(baseBiz.getSysRegionByType(type));
     }
 
 
-    @RequestMapping(value ="",method = RequestMethod.GET)
-    public RestResponse<List<SysRegion>> getRegion(@RequestParam String idListJson){
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public RestResponse<List<SysRegion>> getRegion(@RequestParam String idListJson) {
         try {
-            List<Long> ids = JSON.parseArray(idListJson,Long.class);
+            List<Long> ids = JSON.parseArray(idListJson, Long.class);
             return RestResponse.data(baseBiz.getRegionsByCodes(ids));
         } catch (JSONException ex) {
             return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
-        } catch (CustomIllegalParamException ex){
+        } catch (CustomIllegalParamException ex) {
             return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
         }
     }
@@ -65,46 +69,52 @@ public class SysRegionController extends BaseController<SysRegionBiz> {
 
     /**
      * 根据多个id查找省份
+     *
      * @param ids
      * @return
      */
     @GetMapping("/getSysRegionByIds/{ids}")
-    public RestResponse getSysRegionByIds(@PathVariable String ids){
+    public RestResponse getSysRegionByIds(@PathVariable String ids) {
         Example exam = Example.builder(SysRegion.class)
                 .where(WeekendSqls.<SysRegion>custom()
                         .andIn(SysRegion::getId, Arrays.asList(ids.split(",")))).build();
-        return RestResponse.suc( baseBiz.selectByExample(exam));
+        return RestResponse.suc(baseBiz.selectByExample(exam));
 
     }
 
     /**
      * 根据一个id获取城市
+     *
      * @param id
      * @return
      */
     @GetMapping("/getSysRegionById/{id}")
-    public RestResponse getSysRegionById(@PathVariable Integer id){
+    public RestResponse getSysRegionById(@PathVariable Integer id) {
         Example exam = Example.builder(SysRegion.class)
                 .where(WeekendSqls.<SysRegion>custom()
-                        .andEqualTo(SysRegion::getId,id)).build();
+                        .andEqualTo(SysRegion::getId, id)).build();
         List<SysRegion> sysRegions = baseBiz.selectByExample(exam);
-        if (sysRegions==null||sysRegions.size()!=1) {
+        if (sysRegions == null || sysRegions.size() != 1) {
             RestResponse.suc();
         }
-        return RestResponse.suc( sysRegions.get(0));
+        return RestResponse.suc(sysRegions.get(0));
 
     }
+
     /**
      * 根据一个id获取城市
-     * @param ids
+     *
+     * @param idSet
      * @return
      */
-    @PostMapping("/getSysRegionByIds")
-   public ObjectRestResponse<List<SysRegion>> getSysRegionByIds(@RequestBody Set<Integer> ids){
-        Example exam = Example.builder(SysRegion.class)
-                .where(WeekendSqls.<SysRegion>custom()
-                        .andIn(SysRegion::getId,ids)
-                ).build();
+    @PostMapping("/getSysRegion")
+    public ObjectRestResponse<List<SysRegion>> getSysRegion(@RequestBody Set<Integer> idSet) {
+        if (CollectionUtils.isEmpty(idSet)){
+            return ObjectRestResponse.succ();
+        }
+        Example exam = new Example(SysRegion.class);
+        Example.Criteria criteria = exam.createCriteria();
+        criteria.andIn("id",idSet);
         List<SysRegion> sysRegions = baseBiz.selectByExample(exam);
         return ObjectRestResponse.succ(sysRegions);
 

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

@@ -34,9 +34,8 @@ public class CityController extends BaseController<VehicleBiz> {
      */
     @GetMapping("/corporationCity")
     public ObjectRestResponse<Set<Integer>> corporationCity(
-            @RequestParam("zoneList") String zoneList,
-            @RequestParam("companyList") String companyList) {
-
+            @RequestParam(value = "zoneList",defaultValue = "") String zoneList,
+            @RequestParam(value = "companyList",defaultValue = "") String companyList) {
         return ObjectRestResponse.succ(branchCompanyBiz.getCity(zoneList,companyList));
     }
 }