视频、图片处理(湖南)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SaspEntity/PhotoEntity.java

-package com.founder.commonutils.model.newPublicEntity.SaspEntity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@TableName("st_app_lawcase_objext_result")
-public class PhotoEntity {
-
-
-    @TableField("imgurl")
-    private String imgurl;
-
-    @TableField("fileName")
-    private String fileName;
-
-    @TableField("case_code")
-    private String caseCode;
-
-    @TableField("recieve_code")
-    private String recieveCode;
-
-    @TableField("createtime")
-    private String createtime;
-
-    @TableField("lastest_update_time")
-    private String lastestUpdateTime;
-}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SaspEntity/PhotoOrMediaResult.java

+package com.founder.commonutils.model.newPublicEntity.SaspEntity;
+
+import lombok.Data;
+
+@Data
+public class PhotoOrMediaResult {
+    // 路径
+    private String fileUrl;
+    // 创建时间
+    private String time;
+    // 文件名
+    private String fileName;
+    // 经度
+    private String x;
+    // 纬度
+    private String y;
+}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SaspEntity/SaspResult.java

-package com.founder.commonutils.model.newPublicEntity.SaspEntity;
-
-import lombok.Data;
-
-import javax.validation.constraints.Max;
-import java.util.List;
-
-@Data
-public class SaspResult {
-
-    List<VideoEntity> media;
-
-    List<PhotoEntity> photo;
-}

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SaspEntity/VideoEntity.java

-package com.founder.commonutils.model.newPublicEntity.SaspEntity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data
-@TableName("sk_dictionary")
-public class VideoEntity {
-
-    @TableField("file_pathafterupload")
-    private String  filePathafterupload;
-
-    @TableField("file_name")
-    private String  fileName;
-
-    @TableField("case_code")
-    private String  caseCode;
-
-    @TableField("recieve_code")
-    private String  recieveCode;
-
-    @TableField("create_time")
-    private String  createTime;
-
-    @TableField("lastest_update_time")
-    private String  lastestUpdateTime;
-}

service/publicapi/src/main/java/com/founder/publicapi/controller/AsjService/AsjController.java

 package com.founder.publicapi.controller.AsjService;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
 import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
@@ -10,12 +9,9 @@ import com.founder.commonutils.model.asjEntity.TbStAsjResult;
 import com.founder.commonutils.model.newPublicEntity.*;
 
 
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoEntity;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.SaspResult;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.VideoEntity;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
 import com.founder.commonutils.model.vo.param.*;
-import com.founder.commonutils.util.JsonUtils;
 import com.founder.publicapi.service.TbStAsjService;
 import com.founder.servicebase.logs.OperLog;
 import com.founder.servicebase.logs.OperationType;
@@ -28,7 +24,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -200,21 +195,12 @@ public class AsjController {
     @ApiOperation(value = "以案侦查-涉案视频")
     @PostMapping("/querySasp")
     public MapRestResult querySasp(String asjbh){
-
-        SaspResult saspResult = new SaspResult();
-        List<VideoEntity> videoByAsjbh = tbStAsjService.getVideoByAsjbh(asjbh);
-
-        List<PhotoEntity> photoByAsjbh = tbStAsjService.getPhotoByAsjbh(asjbh);
-        saspResult.setMedia(videoByAsjbh);
-        saspResult.setPhoto(photoByAsjbh);
-
-/*        JSONArray jsonArray = null;
-        try {
-             jsonArray = JsonUtils.readJsonFromClassPath("data/getSasp.json", JSONArray.class);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }*/
-        return MapRestResult.build(200,"成功",saspResult);
+        Map<String,Object> mapResult = new HashMap<>();
+        List<PhotoOrMediaResult> videoByAsjbh = tbStAsjService.getVideoByAsjbh(asjbh);
+        List<PhotoOrMediaResult> photoByAsjbh = tbStAsjService.getPhotoByAsjbh(asjbh);
+        mapResult.put("photo",photoByAsjbh);
+        mapResult.put("media",videoByAsjbh);
+        return MapRestResult.build(200,"成功",mapResult);
     }
 
     @OperLog(message = "点位校验案件信息查询",operation = OperationType.QUERY)

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TbStAsjMapper.java

 package com.founder.publicapi.mapper.mysqlMapper;
 
-
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
 import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
 import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoEntity;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.VideoEntity;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.ZdcsResult;
 import com.founder.commonutils.model.newPublicEntity.ZdryResult;
 import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
@@ -61,7 +58,7 @@ public interface TbStAsjMapper extends BaseMapper<TbStAsj> {
 
     List<Map<String,Object>> toQueryJwdinfoTj(TbAsjJwdinfo tbAsjJwdinfo);
 
-    List<VideoEntity> getVideoByAsjbh(@Param("asjbh")String asjbh);
+    List<PhotoOrMediaResult> getVideoByAsjbh(@Param("asjbh")String asjbh);
 
-    List<PhotoEntity> getPhotoByAsjbh(@Param("asjbh")String asjbh);
+    List<PhotoOrMediaResult> getPhotoByAsjbh(@Param("asjbh")String asjbh);
 }

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TbStAsjMapper.xml

@@ -519,16 +519,16 @@
         )p
     </select>
     <select id="getVideoByAsjbh" parameterType="string"
