警员照片接口

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java

@@ -55,11 +55,6 @@ public class PublicController {
     @Resource
     private PolicemanService policemanService;
 
-    @Resource
-    private SysFileInfoService sysFileInfoService;
-
-    @Resource
-    private PubOrgService pubOrgService;
 
     private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
 
@@ -86,36 +81,8 @@ public class PublicController {
 
     @PostMapping("/uploadPolicePhoto")
     public UploadPolicePhotoDto uploadPolicePhoto(@RequestBody UploadPolicePhotoReq req) {
-        //查询警员表，判断该警员是否已经存在警员照片
-        // 如果存在，则查询file表将该数据进行删除，再调用上传文件接口，将返回的文件信息以及地址更新存储到警员表最终返回警员id和照片地址
-        // 如果不存在照片，那么直接调用上传文件接口，将照片存储到警员表并且返回警员id和照片地址
-        SysFileInfoReq sysFileInfoReq = new SysFileInfoReq();
-        Policeman policeman = policemanService.getById(req.getPoliceId());
-        PubOrg pubOrg = pubOrgService.PubOrgExist(policeman.getOrgId());
-        if (ObjectUtil.isNotNull(policeman.getFileId())){
-            SysFileInfo byId = sysFileInfoService.getById(policeman.getFileId());
-            //删除照片
-
-            sysFileInfoReq.setFileId(policeman.getFileId());
-            try {
-                this.sysFileInfoService.deleteReally(sysFileInfoReq);
-            } catch (Exception var3) {
-                throw new ServiceException(PublicExceptionEnum.FILE_DEL_FAILTURE);
-            }
-
-
-        }
-        //上传照片
-        sysFileInfoReq.setFileBucket("jyzb");
-        sysFileInfoReq.setFileLocation(3);
-        sysFileInfoReq.setFileObjectName("policePhoto/"+pubOrg.getOrgCode()+"/");
-        SysFileInfoResp sysFileInfoResp = sysFileInfoService.uploadFile(req.getPicture(), sysFileInfoReq);
-
 
-        UploadPolicePhotoDto uploadPolicePhotoDto = new UploadPolicePhotoDto();
-//        uploadPolicePhotoDto.setPoliceId();
-//        uploadPolicePhotoDto.setPhoto();
-        return uploadPolicePhotoDto;
+        return policemanService.uploadPolicePhoto(req);
     }
 
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java

@@ -3,11 +3,13 @@ package com.junmp.jyzb.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.junmp.jyzb.api.bean.dto.PolicemanDto;
 import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
+import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
 import com.junmp.jyzb.api.bean.query.CabinetReq;
 import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
 import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
 import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
+import com.junmp.jyzb.api.bean.req.UploadPolicePhotoReq;
 import com.junmp.jyzb.entity.PoliceEquipment;
 import com.junmp.jyzb.entity.Policeman;
 import com.junmp.jyzb.entity.Reassignment;
@@ -101,4 +103,5 @@ public interface PolicemanService extends IService<Policeman> {
     //查询组织机构为null的警员
     List<PolicemanDto> getPoliceWithoutOrg();
 
+    UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -18,6 +18,7 @@ import com.junmp.jyzb.api.bean.query.PolicemanReq;
 import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
 import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
 import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
+import com.junmp.jyzb.api.bean.req.UploadPolicePhotoReq;
 import com.junmp.jyzb.api.exception.enums.*;
 import com.junmp.jyzb.entity.*;
 import com.junmp.jyzb.mapper.*;
@@ -34,7 +35,11 @@ import com.junmp.v2.dict.entity.SysDict;
 import com.junmp.v2.dict.entity.SysDictItem;
 import com.junmp.v2.dict.service.SysDictItemService;
 import com.junmp.v2.dict.service.SysDictService;
+import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
+import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
 import com.junmp.v2.file.api.constant.FileConstant;
+import com.junmp.v2.file.biz.entity.SysFileInfo;
+import com.junmp.v2.file.biz.service.SysFileInfoService;
 import com.junmp.v2.sys.api.bean.user.SysUserDto;
 import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
 import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
@@ -127,6 +132,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
     @Resource
     private CabinetMapper cabinetMapper;
 
+    @Resource
+    private SysFileInfoService sysFileInfoService;
+
     private static final String REDIS_POLICE = "Policeman_";
     private static final String REDIS_ORG = "Organization_";
 
@@ -1257,6 +1265,40 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         return collect;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req) {
+
+        //查询警员表，判断该警员是否已经存在警员照片
+        // 如果存在，则查询file表将该数据进行删除，再调用上传文件接口，将返回的文件信息以及地址更新存储到警员表最终返回警员id和照片地址
+        // 如果不存在照片，那么直接调用上传文件接口，将照片存储到警员表并且返回警员id和照片地址
+        SysFileInfoReq sysFileInfoReq = new SysFileInfoReq();
+        Policeman policeman = policemanService.getById(req.getPoliceId());
+        PubOrg pubOrg = pubOrgService.PubOrgExist(policeman.getOrgId());
+        if (ObjectUtil.isNotNull(policeman.getFileId())){
+            //删除照片
+            sysFileInfoReq.setFileId(policeman.getFileId());
+            try {
+                this.sysFileInfoService.deleteReally(sysFileInfoReq);
+            } catch (Exception var3) {
+                throw new ServiceException(PublicExceptionEnum.FILE_DEL_FAILTURE);
+            }
+            
+        }
+        //上传照片
+        sysFileInfoReq.setFileBucket("jyzb");
+        sysFileInfoReq.setFileLocation(3);
+        sysFileInfoReq.setFileObjectName("policePhoto/"+pubOrg.getOrgCode()+"/");
+        SysFileInfoResp sysFileInfoResp = sysFileInfoService.uploadFile(req.getPicture(), sysFileInfoReq);
+        policeman.setFileId(sysFileInfoResp.getFileId());
+        policeman.setPhoto(sysFileInfoResp.getAccessUrl());
+        //更新警员
+        updateById(policeman);
+        UploadPolicePhotoDto uploadPolicePhotoDto = new UploadPolicePhotoDto();
+        uploadPolicePhotoDto.setPoliceId(policeman.getId());
+        uploadPolicePhotoDto.setPhoto(policeman.getPhoto());
+        return uploadPolicePhotoDto;
+    }
 
 
 }