Skip to content

C
cloud-platform
Commit bb2993d2 authored by jiaorz's avatar jiaorz
Browse files
Options

Merge remote-tracking branch 'origin/dev' into jrz_dev

parents a5c147c1 aa783a98
Show whitespace changes
Inline Side-by-side
Showing with 791 additions and 45 deletions
ace-common/pom.xml
View file @ bb2993d2
......@@ -209,7 +209,7 @@
<artifactId>spring-boot</artifactId>
<version>2.1.3.RELEASE</version>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-openfeign-core</artifactId>
<version>2.1.0.RELEASE</version>
......@@ -226,8 +226,12 @@
<artifactId>feign-core</artifactId>
<version>10.1.0</version>
<scope>compile</scope>
</dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
......
ace-modules/ace-generator/pom.xml
View file @ bb2993d2
......@@ -16,8 +16,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
......
ace-modules/ace-generator/src/main/resources/application.yml
View file @ bb2993d2
......@@ -10,9 +10,9 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://10.5.52.4:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
url: jdbc:mysql://10.5.52.4:3307/xxfc_uccn?useUnicode=true&characterEncoding=UTF-8
username: root
password: e4549e9315f19a88
password: sslcloud123*()
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
......
ace-modules/ace-generator/src/main/resources/generator.properties
View file @ bb2993d2
#\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F
#\u5305\u540D
package=com.xxfc.platform.order
package=com.xxfc.platform.uccn
#\u4F5C\u8005
author=zjw
author=libin
#Email
email=18178966185@163.com
#\u8868\u524D\u9519\u8BEF\u7684Unicode\u5B57\u7B26\u4E32!
......
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivityDTO.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.dto;
import lombok.Data;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 15:51
*/
@Data
public class SummitActivityDTO {
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivityFindDTO.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 18:55
*/
@Data
public class SummitActivityFindDTO extends PageParam {
private Long startTime;
private Long endTime;
private String title;
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/dto/SummitActivitySaveDTO.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.dto;
import lombok.Data;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 18:54
*/
@Data
public class SummitActivitySaveDTO {
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/entity/SummitActivity.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.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;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 峰会活动
*
* @author libin
* @email 18178966185@163.com
* @date 2019-08-26 15:25:32
*/
@Data
@Table(name = "summit_activity")
public class SummitActivity implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(generator = "JDBC")
private Integer id;
/**
* 活动主标题
*/
@Column(name = "title")
@ApiModelProperty(value = "活动主标题")
private String title;
/**
* 副标题（不展示）
*/
@Column(name = "subtitle")
@ApiModelProperty(value = "副标题（不展示）")
private String subtitle;
/**
* 活动主图
*/
@Column(name = "banner")
@ApiModelProperty(value = "活动主图")
private String banner;
/**
* 开始时间
*/
@Column(name = "start_time")
@ApiModelProperty(value = "开始时间")
private Integer startTime;
/**
* 结束时间
*/
@Column(name = "end_time")
@ApiModelProperty(value = "结束时间")
private Integer endTime;
/**
* 报名截止时间（不展示）
*/
@Column(name = "reg_close_time")
@ApiModelProperty(value = "报名截止时间（不展示）")
private Long regCloseTime;
/**
* 省编码
*/
@Column(name = "province_code")
@ApiModelProperty(value = "省编码")
private Integer provinceCode;
/**
* 省
*/
@Column(name = "province")
@ApiModelProperty(value = "省")
private String province;
/**
* 市编码
*/
@Column(name = "city_code")
@ApiModelProperty(value = "市编码")
private Integer cityCode;
/**
* 市
*/
@Column(name = "city")
@ApiModelProperty(value = "市")
private String city;
/**
* 县/镇 编码
*/
@Column(name = "town_code")
@ApiModelProperty(value = "县/镇 编码")
private Integer townCode;
/**
* 县/镇
*/
@Column(name = "town")
@ApiModelProperty(value = "县/镇")
private String town;
/**
* 活动场地（地址格式）
*/
@Column(name = "address")
@ApiModelProperty(value = "活动场地（地址格式）")
private String address;
/**
* 纬度（不展示）
*/
@Column(name = "latitude")
@ApiModelProperty(value = "纬度（不展示）")
private BigDecimal latitude;
/**
* 经度 （不展示）
*/
@Column(name = "longitude")
@ApiModelProperty(value = "经度 （不展示）")
private BigDecimal longitude;
/**
* 总人数
*/
@Column(name = "limit_num")
@ApiModelProperty(value = "总人数")
private Integer limitNum;
/**
* 活动图文内容
*/
@Column(name = "content")
@ApiModelProperty(value = "活动图文内容")
private String content;
/**
* 活动开关（1开，0关）
*/
@Column(name = "is_show")
@ApiModelProperty(value = "活动开关（0关，1开）")
private Integer isShow;
/**
* 报名开关（0开，1关）
*/
@Column(name = "is_open_reg")
@ApiModelProperty(value = "报名开关（0开，1关）")
private Integer isOpenReg;
/**
* 删除（0正常，1删除）
*/
@Column(name = "is_del")
@ApiModelProperty(value = "删除（0正常，1删除）")
private Integer isDel;
/**
* 0是未发布，1是已发布
*/
@Column(name = "is_publish")
@ApiModelProperty(value = "0是未发布，1是已发布")
private Integer isPublish;
/**
* 0是普通，1是置顶（首页展示）
*/
@Column(name = "is_home_page")
@ApiModelProperty(value = "0是普通，1是置顶（首页展示）")
private Integer isHomePage;
/**
* 创建人id
*/
@Column(name = "crt_user")
@ApiModelProperty(value = "创建人id")
private Integer crtUser;
/**
* 创建人姓名
*/
@Column(name = "crt_name")
@ApiModelProperty(value = "创建人姓名")
private String crtName;
/**
* 创建时间
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true)
private Long crtTime;
/**
* 活动对象说明（不展示）
*/
@Column(name = "act_desc")
@ApiModelProperty(value = "活动对象说明（不展示）")
private String actDesc;
/**
* 活动类型(保留，不展示)
*/
@Column(name = "type")
@ApiModelProperty(value = "活动类型(保留，不展示)")
private Integer type;
/**
* 报名人数（不展示）
*/
@Column(name = "will_num")
@ApiModelProperty(value = "报名人数（不展示）")
private Integer willNum;
/**
* 1:欣欣官网 2：滴房车官网 0：无限制
*/
@Column(name = "location")
@ApiModelProperty(value = "1:欣欣官网 2：滴房车官网 0：无限制")
private Integer location;
/**
* 排序
*/
@Column(name = "rank")
@ApiModelProperty(value = "排序")
private Integer rank;
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityAdminVo.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.vo;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 19:00
*/
public class SummitActivityAdminVo {
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailAdminVo.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.vo;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 19:01
*/
public class SummitActivityDetailAdminVo {
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityDetailVo.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 16:17
*/
@Data
public class SummitActivityDetailVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
@ApiModelProperty(value = "活动主标题")
private String title;
@ApiModelProperty(value = "副标题（不展示）")
private String subtitle;
@ApiModelProperty(value = "活动主图")
private String banner;
@ApiModelProperty(value = "开始时间")
private Integer startTime;
@ApiModelProperty(value = "结束时间")
private Integer endTime;
@ApiModelProperty(value = "报名截止时间（不展示）")
private Long regCloseTime;
@ApiModelProperty(value = "省")
private String province;
@ApiModelProperty(value = "市")
private String city;
@ApiModelProperty(value = "县/镇")
private String town;
@ApiModelProperty(value = "活动场地（地址格式）")
private String address;
@ApiModelProperty(value = "总人数")
private Integer limitNum;
@ApiModelProperty(value = "活动图文内容")
private String content;
@ApiModelProperty(value = "报名开关（0开，1关）")
private Integer isOpenReg;
@ApiModelProperty(value = "活动对象说明（不展示）")
@JsonIgnore
private String actDesc;
@ApiModelProperty(value = "活动类型(保留，不展示)")
@JsonIgnore
private Integer type;
@ApiModelProperty(value = "报名人数（不展示）")
@JsonIgnore
private Integer willNum;
}
xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/SummitActivityVo.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 15:51
*/
@Data
public class SummitActivityVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
@ApiModelProperty(value = "活动主标题")
private String title;
@ApiModelProperty(value = "副标题（不展示）")
private String subtitle;
@ApiModelProperty(value = "活动主图")
private String banner;
@ApiModelProperty(value = "开始时间")
private Integer startTime;
@ApiModelProperty(value = "结束时间")
private Integer endTime;
@ApiModelProperty(value = "省")
private String province;
@ApiModelProperty(value = "市")
private String city;
@ApiModelProperty(value = "县/镇")
private String town;
@ApiModelProperty(value = "活动场地（地址格式）")
private String address;
@ApiModelProperty(value = "排序")
@JsonIgnore
private Integer rank;
}
xx-uccn/xx-uccn-server/pom.xml
View file @ bb2993d2
......@@ -18,6 +18,11 @@
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
......
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.biz;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
import com.xxfc.platform.uccn.vo.SummitActivityVo;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import com.xxfc.platform.uccn.entity.SummitActivity;
import com.xxfc.platform.uccn.mapper.SummitActivityMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.time.Instant;
import java.util.Collections;
import java.util.List;
/**
* 峰会活动
*
* @author libin
* @email 18178966185@163.com
* @date 2019-08-26 15:25:32
*/
@Service
public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActivity> {
public List<SummitActivityVo> findSummitActivityForHomePage(Integer limit) {
Example example = new Example(SummitActivity.class);
example.setOrderByClause("rank");
Example.Criteria criteria = example.createCriteria();
//未删除
criteria.andEqualTo("isDel",0);
//是首页展示
criteria.andEqualTo("isHomePage",1);
//已发布
criteria.andEqualTo("isPublish",1);
//活动未下架
criteria.andEqualTo("isShow",0);
//结束时间大于当前时间
//criteria.andGreaterThanOrEqualTo("endTime", Instant.now().toEpochMilli());
PageDataVO<SummitActivity> dataVO = PageDataVO.pageInfo(1, limit, () -> mapper.selectByExample(example));
List<SummitActivity> summitActivities = dataVO.getData();
if (CollectionUtils.isEmpty(summitActivities)){
return Collections.EMPTY_LIST;
}
return JSON.parseObject(JSON.toJSONString(summitActivities),new TypeReference<List<SummitActivityVo>>(){});
}
public SummitActivityDetailVo findSummitActivityDetailById(Integer id) {
SummitActivityDetailVo summitActivityDetailVo = new SummitActivityDetailVo();
SummitActivity summitActivity = mapper.selectByPrimaryKey(id);
BeanUtils.copyProperties(summitActivity, summitActivityDetailVo);
return summitActivityDetailVo;
}
public PageDataVO<SummitActivityAdminVo> listSummitActivityWithPage(SummitActivityFindDTO summitActivityFindDTO) {
return null;
}
public void saveSummitActivity(SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO) {
}
public void publishSummitActivityById(Integer id, Integer state) {
SummitActivity summitActivity = new SummitActivity();
summitActivity.setIsPublish(state);
summitActivity.setId(id);
mapper.updateByPrimaryKeySelective(summitActivity);
}
public void soldOutSummitAcitivityById(Integer id, Integer state) {
SummitActivity summitActivity = new SummitActivity();
summitActivity.setIsShow(state);
summitActivity.setId(id);
mapper.updateByPrimaryKeySelective(summitActivity);
}
public void setShowOnHomePageById(Integer id, Integer state) {
SummitActivity summitActivity = new SummitActivity();
summitActivity.setIsHomePage(state);
summitActivity.setId(id);
mapper.updateByPrimaryKeySelective(summitActivity);
}
public void setRegSateWithSummitActivityById(Integer id, Integer state) {
SummitActivity summitActivity = new SummitActivity();
summitActivity.setIsOpenReg(state);
summitActivity.setId(id);
mapper.updateByPrimaryKeySelective(summitActivity);
}
public void deleteSummitActivityById(Integer id) {
SummitActivity summitActivity = new SummitActivity();
summitActivity.setIsDel(1);
summitActivity.setId(id);
mapper.updateByPrimaryKeySelective(summitActivity);
}
}
\ No newline at end of file
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/mapper/SummitActivityMapper.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.mapper;
import com.xxfc.platform.uccn.entity.SummitActivity;
import tk.mybatis.mapper.common.Mapper;
/**
* 峰会活动
*
* @author libin
* @email 18178966185@163.com
* @date 2019-08-26 15:25:32
*/
public interface SummitActivityMapper extends Mapper<SummitActivity> {
}
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.rest;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.uccn.biz.SummitActivityBiz;
import com.xxfc.platform.uccn.vo.SummitActivityDetailVo;
import com.xxfc.platform.uccn.vo.SummitActivityVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 15:36
*/
@RestController
@RequestMapping("/summitActivity/app/unauth")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
@Api("峰会")
public class SummitActivityController{
private final SummitActivityBiz summitActivityBiz;
@ApiOperation("官网首页展示")
@GetMapping("/home")
public ObjectRestResponse<List<SummitActivityVo>> findSummitActivityForHomePage(@RequestParam(defaultValue = "5",required = false) Integer limit){
List<SummitActivityVo> summitActivityVos = summitActivityBiz.findSummitActivityForHomePage(limit);
return ObjectRestResponse.succ(summitActivityVos);
}
@ApiOperation("峰会活动详情")
@GetMapping("/{id}")
public ObjectRestResponse<SummitActivityDetailVo> findSummitActivityDetailById(@PathVariable(value = "id") Integer id){
SummitActivityDetailVo summitActivityDetailVo = summitActivityBiz.findSummitActivityDetailById(id);
return ObjectRestResponse.succ(summitActivityDetailVo);
}
}
\ No newline at end of file
xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/SummitActivityAdminController.java 0 → 100644
View file @ bb2993d2
package com.xxfc.platform.uccn.rest.admin;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.uccn.biz.SummitActivityBiz;
import com.xxfc.platform.uccn.dto.SummitActivityFindDTO;
import com.xxfc.platform.uccn.dto.SummitActivitySaveDTO;
import com.xxfc.platform.uccn.vo.SummitActivityAdminVo;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author libin
* @version 1.0
* @description
* @data 2019/8/26 15:36
*/
@RestController
@RequestMapping("/admin/summitActivity")
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class SummitActivityAdminController {
private final SummitActivityBiz summitActivityBiz;
@ApiOperation("活动列表")
@PostMapping("/list")
public ObjectRestResponse<PageDataVO<SummitActivityAdminVo>> listSummitActivityWithPage(@RequestBody SummitActivityFindDTO summitActivityFindDTO){
PageDataVO<SummitActivityAdminVo> pageDataVO = summitActivityBiz.listSummitActivityWithPage(summitActivityFindDTO);
return ObjectRestResponse.succ(pageDataVO);
}
@ApiOperation("保存或编辑")
@PostMapping("/save")
public ObjectRestResponse<Void> saveSummitActivity(@RequestBody SummitActivitySaveDTO summitActivitySaveDTO, UserDTO userDTO){
summitActivityBiz.saveSummitActivity(summitActivitySaveDTO,userDTO);
return ObjectRestResponse.succ();
}
@ApiOperation("活动发布设置")
@PutMapping("/publish/{id}/{state}")
public ObjectRestResponse<Void> publishSummitActivity(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
summitActivityBiz.publishSummitActivityById(id,state);
return ObjectRestResponse.succ();
}
@ApiOperation("上下架活动")
@PutMapping("/soldout/{id}/{state}")
public ObjectRestResponse<Void> soldOutSummitActivity(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
summitActivityBiz.soldOutSummitAcitivityById(id,state);
return ObjectRestResponse.succ();
}
@ApiOperation("首页展示设置")
@PutMapping("/home_page/{id}/{state}")
public ObjectRestResponse<Void> setShowOnHomePage(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
summitActivityBiz.setShowOnHomePageById(id,state);
return ObjectRestResponse.succ();
}
@ApiOperation("报名开关设置")
@PutMapping("/reg_state/{id}/{state}")
public ObjectRestResponse<Void> setRegStateWithSummitActivity(@PathVariable(value = "id") Integer id,@PathVariable(value = "state") Integer state){
summitActivityBiz.setRegSateWithSummitActivityById(id,state);
return ObjectRestResponse.succ();
}
@ApiOperation("删除活动")
@DeleteMapping("/{id}")
public ObjectRestResponse<Void> deleteSummitActivity(@PathVariable(value = "id") Integer id){
summitActivityBiz.deleteSummitActivityById(id);
return ObjectRestResponse.succ();
}
}
\ No newline at end of file
xx-uccn/xx-uccn-server/src/main/resources/mapper/SummitActivityMapper.xml 0 → 100644
View file @ bb2993d2
<?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.SummitActivityMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="com.xxfc.platform.uccn.entity.SummitActivity" id="summitActivityMap">
<result property="id" column="id"/>
<result property="title" column="title"/>
<result property="subtitle" column="subtitle"/>
<result property="banner" column="banner"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="regCloseTime" column="reg_close_time"/>
<result property="provinceCode" column="province_code"/>
<result property="province" column="province"/>
<result property="cityCode" column="city_code"/>
<result property="city" column="city"/>
<result property="townCode" column="town_code"/>
<result property="town" column="town"/>
<result property="address" column="address"/>
<result property="latitude" column="latitude"/>
<result property="longitude" column="longitude"/>
<result property="limitNum" column="limit_num"/>
<result property="content" column="content"/>
<result property="isShow" column="is_show"/>
<result property="isOpenReg" column="is_open_reg"/>
<result property="isDel" column="is_del"/>
<result property="isPublish" column="is_publish"/>
<result property="isHomePage" column="is_home_page"/>
<result property="crtUser" column="crt_user"/>
<result property="crtName" column="crt_name"/>
<result property="crtTime" column="crt_time"/>
<result property="actDesc" column="act_desc"/>
<result property="type" column="type"/>
<result property="willNum" column="will_num"/>
<result property="location" column="location"/>
<result property="rank" column="rank"/>
</resultMap>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockApplyVo.java
View file @ bb2993d2
......@@ -8,6 +8,7 @@ import lombok.Data;
@Data
public class BranchCompanyStockApplyVo {
Integer companyId;
Integer stockRightId;
String name;
String tel;
Integer count;
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/BranchCompanyStockRightDTO.java
View file @ bb2993d2
......@@ -13,6 +13,7 @@ import java.math.BigDecimal;
@Data
public class BranchCompanyStockRightDTO {
private Integer id;
private Integer companyBaseId;
private String companyName;
private Integer balance;
private Integer total;
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/BranchCompanyStockRightForWeChatOfficeVO.java
View file @ bb2993d2
......@@ -14,6 +14,7 @@ import java.math.BigDecimal;
public class BranchCompanyStockRightForWeChatOfficeVO {
private Integer id;
private Integer companyBaseId;
private String companyName;
private Integer balance;
private Integer total;
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/CompanyVo.java
View file @ bb2993d2
......@@ -25,6 +25,8 @@ public class CompanyVo extends PageParam {
String images;
@ApiModelProperty("片区id")
Integer zoneId;
@ApiModelProperty("片区名称")
String zoneName;
@ApiModelProperty("公司简介")
String describes;
@ApiModelProperty("详情")
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockApplyInfoBiz.java
View file @ bb2993d2
......@@ -32,7 +32,7 @@ public class BranchCompanyStockApplyInfoBiz extends BaseBiz<BranchCompanyStockAp
* @param applyVo
*/
public void apply(BranchCompanyStockApplyVo applyVo) {
BranchCompanyStockRight stockInfo = branchCompanyStockRightBiz.selectByCompanyId(applyVo.getCompanyId());
BranchCompanyStockRight stockInfo = branchCompanyStockRightBiz.selectById(applyVo.getStockRightId());
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/CompanyBaseBiz.java
View file @ bb2993d2
......@@ -44,6 +44,9 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
@Autowired
SysRegionMapper sysRegionMapper;
@Autowired
AreaBiz areaBiz;
@Value("${branchCompanyPic.url}")
private String companyUrl;
......@@ -121,8 +124,10 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
}
Integer state=companyVo.getState()==null?2:companyVo.getState();
if (state==1&&(StringUtils.isBlank(companyVo.getAddrDetail())||StringUtils.isBlank(companyVo.getImages())||StringUtils.isBlank(companyVo.getDescribes())||StringUtils.isBlank(companyVo.getContent())
||StringUtils.isBlank(companyVo.getLeader())||StringUtils.isBlank(companyVo.getLeaderContactInfo())||StringUtils.isBlank(companyVo.getTourServicePhone())||StringUtils.isBlank(companyVo.getVehiceServicePhone()))){
BigDecimal latitude=companyVo.getLatitude();
BigDecimal longitude=companyVo.getLongitude();
if (state==1&&(StringUtils.isBlank(companyVo.getAddrDetail())||StringUtils.isBlank(companyVo.getImages())||StringUtils.isBlank(companyVo.getDescribes())
||StringUtils.isBlank(companyVo.getLeaderContactInfo())||latitude==null||longitude==null)){
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"上架时参数不能为空");
}
CompanyBase companyBase=new CompanyBase();
......@@ -159,10 +164,19 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
Integer stockId=companyVo.getStockId();
String name="";
String companyName="";
String zoneName="";
if (companyBaseId!=null&&companyBaseId>0){
CompanyBase companyBase=selectById(companyBaseId);
BeanUtils.copyProperties(companyBase,companyVo);
name=companyBase.getName();
Integer zoneId=companyBase.getZoneId();
if (zoneId!=null){
Area area=areaBiz.selectById(zoneId);
if (area!=null){
zoneName=area.getName();
}
}
}
if (companyId!=null&&companyId>0){
BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
......@@ -176,6 +190,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
companyVo.setId(companyBaseId);
companyVo.setName(name);
companyVo.setCompanyName(companyName);
companyVo.setZoneName(zoneName);
return ObjectRestResponse.succ(companyVo);
}
......@@ -199,6 +214,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
BeanUtils.copyProperties(companyVo,right);
if (stockId==null||stockId==0){
right.setId(null);
right.setCompanyBaseId(companyBaseId);
stockRightBiz.insertSelective(right);
}else {
right.setId(stockId);
......@@ -207,7 +223,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
return ObjectRestResponse.succ();
}
//设置基础信息
//设置基础详情
public ObjectRestResponse updCompanyDetail(CompanyVo companyVo){
if (companyVo==null){
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
......@@ -217,21 +233,9 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
Integer companyBaseId=companyVo.getId();
if (companyBaseId==null||companyBaseId==0){
insertSelective(companyBase);
companyBaseId=companyBase.getId();
}else {
updateSelectiveById(companyBase);
}
BranchCompany branchCompany=new BranchCompany();
BeanUtils.copyProperties(companyVo,branchCompany);
branchCompany.setCompanyBaseId(companyBaseId);
Integer companyId=companyVo.getCompanyId();
if (companyId==null||companyId==0){
branchCompany.setId(null);
branchCompanyBiz.insertSelective(branchCompany);
}else {
branchCompany.setId(companyId);
branchCompanyBiz.updateSelectiveById(branchCompany);
}
return ObjectRestResponse.succ();
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyStockRightController.java
View file @ bb2993d2
......@@ -105,7 +105,7 @@ public class BranchCompanyStockRightController extends BaseController<BranchComp
*/
@PostMapping("/app/unauth/apply")
public RestResponse apply(@RequestBody BranchCompanyStockApplyVo applyVo) {
if (applyVo.getCompanyId() == null || applyVo.getName() == null || applyVo.getTel() == null || applyVo.getCount() == null) {
if (applyVo.getStockRightId() == null || applyVo.getName() == null || applyVo.getTel() == null || applyVo.getCount() == null) {
return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
ResCode.INVALID_REST_REQ_PARAM.getDesc());
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java
View file @ bb2993d2
......@@ -58,19 +58,19 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
@ApiOperation("设置股权信息")
@RequestMapping(value = "/updStockInfo", method = RequestMethod.POST)
public ObjectRestResponse updStockInfo(CompanyVo companyVo){
public ObjectRestResponse updStockInfo(@RequestBody CompanyVo companyVo){
return baseBiz.updStockInfo(companyVo);
}
@ApiOperation("设置详情")
@RequestMapping(value = "/updCompanyDetail", method = RequestMethod.POST)
public ObjectRestResponse updCompanyDetail(CompanyVo companyVo){
public ObjectRestResponse updCompanyDetail(@RequestBody CompanyVo companyVo){
return baseBiz.updCompanyDetail(companyVo);
}
@ApiOperation("删除")
@RequestMapping(value = "/del", method = RequestMethod.POST)
public ObjectRestResponse del(@RequestParam(value = "id",defaultValue = "0") Integer id){
return baseBiz.delCompany(id);
public ObjectRestResponse del(@RequestBody CompanyVo companyVo){
return baseBiz.delCompany(companyVo.getId());
}
/**
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockApplyInfoMapper.xml
View file @ bb2993d2
<?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.BranchCompanyStockApplyInfoMapper" >
<resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo" >
<!--
WARNING - @mbg.generated
-->
<id column="id" property="id" jdbcType="INTEGER" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="tel" property="tel" jdbcType="VARCHAR" />
<result column="company_id" property="companyId" jdbcType="INTEGER" />
<result column="count" property="count" jdbcType="INTEGER" />
<result column="state" property="state" jdbcType="INTEGER" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
</resultMap>
<select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo">
select a.*, b.company_name
select a.*, b.`name` as companyName,r.id as companyId
from branch_company_stock_apply_info a
left join `company_base` b on a.company_id = b.id
left join branch_company_stock_info_right r on a.company_base_id=r.id
left join company_base b on b.id=r.company_base_id
order by a.create_time desc
</select>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockRightMapper.xml
View file @ bb2993d2
......@@ -87,7 +87,8 @@
<select id="findWithPageByPriceOrCode"
resultType="com.xxfc.platform.vehicle.pojo.dto.BranchCompanyStockRightDTO">
SELECT
cb.id,
bcsir.id AS `id`,
cb.id AS `companyBaseId`,
bcsir.balance,
bcsir.total,
bcsir.type,
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml
View file @ bb2993d2
......@@ -16,6 +16,7 @@
c.vehice_service_phone as vehiceServicePhone,
c.tour_service_phone as tourServicePhone,
c.zone_id as zoneId,
a.name as zoneName,
c.addr_province as addrProvince,
c.province_name as provinceName,
c.addr_city as addrCity,
......@@ -35,6 +36,7 @@
FROM branch_company c
LEFT JOIN company_base b ON c.company_base_id=b.id
LEFT JOIN branch_company_stock_info_right r ON c.company_base_id=r.company_base_id
LEFT JOIN area a ON c.zone_id=a.id
<where>
b.is_del=0
<if test="zoneId != null and zoneId !='' ">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment