Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldFileService.java

@@ -11,6 +11,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.ParseException;
 
 /**
  * <p>
@@ -30,5 +31,5 @@ public interface MouldFileService extends IService<MouldFile> {
     HttpRespMsg getListByUserAndProjectId(UserVO userVO, PageUtil page);
     HttpRespMsg dowloadFileList(UserVO userVO, HttpServletRequest request, HttpServletResponse response,String downloadPath,String path) throws IOException;
     HttpRespMsg addPartFile(UserVO userVO, String path, MultipartFile[] files);
-    HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response);
+    HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response) throws ParseException;
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -22,6 +22,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -206,13 +208,13 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                 projectFile.setBlongType(blongType);
                 mouldFileMapper.insert(projectFile);
                 //添加上传记录
-                MouldOperationDynamics dynamics = new MouldOperationDynamics();
-                dynamics.setContent(Constant.UPDATE);
-                dynamics.setOperatorId(user.getId());
-                dynamics.setOperatorName(user.getUsername());
-                dynamics.setMouldId(userVO.getMouldId());
-                dynamics.setBelongType(blongType);
-                mouldOperationDynamicsMapper.insert(dynamics);
+//                MouldOperationDynamics dynamics = new MouldOperationDynamics();
+//                dynamics.setContent(Constant.UPDATE);
+//                dynamics.setOperatorId(user.getId());
+//                dynamics.setOperatorName(user.getUsername());
+//                dynamics.setMouldId(userVO.getMouldId());
+//                dynamics.setBelongType(blongType);
+//                mouldOperationDynamicsMapper.insert(dynamics);
                 Project project = projectMapper.selectOne(new QueryWrapper<Project>().eq("id", mould.getProjectId()));
                 List<ProjectApprove> projectApproves = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
                 String content = "";
@@ -581,7 +583,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
     }
 
     @Override
-    public HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response) {
+    public HttpRespMsg downloadFileListExcel(UserVO userVO, HttpServletResponse response) throws ParseException {
         HttpRespMsg msg = new HttpRespMsg();
         List<List<String>> list = new ArrayList<List<String>>();
         //标题
@@ -593,11 +595,19 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         list.add(titleList);
         QueryWrapper<MouldOperationDynamics> qw = new QueryWrapper<MouldOperationDynamics>();
         qw.eq("content", Constant.DOWNLOAD);
+        String start = userVO.getStartTime().replace("Z", " UTC");//是空格+UTC
+        String end = userVO.getStartTime().replace("Z", " UTC");//是空格+UTC
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+        Date date1 = df.parse(start);
+        Date date2 = df.parse(end);
+        SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+        Date startDate = df1.parse(date1.toString());
+        Date endDate = df1.parse(date2.toString());
         SimpleDateFormat dateSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         if (userVO.getStartTime() != null && userVO.getEndTime() != null) {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            qw.le("indate",LocalDateTime.parse(userVO.getStartTime(),formatter));
-            qw.ge("indate", LocalDateTime.parse(userVO.getEndTime(),formatter));
+            qw.le("indate",startDate);
+            qw.ge("indate", endDate);
         }
         List<MouldOperationDynamics> mouldOperationDynamics = mouldOperationDynamicsMapper.selectList(qw);
         for (MouldOperationDynamics dynamic : mouldOperationDynamics) {

cloud-model/src/main/java/com/hssx/cloudmodel/util/MD5Util.java

@@ -6,9 +6,13 @@ import org.springframework.util.DigestUtils;
 import javax.servlet.ServletOutputStream;
 import java.io.*;
 import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
+import java.util.Locale;
 import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -25,11 +29,19 @@ public class MD5Util {
         return DigestUtils.md5DigestAsHex(password.getBytes());
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws ParseException {
+
+//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+////        LocalDateTime parse = LocalDateTime.parse("2019-07-31T16:00:00.000Z", formatter);
+//        System.out.println(parse);
+
+        String start = "2019-07-31T16:00:00.000Z".replace("Z", " UTC");//是空格+UTC
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+        Date date1 = df.parse(start);
+        SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+        Date startDate = df1.parse(date1.toString());
+        System.out.println("date1.toString()"+date1.toString()+"=====startDate"+startDate);
 
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        LocalDateTime parse = LocalDateTime.parse("1986-04-08 12:30:00", formatter);
-        System.out.println(parse);
 //        String password = "000000";
 //        System.out.println(MD5Util.getPassword(password));
 //        System.out.println(UUID.randomUUID().toString().replaceAll("-", ""));;