添加应用分类列表

base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java

@@ -7,14 +7,18 @@ import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.AppTypeEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.key.Constant;
+import com.mortals.xhx.module.app.model.AppCategoryEntity;
+import com.mortals.xhx.module.app.model.AppCategoryQuery;
 import com.mortals.xhx.module.app.model.AppEntity;
 import com.mortals.xhx.module.app.model.AppQuery;
+import com.mortals.xhx.module.app.service.AppCategoryService;
 import com.mortals.xhx.module.app.service.AppService;
 import com.mortals.xhx.module.site.model.SiteEntity;
 import com.mortals.xhx.module.site.model.SiteQuery;
@@ -27,6 +31,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -48,6 +54,9 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
     private ParamService paramService;
     @Autowired
     private SiteService siteService;
+    @Autowired
+    private AppCategoryService appCategoryService;
+
 
     public AppController() {
         super.setModuleDesc("自助终端应用");
@@ -80,6 +89,28 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
         super.doListBefore(query, model, context);
     }
 
+    /**
+     * @param query
+     * @param model
+     * @param context
+     * @return
+     * @throws AppException
+     */
+    @Override
+    protected int doListAfter(AppEntity query, Map<String, Object> model, Context context) throws AppException {
+        model.put("appCategory", new ArrayList<>());
+        if (!ObjectUtils.isEmpty(query.getSiteId())) {
+            AppCategoryQuery appCategoryQuery = new AppCategoryQuery();
+            appCategoryQuery.setSiteId(query.getSiteId());
+            appCategoryQuery.setOrderColList(Arrays.asList(new OrderCol("sort")));
+            List<AppCategoryEntity> appCategoryEntities = appCategoryService.find(appCategoryQuery);
+            if (!ObjectUtils.isEmpty(appCategoryEntities)) {
+                model.put("appCategory", appCategoryEntities);
+            }
+        }
+        return super.doListAfter(query, model, context);
+    }
+
     @Override
     protected int infoAfter(Long id, Map<String, Object> model, AppEntity entity, Context context) throws AppException {
         List<AppEntity> appEntityList = this.service.find(new AppQuery().appCode(entity.getAppCode()), context);
@@ -183,7 +214,7 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
                 throw new AppException("目标appId不能为空！");
             }
             Rest<String> cloneRest = this.service.cloneAppBySameSite(appQuery, getContext());
-            if(YesNoEnum.NO.getValue()==cloneRest.getCode()){
+            if (YesNoEnum.NO.getValue() == cloneRest.getCode()) {
                 return Rest.fail(cloneRest.getMsg());
             }
             recordSysLog(request, busiDesc + " 【成功】");