修改实名制后台管理系统

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);
 
 

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<MultipartFile> items = (List<MultipartFile>) 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<String,String> 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;
     }
 

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<WorkerBenefitsBean> 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<String> urlStr = new LinkedList<>();
         CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
         List<MultipartFile> items = (List<MultipartFile>) 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<String,String> 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;
     }
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/AnnouncementDao.java

@@ -14,7 +14,7 @@ public interface AnnouncementDao {
 
     List<AnnouncementBean> getList(@Param("params")Map<String, Object> params, @Param("offset")Integer offset, @Param("limit")Integer limit);
 
-    void saveFile(AnnouncementBean bean);
+    int saveFile(AnnouncementBean bean);
 
     int addAnnouncement(AnnouncementBean bean);
 

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);
 

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; //备注
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/AnnouncementService.java

@@ -10,7 +10,7 @@ public interface AnnouncementService {
 
     List<AnnouncementBean> getList(Map<String, Object> params, Integer offset, Integer limit);
 
-    void saveFile(AnnouncementBean bean);
+    int saveFile(AnnouncementBean bean);
 
     int addAnnouncement(AnnouncementBean bean);
 

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);
 

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<String, Object> params) {
         return dao.getCount(params);
@@ -26,8 +31,8 @@ public class AnnouncementServiceImpl implements AnnouncementService {
     }
 
     @Override
-    public void saveFile(AnnouncementBean bean) {
+    public int saveFile(AnnouncementBean bean) {
-        dao.saveFile(bean);
+        return dao.saveFile(bean);
     }
 
     @Override
@@ -47,6 +52,23 @@ public class AnnouncementServiceImpl implements AnnouncementService {
 
     @Override
     public List<AnnouncementBean> getDetailData(AnnouncementBean bean) {
-        return dao.getDetailData(bean);
+        List<AnnouncementBean> 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;
     }
 }

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<WorkerBenefitsBean> getList(Map<String, Object> params, Integer offset, Integer limit) {
         return dao.getList(params,offset,limit);
@@ -32,7 +36,22 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService {
 
     @Override
     public List<WorkerBenefitsBean> getWorkerBenefitsList(Map<String, Object> params, Integer offset, Integer limit) {
-        return dao.getWorkerBenefitsList(params,offset,limit);
+        List<WorkerBenefitsBean> 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) {
+    public int saveFileType(WorkerBenefitsBean bean) {
-        dao.saveFileType(bean);
+        return dao.saveFileType(bean);
     }
 
     @Override

real-name/src/main/resources/mappers/companyManager/CompanyManagerMapper.xml

@@ -171,15 +171,15 @@
     </select>
 
     <select id="getOrgId" resultType="java.lang.Integer">
-        SELECT count(*) FROM `bns_smz_pm_organization` WHERE  COMPANY_ID =  #{id} and is_active = '1' and TYPE !='1'
+        SELECT count(*) FROM bns_smz_pm_organization WHERE  COMPANY_ID =  #{id} and is_active = '1' and TYPE !='1'
     </select>
     <select id="getRoleId" resultType="java.lang.Integer">
-        SELECT count(*) FROM `bns_smz_sys_role` WHERE  COMPANY_ID =  #{id} and is_active = '1'
+        SELECT count(*) FROM bns_smz_sys_role WHERE  COMPANY_ID =  #{id} and is_active = '1'
     </select>
     <select id="getUserId" resultType="java.lang.Integer">
         SELECT count(*) FROM bns_smz_sys_user
         WHERE ORG_ID in(
-            SELECT id as orgId  FROM `bns_smz_pm_organization` WHERE  COMPANY_ID = #{id} and is_active = '1'
+            SELECT id as orgId  FROM bns_smz_pm_organization WHERE  COMPANY_ID = #{id} and is_active = '1'
         )
     </select>
 
@@ -195,19 +195,19 @@
 
     <!--公司新增role-->
     <insert id="insertRegisteRole" parameterType="com.bonus.hnrn.rnbmw.manager.entity.CompanyManagerBean" useGeneratedKeys="true" keyProperty="roleId" >
-        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>
 
     <!--公司新增roleUser-->
     <insert id="insertRegisteRoleUser" >
-        INSERT INTO `sys_role_user`( `userId`, `roleId`)
+        INSERT INTO bns_smz_sys_role_user( `userId`, `roleId`)
         VALUES (#{userId}, #{roleId});
     </insert>
 
     <!--公司新增rolePermission-->
     <insert id="insertRegisterRolePermission" >
-        INSERT INTO `sys_role_permission`( `roleId`, `permissionId`)
+        INSERT INTO bns_smz_sys_role_permission( `roleId`, `permissionId`)
         VALUES (#{roleId}, #{id});
     </insert>
 

real-name/src/main/resources/mappers/ownPerson/WorkerBenefitsMapper.xml

@@ -166,7 +166,7 @@
     </select>
 
     <select id="getWorkerBenefitsById" resultType="com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean">
-        SELECT b.id,b.report_type as reportType, report_date as reportDate, f.file_path  as reportPath,b.remark
+        SELECT b.id,b.report_type as reportType, report_date as reportDate, f.file_path  as reportPath, b.remark
         FROM bns_smz_own_worker_benefits b
         LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid and f.is_active = '1'
         LEFT JOIN bns_smz_own_dict d  ON d.id = b.report_type