Browse Source

3.24新增与楼上对接的相应接口

Huang
huangqizhen 3 months ago
parent
commit
27222d4cb0
  1. 4
      pom.xml
  2. 2
      src/main/java/com/example/demo/Util/GoldTistV2.java
  3. 4
      src/main/java/com/example/demo/controller/ProductController.java
  4. 13
      src/main/java/com/example/demo/controller/UserController.java
  5. 5
      src/main/java/com/example/demo/domain/entity/Audit.java
  6. 4
      src/main/java/com/example/demo/mapper/AdminMapper.java
  7. 3
      src/main/java/com/example/demo/mapper/ProductMapper.java
  8. 3
      src/main/java/com/example/demo/mapper/UserMapper.java
  9. 4
      src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
  10. 6
      src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
  11. 9
      src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
  12. 1
      src/main/java/com/example/demo/sevice/ProductService.java
  13. 1
      src/main/java/com/example/demo/sevice/UserSevice.java
  14. 11
      src/main/resources/application.yml
  15. 10
      src/main/resources/mapper/ProductMapper.xml
  16. 10
      src/main/resources/mapper/UserMapper.xml

4
pom.xml

@ -10,8 +10,8 @@
</parent> </parent>
<groupId>com.example</groupId> <groupId>com.example</groupId>
<artifactId>demo</artifactId> <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> <name>demo</name>
<description>demo</description> <description>demo</description>

2
src/main/java/com/example/demo/Util/GoldTistV2.java

@ -186,7 +186,7 @@ public class GoldTistV2 {
* @参数介绍: @param lx 类型 * @参数介绍: @param lx 类型
* @参数介绍: @param jbs 金币数量 * @参数介绍: @param jbs 金币数量
* @参数介绍: @param remark 备注 * @参数介绍: @param remark 备注
* @参数介绍: @param yjjb 永久金币
* @参数介绍: @param yjjb 永久金币
* @参数介绍: @param czr 操作人 * @参数介绍: @param czr 操作人
* @参数介绍: @param goodsname 商品名称 * @参数介绍: @param goodsname 商品名称
* @参数介绍: @return * @参数介绍: @return

4
src/main/java/com/example/demo/controller/ProductController.java

@ -19,4 +19,8 @@ public class ProductController {
public Result Product(@RequestBody Product product){ public Result Product(@RequestBody Product product){
return Result.success(productService.findAll(product)); return Result.success(productService.findAll(product));
} }
@PostMapping("/add")
public Result add(@RequestBody Product product){
return Result.success(productService.add(product));
}
} }

13
src/main/java/com/example/demo/controller/UserController.java

@ -8,6 +8,9 @@ import com.example.demo.sevice.UserSevice;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import java.util.Arrays; import java.util.Arrays;
@ -37,4 +40,14 @@ public class UserController {
public Result jwcode() throws Exception { public Result jwcode() throws Exception {
return Result.success(userSevice.jwcode()); 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());
}
}
} }

5
src/main/java/com/example/demo/domain/entity/Audit.java

@ -11,7 +11,7 @@ import java.util.Date;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties
@JsonIgnoreProperties(ignoreUnknown = true)
public class Audit { public class Audit {
private Integer auditId; private Integer auditId;
private String jwcode; private String jwcode;
@ -47,6 +47,7 @@ private BigDecimal rechargeGold;
private String rechargeTime; private String rechargeTime;
private String adminName; private String adminName;
private String sortField;
private String sortOrder;
} }

4
src/main/java/com/example/demo/mapper/AdminMapper.java

@ -11,9 +11,9 @@ import java.util.List;
public interface AdminMapper { public interface AdminMapper {
@Insert({ @Insert({
"insert into admin", "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", "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") @Options(useGeneratedKeys = true,keyColumn = "admin_id",keyProperty = "adminId")
int insert(Admin admin); int insert(Admin admin);

3
src/main/java/com/example/demo/mapper/ProductMapper.java

@ -9,6 +9,9 @@ import java.util.List;
@Mapper @Mapper
public interface ProductMapper { public interface ProductMapper {
int add(Product product);
@Select({ @Select({
"select * from product" "select * from product"
}) })

3
src/main/java/com/example/demo/mapper/UserMapper.java

@ -10,6 +10,9 @@ import java.util.List;
@Mapper @Mapper
public interface UserMapper { public interface UserMapper {
int add(User user);
@Select({ @Select({
"<script>", "<script>",
"select jwcode from user", "select jwcode from user",

4
src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java

@ -145,10 +145,10 @@ public class AuditServiceImpl implements AuditService {
System.out.println(detailY); System.out.println(detailY);
// result = detailYMapper.add(detailY); // result = detailYMapper.add(detailY);
if(paidGold != null && paidGold.compareTo(BigDecimal.ZERO) != 0) { 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) { 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); return auditMapper.update(audit);

6
src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java

@ -17,6 +17,12 @@ import java.util.List;
@CacheConfig(cacheNames = "product") @CacheConfig(cacheNames = "product")
public class ProductServiceImpl implements ProductService { public class ProductServiceImpl implements ProductService {
private final ProductMapper productMapper; private final ProductMapper productMapper;
@Override
public int add(Product product) {
return productMapper.add(product);
}
@Override @Override
public List<Product> findAll(Product product) { public List<Product> findAll(Product product) {
return productMapper.findAll(product); return productMapper.findAll(product);

9
src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java

@ -52,6 +52,15 @@ public class UserServiceImpl implements UserSevice {
return userMapper.selectJwcode(); 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) { // public User updateFreecoin(Detail userConsumeCoin) {
// //

1
src/main/java/com/example/demo/sevice/ProductService.java

@ -6,5 +6,6 @@ import com.example.demo.domain.entity.Product;
import java.util.List; import java.util.List;
public interface ProductService { public interface ProductService {
int add(Product product);
List<Product> findAll(Product product); List<Product> findAll(Product product);
} }

1
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); PageInfo<User> searchForPage(Integer pageNum, Integer pageSize, User User);
List<String> area(); List<String> area();
List<String> jwcode(); List<String> jwcode();
int add(User user) throws Exception;
} }

11
src/main/resources/application.yml

@ -1,9 +1,12 @@
server: server:
port: 10702
# port: 10702
# port: 10010 # port: 10010
# port:10704
port: 10704
spring: spring:
jackson:
deserialization:
fail-on-unknown-properties: false
servlet: servlet:
multipart: multipart:
max-file-size: 10MB max-file-size: 10MB
@ -17,8 +20,8 @@ spring:
connection-timeout: 30000 connection-timeout: 30000
pool-name: HwgoldHikariCP pool-name: HwgoldHikariCP
driver-class-name: com.mysql.cj.jdbc.Driver 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 username: hwgold
password: 'AGX4Z3YMxiCG3GR2' password: 'AGX4Z3YMxiCG3GR2'
application: application:

10
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>

10
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>
Loading…
Cancel
Save