Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmPageController.java

@@ -7,25 +7,23 @@ import com.gic.haoban.base.api.common.PageResult2;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.PageUtil;
+import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
+import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
-import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
-import com.gic.haoban.manage.web.vo.hm.HmPageInfoVO;
-import com.gic.haoban.manage.web.vo.hm.HmPageListVO;
-import com.gic.haoban.manage.web.vo.hm.HmPageSettingReq;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.qo.hm.HmPageListQO;
+import com.gic.haoban.manage.web.qo.hm.HmPageSettingReq;
 import com.gic.haoban.manage.web.vo.hm.PageRelationVO;
-import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
-import org.springframework.beans.BeanUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @Author MUSI
@@ -37,27 +35,28 @@ import java.util.stream.Collectors;
 @RequestMapping(path = "/hm/guide")
 public class HmPageController {
 
+    private static final Logger log = LoggerFactory.getLogger(HmPageController.class);
     @Autowired
     private HmPageApiService pageApiService;
 
     @RequestMapping(path = "/page/save")
-    public RestResponse<?> savePage(@Valid HmPageSettingReq pageSettingVO){
+    public RestResponse<?> savePage(@Valid HmPageSettingReq pageSettingReq){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO pageDTO = new HmPageDTO();
-        pageDTO.setPageName(pageSettingVO.getTemplateName());
-        pageDTO.setPageTitle(pageSettingVO.getPageTitle());
-        pageDTO.setMerchantName(pageSettingVO.getMerchantName());
-        pageDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
-        pageDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
-        pageDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
-        pageDTO.setGuideComment(pageSettingVO.getGuideComment());
+        pageDTO.setPageName(pageSettingReq.getPageName());
+        pageDTO.setPageTitle(pageSettingReq.getPageTitle());
+        pageDTO.setMerchantName(pageSettingReq.getMerchantName());
+        pageDTO.setMerchantPhoneNumber(pageSettingReq.getMerchantPhoneNumber());
+        pageDTO.setMerchantLogo(pageSettingReq.getMerchantLogo());
+        pageDTO.setPageBackgroundImg(pageSettingReq.getPageBackgroundImg());
+        pageDTO.setGuideComment(pageSettingReq.getGuideComment());
         pageDTO.setCreateorId(loginUser.getClerkId());
         pageDTO.setCreateorName(loginUser.getClerkName());
         pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
         pageDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Long> serviceResponse = pageApiService.saveOrUpdateHmPage(pageDTO);
         if (serviceResponse.isSuccess()){
-            String logContent = "新增落地页模板【MB01" + serviceResponse.getResult()+"-" + pageSettingVO.getTemplateName() +"】";
+            String logContent = "新增落地页模板【MB01" + serviceResponse.getResult()+"-" + pageSettingReq.getPageName() +"】";
             return RestResponse.successResult(serviceResponse.getResult());
         }
         GicLogRecordEvaluationContext.putAttribute("saved", Boolean.FALSE);
@@ -66,17 +65,23 @@ public class HmPageController {
 
 
     @RequestMapping(path = "/page/edit")
-    public RestResponse<?> editPageTemplate(@Valid HmPageSettingReq pageSettingVO){
+    public RestResponse<?> editPage(@Valid HmPageSettingReq pageSettingReq){
+
+        if (pageSettingReq.getPageId() == null){
+            log.warn("[editPage] 无pageId");
+            return RestResponse.failure(HaoBanErrCode.ERR_2.getCode()+"", HaoBanErrCode.ERR_2.getMsg());
+        }
+
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO pageDTO = new HmPageDTO();
-        pageDTO.setPageId(pageSettingVO.getTemplateId());
-        pageDTO.setPageName(pageSettingVO.getTemplateName());
-        pageDTO.setPageTitle(pageSettingVO.getPageTitle());
-        pageDTO.setMerchantName(pageSettingVO.getMerchantName());
-        pageDTO.setMerchantPhoneNumber(pageSettingVO.getMerchantPhoneNumber());
-        pageDTO.setMerchantLogo(pageSettingVO.getMerchantLogo());
-        pageDTO.setPageBackgroundImg(pageSettingVO.getPageBackgroundImg());
-        pageDTO.setGuideComment(pageSettingVO.getGuideComment());
+        pageDTO.setPageId(pageSettingReq.getPageId());
+        pageDTO.setPageName(pageSettingReq.getPageName());
+        pageDTO.setPageTitle(pageSettingReq.getPageTitle());
+        pageDTO.setMerchantName(pageSettingReq.getMerchantName());
+        pageDTO.setMerchantPhoneNumber(pageSettingReq.getMerchantPhoneNumber());
+        pageDTO.setMerchantLogo(pageSettingReq.getMerchantLogo());
+        pageDTO.setPageBackgroundImg(pageSettingReq.getPageBackgroundImg());
+        pageDTO.setGuideComment(pageSettingReq.getGuideComment());
         pageDTO.setCreateorId(loginUser.getClerkId());
         pageDTO.setCreateorName(loginUser.getClerkName());
         pageDTO.setEnterpriseId(loginUser.getEnterpriseId());
@@ -132,7 +137,7 @@ public class HmPageController {
     }
 
     @RequestMapping(path = "/page/list")
-    public RestResponse<?> queryPageList(HmPageListVO pageListVO){
+    public RestResponse<?> queryPageList(HmPageListQO pageListVO){
 
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageQDTO hmPageQDTO = new HmPageQDTO();
@@ -145,27 +150,18 @@ public class HmPageController {
         hmPageQDTO.setEndTime(pageListVO.getEndTime());
         ServiceResponse<Page<HmPageDTO>> serviceResponse = pageApiService.queryPageList(hmPageQDTO);
         PageResult2 pageInfo = PageUtil.getPageInfo(serviceResponse.getResult());
-        List<HmPageInfoVO> pageInfoVos = ((List<HmPageDTO>)pageInfo.getList()).stream().map(item -> {
-            HmPageInfoVO pageInfoVo = new HmPageInfoVO();
-            BeanUtils.copyProperties(item, pageInfoVo);
-            pageInfoVo.setTemplateName(item.getPageName());
-            pageInfoVo.setTemplateCode(item.getPageCode());
-            pageInfoVo.setTemplateId(item.getPageId());
-            return pageInfoVo;
-        }).collect(Collectors.toList());
-        pageInfo.setList(pageInfoVos);
         return RestResponse.successResult(pageInfo);
     }
 
     @RequestMapping(path = "/page/delete")
-    public RestResponse<?> deletePage(Long templateId){
+    public RestResponse<?> deletePage(Long pageId){
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         HmPageDTO hmPageDTO = new HmPageDTO();
-        hmPageDTO.setPageId(templateId);
+        hmPageDTO.setPageId(pageId);
         hmPageDTO.setModifierId(loginUser.getClerkId());
         hmPageDTO.setModifierName(loginUser.getClerkName());
 
-        ServiceResponse<HmPageDTO> queryPageDetail = pageApiService.queryPageDetail(templateId);
+        ServiceResponse<HmPageDTO> queryPageDetail = pageApiService.queryPageDetail(pageId);
         ServiceResponse<Boolean> serviceResponse = pageApiService.deleteHmPage(hmPageDTO);
         if (serviceResponse.isSuccess()){
             String logContent = "删除落地页模板【" + queryPageDetail.getResult().getPageTitle() + "-" + queryPageDetail.getResult().getPageName()+"】";
@@ -176,8 +172,8 @@ public class HmPageController {
     }
 
     @RequestMapping(path = "/page/detail")
-    public RestResponse<?> queryPageDetail(Long templateId){
-        ServiceResponse<HmPageDTO> serviceResponse = pageApiService.queryPageDetail(templateId);
+    public RestResponse<?> queryPageDetail(Long pageId){
+        ServiceResponse<HmPageDTO> serviceResponse = pageApiService.queryPageDetail(pageId);
         return RestResponse.successResult(serviceResponse.getResult());
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmGroupQO.java

@@ -11,6 +11,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 
 public class HmGroupQO extends BasePageInfo {
 
+    private static final long serialVersionUID = -121538712996188058L;
     private String groupName;
 
     public String getGroupName() {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageListVO.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmPageListQO.java

-package com.gic.haoban.manage.web.vo.hm;
+package com.gic.haoban.manage.web.qo.hm;
 
 import com.gic.haoban.base.api.common.BasePageInfo;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -11,8 +11,9 @@ import java.util.Date;
  * @Description
  * @Version
  **/
-public class HmPageListVO extends BasePageInfo {
+public class HmPageListQO extends BasePageInfo {
 
+    private static final long serialVersionUID = 660563636929408221L;
     private String pageSearchText;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmPageSettingReq.java → haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/hm/HmPageSettingReq.java

-package com.gic.haoban.manage.web.vo.hm;
+package com.gic.haoban.manage.web.qo.hm;
 
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -14,13 +14,13 @@ import java.io.Serializable;
 public class HmPageSettingReq implements Serializable {
 
     private static final long serialVersionUID = -3759274516687664059L;
-    private Long templateId;
+    private Long pageId;
     /**
      * 落地页模板名称
      */
     @NotEmpty(message = "落地页模板名称不能为空")
     @Length(max = 20, message = "落地页模板名称长度最大为20个字符")
-    private String templateName;
+    private String pageName;
     /**
      * 页面标题
      */
@@ -53,20 +53,20 @@ public class HmPageSettingReq implements Serializable {
      */
     private String guideComment;
 
-    public Long getTemplateId() {
-        return templateId;
+    public Long getPageId() {
+        return pageId;
     }
 
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
+    public void setPageId(Long pageId) {
+        this.pageId = pageId;
     }
 
-    public String getTemplateName() {
-        return templateName;
+    public String getPageName() {
+        return pageName;
     }
 
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
+    public void setPageName(String pageName) {
+        this.pageName = pageName;
     }
 
     public String getPageTitle() {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/PageRelationVO.java

@@ -10,16 +10,17 @@ import com.gic.haoban.base.api.common.BasePageInfo;
  **/
 public class PageRelationVO extends BasePageInfo {
 
-    private Long templateId;
+    private static final long serialVersionUID = 620990188413994137L;
+    private Long pageId;
 
     private String searchContent;
 
-    public Long getTemplateId() {
-        return templateId;
+    public Long getPageId() {
+        return pageId;
     }
 
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
+    public void setPageId(Long pageId) {
+        this.pageId = pageId;
     }
 
     public String getSearchContent() {