重构

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStatController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
+import com.wwdz.ch.admin.service.AdminStatService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.admin.util.StatVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -27,20 +28,14 @@ public class AdminStatController {
 	private static final Logger logger = LoggerFactory.getLogger(AdminStatController.class);
 
 	@Autowired
-	private StatDao statDao;
+	private AdminStatService adminStatService;
 
 	@RequiresPermissions("admin:stat:user")
 	@RequiresPermissionsDesc(menu = { "统计管理", "用户统计" }, button = "查询")
 	@GetMapping("/user")
 	public Object statUser() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 统计管理->用户统计->查询");
-
-		List<Map> rows = statDao.statUser();
-		String[] columns = new String[] { "day", "users" };
-		StatVo statVo = new StatVo();
-		statVo.setColumns(columns);
-		statVo.setRows(rows);
-
+		StatVo statVo = adminStatService.statUser();
 		logger.info("【请求结束】统计管理->用户统计->查询,响应结果:{}", JSONObject.toJSONString(statVo));
 		return ResponseUtil.ok(statVo);
 	}
@@ -50,13 +45,7 @@ public class AdminStatController {
 	@GetMapping("/order")
 	public Object statOrder() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 统计管理->订单统计->查询");
-
-		List<Map> rows = statDao.statOrder();
-		String[] columns = new String[] { "day", "orders", "customers", "amount", "pcr" };
-		StatVo statVo = new StatVo();
-		statVo.setColumns(columns);
-		statVo.setRows(rows);
-
+		StatVo statVo = adminStatService.statOrder();
 		logger.info("【请求结束】统计管理->订单统计->查询,响应结果:{}", JSONObject.toJSONString(statVo));
 		return ResponseUtil.ok(statVo);
 	}
