股权

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/ServiceAuthRestInterceptor.java

@@ -32,24 +32,28 @@ public class ServiceAuthRestInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        HandlerMethod handlerMethod = (HandlerMethod) handler;
-        // 配置该注解，说明不进行服务拦截
-        IgnoreClientToken annotation = handlerMethod.getBeanType().getAnnotation(IgnoreClientToken.class);
-        if (annotation == null) {
-            annotation = handlerMethod.getMethodAnnotation(IgnoreClientToken.class);
-        }
-        if (annotation != null) {
-            return super.preHandle(request, response, handler);
-        }
-
-        String token = request.getHeader(serviceAuthConfig.getTokenHeader());
-        IJWTInfo infoFromToken = serviceAuthUtil.getInfoFromToken(token);
-        String uniqueName = infoFromToken.getUniqueName();
-        for (String client : serviceAuthUtil.getAllowedClient()) {
-            if (client.equals(uniqueName)) {
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            // 配置该注解，说明不进行服务拦截
+            IgnoreClientToken annotation = handlerMethod.getBeanType().getAnnotation(IgnoreClientToken.class);
+            if (annotation == null) {
+                annotation = handlerMethod.getMethodAnnotation(IgnoreClientToken.class);
+            }
+            if (annotation != null) {
                 return super.preHandle(request, response, handler);
             }
+
+            String token = request.getHeader(serviceAuthConfig.getTokenHeader());
+            IJWTInfo infoFromToken = serviceAuthUtil.getInfoFromToken(token);
+            String uniqueName = infoFromToken.getUniqueName();
+            for (String client : serviceAuthUtil.getAllowedClient()) {
+                if (client.equals(uniqueName)) {
+                    return super.preHandle(request, response, handler);
+                }
+            }
+            throw new ClientForbiddenException("Client is Forbidden!");
+        } else {
+            return super.preHandle(request, response, handler);
         }
-        throw new ClientForbiddenException("Client is Forbidden!");
     }
 }

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/UserAuthRestInterceptor.java

