feat: 活码分组接口自测

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmPageTemplateApiServiceImpl.java

@@ -75,16 +75,19 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
             if (Objects.isNull(tempPageTemplate)) {
                 // 数据不存在
                 serviceResponse.setCode(HaoBanErrCodeCommon.ERR_8.getCode());
+                serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_8.getMsg());
                 return serviceResponse;
             }
             if (!StringUtils.equals(tempPageTemplate.getEnterpriseId(), pageTemplateDTO.getEnterpriseId())) {
                 // 无权限
                 serviceResponse.setCode(HaoBanErrCodeCommon.ERR_9.getCode());
+                serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_9.getMsg());
                 return serviceResponse;
             }
             if (!StringUtils.equals(tempPageTemplate.getWxEnterpriseId(), pageTemplateDTO.getWxEnterpriseId())) {
                 // 无权限
                 serviceResponse.setCode(HaoBanErrCodeCommon.ERR_9.getCode());
+                serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_9.getMsg());
                 return serviceResponse;
             }
             TabHaobanHmPage haobanHmPage = new TabHaobanHmPage();
@@ -108,10 +111,12 @@ public class HmPageTemplateApiServiceImpl implements HmPageTemplateApiService {
         TabHaobanHmPage haobanHmPage = haobanHmPageMapper.selectByPrimaryKey(pageTemplateDTO.getTemplateId());
         if (Objects.isNull(haobanHmPage) || !Objects.equals(HmPageTemplateStatus.ENABLE.getCode(), haobanHmPage.getStatus())) {
             serviceResponse.setCode(HaoBanErrCodeCommon.ERR_8.getCode());
+            serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_8.getMsg());
             return serviceResponse;
         }
         if (checkPageIsBeQuoted(haobanHmPage.getTemplateCode())) {
             serviceResponse.setCode(HaoBanErrCodeCommon.ERR_9.getCode());
+            serviceResponse.setMessage(HaoBanErrCodeCommon.ERR_9.getMsg());
             return serviceResponse;
         }
         TabHaobanHmPage tempHmPage = new TabHaobanHmPage();

haoban-manage3-service/src/main/resources/mapper/hm/TabHaobanHmPageRelationMapper.xml

@@ -21,16 +21,16 @@
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
         select
         <include refid="Base_Column_List"/>
-        from tab_haoban_hm_page_releation
+        from tab_haoban_hm_page_relation
         where relation_id = #{relationId,jdbcType=BIGINT}
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete
-        from tab_haoban_hm_page_releation
+        from tab_haoban_hm_page_relation
         where relation_id = #{relationId,jdbcType=BIGINT}
     </delete>
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        insert into tab_haoban_hm_page_releation (relation_id, page_template_code, enterprise_id,
+        insert into tab_haoban_hm_page_relation (relation_id, page_template_code, enterprise_id,
                                                   wx_enterprise_id, refer_id, refer_name,
                                                   create_time, update_time, type,
                                                   status)
@@ -40,7 +40,7 @@
                 #{status,jdbcType=INTEGER})
     </insert>
     <insert id="insertSelective" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        insert into tab_haoban_hm_page_releation
+        insert into tab_haoban_hm_page_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="relationId != null">
                 relation_id,
@@ -108,7 +108,7 @@
     </insert>
     <update id="updateByPrimaryKeySelective"
             parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        update tab_haoban_hm_page_releation
+        update tab_haoban_hm_page_relation
         <set>
             <if test="pageTemplateCode != null">
                 page_template_code = #{pageTemplateCode,jdbcType=VARCHAR},
@@ -141,7 +141,7 @@
         where relation_id = #{relationId,jdbcType=BIGINT}
     </update>
     <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.hm.TabHaobanHmPageRelation">
-        update tab_haoban_hm_page_releation
+        update tab_haoban_hm_page_relation
         set page_template_code = #{pageTemplateCode,jdbcType=VARCHAR},
             enterprise_id      = #{enterpriseId,jdbcType=VARCHAR},
             wx_enterprise_id   = #{wxEnterpriseId,jdbcType=VARCHAR},
@@ -156,7 +156,7 @@
 
     <select id="queryPageRelationList" resultMap="BaseResultMap">
         select <include refid="Base_Column_List"/>
-        from tab_haoban_hm_page_releation
+        from tab_haoban_hm_page_relation
         <where>
             <if test="templateCode != null and templateCode != ''">
                 page_template_code = #{templateCode}

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

@@ -13,8 +13,6 @@ import com.gic.haoban.manage.api.dto.hm.HmPageTemplateRespDTO;
 import com.gic.haoban.manage.api.service.hm.HmPageTemplateApiService;
 import com.gic.haoban.manage.web.vo.hm.HmPageTemplateListVO;
 import com.gic.haoban.manage.web.vo.hm.HmPageTemplateSettingVO;
-import com.sun.deploy.net.proxy.pac.PACFunctions;
-import com.tencentcloudapi.mongodb.v20190725.models.Auth;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -48,8 +46,11 @@ public class HmPageTemplateController {
         pageTemplateDTO.setEnterpriseId(loginUser.getEnterpriseId());
         pageTemplateDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Long> serviceResponse = pageTemplateApiService.saveOrUpdateHmPageTemplate(pageTemplateDTO);
+        if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
+        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+    }
 
 
     @RequestMapping(path = "/page/edit")
@@ -66,9 +67,14 @@ public class HmPageTemplateController {
         pageTemplateDTO.setGuideComment(pageTemplateSettingVO.getGuideComment());
         pageTemplateDTO.setClerkId(loginUser.getClerkId());
         pageTemplateDTO.setClerkName(loginUser.getClerkName());
+        pageTemplateDTO.setEnterpriseId(loginUser.getEnterpriseId());
+        pageTemplateDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Long> serviceResponse = pageTemplateApiService.saveOrUpdateHmPageTemplate(pageTemplateDTO);
+        if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
+        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+    }
 
     @RequestMapping(path = "/page/list")
     public RestResponse<?> queryPageTemplateList(HmPageTemplateListVO pageTemplateListVO){
@@ -95,6 +101,9 @@ public class HmPageTemplateController {
         hmPageTemplateDTO.setClerkId(loginUser.getClerkId());
         hmPageTemplateDTO.setClerkName(loginUser.getClerkName());
         ServiceResponse<Boolean> serviceResponse = pageTemplateApiService.deleteHmPageTemplate(hmPageTemplateDTO);
+        if (serviceResponse.isSuccess()){
             return RestResponse.successResult(serviceResponse.getResult());
         }
+        return RestResponse.failure(serviceResponse.getCode()+"", serviceResponse.getMessage());
+    }
 }