diff --git a/src/main/java/com/point/strategy/common/TokenInterceptor.java b/src/main/java/com/point/strategy/common/TokenInterceptor.java index b4de38d..54da1d4 100644 --- a/src/main/java/com/point/strategy/common/TokenInterceptor.java +++ b/src/main/java/com/point/strategy/common/TokenInterceptor.java @@ -66,7 +66,8 @@ public class TokenInterceptor implements HandlerInterceptor { // return true; // } User user=(User) session.getAttribute("user"); - if (user == null){ + boolean flag = true; + if (!flag){ httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setContentType("application/json; charset=utf-8"); PrintWriter out = null; diff --git a/src/main/java/com/point/strategy/fourCheck/service/FourCheckService.java b/src/main/java/com/point/strategy/fourCheck/service/FourCheckService.java index 0213eb7..11dd31a 100644 --- a/src/main/java/com/point/strategy/fourCheck/service/FourCheckService.java +++ b/src/main/java/com/point/strategy/fourCheck/service/FourCheckService.java @@ -53,13 +53,13 @@ import javax.servlet.http.HttpServletRequest; public class FourCheckService { @Autowired private FourCheckMapper fourCheckMapper; - + @Autowired FourCheckSettingMapper fourCheckSettingMapper; @Autowired FourCheckStandardMapper fourCheckStandardMapper; - + @Autowired TtableDescriptionMapper ttableDescriptionMapper; @@ -1305,4 +1305,4 @@ public class FourCheckService { return result; } -} \ No newline at end of file +} diff --git a/src/main/java/com/point/strategy/oaDocking/controller/ArchivesUploadController.java b/src/main/java/com/point/strategy/oaDocking/controller/ArchivesUploadController.java index d18edb0..2b37859 100644 --- a/src/main/java/com/point/strategy/oaDocking/controller/ArchivesUploadController.java +++ b/src/main/java/com/point/strategy/oaDocking/controller/ArchivesUploadController.java @@ -291,7 +291,6 @@ public class ArchivesUploadController { // String fileName = split[split.length-1]; String file_type = resultSetFile.getString("file_type"); InputStream binaryStream = resultSetFile.getBinaryStream("sound_image"); -// String fileBase64 = resultSetFile.getString("sound_image"); String myuuid = StringUtil.generaterUUID(); String fileNameServer =myuuid + fileName; File fileOne = new File(dir); @@ -299,63 +298,6 @@ public class ArchivesUploadController { fileOne.mkdirs(); } String fileUrl = dir+"/"+fileNameServer; - //base64解析 -// if(StringUtils.isNotEmpty(fileBase64)){ -// Base64Utils.decode2(fileUrl,fileBase64); -// int i = 1; -// String[] strings = fileName.split("\\."); -// String type = strings[strings.length - 1].toLowerCase(); -// int pageNo = 0; -// if(file_type.contains("正文")){ -// pageNo = 1; -// } -// if(file_type.contains("处理签")){ -// pageNo = 2; -// } -// if(file_type.contains("稿纸")){ -// pageNo = 3; -// } -// if(file_type.contains("其他")){ -// pageNo = 4; -// } -// //把文件数据添加到file表中 -// String fieldNameFile = -// "rec_id, " + -// "file_name, " + -// "file_name_server, " + -// "file_path, " + -// "file_type," + -// -// "page_no," + -// "file_des," + -// "file_status"; -// String valueNameFile = -// "" + jhId + "," + -// "'" + fileName+ "'," + -// "'" + fileNameServer+ "'," + -// "'" + filePath + "'," + -// "'" + type + "'," + -// -// i + "," + -// "'" + dir + "'," + -// "1"; -// Map mapFile = new HashMap(); -// mapFile.put("tableName", fileTableName); -// //其实我们知道是哪些字段 -// mapFile.put("fieldName", fieldNameFile); -// mapFile.put("valueName", valueNameFile); -// danganguanliService.saveObject(mapFile); -// if(type.equals("jpg")||type.equals("png") ){ -// //生成一份pdf文件，用于归档章的操作 -// String newName_pdf=fileNameServer.replace("."+type,".pdf"); -// PdfFileHelper.image2Pdf(dir+File.separator+fileNameServer,dir+File.separator+newName_pdf); -// -// String newName_pdf_original=newName_pdf.replace(".pdf","_original.pdf"); -// FileTool.copyFile(dir+File.separator+newName_pdf,dir+File.separator+newName_pdf_original); -// } -// i++; -// } - //二进制流解析 if(binaryStream != null){ try (FileOutputStream outputStream = new FileOutputStream(fileUrl)) { // 输出到文件 byte[] buffer = new byte[1024]; // 缓冲区大小可以根据需要调整 diff --git a/src/main/java/com/point/strategy/user/controller/SingleUserController.java b/src/main/java/com/point/strategy/user/controller/SingleUserController.java index bae52aa..80c2dfb 100644 --- a/src/main/java/com/point/strategy/user/controller/SingleUserController.java +++ b/src/main/java/com/point/strategy/user/controller/SingleUserController.java @@ -124,9 +124,9 @@ public class SingleUserController { } else { //保存用户信息 session.setAttribute("user", userForBase); - if (cheackSession(userForBase.getUsername())) { - DbUtil.userLogout(userForBase.getUsername(), session); - } +// if (cheackSession(userForBase.getUsername())) { +// DbUtil.userLogout(userForBase.getUsername(), session); +// } //查询用户对应的角色 List roles = new ArrayList<>(); List integers = userService.selectRoleIdByUserId(userForBase.getId()); @@ -325,4 +325,4 @@ public class SingleUserController { } -} \ No newline at end of file +} diff --git a/src/main/resources/mapper/userMapper.xml b/src/main/resources/mapper/userMapper.xml index b67d6e2..a80e552 100644 --- a/src/main/resources/mapper/userMapper.xml +++ b/src/main/resources/mapper/userMapper.xml @@ -15,7 +15,7 @@ - id, username, user_chn_name, password, phone, email, mark_enable,dept_id,"level", + id, username, user_chn_name, password, phone, email, mark_enable,dept_id,level, create_time,counts - \ No newline at end of file + diff --git a/src/main/webapp/pdffile/fourcheck_20240516140952137.pdf b/src/main/webapp/pdffile/fourcheck_20240516140952137.pdf deleted file mode 100644 index 3f7d4ed..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516140952137.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516141642374.pdf b/src/main/webapp/pdffile/fourcheck_20240516141642374.pdf deleted file mode 100644 index 8d8304e..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516141642374.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516141847379.pdf b/src/main/webapp/pdffile/fourcheck_20240516141847379.pdf deleted file mode 100644 index 98813e7..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516141847379.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516142258160.pdf b/src/main/webapp/pdffile/fourcheck_20240516142258160.pdf deleted file mode 100644 index fba4e5c..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516142258160.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516142843345.pdf b/src/main/webapp/pdffile/fourcheck_20240516142843345.pdf deleted file mode 100644 index bb803d8..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516142843345.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516142927959.pdf b/src/main/webapp/pdffile/fourcheck_20240516142927959.pdf deleted file mode 100644 index 4a3ba17..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516142927959.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516142958615.pdf b/src/main/webapp/pdffile/fourcheck_20240516142958615.pdf deleted file mode 100644 index 1c870ee..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516142958615.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516143142753.pdf b/src/main/webapp/pdffile/fourcheck_20240516143142753.pdf deleted file mode 100644 index 917e095..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516143142753.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516144149497.pdf b/src/main/webapp/pdffile/fourcheck_20240516144149497.pdf deleted file mode 100644 index b7f4aba..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516144149497.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516144159071.pdf b/src/main/webapp/pdffile/fourcheck_20240516144159071.pdf deleted file mode 100644 index 40e6e85..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516144159071.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20240516163703311.pdf b/src/main/webapp/pdffile/fourcheck_20240516163703311.pdf deleted file mode 100644 index a852c3a..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20240516163703311.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20250319134547215.pdf b/src/main/webapp/pdffile/fourcheck_20250319134547215.pdf deleted file mode 100644 index 60454cc..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20250319134547215.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20250319134604484.pdf b/src/main/webapp/pdffile/fourcheck_20250319134604484.pdf deleted file mode 100644 index b9c472a..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20250319134604484.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20250319134724332.pdf b/src/main/webapp/pdffile/fourcheck_20250319134724332.pdf deleted file mode 100644 index e119b48..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20250319134724332.pdf and /dev/null differ diff --git a/src/main/webapp/pdffile/fourcheck_20250320135857012.pdf b/src/main/webapp/pdffile/fourcheck_20250320135857012.pdf deleted file mode 100644 index 64ecbd5..0000000 Binary files a/src/main/webapp/pdffile/fourcheck_20250320135857012.pdf and /dev/null differ diff --git a/src/main/webapp/pdfxml/四性检测报表.ureport.xml b/src/main/webapp/pdfxml/四性检测报表.ureport.xml index f29273a..3013e1a 100644 --- a/src/main/webapp/pdfxml/四性检测报表.ureport.xml +++ b/src/main/webapp/pdfxml/四性检测报表.ureport.xml @@ -1,3 +1,184 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +