新增影像信息，收货地址，影像图框模块接口

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/IndustryTypeVo.java

@@ -4,6 +4,8 @@ import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
 import com.upyuns.platform.rs.website.entity.IndustryApplicationType;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @ClassName : IndustryTypeVo
  * @Description : 行业应用首页展示
@@ -15,4 +17,5 @@ public class IndustryTypeVo extends IndustryApplicationType {
 
 	IndustryApplicationInfo industryApplicationInfo;
 
+	List<IndustryApplicationInfo> industryApplicationInfoList;
 }

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/CommonInfoBiz.java

 package com.upyuns.platform.rs.website.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import org.springframework.stereotype.Service;
 
 import com.upyuns.platform.rs.website.entity.CommonInfo;
 import com.upyuns.platform.rs.website.mapper.CommonInfoMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 /**
  * 通用信息
@@ -21,7 +27,28 @@ public class CommonInfoBiz extends BaseBiz<CommonInfoMapper,CommonInfo> {
 		if (commonInfo == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
+		if (commonInfo.getId() != null) {
+			CommonInfo old = selectById(commonInfo.getId());
+			if (old == null || old.getIsDel() == 1) {
+				return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
+			}
+			BeanUtil.copyProperties(commonInfo, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+			updateSelectiveByIdRe(old);
+		} else {
+			insertSelectiveRe(commonInfo);
+		}
 		return ObjectRestResponse.succ();
 	}
 
+	/**
+	 * 根据类型查询信息
+	 * @param type
+	 * @return
+	 */
+	public List<CommonInfo> getByType(Integer type) {
+		Example example = new Example(CommonInfo.class);
+		example.createCriteria().andEqualTo("type", type).andEqualTo("isDel", 0);
+		return mapper.selectByExample(example);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/IndustryApplicationTypeBiz.java

@@ -8,10 +8,13 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.upyuns.platform.rs.website.dto.IndustryApplicationTypeDto;
 import com.upyuns.platform.rs.website.dto.NewsTypeDto;
+import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
 import com.upyuns.platform.rs.website.entity.IndustryApplicationType;
 import com.upyuns.platform.rs.website.entity.NewsType;
 import com.upyuns.platform.rs.website.mapper.IndustryApplicationTypeMapper;
+import com.upyuns.platform.rs.website.vo.IndustryTypeVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
@@ -29,6 +32,8 @@ import java.util.List;
 @Service
 public class IndustryApplicationTypeBiz extends BaseBiz<IndustryApplicationTypeMapper, IndustryApplicationType> {
 
+	@Autowired
+	IndustryApplicationInfoBiz industryApplicationInfoBiz;
 
 	/**
 	 * 新增类型
@@ -100,4 +105,26 @@ public class IndustryApplicationTypeBiz extends BaseBiz<IndustryApplicationTypeM
 		return ObjectRestResponse.succ(pageDataVO);
 	}
 
+	/**
+	 * 获取行业应用信息详情
+	 * @param id
+	 * @return
+	 */
+	public ObjectRestResponse<IndustryTypeVo> getDetail(Integer id) {
+		IndustryTypeVo industryTypeVo = new IndustryTypeVo();
+		IndustryApplicationType industryApplicationType = selectById(id);
+		if (industryApplicationType == null || industryApplicationType.getIsDel() == 1 || industryApplicationType.getStatus() == 2) {
+			return ObjectRestResponse.succ(industryTypeVo);
+		}
+		BeanUtil.copyProperties(industryApplicationType, industryTypeVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+		List<IndustryApplicationInfo> industryApplicationInfoList = industryApplicationInfoBiz.selectList(new IndustryApplicationInfo(){{
+			setIsDel(0);
+			setStatus(1);
+		}});
+		if (industryApplicationInfoList != null && industryApplicationInfoList.size() > 0) {
+			industryTypeVo.setIndustryApplicationInfoList(industryApplicationInfoList);
+		}
+		return ObjectRestResponse.succ(industryTypeVo);
+	}
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/IndustryApplicationTypeController.java

@@ -26,5 +26,8 @@ public class IndustryApplicationTypeController extends BaseController<IndustryAp
 		return baseBiz.getAll(indexShow);
 	}
 
-
+	@GetMapping(value = "getDetail")
+	public ObjectRestResponse getDetail(Integer id) {
+		return baseBiz.getDetail(id);
+	}
 }
\ No newline at end of file