-            resultType="com.founder.commonutils.model.newPublicEntity.SaspEntity.VideoEntity">
-        select * from st_app_camera_media
+            resultType="com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult">
+        select file_pathafterupload as fileUrl,create_time as time,file_name as fileName from st_app_camera_media
         where 1=1
         <if test="asjbh!=null and asjbh!=''">
          and   case_code = #{asjbh, jdbcType=VARCHAR}
         </if>
     </select>
     <select id="getPhotoByAsjbh" parameterType="string"
-            resultType="com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoEntity">
-        select * from st_app_lawcase_objext_result
+            resultType="com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult">
+        select imgurl as fileUrl,createtime as time,file_name as fileName from st_app_lawcase_objext_result
         where 1=1
         <if test="asjbh!=null and asjbh!=''">
         and   case_code = #{asjbh, jdbcType=VARCHAR}

service/publicapi/src/main/java/com/founder/publicapi/service/TbStAsjService.java

@@ -5,8 +5,7 @@ import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
 import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
 import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoEntity;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.VideoEntity;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.newPublicEntity.ZdryResult;
 import com.founder.commonutils.model.newPublicEntity.jwdjyEntity.TbAsjJwdinfo;
@@ -51,7 +50,7 @@ public interface TbStAsjService extends IService<TbStAsj> {
     List<Map<String,Object>> toQueryJwdinfoTj(TbAsjJwdinfo tbAsjJwdinfo, SysUser user);
 
 
-    List<VideoEntity> getVideoByAsjbh(String asjbh);
+    List<PhotoOrMediaResult> getVideoByAsjbh(String asjbh);
 
-    List<PhotoEntity> getPhotoByAsjbh(String asjbh);
+    List<PhotoOrMediaResult> getPhotoByAsjbh(String asjbh);
 }

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TbStAsjServiceImpl.java

@@ -7,8 +7,7 @@ import com.founder.commonutils.model.asjEntity.CbxszAndXlaj;
 import com.founder.commonutils.model.asjEntity.TbAsjJwdInfo;
 import com.founder.commonutils.model.asjEntity.TbStAsj;
 import com.founder.commonutils.model.asjEntity.TbStAsjResult;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoEntity;
-import com.founder.commonutils.model.newPublicEntity.SaspEntity.VideoEntity;
+import com.founder.commonutils.model.newPublicEntity.SaspEntity.PhotoOrMediaResult;
 import com.founder.commonutils.model.newPublicEntity.SkPointlocation;
 import com.founder.commonutils.model.newPublicEntity.SysUser;
 import com.founder.commonutils.model.newPublicEntity.ZdcsResult;
@@ -250,12 +249,12 @@ public class TbStAsjServiceImpl extends ServiceImpl<TbStAsjMapper, TbStAsj> impl
     }
 
     @Override
-    public List<VideoEntity> getVideoByAsjbh(String asjbh) {
+    public List<PhotoOrMediaResult> getVideoByAsjbh(String asjbh) {
         return tbStAsjMapper.getVideoByAsjbh(asjbh);
     }
 
     @Override
-    public List<PhotoEntity> getPhotoByAsjbh(String asjbh) {
+    public List<PhotoOrMediaResult> getPhotoByAsjbh(String asjbh) {
         return tbStAsjMapper.getPhotoByAsjbh(asjbh);
     }