diff --git a/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/CustomMultipartFile.java b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/CustomMultipartFile.java new file mode 100644 index 0000000..e908bda --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-core/src/main/java/com/securitycontrol/common/core/utils/CustomMultipartFile.java @@ -0,0 +1,58 @@ +package com.securitycontrol.common.core.utils; + +import org.springframework.web.multipart.MultipartFile; +import java.io.*; + +public class CustomMultipartFile implements MultipartFile { + private final byte[] content; + private final String fileName; + private final String contentType; + + public CustomMultipartFile(byte[] content, String fileName, String contentType) { + this.content = content; + this.fileName = fileName; + this.contentType = contentType; + } + + @Override + public String getName() { + return fileName; + } + + @Override + public String getOriginalFilename() { + return fileName; + } + + @Override + public String getContentType() { + return contentType; + } + + @Override + public boolean isEmpty() { + return content.length == 0; + } + + @Override + public long getSize() { + return content.length; + } + + @Override + public byte[] getBytes() { + return content; + } + + @Override + public InputStream getInputStream() { + return new ByteArrayInputStream(content); + } + + @Override + public void transferTo(File dest) throws IOException { + try (FileOutputStream fos = new FileOutputStream(dest)) { + fos.write(content); + } + } +} \ No newline at end of file diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectSafetyVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectSafetyVo.java new file mode 100644 index 0000000..d7bbefa --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/SjProjectSafetyVo.java @@ -0,0 +1,41 @@ +package com.securitycontrol.entity.background.vo; + +import lombok.Data; + +@Data +public class SjProjectSafetyVo { + /** + * 主键 + */ + private String id; + /** + * 风险编号 + */ + private String riskCode; + /** + * 作业部位 + */ + private String riskSite; + /** + * 风险等级 + */ + private String riskLevel; + /** + * 预控措施 + */ + private String controller; + /** + * 风险控制关键因素 + */ + private String riskController; + /** + * 开始时间 + */ + private String startTime; + /** + * 是否销号 0 否 1是 + */ + private String isXh; + + +} diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjTwoPageController.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjTwoPageController.java index 7ce7dda..f735cb4 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjTwoPageController.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/SjTwoPageController.java @@ -2,13 +2,8 @@ package com.securitycontrol.screen.controller; import com.securitycontrol.common.core.web.controller.BaseController; import com.securitycontrol.common.core.web.page.TableDataInfo; -import com.securitycontrol.common.log.annotation.Log; -import com.securitycontrol.common.log.enums.OperationType; -import com.securitycontrol.entity.screen.dto.TowerAssInspectDto; import com.securitycontrol.entity.screen.vo.DeviceValueVo; -import com.securitycontrol.entity.screen.vo.TowerAssInspectVo; import com.securitycontrol.screen.service.SjTwoPageService; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping;