Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/UploadToOssDTO.java

@@ -15,5 +15,10 @@ public class UploadToOssDTO implements Serializable {
 
     private String fileName;
 
+    /**
+     * 三大诉求标识
+     */
+    private String code;
+
     private byte[] fileByte;
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiTopicController.java

@@ -148,4 +148,18 @@ public class ApiTopicController {
     public Result<String> uploadImage(@RequestParam("file") MultipartFile file) {
         return topicService.uploadImage(file);
     }
+
+    /**
+     *
+     * 文件上传
+     *
+     * @params [file]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/25 10:45
+     */
+    @PostMapping("upload/{code}")
+    public Result<String> uploadImageByCode(@RequestParam("file") MultipartFile file, @PathVariable("code") String code) {
+        return topicService.uploadImageByCode(file, code);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/TopicService.java

@@ -109,4 +109,16 @@ public interface TopicService {
      * @since 2019/11/25 10:45
      */
     Result<String> uploadImage(MultipartFile file);
+
+    /**
+     *
+     * 文件上传
+     *
+     * @param file
+     * @param code
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2019/11/25 10:45
+     */
+    Result<String> uploadImageByCode(MultipartFile file, String code);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java

@@ -156,4 +156,23 @@ public class TopicServiceImpl implements TopicService {
 
         return new Result<String>().error("上传文件失败");
     }
+
+    @Override
+    public Result<String> uploadImageByCode(MultipartFile file, String code) {
+        if (null == file) {
+            return new Result<String>().error("上传文件不能为空");
+        }
+
+        try {
+            UploadToOssDTO uploadToOssDto = new UploadToOssDTO();
+            uploadToOssDto.setFileByte(file.getBytes());
+            uploadToOssDto.setFileName(file.getOriginalFilename());
+            uploadToOssDto.setCode(code);
+            return ossFeignClient.uploadFile(uploadToOssDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return new Result<String>().error("上传文件失败");
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -2068,6 +2068,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     progressList) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                 Date insertTime = sdf.parse(dto.getCREATEDATE());
+                // 拉取的记录增加30秒，防止出现排序问题
+                insertTime.setTime(insertTime.getTime() + 30000);
                 String itemHandleProcessId = UUID.randomUUID().toString().replaceAll("-", "");
                 // 插入项目处理进度表
                 ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO();
@@ -2695,9 +2697,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if("0".equals(formDto.getState())){
             ItemEntity item = baseDao.selectById(itemPlat.getReferenceId());
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
-            //内容组成：第一个发起结案申请/吹哨的意见+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
-            ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
-            itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile());
+            if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag())){
+                //执法和发展填写网格化平台的意见
+                itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice());
+            }else{
+                //内容组成：第一个发起结案申请/吹哨的意见+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
+                ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
+                itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile());
+            }
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
             updateById(item);
         }else if("1".equals(formDto.getState())){

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java

@@ -166,17 +166,31 @@ public class OssController {
 
     @PostMapping("uploadFile")
     public Result<String> uploadFile(@RequestBody UploadToOssDTO dto) throws Exception {
-        byte[] fileByte = dto.getFileByte();
-        if (null == fileByte || fileByte.length == NumConstant.ZERO) {
-            return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
-        }
-        // 图片压缩
-        byte[] imgBytes = CompressImgUtils.commpressPicCycle(fileByte, 110, 0.9);
-        //上传文件
-        String extension = FilenameUtils.getExtension(dto.getFileName());
-        String url = OssFactory.build().uploadSuffix(imgBytes, extension);
+        if (StringUtils.isNotBlank(dto.getCode())) {
+            String name = ItemStateCodeEnum.getValueByCode(dto.getCode());
+
+            // 图片压缩
+            byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(dto.getFileByte(), 1024, 0.5);
 
-        return new Result().ok(url);
+            //上传文件
+            String extension = FilenameUtils.getExtension(dto.getFileName());
+            String url = OssFactory.build().upload(afterJyBytes, name, extension);
+
+            return new Result().ok(url);
+        } else {
+
+            byte[] fileByte = dto.getFileByte();
+            if (null == fileByte || fileByte.length == NumConstant.ZERO) {
+                return new Result().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
+            }
+            // 图片压缩
+            byte[] imgBytes = CompressImgUtils.commpressPicCycle(fileByte, 110, 0.9);
+            //上传文件
+            String extension = FilenameUtils.getExtension(dto.getFileName());
+            String url = OssFactory.build().uploadSuffix(imgBytes, extension);
+
+            return new Result().ok(url);
+        }
     }
 
     /**
@@ -281,4 +295,32 @@ public class OssController {
         String url = OssFactory.build().upload(afterJyBytes, name, extension);
         return ossService.afterUpload(url, file.getSize());
     }
+
+    /**
+     * 图片上传并压缩缩略图
+     *
+     * @return void
+     * @author lpf
+     * @date 2020/03/27
+     */
+    @PostMapping("uploadImg/{code}")
+    @ApiOperation(value = "上传图片")
+    public Result<UploadImgAllDTO> uploadImgByCode(@RequestParam("file") MultipartFile file, @PathVariable("code") String code) throws Exception {
+        if (file.isEmpty()) {
+            return new Result<UploadImgAllDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
+        }
+        String name = ItemStateCodeEnum.getValueByCode(code);
+
+        // 图片压缩
+        byte[] afterJyBytes = CompressImgUtils.commpressPicCycle(file.getBytes(), 1024, 0.5);
+
+        //上传文件
+        String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+        String url = OssFactory.build().upload(afterJyBytes, name, extension);
+        UploadImgAllDTO uploadAll = new UploadImgAllDTO();
+        uploadAll.setImgUrl(url);
+        uploadAll.setThumbnail(url);
+        uploadAll.setFileName(name);
+        return new Result<UploadImgAllDTO>().ok(uploadAll);
+    }
 }