diff --git a/pom.xml b/pom.xml
index 6238311..76ce931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,6 +166,13 @@
+
+
+ org.apache.poi
+ poi
+ 5.2.2
+
+
diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java
index 7338f2d..3595534 100644
--- a/src/main/java/com/zh/project0512/controller/UtilsController.java
+++ b/src/main/java/com/zh/project0512/controller/UtilsController.java
@@ -86,18 +86,50 @@ public class UtilsController {
return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "上传失败");
}
- @PostMapping("/uploadImg")
- public Result uploadImg(@RequestParam("file") MultipartFile file, @RequestParam(value = "name", defaultValue = "name") String name) {
+// @PostMapping("/uploadImg")
+// public Result uploadImg(@RequestParam("file") MultipartFile file, @RequestParam(value = "name", defaultValue = "name") String name) {
+// try {
+// String homeImage = aliyunOss.checkImage(file);//此处是调用上传服务接口
+// String fileUrl = aliyunOss.getImgUrl(homeImage);
+// String fileType = FileTypeUtil.getcontentType((fileUrl.substring(fileUrl.lastIndexOf("."))));
+// System.out.println(fileType == "video/mp4" ? 1 : (fileType == "image/jpg" ? 2 : (fileType == "text/plain" ? 3 : 0)));
+// Result result = Result.success("上传成功！");
+// return result;
+// } catch (Exception e) {
+// e.printStackTrace();
+// return Result.fail(HttpStatusEnum.NOT_FOUND);
+// }
+// }
+
+ @Operation(summary = "编辑器内上传")
+ @PostMapping("/upload2")
+ @ResponseBody
+ public JSONObject upload2(@RequestParam("file") MultipartFile file, @RequestParam(required = false) String name) {
+ JSONObject res = new JSONObject();
+ res.put("errno",0);
+ if (file.isEmpty()) {
+ res.put("message","请选择文件");
+ return res;
+ }
+ String fileName = file.getOriginalFilename();//文件名
+ String newFileName = UUID.randomUUID().toString().replace("-", "") + LocalDateTime.now().toInstant(ZoneOffset.ofHours(8)).toEpochMilli() + fileName.substring(fileName.lastIndexOf("."));
+ File dest = new File(path + "/" + newFileName);
+ if (!dest.getParentFile().exists()) {
+ dest.getParentFile().mkdirs();
+ }
try {
- String homeImage = aliyunOss.checkImage(file);//此处是调用上传服务接口
- String fileUrl = aliyunOss.getImgUrl(homeImage);
- String fileType = FileTypeUtil.getcontentType((fileUrl.substring(fileUrl.lastIndexOf("."))));
- System.out.println(fileType == "video/mp4" ? 1 : (fileType == "image/jpg" ? 2 : (fileType == "text/plain" ? 3 : 0)));
- Result result = Result.success("上传成功！");
- return result;
- } catch (Exception e) {
+ file.transferTo(dest);
+ res.replace("errno",1);
+ res.put("alt", fileName);
+ res.put("url", "/upload/" + newFileName);
+ res.put("fileType", FileTypeUtil.getcontentType((fileName.substring(fileName.lastIndexOf(".")))));
+ res.put("fileTypeNum", FileTypeUtil.getcontentTypeNum((fileName.substring(fileName.lastIndexOf(".")))));
+ return res;
+ } catch (IOException e) {
e.printStackTrace();
- return Result.fail(HttpStatusEnum.NOT_FOUND);
}
+ res.put("message","上传失败");
+ return res;
}
+
}
diff --git a/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java b/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java
index 05104fa..9c66314 100644
--- a/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java
+++ b/src/main/java/com/zh/project0512/controller/wxApp/UserUController.java
@@ -45,7 +45,7 @@ public class UserUController {
public Result login(@RequestBody @Parameter(hidden = true) JSONObject obj) {
JSONObject res = weChatUtil.auth(obj.getString("code"));
String openid = res.getString("openid");
- User u = userService.selByOpenid(openid);
+ Map u = userService.selByOpenid2(openid);
if (null == u) {
return Result.fail(HttpStatusEnum.USER_NOT_EXIST, "未注册！");
}
diff --git a/src/main/java/com/zh/project0512/mapper/UserMapper.java b/src/main/java/com/zh/project0512/mapper/UserMapper.java
index 07a56b9..4ff91bd 100644
--- a/src/main/java/com/zh/project0512/mapper/UserMapper.java
+++ b/src/main/java/com/zh/project0512/mapper/UserMapper.java
@@ -23,6 +23,8 @@ import java.util.Map;
public interface UserMapper extends BaseMapper {
@Select("SELECT * FROM user where openid=#{openid} ")
User selByOpenid(@Param("openid") String openid);
+ @Select("SELECT t1.*,t2.name as departmentName FROM user t1 left join qywxDepartment t2 on t1.main_department = t2.departmentId where openid=#{openid} ")
+ Map selByOpenid2(@Param("openid") String openid);
@Select("UPDATE user set token=#{token},lastLoginAt=#{time} where openid=#{openid}")
void updByOpenid(String openid, String token, LocalDateTime time);
@Select("SELECT t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.creatAt,t1.updateAt,t1.lastLoginAt" +
diff --git a/src/main/java/com/zh/project0512/model/User.java b/src/main/java/com/zh/project0512/model/User.java
index bcf6c68..b722116 100644
--- a/src/main/java/com/zh/project0512/model/User.java
+++ b/src/main/java/com/zh/project0512/model/User.java
@@ -83,6 +83,7 @@ public class User extends Model {
* 最高级部门id
*/
@Schema(title = "最高级部门id")
+ @TableField("sub_department")
private Integer sub_department;
/**
* 创建时间
diff --git a/src/main/java/com/zh/project0512/service/IUserService.java b/src/main/java/com/zh/project0512/service/IUserService.java
index c301222..2468fd2 100644
--- a/src/main/java/com/zh/project0512/service/IUserService.java
+++ b/src/main/java/com/zh/project0512/service/IUserService.java
@@ -21,6 +21,7 @@ import java.util.Map;
*/
public interface IUserService extends IService {
public User selByOpenid(String openid);
+ Map selByOpenid2(@Param("openid") String openid);
public void updByOpenid(String openid, String token, LocalDateTime time);
IPage