luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

release问题修改

dev
hosinokamui 5 years ago
parent
7508f837c3
commit
1064b9d9c5
7 changed files with 161 additions and 190 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/OperCustomizeConstant.java
  2. 32
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java
  3. 24
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java
  4. 11
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
  5. 46
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
  6. 121
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
  7. 58
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml

15
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/constant/OperCustomizeConstant.java → epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/OperCustomizeConstant.java
View File

@ -6,7 +6,7 @@
* 版权所有，侵权必究！
*/
package com.epmet.dto.constant;
package com.epmet.constant;
/**
* 常量
@ -17,9 +17,18 @@ public interface OperCustomizeConstant {
/**
* 数据状态-已发布
*/
String STATUS = "0";
String STATUS_RELEASED = "0";
/**
* 数据状态-草稿
*/
String STATUS_ONE = "1";
String STATUS_DRAFT = "1";
/**
* 数据状态-已发布
*/
Integer STATUS_IS_RELEASED = 0;
/**
* 数据状态-草稿
*/
Integer STATUS_IS_DRAFT = 1;
}

32
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/ReginConstant.java
View File

@ -1,19 +1,25 @@
package com.epmet.constant;
/**
* @Classname ReginEnum
* @Description 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
* @Date 2020/3/17 15:22
* @Created by yangs
* 所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
* @date 2020/3/17 15:22
* @author angs
*/
public interface ReginConstant {
//所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
//0.标题区
String titleList="titleList";
//1.置顶区
String topList="topList";
//2.功能区
String functionList="functionList";
//3.悬浮区
String floatingList="floatingList";
/**
* 标题区
*/
String TITLE_LIST ="titleList";
/**
* 置顶区
*/
String TOP_LIST ="topList";
/**
* 功能区
*/
String FUNCTION_LIST ="functionList";
/**
* 悬浮区
*/
String FLOATING_LIST="floatingList";
}

24
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/HomeController.java
View File

@ -2,10 +2,9 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.constant.OperCustomizeConstant;
import com.epmet.constant.OperCustomizeConstant;
import com.epmet.dto.form.ComponentListByCustomerFormDTO;
import com.epmet.dto.form.CustomerHomeFormDTO;
import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
import com.epmet.dto.form.HomeDesignFormDTO;
import com.epmet.dto.result.ComponentListByCustomerResultDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
@ -44,13 +43,15 @@ public class HomeController {
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HomeDesignByCustomerResultDTO>
* @Author yang
* @Description 获取客户首页配置的设计稿
* @Date 2020/3/16 13:21
* @author yang
* @description 获取客户首页配置的设计稿
* @date 2020/3/16 13:21
**/
@PostMapping("gethomedesignbycustomer")
public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(@RequestBody HomeDesignByCustomerFormDTO formDTO) {
public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(@RequestBody CustomerHomeFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
//草稿数据
formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT);
return homeService.getHomeDesignByCustomer(formDTO);
}
@ -64,8 +65,7 @@ public class HomeController {
@PostMapping("savehomedesign")
public Result saveHomeDesign(@RequestBody HomeDesignFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
homeService.saveHomeDesign(formDTO);
return new Result();
return homeService.saveHomeDesign(formDTO);
}
/**
@ -78,8 +78,7 @@ public class HomeController {
@PostMapping("distributehomedesign")
public Result distributeHomeDesign(@RequestBody HomeDesignFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
homeService.distributeHomeDesign(formDTO);
return new Result();
return homeService.distributeHomeDesign(formDTO);
}
/**
@ -91,8 +90,9 @@ public class HomeController {
**/
@PostMapping("gethomereleasebycustomer")
public Result<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(@RequestBody CustomerHomeFormDTO formDTO) {
formDTO.setStatus(OperCustomizeConstant.STATUS);//已发布数据
//已发布数据
formDTO.setStatus(OperCustomizeConstant.STATUS_RELEASED);
ValidatorUtils.validateEntity(formDTO);
return homeService.getHomeReleaseByCustomer(formDTO);
return homeService.getHomeDesignByCustomer(formDTO);
}
}

11
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerHomeDetailDao.java
View File

@ -19,7 +19,6 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.form.CustomerHomeFormDTO;
import com.epmet.dto.form.HomeDesignByCustomerFormDTO;
import com.epmet.dto.result.CommonComponentDesignResultDTO;
import com.epmet.entity.CustomerHomeDetailEntity;
import org.apache.ibatis.annotations.Mapper;
@ -42,14 +41,16 @@ public interface CustomerHomeDetailDao extends BaseDao<CustomerHomeDetailEntity>
* @author zhaoqifeng
* @date 2020/3/16 14:02
*/
void updateCustomerHomeDetailByHomeId(String homeId);
void deleteCustomerHomeDetailByHomeId(String homeId);
/**
*
* 根据客户id,所属端获取客户首页配置的设计稿
*
* @param form 客户参数
* @return List<CommonComponentDesignResultDTO>
* @author yangshaoping
* @date 2020/3/1714:02
*/
List<CommonComponentDesignResultDTO> getCustomerHomeDetailComponent(HomeDesignByCustomerFormDTO form);
List<CommonComponentDesignResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO form);
List<CommonComponentDesignResultDTO> selectCustomerHomeDetail(CustomerHomeFormDTO form);
}

