Skip to content

T
tcm-system
Commit 35588669 authored by dmy's avatar dmy
Browse files
Options

中医药小程序代码提交

parent d18a0bc1
Hide whitespace changes
Inline Side-by-side
Showing with 1053 additions and 147 deletions
src/main/java/com/tcm/common/dao/CarouselDao.java
View file @ 35588669
package com.tcm.common.dao;
import com.tcm.util.common.req.CarouselLoadPageReqVo;
import com.tcm.util.common.req.CarouselReqVo;
import com.tcm.util.common.res.CarouselResVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
public interface CarouselDao extends BaseDao {
/**
* 内容加载
* @param carouselReqVo
* @return
*/
CarouselResVo loadInfo(CarouselReqVo carouselReqVo);
/**
* 分页加载
* @param req
* @return
*/
PageSizeData<CarouselResVo> loadByPage(CarouselLoadPageReqVo req);
}
src/main/java/com/tcm/common/dao/CarouselExtendDao.java 0 → 100644
View file @ 35588669
package com.tcm.common.dao;
import com.yanzuoguang.dao.BaseDao;
public interface CarouselExtendDao extends BaseDao {
}
src/main/java/com/tcm/common/dao/FloorAreaDao.java
View file @ 35588669
......@@ -13,4 +13,11 @@ public interface FloorAreaDao extends BaseDao {
* @return
*/
List<FloorAreaResVo> loadBySort(FloorAreaReqVo areaReqVo);
/**
* 加载区域信息
* @param areaVo
* @return
*/
FloorAreaResVo loadInfo(FloorAreaReqVo areaVo);
}
src/main/java/com/tcm/common/dao/FloorAreaExtendDao.java 0 → 100644
View file @ 35588669
package com.tcm.common.dao;
import com.yanzuoguang.dao.BaseDao;
public interface FloorAreaExtendDao extends BaseDao {
}
src/main/java/com/tcm/common/dao/FloorDao.java
View file @ 35588669
package com.tcm.common.dao;
import com.tcm.util.area.FloorVo;
import com.tcm.util.area.req.FloorLoadPageReqVo;
import com.tcm.util.area.req.FloorReqVo;
import com.tcm.util.area.res.FloorResVo;
import com.yanzuoguang.dao.BaseDao;
import com.yanzuoguang.util.vo.PageSizeData;
import java.util.List;
......@@ -13,4 +16,18 @@ public interface FloorDao extends BaseDao {
* @return
*/
List<FloorResVo> loadBySort(FloorReqVo req);
/**
* 分页加载
* @param req
* @return
*/
PageSizeData<FloorResVo> loadByPage(FloorLoadPageReqVo req);
/**
* 单独加载
* @param floor
* @return
*/
FloorResVo loadInfo(FloorReqVo floor);
}
src/main/java/com/tcm/common/dao/impl/CarouselDaoImpl.java
View file @ 35588669
......@@ -2,13 +2,37 @@ package com.tcm.common.dao.impl;
import com.tcm.common.dao.CarouselDao;
import com.tcm.util.common.CarouselVo;
import com.tcm.util.common.req.CarouselLoadPageReqVo;
import com.tcm.util.common.req.CarouselReqVo;
import com.tcm.util.common.res.CarouselResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
@Component
public class CarouselDaoImpl extends BaseDaoImpl implements CarouselDao {
private final static String SQL_LOAD = "loadCarousel";
@Override
protected void init() {
register(CarouselVo.class);
table.add(SQL_LOAD, "select p.*,pe.title as title,pe.carousel_info as carouselInfo from tcm_carousel as p " +
"left join tcm_carousel_extend as pe on p.carousel_id = pe.carousel_id where 1=1 {WHERE} order by p.sort")
.add("carousel_id", "and p.carousel_id =?")
.add("carousel_type", "and p.carousel_type =?")
.add("carousel_status", "and p.carousel_status =?")
.add("languageType", "and pe.language_type =?")
;
}
@Override
public CarouselResVo loadInfo(CarouselReqVo carouselReqVo) {
return this.queryFirst(CarouselResVo.class, SQL_LOAD, carouselReqVo);
}
@Override
public PageSizeData<CarouselResVo> loadByPage(CarouselLoadPageReqVo req) {
return this.queryPage(CarouselResVo.class, req, SQL_LOAD, req);
}
}
src/main/java/com/tcm/common/dao/impl/CarouselExtendDaoImpl.java 0 → 100644
View file @ 35588669
package com.tcm.common.dao.impl;
import com.tcm.common.dao.CarouselExtendDao;
import com.tcm.util.common.CarouselExtendVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class CarouselExtendDaoImpl extends BaseDaoImpl implements CarouselExtendDao {
@Override
protected void init() {
register(CarouselExtendVo.class);
}
}
src/main/java/com/tcm/common/dao/impl/FloorAreaDaoImpl.java
View file @ 35588669
......@@ -17,13 +17,15 @@ public class FloorAreaDaoImpl extends BaseDaoImpl implements FloorAreaDao {
@Override
protected void init() {
register(FloorAreaVo.class);
table.add(SQL_LOAD_BY_SORT, "select p.* from tcm_floor_area as p where 1=1 {WHERE} order by sort")
table.add(SQL_LOAD_BY_SORT, "select p.*,pe.area_name as areaName,pe.area_desc as areaDesc,pe.position as position from tcm_floor_area as p " +
"left join tcm_floor_area_extend as pe on p.area_id =pe.area_id where 1=1 {WHERE} order by sort")
.add("floorId", "and p.floor_id =?")
.add("areaId", "and p.area_id =?")
.add("areaName", "and p.area_name =?")
.add("isFeature", "and p.is_feature =?")
.add("areaStatus", "and p.area_status =?")
.add("createTime", "and p.create_time =?")
.add("languageType", "and pe.language_type =?")
;
}
......@@ -31,4 +33,9 @@ public class FloorAreaDaoImpl extends BaseDaoImpl implements FloorAreaDao {
public List<FloorAreaResVo> loadBySort(FloorAreaReqVo req) {
return this.query(FloorAreaResVo.class, SQL_LOAD_BY_SORT, req);
}
@Override
public FloorAreaResVo loadInfo(FloorAreaReqVo req) {
return this.queryFirst(FloorAreaResVo.class, SQL_LOAD_BY_SORT, req);
}
}
src/main/java/com/tcm/common/dao/impl/FloorAreaExtendDaoImpl.java 0 → 100644
View file @ 35588669
package com.tcm.common.dao.impl;
import com.tcm.common.dao.FloorAreaExtendDao;
import com.tcm.util.area.FloorAreaExtendVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class FloorAreaExtendDaoImpl extends BaseDaoImpl implements FloorAreaExtendDao {
@Override
protected void init() {
register(FloorAreaExtendVo.class);
}
}
src/main/java/com/tcm/common/dao/impl/FloorDaoImpl.java
View file @ 35588669
......@@ -2,9 +2,11 @@ package com.tcm.common.dao.impl;
import com.tcm.common.dao.FloorDao;
import com.tcm.util.area.FloorVo;
import com.tcm.util.area.req.FloorLoadPageReqVo;
import com.tcm.util.area.req.FloorReqVo;
import com.tcm.util.area.res.FloorResVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Component;
import java.util.List;
......@@ -17,10 +19,12 @@ public class FloorDaoImpl extends BaseDaoImpl implements FloorDao {
@Override
protected void init() {
register(FloorVo.class);
table.add(SQL_LOAD_BY_SORT, "select p.* from tcm_floor as p where 1=1 {WHERE} order by sort")
table.add(SQL_LOAD_BY_SORT, "select p.*,pe.floor_name as floorName,pe.floor_desc as floorDesc from tcm_floor as p " +
" left join tcm_floor_extend as pe on p.floor_id = pe.floor_id where 1=1 {WHERE} order by sort")
.add("floorId", "and p.floor_id =?")
.add("floorName", "and p.floor_name =?")
.add("floorStatus", "and p.floor_status =?")
.add("languageType", "and pe.language_type =?")
;
}
......@@ -28,4 +32,14 @@ public class FloorDaoImpl extends BaseDaoImpl implements FloorDao {
public List<FloorResVo> loadBySort(FloorReqVo req) {
return this.query(FloorResVo.class, SQL_LOAD_BY_SORT, req);
}
@Override
public PageSizeData<FloorResVo> loadByPage(FloorLoadPageReqVo req) {
return this.queryPage(FloorResVo.class, req, SQL_LOAD_BY_SORT, req);
}
@Override
public FloorResVo loadInfo(FloorReqVo req) {
return this.queryFirst(FloorResVo.class, SQL_LOAD_BY_SORT, req);
}
}
src/main/java/com/tcm/common/dao/impl/FloorExtendDao.java 0 → 100644
View file @ 35588669
package com.tcm.common.dao.impl;
import com.yanzuoguang.dao.BaseDao;
public interface FloorExtendDao extends BaseDao {
}
src/main/java/com/tcm/common/dao/impl/FloorExtendDaoImpl.java 0 → 100644
View file @ 35588669
package com.tcm.common.dao.impl;
import com.tcm.util.area.FloorExtendVo;
import com.yanzuoguang.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Component;
@Component
public class FloorExtendDaoImpl extends BaseDaoImpl implements FloorExtendDao {
@Override
protected void init() {
register(FloorExtendVo.class);
}
}
src/main/java/com/tcm/common/service/ImageService.java
View file @ 35588669
package com.tcm.common.service;
import com.tcm.util.common.ImageVo;
import com.tcm.util.common.req.ImageReqVo;
import com.tcm.util.common.res.ImageResVo;
......@@ -42,4 +43,10 @@ public interface ImageService {
* 加载所有图片
*/
List<ImageResVo> loadList(ImageReqVo req);
/**
* 批量保存
* @param
*/
String saveList(ImageReqVo req);
}
src/main/java/com/tcm/common/service/impl/AreaServiceImpl.java
View file @ 35588669
package com.tcm.common.service.impl;
import com.tcm.common.dao.FloorAreaDao;
import com.tcm.common.dao.FloorAreaExtendDao;
import com.tcm.common.dao.FloorDao;
import com.tcm.common.dao.impl.FloorExtendDao;
import com.tcm.common.service.AreaService;
import com.tcm.common.service.CarouselService;
import com.tcm.common.service.ImageService;
import com.tcm.common.util.CommonConstant;
import com.tcm.util.area.FloorAreaExtendVo;
import com.tcm.util.area.FloorAreaVo;
import com.tcm.util.area.FloorExtendVo;
import com.tcm.util.area.FloorVo;
import com.tcm.util.area.req.FloorAreaReqVo;
import com.tcm.util.area.req.FloorLoadPageReqVo;
......@@ -33,15 +37,22 @@ public class AreaServiceImpl implements AreaService {
private final FloorAreaDao floorAreaDao;
private final ImageService imageService;
private final CarouselService carouselService;
private final FloorExtendDao floorExtendDao;
private final FloorAreaExtendDao floorAreaExtendDao;
public AreaServiceImpl(FloorDao floorDao,
FloorAreaDao floorAreaDao,
ImageService imageService,
CarouselService carouselService) {
CarouselService carouselService,
FloorExtendDao floorExtendDao,
FloorAreaExtendDao floorAreaExtendDao) {
this.floorDao = floorDao;
this.floorAreaDao = floorAreaDao;
this.imageService = imageService;
this.carouselService = carouselService;
this.floorExtendDao = floorExtendDao;
this.floorAreaExtendDao = floorAreaExtendDao;
}
@Override
......@@ -52,7 +63,14 @@ public class AreaServiceImpl implements AreaService {
floor.setFloorId(floorId);
ObjectHelper.writeWithFrom(floor, req);
floor.setCreateTime(DateHelper.getNow());
floorDao.save(floor);
floorDao.create(floor);
FloorExtendVo floorExtendVo = new FloorExtendVo();
floorExtendVo.setFloorId(floorId);
ObjectHelper.writeWithFrom(floorExtendVo, req.getFloorExtendVo());
floorExtendVo.setFloorExtendId(StringHelper.getNewID());
floorExtendDao.create(floorExtendVo);
return floorId;
} else {
FloorVo floor = new FloorVo();
......@@ -60,22 +78,38 @@ public class AreaServiceImpl implements AreaService {
FloorVo load = floorDao.load(floor, FloorVo.class);
ObjectHelper.writeWithFrom(load, req);
floorDao.update(load);
FloorExtendVo floorExtendVo = new FloorExtendVo();
floorExtendVo.setFloorId(req.getFloorId());
floorExtendVo.setLanguageType(req.getFloorExtendVo().getLanguageType());
FloorExtendVo loadExtend = floorExtendDao.load(floorExtendVo, FloorExtendVo.class);
if (loadExtend == null) {
floorExtendVo.setFloorExtendId(StringHelper.getNewID());
floorExtendDao.create(floorExtendVo);
} else {
ObjectHelper.writeWithFrom(loadExtend, req.getFloorExtendVo());
floorExtendDao.update(floorExtendVo);
}
return req.getFloorId();
}
}
@Override
public FloorResVo floorLoad(FloorReqVo req) {
FloorVo floor = new FloorVo();
FloorReqVo floor = new FloorReqVo();
floor.setFloorId(req.getFloorId());
FloorResVo load = floorDao.load(floor, FloorResVo.class);
floor.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
FloorResVo load = floorDao.loadInfo(floor);
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(load.getFloorId());
load.setImageResVoList(imageService.loadList(imageReqVo));
FloorAreaReqVo areaReqVo = new FloorAreaReqVo();
areaReqVo.setFloorId(req.getFloorId());
List<FloorAreaResVo> floorAreaResVoList = floorAreaDao.loadList(areaReqVo, FloorAreaResVo.class);
areaReqVo.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
List<FloorAreaResVo> floorAreaResVoList = floorAreaDao.loadBySort(areaReqVo);
for (FloorAreaResVo floorAreaResVo : floorAreaResVoList) {
imageReqVo.setRelationId(floorAreaResVo.getAreaId());
floorAreaResVo.setImageList(imageService.loadList(imageReqVo));
......@@ -87,7 +121,7 @@ public class AreaServiceImpl implements AreaService {
@Override
public PageSizeData<FloorResVo> loadPage(FloorLoadPageReqVo req) {
PageSizeData<FloorResVo> page = floorDao.loadPage(req, FloorResVo.class);
PageSizeData<FloorResVo> page = floorDao.loadByPage(req);
return page;
}
......@@ -97,6 +131,11 @@ public class AreaServiceImpl implements AreaService {
FloorVo floor = new FloorVo();
floor.setFloorId(req.getFloorId());
floorDao.remove(floor);
FloorExtendVo floorExtendVo = new FloorExtendVo();
floorExtendVo.setFloorId(req.getFloorId());
floorExtendDao.remove(floorExtendVo);
//楼层图片删除
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(req.getFloorId());
......@@ -106,6 +145,12 @@ public class AreaServiceImpl implements AreaService {
FloorAreaVo areaVo = new FloorAreaVo();
areaVo.setFloorId(req.getFloorId());
List<FloorAreaVo> areaList = floorAreaDao.loadList(areaVo, FloorAreaVo.class);
for (FloorAreaVo floorAreaVo : areaList) {
//扩展信息删除
FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
areaExtendVo.setAreaId(floorAreaVo.getAreaId());
floorAreaExtendDao.remove(areaExtendVo);
}
floorAreaDao.remove(areaVo);
//区域图片删除
for (FloorAreaVo floorAreaVo : areaList) {
......@@ -118,9 +163,11 @@ public class AreaServiceImpl implements AreaService {
@Override
public FloorAreaResVo areaLoad(FloorAreaReqVo req) {
FloorAreaVo areaVo = new FloorAreaVo();
FloorAreaReqVo areaVo = new FloorAreaReqVo();
areaVo.setAreaId(req.getAreaId());
FloorAreaResVo load = floorAreaDao.load(areaVo, FloorAreaResVo.class);
areaVo.setLanguageType(req.getLanguageType() == null ? CommonConstant.LANGUAGE_TYPE_CHINESE : req.getLanguageType());
FloorAreaResVo load = floorAreaDao.loadInfo(areaVo);
ImageReqVo imageReq = new ImageReqVo();
imageReq.setRelationId(load.getAreaId());
List<ImageResVo> images = imageService.loadList(imageReq);
......@@ -137,6 +184,13 @@ public class AreaServiceImpl implements AreaService {
ObjectHelper.writeWithFrom(areaVo, req);
areaVo.setCreateTime(DateHelper.getNow());
floorAreaDao.save(areaVo);
FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
areaExtendVo.setAreaId(areaId);
areaExtendVo.setAreaExtendId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(areaExtendVo, req.getFloorAreaExtendVo());
floorAreaExtendDao.create(areaExtendVo);
return areaId;
} else {
FloorAreaVo areaVo = new FloorAreaVo();
......@@ -144,6 +198,20 @@ public class AreaServiceImpl implements AreaService {
FloorAreaVo load = floorAreaDao.load(areaVo, FloorAreaVo.class);
ObjectHelper.writeWithFrom(load, req);
floorAreaDao.update(load);
FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
areaExtendVo.setAreaId(req.getAreaId());
areaExtendVo.setLanguageType(req.getFloorAreaExtendVo().getLanguageType());
FloorAreaExtendVo loadExtend = floorAreaExtendDao.load(areaExtendVo, FloorAreaExtendVo.class);
if (loadExtend == null) {
//新增
areaExtendVo.setAreaExtendId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(areaExtendVo, req.getFloorAreaExtendVo());
floorAreaExtendDao.create(areaExtendVo);
} else {
ObjectHelper.writeWithFrom(loadExtend, req.getFloorAreaExtendVo());
floorAreaExtendDao.update(loadExtend);
}
return req.getFloorId();
}
}
......@@ -153,6 +221,11 @@ public class AreaServiceImpl implements AreaService {
FloorAreaVo areaVo = new FloorAreaVo();
areaVo.setAreaId(req.getAreaId());
floorAreaDao.remove(areaVo);
//扩展删除
FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
areaExtendVo.setAreaId(req.getAreaId());
floorAreaExtendDao.remove(areaExtendVo);
//关联图片删除
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(req.getAreaId());
imageService.remove(imageReqVo);
......@@ -165,6 +238,8 @@ public class AreaServiceImpl implements AreaService {
//内容加载
CarouselReqVo carouselReqVo = new CarouselReqVo();
carouselReqVo.setCarouselType(CommonConstant.CAROUSEL_TYPE_CENTER_DISPLAY);
Integer languageType = req.getLanguageType() == null ? 0 : req.getLanguageType();
carouselReqVo.setLanguageType(languageType);
CarouselResVo carouselVo = carouselService.load(carouselReqVo);
floorHomeLoadResVo.setCarouselVo(carouselVo);
//楼层加载
......@@ -173,6 +248,7 @@ public class AreaServiceImpl implements AreaService {
FloorAreaReqVo areaReqVo = new FloorAreaReqVo();
areaReqVo.setIsFeature(req.getIsFeature());
areaReqVo.setAreaStatus(req.getAreaStatus());
areaReqVo.setLanguageType(languageType);
List<FloorAreaResVo> floorAreaList = floorAreaDao.loadBySort(areaReqVo);
floorHomeLoadResVo.setFloorList(floorList);
......
src/main/java/com/tcm/common/service/impl/CarouselServiceImpl.java
View file @ 35588669
package com.tcm.common.service.impl;
import com.tcm.common.dao.CarouselDao;
import com.tcm.common.dao.CarouselExtendDao;
import com.tcm.common.service.CarouselService;
import com.tcm.common.service.ImageService;
import com.tcm.util.area.req.CenterDisplayReqVo;
import com.tcm.util.common.CarouselExtendVo;
import com.tcm.util.common.CarouselVo;
import com.tcm.util.common.req.CarouselLoadPageReqVo;
import com.tcm.util.common.req.CarouselReqVo;
......@@ -20,16 +21,21 @@ public class CarouselServiceImpl implements CarouselService {
private final CarouselDao carouselDao;
private final ImageService imageService;
private final CarouselExtendDao carouselExtendDao;
public CarouselServiceImpl(CarouselDao carouselDao, ImageService imageService) {
public CarouselServiceImpl(CarouselDao carouselDao,
ImageService imageService,
CarouselExtendDao carouselExtendDao) {
this.carouselDao = carouselDao;
this.imageService = imageService;
this.carouselExtendDao = carouselExtendDao;
}
@Override
public CarouselResVo load(CarouselReqVo carouselReqVo) {
CarouselResVo load = carouselDao.load(carouselReqVo, CarouselResVo.class);
public CarouselResVo load(CarouselReqVo req) {
CarouselResVo load = carouselDao.loadInfo(req);
if (load != null) {
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(load.getCarouselId());
load.setImageList(imageService.loadList(imageReqVo));
......@@ -45,7 +51,14 @@ public class CarouselServiceImpl implements CarouselService {
ObjectHelper.writeWithFrom(carousel, req);
carousel.setCarouselId(carouselId);
carousel.setCreateTime(DateHelper.getNow());
carouselDao.save(req);
carouselDao.create(req);
CarouselExtendVo carouselExtend = new CarouselExtendVo();
carouselExtend.setCarouselId(carouselId);
carouselExtend.setCarouselExtendId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(carouselExtend, req.getCarouselExtendVo());
carouselExtendDao.create(carouselExtend);
return carouselId;
} else {
CarouselVo carousel = new CarouselVo();
......@@ -54,13 +67,27 @@ public class CarouselServiceImpl implements CarouselService {
ObjectHelper.writeWithFrom(load, req);
load.setUpdateTime(DateHelper.getNow());
carouselDao.update(carousel);
CarouselExtendVo carouselExtend = new CarouselExtendVo();
carouselExtend.setCarouselId(req.getCarouselId());
carouselExtend.setLanguageType(req.getCarouselExtendVo().getLanguageType());
CarouselExtendVo loadExtend = carouselExtendDao.load(carouselExtend, CarouselExtendVo.class);
if (StringHelper.isEmpty(loadExtend)) {
//新增
carouselExtend.setCarouselExtendId(StringHelper.getNewID());
ObjectHelper.writeWithFrom(carouselExtend, req.getCarouselExtendVo());
carouselExtendDao.create(carouselExtend);
} else {
ObjectHelper.writeWithFrom(loadExtend, req.getCarouselExtendVo());
carouselExtendDao.update(carouselExtend);
}
return req.getCarouselId();
}
}
@Override
public PageSizeData<CarouselResVo> loadPage(CarouselLoadPageReqVo req) {
PageSizeData<CarouselResVo> page = carouselDao.loadPage(req, CarouselResVo.class);
PageSizeData<CarouselResVo> page = carouselDao.loadByPage(req);
return page;
}
......@@ -69,6 +96,11 @@ public class CarouselServiceImpl implements CarouselService {
CarouselVo carousel = new CarouselVo();
carousel.setCarouselId(req.getCarouselId());
carouselDao.remove(carousel);
CarouselExtendVo carouselExtend = new CarouselExtendVo();
carouselExtend.setCarouselId(req.getCarouselId());
carouselExtendDao.remove(carouselExtend);
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(req.getCarouselId());
imageService.remove(imageReqVo);
......
src/main/java/com/tcm/common/service/impl/ImageServiceImpl.java
View file @ 35588669
......@@ -10,6 +10,8 @@ import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import org.springframework.stereotype.Service;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
@Service
......@@ -71,4 +73,19 @@ public class ImageServiceImpl implements ImageService {
ObjectHelper.writeWithFrom(image, req);
return imageDao.loadList(image, ImageResVo.class);
}
@Override
public String saveList(ImageReqVo imageReqVo) {
List<ImageVo> imageList = new ArrayList<>();
for (ImageVo imageVo : imageReqVo.getImageList()) {
ImageVo image = new ImageVo();
ObjectHelper.writeWithFrom(image, imageReqVo);
image.setImageId(StringHelper.getNewID());
image.setCreateTime(DateHelper.getNow());
image.setImageUrl(imageVo.getImageUrl());
imageList.add(image);
}
imageDao.createList(imageReqVo.getImageList());
return imageReqVo.getRelationId();
}
}
src/main/java/com/tcm/common/util/CommonConstant.java
View file @ 35588669
......@@ -23,4 +23,24 @@ public class CommonConstant {
public static final Integer CAROUSEL_TYPE_HOME = 0;
public static final Integer CAROUSEL_TYPE_CENTER_DISPLAY = 1;
/**
* 语言类型：0中文1英文2韩文3日文4法文5俄文6西班牙文7葡萄牙文8阿拉伯文9意大利文10印地文11德文12俄文13丹麦文14西班牙文15瑞典
*/
public static final Integer LANGUAGE_TYPE_CHINESE = 0;
public static final Integer LANGUAGE_TYPE_ENGLISH = 1;
public static final Integer LANGUAGE_TYPE_KOREAN = 2;
public static final Integer LANGUAGE_TYPE_JAPANESE = 3;
public static final Integer LANGUAGE_TYPE_FRENCH = 4;
public static final Integer LANGUAGE_TYPE_RUSSIAN = 5;
public static final Integer LANGUAGE_TYPE_SPANISH = 6;
public static final Integer LANGUAGE_TYPE_PORTUGUESE = 7;
public static final Integer LANGUAGE_TYPE_ARABIC = 8;
public static final Integer LANGUAGE_TYPE_ITALIAN = 9;
public static final Integer LANGUAGE_TYPE_HINDI = 10;
public static final Integer LANGUAGE_TYPE_GERMAN = 11;
public static final Integer LANGUAGE_TYPE_DANISH = 12;
public static final Integer LANGUAGE_TYPE_SWEDISH = 13;
public static final Integer LANGUAGE_TYPE_FINNISH = 14;
public static final Integer LANGUAGE_TYPE_THAI = 15;
}
src/main/java/com/tcm/common/web/CompanyController.java
View file @ 35588669
......@@ -36,6 +36,7 @@ public class CompanyController {
public ResponseResult<CompanyResVo> load(@RequestBody CompanyReqVo req) {
return ResponseResult.result(companyService.load(req));
}
/**
* 公司分页查询
*/
......@@ -44,6 +45,7 @@ public class CompanyController {
return ResponseResult.result(companyService.loadPage(req));
}
/**
* 公司删除
*/
......
src/main/java/com/tcm/common/web/ImageController.java
View file @ 35588669
......@@ -30,6 +30,15 @@ public class ImageController {
}
/**
* 图片列表新增
*/
@RequestMapping("/saveList")
public ResponseResult<String> saveList(@RequestBody ImageReqVo req) {
return ResponseResult.result(imageService.saveList(req));
}
/**
* 图片加载
*/
......
src/main/java/com/tcm/product/dao/impl/ProductCategoryDaoImpl.java
View file @ 35588669
......@@ -16,9 +16,12 @@ public class ProductCategoryDaoImpl extends BaseDaoImpl implements ProductCatego
@Override
protected void init() {
register(ProductCategoryVo.class);
table.add(SQL_LOAD_BY_PAGE, "select p.*,ti.image_url as imageUrl from tcm_product_category as p " +
"left join tcm_image as ti on p.category_id = ti.relation_id where 1=1 {WHERE} order by p.sort")
.add("categoryId", "p.category_id = ?")
table.add(SQL_LOAD_BY_PAGE, "select p.*,pe.category_name as categoryName,pe.introduction as introduction," +
" pe.product_efficacy as productEfficacy,ti.image_url as imageUrl from tcm_product_category as p " +
" left join tcm_product_category_extend as pe on p.category_id = pe.category_id" +
" left join tcm_image as ti on p.category_id = ti.relation_id where 1=1 {WHERE} order by p.sort")
.add("categoryId", "and p.category_id = ?")
.add("languageType", "and pe.language_type =?")
;
}
......
src/main/java/com/tcm/product/dao/impl/ProductDaoImpl.java
View file @ 35588669
......@@ -20,6 +20,7 @@ public class ProductDaoImpl extends BaseDaoImpl implements ProductDao {
table.add(SQL_PRODUCT_LOAD_INFO, "select p.* from tcm_product as p where 1=1 {WHERE} order by p.sort")
.add("productId", " AND p.product_id = ?")
.add("categoryId", " AND p.category_id =?")
;
}
......
src/main/java/com/tcm/product/service/impl/ProductCategoryServiceImpl.java
View file @ 35588669
......@@ -106,6 +106,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
product.setImageList(imageList);
ProductExtendVo productExtendVo = productExtendVoMap.get(product.getProductId());
if (productExtendVo != null) {
product.setProductName(productExtendVo.getProductName());
product.setProductExtendVo(productExtendVo);
}
});
......
src/main/java/com/tcm/product/service/impl/ProductServiceImpl.java
View file @ 35588669
......@@ -5,7 +5,9 @@ import com.tcm.product.dao.ProductCategoryDao;
import com.tcm.product.dao.ProductDao;
import com.tcm.product.dao.ProductExtendDao;
import com.tcm.product.service.ProductService;
import com.tcm.util.common.ImageVo;
import com.tcm.util.common.req.ImageReqVo;
import com.tcm.util.common.res.ImageResVo;
import com.tcm.util.product.ProductExtendVo;
import com.tcm.util.product.ProductVo;
import com.tcm.util.product.req.ProductLoadPageReqVo;
......@@ -18,6 +20,7 @@ import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.PageSizeData;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -57,6 +60,8 @@ public class ProductServiceImpl implements ProductService {
productExtendVo.setProductExtendId(StringHelper.getNewID());
productExtendVo.setCreateTime(DateHelper.getNow());
productExtendDao.save(productExtendVo);
//图片保存
saveImageList(req.getImageList(), productId);
return productId;
} else {
ProductVo productVo = new ProductVo();
......@@ -65,26 +70,69 @@ public class ProductServiceImpl implements ProductService {
ObjectHelper.writeWithFrom(load, req);
load.setUpdateTime(DateHelper.getNow());
productDao.update(load);
//保存图片
saveImageList(req.getImageList(), req.getProductId());
ProductExtendVo productExtendVo = new ProductExtendVo();
productExtendVo.setProductId(req.getProductId());
productExtendVo.setLanguageType(req.getProductExtendVo().getLanguageType());
ProductExtendVo loadExtend = productExtendDao.load(productExtendVo, ProductExtendVo.class);
ObjectHelper.writeWithFrom(loadExtend, req.getProductExtendVo());
loadExtend.setUpdateTime(DateHelper.getNow());
productExtendDao.update(productExtendVo);
if (StringHelper.isEmpty(loadExtend)) {
//新增
ObjectHelper.writeWithFrom(productExtendVo, req.getProductExtendVo());
productExtendVo.setProductExtendId(StringHelper.getNewID());
productExtendVo.setCreateTime(DateHelper.getNow());
productExtendDao.save(productExtendVo);
} else {
ObjectHelper.writeWithFrom(loadExtend, req.getProductExtendVo());
loadExtend.setUpdateTime(DateHelper.getNow());
productExtendDao.update(productExtendVo);
}
return req.getProductId();
}
}
private void saveImageList(List<ImageVo> imageList, String productId) {
if (imageList.size() > 0) {
//删除之前的图片
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(productId);
imageService.remove(imageReqVo);
//保存图片
List<ImageVo> saveList = new ArrayList<>();
for (ImageVo imageVo : imageList) {
ImageReqVo imageSave = new ImageReqVo();
imageSave.setImageUrl(imageVo.getImageUrl());
saveList.add(imageSave);
}
imageReqVo.setImageStatus(0);
imageReqVo.setImageType(0);
imageReqVo.setRelationId(productId);
imageReqVo.setImageList(saveList);
imageService.saveList(imageReqVo);
}
}
@Override
public ProductResVo load(ProductReqVo req) {
ProductVo productVo = new ProductVo();
productVo.setProductId(req.getProductId());
ProductResVo loadRes = productDao.load(productVo, ProductResVo.class);
ProductExtendVo productExtendVo = new ProductExtendVo();
productExtendVo.setProductId(req.getProductId());
productExtendVo.setLanguageType(req.getProductExtendVo().getLanguageType());
ProductExtendVo loadExtend = productExtendDao.load(productExtendVo, ProductExtendVo.class);
loadRes.setProductExtendVo(loadExtend);
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(req.getProductId());
List<ImageResVo> imageList = imageService.loadList(imageReqVo);
loadRes.setImageList(imageList);
return loadRes;
}
......@@ -92,10 +140,15 @@ public class ProductServiceImpl implements ProductService {
public PageSizeData<ProductResVo> loadPage(ProductLoadPageReqVo req) {
PageSizeData<ProductResVo> page = productDao.loadPage(req, ProductResVo.class);
ProductExtendVo productExtendVo = new ProductExtendVo();
ImageReqVo imageReqVo = new ImageReqVo();
for (ProductResVo res : page.getList()) {
productExtendVo.setProductId(res.getProductId());
productExtendVo.setLanguageType(req.getLanguageType());
ProductExtendVo loadExtend = productExtendDao.load(productExtendVo, ProductExtendVo.class);
res.setProductExtendVo(loadExtend);
imageReqVo.setRelationId(res.getProductId());
List<ImageResVo> imageList = imageService.loadList(imageReqVo);
res.setImageList(imageList);
}
return page;
}
......@@ -109,7 +162,6 @@ public class ProductServiceImpl implements ProductService {
productExtendVo.setProductId(req.getProductId());
productExtendDao.remove(productExtendVo);
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(req.getProductId());
imageService.remove(imageReqVo);
......@@ -125,7 +177,9 @@ public class ProductServiceImpl implements ProductService {
ImageReqVo imageReqVo = new ImageReqVo();
imageReqVo.setRelationId(item.getProductId());
item.setImageList(imageService.loadList(imageReqVo));
item.setProductExtendVo(productExtendVoMap.get(item.getProductId()));
ProductExtendVo productExtendVo = productExtendVoMap.get(item.getProductId());
item.setProductExtendVo(productExtendVo);
item.setProductName(productExtendVo.getProductName());
});
return page;
}
......
src/main/java/com/tcm/util/area/FloorAreaExtendVo.java 0 → 100644
View file @ 35588669
package com.tcm.util.area;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
@TableAnnotation("tcm_floor_area_extend")
public class FloorAreaExtendVo {
/**
* 区域扩展id
*/
@TableAnnotation("area_extend_id")
@ApiModelProperty(notes = "区域扩展id")
private String areaExtendId;
/**
* 区域id
*/
@TableAnnotation("area_id")
@ApiModelProperty(notes = "区域id")
private String areaId;
/**
* 语言类型
*/
@TableAnnotation("language_type")
@ApiModelProperty(notes = "语言类型")
private Integer languageType;
/**
* 区域名称
*/
@TableAnnotation("area_name")
@ApiModelProperty(notes = "区域名称")
private String areaName;
/**
* 区域描述
*/
@TableAnnotation("area_desc")
@ApiModelProperty(notes = "区域描述")
private String areaDesc;
/**
* 位置
*/
@TableAnnotation("position")
@ApiModelProperty(notes = "位置")
private String position;
public FloorAreaExtendVo() {
}
public String getAreaExtendId() {
return areaExtendId;
}
public void setAreaExtendId(String areaExtendId) {
this.areaExtendId = areaExtendId;
}
public String getAreaId() {
return areaId;
}
public void setAreaId(String areaId) {
this.areaId = areaId;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public String getAreaDesc() {
return areaDesc;
}
public void setAreaDesc(String areaDesc) {
this.areaDesc = areaDesc;
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
}
src/main/java/com/tcm/util/area/FloorAreaVo.java
View file @ 35588669
......@@ -19,30 +19,15 @@ public class FloorAreaVo {
@TableAnnotation("floor_id")
@ApiModelProperty(notes = "楼层主键id")
private String floorId;
/**
* 区域名称
*/
@TableAnnotation("area_name")
@ApiModelProperty(notes = "区域名称")
private String areaName;
/**
* 是否特殊区0是1否
*/
@TableAnnotation("is_feature")
@ApiModelProperty(notes = "是否特殊区0是1否")
private Integer isFeature;
/**
* 区域描述
*/
@TableAnnotation("area_desc")
@ApiModelProperty(notes = "区域描述")
private String areaDesc;
/**
* 区域具体位置介绍
*/
@TableAnnotation("position")
@ApiModelProperty(notes = "区域具体位置介绍")
private String position;
/**
* 区域图标
*/
......@@ -95,14 +80,6 @@ public class FloorAreaVo {
this.floorId = floorId;
}
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public Integer getIsFeature() {
return isFeature;
}
......@@ -111,22 +88,6 @@ public class FloorAreaVo {
this.isFeature = isFeature;
}
public String getAreaDesc() {
return areaDesc;
}
public void setAreaDesc(String areaDesc) {
this.areaDesc = areaDesc;
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
public String getAreaIcon() {
return areaIcon;
}
......
src/main/java/com/tcm/util/area/FloorExtendVo.java 0 → 100644
View file @ 35588669
package com.tcm.util.area;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
@TableAnnotation("tcm_floor_extend")
public class FloorExtendVo {
/**
* 楼层扩展id
*/
@TableAnnotation("floor_extend_id")
@ApiModelProperty(notes = "楼层扩展id")
private String floorExtendId;
/**
* 楼层id
*/
@TableAnnotation("floor_id")
@ApiModelProperty(notes = "楼层id")
private String floorId;
/**
* 楼层名称
*/
@TableAnnotation("floor_name")
@ApiModelProperty(notes = "楼层名称")
private String floorName;
/**
* 语言类型
*/
@TableAnnotation("language_type")
@ApiModelProperty(notes = "语言类型")
private Integer languageType;
/**
* 楼层详情介绍
*/
@TableAnnotation("floor_desc")
@ApiModelProperty(notes = "楼层详情介绍")
private String floorDesc;
public FloorExtendVo() {
}
public String getFloorExtendId() {
return floorExtendId;
}
public void setFloorExtendId(String floorExtendId) {
this.floorExtendId = floorExtendId;
}
public String getFloorId() {
return floorId;
}
public void setFloorId(String floorId) {
this.floorId = floorId;
}
public String getFloorName() {
return floorName;
}
public void setFloorName(String floorName) {
this.floorName = floorName;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
public String getFloorDesc() {
return floorDesc;
}
public void setFloorDesc(String floorDesc) {
this.floorDesc = floorDesc;
}
}
src/main/java/com/tcm/util/area/FloorVo.java
View file @ 35588669
......@@ -12,18 +12,6 @@ public class FloorVo {
@TableAnnotation("floor_id")
@ApiModelProperty(notes = "楼层主键id")
private String floorId;
/**
* 楼层名称
*/
@TableAnnotation("floor_name")
@ApiModelProperty(notes = "楼层名称")
private String floorName;
/**
* 楼层描述
*/
@TableAnnotation("floor_desc")
@ApiModelProperty(notes = "楼层描述")
private String floorDesc;
/**
* 楼层图标
*/
......@@ -66,22 +54,6 @@ public class FloorVo {
this.floorId = floorId;
}
public String getFloorName() {
return floorName;
}
public void setFloorName(String floorName) {
this.floorName = floorName;
}
public String getFloorDesc() {
return floorDesc;
}
public void setFloorDesc(String floorDesc) {
this.floorDesc = floorDesc;
}
public String getFloorIcon() {
return floorIcon;
}
......
src/main/java/com/tcm/util/area/req/FloorAreaReqVo.java
View file @ 35588669
package com.tcm.util.area.req;
import com.tcm.util.area.FloorAreaExtendVo;
import com.tcm.util.area.FloorAreaVo;
public class FloorAreaReqVo extends FloorAreaVo {
private Integer languageType;
private FloorAreaExtendVo floorAreaExtendVo;
public FloorAreaExtendVo getFloorAreaExtendVo() {
return floorAreaExtendVo;
}
public void setFloorAreaExtendVo(FloorAreaExtendVo floorAreaExtendVo) {
this.floorAreaExtendVo = floorAreaExtendVo;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
}
src/main/java/com/tcm/util/area/req/FloorReqVo.java
View file @ 35588669
package com.tcm.util.area.req;
import com.tcm.util.area.FloorExtendVo;
import com.tcm.util.area.FloorVo;
public class FloorReqVo extends FloorVo {
private Integer isFeature;
private Integer areaStatus;
private Integer languageType;
private FloorExtendVo floorExtendVo;
public FloorExtendVo getFloorExtendVo() {
return floorExtendVo;
}
public void setFloorExtendVo(FloorExtendVo floorExtendVo) {
this.floorExtendVo = floorExtendVo;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
public Integer getIsFeature() {
return isFeature;
......
src/main/java/com/tcm/util/area/res/FloorAreaResVo.java
View file @ 35588669
......@@ -2,12 +2,57 @@ package com.tcm.util.area.res;
import com.tcm.util.area.FloorAreaVo;
import com.tcm.util.common.res.ImageResVo;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
public class FloorAreaResVo extends FloorAreaVo {
/**
* 区域名称
*/
@ApiModelProperty(notes = "区域名称")
private String areaName;
/**
* 区域描述
*/
@ApiModelProperty(notes = "区域描述")
private String areaDesc;
/**
* 区域具体位置介绍
*/
@ApiModelProperty(notes = "区域具体位置介绍")
private String position;
public String getAreaName() {
return areaName;
}
public void setAreaName(String areaName) {
this.areaName = areaName;
}
public String getAreaDesc() {
return areaDesc;
}
public void setAreaDesc(String areaDesc) {
this.areaDesc = areaDesc;
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position;
}
private List<ImageResVo> imageList = new ArrayList<>();
public List<ImageResVo> getImageList() {
......
src/main/java/com/tcm/util/area/res/FloorResVo.java
View file @ 35588669
......@@ -8,6 +8,9 @@ import java.util.List;
public class FloorResVo extends FloorVo {
private String floorName;
private String floorDesc;
private List<FloorAreaResVo> floorAreaVoList = new ArrayList<>();
private List<ImageResVo> imageResVoList = new ArrayList<>();
......@@ -27,4 +30,20 @@ public class FloorResVo extends FloorVo {
public void setFloorAreaVoList(List<FloorAreaResVo> floorAreaVoList) {
this.floorAreaVoList = floorAreaVoList;
}
public String getFloorName() {
return floorName;
}
public void setFloorName(String floorName) {
this.floorName = floorName;
}
public String getFloorDesc() {
return floorDesc;
}
public void setFloorDesc(String floorDesc) {
this.floorDesc = floorDesc;
}
}
src/main/java/com/tcm/util/common/CarouselExtendVo.java 0 → 100644
View file @ 35588669
package com.tcm.util.common;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
@TableAnnotation("tcm_carousel_extend")
public class CarouselExtendVo {
/**
* 主键id
*/
@TableAnnotation("carousel_extend_id")
@ApiModelProperty(notes = "主键id")
private String carouselExtendId;
/**
* 标题
*/
@TableAnnotation("title")
@ApiModelProperty(notes = "标题")
private String title;
/**
* 内容详情
*/
@TableAnnotation("carousel_info")
@ApiModelProperty(notes = "内容详情")
private String carouselInfo;
/**
* 内容id
*/
@TableAnnotation("carousel_id")
@ApiModelProperty(notes = "内容id")
private String carouselId;
/**
* 语言类型
*/
@TableAnnotation("language_type")
@ApiModelProperty(notes = "语言类型")
private Integer languageType;
public CarouselExtendVo() {
}
public String getCarouselExtendId() {
return carouselExtendId;
}
public void setCarouselExtendId(String carouselExtendId) {
this.carouselExtendId = carouselExtendId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getCarouselInfo() {
return carouselInfo;
}
public void setCarouselInfo(String carouselInfo) {
this.carouselInfo = carouselInfo;
}
public String getCarouselId() {
return carouselId;
}
public void setCarouselId(String carouselId) {
this.carouselId = carouselId;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
}
src/main/java/com/tcm/util/common/CarouselVo.java
View file @ 35588669
......@@ -13,12 +13,7 @@ public class CarouselVo {
@TableAnnotation("carousel_id")
@ApiModelProperty(notes = "内容管理相关表主键id")
private String carouselId;
/**
* 内容标题
*/
@TableAnnotation("title")
@ApiModelProperty(notes = "内容标题")
private String title;
/**
* 内容类型
*/
......@@ -49,12 +44,7 @@ public class CarouselVo {
@TableAnnotation("carousel_status")
@ApiModelProperty(notes = "状态0正常1下架")
private Integer carouselStatus;
/**
* 文字介绍
*/
@TableAnnotation("carousel_info")
@ApiModelProperty(notes = "文字介绍")
private String carouselInfo;
/**
* 排序
*/
......@@ -97,13 +87,6 @@ public class CarouselVo {
this.carouselId = carouselId;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Integer getCarouselType() {
return carouselType;
......@@ -145,14 +128,6 @@ public class CarouselVo {
this.carouselStatus = carouselStatus;
}
public String getCarouselInfo() {
return carouselInfo;
}
public void setCarouselInfo(String carouselInfo) {
this.carouselInfo = carouselInfo;
}
public Integer getSort() {
return sort;
}
......
src/main/java/com/tcm/util/common/req/CarouselLoadPageReqVo.java
View file @ 35588669
......@@ -15,6 +15,18 @@ public class CarouselLoadPageReqVo extends PageSizeReqVo {
* 内容状态0上架1下架
*/
private Integer carouselStatus;
/**
* 语言类型
*/
private Integer languageType;
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
public String getTitle() {
return title;
......
src/main/java/com/tcm/util/common/req/CarouselReqVo.java
View file @ 35588669
package com.tcm.util.common.req;
import com.tcm.util.common.CarouselExtendVo;
import com.tcm.util.common.CarouselVo;
import com.tcm.util.common.ImageVo;
import java.util.ArrayList;
import java.util.List;
public class CarouselReqVo extends CarouselVo {
private Integer languageType;
private CarouselExtendVo carouselExtendVo;
public CarouselExtendVo getCarouselExtendVo() {
return carouselExtendVo;
}
public void setCarouselExtendVo(CarouselExtendVo carouselExtendVo) {
this.carouselExtendVo = carouselExtendVo;
}
private List<ImageVo> imageList = new ArrayList<>();
public List<ImageVo> getImageList() {
return imageList;
}
public void setImageList(List<ImageVo> imageList) {
this.imageList = imageList;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
}
src/main/java/com/tcm/util/common/req/ImageReqVo.java
View file @ 35588669
......@@ -2,5 +2,18 @@ package com.tcm.util.common.req;
import com.tcm.util.common.ImageVo;
import java.util.ArrayList;
import java.util.List;
public class ImageReqVo extends ImageVo {
private List<ImageVo> imageList = new ArrayList<>();
public List<ImageVo> getImageList() {
return imageList;
}
public void setImageList(List<ImageVo> imageList) {
this.imageList = imageList;
}
}
src/main/java/com/tcm/util/common/res/CarouselResVo.java
View file @ 35588669
package com.tcm.util.common.res;
import com.tcm.util.common.CarouselVo;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
public class CarouselResVo extends CarouselVo {
/**
* 内容标题
*/
@ApiModelProperty(notes = "内容标题")
private String title;
/**
* 文字介绍
*/
@ApiModelProperty(notes = "文字介绍")
private String carouselInfo;
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getCarouselInfo() {
return carouselInfo;
}
public void setCarouselInfo(String carouselInfo) {
this.carouselInfo = carouselInfo;
}
private List<ImageResVo> imageList = new ArrayList<>();
......
src/main/java/com/tcm/util/product/ProductCategoryExtendVo.java 0 → 100644
View file @ 35588669
package com.tcm.util.product;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
@TableAnnotation("tcm_product_category_extend")
public class ProductCategoryExtendVo {
/**
* 主键id
*/
@TableAnnotation("category_extend_id")
@ApiModelProperty(notes = "主键id")
private String categoryExtendId;
/**
* 类别名称
*/
@TableAnnotation("category_name")
@ApiModelProperty(notes = "类别名称")
private String categoryName;
/**
* 介绍
*/
@TableAnnotation("introduction")
@ApiModelProperty(notes = "介绍")
private String introduction;
/**
* 功效
*/
@TableAnnotation("product_efficacy")
@ApiModelProperty(notes = "功效")
private String productEfficacy;
/**
* 类别id
*/
@TableAnnotation("category_id")
@ApiModelProperty(notes = "类别id")
private String categoryId;
/**
* 语言类型
*/
@TableAnnotation("language_type")
@ApiModelProperty(notes = "语言类型")
private String languageType;
public ProductCategoryExtendVo() {
}
public String getCategoryExtendId() {
return categoryExtendId;
}
public void setCategoryExtendId(String categoryExtendId) {
this.categoryExtendId = categoryExtendId;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getIntroduction() {
return introduction;
}
public void setIntroduction(String introduction) {
this.introduction = introduction;
}
public String getCategoryId() {
return categoryId;
}
public void setCategoryId(String categoryId) {
this.categoryId = categoryId;
}
public String getLanguageType() {
return languageType;
}
public void setLanguageType(String languageType) {
this.languageType = languageType;
}
public String getProductEfficacy() {
return productEfficacy;
}
public void setProductEfficacy(String productEfficacy) {
this.productEfficacy = productEfficacy;
}
}
src/main/java/com/tcm/util/product/ProductCategoryVo.java
View file @ 35588669
......@@ -12,12 +12,7 @@ public class ProductCategoryVo {
@TableAnnotation("category_id")
@ApiModelProperty(notes = "主键id")
private String categoryId;
/**
* 类别名称
*/
@TableAnnotation("category_name")
@ApiModelProperty(notes = "类别名称")
private String categoryName;
/**
* 父类id
*/
......@@ -36,12 +31,7 @@ public class ProductCategoryVo {
@TableAnnotation("status")
@ApiModelProperty(notes = "状态0启用1禁用")
private Integer status;
/**
* 介绍
*/
@TableAnnotation("introduction")
@ApiModelProperty(notes = "介绍")
private String introduction;
/**
* 创建时间
......@@ -67,13 +57,6 @@ public class ProductCategoryVo {
this.categoryId = categoryId;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getParentId() {
return parentId;
......@@ -115,11 +98,4 @@ public class ProductCategoryVo {
this.updateTime = updateTime;
}
public String getIntroduction() {
return introduction;
}
public void setIntroduction(String introduction) {
this.introduction = introduction;
}
}
src/main/java/com/tcm/util/product/ProductExtendVo.java
View file @ 35588669
......@@ -18,6 +18,15 @@ public class ProductExtendVo {
@TableAnnotation("product_id")
@ApiModelProperty(notes = "关联产品id")
private String productId;
/**
* 产品名称
*/
@TableAnnotation("product_name")
@ApiModelProperty(notes = "产品名称")
private String productName;
/**
* 标题
*/
......@@ -36,6 +45,13 @@ public class ProductExtendVo {
@TableAnnotation("position")
@ApiModelProperty(notes = "位置")
private String position;
/**
* 语言类型0中文1英文2韩文3日文
*/
@TableAnnotation("language_type")
@ApiModelProperty(notes = "语言类型0中文1英文2韩文3日文")
private Integer languageType;
/**
* 服务类型
*/
......@@ -135,4 +151,20 @@ public class ProductExtendVo {
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
}
src/main/java/com/tcm/util/product/req/ProductCategoryLoadPageReqVo.java
View file @ 35588669
......@@ -11,6 +11,8 @@ public class ProductCategoryLoadPageReqVo extends PageSizeReqVo {
private String categoryName;
private Integer languageType;
public Integer getStatus() {
return status;
}
......@@ -42,4 +44,12 @@ public class ProductCategoryLoadPageReqVo extends PageSizeReqVo {
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
}
src/main/java/com/tcm/util/product/req/ProductLoadPageReqVo.java
View file @ 35588669
......@@ -7,6 +7,7 @@ public class ProductLoadPageReqVo extends PageSizeReqVo {
private String productName;
private String productCategoryId;
private String productStatus;
private Integer languageType;
public String getProductId() {
return productId;
......@@ -39,4 +40,12 @@ public class ProductLoadPageReqVo extends PageSizeReqVo {
public void setProductStatus(String productStatus) {
this.productStatus = productStatus;
}
public Integer getLanguageType() {
return languageType;
}
public void setLanguageType(Integer languageType) {
this.languageType = languageType;
}
}
src/main/java/com/tcm/util/product/req/ProductReqVo.java
View file @ 35588669
package com.tcm.util.product.req;
import com.tcm.util.common.ImageVo;
import com.tcm.util.product.ProductExtendVo;
import com.tcm.util.product.ProductVo;
import java.util.ArrayList;
import java.util.List;
public class ProductReqVo extends ProductVo {
private ProductExtendVo productExtendVo;
private List<ImageVo> imageList = new ArrayList<>();
public List<ImageVo> getImageList() {
return imageList;
}
public void setImageList(List<ImageVo> imageList) {
this.imageList = imageList;
}
public ProductExtendVo getProductExtendVo() {
return productExtendVo;
}
......
src/main/java/com/tcm/util/product/res/ProductCategoryResVo.java
View file @ 35588669
package com.tcm.util.product.res;
import com.tcm.util.product.ProductCategoryVo;
import com.yanzuoguang.dao.TableAnnotation;
import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList;
import java.util.List;
public class ProductCategoryResVo extends ProductCategoryVo {
/**
* 类别名称
*/
@TableAnnotation("category_name")
@ApiModelProperty(notes = "类别名称")
private String categoryName;
/**
* 介绍
*/
@ApiModelProperty(notes = "介绍")
private String introduction;
private String productEfficacy;
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
public String getIntroduction() {
return introduction;
}
public void setIntroduction(String introduction) {
this.introduction = introduction;
}
private List<ProductResVo> productList = new ArrayList<>();
......@@ -26,4 +57,12 @@ public class ProductCategoryResVo extends ProductCategoryVo {
public void setProductList(List<ProductResVo> productList) {
this.productList = productList;
}
public String getProductEfficacy() {
return productEfficacy;
}
public void setProductEfficacy(String productEfficacy) {
this.productEfficacy = productEfficacy;
}
}
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