Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/LinkQO.java

@@ -37,7 +37,7 @@ public class LinkQO extends PageQO {
     private Integer parentId;
     @NotNull(message = "id不能为空", groups = LinkUpdateValid.class)
     private Integer linkId;
-    @NotNull(message = "适用对象不能为空", groups = LinkSaveValid.class)
+//    @NotNull(message = "适用对象不能为空", groups = LinkSaveValid.class)
     private Integer objectType;
     @NotBlank(message = "名称不能为空", groups = LinkSaveValid.class)
     private String name;

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/AppletCustomPageApiService.java

@@ -95,4 +95,13 @@ public interface AppletCustomPageApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

     
 */
     ServiceResponse<String> delete(Integer pageId);
+    /**
+     * 批量删除
+     * @Title: deleteFetch

+     * @Description:
+    
 * @author guojuxing
+     * @param 
pageIds
+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.String>

+    
 */
+    ServiceResponse<String> deleteFetch(String pageIds);
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabAppletCustomPageMapper.java

@@ -105,4 +105,6 @@ public interface TabAppletCustomPageMapper {
             @Param("appId") String appId, @Param("pageType") Integer pageType);
 
     TabAppletCustomPage getDefault(@Param("pageType") Integer pageType);
+
+    void deleteFetch(@Param("list") List<Integer> pageIdList);
 }
\ No newline at end of file

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/AppletCustomPageService.java

@@ -134,4 +134,6 @@ public interface AppletCustomPageService {
     
 */
     TabAppletCustomPage getDefault(Integer pageType);
 
+    void deleteFetch(List<Integer> pageIdList);
+
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AppletCustomPageServiceImpl.java

@@ -103,4 +103,9 @@ public class AppletCustomPageServiceImpl implements AppletCustomPageService{
     public TabAppletCustomPage getDefault(Integer pageType) {
         return tabAppletCustomPageMapper.getDefault(pageType);
     }
+
+    @Override
+    public void deleteFetch(List<Integer> pageIdList) {
+        tabAppletCustomPageMapper.deleteFetch(pageIdList);
+    }
 }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletCustomPageApiServiceImpl.java

@@ -334,6 +334,32 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
         return ServiceResponse.success(record.getTitle());
     }
 
+    @Override
+    public ServiceResponse<String> deleteFetch(String pageIds) {
+        if (StringUtils.isBlank(pageIds)) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "页面id为空");
+        }
+        String[] pageIdArr = pageIds.split(",");
+        StringBuilder pageName = new StringBuilder();
+        List<Integer> pageIdList = new ArrayList<>(pageIdArr.length);
+        for (String pageId : pageIdArr) {
+            if (!StringUtils.isNumeric(pageId)) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "页面id错误，数据格式非法");
+            }
+            TabAppletCustomPage record = appletCustomPageService.getByPageId(Integer.parseInt(pageId));
+            if (record == null) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "页面ID错误，查无数据");
+            }
+            if (record.getStatus().intValue() == 1) {
+                return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "发布状态不能删除");
+            }
+            pageName.append(record.getTitle()).append(",");
+            pageIdList.add(Integer.parseInt(pageId));
+        }
+        appletCustomPageService.deleteFetch(pageIdList);
+        return ServiceResponse.success(pageName.toString());
+    }
+
     /**
      * 获取组件信息
      * @param pageId

gic-platform-enterprise-service/src/main/resources/mapper/TabAppletCustomPageMapper.xml

@@ -242,4 +242,12 @@
     and enterprise_id = -1
     and page_type = #{pageType}
   </select>
+
+  <update id="deleteFetch">
+    update tab_applet_custom_page set status = 0
+    where page_id in
+    <foreach collection="list" item="item" separator="," open="(" close=")" index="">
+      #{item}
+    </foreach>
+  </update>
 </mapper>
\ No newline at end of file

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/CustomPageController.java

@@ -69,6 +69,12 @@ public class CustomPageController {
         return OperationResultUtils.operationResult(result, "删除装修页面", OperationResultUtils.getOperationObject(result));
     }
 
+    @RequestMapping("/delete-fetch")
+    public RestResponse deleteFetch(String pageIds) {
+        ServiceResponse<String> result = appletCustomPageApiService.deleteFetch(pageIds);
+        return OperationResultUtils.operationResult(result, "删除装修页面", OperationResultUtils.getOperationObject(result));
+    }
+
     /**
      * 数据资产类型
      * @Title: listDataIcon