后端框架第二版接口

demo/Admin/src/main/java/com/example/admin/controller/AdminController.java

@@ -0,0 +1,20 @@
+package com.example.admin.controller;
+
+import com.example.commons.domain.entity.Admin;
+import com.example.commons.sevice.AdminService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class AdminController {
+    private final AdminService adminService;
+    @PostMapping("/login")
+    public String login(@RequestBody Admin admin) {
+
+    }
+}

demo/Admin/src/main/java/com/example/admin/mapper/AdminMapper.java

@@ -0,0 +1,15 @@
+package com.example.admin.mapper;
+
+import com.example.commons.domain.entity.Admin;
+import com.example.commons.sevice.AdminService;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface AdminMapper {
+    @Select({
+            "select * from admin",
+            "where username=#{username}"
+    })
+    Admin selectByName(String username);
+}

demo/Admin/src/main/java/com/example/admin/service/AdminServiceImpl.java

@@ -0,0 +1,24 @@
+package com.example.admin.service;
+
+import com.example.commons.domain.entity.Admin;
+import com.example.commons.sevice.AdminService;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AdminServiceImpl implements AdminService {
+
+
+//    private
+    @Override
+    public Admin login(Admin admin) throws Exception {
+//        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(admin.getUsername(),admin.getPassword());
+//
+//        Authentication authentiction = authentication
+        return null;
+    }
+}

demo/Admin/src/main/resources/application.yml

@@ -0,0 +1,18 @@
+server:
+  port: 10010
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
+    username:  hwgold
+    password: 'AGX4Z3YMxiCG3GR2'
+  application:
+    name: recharge
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+upload:
+  path: D:\\gold1\

demo/audit/src/main/java/com/example/audit/controller/AuditController.java

@@ -48,5 +48,14 @@ public class AuditController {
             return Result.success(auditService.searchForPage(page.getPageNum(),page.getPageSize(),page.getAudit()));
         }
     }
+    @PostMapping("/refund")
+    public Result searchForPage(@RequestBody Page page){
+        if(ObjectUtils.isEmpty(page.getPageNum())){
+            return Result.success(auditService.searchForDetail(page.getConsumeDetail()));
+        }
+        else {
+            return Result.success(auditService.searchForConsumeDetail(page.getPageNum(), page.getPageSize(), page.getConsumeDetail()));
+        }
+    }
 }
 

demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java

@@ -1,6 +1,7 @@
 package com.example.audit.mapper;
 
 import com.example.commons.domain.entity.Audit;
+import com.example.commons.domain.vo.ConsumeDetail;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -43,4 +44,19 @@ public interface AuditMapper {
             "</script>"
     })
     List<Audit> select(Audit Audit);
+    @Select({
+            "<script>",
+            "select detail.*,audit.name as admin_name,audit.status,audit.reson from detail",
+            "inner join audit on detail.detail_id = audit.refund_id",
+            "<where>",
+            "<if test='activityId!=null'>and activity_id=#{activityId}</if>",
+            "<if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>",
+            "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
+            "<if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>",
+            "<if test='area!=null and area.length>0'>and area like concat('%',#{area},'%')</if>",
+            "<if test='status!=null'>and audit.status=#{status}</if>",
+            "</where>",
+            "</script>"
+    })
+    List<ConsumeDetail> selectCon(ConsumeDetail consumeDetail);
 }

demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java

@@ -4,6 +4,7 @@ package com.example.audit.service;
 
 import com.example.audit.mapper.AuditMapper;
 import com.example.commons.domain.entity.Audit;
+import com.example.commons.domain.vo.ConsumeDetail;
 import com.example.commons.sevice.AuditService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -38,4 +39,16 @@ public class AuditServiceImpl implements AuditService {
         List<Audit> list= auditMapper.select(audit);
         return new PageInfo<>(list);
     }
+
+    @Override
+    public List<ConsumeDetail> searchForDetail(ConsumeDetail consumeDetail) {
+        return auditMapper.selectCon(consumeDetail);
+    }
+
+    @Override
+    public PageInfo<ConsumeDetail> searchForConsumeDetail(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail) {
+        PageHelper.startPage(pageNum,pageSize);
+        List<ConsumeDetail> list= auditMapper.selectCon(consumeDetail);
+        return new PageInfo<>(list);
+    }
 }

demo/commons/src/main/java/com/example/commons/Util/UploadUtil.java

