From 15375a1d0d07c61c132906ff8da45f67bcd711f6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 17 十一月 2022 15:51:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/TokenService.java | 5 +
src/main/java/com/lf/server/controller/all/SignController.java | 2
src/main/java/com/lf/server/controller/sys/UserController.java | 15 +++--
src/main/java/com/lf/server/controller/data/UploaderController.java | 30 +++++++++-
src/main/java/com/lf/server/entity/sys/TokenEntity.java | 10 +++
src/main/java/com/lf/server/service/data/UploaderService.java | 34 +++++++++++
说明.txt | 9 +-
data/日报.txt | 16 +++++
src/main/resources/mapper/sys/TokenMapper.xml | 2
9 files changed, 105 insertions(+), 18 deletions(-)
diff --git "a/data/\346\227\245\346\212\245.txt" "b/data/\346\227\245\346\212\245.txt"
index d14525a..b0cb074 100644
--- "a/data/\346\227\245\346\212\245.txt"
+++ "b/data/\346\227\245\346\212\245.txt"
@@ -105,4 +105,20 @@
涓嬪懆锛�
1锛塛eb寮�鍙戯細寮�鍙戞煡璇㈠姛鑳斤紙鐐规煡璇€�佺嚎鏌ヨ銆佺煩褰㈡煡璇€�佸渾鏌ヨ锛夈��
2锛夋湇鍔″紑鍙戯細寮�鍙戣祫婧愭棩蹇椼�佷护鐗岀鐞嗐�佺郴缁熼厤缃帴鍙ｃ��
+=========================================2022-11-10
+鏈懆锛�
+1 Web寮�鍙戯細
+1锛夌患鍚堝睍绀猴細
+鏍规嵁鏂癠I閲嶆柊鎼缓椤甸潰妗嗘灦锛屽疄鐜拌瑷�鍒囨崲銆佹牱寮忛鏍肩粺涓�锛�
+
+2锛夎繍缁寸鐞嗭細
+鏍规嵁璁捐閲嶇粯鑿滃崟绠＄悊銆佺敤鎴风鐞嗐�佸崟浣嶇鐞嗐�佽鑹茬鐞嗐�佹潈闄愮鐞嗙殑椤甸潰锛�
+
+2 鏈嶅姟寮�鍙戯細
+寮�鍙戣祫婧愭棩蹇椼�佷护鐗岀鐞嗐�佺郴缁熼厤缃帴鍙ｃ��
+
+涓嬪懆锛�
+1锛塛eb寮�鍙戯細寮�鍙戞煡璇㈠姛鑳斤紙鐐规煡璇€�佺嚎鏌ヨ銆佺煩褰㈡煡璇€�佸渾鏌ヨ锛夈��
+2锛夋湇鍔″紑鍙戯細寮�鍙戞暟鎹笂浼犮�佹爣缁樸�佸湪绾垮埗鍥炬帴鍙ｃ��
=========================================
+
diff --git a/src/main/java/com/lf/server/controller/all/SignController.java b/src/main/java/com/lf/server/controller/all/SignController.java
index aa6d42b..e4bf97f 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -139,7 +139,7 @@
return fail("鍒涘缓鐧诲綍鏃ュ織澶辫触", null);
}
- TokenEntity te = tokenService.getNewToken(ue.getId(), req);
+ TokenEntity te = tokenService.getNewToken(ue, req);
rows = tokenService.insertToken(te);
if (rows == 0) {
return fail("鍒涘缓浠ょ墝澶辫触", null);
diff --git a/src/main/java/com/lf/server/controller/data/UploaderController.java b/src/main/java/com/lf/server/controller/data/UploaderController.java
index acc5049..8b453ac 100644
--- a/src/main/java/com/lf/server/controller/data/UploaderController.java
+++ b/src/main/java/com/lf/server/controller/data/UploaderController.java
@@ -58,8 +58,8 @@
@SysLog()
@ApiOperation(value = "涓婁紶鍏冩暟鎹�")
@ResponseBody
- @PostMapping(value = "/uploadMetaData")
- public ResponseMsg<Object> uploadMetaData(String path, HttpServletRequest req, HttpServletResponse res) {
+ @PostMapping(value = "/uploadMetas")
+ public ResponseMsg<Object> uploadMetas(String path, HttpServletRequest req, HttpServletResponse res) {
try {
UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
@@ -71,7 +71,31 @@
return fail("娌℃湁鎵惧埌涓婁紶鏁版嵁", null);
}
- return success(list.size());
+ uploaderService.dealEntities(list);
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鍒犻櫎鍏冩暟鎹�")
+ @ResponseBody
+ @PostMapping(value = "/deleteMetas")
+ public ResponseMsg<Object> deleteMetas(List<MetaFileEntity> list, HttpServletRequest req) {
+ try {
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ if (null == list || list.isEmpty()) {
+ return fail("娌℃湁鎵惧埌鏂囦欢", null);
+ }
+
+ int rows = uploaderService.deleteFiles(list);
+
+ return success("鎴愬姛", rows);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
diff --git a/src/main/java/com/lf/server/controller/sys/UserController.java b/src/main/java/com/lf/server/controller/sys/UserController.java
index 0f532ce..400b4cd 100644
--- a/src/main/java/com/lf/server/controller/sys/UserController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -197,12 +197,13 @@
@ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.UserEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertUser", produces = "application/json; charset=UTF-8")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public ResponseMsg<Integer> insertUser(@RequestBody UserEntity entity, HttpServletRequest req) {
try {
- String str = userService.validateNewPwd(entity);
+ /*String str = userService.validateNewPwd(entity);
if (str != null) {
return fail(str, -1);
- }
+ }*/
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
@@ -223,6 +224,7 @@
@ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<UserEntity>", paramType = "body", example = "")
})
@PostMapping(value = "/insertUsers", produces = "application/json; charset=UTF-8")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public ResponseMsg<Integer> insertUsers(@RequestBody List<UserEntity> list, HttpServletRequest req) {
try {
if (list == null || list.isEmpty()) {
@@ -231,10 +233,10 @@
UserEntity ue = tokenService.getCurrentUser(req);
for (UserEntity entity : list) {
- String str = userService.validateNewPwd(entity);
+ /*String str = userService.validateNewPwd(entity);
if (str != null) {
return fail(str, -1);
- }
+ }*/
if (ue != null) {
entity.setCreateUser(ue.getId());
}
@@ -291,12 +293,13 @@
})
@ResponseBody
@PostMapping(value = "/updateUser", produces = "application/json; charset=UTF-8")
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
public ResponseMsg<Integer> updateUser(@RequestBody UserEntity entity, HttpServletRequest req) {
try {
- String str = userService.validateOldPwd(entity);
+ /*String str = userService.validateOldPwd(entity);
if (str != null) {
return fail(str, -1);
- }
+ }*/
UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
diff --git a/src/main/java/com/lf/server/entity/sys/TokenEntity.java b/src/main/java/com/lf/server/entity/sys/TokenEntity.java
index 6b5299d..6fae94a 100644
--- a/src/main/java/com/lf/server/entity/sys/TokenEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/TokenEntity.java
@@ -13,6 +13,8 @@
private int id;
+ private String uname;
+
private String token;
private int duration;
@@ -39,6 +41,14 @@
this.id = id;
}
+ public String getUname() {
+ return uname;
+ }
+
+ public void setUname(String uname) {
+ this.uname = uname;
+ }
+
public String getToken() {
return token;
}
diff --git a/src/main/java/com/lf/server/service/data/UploaderService.java b/src/main/java/com/lf/server/service/data/UploaderService.java
index d4f4802..a6d7196 100644
--- a/src/main/java/com/lf/server/service/data/UploaderService.java
+++ b/src/main/java/com/lf/server/service/data/UploaderService.java
@@ -1,7 +1,6 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.MetaFileEntity;
-import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -117,6 +116,39 @@
}
/**
+ * 鑷悊瀹炰綋闆嗗悎
+ */
+ public void dealEntities(List<MetaFileEntity> list) {
+ for (MetaFileEntity entity : list) {
+ entity.setPath(FileHelper.getRelativePath(entity.getPath()));
+ }
+ }
+
+ /**
+ * 鍒犻櫎鏂囦欢
+ * @param list 瀹炰綋闆嗗悎
+ * @return
+ */
+ public Integer deleteFiles(List<MetaFileEntity> list){
+ String root=pathHelper.getConfig().getTempPath();
+
+ int count = 0;
+ for (MetaFileEntity entity : list) {
+ if (!StringHelper.isEmpty(entity.getPath())){
+ String file=root+File.separator+entity.getPath();
+
+ File f=new File(file);
+ if (f.exists()){
+ f.delete();
+ count++;
+ }
+ }
+ }
+
+ return count;
+ }
+
+ /**
* 鑾峰彇鍙傛暟
* Enumeration<String> headers = req.getHeaderNames();
* Enumeration<String> attributes = req.getAttributeNames();
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 8678a50..a1e2dee 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -96,14 +96,15 @@
/**
* 鑾峰彇鏂扮殑浠ょ墝瀹炰綋绫�
*/
- public TokenEntity getNewToken(int userid, HttpServletRequest req) {
+ public TokenEntity getNewToken(UserEntity ue, HttpServletRequest req) {
TokenEntity te = new TokenEntity();
te.setToken(WebHelper.getGuid());
te.setDuration(SettingData.TOKEN_EXPIRE);
te.setExpire(WebHelper.getTimestamp(SettingData.TOKEN_EXPIRE));
te.setType(0);
te.setIp(WebHelper.getIpAddress(req));
- te.setCreateUser(userid);
+ te.setCreateUser(ue.getId());
+ te.setUname(ue.getUname());
return te;
}
diff --git a/src/main/resources/mapper/sys/TokenMapper.xml b/src/main/resources/mapper/sys/TokenMapper.xml
index e69dfc8..c44b465 100644
--- a/src/main/resources/mapper/sys/TokenMapper.xml
+++ b/src/main/resources/mapper/sys/TokenMapper.xml
@@ -49,7 +49,7 @@
</select>
<select id="selectOneByToken" resultType="com.lf.server.entity.sys.TokenEntity">
- select * from lf.sys_token where token = #{token} and expire > now() limit 1
+ select a.*,fn_uname(a.create_user) uname from lf.sys_token a where token = #{token} and expire > now() limit 1
</select>
<insert id="insertToken" parameterType="com.lf.server.entity.sys.TokenEntity">
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index ff579e9..5f05ada 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -43,18 +43,19 @@
42.寮�鍙戞牴鎹悕绉版ā绯婃悳绱㈢敤鎴枫�佸崟浣嶇殑鍓�10鏉¤褰�
43.鏋勫缓QGIS宸ョ▼锛屼娇鐢≒ython杩愯宸ョ▼
44.寮�鍙慟GIS鐢熸垚涓撻鍥惧姛鑳�
-45.寮�鍙戞牴鎹爣缁楯SON鏁版嵁鐢熸垚shp鏂囦欢骞朵笅杞� <
-46.
+45.寮�鍙戞牴鎹爣缁楯SON鏁版嵁鐢熸垚shp鏂囦欢骞朵笅杞�
+46.鍒涘缓QGIS鍑哄浘妯℃澘锛屽紑鍙戞牴鎹ā鏉垮嚭鍥惧姛鑳� <
47.
48.
49.
50.
-----------------------------------------------
.寮�鍙戜笂浼爏hp鏂囦欢杞崲涓篔SON鏁版嵁鎺ュ彛
-.鍒涘缓QGIS鍑哄浘妯℃澘
.寮�鍙慟GIS鍑哄浘鐨凜#鏈嶅姟
.閲囩敤鏍煎紡鍖栧弬鏁拌繍琛孭ython绋嬪簭
-.
+.寮�鍙�.net鏈嶅姟璋冪敤Python绋嬪簭锛屽疄鐜版帴鍙ｅ嚭鍥惧姛鑳�
+.寮�鍙戣鍙朎xcel琛ㄦ牸鍔熻兘
+.寮�鍙戞牴鎹疄浣撳悕绉板姩鎬佽鍙朎xcel鍔熻兘
.
----------------------------------------------------------------------------------------------------
java 璋冪敤gdal璇诲彇gdb鏁版嵁锛宭inux涓媕ava璋冪敤gdal锛�
--
Gitblit v1.9.3