From 63374f2d70f290d6a430e0c6e2505d7bce593898 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 21 十月 2022 16:49:19 +0800
Subject: [PATCH] 日志名称乱码 处置案件图片添加
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml | 20 ++++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java | 16 +++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java | 20 ++++++
ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java | 3
ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java | 65 +++++++++++++++++++++
ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java | 16 +++++
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 28 ++++++++-
ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java | 3
8 files changed, 166 insertions(+), 5 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
index 824f393..19cc5d4 100644
--- a/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/user/UmsAdminLogController.java
@@ -98,7 +98,8 @@
umsAdminLoginLogPage.setSize(logQueryParams.getSize());
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode( ".xlsx", "utf-8"));
+ String fileName = URLEncoder.encode("鏃ュ織", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+fileName + ".xlsx");
EasyExcel
.write(response.getOutputStream(), UmsAdminLogVO.class)
.sheet("鏁版嵁")
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index a19f04b..8bdbd0f 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -13,6 +13,7 @@
import com.ycl.service.caseHandler.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
@@ -49,11 +50,13 @@
IBaseCaseService baseCaseService;
@Autowired
IDisposeRecordService iDisposeRecordService;
+ @Autowired
+ IImageResourcesService iImageResourcesService;
@ApiOperation(value = "璋冨害")
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@ResponseBody
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢璋冨害")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "妗堜欢璋冨害")
public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
dispatchInfoParam.setCreateUser(user.getUserId());
@@ -62,7 +65,7 @@
@ApiOperation(value = "涓婁紶杩濊/杩濆缓澶勭疆缁撴灉")
@PostMapping("/addition_dispose_result")
- @LogSave(operationType = "浜嬮」澶勭疆绠＄悊",contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
+ @LogSave(operationType = "浜嬮」澶勭疆绠＄悊", contain = "妗堜欢涓婁紶澶勭疆缁撴灉")
public CommonResult searchDisposeList(@RequestParam Long caseId,
@RequestParam Integer type,
@RequestBody UploadDisposingResultParam uploadDisposingResultParam) {
@@ -90,7 +93,18 @@
iArrivalSituationService.save(arrivalSituation);
//鏂囦功
Integer illegalBuildingType = 2;
- if (type.equals(illegalBuildingType)) {
+ Integer violation = 1;
+ String handType = "02";
+ ImageResources imageResources = new ImageResources();
+ imageResources.setType(handType);
+ imageResources.setBelongToId(caseId);
+ imageResources.setCreateTime(LocalDateTime.now());
+ imageResources.setCreateUser(user.getUserId());
+ if (type == violation) {
+ imageResources.setUrl(StringUtils.joinWith(",", uploadDisposingResultParam.getPic(), uploadDisposingResultParam.getSituationPic()));
+ iImageResourcesService.save(imageResources);
+ }
+ if (type==illegalBuildingType) {
Writ writ = new Writ();
BeanUtils.copyProperties(uploadDisposingResultParam, writ);
writ.setBaseCaseId(caseId);
@@ -98,6 +112,14 @@
writ.setCreateTime(LocalDateTime.now());
writ.setCreateUser(user.getUserId());
iWritService.save(writ);
+ imageResources.setUrl(StringUtils
+ .joinWith(",", uploadDisposingResultParam.getPic()
+ , uploadDisposingResultParam.getSituationPic()
+ , uploadDisposingResultParam.getOriginalPic()
+ , uploadDisposingResultParam.getOtherPic()
+ , uploadDisposingResultParam.getRectifiedPic()
+ , uploadDisposingResultParam.getWritPic()));
+ iImageResourcesService.save(imageResources);
}
baseCaseService.update(new LambdaUpdateWrapper<BaseCase>().eq(BaseCase::getId, caseId).set(BaseCase::getState, BaseCaseStatus.DISPOSE));
String stepName = StepName.CHECK.getName();
diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index ae445c6..d52a802 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -94,7 +94,8 @@
equipmentBayonetPage.setSize(size);
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode( ".xlsx", "utf-8"));
+ String fileName = URLEncoder.encode("鍗″彛", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), EquipmentBayonetVO.class)
.sheet("鏁版嵁")
.doWrite(iEquipmentBayonetService
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
new file mode 100644
index 0000000..e31a2bc
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/ImageResources.java
@@ -0,0 +1,65 @@
+package com.ycl.entity.caseHandler;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhanghua
+ * @since 2022-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ums_image_resources")
+public class ImageResources implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭Id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鎵�灞濱d
+ */
+ @TableField("belong_to_id")
+ private Long belongToId;
+
+ /**
+ * 鍥剧墖璧勬簮绫诲瀷 01-涓婃姤 02-澶勭疆
+ */
+ @TableField("type")
+ private String type;
+
+ /**
+ * 鍥剧墖璺緞
+ */
+ @TableField("url")
+ private String url;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @TableField("create_user")
+ private Long createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java
new file mode 100644
index 0000000..d9251f9
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseImageResourcesMapper.java
@@ -0,0 +1,16 @@
+package com.ycl.mapper.caseHandler;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ycl.entity.caseHandler.ImageResources;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhanghua
+ * @since 2022-10-21
+ */
+public interface BaseImageResourcesMapper extends BaseMapper<ImageResources> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
new file mode 100644
index 0000000..4a0e462
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IImageResourcesService.java
@@ -0,0 +1,16 @@
+package com.ycl.service.caseHandler;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.entity.caseHandler.ImageResources;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhanghua
+ * @since 2022-10-21
+ */
+public interface IImageResourcesService extends IService<ImageResources> {
+
+}
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
new file mode 100644
index 0000000..f15457a
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/ImageResourcesServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ycl.service.caseHandler.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.caseHandler.ImageResources;
+import com.ycl.mapper.caseHandler.BaseImageResourcesMapper;
+import com.ycl.service.caseHandler.IImageResourcesService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhanghua
+ * @since 2022-10-21
+ */
+@Service
+public class ImageResourcesServiceImpl extends ServiceImpl<BaseImageResourcesMapper, ImageResources> implements IImageResourcesService {
+
+}
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml
new file mode 100644
index 0000000..ce8cf38
--- /dev/null
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseImageResourcesMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ycl.mapper.caseHandler.BaseImageResourcesMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ycl.entity.caseHandler.ImageResources">
+ <id column="id" property="id" />
+ <result column="belong_to_id" property="belongToId" />
+ <result column="type" property="type" />
+ <result column="url" property="url" />
+ <result column="create_user" property="createUser" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
+ <sql id="Base_Column_List">
+ id, belong_to_id, type, url, create_user, create_time
+ </sql>
+
+</mapper>
--
Gitblit v1.8.0