From 67f846e804b36af6e361ebd11c816dfcc2286f4f Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 26 二月 2024 02:08:47 +0800
Subject: [PATCH] 架构搭建
---
user-server/src/main/resources/mapper/EnumMapper.xml | 34 ++++
user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java | 22 +++
framework/src/main/java/com/yuanchu/mom/common/AllController.java | 4
framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java | 4
system-run/src/main/resources/application-prod.yml | 2
user-server/src/main/java/com/yuanchu/mom/service/EnumService.java | 24 +++
pom.xml | 5
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 2
system-run/src/main/resources/application-dev.yml | 4
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 6
/dev/null | 20 --
user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 12 -
user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java | 6
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 2
user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java | 85 +++---------
user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java | 74 ++++++++++
user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java | 59 ++++++++
system-run/pom.xml | 6
18 files changed, 260 insertions(+), 111 deletions(-)
diff --git a/data-server/pom.xml b/data-server/pom.xml
deleted file mode 100644
index f0dfcfb..0000000
--- a/data-server/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>mom</artifactId>
- <groupId>com.yuanchu.mom</groupId>
- <version>1.0.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>data-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <name>data-server</name>
- <description>data-server</description>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>framework</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/data-server/src/main/java/com/yuanchu/mom/Main.java b/data-server/src/main/java/com/yuanchu/mom/Main.java
deleted file mode 100644
index de0dfc5..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/Main.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.yuanchu.mom;
-
-public class Main {
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
\ No newline at end of file
diff --git a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java b/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
deleted file mode 100644
index 2aa2035..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/controller/DataReportingController.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ResourceUtil;
-import cn.hutool.core.text.csv.CsvData;
-import cn.hutool.core.text.csv.CsvReader;
-import cn.hutool.core.text.csv.CsvRow;
-import cn.hutool.core.text.csv.CsvUtil;
-import cn.hutool.core.util.CharsetUtil;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.dto.*;
-import com.yuanchu.mom.exception.ErrorException;
-import com.yuanchu.mom.pojo.DataReporting;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.pojo.FinanceSubmit;
-import com.yuanchu.mom.service.DataReportingService;
-import com.yuanchu.mom.service.FansSubmitService;
-import com.yuanchu.mom.service.FinanceSubmitService;
-import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.apache.tomcat.util.http.fileupload.FileUtils;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.math.BigDecimal;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-@RequestMapping("/dataReporting")
-@RestController
-@Api(tags = "鏁版嵁涓婃姤妯″潡")
-@AllArgsConstructor
-public class DataReportingController {
-
- private DataReportingService dataReportingService;
-
- private FansSubmitService fansSubmitService;
-
- private FinanceSubmitService financeSubmitService;
-
- @ApiOperation(value = "鑾峰彇鏁版嵁涓婃姤鍒楄〃")
- @PostMapping("/selectDataReportingList")
- public Result selectDataReportingList(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- DataReportingPageDto dataReportingPageDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), DataReportingPageDto.class);
- return Result.success(dataReportingService.selectDataReportingList(page, dataReportingPageDto));
- }
-
- @ApiOperation(value = "淇敼鏁版嵁涓婃姤")
- @PostMapping("/upDataReporting")
- public Result upDataReporting(@RequestBody DataReporting dataReporting) {
- return Result.success(dataReportingService.updateDataReporting(dataReporting));
- }
-
- @ApiOperation(value = "鍒犻櫎鏁版嵁涓婃姤淇℃伅")
- @PostMapping("/delDataReporting")
- public Result delDataReporting(Integer id) {
- return Result.success(dataReportingService.delDataReporting(id));
- }
-
- @ApiOperation(value = "鑾峰彇椤圭洰姹囨�诲垪琛�")
- @PostMapping("/selectProductCountDtoPageList")
- public Result selectProductCountDtoPageList(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- ProductCountDto productCountDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), ProductCountDto.class);
- return Result.success(dataReportingService.selectProductCountDtoPageList(page, productCountDto));
- }
-
- @ApiOperation(value = "鑾峰彇鐧昏浜烘眹鎬诲垪琛�")
- @PostMapping("/selectRegistrantCountDtoPageList")
- public Result selectRegistrantCountDtoPageList(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- RegistrantCountDto registrantCountDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), RegistrantCountDto.class);
- return Result.success(dataReportingService.selectRegistrantCountDtoPageList(page, registrantCountDto));
- }
-
- @ApiOperation(value = "鑾峰彇杩涚矇涓婃姤鍒楄〃")
- @PostMapping("/selectFansSubmitList")
- public Result selectFansSubmitList(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- FansSubmit fansSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FansSubmit.class);
- return Result.success(fansSubmitService.selectFansSubmitList(page, fansSubmit));
- }
-
- @ApiOperation(value = "鍒犻櫎杩涚矇涓婃姤鍒楄〃")
- @PostMapping("/delFansSubmit")
- public Result delFansSubmit(Integer id) {
- return Result.success(fansSubmitService.delFansSubmit(id));
- }
-
- @ApiOperation(value = "淇敼杩涚矇涓婃姤淇℃伅")
- @PostMapping("/updateFansSubmit")
- public Result<?> updateFansSubmit(@RequestBody FansSubmit fansSubmit) {
- return Result.success(fansSubmitService.updateFansSubmit(fansSubmit));
- }
-
- @ApiOperation(value = "娣诲姞杩涚矇涓婃姤淇℃伅")
- @PostMapping("/addFansSubmit")
- public Result<?> addFansSubmit(@RequestBody FansSubmit fansSubmit) {
- return Result.success(fansSubmitService.addFansSubmit(fansSubmit, null));
- }
-
- @ApiOperation(value = "鑾峰彇璐㈠姟涓婃姤鍒楄〃")
- @PostMapping("/selectFinanceSubmitList")
- public Result selectFinanceSubmitList(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- FinanceSubmit financeSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FinanceSubmit.class);
- return Result.success(financeSubmitService.selectFinanceSubmitList(page, financeSubmit));
- }
-
- @ApiOperation(value = "鍒犻櫎璐㈠姟涓婃姤鍒楄〃")
- @PostMapping("/delFinanceSubmit")
- public Result delFinanceSubmit(Integer id) {
- return Result.success(financeSubmitService.delFinanceSubmit(id));
- }
-
- @ApiOperation(value = "淇敼璐㈠姟涓婃姤淇℃伅")
- @PostMapping("/updateFinanceSubmit")
- public Result<?> updateFinanceSubmit(@RequestBody FinanceSubmit financeSubmit) {
- return Result.success(financeSubmitService.updateFinanceSubmit(financeSubmit));
- }
-
- @ApiOperation(value = "娣诲姞璐㈠姟涓婃姤淇℃伅")
- @PostMapping("/addFinanceSubmit")
- public Result<?> addFinanceSubmit(@RequestBody FinanceSubmit financeSubmit, String date) {
- return Result.success(financeSubmitService.addFinanceSubmit(financeSubmit, date));
- }
-
- @ValueAuth
- @ApiOperation(value = "鑾峰彇棣栭〉鏁版嵁")
- @GetMapping("/getDataList")
- public Result<?> getDataList() {
- return Result.success(dataReportingService.getDataList());
- }
-
- @ApiOperation(value = "瀵煎叆鏁版嵁涓婃姤鍒楄〃")
- @PostMapping("/inputCsv")
- public Result<?> inputCsv(@RequestParam("file") MultipartFile file) throws IOException {
- CsvReader reader = CsvUtil.getReader();
- CsvData data = reader.read(new InputStreamReader(file.getInputStream(), "GB2312"));
- List<CsvRow> rows = data.getRows();
- List<DataReporting> list = new ArrayList<>();
- String format;
- try {
- format = new SimpleDateFormat("yyyy-MM-dd").format(new SimpleDateFormat("yyyyMMdd").parse(rows.get(2).get(0).split("锛�")[1]));
- } catch (ParseException e) {
- e.printStackTrace();
- throw new ErrorException("鏂囦欢涓棩鏈熷湪杞崲鏃跺嚭鐜伴敊璇�");
- }
- for (int i = 6; i < rows.size(); i++) {
- DataReporting reporting = new DataReporting();
- for (int i1 = 0; i1 < rows.get(5).size(); i1++) {
- String str = rows.get(i).get(i1);
- if (str == null) continue;
- switch (rows.get(5).get(i1)) {
- case "璐︽埛":
- reporting.setName(str);
- break;
- case "澶囨敞":
- String[] split = str.split("-");
- if (split.length == 4) {
- reporting.setName2(split[0]);
- reporting.setChannel(split[1]);
- reporting.setAgent(split[2]);
- reporting.setProduct(split[3]);
- break;
- }
- reporting.setProduct(str);
- break;
- case "灞曠幇閲�":
- reporting.setShowNum(Integer.parseInt(str));
- break;
- case "鐐瑰嚮閲�":
- reporting.setClick(Integer.parseInt(str));
- break;
- case "娑堣垂":
- reporting.setAccountConsumption(new BigDecimal(str));
- break;
- }
- }
- list.add(reporting);
- }
- dataReportingService.addDataReporting(list, format);
- return Result.success();
- }
-
- @ApiOperation(value = "鏂板鏁版嵁涓婃姤")
- @PostMapping("/addDataReporting")
- public Result<?> addDataReporting(@RequestBody DataReporting dataReporting) {
- ArrayList<DataReporting> list = new ArrayList<>();
- list.add(dataReporting);
- dataReportingService.addDataReporting(list, null);
- return Result.success();
- }
-
- @ApiOperation(value = "瀵煎嚭鏁版嵁涓婃姤鍒楄〃")
- @PostMapping("/downDataReportingFile")
- public Result downDataReportingFile(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- DataReportingPageDto dataReportingPageDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), DataReportingPageDto.class);
- return Result.success("瀵煎嚭鎴愬姛", dataReportingService.downDataReportingFile(page, dataReportingPageDto));
- }
-
- @ApiOperation(value = "瀵煎嚭椤圭洰鏁版嵁缁熻鍒楄〃")
- @PostMapping("/downProductCountFile")
- public Result downProductCountFile(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- ProductCountDto productCountDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), ProductCountDto.class);
- return Result.success("瀵煎嚭鎴愬姛", dataReportingService.downProductCountFile(page, productCountDto));
- }
-
- @ApiOperation(value = "瀵煎嚭鍛樺伐鏁版嵁缁熻鍒楄〃")
- @PostMapping("/downRegistrantCountFile")
- public Result downRegistrantCountFile(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- RegistrantCountDto registrantCountDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), RegistrantCountDto.class);
- return Result.success("瀵煎嚭鎴愬姛", dataReportingService.downRegistrantCountFile(page, registrantCountDto));
- }
-
- @ApiOperation(value = "瀵煎嚭杩涚矇涓婃姤鍒楄〃")
- @PostMapping("/downFansSubmitFile")
- public Result downFansSubmitFile(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- FansSubmit fansSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FansSubmit.class);
- return Result.success("瀵煎嚭鎴愬姛", dataReportingService.downFansSubmitFile(page, fansSubmit));
- }
-
- @ApiOperation(value = "瀵煎叆杩涚矇涓婃姤鍒楄〃")
- @PostMapping("/inputFansSubmitCsv")
- public Result<?> inputFansSubmitCsv(@RequestParam("file") MultipartFile file) throws IOException {
- CsvReader reader = CsvUtil.getReader();
- CsvData data = reader.read(new InputStreamReader(file.getInputStream(), "GB2312"));
- List<CsvRow> rows = data.getRows();
- String format;
- try {
- format = new SimpleDateFormat("yyyy-MM-dd").format(new SimpleDateFormat("yyyyMMdd").parse(rows.get(2).get(0).split("锛�")[1]));
- } catch (ParseException e) {
- throw new ErrorException("鏂囦欢涓棩鏈熷湪杞崲鏃跺嚭鐜伴敊璇�");
- }
- for (int i = 6; i < rows.size(); i++) {
- FansSubmit fansSubmit = new FansSubmit();
- for (int i1 = 0; i1 < rows.get(5).size(); i1++) {
- String str = rows.get(i).get(i1);
- if (str == null) continue;
- switch (rows.get(5).get(i1)) {
- case "瀹㈡埛":
- fansSubmit.setCustom(str);
- break;
- case "椤圭洰":
- fansSubmit.setProduct(str);
- break;
- case "寰俊鍙�":
- fansSubmit.setVx(str);
- break;
- case "杩涚矇":
- fansSubmit.setFansAdd(Integer.parseInt(str));
- break;
- }
- }
- fansSubmitService.addFansSubmit(fansSubmit, format);
- }
- return Result.success();
- }
-
- @ApiOperation(value = "鑾峰彇鏁版嵁瀵规瘮鍒楄〃")
- @PostMapping("/selectDataComparisonDtoPageList")
- public Result selectDataComparisonDtoPageList(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- DataComparisonDto dataComparisonDto = JSON.parseObject(JSON.toJSONString(data.get("entity")), DataComparisonDto.class);
- Map<String, Object> stringObjectMap = dataReportingService.selectDataComparisonDtoPageList(page, dataComparisonDto);
- return Result.success(stringObjectMap);
- }
-
- @ApiOperation(value = "瀵煎嚭璐㈠姟涓婃姤鍒楄〃")
- @PostMapping("/downFinanceSubmitFile")
- public Result downFinanceSubmitFile(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- FinanceSubmit financeSubmit = JSON.parseObject(JSON.toJSONString(data.get("entity")), FinanceSubmit.class);
- return Result.success("瀵煎嚭鎴愬姛", dataReportingService.downFinanceSubmitFile(page, financeSubmit));
- }
-
- @ApiOperation(value = "瀵煎叆璐㈠姟涓婃姤鍒楄〃")
- @PostMapping("/inputFinanceSubmitCsv")
- public Result<?> inputFinanceSubmitCsv(@RequestParam("file") MultipartFile file) throws IOException {
- CsvReader reader = CsvUtil.getReader();
- CsvData data = reader.read(new InputStreamReader(file.getInputStream(), "GB2312"));
- List<CsvRow> rows = data.getRows();
- String format;
- try {
- format = new SimpleDateFormat("yyyy-MM-dd").format(new SimpleDateFormat("yyyyMMdd").parse(rows.get(2).get(0).split("锛�")[1]));
- } catch (ParseException e) {
- throw new ErrorException("鏂囦欢涓棩鏈熷湪杞崲鏃跺嚭鐜伴敊璇�");
- }
- for (int i = 6; i < rows.size(); i++) {
- FinanceSubmit financeSubmit = new FinanceSubmit();
- for (int i1 = 0; i1 < rows.get(5).size(); i1++) {
- String str = rows.get(i).get(i1);
- if (str == null) continue;
- switch (rows.get(5).get(i1)) {
- case "浠ｇ悊鍟�":
- financeSubmit.setCompany(str);
- break;
- case "璐︽埛鍚�":
- financeSubmit.setName(str);
- break;
- case "閲戦":
- try {
- financeSubmit.setConsumption(new BigDecimal(str));
- } catch (Exception e) {
- }
- break;
- case "浠ｇ悊杩旂偣":
- try {
- financeSubmit.setAgentRebate(new BigDecimal(str));
- } catch (Exception e) {
- }
- break;
- case "鎵撴浜烘皯甯�":
- try {
- financeSubmit.setMoney(new BigDecimal(str));
- } catch (Exception e) {
- }
- break;
- case "鍛樺伐杩旂偣":
- try {
- financeSubmit.setEmployeeRebate(new BigDecimal(str));
- } catch (Exception e) {
- }
- break;
- case "鍛樺伐杩旂偣浜烘皯甯�":
- try {
- financeSubmit.setEmployeeRebateMoney(new BigDecimal(str));
- } catch (Exception e) {
- }
- break;
- }
- }
- financeSubmitService.addFinanceSubmit(financeSubmit, format);
- }
- return Result.success();
- }
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java
deleted file mode 100644
index 3b72388..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/dto/DataComparisonDto.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * @Author 鎴村崜
- * @Date 2024/1/8
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DataComparisonDto {
-
- @ApiModelProperty("璐﹀彿")
- @ValueTableShow(1)
- private String account;
-
- @ApiModelProperty("璐︽埛鍚�")
- @ValueTableShow(2)
- private String name;
-
- @ApiModelProperty("璐︽埛娑堣垂閲戦")
- @ValueTableShow(3)
- private BigDecimal consumption;
-
- @ApiModelProperty("鐧昏鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- @ApiModelProperty("瀵规瘮鐨勮处鍙�")
- @ValueTableShow(5)
- private String comparisonAccount;
-
- @ApiModelProperty("瀵规瘮鐨勮处鎴峰悕")
- @ValueTableShow(6)
- private String comparisonName;
-
- @ApiModelProperty("瀵规瘮鐨勬秷璐归噾棰�")
- @ValueTableShow(7)
- private BigDecimal comparisonConsumption;
-
- @ApiModelProperty("瀵规瘮鐨勭櫥璁版椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime comparisonCreateTime;
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/DataReportingCsvDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/DataReportingCsvDto.java
deleted file mode 100644
index a97c873..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/dto/DataReportingCsvDto.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import cn.hutool.core.annotation.Alias;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = true)
-public class DataReportingCsvDto {
-
- @Alias("璐︽埛")
- private String name;
-
- @Alias("澶囨敞")
- private String remark;
-
- @Alias("灞曠幇閲�")
- private Integer show;
-
- @Alias("鐐瑰嚮閲�")
- private Integer click;
-
- @Alias("骞冲潎鐐瑰嚮浠锋牸")
- private BigDecimal avgPrice;
-
- @Alias("娑堣垂")
- private BigDecimal consumption;
-
- @Alias("鎼滅储鎺ㄥ箍浣欓")
- private BigDecimal searchBalance;
-
- @Alias("淇℃伅娴佹帹骞夸綑棰�")
- private BigDecimal infoBalance;
-
- @Alias("寰俊澶嶅埗鎸夐挳鐐瑰嚮閲�")
- private Double vxClick;
-
- @Alias("鐐瑰嚮鐜�")
- private String clickThroughRate;
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/DataReportingPageDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/DataReportingPageDto.java
deleted file mode 100644
index 0d68c56..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/dto/DataReportingPageDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import cn.hutool.core.annotation.Alias;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.pojo.DataReporting;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DataReportingPageDto extends DataReporting {
-
- @ValueTableShow(21)
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
- private String createUserName;
-
- @ValueTableShow(22)
- @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
- private String updateUserName;
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java
deleted file mode 100644
index 08d40d0..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/dto/ProductCountDto.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProductCountDto extends OrderBy implements Serializable {
-
- @ValueTableShow(1)
- @ApiModelProperty("鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- @ValueTableShow(2)
- @ApiModelProperty("椤圭洰")
- private String product;
-
- @ValueTableShow(3)
- @ApiModelProperty("娑堣垂")
- private BigDecimal consumption;
-
- @ValueTableShow(4)
- @ApiModelProperty("杩涚矇")
- private Integer fansAdd;
-
- @ValueTableShow(5)
- @ApiModelProperty("瀹㈡埛鎴愭湰")
- private BigDecimal customerCosts;
-
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
- private Integer createUser;
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java b/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
deleted file mode 100644
index 8b974fd..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/dto/RegistrantCountDto.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class RegistrantCountDto extends OrderBy implements Serializable {
-
- /**
- * 鐧昏浜�
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鐧昏浜�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(3)
- private String registrant;
- /**
- * 閮ㄩ棬
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("閮ㄩ棬")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(2)
- private String department;
- /**
- * 璐︽埛鍚�
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("璐︽埛鍚�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(5)
- private String name;
- /**
- * 椤圭洰
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(4)
- private String product;
- /**
- * 灞曠幇閲�
- */
- @ApiModelProperty("灞曠幇閲�")
- @ValueTableShow(6)
- private Integer showNum;
- /**
- * 鐐瑰嚮閲�
- */
- @ApiModelProperty("鐐瑰嚮閲�")
- @ValueTableShow(7)
- private Integer click;
- /**
- * 璐︽埛娑堣垂
- */
- @ApiModelProperty("璐︽埛娑堣垂")
- @ValueTableShow(8)
- private BigDecimal accountConsumption;
- /**
- * 瀹㈡埛杩旂偣娑堣垂
- */
- @ApiModelProperty("瀹㈡埛杩旂偣娑堣垂")
- @ValueTableShow(9)
- private BigDecimal rebateConsumption;
- /**
- * 娑堣垂
- */
- @ApiModelProperty("鎶ュ鎴锋秷璐�")
- @ValueTableShow(10)
- private BigDecimal rebateConsumption2;
- /**
- * 鎶樺悗娑堣垂
- */
- @ApiModelProperty("鎶樺悗娑堣垂")
- @ValueTableShow(11)
- private BigDecimal discountedConsumption;
- /**
- * 杩涚矇
- */
- @ApiModelProperty("杩涚矇")
- @ValueTableShow(12)
- private Integer fansAdd;
- /**
- * 瀹為檯鎴愭湰
- */
- @ApiModelProperty("瀹為檯鎴愭湰")
- @ValueTableShow(13)
- private BigDecimal actualCost;
- /**
- * 瀹㈡埛鎴愭湰
- */
- @ApiModelProperty("瀹㈡埛鎴愭湰")
- @ValueTableShow(14)
- private BigDecimal customerCosts;
- /**
- * 鍒╂鼎
- */
- @ApiModelProperty("鍒╂鼎")
- @ValueTableShow(15)
- private BigDecimal profit;
- /**
- * 浠ｇ悊杩旂偣
- */
- @ApiModelProperty("浠ｇ悊杩旂偣")
- @ValueTableShow(16)
- private BigDecimal agentRebate;
- /**
- * 瀹㈡埛杩旂偣
- */
- @ApiModelProperty("瀹㈡埛杩旂偣")
- @ValueTableShow(17)
- private BigDecimal customerRebate;
- /**
- * 澶囩敤瀛楁
- */
- @ApiModelProperty("澶囩敤瀛楁")
- @ValueTableShow(18)
- private BigDecimal remark;
- /**
- *
- */
- @ApiModelProperty("鐧昏鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("绯荤粺鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(1)
- private LocalDateTime updateTime;
-
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
- private Integer createUser;
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
deleted file mode 100644
index 5253b16..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/DataReportingMapper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.DataComparisonDto;
-import com.yuanchu.mom.dto.DataReportingPageDto;
-import com.yuanchu.mom.dto.ProductCountDto;
-import com.yuanchu.mom.dto.RegistrantCountDto;
-import com.yuanchu.mom.pojo.DataReporting;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恉ata_reporting(鏁版嵁涓婃姤)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2023-12-23 10:39:43
-* @Entity com.yuanchu.mom.pojo.DataReporting
-*/
-public interface DataReportingMapper extends BaseMapper<DataReporting> {
-
- IPage<DataReportingPageDto> selectDataReportingDtoPageList(IPage<DataReportingPageDto> page, QueryWrapper<DataReportingPageDto> ew);
-
- IPage<ProductCountDto> selectProductCountDtoPageList(IPage<ProductCountDto> page, QueryWrapper<ProductCountDto> ew);
-
- IPage<RegistrantCountDto> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, QueryWrapper<RegistrantCountDto> ew);
-
- Map<String, BigDecimal> getDataFor1();
-
- List<Map<String, String>> getDataFor2();
-
- List<Map<String, String>> getDataFor3();
-
- List<Map<String, String>> getDataFor4();
-
- List<Map<String, String>> getDataFor5();
-
- Map<String, String> selectUser(Integer userId);
-
- IPage<DataComparisonDto> selectDataComparisonDtoPageList(Page page, DataComparisonDto dataComparisonDto);
-}
-
-
-
-
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
deleted file mode 100644
index bbaba54..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/FansSubmitMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恌ans_sumbit(杩涚矇涓婃姤)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2023-12-25 00:36:16
-* @Entity com.yuanchu.mom.pojo.FansSumbit
-*/
-public interface FansSubmitMapper extends BaseMapper<FansSubmit> {
-
- IPage<FansSubmit> selectFansSubmitPageList(IPage<FansSubmit> page, QueryWrapper<FansSubmit> ew);
-
-}
-
-
-
-
diff --git a/data-server/src/main/java/com/yuanchu/mom/mapper/FinanceSubmitMapper.java b/data-server/src/main/java/com/yuanchu/mom/mapper/FinanceSubmitMapper.java
deleted file mode 100644
index e97bebf..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/mapper/FinanceSubmitMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.pojo.FinanceSubmit;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恌inance_submit銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2023-12-25 01:48:05
-* @Entity com.yuanchu.mom.pojo.FinanceSubmit
-*/
-public interface FinanceSubmitMapper extends BaseMapper<FinanceSubmit> {
-
- IPage<FinanceSubmit> selectFinanceSubmitPageList(IPage<FinanceSubmit> page, QueryWrapper<FinanceSubmit> ew);
-
-}
-
-
-
-
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java b/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
deleted file mode 100644
index ad81cb9..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/DataReporting.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import cn.hutool.core.annotation.Alias;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.hibernate.validator.constraints.Length;
-
-/**
-* 鏁版嵁涓婃姤
-* @TableName data_reporting
-*/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Accessors(chain = true)
-public class DataReporting extends OrderBy implements Serializable {
-
- /**
- *
- */
- @NotNull(message="[]涓嶈兘涓虹┖")
- @ApiModelProperty("涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
- /**
- * 鐧昏浜�
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鐧昏浜�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(1)
- private String registrant;
- /**
- * 閮ㄩ棬
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("閮ㄩ棬")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(2)
- private String department;
- /**
- * 璐︽埛鍚�
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("璐︽埛鍚�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(3)
- private String name;
-
- @ApiModelProperty("濮撳悕")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(4)
- private String name2;
-
- /**
- * 娓犻亾
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("娓犻亾")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(4)
- private String channel;
-
- @ApiModelProperty("浠ｇ悊鍟�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(4)
- private String agent;
-
- /**
- * 椤圭洰
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ValueTableShow(5)
- private String product;
- /**
- * 灞曠幇閲�
- */
- @ApiModelProperty("灞曠幇閲�")
- @ValueTableShow(6)
- private Integer showNum;
- /**
- * 鐐瑰嚮閲�
- */
- @ApiModelProperty("鐐瑰嚮閲�")
- @ValueTableShow(7)
- private Integer click;
- /**
- * 璐︽埛娑堣垂
- */
- @ApiModelProperty("璐︽埛娑堣垂")
- @ValueTableShow(8)
- private BigDecimal accountConsumption;
- /**
- * 瀹㈡埛杩旂偣娑堣垂
- */
- @ApiModelProperty("瀹㈡埛杩旂偣娑堣垂")
- @ValueTableShow(9)
- private BigDecimal rebateConsumption;
- /**
- * 娑堣垂
- */
- @ApiModelProperty("娑堣垂")
- @ValueTableShow(10)
- private BigDecimal consumption;
- /**
- * 鎶樺悗娑堣垂
- */
- @ApiModelProperty("鎶樺悗娑堣垂")
- @ValueTableShow(11)
- private BigDecimal discountedConsumption;
- /**
- * 杩涚矇
- */
- @ApiModelProperty("杩涚矇")
- @ValueTableShow(12)
- private Integer fansAdd;
- /**
- * 瀹為檯鎴愭湰
- */
- @ApiModelProperty("瀹為檯鎴愭湰")
- @ValueTableShow(13)
- private BigDecimal actualCost;
- /**
- * 鍐呴儴鎴愭湰
- */
- @ApiModelProperty("鍐呴儴鎴愭湰")
- @ValueTableShow(14)
- private BigDecimal internalCosts;
- /**
- * 瀹㈡埛鎴愭湰
- */
- @ApiModelProperty("瀹㈡埛鎴愭湰")
- @ValueTableShow(15)
- private BigDecimal customerCosts;
- /**
- * 鍒╂鼎
- */
- @ApiModelProperty("鍒╂鼎")
- @ValueTableShow(16)
- private BigDecimal profit;
- /**
- * 浠ｇ悊杩旂偣
- */
- @ApiModelProperty("鍛樺伐浠ｇ悊杩旂偣")
- @ValueTableShow(17)
- private BigDecimal agentRebate;
- /**
- * 瀹㈡埛杩旂偣
- */
- @ApiModelProperty("瀹㈡埛杩旂偣")
- @ValueTableShow(18)
- private BigDecimal customerRebate;
- /**
- * 澶囩敤瀛楁
- */
- @ApiModelProperty("鍋氳繘鏉�")
- @ValueTableShow(23)
- private BigDecimal remark;
- /**
- *
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(20)
- private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(21)
- private LocalDateTime updateTime;
- /**
- *
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
- /**
- *
- */
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鏇存柊鐢ㄦ埛")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
deleted file mode 100644
index f10dbb3..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FansSubmit.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-
-/**
- * 杩涚矇涓婃姤
- * @TableName fans_submit
- */
-@TableName(value ="fans_submit")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class FansSubmit extends OrderBy implements Serializable {
-
- /**
- * 涓婚敭
- */
- @NotNull(message="[涓婚敭]涓嶈兘涓虹┖")
- @ApiModelProperty("涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
- /**
- * 瀹㈡埛
- */
- @ValueTableShow(1)
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("瀹㈡埛")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String custom;
- /**
- * 椤圭洰
- */
- @ValueTableShow(2)
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String product;
- /**
- * 寰俊鍙�
- */
- @ValueTableShow(3)
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("寰俊鍙�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String vx;
- /**
- * 杩涚矇
- */
- @ValueTableShow(4)
- @ApiModelProperty("杩涚矇")
- private Integer fansAdd;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鐧昏鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(6)
- private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
- /**
- *
- */
- @ApiModelProperty("鐧昏浜篿d")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @ValueTableShow(5)
- @ApiModelProperty("鐧昏浜�")
- private String createUserName;
- /**
- *
- */
- @ApiModelProperty("鏇存柊鐢ㄦ埛")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- private Integer dataId;
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java b/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
deleted file mode 100644
index 20dfcec..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/pojo/FinanceSubmit.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
-
-/**
-*
-* @TableName finance_submit
-*/
-@TableName(value ="finance_submit")
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class FinanceSubmit extends OrderBy implements Serializable {
-
- /**
- * 涓婚敭
- */
- @NotNull(message="[涓婚敭]涓嶈兘涓虹┖")
- @ApiModelProperty("涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
- /**
- * 浠ｇ悊鍏徃
- */
- @ValueTableShow
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("浠ｇ悊鍟�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String company;
- /**
- * 璐︽埛鍚�
- */
- @ValueTableShow
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("璐︽埛鍚�")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String name;
- /**
- * 娑堣垂閲戦
- */
- @ValueTableShow
- @ApiModelProperty("閲戦")
- private BigDecimal consumption;
- /**
- * 浠ｇ悊杩旂偣
- */
- @ValueTableShow
- @ApiModelProperty("浠ｇ悊杩旂偣")
- private BigDecimal agentRebate;
- /**
- * 鎵撴浜烘皯甯�
- */
- @ValueTableShow
- @ApiModelProperty("鎵撴浜烘皯甯�")
- private BigDecimal money;
- /**
- * 鍛樺伐杩旂偣
- */
- @ValueTableShow
- @ApiModelProperty("鍛樺伐杩旂偣")
- private BigDecimal employeeRebate;
- /**
- * 鍛樺伐杩旂偣浜烘皯甯�
- */
- @ValueTableShow
- @ApiModelProperty("鍛樺伐杩旂偣浜烘皯甯�")
- private BigDecimal employeeRebateMoney;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鐧昏鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ValueTableShow(6)
- private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("绯荤粺鏃堕棿")
- @ValueTableShow(0)
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
- /**
- *
- */
- @ApiModelProperty("鐧昏浜篿d")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @ValueTableShow(5)
- @ApiModelProperty("鐧昏浜�")
- private String createUserName;
- /**
- *
- */
- @ApiModelProperty("鏇存柊鐢ㄦ埛id")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- private Integer dataId;
-
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java b/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
deleted file mode 100644
index 75e00b1..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/service/DataReportingService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.dto.DataComparisonDto;
-import com.yuanchu.mom.dto.DataReportingPageDto;
-import com.yuanchu.mom.dto.ProductCountDto;
-import com.yuanchu.mom.dto.RegistrantCountDto;
-import com.yuanchu.mom.pojo.DataReporting;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.pojo.FinanceSubmit;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恉ata_reporting(鏁版嵁涓婃姤)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2023-12-23 10:39:43
-*/
-public interface DataReportingService extends IService<DataReporting> {
-
- Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto);
-
- int updateDataReporting(DataReporting dataReporting);
-
- Map<String, Object> selectProductCountDtoPageList(IPage<ProductCountDto> page, ProductCountDto productCountDto);
-
- Map<String, Object> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, RegistrantCountDto registrantCountDto);
-
- Map<String, Object> getDataList();
-
- void addDataReporting(List<DataReporting> list, String date);
-
- Integer delDataReporting(Integer id);
-
- String downDataReportingFile(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto);
-
- String downProductCountFile(IPage<ProductCountDto> page, ProductCountDto productCountDto);
-
- String downRegistrantCountFile(IPage<RegistrantCountDto> page, RegistrantCountDto registrantCountDto);
-
- String downFansSubmitFile(IPage<FansSubmit> page, FansSubmit fansSubmit);
-
- Map<String, Object> selectDataComparisonDtoPageList(Page page, DataComparisonDto dataComparisonDto);
-
- String downFinanceSubmitFile(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit);
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java b/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
deleted file mode 100644
index d233e54..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/service/FansSubmitService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.dto.DataReportingPageDto;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恌ans_sumbit(杩涚矇涓婃姤)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2023-12-25 00:36:16
-*/
-public interface FansSubmitService extends IService<FansSubmit> {
-
- Map<String, Object> selectFansSubmitList(IPage<FansSubmit> page, FansSubmit fansSubmit);
-
- int delFansSubmit(Integer id);
-
- int updateFansSubmit(FansSubmit fansSubmit);
-
- int addFansSubmit(FansSubmit fansSubmit, String date);
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java b/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
deleted file mode 100644
index 935e6bb..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/service/FinanceSubmitService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.pojo.FinanceSubmit;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恌inance_submit銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2023-12-25 01:48:05
-*/
-public interface FinanceSubmitService extends IService<FinanceSubmit> {
-
- Map<String, Object> selectFinanceSubmitList(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit);
-
- int delFinanceSubmit(Integer id);
-
- int updateFinanceSubmit(FinanceSubmit financeSubmit);
-
- int addFinanceSubmit(FinanceSubmit financeSubmit, String date);
-
-}
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
deleted file mode 100644
index 3a1de81..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.file.FileReader;
-import cn.hutool.core.net.URLDecoder;
-import cn.hutool.core.text.csv.CsvUtil;
-import cn.hutool.core.text.csv.CsvWriter;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.DataComparisonDto;
-import com.yuanchu.mom.dto.DataReportingPageDto;
-import com.yuanchu.mom.dto.ProductCountDto;
-import com.yuanchu.mom.dto.RegistrantCountDto;
-import com.yuanchu.mom.mapper.FansSubmitMapper;
-import com.yuanchu.mom.pojo.DataReporting;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.pojo.FinanceSubmit;
-import com.yuanchu.mom.service.DataReportingService;
-import com.yuanchu.mom.mapper.DataReportingMapper;
-import com.yuanchu.mom.service.FansSubmitService;
-import com.yuanchu.mom.service.FinanceSubmitService;
-import com.yuanchu.mom.utils.Jwt;
-import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.utils.ServletUtils;
-import lombok.AllArgsConstructor;
-import org.apache.tomcat.util.http.fileupload.IOUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.io.*;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author Administrator
- * @description 閽堝琛ㄣ�恉ata_reporting(鏁版嵁涓婃姤)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
- * @createDate 2023-12-23 10:39:43
- */
-@Service
-public class DataReportingServiceImpl extends ServiceImpl<DataReportingMapper, DataReporting>
- implements DataReportingService {
-
- @Resource
- private DataReportingMapper dataReportingMapper;
-
- @Resource
- private GetLook getLook;
-
- @Value("${outPath}")
- private String outPath;
-
- @Resource
- private FansSubmitMapper fansSubmitMapper;
-
- @Resource
- private FansSubmitService fansSubmitService;
-
- @Resource
- private FinanceSubmitService financeSubmitService;
-
- @Override
- public Map<String, Object> selectDataReportingList(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
- Map<String, Object> map = new HashMap<>();
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectDataReportingList");
- if (map1.get("look") == 1) dataReportingPageDto.setCreateUser(map1.get("userId"));
- map.put("head", PrintChina.printChina(DataReportingPageDto.class));
- map.put("body", dataReportingMapper.selectDataReportingDtoPageList(page, QueryWrappers.queryWrappers(dataReportingPageDto)));
- return map;
- }
-
- @Override
- public int updateDataReporting(DataReporting dataReporting) {
- DataReporting dataReporting2 = new DataReporting();
- dataReporting2.setId(dataReporting.getId());
- dataReporting2.setInternalCosts(dataReporting.getInternalCosts());
- dataReporting2.setCustomerCosts(dataReporting.getCustomerCosts());
- dataReporting2.setCustomerRebate(dataReporting.getCustomerRebate());
- dataReporting2.setRemark(dataReporting.getRemark());
- try {
- dataReporting2.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP));
- } catch (Exception e) {
- }
- try {
- dataReporting2.setConsumption(dataReporting.getCustomerCosts().multiply(BigDecimal.valueOf(dataReporting.getFansAdd())));
- } catch (Exception e) {
- }
- try {
- dataReporting2.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- try {
- dataReporting2.setActualCost(dataReporting.getAccountConsumption().divide(new BigDecimal(dataReporting.getFansAdd()), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- try {
- dataReporting2.setProfit(dataReporting.getRebateConsumption().subtract(dataReporting.getConsumption()));
- }catch (Exception e){}
- return dataReportingMapper.updateById(dataReporting2);
- }
-
- @Override
- public Map<String, Object> selectProductCountDtoPageList(IPage<ProductCountDto> page, ProductCountDto productCountDto) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ProductCountDto.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectProductCountDtoPageList");
- if (map1.get("look") == 1) productCountDto.setCreateUser(map1.get("userId"));
- map.put("body", dataReportingMapper.selectProductCountDtoPageList(page, QueryWrappers.queryWrappers(productCountDto)));
- return map;
- }
-
- @Override
- public Map<String, Object> selectRegistrantCountDtoPageList(IPage<RegistrantCountDto> page, RegistrantCountDto registrantCountDto) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(RegistrantCountDto.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList");
- if (map1.get("look") == 1) registrantCountDto.setCreateUser(map1.get("userId"));
- map.put("body", dataReportingMapper.selectRegistrantCountDtoPageList(page, QueryWrappers.queryWrappers(registrantCountDto)));
- return map;
- }
-
- @Override
- public Map<String, Object> getDataList() {
- Map<String, Object> map = new HashMap<>();
- map.put("data1", dataReportingMapper.getDataFor1());
- map.put("data2", dataReportingMapper.getDataFor2());
- map.put("data3", dataReportingMapper.getDataFor3());
- map.put("data4", dataReportingMapper.getDataFor4());
- map.put("data5", dataReportingMapper.getDataFor5());
- return map;
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void addDataReporting(List<DataReporting> list, String date) {
- int userId = Integer.parseInt(JSONUtil.parseObj(new Jwt().readJWT(ServletUtils.getRequest().getHeader("token")).get("data")).get("id") + "");
- Map<String, String> map = dataReportingMapper.selectUser(userId);
- for (DataReporting dataReporting : list) {
- if (dataReporting.getName() == null || dataReporting.getName().equals("")) dataReporting.setName(map.get("account"));
- if (date == null) {
- date = LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- };
- DataReporting one = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getProduct, dataReporting.getProduct()).eq(DataReporting::getName, dataReporting.getName()).eq(DataReporting::getCreateUser, userId).like(DataReporting::getCreateTime, date));
- try {
- dataReporting.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP));
- } catch (Exception e) {
- }
- try {
- dataReporting.setConsumption(dataReporting.getCustomerCosts().multiply(new BigDecimal(dataReporting.getFansAdd())));
- } catch (Exception e) {
- }
- try {
- dataReporting.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- } catch (Exception e) {
- }
- try {
- dataReporting.setActualCost(dataReporting.getAccountConsumption().divide(new BigDecimal(dataReporting.getFansAdd()), 2, RoundingMode.HALF_UP));
- } catch (Exception e) {
- }
- try {
- dataReporting.setProfit(dataReporting.getRebateConsumption().subtract(dataReporting.getConsumption()));
- } catch (Exception e) {
- }
- try {
- dataReporting.setRemark(dataReporting.getConsumption().subtract(dataReporting.getRebateConsumption()));
- } catch (Exception e) {
- }
- if (ObjectUtil.isEmpty(one)) {
- dataReporting.setRegistrant(map.get("name"));
- dataReporting.setDepartment(map.get("department"));
- dataReporting.setCreateTime(LocalDateTime.parse(date + " " + new SimpleDateFormat("HH:mm:ss").format(new Date()), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
- dataReportingMapper.insert(dataReporting);
- } else {
- dataReporting.setId(one.getId());
- dataReporting.setName(null);
- dataReportingMapper.updateById(dataReporting);
- }
- }
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public Integer delDataReporting(Integer id) {
- List<FansSubmit> fansSubmits = fansSubmitMapper.selectList(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getDataId, id).select(FansSubmit::getId));
- fansSubmitMapper.deleteBatchIds(fansSubmits);
- return dataReportingMapper.deleteById(id);
- }
-
- @Override
- public String downDataReportingFile(IPage<DataReportingPageDto> page, DataReportingPageDto dataReportingPageDto) {
- Map<String, Object> map = selectDataReportingList(page, dataReportingPageDto);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
- String name = "鏁版嵁涓婃姤" + time + ".csv";
- String path = outPath + name;
- CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
- writer.write(new String[]{"瀵煎嚭鏃堕棿锛�"+time});
- writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�"+dataReportingPageDto.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
- writer.write(new String[]{});
- writer.write(new String[]{});
- List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
- String[] str = new String[head.size()];
- for (int i = 0; i < head.size(); i++) {
- str[i] = head.get(i).get("value");
- }
- writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
- Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
- for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
- }
- writer.write(str);
- });
- writer.close();
- return name;
- }
-
- @Override
- public String downProductCountFile(IPage<ProductCountDto> page, ProductCountDto productCountDto) {
- Map<String, Object> map = selectProductCountDtoPageList(page, productCountDto);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
- String name = "椤圭洰鏁版嵁缁熻" + time + ".csv";
- String path = outPath + name;
- CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
- writer.write(new String[]{"瀵煎嚭鏃堕棿锛�"+time});
- writer.write(new String[]{});
- writer.write(new String[]{});
- writer.write(new String[]{});
- writer.write(new String[]{});
- List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
- String[] str = new String[head.size()];
- for (int i = 0; i < head.size(); i++) {
- str[i] = head.get(i).get("value");
- }
- writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
- Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
- for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
- }
- writer.write(str);
- });
- writer.close();
- return name;
- }
-
- @Override
- public String downRegistrantCountFile(IPage<RegistrantCountDto> page, RegistrantCountDto registrantCountDto) {
- Map<String, Object> map = selectRegistrantCountDtoPageList(page, registrantCountDto);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
- String name = "鍛樺伐鏁版嵁缁熻" + time + ".csv";
- String path = outPath + name;
- CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
- writer.write(new String[]{"瀵煎嚭鏃堕棿锛�"+time});
- writer.write(new String[]{});
- writer.write(new String[]{});
- writer.write(new String[]{});
- writer.write(new String[]{});
- List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
- String[] str = new String[head.size()];
- for (int i = 0; i < head.size(); i++) {
- str[i] = head.get(i).get("value");
- }
- writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
- Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
- for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
- }
- writer.write(str);
- });
- writer.close();
- return name;
- }
-
- @Override
- public String downFansSubmitFile(IPage<FansSubmit> page, FansSubmit fansSubmit) {
- Map<String, Object> map = fansSubmitService.selectFansSubmitList(page, fansSubmit);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
- String name = "绮変笣涓婃姤" + time + ".csv";
- String path = outPath + name;
- CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
- writer.write(new String[]{"瀵煎嚭鏃堕棿锛�"+time});
- writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�"+fansSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
- writer.write(new String[]{});
- writer.write(new String[]{});
- List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
- String[] str = new String[head.size()];
- for (int i = 0; i < head.size(); i++) {
- str[i] = head.get(i).get("value");
- }
- writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
- Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
- for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
- }
- writer.write(str);
- });
- writer.close();
- return name;
- }
-
- @Override
- public String downFinanceSubmitFile(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit) {
- Map<String, Object> map = financeSubmitService.selectFinanceSubmitList(page, financeSubmit);
- String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_mm_ss"));
- String name = "璐㈠姟涓婃姤" + time + ".csv";
- String path = outPath + name;
- CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_GBK);
- writer.write(new String[]{"瀵煎嚭鏃堕棿锛�"+time});
- writer.write(new String[]{});
- writer.write(new String[]{"鏃堕棿鑼冨洿锛�"+financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyyMMdd"))});
- writer.write(new String[]{});
- writer.write(new String[]{});
- List<Map<String, String>> head = JSON.parseObject(JSON.toJSONString(map.get("head")), List.class);
- String[] str = new String[head.size()];
- for (int i = 0; i < head.size(); i++) {
- str[i] = head.get(i).get("value");
- }
- writer.write(str);
- JSON.parseObject(JSON.toJSONString(map.get("body")), IPage.class).getRecords().forEach(a->{
- Map<String, Object> map1 = JSON.parseObject(JSON.toJSONString(a), Map.class);
- for (int i = 0; i < head.size(); i++) {
- str[i] = map1.get(head.get(i).get("label"))==null?null:map1.get(head.get(i).get("label"))+"";
- }
- writer.write(str);
- });
- writer.close();
- return name;
- }
-
- /**
- * 鑾峰彇鏁版嵁瀵规瘮鍒楄〃
- */
- @Override
- public Map<String, Object> selectDataComparisonDtoPageList(Page page, DataComparisonDto dataComparisonDto) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(DataComparisonDto.class));
-
- if (StringUtils.isEmpty(dataComparisonDto.getName())
- || StringUtils.isEmpty(dataComparisonDto.getComparisonName())) {
- map.put("body", new Page<DataComparisonDto>());
- }else {
- long startTime = System.currentTimeMillis();
- IPage<DataComparisonDto> dataReportingPageDtoIPage = dataReportingMapper.selectDataComparisonDtoPageList(page, dataComparisonDto);
- long endTime = System.currentTimeMillis();
- System.out.println("鎵ц鏃堕棿锛�" + (endTime - startTime) + " 姣");
- map.put("body", dataReportingPageDtoIPage);
- }
- return map;
- }
-}
-
-
-
-
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
deleted file mode 100644
index 5177530..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FansSubmitServiceImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.DataReportingPageDto;
-import com.yuanchu.mom.exception.ErrorException;
-import com.yuanchu.mom.mapper.DataReportingMapper;
-import com.yuanchu.mom.pojo.DataReporting;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.service.FansSubmitService;
-import com.yuanchu.mom.mapper.FansSubmitMapper;
-import com.yuanchu.mom.utils.Jwt;
-import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.utils.ServletUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Administrator
- * @description 閽堝琛ㄣ�恌ans_sumbit(杩涚矇涓婃姤)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
- * @createDate 2023-12-25 00:36:16
- */
-@Service
-@AllArgsConstructor
-public class FansSubmitServiceImpl extends ServiceImpl<FansSubmitMapper, FansSubmit>
- implements FansSubmitService {
-
- private FansSubmitMapper fansSubmitMapper;
-
- private GetLook getLook;
-
- private DataReportingMapper dataReportingMapper;
-
- @Override
- public Map<String, Object> selectFansSubmitList(IPage<FansSubmit> page, FansSubmit fansSubmit) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(FansSubmit.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectFansSubmitList");
- if(map1.get("look")==1) fansSubmit.setCreateUser(map1.get("userId"));
- map.put("body", fansSubmitMapper.selectFansSubmitPageList(page, QueryWrappers.queryWrappers(fansSubmit)));
- return map;
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public int delFansSubmit(Integer id) {
- FansSubmit fansSubmit = fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getId, id).select(FansSubmit::getFansAdd, FansSubmit::getDataId));
- DataReporting dataReporting = dataReportingMapper.selectById(fansSubmit.getDataId());
- dataReporting.setFansAdd(dataReporting.getFansAdd() - fansSubmit.getFansAdd());
- dataReportingMapper.updateById(dataReporting);
- return fansSubmitMapper.deleteById(id);
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public int updateFansSubmit(FansSubmit fansSubmit) {
- DataReporting dataReporting = dataReportingMapper.selectById(fansSubmit.getDataId());
- dataReporting.setFansAdd(dataReporting.getFansAdd() + fansSubmit.getFansAdd() - fansSubmitMapper.selectOne(Wrappers.<FansSubmit>lambdaQuery().eq(FansSubmit::getId, fansSubmit.getId()).select(FansSubmit::getFansAdd)).getFansAdd());
- dataReportingMapper.updateById(dataReporting);
- return fansSubmitMapper.updateById(fansSubmit);
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public int addFansSubmit(FansSubmit fansSubmit, String date) {
- if(date == null) date = getYesterday();
- DataReporting dataReporting = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getName, fansSubmit.getCustom()).eq(DataReporting::getProduct, fansSubmit.getProduct()).eq(DataReporting::getCreateUser, getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList").get("userId")).like(DataReporting::getCreateTime, date));
- if(ObjectUtil.isEmpty(dataReporting)){
- throw new ErrorException(date+" 瀹㈡埛锛�"+fansSubmit.getCustom()+" 骞舵湭涓婃姤杩� "+fansSubmit.getProduct()+" 椤圭洰");
- }
- dataReporting.setFansAdd((dataReporting.getFansAdd()==null?0:dataReporting.getFansAdd()) + fansSubmit.getFansAdd());
- dataReportingMapper.updateById(dataReporting);
- fansSubmit.setDataId(dataReporting.getId());
- return fansSubmitMapper.insert(fansSubmit);
- }
-
- public String getYesterday(){
- return LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- }
-}
-
-
-
-
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
deleted file mode 100644
index 612bef2..0000000
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.exception.ErrorException;
-import com.yuanchu.mom.mapper.DataReportingMapper;
-import com.yuanchu.mom.pojo.DataReporting;
-import com.yuanchu.mom.pojo.FansSubmit;
-import com.yuanchu.mom.pojo.FinanceSubmit;
-import com.yuanchu.mom.service.DataReportingService;
-import com.yuanchu.mom.service.FinanceSubmitService;
-import com.yuanchu.mom.mapper.FinanceSubmitMapper;
-import com.yuanchu.mom.utils.QueryWrappers;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恌inance_submit銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2023-12-25 01:48:05
-*/
-@Service
-@AllArgsConstructor
-public class FinanceSubmitServiceImpl extends ServiceImpl<FinanceSubmitMapper, FinanceSubmit>
- implements FinanceSubmitService{
-
- private FinanceSubmitMapper financeSubmitMapper;
-
- private GetLook getLook;
-
- private DataReportingMapper dataReportingMapper;
-
- @Override
- public Map<String, Object> selectFinanceSubmitList(IPage<FinanceSubmit> page, FinanceSubmit financeSubmit) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(FinanceSubmit.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectFinanceSubmitList");
- if(map1.get("look")==1) financeSubmit.setCreateUser(map1.get("userId"));
- map.put("body", financeSubmitMapper.selectFinanceSubmitPageList(page, QueryWrappers.queryWrappers(financeSubmit)));
- return map;
- }
-
- @Override
- public int delFinanceSubmit(Integer id) {
- return financeSubmitMapper.deleteById(id);
- }
-
- @Override
- public int updateFinanceSubmit(FinanceSubmit financeSubmit) {
- DataReporting reporting = dataReportingMapper.selectById(financeSubmit.getDataId());
- reporting.setId(financeSubmit.getDataId());
- reporting.setAgentRebate(financeSubmit.getEmployeeRebate());
- try {
- reporting.setDiscountedConsumption(reporting.getConsumption().divide(reporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- dataReportingMapper.updateById(reporting);
- return financeSubmitMapper.updateById(financeSubmit);
- }
-
- @Override
- public int addFinanceSubmit(FinanceSubmit financeSubmit, String date) {
- if(date == null) date = getYesterday();
- DataReporting dataReporting = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).eq(DataReporting::getCreateUser, getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList").get("userId")).like(DataReporting::getCreateTime, date));
- if(ObjectUtil.isEmpty(dataReporting)){
- throw new ErrorException(date+" 璐︽埛锛�"+financeSubmit.getName()+" 浠ｇ悊鍟嗭細"+financeSubmit.getCompany()+" 骞舵湭涓婃姤杩�");
- }
- dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
- try {
- dataReporting.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- dataReportingMapper.updateById(dataReporting);
- financeSubmit.setDataId(dataReporting.getId());
- return financeSubmitMapper.insert(financeSubmit);
- }
-
- public String getYesterday(){
- return LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- }
-}
-
-
-
-
diff --git a/data-server/src/main/resources/mapper/DataReportingMapper.xml b/data-server/src/main/resources/mapper/DataReportingMapper.xml
deleted file mode 100644
index d7854d0..0000000
--- a/data-server/src/main/resources/mapper/DataReportingMapper.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.DataReportingMapper">
-
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.DataReporting">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="department" column="department" jdbcType="VARCHAR"/>
- <result property="registrant" column="registrant" jdbcType="VARCHAR"/>
- <result property="product" column="product" jdbcType="VARCHAR"/>
- <result property="channel" column="channel" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="showNum" column="show_num" jdbcType="INTEGER"/>
- <result property="click" column="click" jdbcType="INTEGER"/>
- <result property="accountConsumption" column="account_consumption" jdbcType="DECIMAL"/>
- <result property="rebateConsumption" column="rebate_consumption" jdbcType="DECIMAL"/>
- <result property="consumption" column="consumption" jdbcType="DECIMAL"/>
- <result property="discountedConsumption" column="discounted_consumption" jdbcType="DECIMAL"/>
- <result property="fansAdd" column="fans_add" jdbcType="INTEGER"/>
- <result property="actualCost" column="actual_cost" jdbcType="DECIMAL"/>
- <result property="internalCosts" column="internal_costs" jdbcType="DECIMAL"/>
- <result property="customerCosts" column="customer_costs" jdbcType="DECIMAL"/>
- <result property="profit" column="profit" jdbcType="DECIMAL"/>
- <result property="agentRebate" column="agent_rebate" jdbcType="DECIMAL"/>
- <result property="customerRebate" column="customer_rebate" jdbcType="DECIMAL"/>
- <result property="remark" column="remark" jdbcType="DECIMAL"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
- <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
- </resultMap>
-
- <select id="selectDataReportingDtoPageList" resultType="com.yuanchu.mom.dto.DataReportingPageDto">
- select * from (
- select dr.*,u1.name create_user_name,u2.name update_user_name from data_reporting dr
- left join user u1 on dr.create_user = u1.id
- left join user u2 on dr.update_user = u2.id
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="selectProductCountDtoPageList" resultType="com.yuanchu.mom.dto.ProductCountDto">
- select * from (
- select update_time, create_time, product, sum(consumption) consumption, sum(fans_add) fans_add,
- sum(customer_costs) customer_costs, create_user
- from data_reporting
- group by product,date_format(create_time, '%Y-%m-%d')
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="selectRegistrantCountDtoPageList" resultType="com.yuanchu.mom.dto.RegistrantCountDto">
- select * from (
- select id, department, registrant, product, name, sum(show_num) show_num, sum(click) click,
- sum(account_consumption)account_consumption, sum(rebate_consumption)
- rebate_consumption,(sum(rebate_consumption)+sum(remark)) rebate_consumption2, sum(discounted_consumption)
- discounted_consumption, sum(fans_add) fans_add, sum(actual_cost) actual_cost, sum(customer_costs)
- customer_costs, sum(profit) profit, sum(agent_rebate) agent_rebate, sum(customer_rebate) customer_rebate,
- sum(remark) remark, create_time, update_time, create_user
- from data_reporting
- group by registrant,date_format(create_time, '%Y-%m-%d')
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
- <select id="getDataFor1" resultType="java.util.Map">
- select COALESCE(sum(account_consumption), 0) data1,
- COALESCE(sum(consumption), 0) data2,
- COALESCE(sum(customer_costs), 0) data3,
- COALESCE(sum(actual_cost), 0) data4
- from data_reporting
- where date(create_time) like (CURDATE() - INTERVAL 1 DAY)
- </select>
- <select id="getDataFor2" resultType="java.util.Map">
- SELECT sum(account_consumption) account_consumptions,
- DATE_FORMAT(create_time, '%m-%d') `date`,
- DATE_FORMAT(create_time, '%y-%m-%d') time
- FROM data_reporting
- group by DATE_FORMAT(create_time, '%y-%m-%d')
- having DATE_SUB(CURDATE(), INTERVAL 7 DAY) < time
- and time < CURDATE()
- </select>
- <select id="getDataFor3" resultType="java.util.Map">
- SELECT sum(consumption) consumption,
- DATE_FORMAT(create_time, '%m-%d') `date`,
- DATE_FORMAT(create_time, '%y-%m-%d') time
- FROM data_reporting
- group by DATE_FORMAT(create_time, '%y-%m-%d')
- having DATE_SUB(CURDATE(), INTERVAL 7 DAY) < time
- and time < CURDATE()
- </select>
- <select id="getDataFor4" resultType="java.util.Map">
- select product, sum(customer_costs) customerCosts
- from data_reporting
- group by product
- order by customerCosts desc
- limit 7
- </select>
- <select id="getDataFor5" resultType="java.util.Map">
- select product, sum(actual_cost) actualCost
- from data_reporting
- group by product
- order by actualCost desc
- limit 7
- </select>
- <select id="selectUser" resultType="java.util.Map">
- select user.department, user.name, user.account
- from user
- where id = #{userId}
- </select>
-
- <select id="selectDataComparisonDtoPageList" resultType="com.yuanchu.mom.dto.DataComparisonDto">
- select a.account account,
- a.name name,
- a.account_consumption consumption,
- b.account comparisonAccount,
- b.name comparisonName,
- b.account_consumption comparisonConsumption
- from (select dr1.*, user.id uId, user.name uName, user.account
- from data_reporting dr1
- join user on dr1.create_user = user.id
- where date_format(dr1.create_time, '%Y-%m-%d') =
- date_format(#{dataComparisonDto.createTime}, '%Y-%m-%d')
- and user.name = #{dataComparisonDto.name}) a
- left join (select dr2.*, user.id uId, user.name uName, user.account
- from data_reporting dr2
- join user on dr2.create_user = user.id
- where date_format(dr2.create_time, '%Y-%m-%d') =
- date_format(#{dataComparisonDto.createTime}, '%Y-%m-%d')
- and user.name = #{dataComparisonDto.comparisonName}) b
- on a.name = b.name
- and a.product = b.product
- where (a.account_consumption != b.account_consumption
- or b.account_consumption is null)
- </select>
-</mapper>
diff --git a/data-server/src/main/resources/mapper/FansSubmitMapper.xml b/data-server/src/main/resources/mapper/FansSubmitMapper.xml
deleted file mode 100644
index 35b4767..0000000
--- a/data-server/src/main/resources/mapper/FansSubmitMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.FansSubmitMapper">
-
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.FansSubmit">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="custom" column="custom" jdbcType="VARCHAR"/>
- <result property="product" column="product" jdbcType="VARCHAR"/>
- <result property="vx" column="vx" jdbcType="VARCHAR"/>
- <result property="fansAdd" column="fans_add" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- </resultMap>
- <select id="selectFansSubmitPageList" resultType="com.yuanchu.mom.pojo.FansSubmit">
- select * from (
- select fm.*, u.name create_user_name from fans_submit fm, user u
- where fm.create_user = u.id
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-
-</mapper>
diff --git a/data-server/src/main/resources/mapper/FinanceSubmitMapper.xml b/data-server/src/main/resources/mapper/FinanceSubmitMapper.xml
deleted file mode 100644
index 4bb0808..0000000
--- a/data-server/src/main/resources/mapper/FinanceSubmitMapper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.FinanceSubmitMapper">
-
- <select id="selectFinanceSubmitPageList" resultType="com.yuanchu.mom.pojo.FinanceSubmit">
- select * from (
- select fs.*, u.name create_user_name from finance_submit fs, user u
- where fs.create_user = u.id
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
-</mapper>
diff --git a/framework/src/main/java/com/yuanchu/mom/common/AllController.java b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
index 10176fc..2097319 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/AllController.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -38,6 +38,10 @@
type = "鍒犻櫎";
} else if(remark.contains("娣诲姞")||remark.contains("鏂板")){
type = "娣诲姞";
+ } else if(remark.contains("瀵煎叆")){
+ type = "瀵煎叆";
+ } else if(remark.contains("瀵煎嚭")){
+ type = "瀵煎嚭";
}
try {
authMapper.insertPower(value.getMethod().getName(), remark, type);
diff --git a/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java b/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
index 8a3a9a6..34275f7 100644
--- a/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
+++ b/framework/src/main/java/com/yuanchu/mom/mapper/AuthMapper.java
@@ -20,9 +20,9 @@
int deletePower();
@Select("select COALESCE(count(*), 0) from power p left join user u on u.role_id = p.role_id where u.id = #{userId} and p.menu_method = #{method}")
- int isPower(Integer userId, String method);
+ Integer isPower(Integer userId, String method);
@Select("select look from power p left join user u on u.role_id = p.role_id where u.id = #{userId} and p.menu_method = #{method}")
- int countPower(Integer userId, String method);
+ Integer countPower(Integer userId, String method);
}
diff --git a/pom.xml b/pom.xml
index 9b26b37..50b9ca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,15 +11,14 @@
<groupId>com.yuanchu.mom</groupId>
<artifactId>mom</artifactId>
<version>1.0.0</version>
- <name>oms</name>
- <description>oms</description>
+ <name>center-lims</name>
+ <description>center-lims</description>
<packaging>pom</packaging>
<modules>
<module>framework</module>
<module>user-server</module>
<module>system-run</module>
- <module>data-server</module>
</modules>
<properties>
diff --git a/system-run/pom.xml b/system-run/pom.xml
index 9079d88..f94e371 100644
--- a/system-run/pom.xml
+++ b/system-run/pom.xml
@@ -28,12 +28,6 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>data-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
-
<!--druid-->
<dependency>
<groupId>com.alibaba</groupId>
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 0b6562b..81460b6 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location: D:\楣撻洀鍏徃\frame-after\logs_IS_UNDEFINED
+ file-location: D:\楣撻洀鍏徃\frame-after\logs
# 鏁版嵁搴撳浠借矾寰�
backup:
@@ -34,7 +34,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/shengyun?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: root
password: 123456
druid:
diff --git a/system-run/src/main/resources/application-prod.yml b/system-run/src/main/resources/application-prod.yml
index 376368d..5ccc007 100644
--- a/system-run/src/main/resources/application-prod.yml
+++ b/system-run/src/main/resources/application-prod.yml
@@ -29,7 +29,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/shengyun?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://127.0.0.1:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: root
password: 123456
druid:
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
index c6e21c4..bcfb512 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/EnumController.java
@@ -2,18 +2,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.CustomEnum;
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
-import com.yuanchu.mom.service.CustomEnumService;
-import com.yuanchu.mom.service.ProductEnumService;
+import com.yuanchu.mom.dto.RolePowerDto;
+import com.yuanchu.mom.pojo.Enums;
+import com.yuanchu.mom.service.EnumService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
@@ -24,71 +20,32 @@
@AllArgsConstructor
public class EnumController {
- private CustomEnumService customEnumService;
+ private EnumService enumService;
- private ProductEnumService productEnumService;
-
- @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
- @PostMapping("/selectCustomEnumLists")
- public Result selectCustomEnumLists(@RequestBody Map<String, Object> data) throws Exception {
+ @ApiOperation(value = "鑾峰彇鏋氫妇鍒楄〃")
+ @PostMapping("/selectEnumList")
+ public Result selectEnumList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- CustomEnum customEnum = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), CustomEnum.class);
- return Result.success(customEnumService.selectCustomEnumList(page, customEnum));
+ Enums enums = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Enums.class);
+ return Result.success(enumService.selectEnumList(page, enums));
}
- @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃鏋氫妇")
- @GetMapping("/selectCustomEnumList")
- public Result selectCustomEnumList(){
- return Result.success(customEnumService.selectList());
+ @ApiOperation(value = "娣诲姞鏋氫妇")
+ @PostMapping("/addEnum")
+ public Result addEnum(@RequestBody Enums enums) {
+ return Result.success(enumService.addEnum(enums));
}
- @ApiOperation(value = "鍒犻櫎瀹㈡埛鍒楄〃")
- @PostMapping("/delCustomEnum")
- public Result delCustomEnum(Integer id){
- return Result.success(customEnumService.delCustomEnum(id));
+ @ApiOperation(value = "淇敼鏋氫妇")
+ @PostMapping("/upEnum")
+ public Result<?> upEnum(@RequestBody Enums enums) {
+ return Result.success(enumService.upEnum(enums));
}
- @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
- @PostMapping("/updateCustomEnum")
- public Result<?> updateCustomEnum(@RequestBody CustomEnum customEnum) {
- return Result.success(customEnumService.updateCustomEnum(customEnum));
+ @ApiOperation(value = "鍒犻櫎鏋氫妇")
+ @PostMapping("/delEnum")
+ public Result<?> delEnum(Integer id) {
+ return Result.success(enumService.delEnum(id));
}
- @ApiOperation(value = "娣诲姞瀹㈡埛淇℃伅")
- @PostMapping("/addCustomEnum")
- public Result<?> addCustomEnum(@RequestBody CustomEnum customEnum) {
- return Result.success(customEnumService.addCustomEnum(customEnum));
- }
-
- @ApiOperation(value = "鑾峰彇椤圭洰鍒楄〃")
- @PostMapping("/selectProductEnumLists")
- public Result selectProductEnumLists(@RequestBody Map<String, Object> data) {
- Page page = JSON.parseObject(JSON.toJSONString(data.get("page")), Page.class);
- ProductEnum productEnum = JSON.parseObject(JSON.toJSONString(data.get("entity")), ProductEnum.class);
- return Result.success(productEnumService.selectProductEnumList(page, productEnum));
- }
-
- @ApiOperation(value = "鑾峰彇椤圭洰鍒楄〃鏋氫妇")
- @GetMapping("/selectProductEnumList")
- public Result selectProductEnumList(){
- return Result.success(productEnumService.selectList());
- }
-
- @ApiOperation(value = "鍒犻櫎椤圭洰鍒楄〃")
- @PostMapping("/delProductEnum")
- public Result delProductEnum(Integer id){
- return Result.success(productEnumService.delProductEnum(id));
- }
-
- @ApiOperation(value = "淇敼椤圭洰淇℃伅")
- @PostMapping("/updateProductEnum")
- public Result<?> updateProductEnum(@RequestBody ProductEnum productEnum) {
- return Result.success(productEnumService.updateProductEnum(productEnum));
- }
-
- @ApiOperation(value = "娣诲姞椤圭洰淇℃伅")
- @PostMapping("/addProductEnum")
- public Result<?> addProductEnum(@RequestBody ProductEnum productEnum) {
- return Result.success(productEnumService.addProductEnum(productEnum));
- }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index b6233db..5774f37 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -3,27 +3,15 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.RolePowerDto;
-import com.yuanchu.mom.dto.UserPageDto;
-import com.yuanchu.mom.mapper.AuthMapper;
-import com.yuanchu.mom.mapper.PowerMapper;
-import com.yuanchu.mom.pojo.CustomEnum;
-import com.yuanchu.mom.pojo.Power;
import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.PowerService;
import com.yuanchu.mom.service.RoleService;
-import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
-import com.yuanchu.mom.utils.Jwt;
-import com.yuanchu.mom.utils.RedisUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.apache.ibatis.annotations.ResultType;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 0840e7f..f0792ec 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -118,4 +118,10 @@
return Result.success(userService.addUser(user));
}
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅鏋氫妇")
+ @GetMapping("/getUserMenu")
+ @ValueAuth
+ public Result<?> getUserMenu() {
+ return Result.success(userService.getUserMenu());
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/CustomEnumMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/CustomEnumMapper.java
deleted file mode 100644
index 4e566b5..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/CustomEnumMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.CustomEnum;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恈ustom_enum銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2023-12-24 14:40:43
-* @Entity com.yuanchu.mom.pojo.CustomEnum
-*/
-public interface CustomEnumMapper extends BaseMapper<CustomEnum> {
-
-}
-
-
-
-
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java
new file mode 100644
index 0000000..a4252db
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/EnumMapper.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.pojo.Enums;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恊num銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-02-26 01:00:03
+* @Entity com.yuanchu.mom.pojo.Enums
+*/
+public interface EnumMapper extends BaseMapper<Enums> {
+
+ IPage<Enums> selectEnumPageList(IPage<Enums> page, QueryWrapper<Enums> ew);
+
+}
+
+
+
+
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/ProductEnumMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/ProductEnumMapper.java
deleted file mode 100644
index 9028c95..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/mapper/ProductEnumMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恜roduct_enum(椤圭洰鏋氫妇)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2023-12-24 15:46:30
-* @Entity com.yuanchu.mom.pojo.ProductEnum
-*/
-public interface ProductEnumMapper extends BaseMapper<ProductEnum> {
-
-}
-
-
-
-
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java b/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java
deleted file mode 100644
index 494b68a..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/CustomEnum.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
-
-/**
-*
-* @TableName custom_enum
-*/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class CustomEnum extends OrderBy implements Serializable {
-
- /**
- * 涓婚敭
- */
- @NotNull(message="[涓婚敭]涓嶈兘涓虹┖")
- @ApiModelProperty("涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @ValueTableShow(1)
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("瀹㈡埛鍚嶇О")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String name;
- /**
- * 鍏徃
- */
- @ValueTableShow(2)
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("鍏徃")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String company;
-
- @ValueTableShow(3)
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
-
- @ValueTableShow(4)
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
- /**
- *
- */
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
- /**
- *
- */
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java b/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
new file mode 100644
index 0000000..c4f50d9
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/Enums.java
@@ -0,0 +1,74 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ *
+ * @TableName enum
+ */
+@TableName(value ="enums")
+@Data
+public class Enums extends OrderBy implements Serializable {
+ /**
+ *
+ */
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "鍒嗙被")
+ private String category;
+
+ /**
+ * 鏍囬
+ */
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "鏍囬")
+ private String label;
+
+ /**
+ * 鍙傛暟
+ */
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "鍙傛暟")
+ private String value;
+
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ValueTableShow(4)
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ private String createUserName;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+ private String updateUserName;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/ProductEnum.java b/user-server/src/main/java/com/yuanchu/mom/pojo/ProductEnum.java
deleted file mode 100644
index 278f955..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/ProductEnum.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.Length;
-
-/**
-* 椤圭洰鏋氫妇
-* @TableName product_enum
-*/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProductEnum extends OrderBy implements Serializable {
-
- /**
- * 涓婚敭
- */
- @NotNull(message="[涓婚敭]涓嶈兘涓虹┖")
- @ApiModelProperty("涓婚敭")
- @TableId(type = IdType.AUTO)
- private Integer id;
- /**
- * 椤圭洰
- */
- @ValueTableShow(1)
- @Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("椤圭洰")
- @Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- private String product;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ValueTableShow(2)
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime createTime;
- /**
- * 鏇存柊鏃堕棿
- */
- @ValueTableShow(3)
- @ApiModelProperty("鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime updateTime;
- /**
- *
- */
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
- /**
- *
- */
- @ApiModelProperty("")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-}
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index 5a2384a..587e028 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -37,7 +37,7 @@
private String password;
@ValueTableShow(2)
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�")
private String name;
@ValueTableShow(3)
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/CustomEnumService.java b/user-server/src/main/java/com/yuanchu/mom/service/CustomEnumService.java
deleted file mode 100644
index 5086b3c..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/service/CustomEnumService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.pojo.CustomEnum;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.pojo.User;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恈ustom_enum銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2023-12-24 14:40:43
-*/
-
-
-public interface CustomEnumService {
-
- Map<String, Object> selectCustomEnumList(IPage<CustomEnum> page, CustomEnum customEnum);
-
- List<CustomEnum> selectList();
-
- int delCustomEnum(Integer id);
-
- int updateCustomEnum(CustomEnum customEnum);
-
- int addCustomEnum(CustomEnum customEnum);
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/EnumService.java b/user-server/src/main/java/com/yuanchu/mom/service/EnumService.java
new file mode 100644
index 0000000..f180f8b
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/service/EnumService.java
@@ -0,0 +1,24 @@
+package com.yuanchu.mom.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.pojo.Enums;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恊num銆戠殑鏁版嵁搴撴搷浣淪ervice
+* @createDate 2024-02-26 01:00:03
+*/
+public interface EnumService extends IService<Enums> {
+
+ Map<String, Object> selectEnumList(IPage<Enums> page, Enums enums);
+
+ int addEnum(Enums enums);
+
+ int upEnum(Enums enums);
+
+ int delEnum(Integer id);
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/ProductEnumService.java b/user-server/src/main/java/com/yuanchu/mom/service/ProductEnumService.java
deleted file mode 100644
index f13c972..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/service/ProductEnumService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恜roduct_enum(椤圭洰鏋氫妇)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2023-12-24 15:46:30
-*/
-public interface ProductEnumService extends IService<ProductEnum> {
-
- Map<String, Object> selectProductEnumList(IPage<ProductEnum> page, ProductEnum productEnum);
-
- List<ProductEnum> selectList();
-
- int delProductEnum(Integer id);
-
- int updateProductEnum(ProductEnum productEnum);
-
- int addProductEnum(ProductEnum productEnum);
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index e584c81..3b8fc96 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -22,4 +22,6 @@
int addUser(User user);
+ List<User> getUserMenu();
+
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/imp/CustomEnumServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/imp/CustomEnumServiceImp.java
deleted file mode 100644
index f46aad2..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/service/imp/CustomEnumServiceImp.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.yuanchu.mom.service.imp;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.mapper.CustomEnumMapper;
-import com.yuanchu.mom.pojo.CustomEnum;
-import com.yuanchu.mom.pojo.Role;
-import com.yuanchu.mom.service.CustomEnumService;
-import com.yuanchu.mom.utils.QueryWrappers;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-@AllArgsConstructor
-public class CustomEnumServiceImp implements CustomEnumService {
-
- private CustomEnumMapper customEnumMapper;
-
- private GetLook getLook;
-
- @Override
- public Map<String, Object> selectCustomEnumList(IPage<CustomEnum> page, CustomEnum customEnum) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(CustomEnum.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectCustomEnumLists");
- if(map1.get("look")==1) customEnum.setCreateUser(map1.get("userId"));
- map.put("body", customEnumMapper.selectPage(page, QueryWrappers.queryWrappers(customEnum)));
- return map;
- }
-
- @Override
- public List<CustomEnum> selectList() {
- return customEnumMapper.selectList(null);
- }
-
- @Override
- public int delCustomEnum(Integer id) {
- return customEnumMapper.deleteById(id);
- }
-
- @Override
- public int updateCustomEnum(CustomEnum customEnum) {
- return customEnumMapper.updateById(customEnum);
- }
-
- @Override
- public int addCustomEnum(CustomEnum customEnum) {
- return customEnumMapper.insert(customEnum);
- }
-}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/imp/ProductEnumServiceImpl.java b/user-server/src/main/java/com/yuanchu/mom/service/imp/ProductEnumServiceImpl.java
deleted file mode 100644
index 0e4ba4f..0000000
--- a/user-server/src/main/java/com/yuanchu/mom/service/imp/ProductEnumServiceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.yuanchu.mom.service.imp;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.mapper.ProductEnumMapper;
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.yuanchu.mom.pojo.ProductEnum;
-import com.yuanchu.mom.service.ProductEnumService;
-import com.yuanchu.mom.mapper.ProductEnumMapper;
-import com.yuanchu.mom.utils.QueryWrappers;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恜roduct_enum(椤圭洰鏋氫妇)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2023-12-24 15:46:30
-*/
-@Service
-@AllArgsConstructor
-public class ProductEnumServiceImpl extends ServiceImpl<ProductEnumMapper, ProductEnum>
- implements ProductEnumService{
-
- private ProductEnumMapper productEnumMapper;
-
- private GetLook getLook;
-
- @Override
- public Map<String, Object> selectProductEnumList(IPage<ProductEnum> page, ProductEnum productEnum) {
- Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(ProductEnum.class));
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectProductEnumLists");
- if(map1.get("look")==1) productEnum.setCreateUser(map1.get("userId"));
- map.put("body", productEnumMapper.selectPage(page, QueryWrappers.queryWrappers(productEnum)));
- return map;
- }
-
- @Override
- public List<ProductEnum> selectList() {
- return productEnumMapper.selectList(null);
- }
-
- @Override
- public int delProductEnum(Integer id) {
- return productEnumMapper.deleteById(id);
- }
-
- @Override
- public int updateProductEnum(ProductEnum productEnum) {
- return productEnumMapper.updateById(productEnum);
- }
-
- @Override
- public int addProductEnum(ProductEnum productEnum) {
- return productEnumMapper.insert(productEnum);
- }
-
-}
-
-
-
-
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
index 0840dd6..7d8d7ae 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/imp/UserServiceImp.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
@@ -70,4 +71,9 @@
public int addUser(User user) {
return userMapper.insert(user);
}
+
+ @Override
+ public List<User> getUserMenu() {
+ return userMapper.selectList(Wrappers.<User>lambdaQuery().eq(User::getState, 1).select(User::getName, User::getId));
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
new file mode 100644
index 0000000..f8c4ded
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/EnumServiceImpl.java
@@ -0,0 +1,59 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.pojo.Enums;
+import com.yuanchu.mom.service.EnumService;
+import com.yuanchu.mom.mapper.EnumMapper;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+* @author Administrator
+* @description 閽堝琛ㄣ�恊num銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+* @createDate 2024-02-26 01:00:03
+*/
+@Service
+@AllArgsConstructor
+public class EnumServiceImpl extends ServiceImpl<EnumMapper, Enums>
+ implements EnumService{
+
+ private GetLook getLook;
+
+ private EnumMapper enumMapper;
+
+ @Override
+ public Map<String, Object> selectEnumList(IPage<Enums> page, Enums enums) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(Enums.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectUserList");
+ if(map1.get("look")==1) enums.setCreateUser(map1.get("userId"));
+ map.put("body", enumMapper.selectEnumPageList(page, QueryWrappers.queryWrappers(enums)));
+ return map;
+ }
+
+ @Override
+ public int addEnum(Enums enums) {
+ return enumMapper.insert(enums);
+ }
+
+ @Override
+ public int upEnum(Enums enums) {
+ return enumMapper.updateById(enums);
+ }
+
+ @Override
+ public int delEnum(Integer id) {
+ return enumMapper.deleteById(id);
+ }
+}
+
+
+
+
diff --git a/user-server/src/main/resources/mapper/CustomEnumMapper.xml b/user-server/src/main/resources/mapper/CustomEnumMapper.xml
deleted file mode 100644
index 599817e..0000000
--- a/user-server/src/main/resources/mapper/CustomEnumMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.CustomEnumMapper">
-
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.CustomEnum">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="company" column="company" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,name,company,
- create_time,update_time,create_user,
- update_user
- </sql>
-</mapper>
diff --git a/user-server/src/main/resources/mapper/EnumMapper.xml b/user-server/src/main/resources/mapper/EnumMapper.xml
new file mode 100644
index 0000000..9f3dee1
--- /dev/null
+++ b/user-server/src/main/resources/mapper/EnumMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.EnumMapper">
+
+ <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.Enums">
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="label" column="label" jdbcType="VARCHAR"/>
+ <result property="value" column="value" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id,label,value,
+ create_user,create_time,update_user,
+ update_time
+ </sql>
+
+ <select id="selectEnumPageList" resultType="com.yuanchu.mom.pojo.Enums">
+ select * from (
+ select e.id,e.category,e.label,e.value, u2.name create_user_name,e.create_time, u3.name update_user_name, e.update_time
+ from enums e
+ left join user u2 on u2.id = e.create_user
+ left join user u3 on u3.id = e.update_user
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+</mapper>
diff --git a/user-server/src/main/resources/mapper/ProductEnumMapper.xml b/user-server/src/main/resources/mapper/ProductEnumMapper.xml
deleted file mode 100644
index b2c773c..0000000
--- a/user-server/src/main/resources/mapper/ProductEnumMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.ProductEnumMapper">
-
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.ProductEnum">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,name,create_time,
- update_time,create_user,update_user
- </sql>
-</mapper>
--
Gitblit v1.9.3