From 0336c2765cf032a4540a604670b43155d951cce3 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 17 Jan 2025 17:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppController.java | 14 +++++--- .../gzcar/business/app/entity/AppPlanVo.java | 2 ++ .../business/app/service/AppService.java | 10 ++++++ .../business/app/service/AppServiceImpl.java | 18 ++++++++++ .../backstage/entity/CarBalanceVo.java | 5 ++- .../backstage/mapper/HomeIndexMapper.java | 19 +++++++--- .../service/HomeIndexServiceImpl.java | 6 ++-- .../service/SupDispatchCarServiceImpl.java | 7 ++++ .../system/service/FileUploadService.java | 36 +++++++++++++++++++ .../jwt/JwtAuthenticationTokenFilter.java | 8 ++--- .../mappers/business/app/AppMapper.xml | 6 ++-- .../business/backstage/CarBalanceMapper.xml | 35 +++++++++++++----- .../backstage/CarStatisticsMapper.xml | 14 +++++--- .../business/backstage/DispatchCarMapper.xml | 7 ++-- .../business/backstage/HomeIndexMapper.xml | 15 ++++++++ .../backstage/SupDispatchCarMapper.xml | 3 +- 16 files changed, 168 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java b/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java index ef43acc..9fef2cb 100644 --- a/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java +++ b/src/main/java/com/bonus/gzcar/business/app/controller/AppController.java @@ -13,13 +13,17 @@ import com.bonus.gzcar.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Objects; /** @@ -130,10 +134,8 @@ public class AppController{ * @return */ @GetMapping("getOutPageList") - @DecryptAndVerify(decryptedClass = CarPlanOutVo.class) + @DecryptAndVerify(decryptedClass = CarNeedPlanVo.class) public PageInfo getOutPageList(EncryptedReq dto) { - String userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId().toString(); - dto.getData().setCreator(userId);dto.getData().setUserId(userId); PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = supDispatchCarService.getOutPageList(dto.getData());; return new PageInfo<>(list); @@ -156,6 +158,10 @@ public class AppController{ public ServerResponse uploadFile(EncryptedReq dto) { return service.uploadFile(dto.getData()); } - + @ApiOperation(value = "APP文件上传") + @PostMapping("appUploadFile") + public ServerResponse appUploadFile(@RequestParam(value = "file") MultipartFile file,HttpServletRequest request){ + return service.appUploadFile(file,request); + } } diff --git a/src/main/java/com/bonus/gzcar/business/app/entity/AppPlanVo.java b/src/main/java/com/bonus/gzcar/business/app/entity/AppPlanVo.java index d912d39..1e13b22 100644 --- a/src/main/java/com/bonus/gzcar/business/app/entity/AppPlanVo.java +++ b/src/main/java/com/bonus/gzcar/business/app/entity/AppPlanVo.java @@ -70,6 +70,8 @@ public class AppPlanVo extends ParentVo { */ private String projectContent; + private String supName; + private String needDay; private String remark; diff --git a/src/main/java/com/bonus/gzcar/business/app/service/AppService.java b/src/main/java/com/bonus/gzcar/business/app/service/AppService.java index 31a23b3..e2cefe0 100644 --- a/src/main/java/com/bonus/gzcar/business/app/service/AppService.java +++ b/src/main/java/com/bonus/gzcar/business/app/service/AppService.java @@ -4,7 +4,9 @@ import com.bonus.gzcar.business.app.entity.AppPlanVo; import com.bonus.gzcar.business.backstage.entity.CarCarVo; import com.bonus.gzcar.business.backstage.entity.CarPlanOutVo; import com.bonus.gzcar.manager.webResult.ServerResponse; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -53,4 +55,12 @@ public interface AppService { * @return */ ServerResponse uploadFile(CarPlanOutVo data); + + /** + * 文件上传 + * @param file + * @param request + * @return + */ + ServerResponse appUploadFile(MultipartFile file, HttpServletRequest request); } diff --git a/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java b/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java index c3b4bfb..9a1f1d2 100644 --- a/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/app/service/AppServiceImpl.java @@ -15,7 +15,9 @@ import com.bonus.gzcar.manager.webResult.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; @@ -134,4 +136,20 @@ public class AppServiceImpl implements AppService{ } return null; } + + @Override + public ServerResponse appUploadFile(MultipartFile file, HttpServletRequest request) { + try{ + String id=request.getParameter("id"); + if(StringHelper.isEmpty(id) || "undefined".equals(id)){ + return ServerResponse.createErroe("id不能为空"); + } + uploadService.uploadImageOne(file,id,"car_plan_out","到货确认单"); + return ServerResponse.createBySuccessMsg("上传成功"); + }catch (Exception e){ + log.error(e.toString(),e); + } + + return null; + } } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceVo.java b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceVo.java index 813e62b..7f9b145 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceVo.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/entity/CarBalanceVo.java @@ -120,7 +120,10 @@ public class CarBalanceVo extends ParentVo { * 待排车数量 */ private String dpcNum; - + /** + * 计划类型 + */ + private String typeName; diff --git a/src/main/java/com/bonus/gzcar/business/backstage/mapper/HomeIndexMapper.java b/src/main/java/com/bonus/gzcar/business/backstage/mapper/HomeIndexMapper.java index 1c6ae9f..352dc37 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/mapper/HomeIndexMapper.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/mapper/HomeIndexMapper.java @@ -1,9 +1,6 @@ package com.bonus.gzcar.business.backstage.mapper; -import com.bonus.gzcar.business.backstage.entity.BackParamsDto; -import com.bonus.gzcar.business.backstage.entity.HomeProDetailVo; -import com.bonus.gzcar.business.backstage.entity.HomeProRankingVo; -import com.bonus.gzcar.business.backstage.entity.HomeSupStatisticsVo; +import com.bonus.gzcar.business.backstage.entity.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -109,4 +106,18 @@ public interface HomeIndexMapper { * @date 2025/1/17 9:58 */ List getProDetails(BackParamsDto dto); + + /** + * 查询支付金额及计划条数 + * @param dto + * @return + */ + IndexVo getPayMoney(BackParamsDto dto); + + /** + * 查询未支付计划 z0 + * @param dto + * @return + */ + IndexVo getNoPayMoney(BackParamsDto dto); } diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java index 324e0a0..60e70b4 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/HomeIndexServiceImpl.java @@ -100,12 +100,14 @@ public class HomeIndexServiceImpl implements HomeIndexService { Future> future5 = testTaskExecutor.submit(() -> { log.info("数据概览-已付款金额{}", Thread.currentThread().getName()); List dataList = new ArrayList<>(2); - dataList.add(0, 0.0); - dataList.add(1, 0); + IndexVo indexVo = mapper.getPayMoney(dto); + dataList.add(0, indexVo.getMoney()); + dataList.add(1, indexVo.getNum()); return dataList; }); Future> future6 = testTaskExecutor.submit(() -> { log.info("数据概览-应付款金额{}", Thread.currentThread().getName()); + IndexVo indexVo = mapper.getNoPayMoney(dto); List dataList = new ArrayList<>(2); dataList.add(0, 0.0); dataList.add(1, 0); diff --git a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java index 5d38e17..7169521 100644 --- a/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java +++ b/src/main/java/com/bonus/gzcar/business/backstage/service/SupDispatchCarServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.gzcar.business.backstage.service; import cn.afterturn.easypoi.cache.manager.IFileLoader; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.bonus.gzcar.business.backstage.entity.*; import com.bonus.gzcar.business.backstage.mapper.SupDispatchCarMapper; import com.bonus.gzcar.business.system.entity.AuditRecordVo; @@ -328,6 +329,9 @@ public class SupDispatchCarServiceImpl implements SupDispatchCarService{ public List getOutPageList(CarNeedPlanVo data) { List list=new ArrayList<>(); try { + String userId= Objects.requireNonNull(UserUtil.getLoginUser()).getUserId().toString(); + data.setCreator(userId); + data.setUserId(userId); list=mapper.getOutPageList(data); for (CarNeedPlanVo carNeedPlanVo:list){ if(carNeedPlanVo.getFileNum()>0){ @@ -351,9 +355,12 @@ public class SupDispatchCarServiceImpl implements SupDispatchCarService{ public ServerResponse uploadFile(HttpServletRequest request, MultipartFile[] files) { try { String params=request.getParameter("params"); + if(StringHelper.isEmpty(params)){ return ServerResponse.createErroe("请求参数缺失"); } + JSONObject json=JSON.parseObject(params); + params=json.get("id").toString(); uploadService.uploadImage(files,params,"car_plan_out","到货确认单"); return ServerResponse.createBySuccessMsg("上传成功"); }catch (Exception e){ diff --git a/src/main/java/com/bonus/gzcar/business/system/service/FileUploadService.java b/src/main/java/com/bonus/gzcar/business/system/service/FileUploadService.java index 6cb2e1a..f0e76ba 100644 --- a/src/main/java/com/bonus/gzcar/business/system/service/FileUploadService.java +++ b/src/main/java/com/bonus/gzcar/business/system/service/FileUploadService.java @@ -123,7 +123,43 @@ public class FileUploadService { return list; } + public List uploadImageOne(MultipartFile file , String outId, String table, String type){ + List list=new ArrayList<>(); + try { + String fileName = file.getOriginalFilename(); + String suffix=IDUtils.getSuffix(fileName); + String path="/"+DateTimeHelper.getNowYMD()+"/"+ IDUtils.createID()+suffix; + String newPath= SystemUtils.getUploadPath()+path; + File uploadFile = new File(newPath); + //生成文件夹 + if (!uploadFile.getParentFile().exists()) { + uploadFile.getParentFile().mkdirs(); + } + String fileType=isImageFileExtension(fileName); + // 存入临时文件 + file.transferTo(uploadFile); + FileUploadVo vo=new FileUploadVo(); + vo.setFileName(fileName); + vo.setFileUrl(path); + vo.setOwnId(outId); + vo.setModelTable(table); + vo.setSuffix(suffix); + vo.setFileType(fileType); + String userId= UserUtil.getLoginUser().getUserId()+""; + String userName=UserUtil.getLoginUser().getUsername(); + vo.setCreator(userId); + vo.setCreateName(userName); + if(StringHelper.isNotEmpty(type)){ + vo.setType(type); + } + list.add(vo); + mapper.insertFileUpload(vo); + }catch (Exception e){ + log.error(e.toString(),e); + } + return list; + } /** * 上传文件 */ diff --git a/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java b/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java index 7fe1c6c..e769fa9 100644 --- a/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java +++ b/src/main/java/com/bonus/gzcar/manager/security/jwt/JwtAuthenticationTokenFilter.java @@ -46,10 +46,10 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { filterChain.doFilter(request, response); return; } - if(uri.contains("/app/")){ - filterChain.doFilter(request, response); - return; - } +// if(uri.contains("/app/")){ +// filterChain.doFilter(request, response); +// return; +// } if(StringUtils.isEmpty(jwtToken)){ ResultUtil.responseJson(response,ResultUtil.resultCode(401,"请先登录")); return; diff --git a/src/main/resources/mappers/business/app/AppMapper.xml b/src/main/resources/mappers/business/app/AppMapper.xml index 573bfb6..3609f00 100644 --- a/src/main/resources/mappers/business/app/AppMapper.xml +++ b/src/main/resources/mappers/business/app/AppMapper.xml @@ -89,9 +89,9 @@ diff --git a/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml b/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml index 38246c8..fe5c2fd 100644 --- a/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarBalanceMapper.xml @@ -52,6 +52,9 @@ GROUP BY cpas.sup_id )pro on pro.sup_id=cpo.sup_id where cpo.status=1 + + and cs.name like concat('%',#{keyWord},'%') + GROUP BY cpo.sup_id diff --git a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml index a24141d..4bc6347 100644 --- a/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml +++ b/src/main/resources/mappers/business/backstage/CarStatisticsMapper.xml @@ -17,7 +17,7 @@ left join car_plan_apply cpa on cpo.apply_id=cpa.id LEFT JOIN car_supplier cs on cpo.sup_id=cs.id left join bm_project pro on pro.bid_id=cpa.pro_id - where 1=1 + where 1=1 and cpo.status=1 and cs.name like concat('%',#{supName},'%') @@ -57,6 +57,7 @@ + + + \ No newline at end of file diff --git a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml index b4c19c3..6d10e18 100644 --- a/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml +++ b/src/main/resources/mappers/business/backstage/SupDispatchCarMapper.xml @@ -235,7 +235,8 @@ and ( cpa.code like concat('%',#{keyWord},'%') or - pro.name like concat('%',#{keyWord},'%') + pro.name like concat('%',#{keyWord},'%') or + cpa.user_name like concat('%',#{keyWord},'%') )