上传不显示图片问题

liujun001
1 parent 08088c35
Showing 8 changed files with 46 additions and 25 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/resource/UpLoadPicturePicDataDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/resource/LinggangSignInResource.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/sign/in/resource/LinggangSignInResourceServiceImpl.java
Bsth-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -99,9 +99,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(loginDriverDTO.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         NewDriver driver = null;
@@ -127,9 +127,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         SignIn signIn = convertSignIn(dto);
@@ -170,9 +170,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         SignIn signIn = convertSignIn(dto);
@@ -202,9 +202,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         SignIn signIn = convertSignIn(dto);
@@ -220,9 +220,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         LinggangScheduling scheduling = convertScheduling(dto);
@@ -250,9 +250,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         NewDriver newDriver = convertGetBeforeWorkListDTO(dto);
@@ -295,9 +295,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         List<LinggangSignInResource> convertLinggangSignInResources = convertLinggangSignInResource(dto);
@@ -319,9 +319,9 @@ public class DssDriverController extends BaseController {
         }
         String msg = JwtAuthenticationTokenFilter.validateDevice(dto.getDevice());
-        if(StringUtils.isNotEmpty(msg)){
+        if (StringUtils.isNotEmpty(msg)) {
             log.info(msg);
-            return ResponseResult.error(TipEnum.TIP_401.getCode(),TipEnum.TIP_401.getMsg());
+            return ResponseResult.error(TipEnum.TIP_401.getCode(), TipEnum.TIP_401.getMsg());
         }
         LinggangSignInResource resource = cconvertLinggangSignInResource(dto);
@@ -536,6 +536,10 @@ public class DssDriverController extends BaseController {
             resource.setCreateTime(new Date());
             resource.setDevice(dto.getDevice());
             resource.setContent(pic.getPic());
+            resource.setPicType(pic.getPicType());
+            if (StringUtils.isEmpty(resource.getPicType())) {
+                resource.setPicType("png");
+            }
             resources.add(resource);
         }
@@ -36,6 +36,8 @@ public class UpLoadPicturePicDataDTO implements java.io.Serializable {
     @NotEmpty(message = "照片内容不能为空")
     @ApiModelProperty(value = "照片;格式：BASE64", required = true)
     private String pic;
+    @ApiModelProperty(value = "照片类型", required = true)
+    private String picType;
     @Override
     public String toString() {
@@ -77,6 +77,8 @@ public class LinggangSignInResource {
     /**文件内容*/
     @TableField(exist = false)
     private String content;
+    @TableField(exist = false)
+    private String picType;
     public Integer getIndex() {
         return index1;
@@ -244,7 +244,7 @@ public class DriverJob implements InitializingBean {
     @Transactional(rollbackFor = Exception.class)
     public void getSchedulingInfo() {
         Date date = new Date();
-        JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRequestIdOfMDCValue());
+        JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRandomValue());
         for (int i = 0; i < 2; i++) {
             runScheduling(DateUtils.addDays(date, i).getTime());
         }
@@ -288,7 +288,7 @@ public class DriverJob implements InitializingBean {
         }
         Integer count = schedulingService.countId(scheduling);
         if (Objects.nonNull(count) && count > 0) {
-            log.info("[{}]排班数据已经存在", date);
+            log.info("[{}]排班数据已经存在:[{}]", date,count);
             return;
         }
@@ -302,8 +302,9 @@ public class DriverJob implements InitializingBean {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
+        String requestId = JwtAuthenticationTokenFilter.getRequestIdOfMDCValue();
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type,idSets);
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type,idSets,requestId);
         // 删除两天前排班信息
         if (isSameDay) {
             deleteScheduling();
@@ -400,7 +401,8 @@ public class DriverJob implements InitializingBean {
     }
-    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type,Set<Long> idSets) {
+    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type,Set<Long> idSets,String requestId) {
+        JwtAuthenticationTokenFilter.putMDC("job",requestId);
         log.info("开始拉取排班:{};[{}]", dateKey, getSchedulingInfoUrl);
         List<ResponseSchedulingDto> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
@@ -445,8 +447,9 @@ public class DriverJob implements InitializingBean {
             }
             schedulingList.sort(Comparator.comparing(ResponseSchedulingDto::getFcsjT));
         }
+
         // 存入签到报表
-        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type,idSets);
+        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type,idSets,requestId);
         // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
         log.info("拉取排班完毕:{}", dateKey);
@@ -28,6 +28,7 @@ import com.ruoyi.equipment.domain.EquipmentLog;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.errorScheduling.domain.ErrorJobcode;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.GlobalIndex;
@@ -416,7 +417,8 @@ public class ThreadJobService {
      */
     @Async
     @Transactional(rollbackFor = {Exception.class})
-    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type,Set<Long> IdSets) {
+    public void asyncComputedScheduling(Map<String, List<ResponseSchedulingDto>> originSchedulingMap, String timeOut, Date date, int type,Set<Long> IdSets,String requestId) {
+        JwtAuthenticationTokenFilter.putMDC("job",requestId);
         //查询当天是否保存过考情表  如果不存在则保存
         List<DriverScheduling> bcList = schedulingMapper.queryToDay(DateUtil.YYYY_MM_DD_LINK.format(date), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(date, 1)), null, null, null);
         Map<String, List<DriverScheduling>> dto = nowSchedulingCache.getCacheScheduling(ConstDateUtil.formatDate(date));
@@ -101,6 +101,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
     private static void switchTime(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if(Objects.isNull(entity) || Objects.isNull(wrapper)){
+            return;
+        }
         if (Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())) {
             wrapper.between(LinggangKeyWorkLocation::getScheduleDate, entity.getStartScheduleDate(), entity.getEndScheduleDate());
         } else if (Objects.nonNull(entity.getStartScheduleDate())) {
@@ -111,6 +114,10 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
     private static void switchTypes(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if(Objects.isNull(entity) || Objects.isNull(wrapper)){
+            return;
+        }
+
         if (CollectionUtils.isNotEmpty(entity.getTypes())) {
             wrapper.in(LinggangKeyWorkLocation::getType, entity.getTypes());
         }
@@ -130,7 +130,8 @@ public class LinggangSignInResourceServiceImpl extends ServiceImpl&lt;LinggangSignI
             builder.append(en.getSignId());
             builder.append(File.separator);
             builder.append(UUID.randomUUID().toString().replace("-", ""));
-            builder.append(".jpg");
+            builder.append(".");
+            builder.append(en.getPicType());
             en.setPath(builder.toString());
             en.setResourceType(1);
@@ -141,7 +142,7 @@ public class LinggangSignInResourceServiceImpl extends ServiceImpl&lt;LinggangSignI
         boolean flag = saveBatch(entities);
         if (flag) {
             entities.stream().forEach(en -> {
-                ResponseResult<Boolean> result = uploadUtil.uploadImageOfBase64(en.getContent(), en.getPath(), "jpg");
+                ResponseResult<Boolean> result = uploadUtil.uploadImageOfBase64(en.getContent(), en.getPath(), en.getPicType());
                 if (!result.isSuccess() && Objects.equals(result.getData(), Boolean.FALSE)) {
                     throw new InterruptException("图片上传失败，请检查服务器");
                 }
@@ -86,7 +86,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
         return MDC.get(REQUEST_ID_KEY);
     }
-    private static String getRandomValue() {
+    public static String getRandomValue() {
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
 }