解决包名冲突问题

This commit is contained in:
cuibaocheng 2021-06-03 15:50:51 +08:00
parent 82c7f08a0c
commit 5d0d076509
25 changed files with 40 additions and 55 deletions

View File

@ -1,8 +1,8 @@
package cn.com.tenlion.buildingpictures.service.picturestemplate; package cn.com.tenlion.buildingpictures.service.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateContentVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateVO;
import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;

View File

@ -1,9 +1,9 @@
package cn.com.tenlion.buildingpictures.service.picturestemplatearea; package cn.com.tenlion.buildingpictures.service.picturestemplatearea;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.ListPage; import ink.wgink.pojo.ListPage;

View File

@ -5,8 +5,6 @@ import cn.com.tenlion.materialstore.pojo.dtos.materialdata.MaterialDataDTO;
import cn.com.tenlion.materialstore.pojo.vos.materialdata.MaterialDataVO; import cn.com.tenlion.materialstore.pojo.vos.materialdata.MaterialDataVO;
import ink.wgink.util.ReflectUtil; import ink.wgink.util.ReflectUtil;
import java.util.List;
public interface MaterialDataService { public interface MaterialDataService {
/** /**

View File

@ -1,8 +1,8 @@
package cn.com.tenlion.buildingpictures.controller.apis.picturestemplate; package cn.com.tenlion.buildingpictures.controller.apis.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateContentVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService; import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService;
import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.base.DefaultBaseController;

View File

@ -1,9 +1,9 @@
package cn.com.tenlion.buildingpictures.controller.apis.picturestemplatearea; package cn.com.tenlion.buildingpictures.controller.apis.picturestemplatearea;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService; import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.base.DefaultBaseController;

View File

@ -1,6 +1,6 @@
package cn.com.tenlion.buildingpictures.dao.picturestemplate; package cn.com.tenlion.buildingpictures.dao.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SaveException;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;

View File

@ -1,6 +1,6 @@
package cn.com.tenlion.buildingpictures.dao.picturestemplatearea; package cn.com.tenlion.buildingpictures.dao.picturestemplatearea;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.RemoveException;
import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SaveException;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;

View File

@ -2,10 +2,10 @@ package cn.com.tenlion.buildingpictures.service.picturestemplate.impl;
import cn.com.tenlion.buildingpictures.dao.picturestemplate.IPicturesTemplateDao; import cn.com.tenlion.buildingpictures.dao.picturestemplate.IPicturesTemplateDao;
import cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao; import cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateContentVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateContentVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplate.PicturesTemplateVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate.PicturesTemplateVO;
import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService; import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService; import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService; import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService;

View File

@ -1,10 +1,10 @@
package cn.com.tenlion.buildingpictures.service.picturestemplatearea.impl; package cn.com.tenlion.buildingpictures.service.picturestemplatearea.impl;
import cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao; import cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaAllVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaPiointVO;
import cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO; import cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea.PicturesTemplateAreaVO;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService; import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;

View File

@ -1,7 +1,7 @@
package cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.impl; package cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.impl;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService; import cn.com.tenlion.buildingpictures.service.picturestemplate.IPicturesTemplateService;
import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService; import cn.com.tenlion.buildingpictures.service.picturestemplatearea.IPicturesTemplateAreaService;
import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService; import cn.com.tenlion.buildingpictures.service.picturestemplatebuilding.IPicturesTemplateBuildingService;

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.tenlion.buildingpictures.dao.picturestemplate.IPicturesTemplateDao"> <mapper namespace="cn.com.tenlion.buildingpictures.dao.picturestemplate.IPicturesTemplateDao">
<resultMap id="picturesTemplateDTO" type="cn.com.tenlion.materialstore.pojo.dtos.picturestemplate.PicturesTemplateDTO"> <resultMap id="picturesTemplateDTO" type="cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate.PicturesTemplateDTO">
<id column="pictures_template_id" property="picturesTemplateId"/> <id column="pictures_template_id" property="picturesTemplateId"/>
<result column="pictures_template_code" property="picturesTemplateCode"/> <result column="pictures_template_code" property="picturesTemplateCode"/>
<result column="pictures_template_background_image" property="picturesTemplateBackgroundImage"/> <result column="pictures_template_background_image" property="picturesTemplateBackgroundImage"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao"> <mapper namespace="cn.com.tenlion.buildingpictures.dao.picturestemplatearea.IPicturesTemplateAreaDao">
<resultMap id="picturesTemplateAreaDTO" type="cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO"> <resultMap id="picturesTemplateAreaDTO" type="cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO">
<id column="pictures_template_area_id" property="picturesTemplateAreaId"/> <id column="pictures_template_area_id" property="picturesTemplateAreaId"/>
<result column="pictures_template_id" property="picturesTemplateId"/> <result column="pictures_template_id" property="picturesTemplateId"/>
<result column="template_area_source" property="templateAreaSource"/> <result column="template_area_source" property="templateAreaSource"/>

View File

@ -1,26 +1,14 @@
package cn.com.tenlion.materialstore.controller.api.materialdata; package cn.com.tenlion.materialstore.controller.api.materialdata;
import cn.com.tenlion.materialstore.pojo.dtos.materialdata.MaterialDataDTO; import cn.com.tenlion.materialstore.pojo.dtos.materialdata.MaterialDataDTO;
import cn.com.tenlion.materialstore.pojo.dtos.materialphoto.MaterialPhotoDTO;
import cn.com.tenlion.materialstore.pojo.vos.materialphoto.MaterialPhotoVO;
import cn.com.tenlion.materialstore.service.materialdata.MaterialDataService; import cn.com.tenlion.materialstore.service.materialdata.MaterialDataService;
import cn.com.tenlion.materialstore.service.materialphoto.IMaterialPhotoService;
import ink.wgink.annotation.CheckRequestBodyAnnotation;
import ink.wgink.common.base.DefaultBaseController; import ink.wgink.common.base.DefaultBaseController;
import ink.wgink.interfaces.consts.ISystemConstant; import ink.wgink.interfaces.consts.ISystemConstant;
import ink.wgink.pojo.ListPage;
import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.ErrorResult;
import ink.wgink.pojo.result.SuccessResult;
import ink.wgink.pojo.result.SuccessResultData;
import ink.wgink.pojo.result.SuccessResultList;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/** /**
* @ClassName: MaterialDataController * @ClassName: MaterialDataController
* @Description: 图片素材 * @Description: 图片素材

View File

@ -25,7 +25,6 @@ import cn.com.tenlion.materialstore.service.materialvideo.IMaterialVideoService;
import ink.wgink.common.base.DefaultBaseService; import ink.wgink.common.base.DefaultBaseService;
import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.SearchException;
import ink.wgink.pojo.app.AppTokenUser; import ink.wgink.pojo.app.AppTokenUser;
import ink.wgink.util.ReflectUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;

View File

@ -1,6 +1,6 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplate; package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
import cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO; import cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea.PicturesTemplateAreaDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.ArrayList; import java.util.ArrayList;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplate; package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplate;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea; package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.dtos.picturestemplatearea; package cn.com.tenlion.buildingpictures.pojo.dtos.picturestemplatearea;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplate; package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplate; package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplate;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation; import ink.wgink.annotation.CheckNumberAnnotation;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea; package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea; package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatearea; package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatearea;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation; import ink.wgink.annotation.CheckNumberAnnotation;

View File

@ -1,4 +1,4 @@
package cn.com.tenlion.materialstore.pojo.vos.picturestemplatebuilding; package cn.com.tenlion.buildingpictures.pojo.vos.picturestemplatebuilding;
import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckEmptyAnnotation;
import ink.wgink.annotation.CheckNumberAnnotation; import ink.wgink.annotation.CheckNumberAnnotation;

View File

@ -1,8 +1,8 @@
package cn.com.tenlion.materialstore.pojo.vos.materialdata; package cn.com.tenlion.materialstore.pojo.vos.materialdata;
import cn.com.tenlion.materialstore.pojo.vos.materialmap.MaterialMapVO;
import cn.com.tenlion.materialstore.pojo.vos.materialaudio.MaterialAudioVO; import cn.com.tenlion.materialstore.pojo.vos.materialaudio.MaterialAudioVO;
import cn.com.tenlion.materialstore.pojo.vos.materiallink.MaterialLinkVO; import cn.com.tenlion.materialstore.pojo.vos.materiallink.MaterialLinkVO;
import cn.com.tenlion.materialstore.pojo.vos.materialmap.MaterialMapVO;
import cn.com.tenlion.materialstore.pojo.vos.materialphoto.MaterialPhotoVO; import cn.com.tenlion.materialstore.pojo.vos.materialphoto.MaterialPhotoVO;
import cn.com.tenlion.materialstore.pojo.vos.materialtext.MaterialTextVO; import cn.com.tenlion.materialstore.pojo.vos.materialtext.MaterialTextVO;
import cn.com.tenlion.materialstore.pojo.vos.materialvideo.MaterialVideoVO; import cn.com.tenlion.materialstore.pojo.vos.materialvideo.MaterialVideoVO;