标签修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java

@@ -1,14 +1,11 @@
 package com.jero.modules.tag.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.CommonConstant;
-import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
-import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.enums.FixedFieldEnum;
 import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
 import com.jero.modules.tag.entity.OnlCgformArea;
@@ -53,16 +50,17 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 	/**
 	 * 分页列表查询
 	 *
-	 * @param onlCgformTag
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
 	 * @return
 	 */
 	@AutoLog(value = "标签管理-分页列表查询")
 	@ApiOperation(value="标签管理-分页列表查询", notes="标签管理-分页列表查询")
-	@GetMapping(value = "/page")
+	@PostMapping(value = "/page")
-	public Result<?> queryPageList(@RequestParam(name = "cut") String cut,
+	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
+		QueryWrapper<OnlCgformTag> queryWrapper=new QueryWrapper<>();
+		IPage<OnlCgformTag> pageList= onlCgformTagService.queryPageList(params);
+		return  Result.OK(pageList);
+	}
+	/*public Result<?> queryPageList(@RequestParam(name = "cut") String cut,
 								   OnlCgformTag onlCgformTag,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -84,32 +82,9 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 		} else {
 			list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName()));
 			list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));
-
-		/*	String mid = String.valueOf(pageSize);
-			JSONArray json = JSONArray.parseArray(mid);
-			List<OnlCgformTag> aList = json.toJavaList(OnlCgformTag.class);*/
-			//IPage p= (IPage) list;//list.addAll(aList)
 			return Result.OK(list);
 		}
-	}
+	}*/
-/*
-*	//中英切换-属性类型列+展示区域列
-		List<Map<String, Object>> pageList = onlCgformTagService.selectPageInfo(page, queryWrapper);
-
-		if (CutEnum.CN.getValue().equals(cut)) {
-			return Result.OK(pageList);
-		} else {
-			JSONArray jsonArray = new JSONArray();
-			jsonArray.addAll(pageList);
-
-			String reset=LineHumpUtil.humpToLine2(jsonArray.toString());
-			JSONArray jsonArray2= JSONArray.parseArray(reset);
-			List<OnlCgformTag> list = jsonArray2.toJavaList(OnlCgformTag.class);
-
-			list.stream().forEach(f -> f.setFieldShowType(f.getFieldShowTypeEnName()));
-			list.stream().forEach(s->s.setShowArea(s.getShowAreaEnName()));
-			return Result.OK(list);
-		}*/
 	/**
 	 * 表头中英文切换
 	 *

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java

@@ -1,11 +1,10 @@
 package com.jero.modules.tag.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.modules.tag.entity.OnlCgformTag;
 import org.apache.ibatis.annotations.Select;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Map;
 
@@ -26,7 +25,9 @@ public interface OnlCgformTagMapper extends BaseMapper<OnlCgformTag> {
             "from onl_cgform_field as f \n" +
             "left join sys_dict_item as i on f.field_show_type=i.item_value\n" +
             "left join onl_cgform_area as a on f.show_area=a.id\n" +
+            "order by f.create_time desc\n" +
             "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\" \n" +
             "and i.dict_id=1493098515761917954 order by f.create_time desc\n")
-    IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
+    IPage<OnlCgformTag> queryPageList(IPage page,@Param("params") Map<String, Object> params);
+//IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java

@@ -1,7 +1,6 @@
 package com.jero.modules.tag.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.entity.OnlCgformTag;
@@ -58,6 +57,8 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
 	OnlCgformTag queryById(String id);
 
 
+	IPage<OnlCgformTag> queryPageList(Map<String, Object> params);
+
 	/**
 	 * 列表查询
 	 *
@@ -88,6 +89,6 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
 	 */
 	//List<Map<String,Object>> queryCondition(String flag,String cut);
 
-	List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
+	//List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java

@@ -1,11 +1,11 @@
 package com.jero.modules.tag.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
 import com.jero.modules.tag.entity.OnlCgformArea;
 import com.jero.modules.tag.entity.OnlCgformTag;
@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 标签管理
@@ -96,6 +95,24 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 		return getById(id);
 	}
 
+	@Override
+	public IPage<OnlCgformTag> queryPageList(Map<String, Object> params) {
+		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
+		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
+		IPage page = new Page(pageNo, pageSize);
+
+		//中英切换-属性类型+展示区域列
+		if (CutEnum.CN.getValue().equals(params.get("cut").toString())) {
+			IPage<OnlCgformTag> result = onlCgformTagMapper.queryPageList(page,params);
+			return result;
+		} else {
+			params.put("fieldShowType", params.get("fieldShowTypeEnName"));
+			params.put("showArea",params.get("showAreaEnName"));
+			IPage<OnlCgformTag> result = onlCgformTagMapper.queryPageList(page,params);
+			return result;
+		}
+
+	}
 
 	/**
 	 * 列表查询
@@ -241,10 +258,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 		return list;
 	}*/
 
-	@Override
+/*	@Override
 	public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper) {
 		IPage<Map<String, Object>> info= onlCgformTagMapper.selectPageInfo(page, queryWrapper);
 		List<Map<String, Object>> list = info.getRecords().stream().collect(Collectors.toList());
 		return list;
-	}
+	}*/
 }