From 351b9a53cb9ecebdf8f79db0117f540d9c42c2a4 Mon Sep 17 00:00:00 2001
From: whycrzg <ruanzhigang@whycst.com>
Date: 星期二, 23 二月 2021 17:19:23 +0800
Subject: [PATCH] update
---
src/main/java/com/fgkj/controller/MyFileController.java | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/MyFileController.java b/src/main/java/com/fgkj/controller/MyFileController.java
index 18ce197..fca786f 100644
--- a/src/main/java/com/fgkj/controller/MyFileController.java
+++ b/src/main/java/com/fgkj/controller/MyFileController.java
@@ -1,40 +1,28 @@
package com.fgkj.controller;
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import com.fgkj.dto.*;
+import com.fgkj.mapper.UinfDaoFactory;
+import com.fgkj.services.User_logService;
+import com.fgkj.util.*;
+import com.google.gson.Gson;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-
-import com.fgkj.mapper.DAOHelper;
-import com.fgkj.mapper.UinfDaoFactory;
-import com.fgkj.dto.BattInf;
-import com.fgkj.dto.BattMap_information;
-import com.fgkj.dto.ImageSize;
-import com.fgkj.dto.MyFile;
-import com.fgkj.dto.ServiceModel;
-import com.fgkj.dto.User_inf;
-import com.fgkj.dto.User_log;
-import com.fgkj.services.User_logService;
-import com.google.gson.Gson;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
@RequestMapping("myFile")
@RestController
-@Api
+@Api(tags = "myFile鎺ュ彛")
public class MyFileController{
@@ -50,6 +38,7 @@
//涓婁紶鏂囦欢
@PostMapping("/uploadTestFile")
+ @ApiOperation(notes = "",value="byInfo")
public ServiceModel UploadTestFile(@RequestParam File[] file,String[] fileFileName,String battName){
HttpServletResponse res = ActionUtil.getResponse();
res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
@@ -122,6 +111,7 @@
}
@PostMapping("uploadIphoneFile")
+ @ApiOperation(notes = "",value="byInfo")
public ServiceModel UploadIphoneFile(@RequestParam String filestr,String fname,String battname){
HttpServletResponse res = ActionUtil.getResponse();
res.setHeader("Access-Control-Allow-Origin", "*"); //鍏佽璺ㄥ煙璁块棶
@@ -196,6 +186,7 @@
//涓婁紶鏈烘埧瑙嗛鎺ュ彛
@PostMapping("uploadStationFile")
+ @ApiOperation(notes = "",value="涓婁紶鏈烘埧瑙嗛鎺ュ彛")
public ServiceModel uploadStationFile(@RequestBody BattInf binf,@RequestParam File[] file,String[] fileFileName){
// BattInf binf = getGson().fromJson(json, BattInf.class);
String fileRoot = "stationsrc";
@@ -225,7 +216,8 @@
*
* 鑾峰彇鎸囧畾鏈烘埧寰楄祫婧�
*/
- @GetMapping("stationSource")
+ @PostMapping("stationSource")
+ @ApiOperation(notes = "",value="鑾峰彇鎸囧畾鏈烘埧寰楄祫婧�")
public ServiceModel searchStationSource(@RequestBody BattInf binf){
String fileRoot = "stationsrc"; //瀛樻斁鏈烘埧璧勬簮鏂囦欢鐨勬枃浠跺す
// BattInf binf = getGson().fromJson(json, BattInf.class);
@@ -301,6 +293,7 @@
//涓婁紶鏈烘埧瑙嗛鎺ュ彛(鎵嬫満绔�)
@PostMapping("uploadStationFile4Mobile")
+ @ApiOperation(notes = "",value="涓婁紶鏈烘埧瑙嗛鎺ュ彛(鎵嬫満绔�)")
public ServiceModel uploadStationFile_mobile(@RequestBody BattInf binf,@RequestParam File[] file,String[] fileFileName){
// BattInf binf = getGson().fromJson(json, BattInf.class);
String fileRoot = "stationsrc";
@@ -383,7 +376,7 @@
//璁剧疆鏃堕棿
- g.drawString("鏃堕棿:"+DAOHelper.sdf.format(new Date()), 0 , font_size*4);
+ g.drawString("鏃堕棿:"+ DateUtil.sdf.format(new Date()), 0 , font_size*4);
//璁剧疆鏈烘埧id
g.drawString("鏈烘埧ID:"+binfmation.getStationId(), 0 , font_size*5);
//璁剧疆澶囨敞
@@ -469,6 +462,7 @@
* @return
*/
@GetMapping("readAllStation")
+ @ApiOperation(notes = "",value="璇诲彇鎵�鏈変笂浼犺繃鍥剧墖鍜岃棰戠殑鏈烘埧id鏂囦欢澶�")
public ServiceModel ReadAllStation() {
String fileRoot = "stationsrc";
ServiceModel model = new ServiceModel();
@@ -499,6 +493,7 @@
* @return
*/
@DeleteMapping("file")
+ @ApiOperation(notes = "",value="鍒犻櫎鎸囧畾鐨勮祫婧愭枃浠�")
public ServiceModel deleteFile(@RequestBody MyFile myFile) {
ServiceModel model = new ServiceModel();
// MyFile myfile = getGson().fromJson(json, MyFile.class);
@@ -519,7 +514,7 @@
e.printStackTrace();
}
{
- String msg=((User_inf)ActionUtil.getUser()).getUName()+"鍒犻櫎"+myFile.getFilePath()+"鏈烘埧鐨�"+myFile.getFileName();
+ String msg=((User_inf)ActionUtil.getUser()).getuName()+"鍒犻櫎"+myFile.getFilePath()+"鏈烘埧鐨�"+myFile.getFileName();
User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
listU.add(ulog);
(new User_logService()).addPro(listU);//灏嗙敤鎴风殑鎿嶄綔璁板綍涓嬫潵
@@ -530,13 +525,13 @@
return model;
}
-
+ /*
public static void main(String[] args) {
- /*String filePath = "D:/test/a/a.txt";
+ *//*String filePath = "D:/test/a/a.txt";
//ActionUtil.createFileRootIFNotExist(filePath);
File file = new File(filePath);
- System.out.println(ActionUtil.tojson(file));*/
+ System.out.println(ActionUtil.tojson(file));*//*
//GraphicsFile("鎴戞槸椴佹槦浼�","D:\\1.jpg","D:\\2.jpg",0,new Color(255,0,0),"JPG");
BattMap_information binfmation=new BattMap_information();
binfmation.setStationId("42000001");
@@ -548,5 +543,5 @@
String filePath = "D:\\2.jpg";
//String filename="2.jpg";
GraphicsFile(binfmation,file,filePath);
- }
+ }*/
}
--
Gitblit v1.9.1