From 27222d4cb0cbc05c58c30fc2525f6ed5246619bb Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Mon, 24 Mar 2025 11:33:18 +0800
Subject: [PATCH] =?UTF-8?q?3.24=E6=96=B0=E5=A2=9E=E4=B8=8E=E6=A5=BC?=
 =?UTF-8?q?=E4=B8=8A=E5=AF=B9=E6=8E=A5=E7=9A=84=E7=9B=B8=E5=BA=94=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     |  4 ++--
 src/main/java/com/example/demo/Util/GoldTistV2.java         |  2 +-
 .../java/com/example/demo/controller/ProductController.java |  4 ++++
 .../java/com/example/demo/controller/UserController.java    | 13 +++++++++++++
 src/main/java/com/example/demo/domain/entity/Audit.java     |  5 +++--
 src/main/java/com/example/demo/mapper/AdminMapper.java      |  4 ++--
 src/main/java/com/example/demo/mapper/ProductMapper.java    |  3 +++
 src/main/java/com/example/demo/mapper/UserMapper.java       |  3 +++
 .../java/com/example/demo/serviceImpl/AuditServiceImpl.java |  4 ++--
 .../com/example/demo/serviceImpl/ProductServiceImpl.java    |  6 ++++++
 .../java/com/example/demo/serviceImpl/UserServiceImpl.java  |  9 +++++++++
 src/main/java/com/example/demo/sevice/ProductService.java   |  1 +
 src/main/java/com/example/demo/sevice/UserSevice.java       |  1 +
 src/main/resources/application.yml                          | 11 +++++++----
 src/main/resources/mapper/ProductMapper.xml                 | 10 ++++++++++
 src/main/resources/mapper/UserMapper.xml                    | 10 ++++++++++
 16 files changed, 77 insertions(+), 13 deletions(-)
 create mode 100644 src/main/resources/mapper/ProductMapper.xml
 create mode 100644 src/main/resources/mapper/UserMapper.xml

diff --git a/pom.xml b/pom.xml
index 09fb9bb..bf598a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<groupId>com.example</groupId>
 	<artifactId>demo</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
-<!--	<version>0.0.3-SNAPSHOT</version>-->
+<!--	<version>0.0.2-SNAPSHOT</version>-->
+	<version>0.0.3-SNAPSHOT</version>
 	<name>demo</name>
 	<description>demo</description>
 
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({
             "<script>",
             "select jwcode from user",
diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
index c50425a..5e812f9 100644
--- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
@@ -145,10 +145,10 @@ public class AuditServiceImpl implements AuditService {
         System.out.println(detailY);
 //        result = detailYMapper.add(detailY);
             if(paidGold != null && paidGold.compareTo(BigDecimal.ZERO) != 0) {
-                 GoldTistV2.addCoinNew(jwcode, 64, paidGold.doubleValue(), remark, 0, username, "金币");
+                 GoldTistV2.addCoinNew(jwcode, 55, paidGold.doubleValue(), remark, 0, username, "金币");
             }
             if(freeGold != null && freeGold.compareTo(BigDecimal.ZERO) != 0) {
-                GoldTistV2.addCoinNew(jwcode, 63, freeGold.doubleValue(), remark, 0, username, "金币");
+                GoldTistV2.addCoinNew(jwcode, 55, freeGold.doubleValue(), remark, 0, username, "金币");
             }
         }
         return auditMapper.update(audit);
diff --git a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
index 2ca842e..dd017fe 100644
--- a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
@@ -17,6 +17,12 @@ import java.util.List;
 @CacheConfig(cacheNames = "product")
 public class ProductServiceImpl implements ProductService {
     private final ProductMapper productMapper;
+
+    @Override
+    public int add(Product product) {
+        return productMapper.add(product);
+    }
+
     @Override
     public List<Product> findAll(Product product) {
         return productMapper.findAll(product);
diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
index 7f0985d..fb08232 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -52,6 +52,15 @@ public class UserServiceImpl implements UserSevice {
         return userMapper.selectJwcode();
     }
 
+    @Override
+    public int add(User user) throws Exception {
+        User sUser = userMapper.select(user.getJwcode());
+        if (!ObjectUtils.isEmpty(sUser)){
+            throw new Exception("已存在此用户");
+        }
+        return userMapper.add(user);
+    }
+
     //设置免费金币
 //    public User updateFreecoin(Detail userConsumeCoin) {
 //
diff --git a/src/main/java/com/example/demo/sevice/ProductService.java b/src/main/java/com/example/demo/sevice/ProductService.java
index 80a8218..053a79f 100644
--- a/src/main/java/com/example/demo/sevice/ProductService.java
+++ b/src/main/java/com/example/demo/sevice/ProductService.java
@@ -6,5 +6,6 @@ import com.example.demo.domain.entity.Product;
 import java.util.List;
 
 public interface ProductService {
+    int add(Product product);
     List<Product> findAll(Product product);
 }
diff --git a/src/main/java/com/example/demo/sevice/UserSevice.java b/src/main/java/com/example/demo/sevice/UserSevice.java
index 4673bdd..9879693 100644
--- a/src/main/java/com/example/demo/sevice/UserSevice.java
+++ b/src/main/java/com/example/demo/sevice/UserSevice.java
@@ -12,4 +12,5 @@ public interface UserSevice {
     PageInfo<User> searchForPage(Integer pageNum, Integer pageSize, User User);
     List<String> area();
     List<String> jwcode();
+    int add(User user) throws Exception;
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 67d9427..921220b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,9 +1,12 @@
 server:
-  port: 10702
+#  port: 10702
 #  port: 10010
-#  port:10704
+  port: 10704
 
 spring:
+  jackson:
+    deserialization:
+      fail-on-unknown-properties: false
   servlet:
     multipart:
       max-file-size: 10MB
@@ -17,8 +20,8 @@ spring:
       connection-timeout: 30000
       pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
-#    url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
     username: hwgold
     password: 'AGX4Z3YMxiCG3GR2'
   application:
diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml
new file mode 100644
index 0000000..29af172
--- /dev/null
+++ b/src/main/resources/mapper/ProductMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.ProductMapper">
+    <insert id="add" parameterType="com.example.demo.domain.entity.Product">
+        INSERT INTO user (price, name,listed_time,down_time,remark,subjects,type,product_flag,create_time)
+        VALUES (#{price}, #{name},#{listedTime},#{downTime},#{remark},#{subjects},#{type},#{productFlag},#{createTime})
+    </insert>
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
new file mode 100644
index 0000000..8f29fb7
--- /dev/null
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.UserMapper">
+    <insert id="add" parameterType="com.example.demo.domain.entity.User">
+        INSERT INTO user (jwcode, name, area)
+        VALUES (#{jwcode}, #{name}, #{area})
+    </insert>
+</mapper>
\ No newline at end of file