添加大厅与窗口关联

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteBusinessServiceImpl.java

@@ -92,8 +92,6 @@ public class SiteBusinessServiceImpl extends AbstractCRUDCacheServiceImpl<SiteBu
     @Override
     protected void findAfter(SiteBusinessEntity params, PageInfo pageInfo, Context context, List<SiteBusinessEntity> list) throws AppException {
         //重新内存分页
-        params.getPage();
-        params.getSize();
         list = MemoryPagination.pagination(list, params.getSize() == -1 ? list.size() : params.getSize(), params.getPage());
         if (!ObjectUtils.isEmpty(params.getIdNotList())) {
             //排除掉已经存在的ids

base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteHallController.java

@@ -64,21 +64,25 @@ public class SiteHallController extends BaseCRUDJsonBodyMappingController<SiteHa
      */
     @PostMapping(value = "getBusinessByHall")
     @UnAuth
-    public String getBusinessByHall(@RequestBody SiteHallEntity siteHall) {
-        JSONObject jsonObject = new JSONObject();
+    public Rest<Object> getBusinessByHall(@RequestBody SiteHallEntity siteHall) {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
         String busiDesc = "根据大厅查询所属业务";
+        int code = VALUE_RESULT_SUCCESS;
         try {
             Rest<List<BusinessEntity>> rest = this.service.getBusinessByHall(siteHall, getContext());
             recordSysLog(request, busiDesc + " 【成功】");
-            jsonObject.put(KEY_RESULT_DATA, rest.getData());
-            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功！");
+            model.put(KEY_RESULT_DATA, rest.getData());
+            model.put("message_info", busiDesc + "成功");
         } catch (Exception e) {
             log.error("获取异常", e);
-            jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
-            jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
+            code = VALUE_RESULT_FAILURE;
+            this.doException(this.request, busiDesc, model, e);
         }
-        return jsonObject.toJSONString();
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
     }
 
 

base-manager/src/main/java/com/mortals/xhx/module/window/model/vo/WindowBusinessVo.java

 package com.mortals.xhx.module.window.model.vo;
+
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.mortals.framework.model.BaseEntityLong;
@@ -7,12 +9,13 @@ import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+
 /**
-* 窗口业务视图对象
-*
-* @author zxfei
-* @date 2022-01-12
-*/
+ * 窗口业务视图对象
+ *
+ * @author zxfei
+ * @date 2022-01-12
+ */
 @Data
 public class WindowBusinessVo extends BaseEntityLong {
 
@@ -27,18 +30,22 @@ public class WindowBusinessVo extends BaseEntityLong {
      */
     private String fromnum;
 
-    /** 窗口id列表 */
-    private List <Long> windowIdList;
+    /**
+     * 窗口id列表
+     */
+    private List<Long> windowIdList;
 
     /**
      * 大厅ID
      */
     @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JSONField(serialize = true)
     private Long hallId;
     /**
      * 大厅名称
      */
     @JsonInclude(JsonInclude.Include.ALWAYS)
+    @JSONField(serialize = true)
     private String hallName;