From 879b8da64fb3edcda27546b1eea4fca37fa606ea Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 10 Jul 2025 15:20:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=EF=BC=88=E9=83=A8=E5=88=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/PermissionController.java | 12 ++++++++ .../demo/controller/WorkbenchController.java | 6 ++-- .../com/example/demo/domain/vo/WorkbenchCard.java | 2 +- .../demo/domain/vo/WorkbenchMarketCard.java | 5 ++++ .../com/example/demo/mapper/PermissionMapper.java | 1 + .../example/demo/service/PermissionService.java | 4 +-- .../com/example/demo/service/WorkbenchService.java | 4 +-- .../demo/serviceImpl/PermissionServiceImpl.java | 32 ++++++++++++++++++++-- .../demo/serviceImpl/WorkbenchServiceImpl.java | 14 ++++------ src/main/resources/mapper/AuditMapper.xml | 2 +- src/main/resources/mapper/PermissionMapper.xml | 24 ++++++++++++++++ 11 files changed, 87 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/example/demo/controller/PermissionController.java b/src/main/java/com/example/demo/controller/PermissionController.java index 9e043d4..0c3d3c3 100644 --- a/src/main/java/com/example/demo/controller/PermissionController.java +++ b/src/main/java/com/example/demo/controller/PermissionController.java @@ -39,6 +39,7 @@ public class PermissionController { public Result getPermission(@RequestBody Page page){ return Result.success(permissionService.getpermission(page.getPageNum(), page.getPageSize(), page.getPermission())); } + //新增用户 @PostMapping("/addPermission") public Result addPermission(@RequestBody Admin admin) throws Exception { System.out.println( admin); @@ -50,6 +51,17 @@ public class PermissionController { return Result.error(e.getMessage()); } } + //编辑用户 + @PostMapping("/updateAdmin") + public Result updateAdmin(@RequestBody Admin admin) throws Exception { + try { + return Result.success(permissionService.updateAdmin(admin)); + } + catch (Exception e) { + log.error(Arrays.toString(e.getStackTrace())); + return Result.error(e.getMessage()); + } + } @PostMapping("/getRole") public Result getRole(@RequestBody String token){ return Result.success(permissionService.getRole(token)); diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index bad46b7..5d02ba9 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -43,7 +43,7 @@ public class WorkbenchController { */ @PostMapping("getCard") public ResponseEntity card1(@RequestBody WorkbenchCard workbench){ - WorkbenchCard result =workbenchService.getCard(workbench.getToken()); + WorkbenchCard result =workbenchService.getCard(); return ResponseEntity.ok(result); } /* @@ -51,7 +51,7 @@ public class WorkbenchController { */ @PostMapping("getGraph") public ResponseEntity graph1(@RequestBody WorkbenchCard workbench){ - WorkbenchCard result =workbenchService.getGraph(workbench.getToken(),workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets()); + WorkbenchCard result =workbenchService.getGraph(workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets()); return ResponseEntity.ok(result); } /* @@ -61,7 +61,7 @@ public class WorkbenchController { public ResponseEntity updateCard(@RequestBody WorkbenchCard workbench){ statisticsService.runHourlyTaskPart1(); //更新余量数据 statisticsService.runHourlyTaskPart2(); //更新余量外数据 - WorkbenchCard result =workbenchService.getCard(workbench.getToken()); //获取卡片数据 + WorkbenchCard result =workbenchService.getCard(); //获取卡片数据 return ResponseEntity.ok(result); } } diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java b/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java index 0b03299..7be77a1 100644 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java +++ b/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java @@ -22,7 +22,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class WorkbenchCard implements Serializable { - private String token; //用户token + //private String token; //用户token private List marketCards; // 地区卡片数据 private List marketGraphs; // 地区图表数据 private List markets; // 地区列表 diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java b/src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java index e84b9d1..48b2ef0 100644 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java +++ b/src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java @@ -1,10 +1,12 @@ package com.example.demo.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** * @program: gold-java @@ -59,6 +61,9 @@ public class WorkbenchMarketCard implements Serializable { private Integer sumDaily; // 总日环比（%） private Integer yearlyRechargeNum; // 全年累计充值人头数 + //更新时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date updateTime; //图表 private Integer SumRechargePermanent; //合计充值永久金币 private Integer SumRechargeFree; //合计充值免费金币 diff --git a/src/main/java/com/example/demo/mapper/PermissionMapper.java b/src/main/java/com/example/demo/mapper/PermissionMapper.java index 792be01..ac7edf7 100644 --- a/src/main/java/com/example/demo/mapper/PermissionMapper.java +++ b/src/main/java/com/example/demo/mapper/PermissionMapper.java @@ -28,4 +28,5 @@ public interface PermissionMapper { Integer deleteAdmin(Integer id); Integer deleteAdminRole(Integer id); Integer updateAdminRole(AdminRole adminRole); + Integer upadateAdmin(Admin admin); } diff --git a/src/main/java/com/example/demo/service/PermissionService.java b/src/main/java/com/example/demo/service/PermissionService.java index 8d124bf..e306b28 100644 --- a/src/main/java/com/example/demo/service/PermissionService.java +++ b/src/main/java/com/example/demo/service/PermissionService.java @@ -3,11 +3,9 @@ package com.example.demo.service; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Permission; import com.github.pagehelper.PageInfo; -import javax.swing.*; import java.util.List; /** @@ -27,4 +25,6 @@ public interface PermissionService { Integer deleteAdmin(Integer id); Integer updateAdminRole(AdminRole adminRole); Integer upadatePermission(Admin admin) throws Exception; + + Object updateAdmin(Admin admin)throws Exception; } diff --git a/src/main/java/com/example/demo/service/WorkbenchService.java b/src/main/java/com/example/demo/service/WorkbenchService.java index fa011c1..8efa2fe 100644 --- a/src/main/java/com/example/demo/service/WorkbenchService.java +++ b/src/main/java/com/example/demo/service/WorkbenchService.java @@ -20,11 +20,11 @@ import java.util.Map; public interface WorkbenchService { //获取不同地区的工作台统计卡片 - WorkbenchCard getCard(String token); + WorkbenchCard getCard( ); //获取卡片数据 WorkbenchMarketCard createWorkbenchMarketCard(String market, Statistics currentStatistics,Statistics ydayStatistics, Date yearlyStartDate, Date currentDate); //获取不同地区的工作台柱状图数据（根据类型，起止时间，地区查询） - WorkbenchCard getGraph(String token, Date startDate, Date endDate, List markets); + WorkbenchCard getGraph(Date startDate, Date endDate, List markets); //根据类型获取年初至今的统计数据 Map calculateAllSum(String market, Date startDate, Date endDate); //获取该日期该市场的日环比 diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java index d4b5cf5..6b0a454 100644 --- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java @@ -3,9 +3,7 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.Permission; -import com.example.demo.domain.vo.Result; import com.example.demo.mapper.AdminMapper; import com.example.demo.mapper.PermissionMapper; import com.example.demo.service.PermissionService; @@ -111,10 +109,40 @@ public class PermissionServiceImpl implements PermissionService { return permissionMapper.updateAdminRole(adminRole); } + //修改管理员状态（启用 不启用） @Override public Integer upadatePermission(Admin admin) throws Exception { return permissionMapper.updatePermission(admin); } + @Override + public Object updateAdmin(Admin admin)throws Exception { + + if(ObjectUtils.isEmpty(admin.getAccount())){ + throw new Exception("账号为空！"); + } + if(ObjectUtils.isEmpty( admin.getMarket())){ + throw new Exception("地区为空！"); + } + if(ObjectUtils.isEmpty( admin.getPostiton())){ + throw new Exception("职位为空！"); + } + + if(ObjectUtils.isEmpty( admin.getAdminName())){ + throw new Exception("用户名为空！"); + } + if(ObjectUtils.isEmpty( admin.getMachineId())){ + throw new Exception("机器编号为空！"); + } + if (admin.getMachineId().contains(",")) { + throw new Exception("机器编号格式错误"); + } + else { + + + return permissionMapper.upadateAdmin(admin); + } + } + } diff --git a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java index 2f724b3..2ea536a 100644 --- a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java @@ -39,7 +39,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { @Autowired private StatisticsMapper statisticsMapper; @Override - public WorkbenchCard getCard(String token) { + public WorkbenchCard getCard( ) { Date date=new Date();//当天 Date yday=generalService.getYesterday(); // 获取开始时间和结束时间（当天） @@ -83,7 +83,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { // 收集并行流结果为列表 .collect(Collectors.toList()); - return new WorkbenchCard(token, marketCards,new ArrayList<>(), markets, date, date); + return new WorkbenchCard( marketCards,new ArrayList<>(), markets, date, date); } /* @@ -97,7 +97,6 @@ public class WorkbenchServiceImpl implements WorkbenchService { if (currentStatistics != null&& ydayStatistics != null) { // 一次性获取全年统计数据（从年初到今天） Map yearlyStats = calculateAllSum(market, yearlyStartDate, date); - // 卡片一：当前金币相关 card.setCurrentPermanent(currentStatistics.getCurrentPermanent());//余量-永久金币 card.setCurrentFreeJune(currentStatistics.getCurrentFreeJune()); //余量-免费六月金币 @@ -127,25 +126,24 @@ public class WorkbenchServiceImpl implements WorkbenchService { card.setDailyReduce(totalConsume - totalRefund);//昨日总消耗 card.setYearlyConsume(yearlyStats.getOrDefault("consume", 0)); // 年累计消费 card.setYearlyRefund(yearlyStats.getOrDefault("refund", 0)); // 年累计退款 - card.setYearlyReduce(card.getYearlyConsume() - card.getYearlyRefund());//年累计消耗 // 卡片四：人头数相关 card.setRechargeNum(currentStatistics.getRechargeNum()); card.setFirstRecharge(currentStatistics.getFirstRecharge()); card.setYearlyRechargeNum(yearlyStats.getOrDefault("rechargeNum", 0)); - - // 周环比、日同比 card.setWow(calculateWeekOverWeek(market, currentDate)); card.setSumWow(calculateAllWeekOverWeek(date)); card.setDaily(calculateDayOverDay(market, currentDate)); card.setSumDaily(calculateAllDayOverDay(date)); + //更新时间 + card.setUpdateTime(currentStatistics.getUpdateTime()); } return card; } @Override - public WorkbenchCard getGraph(String token, Date startDate, Date endDate, List markets) { + public WorkbenchCard getGraph( Date startDate, Date endDate, List markets) { List marketGraphs = new ArrayList<>(); for (String market : markets) { @@ -161,7 +159,7 @@ public class WorkbenchServiceImpl implements WorkbenchService { graphs.setSumConsume(sums.get("consume")); marketGraphs.add(graphs); } - return new WorkbenchCard(token, new ArrayList<>(),marketGraphs,markets,startDate,endDate); + return new WorkbenchCard(new ArrayList<>(),marketGraphs,markets,startDate,endDate); } /* diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 03a28cf..0708cc3 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -23,7 +23,7 @@ current_free_june = current_free_june + COALESCE(#{currentFreeJune},0), current_free_december = current_free_december + COALESCE(#{currentFreeDecember},0), current_task_gold = current_task_gold + COALESCE(#{currentTaskGold},0), - recharge_num = recharge_num + COALESCE(#{rechargeNum},0) + recharge_num = #{rechargeNum} where jwcode = #{jwcode} diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index b75e6d8..fe08c89 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -27,6 +27,30 @@ where admin_id= #{id} + + update admin + + + admin_name= #{adminName}, + + + machine_id= #{machineId}, + + + account= #{account}, + + + postiton= #{postiton}, + + + remark= #{remark}, + + + market= #{market} + + + where id= #{id} + delete from admin where id=#{id}