@@ -31,38 +31,42 @@ public class UserAuthRestInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        HandlerMethod handlerMethod = (HandlerMethod) handler;
-        // 配置该注解，说明不进行用户拦截
-        IgnoreUserToken annotation = handlerMethod.getBeanType().getAnnotation(IgnoreUserToken.class);
-        if (annotation == null) {
-            annotation = handlerMethod.getMethodAnnotation(IgnoreUserToken.class);
-        }
-        String token = request.getHeader(userAuthConfig.getTokenHeader());
-        if (StringUtils.isEmpty(token)) {
-            if (request.getCookies() != null) {
-                for (Cookie cookie : request.getCookies()) {
-                    if (cookie.getName().equals(userAuthConfig.getTokenHeader())) {
-                        token = cookie.getValue();
+        if (handler instanceof HandlerMethod) {
+            HandlerMethod handlerMethod = (HandlerMethod) handler;
+            // 配置该注解，说明不进行用户拦截
+            IgnoreUserToken annotation = handlerMethod.getBeanType().getAnnotation(IgnoreUserToken.class);
+            if (annotation == null) {
+                annotation = handlerMethod.getMethodAnnotation(IgnoreUserToken.class);
+            }
+            String token = request.getHeader(userAuthConfig.getTokenHeader());
+            if (StringUtils.isEmpty(token)) {
+                if (request.getCookies() != null) {
+                    for (Cookie cookie : request.getCookies()) {
+                        if (cookie.getName().equals(userAuthConfig.getTokenHeader())) {
+                            token = cookie.getValue();
+                        }
                     }
                 }
             }
-        }
-        IJWTInfo infoFromToken = null;
-        try {
-            infoFromToken = userAuthUtil.getInfoFromToken(token);
-        }catch (Exception e){
-            if (annotation != null) {
-                return super.preHandle(request, response, handler);
-            }else {
-                throw e;
+            IJWTInfo infoFromToken = null;
+            try {
+                infoFromToken = userAuthUtil.getInfoFromToken(token);
+            } catch (Exception e) {
+                if (annotation != null) {
+                    return super.preHandle(request, response, handler);
+                } else {
+                    throw e;
+                }
             }
+            BaseContextHandler.setUsername(infoFromToken.getUniqueName());
+            BaseContextHandler.setName(infoFromToken.getName());
+            BaseContextHandler.setUserID(infoFromToken.getId());
+            BaseContextHandler.setToken(token);
+            // 这里可以添加RequestType
+            return super.preHandle(request, response, handler);
+        }else {
+            return super.preHandle(request, response, handler);
         }
-        BaseContextHandler.setUsername(infoFromToken.getUniqueName());
-        BaseContextHandler.setName(infoFromToken.getName());
-        BaseContextHandler.setUserID(infoFromToken.getId());
-        BaseContextHandler.setToken(token);
-        // 这里可以添加RequestType
-        return super.preHandle(request, response, handler);
     }
 
     @Override

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteShopController.java

@@ -11,10 +11,7 @@ import com.xxfc.platform.campsite.vo.CampsiteShopDetailVo;
 import com.xxfc.platform.campsite.vo.CampsiteShopPageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -63,8 +60,8 @@ public class CampsiteShopController extends BaseController<CampsiteShopBiz, Camp
         return getBaseBiz().getAllByHome(page,limit);
     }
 
-    @GetMapping(value = "/app/unauth/webchat_official/campsites")
-    public ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsitesForPublicNumber(CampsiteShopFindDTO campsiteShopFindDTO){
+    @PostMapping(value = "/app/unauth/webchat_official/campsites")
+    public ObjectRestResponse<PageDataVO<CampsiteShopPageVo>> findCampsitesForPublicNumber(@RequestBody  CampsiteShopFindDTO campsiteShopFindDTO){
 
         PageDataVO<CampsiteShopPageVo> campsiteShops = baseBiz.findCampsiteShopPageByType(campsiteShopFindDTO);
         return ObjectRestResponse.succ(campsiteShops);

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

@@ -40,7 +40,8 @@ public class BranchCompanyStockRight{
      */
     private Integer type;
 
-    private Integer state;
+    @Column(name = "stock_state")
+    private Integer stockState;
 
 
     /**

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 11:03
+ */
+@Data
+public class BranchCompanyStockRightDTO {
+    private Integer id;
+    private String companyName;
+    private Integer balance;
+    private Integer total;
+    private BigDecimal price;
+    private String cover;
+    private Integer type;
+}

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

+package com.xxfc.platform.vehicle.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 13:51
+ */
+@Data
+public class CompanyBaseDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分公司名称
+     */
+    @ApiModelProperty("分公司名称")
+    private String name;
+    /**
+     * 公司封面
+     */
+    @ApiModelProperty("公司封面")
+    private String cover;
+    /**
+     * 轮播图
+     */
+    @ApiModelProperty("轮播图")
+    private List<String> images;
+
+    @ApiModelProperty("公司简介")
+    private String describes;
+
+    @ApiModelProperty("详情")
+    private String content;
+
+    @ApiModelProperty("地址-省/直辖市")
+    private String province;
+
+    @ApiModelProperty("地址-市")
+    private String city;
+
+    @ApiModelProperty("地址-镇/县")
+    private String town;
+
+    @ApiModelProperty("具体地址")
+    private String address;
+}

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

+package com.xxfc.platform.vehicle.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 12:18
+ */
+@Data
+public class CompanyBaseVo {
+
+    /**
+     * 分公司名称
+     */
+    @ApiModelProperty("分公司名称")
+    private String name;
+    /**
+     * 公司封面
+     */
+    @ApiModelProperty("公司封面")
+    private String cover;
+    /**
+     * 轮播图
+     */
+    @ApiModelProperty("轮播图")
+    private List<String> images;
+
+    @ApiModelProperty("公司简介")
+    private String describes;
+
+    @ApiModelProperty("详情")
+    private String content;
+
+    @ApiModelProperty("地址-省/直辖市")
+    private String province;
+
+    @ApiModelProperty("地址-市")
+    private String city;
+
+    @ApiModelProperty("地址-镇/县")
+    private String town;
+
+    @ApiModelProperty("具体地址")
+    private String address;
+}

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockRight;
 import com.xxfc.platform.vehicle.mapper.*;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyStockRightDTO;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyStockRightFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyStockInfoRightVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyStockRightForWeChatOfficeVO;
@@ -63,7 +64,7 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
             stockInfo.setBalance(stockInfo.getTotal());
         }
         if (stockInfoVo.getState() == null) {
-            stockInfo.setState(0);
+            stockInfo.setStockState(0);
         }
         if (id == null || id == 0) {
             mapper.insertSelective(stockInfo);
@@ -152,7 +153,7 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
                 stockInfoVo.setPrice(price);
                 stockInfoVo.setBalance(balance);
                 stockInfoVo.setTotal(total);
-                stockInfoVo.setState(2);
+                stockInfoVo.setStockState(2);
                 list.add(stockInfoVo);
             }
             mapper.addCompamyList(list);
@@ -166,17 +167,17 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
 
     public PageDataVO<BranchCompanyStockRightForWeChatOfficeVO> findWithPageByPriceOrCode(BranchCompanyStockRightFindDTO branchCompanyStockRightFindDTO) {
          PageDataVO<BranchCompanyStockRightForWeChatOfficeVO> dataPage = new PageDataVO<>();
-        PageDataVO<BranchCompanyStockRight> pageDataVO = PageDataVO.pageInfo(branchCompanyStockRightFindDTO.getPage(), branchCompanyStockRightFindDTO.getLimit(),
+        PageDataVO<BranchCompanyStockRightDTO> pageDataVO = PageDataVO.pageInfo(branchCompanyStockRightFindDTO.getPage(), branchCompanyStockRightFindDTO.getLimit(),
                 () -> mapper.findWithPageByPriceOrCode(branchCompanyStockRightFindDTO.getPrice(), branchCompanyStockRightFindDTO.getProvinceCode(), branchCompanyStockRightFindDTO.getCityCode()));
 
-        List<BranchCompanyStockRight> data = pageDataVO.getData();
+        List<BranchCompanyStockRightDTO> data = pageDataVO.getData();
         if (CollectionUtils.isEmpty(data)){
             return dataPage;
         }
 
         List<BranchCompanyStockRightForWeChatOfficeVO> stockRights = new ArrayList<>();
         BranchCompanyStockRightForWeChatOfficeVO branchCompanyStockRightForWeChatOfficeVO;
-        for (BranchCompanyStockRight branchCompanyStockRight : data) {
+        for (BranchCompanyStockRightDTO branchCompanyStockRight : data) {
             branchCompanyStockRightForWeChatOfficeVO= new BranchCompanyStockRightForWeChatOfficeVO();
             BeanUtils.copyProperties(branchCompanyStockRight,branchCompanyStockRightForWeChatOfficeVO);
             stockRights.add(branchCompanyStockRightForWeChatOfficeVO);

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

@@ -2,19 +2,20 @@ package com.xxfc.platform.vehicle.biz;
 
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.xxfc.platform.vehicle.entity.*;
+import com.xxfc.platform.vehicle.entity.CompanyBase;
 import com.xxfc.platform.vehicle.mapper.CompanyBaseMapper;
+import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
+import com.xxfc.platform.vehicle.pojo.vo.CompanyBaseVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 @Service
 @Slf4j
 public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
-
-
-    //临时数据同步
-  //  public ObjectRestResponse
+    public CompanyBaseVo findCompanyDetailById(Integer id) {
+        CompanyBaseDetailDTO companyBaseDetailDTO = mapper.findCompanyBaseById(id);
+        return null;
+    }
 
 
 }

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockRight;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyStockRightDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyStockInfoRightVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
@@ -27,5 +28,5 @@ public interface BranchCompanyStockRightMapper extends Mapper<BranchCompanyStock
 
     Integer getCompanyInfo(@Param("name")String name);
 
-    List<BranchCompanyStockRight> findWithPageByPriceOrCode(@Param("price") BigDecimal price,@Param("provinceCode") Integer provinceCode,@Param("cityCode") Integer cityCode);
+    List<BranchCompanyStockRightDTO> findWithPageByPriceOrCode(@Param("price") BigDecimal price, @Param("provinceCode") Integer provinceCode, @Param("cityCode") Integer cityCode);
 }
\ No newline at end of file

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

@@ -2,9 +2,12 @@ package com.xxfc.platform.vehicle.mapper;
 
 
 import com.xxfc.platform.vehicle.entity.CompanyBase;
+import com.xxfc.platform.vehicle.pojo.dto.CompanyBaseDetailDTO;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 
 public interface CompanyBaseMapper extends Mapper<CompanyBase> {
 
+    CompanyBaseDetailDTO findCompanyBaseById(@Param("id") Integer id);
 }
\ No newline at end of file

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

@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.util.List;
 
 @RestController
 @IgnoreClientToken
@@ -194,13 +196,19 @@ public class BranchCompanyStockRightController extends BaseController<BranchComp
         return baseBiz.importExcel(multipartfile,request);
     }
 
+    @GetMapping("/app/unauth/stock_right_price")
+    public ObjectRestResponse<List<Integer>> getStorkRightPrices(){
+        List<Integer> allPrice = baseBiz.getAllPrice();
+        return ObjectRestResponse.succ(allPrice);
+    }
+
     /**
      * 微信公众号查询
      * @param branchCompanyStockRightFindDTO
      * @return
      */
-    @GetMapping("/webchat_office/stockrights")
-    public ObjectRestResponse<PageDataVO<BranchCompanyStockRightForWeChatOfficeVO>> findBranchCompanyStockRightsForWechatOffice(BranchCompanyStockRightFindDTO branchCompanyStockRightFindDTO){
+    @PostMapping("/app/unauth/webchat_office/stockrights")
+    public ObjectRestResponse<PageDataVO<BranchCompanyStockRightForWeChatOfficeVO>> findBranchCompanyStockRightsForWechatOffice(@RequestBody  BranchCompanyStockRightFindDTO branchCompanyStockRightFindDTO){
          PageDataVO<BranchCompanyStockRightForWeChatOfficeVO> branchCompanyStockRightForWeChatOfficeVOPageDataVO = baseBiz.findWithPageByPriceOrCode(branchCompanyStockRightFindDTO);
         return ObjectRestResponse.succ(branchCompanyStockRightForWeChatOfficeVOPageDataVO);
     }

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

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.biz.CompanyBaseBiz;
+import com.xxfc.platform.vehicle.pojo.vo.CompanyBaseVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/23 12:16
+ */
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequestMapping("/company_base")
+public class CompanyBaseController {
+
+     private final  CompanyBaseBiz companyBaseBiz;
+
+
+     @GetMapping("/detail/{id}")
+    public ObjectRestResponse<CompanyBaseVo> findCompanyDetailById(@PathVariable(value = "id") Integer id){
+          CompanyBaseVo companyBaseVo = companyBaseBiz.findCompanyDetailById(id);
+         return ObjectRestResponse.succ(companyBaseVo);
+     }
+
+}

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

@@ -18,7 +18,7 @@
         r.price,
         r.rank,
         r.total,
-        r.state,
+        r.stock_state,
         c.addr_city AS addrCity,
         c.addr_province AS addrProvince,
         c.`name` AS companyName
@@ -45,8 +45,11 @@
         </trim>
         order by rank DESC,price DESC
     </select>
-    <select id="selectAllPrice" resultType="int">
-        select distinct price from branch_company_stock_info_right where  is_del=0 order by price
+    <select id="selectAllPrice" resultType="integer">
+        SELECT DISTINCT
+	      `price`
+         FROM
+	  ( SELECT `price` / 10000 AS `price` FROM branch_company_stock_info_right WHERE is_del = 0 ) AS `bcsir` ORDER BY price DESC
     </select>
     <select id="selectInfoById" resultType="com.xxfc.platform.vehicle.pojo.vo.BranchCompanyStockInfoRightVo">
         SELECT
@@ -58,7 +61,7 @@
         r.price,
         r.rank,
         r.total,
-        r.state,
+        r.stock_state,
         c.addr_city AS addrCity,
         c.addr_province AS addrProvince,
         c.`name` AS companyName
@@ -74,27 +77,29 @@
 
     <insert id="addCompamyList" parameterType="java.util.List">
         insert into branch_company_stock_info_right (
-        company_id,balance,total,price,state,company_pic,crt_time,upd_time
+        company_id,balance,total,price,stock_state,company_pic,crt_time,upd_time
         ) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.companyId},#{item.balance},#{item.total},#{item.price},#{item.state},#{item.companyPic},#{item.crtTime},#{item.updTime})
+            (#{item.companyId},#{item.balance},#{item.total},#{item.price},#{item.stockState}
+            ,#{item.companyPic},#{item.crtTime},#{item.updTime})
         </foreach>
     </insert>
     <select id="findWithPageByPriceOrCode"
-            resultType="com.xxfc.platform.vehicle.entity.BranchCompanyStockRight">
+            resultType="com.xxfc.platform.vehicle.pojo.dto.BranchCompanyStockRightDTO">
         SELECT
-        bcsir.id,
+        cb.id,
         bcsir.balance,
         bcsir.total,
         bcsir.type,
-        bcsir.price,
+        bcsir.price/10000 as `price`,
         cb.cover,
-        cb.name
+        cb.name as `companyName`
         FROM
-        ( SELECT id, company_base_id, balance, total, price, type FROM `branch_company_stock_info_right` WHERE `state` =
+        ( SELECT id, company_base_id, balance, total, price, type FROM `branch_company_stock_info_right` WHERE
+        `stock_state` =
         2 AND `is_del`=0
         <if test="price != null">
-            AND `price`=#{price}
+            AND `price`=#{price}*10000
         </if>
         ) AS `bcsir`
         INNER JOIN ( SELECT id, `name`, cover FROM `company_base` WHERE 1=1
@@ -102,8 +107,8 @@
             AND `addr_province`=#{provinceCode}
         </if>
         <if test="cityCode != null">
-            AND `addr_city`=#{provinceCode}
+            AND `addr_city`=#{cityCode}
         </if>
-        ) AS `cb` ON cb.id = bcsir.company_base_id
+        ) AS `cb` ON cb.id = bcsir.company_base_id order by bcsir.price desc
     </select>
 </mapper>
\ No newline at end of file