framework/src/main/java/com/yuanchu/mom/utils/QueryWrappers.java
@@ -69,5 +69,4 @@ // System.out.println(wrapper.getExpression().getSqlSegment()); return wrapper; } } } 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(); // 获取传输的json数据 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}"); } } } 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)); } } } inspect-server/src/main/java/com/yuanchu/mom/dto/UnPassPageDto.java
@@ -12,4 +12,4 @@ @Data public class UnPassPageDto extends InsUnPass implements Serializable { } } 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); } } 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; /** * 检测子项 */ 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;
@@ -11,4 +11,4 @@ */ public interface InsUnPassService { Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto); } } 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; } } } 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> inspect-server/src/main/resources/static/report-template.docxBinary files differ
user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
@@ -86,4 +86,4 @@ } return 1; } } }
