From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/performance/controller/PerformanceController.java | 88 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java b/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java
index 1d5991c..fe70c79 100644
--- a/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java
+++ b/src/main/java/org/springblade/modules/performance/controller/PerformanceController.java
@@ -16,23 +16,26 @@
*/
package org.springblade.modules.performance.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.performance.entity.Performance;
-import org.springblade.modules.performance.vo.PerformanceVO;
import org.springblade.modules.performance.service.IPerformanceService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.performance.vo.PerformanceVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* 保安员表现管理
@@ -87,7 +90,16 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入performance")
public R save(@Valid @RequestBody Performance performance) {
- return R.status(performanceService.save(performance));
+ boolean save = performanceService.save(performance);
+ String s1 =
+ "insert into sys_performance(id,securityId,Achievements,time,score) " +
+ "values(" + "'" + performance.getId() + "'" + "," +
+ "'" + performance.getSecurityid() + "'" + "," +
+ "'" + performance.getAchievements() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" + "," +
+ "'" + performance.getScore() + "'" + ")";
+ FtpUtil.sqlFileUpload(s1);
+ return R.status(save);
}
/**
@@ -97,8 +109,17 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入performance")
public R update(@Valid @RequestBody Performance performance) {
- return R.status(performanceService.updateById(performance));
+ boolean b = performanceService.updateById(performance);
+ //内网同步
+ String s1 = "update sys_performance set securityId = " + "'" + performance.getSecurityid() + "'" +
+ ",Achievements = " + "'" + performance.getAchievements() + "'" +
+ ",time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(performance.getTime()) + "'" +
+ ",score = " + "'" + performance.getScore() + "'" +
+ " " + "where id = " + "'" + performance.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.status(b);
}
+
/**
* 新增或修改
@@ -122,4 +143,53 @@
}
+ /**
+ * 查询本年所有月份的表现差的数量
+ * @return
+ */
+ @GetMapping("/queryYearPer")
+ public R queryYearAlarm() {
+ Calendar cal = Calendar.getInstance();
+ String year = String.valueOf(cal.get(Calendar.YEAR));
+ Map<String, String> map = performanceService.queryYearPer(year);
+ map = (HashMap<String, String>) sortMapBykeyAsc(map) ;//key升序
+ return R.data(map);
+ }
+
+ //升序
+ public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
+ Map<String, String> sortedMap = new LinkedHashMap<String, String>();
+ try {
+ if (oriMap != null && !oriMap.isEmpty()) {
+ List<Map.Entry<String, String>> entryList = new ArrayList<Map.Entry<String, String>>(oriMap.entrySet());
+ Collections.sort(entryList,
+ new Comparator<Map.Entry<String, String>>() {
+ public int compare(Map.Entry<String, String> entry2,
+ Map.Entry<String, String> entry1) {
+ int value2 = 0, value1 = 0;
+ try {
+ value2 = Integer.parseInt(entry1.getKey());
+ value1 = Integer.parseInt(entry2.getKey());
+ } catch (NumberFormatException e) {
+ value2 = 0;
+ value1 = 0;
+ }
+ return value1 - value2;
+ }
+ });
+ Iterator<Map.Entry<String, String>> iter = entryList.iterator();
+ Map.Entry<String, String> tmpEntry = null;
+ while (iter.hasNext()) {
+ tmpEntry = iter.next();
+ sortedMap.put(tmpEntry.getKey(), tmpEntry.getValue());
+ }
+ }
+ } catch (Exception e) {
+ }
+ return sortedMap;
+ }
+
+
+
+
}
--
Gitblit v1.9.3