消息部分代码提交

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/controller/LookOverController.java

@@ -15,14 +15,12 @@ import com.jeeplus.test.garbageClearance.domain.LookOver;
 import com.jeeplus.test.garbageClearance.service.DTO.LookOverDTO;
 import com.jeeplus.test.garbageClearance.service.LookOverService;
 import com.jeeplus.test.garbageClearance.utils.SnowFlake;
-import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.domain.WorkAttachmentInfo;
 import com.jeeplus.test.oss.service.OssService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -55,6 +53,20 @@ public class LookOverController {
     private NotifyService notifyService;
 
     /**
+     * 查询巡视工单
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("queryById")
+    public ResponseEntity queryById(String id) {
+        // 还需要处理单位  清运专员  联系方式  及  附件信息
+        LookOver post = overService.selectByID ( id );
+
+        return ResponseEntity.ok ( post );
+    }
+
+    /**
      * 保存巡视信息
      */
     @ApiLog("保存巡视信息")

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/domain/LookOver.java

@@ -40,6 +40,21 @@ public class LookOver extends BaseEntity implements Serializable {
     @ApiModelProperty("处理状态")
     private String status;
 
+    @ApiModelProperty("清运专员")
+    private String clearUserId;
+
+    @ApiModelProperty("清运专员名称")
+    @TableField(exist = false)
+    private String clearUserName;
+
+    @ApiModelProperty("联系方式")
+    @TableField(exist = false)
+    private String clearUserMobile;
+
+    @TableField(exist = false)
+    @ApiModelProperty("处理单位名称")
+    private String processingUnitName;
+
     //附件信息
     @TableField(exist = false)
     List<WorkAttachmentInfo> fileList1;

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/mapper/LookOverMapper.java

@@ -8,8 +8,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.garbageClearance.domain.LookOver;
 import com.jeeplus.test.garbageClearance.service.DTO.LookOverDTO;
+import com.jeeplus.test.oss.domain.WorkAttachmentInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 垃圾清运-巡视工单 Mapper 接口
@@ -24,4 +27,14 @@ public interface LookOverMapper extends BaseMapper<LookOver> {
     IPage<LookOver> findPage(Page<LookOverDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     UserDTO getUserInfoByOffId(@Param("officeId") String officeId);
+
+    /**
+     * 根据id获取巡视工单信息
+     * @param id
+     * @return
+     */
+    LookOver selectByID(@Param("id") String id);
+
+    //查出附件信息
+    List<WorkAttachmentInfo> getByAttachmentId(String id);
 }

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/mapper/xml/LookOverMapper.xml

@@ -27,4 +27,24 @@
         ${ew.customSqlSegment}
         ORDER BY a.update_time DESC
     </select>
+    <select id="selectByID" resultType="com.jeeplus.test.garbageClearance.domain.LookOver">
+        select a.no,a.processing_unit,a.remarks,
+        so.name as processingUnitName, su.name as clearUserName, su.mobile as clearUserMobile
+        from garbage_clearance_look_over a
+        left join sys_office so on a.processing_unit = so.id
+        left join sys_user su on a.clear_user_id = su.id
+        where a.id = #{id} and a.del_flag = 0
+    </select>
+    <select id="getByAttachmentId" resultType="com.jeeplus.test.oss.domain.WorkAttachmentInfo">
+        SELECT
+            url,
+            type,
+            attachment_name as name,
+            file_size as size
+		FROM
+			work_attachment
+		WHERE
+			del_flag = 0
+			AND attachment_id = #{id}
+    </select>
 </mapper>

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/service/LookOverService.java

@@ -19,12 +19,17 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.garbageClearance.domain.LookOver;
 import com.jeeplus.test.garbageClearance.mapper.LookOverMapper;
+import com.jeeplus.test.oss.domain.WorkAttachmentInfo;
+import com.jeeplus.test.oss.service.OssService;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.jeeplus.test.garbageClearance.service.DTO.LookOverDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +41,8 @@ import java.util.stream.Collectors;
 @Transactional
 public class LookOverService extends ServiceImpl<LookOverMapper, LookOver> {
 
+    @Autowired
+    private OssService ossService;
 
     public String getMaxNo() {
         // 创建查询条件构造器
@@ -55,6 +62,29 @@ public class LookOverService extends ServiceImpl<LookOverMapper, LookOver> {
         return baseMapper.getUserInfoByOffId(officeId);
     }
 
+    /**
+     * 根据id获取巡视工单信息
+     * @param id
+     * @return
+     */
+    public LookOver selectByID(String id) {
+        LookOver lookOver = baseMapper.selectByID(id);
+        List<WorkAttachmentInfo> files = baseMapper.getByAttachmentId(id);
+
+        if (null != files && files.size()>0) {
+            files.forEach(fi->{
+                String fileTemporaryLookUrl = ossService.getFileTemporaryLookUrl(fi.getUrl());
+                fi.setUrl(fileTemporaryLookUrl);
+            });
+
+            lookOver.setFileList1(files);
+        }
+
+        // 根据id 从work_attachment 表中获取图片信息
+        return lookOver;
+    }
+
+
 
     /**
      * 查询无报告项目及老项目列表信息

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/oss/domain/WorkAttachmentInfo.java

@@ -34,6 +34,9 @@ public class WorkAttachmentInfo extends BaseEntity {
      */
     private String attachmentName;
 
+    @TableField(exist = false)
+    private String name;
+
     /**
      * 文件所属业务模块（数据字典配置）
      */
@@ -53,6 +56,8 @@ public class WorkAttachmentInfo extends BaseEntity {
      * 附件大小
      */
     private String fileSize;
+    @TableField(exist = false)
+    private String size;
 
     /**
      * 排序

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/oss/service/OssService.java

@@ -198,6 +198,43 @@ public class OssService extends ServiceImpl<OssServiceMapper,WorkAttachment> {
     }
 
     /**
+     * 生成临时文件
+     * @param list
+     * @return
+     */
+    public List<WorkAttachmentInfo> temporaryUrlForLO(List<WorkAttachmentInfo> list) {
+        list.stream().forEach(work -> {
+            String url = null;
+            if (StringUtils.isNotEmpty(work.getUrl())) {
+                url = aliyunUrl + work.getUrl();
+                work.setTemporaryUrl(getFileTemporaryLookUrl(url));
+            }
+
+            //对文件大小进行处理
+            if(StringUtils.isBlank(work.getFileSize())){
+                work.setFileSize("0");
+            }
+            if(StringUtils.isNotBlank(work.getFileSize())){
+                Long fileSizeBytes = Long.parseLong(work.getFileSize());
+                //如果数据库文件大小小于等于0， 则访问阿里云获取文件大小
+                fileSizeBytes = 0L;
+                if (fileSizeBytes<=0){
+                    fileSizeBytes = ossClientService.getSimplifiedObjectMeta(url);
+                }
+
+                if(null != fileSizeBytes){
+                    Double fileSize = (double)fileSizeBytes/1024/1024;
+                    work.setFileSize(String.format("%.2f", fileSize));
+                }else{
+                    work.setFileSize("0.00");
+                }
+            }
+        });
+        return list;
+    }
+
+
+    /**
      * 根据文件路径获取文件信息
      * @param url
      * @return