Skip to content

C
cloud-platform
Commit 46c9f674 authored by hanfeng's avatar hanfeng
Browse files
Options

增加车型标签增加和修改功能

parent fd87710c
Show whitespace changes
Inline Side-by-side
Showing with 537 additions and 95 deletions
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/common/TourBaseController.java
View file @ 46c9f674
......@@ -23,6 +23,7 @@ public class TourBaseController<Biz extends BaseBiz> extends CommonBaseControlle
public AppUserDTO getUserInfo(){
return userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
}
public Biz getBaseBiz() {
return baseBiz;
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java
View file @ 46c9f674
package com.xxfc.platform.tour.rest;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.xxfc.platform.tour.biz.TourUserBiz;
import com.xxfc.platform.tour.common.TourBaseController;
......@@ -8,6 +9,7 @@ import com.xxfc.platform.tour.entity.TourUser;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import tk.mybatis.mapper.entity.Example;
import tk.mybatis.mapper.weekend.WeekendSqls;
......@@ -48,18 +50,52 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
}
@ApiOperation("修改")
@PostMapping(value = "/update")
public ObjectRestResponse<TourUser> update(@RequestBody TourUser tourUser){
@ApiOperation("插入和更新")
@PostMapping(value = "/app/addAndUpdate")
@Transactional
public ObjectRestResponse<TourUser> addAndUpdate(@RequestBody TourUser tourUser){
try {
if (tourUser.getId()==null||tourUser.getId()==0) {
AppUserDTO userInfo = getUserInfo();
if (userInfo==null||userInfo.getUserid()==null||userInfo.getUserid()==0) {
ObjectRestResponse.createDefaultFail();
}
Integer userid = userInfo.getUserid();
tourUser.setUserid(userid);
tourUser.setCrtTime(System.currentTimeMillis());
tourUser.setIsdel(0);
baseBiz.insertSelective(tourUser);
}else {
tourUser.setUpdTime(System.currentTimeMillis());
baseBiz.updateSelectiveById(tourUser);
}
return new ObjectRestResponse<TourUser>();
} catch (Exception e) {
e.printStackTrace();
throw new BaseException("失败");
}
@ApiOperation("添加")
@PostMapping(value = "/add")
public ObjectRestResponse<TourUser> add(@RequestBody TourUser tourUser){
baseBiz.insertSelective(tourUser);
return new ObjectRestResponse<TourUser>();
}
@ApiOperation("通过id查询")
@PostMapping(value = "/app/findById/{id}")
public ObjectRestResponse<TourUser> findById(@PathVariable Integer id){
AppUserDTO userInfo = getUserInfo();
if (userInfo==null||userInfo.getUserid()==null||userInfo.getUserid()==0) {
ObjectRestResponse.createDefaultFail();
}
Integer userid = userInfo.getUserid();
TourUser user = new TourUser();
user.setUserid(userid);
user.setId(id);
if (id==null||id==0) {
ObjectRestResponse.createDefaultFail();
}
return ObjectRestResponse.succ(baseBiz.selectList(user));
}
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java
View file @ 46c9f674
......@@ -38,6 +38,14 @@ public class VehicleModel implements Serializable {
@ApiModelProperty(value = "房车配置，code逗号分割")
private String config;
@Column(name = "number")
@ApiModelProperty(value = "乘卧数")
private String number;
@Column(name = "brand")
@ApiModelProperty(value = "品牌")
private String brand;
//关键标签，code逗号分割
@Column(name = "keyword")
@ApiModelProperty(value = "关键标签，code逗号分割")
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehiclePlatCata.java
View file @ 46c9f674
......@@ -70,5 +70,10 @@ public class VehiclePlatCata implements Serializable {
@ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime;
//是否多选
@Column(name = "ismore")
@ApiModelProperty(value = "多选 0:单选 1:多选" )
private Integer ismore;
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/Cascade.java 0 → 100644
View file @ 46c9f674
package com.xxfc.platform.vehicle.pojo;
import lombok.Data;
import java.util.List;
@Data
public class Cascade <v> {
v parent;
List<v> children;
public Cascade(v parent, List<v> children) {
this.parent=parent;
this.children=children;
}
public Cascade() {
}
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java
View file @ 46c9f674
......@@ -3,6 +3,8 @@ package com.xxfc.platform.vehicle.pojo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 车型查询条件bean
* @author Administrator
......
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java
View file @ 46c9f674
package com.xxfc.platform.vehicle.pojo;
import com.xxfc.platform.vehicle.entity.Vehicle;
import com.xxfc.platform.vehicle.entity.VehicleModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -22,9 +23,8 @@ import java.util.Date;
*/
@Data
@Table(name = "vehicle_model")
public class VehicleModelVo implements Serializable {
public class VehicleModelVo extends VehicleModel implements Serializable {
private static final long serialVersionUID = 1L;
//主键
@Id
@GeneratedValue(generator = "JDBC")
......@@ -41,6 +41,14 @@ public class VehicleModelVo implements Serializable {
@ApiModelProperty(value = "房车配置，code逗号分割")
private String config;
@Column(name = "number")
@ApiModelProperty(value = "乘卧数")
private String number;
@Column(name = "brand")
@ApiModelProperty(value = "品牌")
private String brand;
//关键标签，code逗号分割
@Column(name = "keyword")
@ApiModelProperty(value = "关键标签，code逗号分割")
......@@ -66,10 +74,6 @@ public class VehicleModelVo implements Serializable {
@ApiModelProperty(value = "价格")
private BigDecimal price;
//会员价格
@Column(name = "vip_price")
@ApiModelProperty(value = "会员价格")
private BigDecimal vipPrice;
//总押金
@Column(name = "deposit")
......@@ -130,9 +134,19 @@ public class VehicleModelVo implements Serializable {
@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
private Integer hotSign;
@ApiModelProperty(value = "是否删除")
private Integer isdel;
@Column(name = "rent_discount_status")
@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")
private Integer rentDiscountStatus;
@Column(name = "rent_discount_price")
@ApiModelProperty(value = "租车优惠价格")
private BigDecimal RentDiscountPrice;
@Column(name = "buy_price")
@ApiModelProperty(value = "购买价格")
private BigDecimal buyPrice;
@ApiModelProperty(value = "总数量")
private Integer sum;
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePlatCataBiz.java
View file @ 46c9f674
......@@ -5,12 +5,16 @@ import com.ace.cache.annotation.Cache;
import com.ace.cache.annotation.CacheClear;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.exception.BaseException;
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.common.RestResponse;
import com.xxfc.platform.vehicle.constant.RedisKey;
import com.xxfc.platform.vehicle.entity.VehicleCata;
import com.xxfc.platform.vehicle.entity.VehicleModel;
import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
import com.xxfc.platform.vehicle.pojo.Cascade;
import com.xxfc.platform.vehicle.pojo.CataVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
......@@ -31,16 +35,17 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
@Autowired
VehicleCataBiz vehicleCataBiz;
//更新
@Transactional
@CacheClear(pre = RedisKey.BRANCH_CATA_CACHE)
public RestResponse update(CataVo cataVo){
public RestResponse update(CataVo cataVo) {
VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
BeanUtils.copyProperties(cataVo,vehiclePlatCata);
if(vehiclePlatCata.getId()==null||vehiclePlatCata.getId()==0){
BeanUtils.copyProperties(cataVo, vehiclePlatCata);
if (vehiclePlatCata.getId() == null || vehiclePlatCata.getId() == 0) {
vehiclePlatCata.setUpdTime(System.currentTimeMillis());
insertSelective(vehiclePlatCata);
}else{
} else {
updateSelectiveById(vehiclePlatCata);
}
return RestResponse.suc();
......@@ -66,13 +71,14 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
treeObject.put("children", getChildren(cata.getId()));
list.add(treeObject);
}
obj.put("cata",list);
obj.put("cata", list);
return obj;
}
public List<Object> getChildren(Integer parentId){
public List<Object> getChildren(Integer parentId) {
List<Object> list = new ArrayList<>();
List<VehiclePlatCata> children = getAll(parentId);
if(children.size()>0){
if (children.size() > 0) {
for (VehiclePlatCata cata : children) {
JSONObject obj = new JSONObject();
obj.put("id", cata.getId());
......@@ -87,25 +93,29 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
return list;
}
public List<VehiclePlatCata> getAll(Integer parentId){
public List<VehiclePlatCata> getAll(Integer parentId) {
Example example = new Example(VehiclePlatCata.class);
example.createCriteria().andEqualTo("parentId", parentId).andEqualTo("state",0);
example.createCriteria().andEqualTo("parentId", parentId).andEqualTo("state", 0);
example.setOrderByClause("`rank` desc");
return mapper.selectByExample(example);
}
/**
* 根据车型获取
*
* @param modelId
* @return
*/
public List<VehiclePlatCata> getByModelId(Integer modelId){
public List<VehiclePlatCata> getByModelId(Integer modelId) {
List<VehicleCata> vehicleCatas = vehicleCataBiz.selectByExample(new Example.Builder(VehicleCata.class)
.where(WeekendSqls.<VehicleCata>custom().andEqualTo(VehicleCata::getVehicleModelId, modelId)).build());
if(vehicleCatas.isEmpty()) {
if (vehicleCatas.isEmpty()) {
return new ArrayList<VehiclePlatCata>();
}else {
} else {
List<VehiclePlatCata> VehiclePlatCatas = this.selectByExample(new Example.Builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom().andIn(VehiclePlatCata::getId
, vehicleCatas.parallelStream().map(VehicleCata::getCataId).distinct()
......@@ -114,4 +124,223 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
}
}
/**
* 级联添加
* @param cascade
* @return
*/
@Transactional
public ObjectRestResponse addCascades(Cascade<VehiclePlatCata> cascade) {
try {
//取出一级标签
VehiclePlatCata parent = cascade.getParent();
//插入一级标签获得id
mapper.insertSelective(parent);
Integer parentId = parent.getId();
//取出二级标签
List<VehiclePlatCata> childrens = cascade.getChildren();
//逐条插入二级标签
for (VehiclePlatCata children : childrens) {
children.setParentId(parentId);
}
mapper.addPlatCataList(childrens);
return ObjectRestResponse.succ();
} catch (Exception e) {
e.printStackTrace();
throw new BaseException(ResultCode.FAILED_CODE);
}
}
/**
* 根据父类id获取子标签
*
* @param parentId
* @return
*/
public ObjectRestResponse fingCatasByParentId(Integer parentId) {
Example example = Example.builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId, parentId)
.andEqualTo(VehiclePlatCata::getState, 0))
.orderByAsc("rank")
.build();
List<VehiclePlatCata> vpcs = mapper.selectByExample(example);
return ObjectRestResponse.succ(vpcs);
}
/**
* 分页或不分页,获取一级标签及其子标签
*
*
* @param sort
* @param page
* @param limit
* @return
*/
public ObjectRestResponse getCascades( Integer page, Integer limit ,Integer sort) {
try {
//标签列表页面
if (sort==null||sort==0) {
//获取一级标签
Example example = Example.builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId, 0)
.andEqualTo(VehiclePlatCata::getState, 0))
.orderByAsc("rank")
.build();
//分页查询一级标签并分类
PageDataVO opdvo = PageDataVO.pageInfo(page, limit, () -> mapper.selectByExample(example));
List<VehiclePlatCata> parentvpcs = opdvo.getData();
//传入一级标签集集合,或去一二级标签集合
ArrayList<Cascade<VehiclePlatCata>> cascades = getCascades(parentvpcs);
//用一二级标签集合,替换原来的一级标签集合
opdvo.setData(cascades);
return ObjectRestResponse.succ(opdvo);
}
//增加车型页面
if (sort==1){
//获取一级标签
Example example = Example.builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId, 0)
.andEqualTo(VehiclePlatCata::getState, 0))
.orderByAsc("ismore","rank")
.build();
//分页查询父类
List<VehiclePlatCata> parentvpcs = mapper.selectByExample(example);
//传入一级标签集集合,或去一二级标签集合
ArrayList<Cascade<VehiclePlatCata>> cascades = getCascades(parentvpcs);
return ObjectRestResponse.succ(cascades);
}
} catch (Exception e) {
e.printStackTrace();
}
return ObjectRestResponse.createDefaultFail();
}
/**
* 获取一二级标签集合
* @param parentvpcs
* @return
*/
private ArrayList<Cascade<VehiclePlatCata>> getCascades(List<VehiclePlatCata> parentvpcs) {
ArrayList<Cascade<VehiclePlatCata>> cascades = new ArrayList();
//获取二级标签
for (VehiclePlatCata parentvpc : parentvpcs) {
Example exa = Example.builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId, parentvpc.getId())
.andEqualTo(VehiclePlatCata::getState, 0))
.orderByAsc("rank")
.build();
List<VehiclePlatCata> childrenvpcs = mapper.selectByExample(exa);
//一级标签和其二级标签存入Cascade中集合中
cascades.add(new Cascade<VehiclePlatCata>(parentvpc, childrenvpcs));
}
return cascades;
}
/**
* 查询一个一级标签及其子标签
*
* @param id
* @return
*/
public ObjectRestResponse findCascade(Integer id) {
VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
vehiclePlatCata.setId(id);
vehiclePlatCata.setState(0);
VehiclePlatCata result = mapper.selectOne(vehiclePlatCata);
Example example = Example.builder(VehiclePlatCata.class)
.where(WeekendSqls.<VehiclePlatCata>custom()
.andEqualTo(VehiclePlatCata::getParentId, id)
.andEqualTo(VehiclePlatCata::getState, 0))
.orderByAsc("rank")
.build();
List<VehiclePlatCata> vpcs = mapper.selectByExample(example);
return ObjectRestResponse.succ(new Cascade<VehiclePlatCata>(result, vpcs));
}
/**
* 更新
* @param cas
* @return
*/
@Transactional
public ObjectRestResponse updateCascade( Cascade<VehiclePlatCata> cas) {
if (cas==null||cas.getParent()==null) {
return ObjectRestResponse.createDefaultFail();
}
VehiclePlatCata parentVPC = cas.getParent();
//通过判断一级标签是否有id来判断是更新还是添加
if (parentVPC.getId()==null||parentVPC.getId()==0) {
//设置标签状态和创建时间
parentVPC.setState(0);
parentVPC.setCrtTime(System.currentTimeMillis());
//插入一级标签
insertSelective(parentVPC);
List<VehiclePlatCata> children = cas.getChildren();
if (children==null||children.size()==0) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无子标签");
}
mapper.addPlatCataList(children);
return ObjectRestResponse.succ();
}else{
//设置更新时间
parentVPC.setUpdTime(System.currentTimeMillis());
//更新一级标签
List<VehiclePlatCata> children = cas.getChildren();
updateSelectiveById(parentVPC);
if (children==null||children.size()==0) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无子标签");
}
for (VehiclePlatCata child : children) {
//判断子标签是更新还是新增
if (child.getId()==null){
insertSelective(child);
}else {
//判断更新的是否是删除
if (child.getState()==1) {
Integer id = child.getId();
VehicleCata vehicleCata = new VehicleCata();
//修改车型和标签的中间表
vehicleCataBiz.delete(vehicleCata);
}
}
}
VehiclePlatCata parent = cas.getParent();
}
return null;
}
}
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehiclePlatCataMapper.java
View file @ 46c9f674
package com.xxfc.platform.vehicle.mapper;
import com.xxfc.platform.vehicle.entity.VehicleCata;
import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
public interface VehiclePlatCataMapper extends Mapper<VehiclePlatCata> {
int addPlatCataList(@Param("list") List<VehiclePlatCata> list);
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCataController.java
View file @ 46c9f674
......@@ -3,14 +3,19 @@ package com.xxfc.platform.vehicle.rest;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
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.VehicleCataBiz;
import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.common.VehicleBaseController;
import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
import com.xxfc.platform.vehicle.pojo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import sun.java2d.pipe.AATextRenderer;
import java.util.Arrays;
@RestController
@RequestMapping("/cata")
......@@ -51,8 +56,73 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
/**
* 根据父类id获取子标签
* @param parentId
* @return
*/
@GetMapping(value = "/add/fingCatasByParentId/{parentId}")
public ObjectRestResponse fingCatasByParentId(@PathVariable Integer parentId ){
return baseBiz.fingCatasByParentId(parentId);
}
/**
* 查询一个一级标签及其子标签
* @param id
* @return
*/
@GetMapping(value = "/add/findCascade/{id}")
public ObjectRestResponse findCascade(@PathVariable Integer id){
return baseBiz.findCascade(id);
}
/**
* 分页或不分页,获取一级标签及其子标签
* @param page 当前页
* @param limit 每页条数
* @param sort 分类 0-增加车型页面,1-标签管理页面
* @return
*/
@GetMapping(value = "/add/fingCatasByParentId/{page}/{limit}/{sort}")
public ObjectRestResponse getCascades(
@PathVariable Integer page
,@PathVariable Integer limit
,@PathVariable Integer sort){
return baseBiz.getCascades(page,limit,sort);
}
/**
* 级联添加
* @param cascade
* @return
*/
@PostMapping(value = "/add/addCascade/")
public ObjectRestResponse addCascade(@RequestBody Cascade<VehiclePlatCata> cascade){
return baseBiz.addCascades(cascade);
}
/**
* 修改和增加一二级标签
* @param uc
* @return
*/
@PutMapping("/add/uc")
public ObjectRestResponse updateCascade(@RequestBody Cascade<VehiclePlatCata> uc){
baseBiz.updateCascade(uc);
return null;
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @ 46c9f674
......@@ -11,16 +11,21 @@ import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.entity.Vehicle;
import com.xxfc.platform.vehicle.entity.VehicleCata;
import com.xxfc.platform.vehicle.entity.VehicleModel;
import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.bytebuddy.implementation.bytecode.Throw;
import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.jdbc.Null;
import org.apache.ibatis.annotations.Delete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
......@@ -68,19 +73,18 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
}
/**
* 车型列表查询
* 车型列表查
*
* @param vmqc 条件
* @return
*/
@ApiOperation("车型列表")
@PostMapping(value = "/app/findVehicleModelPage")
public ObjectRestResponse<VModelDetailVO> findVehicleModelPage(
public ObjectRestResponse<VehicleModelVo> findVehicleModelPage(
@RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc) {
if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
return ObjectRestResponse.createDefaultFail();
}
return vehicleModelBiz.findVehicleModelPage(vmqc);
}
......@@ -94,6 +98,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
@ApiOperation("添加")
@PostMapping(value = "/app/add")
@ResponseBody
@Transactional
public ObjectRestResponse<VehicleModel> add(@RequestBody VehicleModel vm, HttpServletRequest request) {
if (vm == null) {
return ObjectRestResponse.createDefaultFail();
......@@ -107,7 +112,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
if (StringUtils.isBlank(token)) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "请登录");
}
ObjectRestResponse<UserDTO> uorr = userFeign.userinfoByToken(token);
ObjectRestResponse<UserDTO> uorr = null;
try {
uorr = userFeign.userinfoByToken(token);
} catch (Exception e) {
e.printStackTrace();
}
if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
......@@ -145,18 +155,25 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
return ObjectRestResponse.succ();
} catch (NumberFormatException e) {
e.printStackTrace();
throw new BaseException(ResultCode.FAILED_CODE);
}
return ObjectRestResponse.createDefaultFail();
}
@ApiOperation("修改")
@PutMapping(value = "/app/update")
@ResponseBody
@Transactional
public ObjectRestResponse<VehicleModel> update(@RequestBody VehicleModel vm, HttpServletRequest request) {
String token = request.getHeader("Authorization");
ObjectRestResponse<UserDTO> uorr = userFeign.userinfoByToken(token);
ObjectRestResponse<UserDTO> uorr = null;
try {
uorr = userFeign.userinfoByToken(token);
} catch (Exception e) {
e.printStackTrace();
}
if (uorr == null || uorr.getData() == null || StringUtils.isBlank(uorr.getData().getName()) || uorr.getData().getId() == null) {
return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
......@@ -193,10 +210,27 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
return ObjectRestResponse.succ();
} catch (NumberFormatException e) {
e.printStackTrace();
}
throw new BaseException(ResultCode.FAILED_CODE);
return ObjectRestResponse.createDefaultFail();
}
}
@Override
@ApiOperation("删除")
@DeleteMapping(value = "/app/{id}")
@ResponseBody
@Transactional
public ObjectRestResponse<VehicleModel> remove(@PathVariable int id){
try {
vehicleModelBiz.deleteById(id);
VehicleCata vehicleCata = new VehicleCata();
vehicleCata.setVehicleModelId(id);
vehicleCataBiz.delete(vehicleCata);
return ObjectRestResponse.succ();
} catch (Exception e) {
e.printStackTrace();
throw new BaseException(ResultCode.FAILED_CODE);
}
}
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCataPlatMapper.xml 0 → 100644
View file @ 46c9f674
<?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.VehiclePlatCataMapper">
<insert id="addPlatCataList" parameterType="java.util.List">
insert into vehicle_cata (
parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,ismore
) VALUES
<foreach collection ="list" item="item" index="index" separator =",">
(#{item.parentId},#{item.name},#{item.icon},#{item.depict}
,#{item.rank},#{item.level},#{item.state},#{item.crtTime}
,#{item.updTime},#{item.ismore})
</foreach>
</insert>
</mapper>
\ No newline at end of file
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