修改用户相关

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

@@ -9,8 +9,20 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * ${DESCRIPTION}
@@ -27,7 +39,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAceCache
 @EnableTransactionManagement
 @MapperScan("com.github.wxiaoqi.security.admin.mapper")
-@EnableSwagger2Doc
+//@EnableSwagger2Doc
 public class AdminBootstrap {
     public static void main(String[] args) {
         new SpringApplicationBuilder(AdminBootstrap.class).run(args);    }

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

@@ -35,6 +35,8 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
     private ResourceAuthorityMapper resourceAuthorityMapper;
     @Autowired
     private MenuMapper menuMapper;
+    @Autowired
+    private GroupMapper groupMapper;
 
     @Override
     public void insertSelective(Group entity) {
@@ -58,6 +60,16 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
         super.updateById(entity);
     }
 
+    /**
+     * 获取用户关联群组
+     *
+     * @param userId
+     * @return
+     */
+    public Group getUserGroups(int userId) {
+        return groupMapper.selectMemberGroupByUserId(userId);
+    }
+
     /**
      * 获取群组关联用户
      *
@@ -68,6 +80,7 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
         return new GroupUsers(userMapper.selectMemberByGroupId(groupId), userMapper.selectLeaderByGroupId(groupId));
     }
 
+
     /**
      * 变更群主所分配用户
      *

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/SwaggerConfig.java

+package com.github.wxiaoqi.security.admin.config;
+
+import com.spring4all.swagger.Swagger2Configuration;
+import com.spring4all.swagger.SwaggerAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @Description : swagger配置配置
+* @Author : Mars
+* @Date : 2017年9月6日
+*/
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig{
+	
+    /**
+     * Every Docket bean is picked up by the swagger-mvc framework - allowing for multiple
+     * swagger groups i.e. same code base multiple swagger resource listings.
+     */
+    @Bean
+    public Docket customDocket(){
+    	ParameterBuilder ticketPar = new ParameterBuilder();
+        List<Parameter> pars = new ArrayList<Parameter>();
+    	ticketPar.name("Authorization").description("user Authorization")
+    	.modelRef(new ModelRef("string")).parameterType("header")
+    	.required(false).build(); //header中的ticket参数非必填，传空也可以
+    	pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
+ 
+        return new Docket(DocumentationType.SWAGGER_2)
+        		.select()
+                .apis(RequestHandlerSelectors.basePackage("com.github.wxiaoqi.security.admin"))
+        		//.apis(RequestHandlerSelectors.any())
+                .build()  
+                .globalOperationParameters(pars)  
+                .apiInfo(apiInfo());
+    }
+    
+    ApiInfo apiInfo() {
+    	return new ApiInfoBuilder()
+            .title("api swagger document")  
+            .description("前后端联调swagger api 文档")  
+            .version("2.1.5.5")  
+            .build();
+    }  
+}
\ No newline at end of file

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

@@ -30,6 +30,9 @@ public class User {
 
     private String type;
 
+    @Column(name = "status")
+    private Integer status;
+
     private String description;
 
     @Column(name = "crt_time")
@@ -56,6 +59,15 @@ public class User {
     @Column(name = "upd_host")
     private String updHost;
 
+    @Column(name = "data_all")
+    private Integer dataAll;
+
+    @Column(name = "data_zone")
+    private String dataZone;
+
+    @Column(name = "data_company")
+    private String dataCompany;
+
     private String attr1;
 
     private String attr2;
@@ -226,6 +238,14 @@ public class User {
         this.type = type;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     /**
      * @return description
      */
@@ -352,6 +372,30 @@ public class User {
         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
      */
@@ -463,4 +507,6 @@ public class User {
     public void setAttr8(String attr8) {
         this.attr8 = attr8;
     }
+
+
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/GroupMapper.java

@@ -9,4 +9,5 @@ public interface GroupMapper extends Mapper<Group> {
     public void deleteGroupLeadersById (@Param("groupId") int groupId);
     public void insertGroupMembersById (@Param("groupId") int groupId,@Param("userId") int userId);
     public void insertGroupLeadersById (@Param("groupId") int groupId,@Param("userId") int userId);
+    public Group selectMemberGroupByUserId(@Param("userId") int userId);
 }
\ No newline at end of file

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

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.GroupBiz;
+import com.github.wxiaoqi.security.admin.biz.ResourceAuthorityBiz;
+import com.github.wxiaoqi.security.admin.biz.UserBiz;
+import com.github.wxiaoqi.security.admin.entity.Group;
+import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.vo.GroupUsers;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-08 11:51
+ */
+@RestController
+@RequestMapping("current")
+public class CurrentController {
+    @Autowired
+    private GroupBiz groupBiz;
+
+    @Autowired
+    private UserBiz userBiz;
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @RequestMapping(value = "/groups", method = RequestMethod.GET)
+    public @ResponseBody
+    BaseResponse getGroups(String token) throws Exception  {
+        String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
+        if (username == null) {
+            throw new Exception();
+        }
+        User user = userBiz.getUserByUsername(username);
+        if (user == null) {
+            throw new Exception();
+        }
+        return new ObjectRestResponse<Group>().rel(true).data(groupBiz.getUserGroups(user.getId()));
+    }
+}

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

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.MenuBiz;
+import com.github.wxiaoqi.security.admin.biz.UserBiz;
+import com.github.wxiaoqi.security.admin.entity.Group;
+import com.github.wxiaoqi.security.admin.entity.Menu;
+import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
+import com.github.wxiaoqi.security.admin.vo.FrontUser;
+import com.github.wxiaoqi.security.admin.vo.MenuTree;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author wanghaobin
+ * @create 2017-06-08 11:51
+ */
+@RestController
+@RequestMapping("public")
+public class PublicController {
+
+    @Autowired
+    private UserBiz userBiz;
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @RequestMapping(value = "/userinfo-by-token", method = RequestMethod.GET)
+    public @ResponseBody
+    ObjectRestResponse userinfoByToken(String token) throws Exception {
+        String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
+        if (username == null) {
+            throw new Exception();
+        }
+        User user = userBiz.getUserByUsername(username);
+        if (user == null) {
+            throw new Exception();
+        }
+        return new ObjectRestResponse<User>().rel(true).data(user);
+    }
+}

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

@@ -7,13 +7,12 @@ import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.FrontUser;
 import com.github.wxiaoqi.security.admin.vo.MenuTree;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -32,6 +31,13 @@ public class UserController extends BaseController<UserBiz,User> {
     @Autowired
     private MenuBiz menuBiz;
 
+    @Override
+    @RequestMapping(value = "",method = RequestMethod.POST)
+    @IgnoreClientToken
+    public ObjectRestResponse<User> add(@RequestBody User entity){
+        return super.add(entity);
+    }
+
     @RequestMapping(value = "/front/info", method = RequestMethod.GET)
     @ResponseBody
     public ResponseEntity<?> getUserInfo(String token) throws Exception {

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

+package com.github.wxiaoqi.security.admin.rpc.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by ace on 2017/9/12.
+ */
+@Service
+public class GroupService {
+
+}

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

@@ -52,4 +52,10 @@
        #{groupId},#{userId}
     )
   </insert>
+
+  <select id="selectMemberGroupByUserId" resultMap="BaseResultMap">
+    select g.* from base_group g
+                      left join  base_group_member gm
+                                 on gm.group_id = g.id where gm.user_id = #{userId}
+  </select>
 </mapper>
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/VehicleApplication.java

@@ -2,6 +2,7 @@ package com.xinxincaravan.caravan.vehicle;
 
 import com.ace.cache.EnableAceCache;
 import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
+import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableDiscoveryClient
 @EnableScheduling
 @EnableAceAuthClient
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign", "com.xinxincaravan.caravan.vehicle.feign"})
 @EnableAceCache
 @MapperScan("com.xinxincaravan.caravan.vehicle.mapper")
 public class VehicleApplication {

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/UserService.java

+package com.xinxincaravan.caravan.vehicle.biz;
+
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
+import com.xinxincaravan.caravan.vehicle.constant.VehicleActiveType;
+import com.xinxincaravan.caravan.vehicle.constant.VehicleDepartureState;
+import com.xinxincaravan.caravan.vehicle.constant.VehicleStatus;
+import com.xinxincaravan.caravan.vehicle.entity.Vehicle;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleActiveLog;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleDepartureLog;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleUpkeepLog;
+import com.xinxincaravan.caravan.vehicle.mapper.*;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleArrivalVo;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureVo;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepEndVo;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleUpkeepVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class UserService {
+
+}

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/config/SwaggerConfig.java

+package com.xinxincaravan.caravan.vehicle.config;
+
+import com.spring4all.swagger.Swagger2Configuration;
+import com.spring4all.swagger.SwaggerAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @Description : swagger配置配置
+* @Author : Mars
+* @Date : 2017年9月6日
+*/
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig{
+	
+    /**
+     * Every Docket bean is picked up by the swagger-mvc framework - allowing for multiple
+     * swagger groups i.e. same code base multiple swagger resource listings.
+     */
+    @Bean
+    public Docket customDocket(){
+    	ParameterBuilder ticketPar = new ParameterBuilder();
+        List<Parameter> pars = new ArrayList<Parameter>();
+    	ticketPar.name("Authorization").description("user Authorization")
+    	.modelRef(new ModelRef("string")).parameterType("header")
+    	.required(false).build(); //header中的ticket参数非必填，传空也可以
+    	pars.add(ticketPar.build());    //根据每个方法名也知道当前方法在设置什么参数
+ 
+        return new Docket(DocumentationType.SWAGGER_2)
+        		.select()
+                .apis(RequestHandlerSelectors.basePackage("com.github.wxiaoqi.security.admin"))
+        		//.apis(RequestHandlerSelectors.any())
+                .build()  
+                .globalOperationParameters(pars)  
+                .apiInfo(apiInfo());
+    }
+    
+    ApiInfo apiInfo() {
+    	return new ApiInfoBuilder()
+            .title("api swagger document")  
+            .description("前后端联调swagger api 文档")  
+            .version("2.1.5.5")  
+            .build();
+    }  
+}
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/constant/ConstantType.java

@@ -8,6 +8,7 @@ public enum  ConstantType {
     VEHICLE_BRAND(1,"车辆品牌"),
     VEHICLE_USE(2,"车辆用途"),
     INSURANCE_COMPANY(3,"保险公司"),
+    ZONE(4,"片区"),
     ;
 
     /**

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/feign/UserFeign.java

+package com.xinxincaravan.caravan.vehicle.feign;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Created by ace on 2017/9/15.
+ */
+//@FeignClient(value = "${auth.serviceId}",configuration = {})
+@FeignClient("ace-admin")
+public interface UserFeign {
+    @RequestMapping(value = "/public/userinfo-by-token")
+    public ObjectRestResponse<UserDTO> userinfoByToken(@RequestParam("token") String token);
+
+}

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/feign/dto/UserDTO.java

+package com.xinxincaravan.caravan.vehicle.feign.dto;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+@Data
+public class UserDTO {
+    private Integer id;
+
+    private String username;
+
+    private String password;
+
+    private String name;
+
+    private String birthday;
+
+    private String address;
+
+    private String mobilePhone;
+
+    private String telPhone;
+
+    private String email;
+
+    private String sex;
+
+    private String type;
+
+    private Integer status;
+
+    private String description;
+
+    private Date crtTime;
+
+    private String crtUser;
+
+    private String crtName;
+
+    private String crtHost;
+
+    private Date updTime;
+
+    private String updUser;
+
+    private String updName;
+
+    private String updHost;
+
+    private Integer dataAll;
+
+    private String dataZone;
+
+    private String dataCompany;
+
+}
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/BranchCompanyController.java

 package com.xinxincaravan.caravan.vehicle.rest;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 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.xinxincaravan.caravan.vehicle.biz.BranchCompanyBiz;
 import com.xinxincaravan.caravan.vehicle.common.BaseController;
 import com.xinxincaravan.caravan.vehicle.common.RestResponse;
 import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
 import com.xinxincaravan.caravan.vehicle.entity.BranchCompany;
+import com.xinxincaravan.caravan.vehicle.feign.UserFeign;
+import com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO;
 import com.xinxincaravan.caravan.vehicle.vo.BranchCompanyVo;
 import com.xinxincaravan.caravan.vehicle.vo.PageDataVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -23,11 +29,19 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
 
     private static Integer MAX_DRIVING_LICENSE_SIZE  = 10*1024*1024;//10M
 
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
     @IgnoreUserToken
     @RequestMapping(value ="/page",method = RequestMethod.GET)
     public RestResponse<PageDataVo<BranchCompany>> page(@RequestParam Integer page, @RequestParam Integer limit,
                                                           @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
                                                           @RequestParam(required = false) Integer addrTown) {
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        log.info(JSONObject.toJSONString(userDTO));
         return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity,
                  addrTown));
     }