46
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/HomeService.java
View File

@ -24,37 +24,43 @@ public interface HomeService {
Result<ComponentListByCustomerResultDTO> getComponentListByCustomer(ComponentListByCustomerFormDTO formDTO);
/**
* @param formDTO
*
* 获取客户首页配置的设计稿
*
* @param formDTO 参数
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.HomeDesignByCustomerResultDTO>
* @Author yang
* @Description 获取客户首页配置的设计稿
* @Date 2020/3/16 13:21
* @author yang
* @date 2020/3/16 13:21
**/
Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(HomeDesignByCustomerFormDTO formDTO);
Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(CustomerHomeFormDTO formDTO);
/**
*
* 首页设计稿组件上传数据
* @param: formDTO
* @author: zhaoqifeng
* @date: 2020/03/16 13:49:41
*
* @param formDTO 参数
* @return Result
* @author zhaoqifeng
* @date 2020/03/16 13:49:41
*/
void saveHomeDesign(HomeDesignFormDTO formDTO);
Result saveHomeDesign(HomeDesignFormDTO formDTO);
/**
*
* 首页设计稿发版
* @param: formDTO
* @author: zhaoqifeng
* @date: 2020/03/16 13:49:41
*
* @param formDTO 参数
* @return Result
* @author zhaoqifeng
* @date 2020/03/16 13:49:41
*/
void distributeHomeDesign(HomeDesignFormDTO formDTO);
Result distributeHomeDesign(HomeDesignFormDTO formDTO);
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CustomerHomeFormDTO>
* @Author sun
* @Description 获取客户首页发布数据
**/
Result<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO);
// /**
// * @param formDTO
// * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CustomerHomeFormDTO>
// * @Author sun
// * @Description 获取客户首页发布数据
// **/
// Result<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO);
}

