From da93888195bfb4cff0bcb2512631237b057fb342 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Wed, 31 Dec 2025 15:25:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E5=90=8D=E5=88=B6?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/hnrn/rnbmw/manager/dao/RoleDao.java | 2 +- .../controller/AnnouncementController.java | 37 +++++++++++++++- .../controller/WorkerBenefitsController.java | 43 +++++++++++++++++-- .../rnbmw/ownPerson/dao/AnnouncementDao.java | 2 +- .../ownPerson/dao/WorkerBenefitsDao.java | 2 +- .../ownPerson/entity/WorkerBenefitsBean.java | 1 + .../service/AnnouncementService.java | 2 +- .../service/WorkerBenefitsService.java | 2 +- .../service/impl/AnnouncementServiceImpl.java | 28 ++++++++++-- .../impl/WorkerBenefitsServiceImpl.java | 25 +++++++++-- .../companyManager/CompanyManagerMapper.xml | 12 +++--- .../ownPerson/WorkerBenefitsMapper.xml | 2 +- 12 files changed, 134 insertions(+), 24 deletions(-) diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/RoleDao.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/RoleDao.java index c58a6f3..225ea05 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/RoleDao.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/RoleDao.java @@ -29,7 +29,7 @@ public interface RoleDao { @Select("select * from bns_smz_sys_role t where t.name = #{name} and t.company_id = #{companyId} and is_active = 1") Role getRole(String name,String companyId); - @Select("select su.id from bns_smz_sys_role_user t left join sys_user su on su.ID =t.userId where t.roleId = #{roleId} and su.IS_ACTIVE = 1") + @Select("select su.id from bns_smz_sys_role_user t left join bns_smz_sys_user su on su.ID =t.userId where t.roleId = #{roleId} and su.IS_ACTIVE = 1") Role getUserRole(Long roleId); diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/AnnouncementController.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/AnnouncementController.java index 52b86b5..ac66294 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/AnnouncementController.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/AnnouncementController.java @@ -2,6 +2,7 @@ package com.bonus.hnrn.rnbmw.ownPerson.controller; import com.bonus.hnrn.rnbmw.basic.controller.ProjectController; import com.bonus.hnrn.rnbmw.basic.entity.SalaryPaymentAndAttendanceRecordsBean; +import com.bonus.hnrn.rnbmw.file.UploadService; import com.bonus.hnrn.rnbmw.manager.annotation.LogAnnotation; import com.bonus.hnrn.rnbmw.manager.model.SysUser; import com.bonus.hnrn.rnbmw.manager.table.PageTableHandler; @@ -42,6 +43,9 @@ public class AnnouncementController { @Resource(name = "AnnouncementService") private AnnouncementService service; + @Resource + private UploadService uploadService; + @GetMapping @ApiOperation(value = "自有人员-通知公告-列表") @PreAuthorize("hasAuthority('sys:Announcement:query')") @@ -153,7 +157,7 @@ public class AnnouncementController { List items = (List) map.get("filePath"); logger.error("items==" + items.size()); - for (int i = 0; i < items.size(); i++) { + /*for (int i = 0; i < items.size(); i++) { MultipartFile item = items.get(i); String tmpName = item.getOriginalFilename();// 完整路径 IE if (StringHelper.isEmpty(tmpName)) { @@ -190,7 +194,36 @@ public class AnnouncementController { ar.setFailMsg(GlobalConst.SAVE_FAIL); } } - ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED); + ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);*/ + + + for (int i = 0; i < items.size(); i++) { + MultipartFile item = items.get(i); + String tmpName = item.getOriginalFilename();// 完整路径 IE + if (StringHelper.isEmpty(tmpName)) { + return null; // 根据情况 + } + try { + Map resultMap=uploadService.uploadSingFile(item,"smz/idcard"); + urlStr.add(resultMap.get("url")); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.SAVE_FAIL); + } + } + + int result = 0; + AnnouncementBean bean = new AnnouncementBean(); + String fileName = DateTimeHelper.getNowDate().replace("-", "") + "_" + generateShortUuid() + "_" + "broadFile"; + bean.setPid(vo.getId()); + bean.setFileName(fileName);//文件名 + bean.setFilePath(urlStr.get(0));//路径 + result = service.saveFile(bean); + if(result==1){ + ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED); + }else { + ar.setFailMsg(GlobalConst.SAVE_FAIL); + } return ar; } diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/WorkerBenefitsController.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/WorkerBenefitsController.java index a5b7a56..d4435b7 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/WorkerBenefitsController.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/WorkerBenefitsController.java @@ -1,5 +1,6 @@ package com.bonus.hnrn.rnbmw.ownPerson.controller; +import com.bonus.hnrn.rnbmw.file.UploadService; import com.bonus.hnrn.rnbmw.manager.annotation.LogAnnotation; import com.bonus.hnrn.rnbmw.manager.dao.UserDao; import com.bonus.hnrn.rnbmw.manager.model.SysUser; @@ -37,6 +38,9 @@ public class WorkerBenefitsController { @Resource(name = "userDao") private UserDao userdao; + @Resource + private UploadService uploadService; + @GetMapping @ApiOperation(value = "自有人员-待遇申报-列表") @PreAuthorize("hasAuthority('sys:workerBenefits:query')") @@ -107,18 +111,22 @@ public class WorkerBenefitsController { WorkerBenefitsBean bean = new WorkerBenefitsBean(); List list ; String reportPath = ""; + String reportPaths = ""; try { list = service.getWorkerBenefitsById(id); if(list.size()>0){ for (int i = 0; i < list.size(); i++) { if(i == list.size()-1){ - reportPath +=list.get(i).getReportPath(); + reportPath +=uploadService.getPresignedUrl(list.get(i).getReportPath()); + reportPaths +=list.get(i).getReportPath(); // bean.setReportPath(list.get(i).getReportPath()); }else{ - reportPath +=list.get(i).getReportPath()+","; + reportPath +=uploadService.getPresignedUrl(list.get(i).getReportPath())+","; + reportPaths +=list.get(i).getReportPath()+","; // bean.setReportPath(list.get(i).getReportPath()+","); } } + bean.setReportPaths(reportPaths); bean.setReportPath(reportPath); bean.setId(list.get(0).getId()); bean.setReportType(list.get(0).getReportType()); @@ -166,7 +174,22 @@ public class WorkerBenefitsController { List urlStr = new LinkedList<>(); CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(); List items = (List) map.get("filePath"); - try { + for (int i = 0; i < items.size(); i++) { + MultipartFile item = items.get(i); + String tmpName = item.getOriginalFilename();// 完整路径 IE + if (StringHelper.isEmpty(tmpName)) { + return null; // 根据情况 + } + try { + Map resultMap=uploadService.uploadSingFile(item,"smz/idcard"); + urlStr.add(resultMap.get("url")); + } catch (Exception e) { + logger.error(e.toString(), e); + ar.setFailMsg(GlobalConst.SAVE_FAIL); + } + } + + /*try { for (MultipartFile item:items) { String tmpName = item.getOriginalFilename();// 完整路径 IE if (StringHelper.isEmpty(tmpName)) { @@ -201,7 +224,19 @@ public class WorkerBenefitsController { e.printStackTrace(); ar.setSucceedMsg(GlobalConst.SAVE_FAIL); } - ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED); + ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);*/ + int result = 0; + bean.setReportPath(urlStr.get(0)); + bean.setPId(bean.getId()); + String fileName = DateTimeHelper.getNowDate().replace("-", "") + "_" + generateShortUuid() + "_" + "broadFile"; + bean.setReportName(fileName);//文件名 + result= service.saveFileType(bean); + if(result==1){ + ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED); + }else { + ar.setFailMsg(GlobalConst.SAVE_FAIL); + } + return ar; } diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/AnnouncementDao.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/AnnouncementDao.java index f565b79..2588a52 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/AnnouncementDao.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/AnnouncementDao.java @@ -14,7 +14,7 @@ public interface AnnouncementDao { List getList(@Param("params")Map params, @Param("offset")Integer offset, @Param("limit")Integer limit); - void saveFile(AnnouncementBean bean); + int saveFile(AnnouncementBean bean); int addAnnouncement(AnnouncementBean bean); diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/WorkerBenefitsDao.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/WorkerBenefitsDao.java index 6043e05..eed2940 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/WorkerBenefitsDao.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/WorkerBenefitsDao.java @@ -26,7 +26,7 @@ public interface WorkerBenefitsDao { int updateBenefits(WorkerBenefitsBean bean); - void saveFileType(WorkerBenefitsBean bean); + int saveFileType(WorkerBenefitsBean bean); int deleteBenefits(String id); diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/entity/WorkerBenefitsBean.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/entity/WorkerBenefitsBean.java index 168c4c0..3fb6a98 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/entity/WorkerBenefitsBean.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/entity/WorkerBenefitsBean.java @@ -9,6 +9,7 @@ public class WorkerBenefitsBean extends WorkerBean { public String reportType; //申报类型 对应字典表ID public String reportDate; //申报日期 public String reportPath; //相关资料 图片路径 + public String reportPaths; //相关资料 图片路径 public String reportName; //相关资料 图片名称 public String remark; //备注 diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/AnnouncementService.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/AnnouncementService.java index 4267d25..a802245 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/AnnouncementService.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/AnnouncementService.java @@ -10,7 +10,7 @@ public interface AnnouncementService { List getList(Map params, Integer offset, Integer limit); - void saveFile(AnnouncementBean bean); + int saveFile(AnnouncementBean bean); int addAnnouncement(AnnouncementBean bean); diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/WorkerBenefitsService.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/WorkerBenefitsService.java index 429a875..4607cd5 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/WorkerBenefitsService.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/WorkerBenefitsService.java @@ -19,7 +19,7 @@ public interface WorkerBenefitsService { int updateBenefits(WorkerBenefitsBean bean); - void saveFileType(WorkerBenefitsBean bean); + int saveFileType(WorkerBenefitsBean bean); int deleteBenefits(String id); diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/AnnouncementServiceImpl.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/AnnouncementServiceImpl.java index 8485704..5fcc74b 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/AnnouncementServiceImpl.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/AnnouncementServiceImpl.java @@ -1,7 +1,9 @@ package com.bonus.hnrn.rnbmw.ownPerson.service.impl; +import com.bonus.hnrn.rnbmw.file.UploadService; import com.bonus.hnrn.rnbmw.ownPerson.dao.AnnouncementDao; import com.bonus.hnrn.rnbmw.ownPerson.entity.AnnouncementBean; +import com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean; import com.bonus.hnrn.rnbmw.ownPerson.service.AnnouncementService; import com.bonus.hnrn.rnbmw.person.dao.PersonTrainDao; import org.springframework.stereotype.Service; @@ -15,6 +17,9 @@ public class AnnouncementServiceImpl implements AnnouncementService { @Resource(name = "AnnouncementDao") private AnnouncementDao dao; + @Resource + private UploadService uploadService; + @Override public int getCount(Map params) { return dao.getCount(params); @@ -26,8 +31,8 @@ public class AnnouncementServiceImpl implements AnnouncementService { } @Override - public void saveFile(AnnouncementBean bean) { - dao.saveFile(bean); + public int saveFile(AnnouncementBean bean) { + return dao.saveFile(bean); } @Override @@ -47,6 +52,23 @@ public class AnnouncementServiceImpl implements AnnouncementService { @Override public List getDetailData(AnnouncementBean bean) { - return dao.getDetailData(bean); + List list = dao.getDetailData(bean); + if(list != null && list.size() > 0){ + for(AnnouncementBean o : list){ + if(o.getFilePath()!=null){ + if(o.getFilePath().contains("@")){ + String[] reportPath = o.getFilePath().split("@"); + String reportPathUrl = ""; + for(String path : reportPath){ + reportPathUrl = reportPathUrl + uploadService.getPresignedUrl(path) + "@"; + } + o.setFilePath(reportPathUrl); + }else{ + o.setFilePath(uploadService.getPresignedUrl(o.getFilePath())); + } + } + } + } + return list; } } diff --git a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/WorkerBenefitsServiceImpl.java b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/WorkerBenefitsServiceImpl.java index 070273f..8445ed6 100644 --- a/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/WorkerBenefitsServiceImpl.java +++ b/real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/WorkerBenefitsServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.hnrn.rnbmw.ownPerson.service.impl; +import com.bonus.hnrn.rnbmw.file.UploadService; import com.bonus.hnrn.rnbmw.ownPerson.dao.WorkerBenefitsDao; import com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean; import com.bonus.hnrn.rnbmw.ownPerson.service.WorkerBenefitsService; @@ -15,6 +16,9 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService { @Resource(name = "WorkerBenefitsDao") private WorkerBenefitsDao dao; + @Resource + private UploadService uploadService; + @Override public List getList(Map params, Integer offset, Integer limit) { return dao.getList(params,offset,limit); @@ -32,7 +36,22 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService { @Override public List getWorkerBenefitsList(Map params, Integer offset, Integer limit) { - return dao.getWorkerBenefitsList(params,offset,limit); + List list = dao.getWorkerBenefitsList(params,offset,limit); + for(WorkerBenefitsBean bean : list){ + if(bean.getReportPath()!=null){ + if(bean.getReportPath().contains(",")){ + String[] reportPath = bean.getReportPath().split(","); + String reportPathUrl = ""; + for(String path : reportPath){ + reportPathUrl = reportPathUrl + uploadService.getPresignedUrl(path) + ","; + } + bean.setReportPath(reportPathUrl); + }else{ + bean.setReportPath(uploadService.getPresignedUrl(bean.getReportPath())); + } + } + } + return list; } @Override @@ -53,8 +72,8 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService { } @Override - public void saveFileType(WorkerBenefitsBean bean) { - dao.saveFileType(bean); + public int saveFileType(WorkerBenefitsBean bean) { + return dao.saveFileType(bean); } @Override diff --git a/real-name/src/main/resources/mappers/companyManager/CompanyManagerMapper.xml b/real-name/src/main/resources/mappers/companyManager/CompanyManagerMapper.xml index 6f60bce..15a9dcd 100644 --- a/real-name/src/main/resources/mappers/companyManager/CompanyManagerMapper.xml +++ b/real-name/src/main/resources/mappers/companyManager/CompanyManagerMapper.xml @@ -171,15 +171,15 @@ @@ -195,19 +195,19 @@ - INSERT INTO `bns_smz_sys_role`( `name`, `company_id`,role_level, description ,`TYPE`, `createTime`, `updateTime`,`status`, `is_active`,is_free) + INSERT INTO bns_smz_sys_role( `name`, `company_id`,role_level, description ,`TYPE`, `createTime`, `updateTime`,`status`, `is_active`,is_free) VALUES ('公司管理员', #{id},'1', '公司管理-新增' , '1,2',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP(),'1', '1',#{isFree}); - INSERT INTO `sys_role_user`( `userId`, `roleId`) + INSERT INTO bns_smz_sys_role_user( `userId`, `roleId`) VALUES (#{userId}, #{roleId}); - INSERT INTO `sys_role_permission`( `roleId`, `permissionId`) + INSERT INTO bns_smz_sys_role_permission( `roleId`, `permissionId`) VALUES (#{roleId}, #{id}); diff --git a/real-name/src/main/resources/mappers/ownPerson/WorkerBenefitsMapper.xml b/real-name/src/main/resources/mappers/ownPerson/WorkerBenefitsMapper.xml index c14fef2..ac9fd05 100644 --- a/real-name/src/main/resources/mappers/ownPerson/WorkerBenefitsMapper.xml +++ b/real-name/src/main/resources/mappers/ownPerson/WorkerBenefitsMapper.xml @@ -166,7 +166,7 @@