@@ -66,13 +55,7 @@ public class AdminStatController {
 	@GetMapping("/goods")
 	public Object statGoods() {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 统计管理->商品统计->查询");
-
-		List<Map> rows = statDao.statGoods();
-		String[] columns = new String[] { "day", "orders", "products", "amount" };
-		StatVo statVo = new StatVo();
-		statVo.setColumns(columns);
-		statVo.setRows(rows);
-
+		StatVo statVo = adminStatService.statGoods();
 		logger.info("【请求结束】统计管理->商品统计->查询,响应结果:{}", JSONObject.toJSONString(statVo));
 		return ResponseUtil.ok(statVo);
 	}

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/AdminStorageController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.admin.annotation.RequiresPermissionsDesc;
+import com.wwdz.ch.admin.service.AdminStorageService;
 import com.wwdz.ch.admin.service.UploadService;
 import com.wwdz.ch.admin.util.AuthSupport;
 import com.wwdz.ch.core.storage.StorageService;
@@ -40,7 +41,7 @@ public class AdminStorageController {
 	private StorageService storageService;
 
 	@Autowired
-	private DtsStorageDao dtsStorageDao;
+	private AdminStorageService adminStorageService;
 
 	@Autowired
 	UploadService uploadService;
@@ -53,13 +54,7 @@ public class AdminStorageController {
 			@Sort @RequestParam(defaultValue = "add_time") String sort,
 			@Order @RequestParam(defaultValue = "desc") String order) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->查询,请求参数,name:{},key:{},page:{}", name, key, page);
-
-		List<Storage> storageList = dtsStorageDao.querySelective(key, name, page, limit, sort, order);
-		long total = PageInfo.of(storageList).getTotal();
-		Map<String, Object> data = new HashMap<>();
-		data.put("total", total);
-		data.put("items", storageList);
-
+		Object data = adminStorageService.list(key, name, page, limit, sort, order);
 		logger.info("【请求结束】系统管理->对象存储->查询:响应结果:{}", JSONObject.toJSONString(data));
 		return ResponseUtil.ok(data);
 	}
@@ -88,14 +83,7 @@ public class AdminStorageController {
 	@PostMapping("/read")
 	public Object read(@NotNull Integer id) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->详情,请求参数,id:{}", id);
-
-		Storage storageInfo = dtsStorageDao.findById(id);
-		if (storageInfo == null) {
-			return ResponseUtil.badArgumentValue();
-		}
-
-		logger.info("【请求结束】系统管理->对象存储->详情:响应结果:{}", JSONObject.toJSONString(storageInfo));
-		return ResponseUtil.ok(storageInfo);
+		return adminStorageService.read(id);
 	}
 
 	@RequiresPermissions("admin:storage:update")
@@ -103,31 +91,16 @@ public class AdminStorageController {
 	@PostMapping("/update")
 	public Object update(@RequestBody Storage dtsStorage) {
 		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->编辑,请求参数:{}", JSONObject.toJSONString(dtsStorage));
+		return adminStorageService.update(dtsStorage);
 
-		if (dtsStorageDao.update(dtsStorage) == 0) {
-			logger.error("系统管理->对象存储->编辑 错误:{}", "更新数据失败!");
-			return ResponseUtil.updatedDataFailed();
-		}
-
-		logger.info("【请求结束】系统管理->对象存储->编辑:响应结果:{}", JSONObject.toJSONString(dtsStorage));
-		return ResponseUtil.ok(dtsStorage);
 	}
 
 	@RequiresPermissions("admin:storage:delete")
 	@RequiresPermissionsDesc(menu = { "系统管理", "对象存储" }, button = "删除")
 	@PostMapping("/delete")
-	public Object delete(@RequestBody Storage DtsStorage) {
-		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->删除,请求参数:{}", JSONObject.toJSONString(DtsStorage));
-
-		String key = DtsStorage.getKey();
-		if (StringUtils.isEmpty(key)) {
-			return ResponseUtil.badArgument();
-		}
-		dtsStorageDao.deleteByKey(key);
-		storageService.delete(key);
-
-		logger.info("【请求结束】系统管理->对象存储->删除:响应结果:{}", "成功!");
-		return ResponseUtil.ok();
+	public Object delete(@RequestBody Storage storage) {
+		logger.info("【请求开始】操作人:[" + AuthSupport.userName()+ "] 系统管理->对象存储->删除,请求参数:{}", JSONObject.toJSONString(storage));
+		return adminStorageService.delete(storage);
 	}
 
 	@RequiresPermissions("admin:storage:uploadBase64")

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminStatServiceImpl.java

+package com.wwdz.ch.admin.impl;
+
+import com.wwdz.ch.admin.service.AdminStatService;
+import com.wwdz.ch.admin.util.StatVo;
+import com.wwdz.ch.db.dao.StatDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AdminStatServiceImpl implements AdminStatService {
+	private static final Logger logger = LoggerFactory.getLogger(AdminStatServiceImpl.class);
+
+	@Autowired
+	private StatDao statDao;
+
+
+	@Override
+	public StatVo statUser() {
+		List<Map> rows = statDao.statUser();
+		String[] columns = new String[] { "day", "users" };
+		StatVo statVo = new StatVo();
+		statVo.setColumns(columns);
+		statVo.setRows(rows);
+		return statVo;
+	}
+
+
+	@Override
+	public StatVo statOrder() {
+		List<Map> rows = statDao.statOrder();
+		String[] columns = new String[] { "day", "orders", "customers", "amount", "pcr" };
+		StatVo statVo = new StatVo();
+		statVo.setColumns(columns);
+		statVo.setRows(rows);
+		return statVo;
+	}
+
+
+	@Override
+	public StatVo statGoods() {
+		List<Map> rows = statDao.statGoods();
+		String[] columns = new String[] { "day", "orders", "products", "amount" };
+		StatVo statVo = new StatVo();
+		statVo.setColumns(columns);
+		statVo.setRows(rows);
+		return statVo;
+	}
+
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/AdminStorageServiceImpl.java

+package com.wwdz.ch.admin.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.admin.service.AdminStorageService;
+import com.wwdz.ch.admin.service.UploadService;
+import com.wwdz.ch.core.storage.StorageService;
+import com.wwdz.ch.core.util.ResponseUtil;
+import com.wwdz.ch.db.dao.dts.DtsStorageDao;
+import com.wwdz.ch.db.domain.Storage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import javax.validation.constraints.NotNull;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class AdminStorageServiceImpl implements AdminStorageService {
+	private static final Logger logger = LoggerFactory.getLogger(AdminStorageServiceImpl.class);
+
+	@Autowired
+	private StorageService storageService;
+
+	@Autowired
+	private DtsStorageDao dtsStorageDao;
+
+	@Autowired
+	UploadService uploadService;
+
+
+	@Override
+	public Object list(String key, String name, Integer page, Integer limit, String sort, String order){
+		List<Storage> storageList = dtsStorageDao.querySelective(key, name, page, limit, sort, order);
+		long total = PageInfo.of(storageList).getTotal();
+		Map<String, Object> data = new HashMap<>();
+		data.put("total", total);
+		data.put("items", storageList);
+		return data;
+	}
+
+
+	@Override
+	public Object read(@NotNull Integer id) {
+		try {
+			Storage storageInfo = dtsStorageDao.findById(id);
+			if (storageInfo == null) {
+				return ResponseUtil.badArgumentValue();
+			}
+
+			logger.info("【请求结束】系统管理->对象存储->详情:响应结果:{}", JSONObject.toJSONString(storageInfo));
+			return ResponseUtil.ok(storageInfo);
+		} catch (Exception e) {
+			logger.error("系统管理->对象存储->详情 error:{}", e);
+		}
+		return ResponseUtil.fail();
+	}
+
+	@Override
+	public Object update(Storage dtsStorage) {
+		try {
+			if (dtsStorageDao.update(dtsStorage) == 0) {
+				logger.error("系统管理->对象存储->编辑 错误:{}", "更新数据失败!");
+				return ResponseUtil.updatedDataFailed();
+			}
+			logger.info("【请求结束】系统管理->对象存储->编辑:响应结果:{}", JSONObject.toJSONString(dtsStorage));
+			return ResponseUtil.ok(dtsStorage);
+		} catch (Exception e) {
+			logger.error("系统管理->对象存储->编辑 error:{}", e);
+		}
+		return ResponseUtil.fail();
+	}
+
+
+	@Override
+	public Object delete(Storage DtsStorage) {
+		try {
+			String key = DtsStorage.getKey();
+			if (StringUtils.isEmpty(key)) {
+				return ResponseUtil.badArgument();
+			}
+			dtsStorageDao.deleteByKey(key);
+			storageService.delete(key);
+			logger.info("【请求结束】系统管理->对象存储->删除:响应结果:{}", "成功!");
+			return ResponseUtil.ok();
+		} catch (Exception e) {
+			logger.error("系统管理->对象存储->编辑 error:{}", e);
+		}
+		return ResponseUtil.fail();
+	}
+
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminStatService.java

+package com.wwdz.ch.admin.service;
+
+import com.wwdz.ch.admin.util.StatVo;
+
+public interface AdminStatService {
+    StatVo statUser();
+
+    StatVo statOrder();
+
+    StatVo statGoods();
+}

ch-admin-api/src/main/java/com/wwdz/ch/admin/service/AdminStorageService.java

+package com.wwdz.ch.admin.service;
+
+import com.wwdz.ch.db.domain.Storage;
+
+import javax.validation.constraints.NotNull;
+
+public interface AdminStorageService {
+    Object list(String key, String name, Integer page, Integer limit, String sort, String order);
+
+    Object read(@NotNull Integer id);
+
+    Object update(Storage dtsStorage);
+
+    Object delete(Storage DtsStorage);
+}