Merge branch 'base-modify' into dev-hf

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/RandomUtil.java

@@ -63,7 +63,7 @@ public class RandomUtil
 
 	public static void main(String[] args) {
 		int max = 20;
-		int n = 20;
+		int n = 30;
 		Set<Integer> set = new HashSet<>();
 		randomSet(max, n, set, n);
 		for(Integer a : set) {

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

@@ -25,6 +25,8 @@ public class Menu {
 
     private String type;
 
+    private String state;
+
     private String description;
 
     @Column(name = "crt_time")
@@ -167,6 +169,20 @@ public class Menu {
         this.type = type;
     }
 
+    /**
+     * @return state
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * @param state
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
     /**
      * @return description
      */

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

@@ -120,8 +120,8 @@ public class UserController extends CommonBaseController {
 
     @RequestMapping(value = "/front/menus", method = RequestMethod.GET)
     public @ResponseBody
-    List<MenuTree> getMenusByUsername(String token) throws Exception {
-        return permissionService.getMenusByUsername(token);
+    List<MenuTree> getMenusByUsername(String token,String state) throws Exception {
+        return permissionService.getMenusByUsername(token,state);
     }
 
     @RequestMapping(value = "/front/menu/all", method = RequestMethod.GET)

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

@@ -170,13 +170,14 @@ public class PermissionService {
         return frontUser;
     }
 
-    public List<MenuTree> getMenusByUsername(String token) throws Exception {
+    public List<MenuTree> getMenusByUsername(String token,String state) throws Exception {
         String username = userAuthUtil.getInfoFromToken(token).getUniqueName();
         if (username == null) {
             return null;
         }
         User user = userBiz.getUserByUsername(username);
         List<Menu> menus = menuBiz.getUserAuthorityMenuByUserId(user.getId());
+        menus=menus.stream().filter(a->state.contains(a.getState())).collect(Collectors.toList());
         return getMenuTree(menus,AdminCommonConstant.ROOT);
     }
 }

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

@@ -12,6 +12,7 @@
         <result column="href" jdbcType="VARCHAR" property="href"/>
         <result column="icon" jdbcType="VARCHAR" property="icon"/>
         <result column="type" jdbcType="CHAR" property="type"/>
+        <result column="state" jdbcType="INTEGER" property="state"/>
         <result column="description" jdbcType="VARCHAR" property="description"/>
         <result column="crt_time" jdbcType="DATE" property="crtTime"/>
         <result column="crt_user" jdbcType="VARCHAR" property="crtUser"/>

xx-universal/xx-universal-api/pom.xml

@@ -72,6 +72,17 @@
             <artifactId>junrar</artifactId>
             <version>0.7</version>
         </dependency>
+        <!-- jpush -->
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <version>3.3.7</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jiguang-common</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/JPushBiz.java

+package com.xxfc.platform.universal.biz;
+
+
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.PushResult;
+import cn.jpush.api.push.model.PushPayload;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.universal.service.SmsService;
+import com.xxfc.platform.universal.utils.CCPRestSmsUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class JPushBiz {
+
+
+    @Value("${universal.MASTER_SECRET}")
+    private  String MASTER_SECRET;
+    @Value("${universal.APP_KEY}")
+    private  String APP_KEY;
+
+    //推送给所有平台设备
+    public ObjectRestResponse jpushToAllPlat(String title){
+        ClientConfig clientConfig = ClientConfig.getInstance();
+        final JPushClient jpushClient = new JPushClient(MASTER_SECRET, APP_KEY, null, clientConfig);
+        PushPayload payload = PushPayload.alertAll(title);
+        try {
+            PushResult result = jpushClient.sendPush(payload);
+            log.debug("\n推送结果:"+result);
+           return  ObjectRestResponse.succ();
+        } catch (APIConnectionException e) {
+            // Connection error, should retry later
+            log.debug("\nConnection error, should retry later"+e);
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,e.getMessage());
+        } catch (APIRequestException e) {
+            // Should review the error, and fix the request
+            log.debug("\nShould review the error, and fix the request"+ e);
+            log.debug("\nHTTP Status: " + e.getStatus());
+            log.debug("\nError Code: " + e.getErrorCode());
+            log.debug("\nError Message: " + e.getErrorMessage());
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,e.getMessage());
+        }
+    }
+
+
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/JPushController.java

+package com.xxfc.platform.universal.controller;
+
+
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.universal.biz.JPushBiz;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 极光推送
+ */
+@RestController
+@RequestMapping("jpush")
+@IgnoreUserToken
+public class JPushController {
+
+       @Autowired
+       JPushBiz jPushBiz;
+
+
+
+    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.GET) //匹配的是href中的download请求
+    public ObjectRestResponse sendSms(@RequestParam("title") String title) throws Exception {
+
+        return jPushBiz.jpushToAllPlat(title);
+    }
+}
+

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

+package com.xxfc.platform.vehicle.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Table(name = "vehicle_user_reserve")
+public class VehicleUserReserve {
+    @Id
+    @GeneratedValue(generator = "JDBC")
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @Column(name = "user_id")
+    @ApiModelProperty("用户id")
+    private Integer userId;
+
+    @Column(name = "mode_id")
+    @ApiModelProperty("车型id")
+    private Integer modeId;
+
+
+    @ApiModelProperty("预定姓名")
+    private String name;
+
+
+    @ApiModelProperty("电话")
+    private String phone;
+
+
+    @Column(name = "start_time")
+    @ApiModelProperty("开始时间")
+    private Long startTime;
+
+    @Column(name = "end_time")
+    @ApiModelProperty("结束时间")
+    private Long endTime;
+
+
+    @Column(name = "addr_province")
+    @ApiModelProperty("地址-省/直辖市(编码)")
+    private Integer addrProvince;
+
+    @Column(name = "province_name")
+    @ApiModelProperty("省名称")
+    private String provinceName;
+
+    @Column(name = "addr_city")
+    @ApiModelProperty("市编号")
+    private Integer addrCity;
+
+    @Column(name = "city_name")
+    @ApiModelProperty("市名称")
+    private String cityName;
+
+
+    @Column(name = "company_id")
+    @ApiModelProperty("分公司id")
+    private Integer companyId;
+
+
+    @Column(name = "crt_time")
+    @ApiModelProperty("创建时间")
+    private Long crtTime;
+
+
+    @Column(name = "upd_time")
+    @ApiModelProperty("更新时间")
+    private Long updTime;
+
+
+    @ApiModelProperty("0-未处理；1-处理中;2-已处理")
+    private Integer status;
+
+    @Column(name = "is_del")
+    @ApiModelProperty("是否删除：0-正常；1-删除")
+    private Integer isDel;
+
+
+
+}
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 12:18
+ */
+@Data
+public class VehicleUserReserveDTO extends PageParam {
+
+
+
+}

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import com.xxfc.platform.vehicle.entity.VehicleUserReserve;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 12:18
+ */
+@Data
+public class VehicleUserReserveVo extends VehicleUserReserve {
+
+
+    @ApiModelProperty("车型名称")
+    private String modelName;
+}

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

+package com.xxfc.platform.vehicle.biz;
+
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+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.xxfc.platform.vehicle.entity.*;
+import com.xxfc.platform.vehicle.mapper.VehicleUserReserveMapper;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+
+
+@Service
+@Slf4j
+public class VehicleUserReserveBiz extends BaseBiz<VehicleUserReserveMapper, VehicleUserReserve>  {
+
+
+    //获取列表
+    public ObjectRestResponse getList(VehicleUserReserveDTO reserveDTO){
+        Integer page=1;
+        Integer limit=10;
+        if (reserveDTO.getPage()!=null&&reserveDTO.getPage()>0){
+            page=reserveDTO.getPage();
+        }
+        if (reserveDTO.getLimit()!=null&&reserveDTO.getLimit()>0){
+            limit=reserveDTO.getLimit();
+        }
+        return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.getList(reserveDTO)));
+    }
+
+    //新增预定
+    public ObjectRestResponse updReserve(VehicleUserReserveVo reserveVo){
+        if (reserveVo==null){
+            return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+        }
+        VehicleUserReserve userReserve=new VehicleUserReserveVo();
+        BeanUtils.copyProperties(reserveVo,userReserve);
+        insertSelective(userReserve);
+        return  ObjectRestResponse.succ();
+    }
+
+
+
+
+
+}

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

+package com.xxfc.platform.vehicle.mapper;
+
+
+
+import com.xxfc.platform.vehicle.entity.VehicleUserReserve;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+
+public interface VehicleUserReserveMapper extends Mapper<VehicleUserReserve> {
+
+     //获取预约列表
+     List<VehicleUserReserveVo> getList(VehicleUserReserveDTO reserveDTO);
+
+}
\ No newline at end of file

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

+package com.xxfc.platform.vehicle.rest;
+
+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.xxfc.platform.vehicle.biz.VehicleUserReserveBiz;
+import com.xxfc.platform.vehicle.common.BaseController;
+import com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO;
+import com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@IgnoreClientToken
+@RequestMapping("reserve")
+public class VehicleUserReserveController extends BaseController<VehicleUserReserveBiz> {
+
+
+
+
+    @ApiOperation("查询预定列表")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public ObjectRestResponse getList(VehicleUserReserveDTO reserveDTO){
+        return  baseBiz.getList(reserveDTO);
+    }
+
+    @ApiOperation("添加预定信息")
+    @IgnoreUserToken
+    @RequestMapping(value = "/app/unauth/updReserve", method = RequestMethod.POST)
+    public ObjectRestResponse updReserve(@RequestBody VehicleUserReserveVo reserveVo){
+        return  baseBiz.updReserve(reserveVo);
+    }
+
+
+
+
+
+
+}

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleUserReserveMapper" >
+
+
+    <select id="getList"   parameterType="com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO" resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo">
+        SELECT
+        r.id,
+        r.user_id as userId,
+        r.mode_id as modeId,
+        r.`name`,
+        r.phone,
+        r.start_time as startTime,
+        r.end_time as endTime,
+        r.addr_province as addrProvince,
+        r.province_name as provinceName,
+        r.addr_city as addrCity,
+        r.city_name as cityName,
+        r.company_id as companyId,
+        r.crt_time as crtTime,
+        r.upd_time as updTime,
+        r.`status`,
+        m.`name` as modelName
+        FROM vehicle_user_reserve r
+        LEFT JOIN vehicle_model m  ON r.mode_id=m.id
+        <where>
+            r.is_del=0
+        </where>
+        order by r.upd_time desc
+    </select>
+
+</mapper>
\ No newline at end of file