@@ -0,0 +1,54 @@
+package com.example.commons.Util;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.UUID;
+
+public class UploadUtil {
+
+	/**
+	 * 将文件保存到指定路径 
+	 * @return
+	 */
+	public static String save(MultipartFile file, String path) {
+		
+		// 验证文件是不是传了
+		if (file.getSize() <= 0) {
+			return null;
+		}
+		
+		// 验证文件夹是否存在
+		File pathFile = new File(path);
+		if (!pathFile.exists()) {
+			// 创建
+			if (!pathFile.mkdirs()) {
+				return null;
+			}
+		}
+		
+		// 生UUID作为新的文件名
+		String fileName = UUID.randomUUID().toString();
+		String oldName = file.getOriginalFilename();
+		
+		if (oldName.lastIndexOf(".")>=0) {
+			String suffix = oldName.substring(oldName.lastIndexOf("."));
+			fileName += suffix;
+		}
+		
+		// 创建一个文件流
+		try (OutputStream out = new FileOutputStream(path + fileName) ){
+			// 把上传的文件,写到这个流里面
+			out.write(file.getBytes());
+			
+			// 写成功了
+			return fileName;
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+		
+		return null;
+	}
+}

demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java

@@ -32,4 +32,7 @@ public class ConsumeDetail {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
+    private String adminName;
+    private String reson;
+
 }

demo/commons/src/main/java/com/example/commons/domain/vo/Page.java

@@ -16,4 +16,5 @@ public class Page {
     private Activity activity;
     private Rate rate;
     private Audit audit;
+    private ConsumeDetail consumeDetail;
 }

demo/commons/src/main/java/com/example/commons/sevice/AdminService.java

@@ -0,0 +1,7 @@
+package com.example.commons.sevice;
+
+import com.example.commons.domain.entity.Admin;
+
+public interface AdminService {
+    Admin login(Admin admin)throws Exception;
+}

demo/commons/src/main/java/com/example/commons/sevice/AuditService.java

@@ -2,6 +2,7 @@ package com.example.commons.sevice;
 
 import com.example.commons.domain.entity.Audit;
 import com.example.commons.domain.entity.Recharge;
+import com.example.commons.domain.vo.ConsumeDetail;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
@@ -11,5 +12,7 @@ public interface AuditService {
     int edit(Audit audit);
     List<Audit> search(Audit audit) ;
     PageInfo<Audit> searchForPage(Integer pageNum, Integer pageSize, Audit audit);
+    List<ConsumeDetail> searchForDetail(ConsumeDetail consumeDetail);
+    PageInfo<ConsumeDetail> searchForConsumeDetail(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail);
 }
 

demo/pom.xml

@@ -22,6 +22,7 @@
         <module>commons</module>
         <module>user</module>
         <module>audit</module>
+        <module>Admin</module>
     </modules>
 
     <properties>
@@ -54,8 +55,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot
+            </groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
     </dependencies>
 
+
     <dependencyManagement>
         <dependencies>
             <dependency>

demo/recharge/src/main/java/com/example/recharge/config/WebConfig.java

@@ -0,0 +1,16 @@
+package com.example.recharge.config;
+
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configurable
+public class WebConfig implements WebMvcConfigurer {
+    @Value("${upload.path}")
+    private String path;
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/upload/**").addResourceLocations("file:" + path);
+    }
+}

demo/recharge/src/main/java/com/example/recharge/controller/UploadController.java

@@ -0,0 +1,25 @@
+package com.example.recharge.controller;
+
+
+import com.example.commons.Util.UploadUtil;
+import com.example.commons.domain.vo.Result;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@RestController
+@RequestMapping("/upload")
+@CrossOrigin
+public class UploadController {
+    @Value("${upload.path}")
+    private String path;
+
+    @PostMapping
+    public Result upload(MultipartFile file) {
+        String fileName = UploadUtil.save(file,path);
+        return Result.success(fileName);
+    }
+}

demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java

@@ -37,10 +37,11 @@ public interface RechargeMapper {
                     "INNER JOIN `admin` on recharge.admin_id = `admin`.admin_id",
             "<where>",
             "flag='1'",
-            "<if test='activityId!=null'>and activity_id=#{activityId}</if>",
+            "<if test='activityId!=null'>and recharge.activity_id=#{activityId}</if>",
+            "<if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>",
             "<if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>",
-            "<if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>",
-            "<if test='area!=null and area.length>0'>and area like concat('%',#{area},'%')</if>",
+            "<if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>",
+            "<if test='area!=null and area.length>0'>and recharge.area like concat('%',#{area},'%')</if>",
             "<if test='status!=null'>and audit.status=#{status}</if>",
             "</where>",
             "</script>"

demo/recharge/src/main/resources/application.yml

@@ -13,3 +13,6 @@ mybatis:
   configuration:
     map-underscore-to-camel-case: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+upload:
+  path: D:\\gold1\