Merge branch 'lb_dev' into base-modify

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/Article.java

+package com.xxfc.platform.uccn.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+import tk.mybatis.mapper.annotation.KeySql;
+import tk.mybatis.mapper.code.IdentityDialect;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * 文章实体
+ *
+ * @author Administrator
+ */
+@Data
+@Table(name = "article")
+@ApiModel(value = "文章实体")
+public class Article {
+
+    @Id
+    @KeySql(dialect = IdentityDialect.MYSQL)
+    private Integer id;
+    /**
+     * 标题
+     */
+    @Column(name = "title")
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    /**
+     * 副标题
+     */
+    @Column(name = "subtitle")
+    @ApiModelProperty(value = "副标题")
+
+    private String subtitle;
+
+    /**
+     * 文章摘要
+     */
+    @Column(name = "epitome")
+    @ApiModelProperty(value = "文章摘要")
+    private String epitome;
+
+    /**
+     * 正文
+     */
+    @Column(name = "text")
+    @ApiModelProperty(value = "正文")
+    private String text;
+
+    /**
+     * 图片url,以逗号分割
+     */
+    @Column(name = "picture")
+    @ApiModelProperty(value = "图片url,以逗号分割")
+    private String picture;
+
+    /**
+     * 作者
+     */
+    @Column(name = "author")
+    @ApiModelProperty(value = "作者")
+    private Integer author;
+
+    /**
+     * 发布人
+     */
+    @Column(name = "publisher")
+    @ApiModelProperty(value = "发布人")
+    private Integer publisher;
+
+    /**
+     * 封面图
+     */
+    @Column(name = "cover_image")
+    @ApiModelProperty(value = "封面图")
+    private Integer coverImage;
+
+    /**
+     * 权重
+     */
+    @Column(name = "weight")
+    @ApiModelProperty(value = "权重")
+    private Integer weight;
+
+    /**
+     * 是否删除:0-否,1-是
+     */
+    @Column(name = "is_del")
+    @ApiModelProperty(value = "是否删除:0-否,1-是")
+    private Integer isDel;
+
+    /**
+     * 是否上下架:0-否,1-是
+     */
+    @Column(name = "status")
+    @ApiModelProperty(value = "是否上下架:0-否,1-是")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "cre_time")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date creTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "upd_time")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private Date updTime;
+
+    /**
+     * 上架时间
+     */
+    @Column(name = "add_time")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "上架时间")
+    private Date addTime;
+
+}

xx-uccn/xx-uccn-server/pom.xml

@@ -25,6 +25,7 @@
     </dependencies>
     <build>
         <plugins>
+            <!-- 此插件用来生成通用mapper的代码 -->
             <plugin>
                 <groupId>org.mybatis.generator</groupId>
                 <artifactId>mybatis-generator-maven-plugin</artifactId>

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/UccnApplication.java

 package com.xxfc.platform.uccn;
 
+import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@@ -11,10 +12,11 @@ import tk.mybatis.spring.annotation.MapperScan;
  * @author Administrator
  */
 @SpringBootApplication(scanBasePackages ={
-        "com.xxfc.platform",
+         "com.xxfc.platform.uccn",
         "com.github.wxiaoqi"
 })
 @EnableDiscoveryClient
+@EnableAceAuthClient
 @EnableFeignClients(value = {"com.xxfc.platform","com.github.wxiaoqi.security"})
 @MapperScan(basePackages = "com.xxfc.platform.uccn.mapper")
 public class UccnApplication {

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

+package com.xxfc.platform.uccn.biz;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.uccn.entity.Article;
+import com.xxfc.platform.uccn.mapper.ArticleMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Service
+public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
+
+    public PageInfo getArticleList(Integer page, Integer limit) {
+        PageHelper.startPage(page,limit);
+        List articleList = mapper.getArticleList();
+        return PageInfo.of(articleList);
+    }
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/config/SwaggerConfig.java

@@ -41,7 +41,7 @@ public class SwaggerConfig {
 
         return new Docket(DocumentationType.SWAGGER_2)
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.xxfc.platform.activity.rest"))
+                .apis(RequestHandlerSelectors.basePackage("com.xxfc.platform.uccn"))
                 .build()
                 .globalOperationParameters(pars)
                 .apiInfo(apiInfo());

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/ArticleMapper.java

+package com.xxfc.platform.uccn.mapper;
+
+import com.xxfc.platform.uccn.entity.Article;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public interface ArticleMapper extends Mapper<Article> {
+    List getArticleList();
+}

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/ArticleController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.ArticleBiz;
+import com.xxfc.platform.uccn.entity.Article;
+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;
+
+/**
+ * 文章
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/article")
+@Api(tags = {"文章"})
+public class ArticleController extends BaseController<ArticleBiz, Article> {
+
+    @GetMapping("/list")
+    @ApiOperation(value = "获取文章列表")
+     public ObjectRestResponse getArticleList(
+             @RequestParam(name = "page",defaultValue = "1") Integer page,
+             @RequestParam(name = "limit",defaultValue = "10")Integer limit){
+        return ObjectRestResponse.succ(baseBiz.getArticleList(page,limit));
+     }
+}

xx-uccn/xx-uccn-server/src/main/resources/mapper/ArticleMapper.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.uccn.mapper.ArticleMapper">
+
+    <select id="getArticleList" resultType="com.xxfc.platform.uccn.entity.Article">
+        select title,epitome,add_time,cover_image from article  where is_del=0 and status=1 order by weight,add_time DESC
+    </select>
+
+</mapper>
\ No newline at end of file

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

@@ -32,7 +32,7 @@ public class BranchCompanyStockApplyInfoBiz extends BaseBiz<BranchCompanyStockAp
      * @param applyVo
      */
     public void apply(BranchCompanyStockApplyVo applyVo) {
-        BranchCompanyStockRight stockInfo = branchCompanyStockRightBiz.selectById(applyVo.getCompanyId());
+        BranchCompanyStockRight stockInfo = branchCompanyStockRightBiz.selectByCompanyId(applyVo.getCompanyId());
         if (stockInfo == null) {
             throw new BaseException(ResCode.BRANCH_COMPANY_STOCK_UNEXIST.getDesc(), ResCode.BRANCH_COMPANY_STOCK_UNEXIST.getCode());
         }

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

@@ -189,4 +189,12 @@ public class BranchCompanyStockRightBiz extends BaseBiz<BranchCompanyStockRightM
         dataPage.setData(stockRights);
         return dataPage;
     }
+
+    public BranchCompanyStockRight selectByCompanyId(Integer companyId) {
+        BranchCompanyStockRight branchCompanyStockRight = new BranchCompanyStockRight();
+        branchCompanyStockRight.setCompanyBaseId(companyId);
+        branchCompanyStockRight.setIsDel(0);
+        BranchCompanyStockRight result = mapper.selectOne(branchCompanyStockRight);
+        return result;
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848,10.1.37.166:8848
+        server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml