From 56752f7245347424762514dfa0c55f1968ab1d5e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 16 五月 2024 22:41:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 37 ++++++++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java | 4 +
framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java | 3 -
inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java | 2
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java | 2
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java | 2
inspect-server/src/main/resources/mapper/InsUnPassMapper.xml | 11 +++--
user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 2
12 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java b/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
index 8a3998f..4639e15 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
@@ -69,5 +69,4 @@
// System.out.println(wrapper.getExpression().getSqlSegment());
return wrapper;
}
-
-}
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index b851be5..8346cbb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -1,5 +1,8 @@
package com.yuanchu.mom.controller;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
@@ -15,10 +18,15 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.io.PrintWriter;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Map;
+import java.util.Objects;
+import java.util.Scanner;
@RestController
@RequestMapping("/insReport")
@@ -91,4 +99,33 @@
return Result.success(insReportService.ratifyReport(id, isRatify, ratifyTell));
}
+ @RequestMapping("/onlyOffice/save")
+ public void saveFile(@RequestParam String fileName, HttpServletRequest request, HttpServletResponse response) {
+ PrintWriter writer = null;
+ try {
+ writer = response.getWriter();
+ // 鑾峰彇浼犺緭鐨刯son鏁版嵁
+ Scanner scanner = new Scanner(request.getInputStream()).useDelimiter("\\A");
+ String body = scanner.hasNext() ? scanner.next() : "";
+ JSONObject jsonObject = JSONObject.parseObject(body);
+
+ System.out.println(jsonObject);
+ if (jsonObject.containsKey("url")) {
+ String jsonArray = jsonObject.get("lastsave").toString(); // 鏇存柊鏃堕棿
+ String fileUrl = jsonObject.get("url").toString(); // 鏇存柊鏂囦欢url
+ HttpUtil.downloadFile(fileUrl, FileUtil.file(wordUrl + "/" + fileName));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ writer.write("{\"error\":-1}");
+ return;
+ }
+ /*
+ * status = 1锛屾垜浠粰onlyOffice鐨勬湇鍔¤繑鍥瀧"error":"0"}鐨勪俊鎭��
+ * 杩欐牱onlyOffice浼氳涓哄洖璋冩帴鍙ｆ槸娌￠棶棰樼殑锛岃繖鏍峰氨鍙互鍦ㄧ嚎缂栬緫鏂囨。浜嗭紝鍚﹀垯鐨勮瘽浼氬脊鍑虹獥鍙ｈ鏄�
+ */
+ if (Objects.nonNull(writer)) {
+ writer.write("{\"error\":0}");
+ }
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
index 2877fa1..2822d73 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsUnPassController.java
@@ -37,4 +37,4 @@
UnPassPageDto unPassPageDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UnPassPageDto.class);
return Result.success(insUnPassService.pageInsUnPass(page, unPassPageDto));
}
-}
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
index d22aa34..8581e60 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
@@ -12,4 +12,4 @@
@Data
public class UnPassPageDto extends InsUnPass implements Serializable {
-}
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java
index 1f0990d..c5d4d62 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsUnPassMapper.java
@@ -12,4 +12,4 @@
*/
public interface InsUnPassMapper extends BaseMapper<InsUnPass> {
IPage<UnPassPageDto> pageInsUnPass(IPage<UnPassPageDto> page, QueryWrapper<UnPassPageDto> ew);
-}
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
index c1fcdd0..869393d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
@@ -37,7 +37,7 @@
* 妫�娴嬮」
*/
@ValueTableShow(value = 4, name = "妫�娴嬮」")
- private String inspectionItems;
+ private String inspectionItem;
/**
* 妫�娴嬪瓙椤�
*/
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index d3d9f56..8723b42 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -1,9 +1,9 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.pojo.InsReport;
-import com.baomidou.mybatisplus.extension.service.IService;
import java.util.Map;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java
index fba17e5..198a274 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsUnPassService.java
@@ -11,4 +11,4 @@
*/
public interface InsUnPassService {
Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto);
-}
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
index 19bf21e..5c6ad2e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
@@ -30,7 +30,9 @@
public Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(UnPassPageDto.class));
+// Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("pageInsUnPass");
+// if (map1.get("look") == 1) unPassPageDto.setCreateUser(map1.get("userId"));
map.put("body", insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto)));
return map;
}
-}
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
index 88c5d45..d67f656 100644
--- a/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnPassMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsUnPass">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="inspectionItems" column="inspection_items" jdbcType="VARCHAR"/>
+ <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
<result property="model" column="model" jdbcType="VARCHAR"/>
@@ -19,7 +19,10 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<select id="pageInsUnPass" resultType="com.yuanchu.mom.dto.UnPassPageDto">
- select *
- from ins_un_pass iu
+ SELECT * FROM
+ ins_un_pass iu
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
</select>
-</mapper>
+</mapper>
\ No newline at end of file
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 4550e8e..8d3e75d 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
index 07343a3..3e30513 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
@@ -86,4 +86,4 @@
}
return 1;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3