From d83e2977769b3d56f4ca6fdbf798e22d3940e003 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 06 三月 2024 18:00:45 +0800
Subject: [PATCH] 功能完善
---
system-run/src/main/resources/application-dev.yml | 2
user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java | 16 +++++
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 18 +++--
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 79 ++++++++++++++++++++++++++
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 8 ++
5 files changed, 113 insertions(+), 10 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 4536e8b..98b92c8 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -11,9 +11,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -22,13 +24,16 @@
* 璁惧(DeviceController)琛ㄦ帶鍒跺眰
*/
@Api(tags = "璁惧")
-@AllArgsConstructor
@RestController
@RequestMapping("/deviceScope")
public class DeviceController {
+ @Resource
private DeviceService deviceService;
+
+ @Value("${file.path}")
+ private String filePath;
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@PostMapping("/selectDeviceParameter")
@@ -78,16 +83,14 @@
}
//鍥剧墖涓婁紶
- @ApiOperation(value = "鍥剧墖涓婁紶")
+ @ApiOperation(value = "璁惧鍥剧墖涓婁紶")
@PostMapping("/uploadFile")
public Result uploadFile(MultipartFile file) {
-
- System.out.println(file.getOriginalFilename());
- String urlString = null;
- String pathName = null;
+ String urlString;
+ String pathName;
String filename = file.getOriginalFilename();
try {
- String path = "/Users/gaoaoy/webapp/images";
+ String path = filePath;
File realpath = new File(path);
if (!realpath.exists()) {
realpath.mkdirs();
@@ -95,7 +98,6 @@
pathName = UUID.randomUUID() + "_" + file.getOriginalFilename();
urlString = realpath + "/" + pathName;
file.transferTo(new File(urlString));
- System.out.println(pathName);
HashMap<String, String> map = new HashMap<>();
map.put("name", filename);
map.put("url", pathName);
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 347d78f..42b0aa6 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: D:/webapp/images
+ path: D:/Download
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
new file mode 100644
index 0000000..3533258
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -0,0 +1,79 @@
+package com.yuanchu.mom.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("user")
+public class Custom extends OrderBy implements Serializable {
+
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "璐﹀彿")
+ private String account;
+
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "鐢ㄦ埛鍚�")
+ private String name;
+
+ @ValueTableShow(10)
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer state;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "閭")
+ private String email;
+
+ @ValueTableShow(6)
+ @ApiModelProperty(value = "鐢佃瘽鍙风爜")
+ private String phone;
+
+ @ApiModelProperty(value = "閮ㄩ棬")
+ private String department;
+
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "瀹㈡埛鍗曚綅")
+ private String company;
+
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "鍗曚綅鍦板潃")
+ private String address;
+
+ @ValueTableShow(9)
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ApiModelProperty(value = "鏇存柊鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ private Integer isCustom;
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java b/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java
new file mode 100644
index 0000000..78685a5
--- /dev/null
+++ b/user-server/src/main/java/com/yuanchu/mom/mapper/CustomMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yuanchu.mom.dto.Custom;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CustomMapper extends BaseMapper<Custom> {
+
+// IPage<User> selectUserDtoPageList(IPage<UserPageDto> page, QueryWrapper<UserPageDto> ew);
+
+}
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index 587e028..e4817dc 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -61,8 +61,12 @@
private String department;
@ValueTableShow(8)
- @ApiModelProperty(value = "鍏徃")
+ @ApiModelProperty(value = "鍗曚綅")
private String company;
+
+ @ValueTableShow(8)
+ @ApiModelProperty(value = "鍗曚綅鍦板潃")
+ private String address;
@ApiModelProperty(value = "瑙掕壊涓婚敭")
private Integer roleId;
@@ -87,4 +91,6 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+ private Integer isCustom;
+
}
--
Gitblit v1.9.3