From 6f89758d745e1b13e3dd442a85eac4520dbaa8bf Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Sat, 30 Nov 2024 10:46:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=89=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/admin/controller/AdminController.java | 20 ++++++++ .../java/com/example/admin/mapper/AdminMapper.java | 15 ++++++ .../example/admin/service/AdminServiceImpl.java | 24 ++++++++++ demo/Admin/src/main/resources/application.yml | 18 ++++++++ .../example/audit/controller/AuditController.java | 9 ++++ .../java/com/example/audit/mapper/AuditMapper.java | 16 +++++++ .../example/audit/service/AuditServiceImpl.java | 13 ++++++ .../java/com/example/commons/Util/UploadUtil.java | 54 ++++++++++++++++++++++ .../example/commons/domain/vo/ConsumeDetail.java | 3 ++ .../java/com/example/commons/domain/vo/Page.java | 1 + .../com/example/commons/sevice/AdminService.java | 7 +++ .../com/example/commons/sevice/AuditService.java | 3 ++ demo/pom.xml | 7 +++ .../com/example/recharge/config/WebConfig.java | 16 +++++++ .../recharge/controller/UploadController.java | 25 ++++++++++ .../example/recharge/mapper/RechargeMapper.java | 7 +-- demo/recharge/src/main/resources/application.yml | 5 +- 17 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 demo/Admin/src/main/java/com/example/admin/controller/AdminController.java create mode 100644 demo/Admin/src/main/java/com/example/admin/mapper/AdminMapper.java create mode 100644 demo/Admin/src/main/java/com/example/admin/service/AdminServiceImpl.java create mode 100644 demo/Admin/src/main/resources/application.yml create mode 100644 demo/commons/src/main/java/com/example/commons/Util/UploadUtil.java create mode 100644 demo/commons/src/main/java/com/example/commons/sevice/AdminService.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/config/WebConfig.java create mode 100644 demo/recharge/src/main/java/com/example/recharge/controller/UploadController.java diff --git a/demo/Admin/src/main/java/com/example/admin/controller/AdminController.java b/demo/Admin/src/main/java/com/example/admin/controller/AdminController.java new file mode 100644 index 0000000..191d1c7 --- /dev/null +++ b/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) { + + } +} diff --git a/demo/Admin/src/main/java/com/example/admin/mapper/AdminMapper.java b/demo/Admin/src/main/java/com/example/admin/mapper/AdminMapper.java new file mode 100644 index 0000000..bea56c3 --- /dev/null +++ b/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); +} diff --git a/demo/Admin/src/main/java/com/example/admin/service/AdminServiceImpl.java b/demo/Admin/src/main/java/com/example/admin/service/AdminServiceImpl.java new file mode 100644 index 0000000..ed02006 --- /dev/null +++ b/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; + } +} diff --git a/demo/Admin/src/main/resources/application.yml b/demo/Admin/src/main/resources/application.yml new file mode 100644 index 0000000..ec2006d --- /dev/null +++ b/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\ \ No newline at end of file diff --git a/demo/audit/src/main/java/com/example/audit/controller/AuditController.java b/demo/audit/src/main/java/com/example/audit/controller/AuditController.java index e7c847a..92dfaf7 100644 --- a/demo/audit/src/main/java/com/example/audit/controller/AuditController.java +++ b/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())); + } + } } diff --git a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java b/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java index ea0b7fd..b3dcc47 100644 --- a/demo/audit/src/main/java/com/example/audit/mapper/AuditMapper.java +++ b/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 { "" }) List select(Audit Audit); + @Select({ + "" + }) + List selectCon(ConsumeDetail consumeDetail); } diff --git a/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java b/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java index 87fbd79..3077921 100644 --- a/demo/audit/src/main/java/com/example/audit/service/AuditServiceImpl.java +++ b/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 list= auditMapper.select(audit); return new PageInfo<>(list); } + + @Override + public List searchForDetail(ConsumeDetail consumeDetail) { + return auditMapper.selectCon(consumeDetail); + } + + @Override + public PageInfo searchForConsumeDetail(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail) { + PageHelper.startPage(pageNum,pageSize); + List list= auditMapper.selectCon(consumeDetail); + return new PageInfo<>(list); + } } diff --git a/demo/commons/src/main/java/com/example/commons/Util/UploadUtil.java b/demo/commons/src/main/java/com/example/commons/Util/UploadUtil.java new file mode 100644 index 0000000..3094d4f --- /dev/null +++ b/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; + } +} diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java b/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java index 50e5996..5e7b4c5 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/vo/ConsumeDetail.java +++ b/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; + } diff --git a/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java b/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java index 1c9c948..22d7c11 100644 --- a/demo/commons/src/main/java/com/example/commons/domain/vo/Page.java +++ b/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; } diff --git a/demo/commons/src/main/java/com/example/commons/sevice/AdminService.java b/demo/commons/src/main/java/com/example/commons/sevice/AdminService.java new file mode 100644 index 0000000..c8803fc --- /dev/null +++ b/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; +} diff --git a/demo/commons/src/main/java/com/example/commons/sevice/AuditService.java b/demo/commons/src/main/java/com/example/commons/sevice/AuditService.java index ffbba16..260fe9f 100644 --- a/demo/commons/src/main/java/com/example/commons/sevice/AuditService.java +++ b/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 search(Audit audit) ; PageInfo searchForPage(Integer pageNum, Integer pageSize, Audit audit); + List searchForDetail(ConsumeDetail consumeDetail); + PageInfo searchForConsumeDetail(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail); } diff --git a/demo/pom.xml b/demo/pom.xml index 05b1175..7d3a7e7 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,6 +22,7 @@ commons user audit + Admin @@ -54,8 +55,14 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + + spring-boot-starter-security + + diff --git a/demo/recharge/src/main/java/com/example/recharge/config/WebConfig.java b/demo/recharge/src/main/java/com/example/recharge/config/WebConfig.java new file mode 100644 index 0000000..210652d --- /dev/null +++ b/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); + } +} diff --git a/demo/recharge/src/main/java/com/example/recharge/controller/UploadController.java b/demo/recharge/src/main/java/com/example/recharge/controller/UploadController.java new file mode 100644 index 0000000..24783f3 --- /dev/null +++ b/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); + } +} diff --git a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java b/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java index c2d24ca..6d1cf73 100644 --- a/demo/recharge/src/main/java/com/example/recharge/mapper/RechargeMapper.java +++ b/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", "", "flag='1'", - "and activity_id=#{activityId}", + "and recharge.activity_id=#{activityId}", + "and recharge.admin_id=#{adminId}", "AND recharge.create_time BETWEEN #{startDate} AND #{endDate}", - "and recharge_way like concat('%',#{rechargeWay},'%')", - "and area like concat('%',#{area},'%')", + "and pay_way like concat('%',#{payWay},'%')", + "and recharge.area like concat('%',#{area},'%')", "and audit.status=#{status}", "", "" diff --git a/demo/recharge/src/main/resources/application.yml b/demo/recharge/src/main/resources/application.yml index cfc9875..ec2006d 100644 --- a/demo/recharge/src/main/resources/application.yml +++ b/demo/recharge/src/main/resources/application.yml @@ -12,4 +12,7 @@ spring: mybatis: configuration: map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + +upload: + path: D:\\gold1\ \ No newline at end of file