From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/demo/controller/DemoOperateController.java | 83 +++++++----------------------------------
1 files changed, 15 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/ots/project/demo/controller/DemoOperateController.java b/src/main/java/com/ots/project/demo/controller/DemoOperateController.java
index 69e7369..ae320d2 100644
--- a/src/main/java/com/ots/project/demo/controller/DemoOperateController.java
+++ b/src/main/java/com/ots/project/demo/controller/DemoOperateController.java
@@ -1,5 +1,4 @@
package com.ots.project.demo.controller;
-
import com.ots.common.exception.BusinessException;
import com.ots.common.utils.StringUtils;
import com.ots.common.utils.poi.ExcelUtil;
@@ -14,24 +13,16 @@
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-/**
- * 鎿嶄綔鎺у埗
- *
- * @author ots
- */
@Controller
@RequestMapping("/demo/operate")
public class DemoOperateController extends BaseController {
private String prefix = "demo/operate";
-
private final static Map<Integer, UserOperateModel> users = new LinkedHashMap<Integer, UserOperateModel>();
-
{
users.put(1, new UserOperateModel(1, "1000001", "娴嬭瘯1", "0", "15888888888", "ry@qq.com", 150.0, "0"));
users.put(2, new UserOperateModel(2, "1000002", "娴嬭瘯2", "1", "15666666666", "ry@qq.com", 180.0, "1"));
@@ -60,32 +51,23 @@
users.put(25, new UserOperateModel(25, "1000025", "娴嬭瘯25", "1", "15666666666", "ry@qq.com", 250.0, "1"));
users.put(26, new UserOperateModel(26, "1000026", "娴嬭瘯26", "1", "15666666666", "ry@qq.com", 250.0, "1"));
}
-
- /**
- * 琛ㄦ牸
- */
+
@GetMapping("/table")
public String table() {
return prefix + "/table";
}
-
- /**
- * 鍏朵粬
- */
+
@GetMapping("/other")
public String other() {
return prefix + "/other";
}
-
- /**
- * 鏌ヨ鏁版嵁
- */
+
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(UserOperateModel userModel) {
TableDataInfo rspData = new TableDataInfo();
List<UserOperateModel> userList = new ArrayList<UserOperateModel>(users.values());
- // 鏌ヨ鏉′欢杩囨护
+
if (StringUtils.isNotEmpty(userModel.getSearchValue())) {
userList.clear();
for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet()) {
@@ -109,18 +91,12 @@
rspData.setTotal(userList.size());
return rspData;
}
-
- /**
- * 鏂板鐢ㄦ埛
- */
+
@GetMapping("/add")
public String add(ModelMap mmap) {
return prefix + "/add";
}
-
- /**
- * 鏂板淇濆瓨鐢ㄦ埛
- */
+
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(UserOperateModel user) {
@@ -128,28 +104,19 @@
user.setUserId(userId);
return AjaxResult.success(users.put(userId, user));
}
-
- /**
- * 淇敼鐢ㄦ埛
- */
+
@GetMapping("/edit/{userId}")
public String edit(@PathVariable("userId") Integer userId, ModelMap mmap) {
mmap.put("user", users.get(userId));
return prefix + "/edit";
}
-
- /**
- * 淇敼淇濆瓨鐢ㄦ埛
- */
+
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(UserOperateModel user) {
return AjaxResult.success(users.put(user.getUserId(), user));
}
-
- /**
- * 瀵煎嚭
- */
+
@PostMapping("/export")
@ResponseBody
public AjaxResult export(UserOperateModel user) {
@@ -157,20 +124,14 @@
ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
return util.exportExcel(list, "鐢ㄦ埛鏁版嵁");
}
-
- /**
- * 涓嬭浇妯℃澘
- */
+
@GetMapping("/importTemplate")
@ResponseBody
public AjaxResult importTemplate() {
ExcelUtil<UserOperateModel> util = new ExcelUtil<UserOperateModel>(UserOperateModel.class);
return util.importTemplateExcel("鐢ㄦ埛鏁版嵁");
}
-
- /**
- * 瀵煎叆鏁版嵁
- */
+
@PostMapping("/importData")
@ResponseBody
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
@@ -179,10 +140,7 @@
String message = importUser(userList, updateSupport);
return AjaxResult.success(message);
}
-
- /**
- * 鍒犻櫎鐢ㄦ埛
- */
+
@PostMapping("/remove")
@ResponseBody
public AjaxResult remove(String ids) {
@@ -192,30 +150,19 @@
}
return AjaxResult.success();
}
-
- /**
- * 鏌ョ湅璇︾粏
- */
+
@GetMapping("/detail/{userId}")
public String detail(@PathVariable("userId") Integer userId, ModelMap mmap) {
mmap.put("user", users.get(userId));
return prefix + "/detail";
}
-
@PostMapping("/clean")
@ResponseBody
public AjaxResult clean() {
users.clear();
return success();
}
-
- /**
- * 瀵煎叆鐢ㄦ埛鏁版嵁
- *
- * @param userList 鐢ㄦ埛鏁版嵁鍒楄〃
- * @param isUpdateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
- * @return 缁撴灉
- */
+
public String importUser(List<UserOperateModel> userList, Boolean isUpdateSupport) {
if (StringUtils.isNull(userList) || userList.size() == 0) {
throw new BusinessException("Import user data cannot be empty锛�");
@@ -226,7 +173,7 @@
StringBuilder failureMsg = new StringBuilder();
for (UserOperateModel user : userList) {
try {
- // 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
+
boolean userFlag = false;
for (Map.Entry<Integer, UserOperateModel> entry : users.entrySet()) {
if (entry.getValue().getUserName().equals(user.getUserName())) {
--
Gitblit v1.9.1