首页图标

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java

@@ -1,25 +1,35 @@
 package com.jero.modules.home.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import com.jero.common.api.vo.Result;
-import com.jero.common.system.query.QueryGenerator;
-import com.jero.modules.home.entity.HomeFunctionModuleEO;
-import com.jero.modules.home.service.IHomeFunctionModuleEOService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.base.controller.JeroController;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.jero.common.system.query.QueryGenerator;
-import org.springframework.validation.annotation.Validated;
+import com.jero.modules.home.entity.HomeFunctionModuleEO;
-import org.springframework.web.bind.annotation.*;
+import com.jero.modules.home.service.IHomeFunctionModuleEOService;
-import org.springframework.web.servlet.ModelAndView;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
 
 
  /**
@@ -74,14 +84,14 @@ public class HomeFunctionModuleEOController extends JeroController<HomeFunctionM
 	/**
 	 *   添加
 	 *   state = 1为选中的图表,state = 2为未选择的图表
-	 * @param homeFunctionModuleEOList
+	 * @param listMap
 	 * @return
 	 */
 	@AutoLog(value = "功能模块-添加")
 	@ApiOperation(value="功能模块-添加", notes="功能模块-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@Validated @RequestBody List<HomeFunctionModuleEO> homeFunctionModuleEOList) {
+	public Result<?> add(@RequestBody JSONObject listMap) {
-		homeFunctionModuleEOService.add(homeFunctionModuleEOList);
+		homeFunctionModuleEOService.add(listMap);
 		return Result.OK("添加成功！");
 	}
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java

@@ -2,6 +2,8 @@ package com.jero.modules.home.service;
 
 import com.jero.modules.home.entity.HomeFunctionModuleEO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.List;
 
 /**
@@ -15,10 +17,10 @@ public interface IHomeFunctionModuleEOService extends IService<HomeFunctionModul
 	/**
 	 * 保存
 	 *
-	 * @param homeFunctionModuleEOList
+	 * @param listMap
 	 * @return
 	 */
-    void add(List<HomeFunctionModuleEO> homeFunctionModuleEOList);
+    void add(JSONObject listMap);
 
 	/**
 	 * 更新

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java

@@ -1,15 +1,21 @@
 package com.jero.modules.home.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.home.entity.HomeFunctionModuleEO;
 import com.jero.modules.home.mapper.HomeFunctionModuleEOMapper;
 import com.jero.modules.home.service.IHomeFunctionModuleEOService;
+
+import com.alibaba.fastjson.JSONObject;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.stereotype.Service;
-import java.util.List;
+
 import java.util.Date;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 /**
  * @Description: 功能模块
@@ -23,17 +29,22 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl<HomeFunctionMod
 	/**
 	 * 保存
 	 *
-	 * @param homeFunctionModuleEOList
+	 * @param listMap
 	 * @return
 	 */
 	@Override
-    public void add(List<HomeFunctionModuleEO> homeFunctionModuleEOList) {
+    public void add(JSONObject listMap) {
+		List<Map<String, Object>> mapList = (List<Map<String, Object>>) listMap.get("listMap");
+		List<HomeFunctionModuleEO> homeFunctionModuleEOS = JSONObject.parseArray(JSON.toJSONString(mapList), HomeFunctionModuleEO.class);
 		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		//先删除在添加
 		LambdaQueryWrapper<HomeFunctionModuleEO> wrapper = new LambdaQueryWrapper<>();
 		wrapper.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername());
 		this.remove(wrapper);
-        this.saveBatch(homeFunctionModuleEOList);
+		for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) {
+			homeFunctionModuleEO.setId(UUID.randomUUID().toString().replace("-", ""));
+		}
+		this.saveBatch(homeFunctionModuleEOS);
     }
 
 	/**