diff --git a/pom.xml b/pom.xml
index 09fb9bb..bf598a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
com.example
demo
- 0.0.2-SNAPSHOT
-
+
+ 0.0.3-SNAPSHOT
demo
demo
diff --git a/src/main/java/com/example/demo/Util/GoldTistV2.java b/src/main/java/com/example/demo/Util/GoldTistV2.java
index 388f677..3e62c1f 100644
--- a/src/main/java/com/example/demo/Util/GoldTistV2.java
+++ b/src/main/java/com/example/demo/Util/GoldTistV2.java
@@ -186,7 +186,7 @@ public class GoldTistV2 {
* @参数介绍: @param lx 类型
* @参数介绍: @param jbs 金币数量
* @参数介绍: @param remark 备注
- * @参数介绍: @param yjjb 永久金币
+ * @参数介绍: @param yjjb 永久金币
* @参数介绍: @param czr 操作人
* @参数介绍: @param goodsname 商品名称
* @参数介绍: @return
diff --git a/src/main/java/com/example/demo/controller/ProductController.java b/src/main/java/com/example/demo/controller/ProductController.java
index 6f6d0d3..ddb45bc 100644
--- a/src/main/java/com/example/demo/controller/ProductController.java
+++ b/src/main/java/com/example/demo/controller/ProductController.java
@@ -19,4 +19,8 @@ public class ProductController {
public Result Product(@RequestBody Product product){
return Result.success(productService.findAll(product));
}
+ @PostMapping("/add")
+ public Result add(@RequestBody Product product){
+ return Result.success(productService.add(product));
+ }
}
diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/UserController.java
index dd63121..1f01e8f 100644
--- a/src/main/java/com/example/demo/controller/UserController.java
+++ b/src/main/java/com/example/demo/controller/UserController.java
@@ -8,6 +8,9 @@ import com.example.demo.sevice.UserSevice;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.HttpStatus;
+
import java.util.Arrays;
@@ -37,4 +40,14 @@ public class UserController {
public Result jwcode() throws Exception {
return Result.success(userSevice.jwcode());
}
+ @PostMapping("/add")
+ public Result User(@RequestBody User user) throws Exception{
+ try {
+ return Result.success(userSevice.add(user));
+
+ } catch (Exception e) {
+ log.error(Arrays.toString(e.getStackTrace()));
+ return Result.error(e.getMessage());
+ }
+ }
}
diff --git a/src/main/java/com/example/demo/domain/entity/Audit.java b/src/main/java/com/example/demo/domain/entity/Audit.java
index 4b612b7..f76da9b 100644
--- a/src/main/java/com/example/demo/domain/entity/Audit.java
+++ b/src/main/java/com/example/demo/domain/entity/Audit.java
@@ -11,7 +11,7 @@ import java.util.Date;
@Data
@NoArgsConstructor
-@JsonIgnoreProperties
+@JsonIgnoreProperties(ignoreUnknown = true)
public class Audit {
private Integer auditId;
private String jwcode;
@@ -47,6 +47,7 @@ private BigDecimal rechargeGold;
private String rechargeTime;
private String adminName;
-
+ private String sortField;
+ private String sortOrder;
}
diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java
index fd9816b..5004a09 100644
--- a/src/main/java/com/example/demo/mapper/AdminMapper.java
+++ b/src/main/java/com/example/demo/mapper/AdminMapper.java
@@ -11,9 +11,9 @@ import java.util.List;
public interface AdminMapper {
@Insert({
"insert into admin",
- "(name,jwcode,password,permission,area,admin_flag,create_time,remark,status1)",
+ "(name,jwcode,password,permission,area,store,admin_flag,create_time,remark,status1,machineId)",
"values",
- "(#{name},#{jwcode},,#{password},#{permission},#{area},#{admin_flag},now(),#{remark},#{status1})"
+ "(#{name},#{jwcode},,#{password},#{permission},#{area},#{store},#{admin_flag},now(),#{remark},#{status1},#{machineId})"
})
@Options(useGeneratedKeys = true,keyColumn = "admin_id",keyProperty = "adminId")
int insert(Admin admin);
diff --git a/src/main/java/com/example/demo/mapper/ProductMapper.java b/src/main/java/com/example/demo/mapper/ProductMapper.java
index e66b1f8..fb51f82 100644
--- a/src/main/java/com/example/demo/mapper/ProductMapper.java
+++ b/src/main/java/com/example/demo/mapper/ProductMapper.java
@@ -9,6 +9,9 @@ import java.util.List;
@Mapper
public interface ProductMapper {
+
+ int add(Product product);
+
@Select({
"select * from product"
})
diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java
index 851b5cf..adb1cbd 100644
--- a/src/main/java/com/example/demo/mapper/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/UserMapper.java
@@ -10,6 +10,9 @@ import java.util.List;
@Mapper
public interface UserMapper {
+
+ int add(User user);
+
@Select({
"