121
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.OperCustomizeConstant;
import com.epmet.constant.ReginConstant;
import com.epmet.dao.CustomerHomeDao;
import com.epmet.dao.CustomerHomeDetailDao;
@ -11,18 +13,23 @@ import com.epmet.dto.result.ComponentListByCustomerResultDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
import com.epmet.entity.CustomerHomeDetailEntity;
import com.epmet.entity.CustomerHomeEntity;
import com.epmet.service.CustomerHomeDetailService;
import com.epmet.service.HomeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
/**
* @Description 客户定制化服务-首页
* @Author yinzuomei
* @Date 2020/3/11 13:14
* 客户定制化服务-首页
*
* @author yinzuomei
* @date 2020/3/11 13:14
*/
@Slf4j
@Service
public class HomeServiceImpl implements HomeService {
@Autowired
@ -31,6 +38,8 @@ public class HomeServiceImpl implements HomeService {
private CustomerHomeDetailDao customerHomeDetailDao;
@Autowired
private CustomerHomeDao customerHomeDao;
@Autowired
private CustomerHomeDetailService customerHomeDetailService;
@Override
public Result<ComponentListByCustomerResultDTO> getComponentListByCustomer(ComponentListByCustomerFormDTO formDTO) {
@ -41,106 +50,78 @@ public class HomeServiceImpl implements HomeService {
}
@Override
public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(HomeDesignByCustomerFormDTO formDTO) {
public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) {
HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
//根据客户id,所属端获取客户首页配置的设计稿
List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.getCustomerHomeDetailComponent(formDTO);
List<CommonComponentDesignResultDTO> titlelist=new ArrayList<CommonComponentDesignResultDTO>();
List<CommonComponentDesignResultDTO> toplist=new ArrayList<CommonComponentDesignResultDTO>();
List<CommonComponentDesignResultDTO> functionlist=new ArrayList<CommonComponentDesignResultDTO>();
List<CommonComponentDesignResultDTO> floatlist=new ArrayList<CommonComponentDesignResultDTO>();
List<String> usedComponent=new ArrayList<>();//使用过的组件集合
for(CommonComponentDesignResultDTO c:list){
List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO);
List<CommonComponentDesignResultDTO> titleList = new ArrayList<>();
List<CommonComponentDesignResultDTO> topList = new ArrayList<>();
List<CommonComponentDesignResultDTO> functionList = new ArrayList<>();
List<CommonComponentDesignResultDTO> floatingList = new ArrayList<>();
//使用过的组件集合
List<String> usedComponent = new ArrayList<>();
for (CommonComponentDesignResultDTO c : list) {
usedComponent.add(c.getComponentId());
//所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
if(ReginConstant.titleList.equals(c.getRegion())){
titlelist.add(c);
}else if(ReginConstant.topList.equals(c.getRegion())){
toplist.add(c);
}else if(ReginConstant.functionList.equals(c.getRegion())){
functionlist.add(c);
}else if(ReginConstant.floatingList.equals(c.getRegion())){
floatlist.add(c);
if (ReginConstant.TITLE_LIST.equals(c.getRegion())) {
titleList.add(c);
} else if (ReginConstant.TOP_LIST.equals(c.getRegion())) {
topList.add(c);
} else if (ReginConstant.FUNCTION_LIST.equals(c.getRegion())) {
functionList.add(c);
} else if (ReginConstant.FLOATING_LIST.equals(c.getRegion())) {
floatingList.add(c);
}
}
resultDTO.setTitleList(titlelist);
resultDTO.setTopList(toplist);
resultDTO.setFloatingList(floatlist);
resultDTO.setFunctionList(functionlist);
resultDTO.setTitleList(titleList);
resultDTO.setTopList(topList);
resultDTO.setFloatingList(floatingList);
resultDTO.setFunctionList(functionList);
if (OperCustomizeConstant.STATUS_DRAFT.equals(formDTO.getStatus())) {
resultDTO.setUsedComponentIdList(usedComponent);
}
return new Result<HomeDesignByCustomerResultDTO>().ok(resultDTO);
}
@Override
public void saveHomeDesign(HomeDesignFormDTO formDTO) {
@Transactional(rollbackFor = Exception.class)
public Result saveHomeDesign(HomeDesignFormDTO formDTO) {
//根据客户ID和所属端类型从客户首页表找到对应的已发布和草稿
List<CustomerHomeEntity> customerHomeList = customerHomeDao.selectCustomerHomeList(formDTO);
//只处理草稿的数据
for(CustomerHomeEntity entity : customerHomeList) {
if (entity.getStatus() == 1) {
for (CustomerHomeEntity entity : customerHomeList) {
if (OperCustomizeConstant.STATUS_IS_DRAFT.equals(entity.getStatus())) {
saveCustomerHomeDetail(formDTO, entity);
}
}
return new Result();
}
@Override
public void distributeHomeDesign(HomeDesignFormDTO formDTO) {
@Transactional(rollbackFor = Exception.class)
public Result distributeHomeDesign(HomeDesignFormDTO formDTO) {
//根据客户ID和所属端类型从客户首页表找到对应的已发布和草稿
List<CustomerHomeEntity> customerHomeList = customerHomeDao.selectCustomerHomeList(formDTO);
//草稿和模板数据都要处理
for(CustomerHomeEntity entity : customerHomeList) {
for (CustomerHomeEntity entity : customerHomeList) {
saveCustomerHomeDetail(formDTO, entity);
}
return new Result();
}
private void saveCustomerHomeDetail(HomeDesignFormDTO formDTO, CustomerHomeEntity entity) {
private void saveCustomerHomeDetail(HomeDesignFormDTO formDTO, CustomerHomeEntity customerHomeEntity) {
//根据homeID清空客户首页详情表中的数据
customerHomeDetailDao.updateCustomerHomeDetailByHomeId(entity.getId());
customerHomeDetailDao.deleteCustomerHomeDetailByHomeId(customerHomeEntity.getId());
List<CustomerHomeDetailEntity> list = ConvertUtils.sourceToTarget(formDTO.getComponentList(), CustomerHomeDetailEntity.class);
//将数据存入客户首页详情表
for (HomeComponentFormDTO homeComponentForm : formDTO.getComponentList()) {
CustomerHomeDetailEntity customerHomeDetailEntity = new CustomerHomeDetailEntity();
customerHomeDetailEntity.setHomeId(entity.getId());
customerHomeDetailEntity.setComponentId(homeComponentForm.getComponentId());
customerHomeDetailEntity.setRegion(homeComponentForm.getRegion());
customerHomeDetailEntity.setConfiguration(homeComponentForm.getConfiguration());
customerHomeDetailEntity.setDemoData(homeComponentForm.getDemoData());
customerHomeDetailEntity.setDisplayOrder(homeComponentForm.getDisplayOrder());
customerHomeDetailDao.insert(customerHomeDetailEntity);
customerHomeDetailService.insertBatch(list);
}
}
@Override
public Result<HomeDesignByCustomerResultDTO> getHomeReleaseByCustomer(CustomerHomeFormDTO formDTO) {
HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
//根据客户id,所属端获取客户首页配置的设计稿
List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.getHomeReleaseByCustomer(formDTO);
List<CommonComponentDesignResultDTO> titlelist=new ArrayList<CommonComponentDesignResultDTO>();
List<CommonComponentDesignResultDTO> toplist=new ArrayList<CommonComponentDesignResultDTO>();
List<CommonComponentDesignResultDTO> functionlist=new ArrayList<CommonComponentDesignResultDTO>();
List<CommonComponentDesignResultDTO> floatlist=new ArrayList<CommonComponentDesignResultDTO>();
//List<String> usedComponent=new ArrayList<>();//使用过的组件集合
for(CommonComponentDesignResultDTO c:list){
//usedComponent.add(c.getComponentId());
//所属区域：0.标题区、1.置顶区、2.功能区、3.悬浮区
if(ReginConstant.titleList.equals(c.getRegion())){
titlelist.add(c);
}else if(ReginConstant.topList.equals(c.getRegion())){
toplist.add(c);
}else if(ReginConstant.functionList.equals(c.getRegion())){
functionlist.add(c);
}else if(ReginConstant.floatingList.equals(c.getRegion())){
floatlist.add(c);
}
}
resultDTO.setTitleList(titlelist);
resultDTO.setTopList(toplist);
resultDTO.setFloatingList(floatlist);
resultDTO.setFunctionList(functionlist);
//resultDTO.setUsedComponentIdList(usedComponent);
return new Result<HomeDesignByCustomerResultDTO>().ok(resultDTO);
}
}

58
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerHomeDetailDao.xml
View File

@ -18,7 +18,7 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<update id="updateCustomerHomeDetailByHomeId" parameterType="java.lang.String">
<update id="deleteCustomerHomeDetailByHomeId" parameterType="java.lang.String">
UPDATE
CUSTOMER_HOME_DETAIL
set
@ -28,49 +28,17 @@
AND DEL_FLAG = 0
</update>
<!-- 根据客户id,所属端获取客户首页配置的设计稿 -->
<select id="getCustomerHomeDetailComponent" parameterType="com.epmet.dto.form.HomeDesignByCustomerFormDTO"
<!-- 客户首页详情列表查询 -->
<select id="selectCustomerHomeDetail" parameterType="com.epmet.dto.form.CustomerHomeFormDTO"
resultType="com.epmet.dto.result.CommonComponentDesignResultDTO">
SELECT
b.COMPONENT_ID,
c.COMPONENT_NAME,
c.COMPONENT_FRONT_ID,
b.REGION,
b.CONFIGURATION,
b.DEMO_DATA,
b.DISPLAY_ORDER
FROM
(
SELECT
a.id
FROM
customer_home a
WHERE
a.DEL_FLAG = 0
AND a.CUSTOMER_ID = #{customerId}
AND a.CLIENT_TYPE = #{clientType}
and a.`STATUS`=1
ORDER BY
a.CREATED_TIME DESC
LIMIT 1
) a
INNER JOIN customer_home_detail b ON a.id = b.HOME_ID
LEFT JOIN home_component c ON b.COMPONENT_ID = c.id
WHERE
b.DEL_FLAG = 0 and c.DEL_FLAG=0
</select>
<!-- 客户发布列表查询 -->
<select id="getHomeReleaseByCustomer" parameterType="com.epmet.dto.form.CustomerHomeFormDTO"
resultType="com.epmet.dto.result.CommonComponentDesignResultDTO">
SELECT
b.COMPONENT_ID,
c.COMPONENT_NAME,
c.COMPONENT_FRONT_ID,
b.REGION,
b.CONFIGURATION,
b.DEMO_DATA,
b.DISPLAY_ORDER
chd.COMPONENT_ID,
hc.COMPONENT_NAME,
hc.COMPONENT_FRONT_ID,
chd.REGION,
chd.CONFIGURATION,
chd.DEMO_DATA,
chd.DISPLAY_ORDER
FROM
(
SELECT
@ -82,8 +50,8 @@
AND CLIENT_TYPE = #{clientType}
AND `STATUS` = #{status}
) a
INNER JOIN customer_home_detail b ON a.id = b.HOME_ID AND b.DEL_FLAG = '0'
LEFT JOIN home_component c ON b.COMPONENT_ID = c.id AND c.DEL_FLAG = '0'
ORDER BY b.REGION DESC,b.DISPLAY_ORDER ASC
INNER JOIN customer_home_detail chd ON a.id = chd.HOME_ID AND chd.DEL_FLAG = '0'
LEFT JOIN home_component hc ON chd.COMPONENT_ID = hc.id AND hc.DEL_FLAG = '0'
ORDER BY chd.REGION DESC,chd.DISPLAY_ORDER ASC
</select>
</mapper>
Write Preview
Loading…
Cancel
Save