员工&档案の照片的上传和修改

src/main/java/com/jeeplus/modules/sys/service/UserService.java

@@ -214,11 +214,6 @@ public class UserService extends BaseController {
                         BOSClientUtil bosClientUtil = new BOSClientUtil();
                         String uploadPath = bosClientUtil.upload(path, inputStream);
                         user.setPhoto(uploadPath);
-//                        OSSClientUtil ossUtil =new OSSClientUtil();
-//                        String[] arr = temp.split("/");
-//                        String photoName = System.currentTimeMillis()+arr[arr.length-1];
-//                        ossUtil.uploadFile2OSS(inputStream, Global.getPhoto(), photoName);
-//                        user.setPhoto(Global.getAliyunUrl()+"/"+ Global.getPhoto() + photoName);
                         FileUtils.delFile(Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL  +time);
                     } catch (IOException e) {
                         e.printStackTrace();

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -227,7 +227,7 @@ public class WorkStaffBasicInfoController extends BaseController {
 		MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
 		if(pictureFile != null && pictureFile.getSize()>0){
 			String path = new StringBuilder("/employeeImg/")
-			.append(workStaffBasicInfo.getName()).append(".png").toString();
+			.append(workStaffBasicInfo.getName()+System.currentTimeMillis()).append(".png").toString();
 			InputStream inputStream = pictureFile.getInputStream();
             BOSClientUtil bosClientUtil = new BOSClientUtil();
 			String url = bosClientUtil.upload(path, inputStream);
@@ -552,6 +552,16 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
+        MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
+        if(pictureFile != null && pictureFile.getSize()>0){
+            String path = new StringBuilder("/employeeImg/")
+                    .append(workStaffBasicInfo.getName()+System.currentTimeMillis()).append(".png").toString();
+            InputStream inputStream = pictureFile.getInputStream();
+            BOSClientUtil bosClientUtil = new BOSClientUtil();
+            String url = bosClientUtil.upload(path, inputStream);
+            workStaffBasicInfo.setPicture(url);
+        }
+
 		String achieveId = workStaffBasicInfo.getId();
 		WorkStaffBasicInfo t = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());//从数据库取出记录的值
 		String staffId = t.getId();

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailModify.jsp

@@ -94,7 +94,7 @@
             var this_upload_div_1 =
                 '<div id="this_upload_div_'+ index + '" style="position:relative;">'+
                 '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
-                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="this_upload_files"  onchange="this_upload_show_image('+index+ ')" /><br>'+
+                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image('+index+ ')" /><br>'+
                 '</div>';
             $("#this_upload_image_div_"+ index).html("").append(this_upload_div_1);
         }

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailModifyDirectly.jsp

@@ -107,8 +107,8 @@
         function this_add_div(index) {
             var this_upload_div_1 =
                 '<div id="this_upload_div_'+ index + '" style="position:relative;">'+
-                '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
-                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="this_upload_files"  onchange="this_upload_show_image('+index+ ')" /><br>'+
+                     '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
+                     '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image('+index+ ')" /><br>'+
                 '</div>';
             $("#this_upload_image_div_"+ index).html("").append(this_upload_div_1);
         }

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -201,7 +201,7 @@
             var this_upload_div_1 =
                 '<div id="this_upload_div_'+ index + '" style="position:relative;">'+
                 '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
-                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="this_upload_files"  onchange="this_upload_show_image('+index+ ')" /><br>'+
+                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image('+index+ ')" /><br>'+
                 '</div>';
             $("#this_upload_image_div_"+ index).html("").append(this_upload_div_1);
         }