Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -72,10 +72,10 @@ public class ClueController {
     }
 
     //下载
-    @RequestMapping("downFile")
-    public Object downFile(UploadFile file, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        return clueService.downFile(file, request, response);
-    }
+//    @RequestMapping("downFile")
+//    public Object downFile(UploadFile file, HttpServletRequest request, HttpServletResponse response) throws Exception {
+//        return clueService.downFile(file, request, response);
+//    }
 
     //删除
     @RequestMapping("deleteFile")

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/UploadFile.java

@@ -35,6 +35,11 @@ public class UploadFile extends Model<UploadFile> {
      */
     @TableField("name")
     private String name;
+    /**
+     * 文件大小
+     */
+    @TableField("size")
+    private String size;
     @TableField(exist = false)
     private String userName;
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/ClueMapper.java

@@ -31,7 +31,8 @@ public interface ClueMapper extends BaseMapper<Clue> {
             "(select `name` from sys_dict where code = 'ClueSources' and id =  clue_source_id) clueSourceValue," +
             "(select `name` from sys_dict where code = 'CustomIndustry' and id =  customer_industry_id) customerIndustryValue," +
             "(select `name` from sys_dict where code = 'CustomLevel' and id =  customer_level_id) customerLevelValue ," +
-            "(select `name` from user where id = incharger_id ) inchargerName" +
+            "(select `name` from user where id = incharger_id ) inchargerName," +
+            "(select `name` from user where id = create_id ) createName" +
             " from clue where id = #{id}")
     Clue selectById2Info(@Param("id") Integer id);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/BusinessOpportunityServiceImpl.java

@@ -338,7 +338,6 @@ public class BusinessOpportunityServiceImpl extends ServiceImpl<BusinessOpportun
     @Override
     public Object reFileName(UploadFile uploadFile, HttpServletRequest request) {
         return uploadFileMapper.update(null, new UpdateWrapper<UploadFile>().eq("id", uploadFile.getId()).set("name", uploadFile.getName()));
-
     }
 
     private BusinessOpportunity setNull(BusinessOpportunity bo) {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -218,12 +218,12 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
         String inchargerId = clue.getInchargerId();
         ActionLog clueLog = new ActionLog();
         clueLog.setUserId(user.getId());
-        clueLog.setItemId(clue.getId());
         clueLog.setCreatTime(new Date());
         clueLog.setCode("clue");
 
         List<Clue> clues = clueMapper.selectList(new QueryWrapper<Clue>().in("id", ids));
         for (Clue clue1 : clues) {
+            clueLog.setItemId(clue1.getId());
             if (clue1.getInchargerId() == null) {
                 //认领
                 clueLog.setName("认领了线索");
@@ -305,9 +305,13 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
                 String purFName = UUID.randomUUID().toString().replaceAll("-", "");
                 realName = purFName + suffix;
 
-
-                uf.setPath(filePath + realName);
+                long size = file.getSize();
+                String s = "MB";
+                double  l = size / 1024.00 / 1024.00;
+                System.out.println(size);
+                uf.setPath("/file/" + realName);
                 uf.setCode("clue");
+                uf.setSize(l+s);
                 uf.setItemId(clue.getId());
                 uf.setRealName(realName);
                 uf.setCreateTime(new Date());
@@ -367,25 +371,28 @@ public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements Cl
     @Override
     public Object downFile(UploadFile file, HttpServletRequest request, HttpServletResponse response) {
         HttpRespMsg msg = new HttpRespMsg();
-        try {
-            ServletOutputStream os = response.getOutputStream();
+//        try {
+//            ServletOutputStream os = response.getOutputStream();
             UploadFile uploadFile = uploadFileMapper.selectById(file.getId());
-            if (uploadFile == null ){
-                msg.setError("文件未找到");
-                return msg;
-            }
-
-            File uploadFile1 = new File(uploadFile.getPath());
-            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(uploadFile.getName(), "UTF-8"));
-            response.setContentType("application/octet-stream");
-            // 读取文件的字节流
-            os.write(FileUtil.readFileByBytes(uploadFile1));
-            os.flush();
-
-        } catch (IOException e) {
-            msg.setError(MessageUtils.message("file.error"));
-            e.printStackTrace();
-        }
+        String path1 = uploadFile.getPath();
+        path1 = path1.substring(2);
+        msg.setData(path1);
+//            if (uploadFile == null ){
+//                msg.setError("文件未找到");
+//                return msg;
+//            }
+//
+//            File uploadFile1 = new File(uploadFile.getPath());
+//            response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(uploadFile.getName(), "UTF-8"));
+//            response.setContentType("application/octet-stream");
+//            // 读取文件的字节流
+//            os.write(FileUtil.readFileByBytes(uploadFile1));
+//            os.flush();
+//
+//        } catch (IOException e) {
+//            msg.setError(MessageUtils.message("file.error"));
+//            e.printStackTrace();
+//        }
         return msg;
     }