Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.amosframework.boot</groupId>
+        <artifactId>amos-boot-module-api</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>amos-boot-module-file-api</artifactId>
+    
+    
+
+  <dependencies>
+        <!--pdf转图片-->
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>2.0.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>fontbox</artifactId>
+            <version>2.0.15</version>
+        </dependency>
+
+        <!--Cannot read JPEG2000 image: Java Advanced Imaging (JAI) Image I/O Tools are not installed-->
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-jpeg2000</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+
+        <!--PDF解析依赖-->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.13</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext-asian</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+
+
+
+  		  <dependency>
+              <groupId>net.sf.cssbox</groupId>
+              <artifactId>pdf2dom</artifactId>
+              <version>1.7</version>
+          </dependency> 
+          <dependency>
+              <groupId>org.apache.pdfbox</groupId>
+              <artifactId>pdfbox</artifactId>
+              <version>2.0.12</version>
+         </dependency>
+         <dependency>
+             <groupId>org.apache.pdfbox</groupId>
+             <artifactId>pdfbox-tools</artifactId>
+             <version>2.0.12</version>
+  		 </dependency>
+
+		<dependency>
+		  <groupId>com.aspose</groupId>
+		  <artifactId>aspose-pdf</artifactId>
+		  <version>18.9</version>
+		</dependency>
+		<dependency>
+		  <groupId>com.aspose</groupId>
+		  <artifactId>aspose-words</artifactId>
+		  <version>19.5jdk</version>
+		</dependency>
+		<dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-cells</artifactId>
+            <version>8.5.2</version>
+        </dependency>
+		<dependency>
+            <groupId>e-iceblue</groupId>
+            <artifactId>spire.doc.free</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>e-iceblue</groupId>
+            <artifactId>spire.pdf.free</artifactId>
+            <version>2.6.3</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.8</version>
+        </dependency>
+        <!-- thumbnailator: 图片压缩工具 -->
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+        </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/config/Constants.java

+package com.yeejoin.amos.file.config;
+
+/**
+ * <p>
+ * 全局常用变量
+ * </p>
+ *
+ * @author zhengqing
+ * @description
+ * @date 2019/10/12 14:47
+ */
+public class Constants {
+
+    // ===============================================================================
+    // ============================ ↓↓↓↓↓↓ 文件系列 ↓↓↓↓↓↓ ============================
+    // ===============================================================================
+
+    /**
+     * 系统分隔符
+     */
+    public static String SYSTEM_SEPARATOR = "/";
+
+    /**
+     * 获取项目根目录
+     */
+    public static String PROJECT_ROOT_DIRECTORY = System.getProperty("user.dir").replaceAll("\\\\", SYSTEM_SEPARATOR);
+
+    /**
+     * 临时文件相关
+     */
+    public final static String DEFAULT_FOLDER_TMP = PROJECT_ROOT_DIRECTORY + "/tmp";
+    public final static String DEFAULT_FOLDER_TMP_GENERATE = PROJECT_ROOT_DIRECTORY + "/tmp-generate";
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/config/MatchLicense.java

+package com.yeejoin.amos.file.config;
+
+import com.aspose.words.License;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+/**
+ * <p>
+ * `aspose-words`授权处理
+ * </p>
+ *
+ * @author zhengqing
+ * @description
+ * @date 2020/12/30$ 11:33$
+ */
+@Slf4j
+public class MatchLicense {
+
+    public static void init() {
+        try {
+            log.info("实现`aspose-words`授权 -> 去掉头部水印");
+            /*
+              实现匹配文件授权 -> 去掉头部水印 `Evaluation Only. Created with Aspose.Words. Copyright 2003-2018 Aspose Pty Ltd.` |
+                                          `Evaluation Only. Created with Aspose.Cells for Java. Copyright 2003 - 2020 Aspose Pty Ltd.`
+             */
+            InputStream is = new ClassPathResource("license.xml").getInputStream();
+            License license = new License();
+            license.setLicense(is);
+        } catch (Exception e) {
+            log.error("《`aspose-words`授权》 失败： {}", e.getMessage());
+        }
+    }
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/convert/DocConvert.java

+package com.yeejoin.amos.file.convert;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+
+import org.apache.poi.poifs.filesystem.DirectoryEntry;
+import org.apache.poi.poifs.filesystem.DocumentEntry;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+
+import com.aspose.pdf.Document;
+import com.aspose.pdf.SvgSaveOptions;
+import com.aspose.words.DocSaveOptions;
+import com.aspose.words.SaveFormat;
+import com.spire.pdf.FileFormat;
+import com.spire.pdf.PdfDocument;
+import com.spire.pdf.widget.PdfPageCollection;
+
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class DocConvert {
+	
+
+	
+	/**
+	 * pdf转为docx
+	 * @param pdfpath pdf路径
+	 * @param docxpath dox路径
+	 */
+	public static void pdf2docx(String pdfpath, String docxpath) {
+		 // load PDF document
+	    Document doc = new Document(pdfpath);
+	    DocSaveOptions saveOptions = new DocSaveOptions();
+	    // resultant file name
+	    String outFileName = docxpath;
+	    doc.save(docxpath);
+	}
+
+	/**
+	 * pdf转为docx
+	 * @param pdfpath pdf路径
+	 * @param OutputStream out流
+	 */
+	public static void pdf2docx(String pdfpath, OutputStream out) {
+		 // load PDF document
+	    Document doc = new Document(pdfpath);
+	    // instantiate an object of SvgSaveOptions
+	    SvgSaveOptions saveOptions = new SvgSaveOptions();
+	    // do not compress SVG image to Zip archive
+	    saveOptions.CompressOutputToZipArchive = false;
+	    // save the output in SVG files
+	    doc.save(out, saveOptions);
+	}
+
+    
+
+    /**
+     * `html` 转 `word` 【 注：本地图片不支持显示！！！ 需转换成在线图片 】
+     *
+     * @param htmlBytes: html字节码
+     * @return word文件路径
+     * @author zhengqing
+     * @date 2020/11/24 11:52
+     */
+    @SneakyThrows(Exception.class)
+    public static byte[] htmlBytes2WordBytes(byte[] htmlBytes) {
+    	com.aspose.words.Document doc = new com.aspose.words.Document();
+        com.aspose.words.DocumentBuilder builder = new com.aspose.words.DocumentBuilder(doc);
+        builder.insertHtml(new String(htmlBytes));
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        doc.save(outputStream, SaveFormat.DOCX);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * `html` 转 `word` 【 注：本地图片不支持显示！！！ 需转换成在线图片 】
+     *
+     * @param htmlBytes:    html字节码
+     * @param wordFilePath: 待生成的word文件路径
+     * @return word文件数据
+     */
+    @SneakyThrows(Exception.class)
+    public static File htmlBytes2WordFile(byte[] htmlBytes, String wordFilePath) {
+    	com.aspose.words.Document doc = new com.aspose.words.Document();
+        com.aspose.words.DocumentBuilder builder = new com.aspose.words.DocumentBuilder(doc);
+        builder.insertHtml(new String(htmlBytes));
+        doc.save(wordFilePath, SaveFormat.DOCX);
+        return new File(wordFilePath);
+    }
+
+    /**
+     * `html` 转 `word` 【注`doc`生成的html中的图片路径中中文是被转义处理过的，再生成word时图片便看不了，需单独做处理，`docx`无此问题】 【 注：此方式会丢失一定格式 】
+     *
+     * @param html:         html内容
+     * @param fileRootPath: 文件根位置
+     * @param wordFileName: 待生成的word文件名
+     * @return word文件路径
+     */
+    @SneakyThrows(Exception.class)
+    public static String html2Word(String html, String fileRootPath, String wordFileName) {
+        final String wordFilePath = fileRootPath + "/" + wordFileName;
+        byte htmlBytes[] = html.getBytes();
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(htmlBytes);
+        POIFSFileSystem poifs = new POIFSFileSystem();
+        DirectoryEntry directory = poifs.getRoot();
+        DocumentEntry documentEntry = directory.createDocument("WordDocument", inputStream);
+        FileOutputStream outputStream = new FileOutputStream(wordFilePath);
+        poifs.writeFilesystem(outputStream);
+        inputStream.close();
+        outputStream.close();
+        return wordFilePath;
+    }
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/convert/EMFConvert.java

+package com.yeejoin.amos.file.convert;
+
+import java.io.OutputStream;
+
+import com.aspose.pdf.*;
+import com.aspose.pdf.devices.EmfDevice;
+import com.aspose.pdf.devices.Resolution;
+
+
+public class EMFConvert {
+	/**
+	 * pdf转为emf文件，只能转换一页
+	 */
+	public static void pdf2emf(String inputPath, String outPath){
+	    // instantiate EmfDevice object
+	    EmfDevice device = new EmfDevice(new Resolution(96));
+	    // load existing PDF file
+	    Document doc = new Document(inputPath);
+	    // save first page of PDF file as Emf image
+	    device.process(doc.getPages().get_Item(1), outPath);
+	}
+	
+	/**
+	 * pdf转为emf文件，只能转换一页
+	 */
+	public static void pdf2emf(String inputPath, OutputStream out){
+	    // instantiate EmfDevice object
+	    EmfDevice device = new EmfDevice(new Resolution(96));
+	    // load existing PDF file
+	    Document doc = new Document(inputPath);
+	    // save first page of PDF file as Emf image
+	    device.process(doc.getPages().get_Item(1), out);
+	}
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/convert/PPTConvert.java

+package com.yeejoin.amos.file.convert;
+
+
+import java.io.OutputStream;
+
+import com.aspose.pdf.*;
+
+public class PPTConvert {
+	/**
+	 * pdf转为ppt
+	 * @param pdfpath pdf路径
+	 * @param pptpath ppt路径
+	 */
+	public static void docx2pdf(String pdfpath, String pptpath) {
+	    // Load source PDF file
+	    Document doc = new Document(pdfpath);
+	    // Instantiate Doc SaveOptions instance
+	    PptxSaveOptions saveOptions = new PptxSaveOptions();
+	    doc.save(pptpath, saveOptions);
+	}
+	
+	public static void docx2pdf(String pdfpath, OutputStream out) {
+	    // Load source PDF file
+	    Document doc = new Document(pdfpath);
+	    // Instantiate Doc SaveOptions instance
+	    PptxSaveOptions saveOptions = new PptxSaveOptions();
+	    // Save resultant DOCX file
+	    doc.save(out, saveOptions);
+	}
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/convert/SVGConvert.java

+package com.yeejoin.amos.file.convert;
+
+
+import java.io.OutputStream;
+
+import com.aspose.pdf.*;
+
+public class SVGConvert {
+	/**
+	 * pdf转为svg
+	 * @param pdfpath pdf路径
+	 * @param docxpath svg路径
+	 */
+	public static void docx2pdf(String pdfpath, String svgpath) {
+	    Document doc =new Document(pdfpath);
+	    doc.save(svgpath);
+	}
+	
+	/**
+	 * svg转为docx
+	 * @param pdfpath pdf路径
+	 * @param OutputStream out
+	 */
+	public static void docx2pdf(String pdfpath, OutputStream out) {
+	    // Load PDF document
+	    Document doc =new Document(pdfpath);
+	    doc.save(out);
+	}
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/dto/AllPageInfo.java

+package com.yeejoin.amos.file.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+@ApiModel("文档的pdf和img信息")
+public class AllPageInfo {
+
+    @ApiModelProperty("id")
+    private String id;
+
+    @ApiModelProperty("文档Id")
+    private String documentId;
+
+    @ApiModelProperty("每一页的pdf和img信息")
+    private List<PageInfo> pageInfoList = new ArrayList<>();
+
+    public String getId() {
+        return id;
+    }
+
+    public AllPageInfo setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getDocumentId() {
+		return documentId;
+	}
+
+	public void setDocumentId(String documentId) {
+		this.documentId = documentId;
+	}
+
+	public List<PageInfo> getPageInfoList() {
+        return pageInfoList;
+    }
+
+    public void setPageInfoList(List<PageInfo> pageInfoList) {
+        this.pageInfoList = pageInfoList;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/dto/CatalogInfo.java

+package com.yeejoin.amos.file.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+@ApiModel("文档的目录信息")
+public class CatalogInfo {
+
+    @ApiModelProperty("文档id")
+    private String id;
+
+    @ApiModelProperty("文档Id")
+    private String documentId;
+
+    @ApiModelProperty("文档名称")
+    private String documentName;
+
+    @ApiModelProperty("总页数")
+    private Integer totalPage;
+
+    @ApiModelProperty("目录信息")
+    private List<ChildCatalog> childCatalogList = new ArrayList<>();
+
+
+    public String getId() {
+        return id;
+    }
+
+    public CatalogInfo setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+
+    public String getDocumentId() {
+		return documentId;
+	}
+
+	public void setDocumentId(String documentId) {
+		this.documentId = documentId;
+	}
+
+	public String getDocumentName() {
+		return documentName;
+	}
+
+	public void setDocumentName(String documentName) {
+		this.documentName = documentName;
+	}
+
+	public Integer getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(Integer totalPage) {
+        this.totalPage = totalPage;
+    }
+
+    public List<ChildCatalog> getChildCatalogList() {
+        return childCatalogList;
+    }
+
+    public void setChildCatalogList(List<ChildCatalog> childCatalogList) {
+        this.childCatalogList = childCatalogList;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/dto/ChildCatalog.java

+package com.yeejoin.amos.file.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+@ApiModel("子目录信息")
+public class ChildCatalog {
+
+    @ApiModelProperty("目录Id")
+    private String catalogId;
+
+    @ApiModelProperty("目录名称")
+    private String catalogName;
+
+    @ApiModelProperty("页码")
+    private Integer pageNum;
+
+    @ApiModelProperty("目录层级")
+    private Integer catalogLevel;
+
+    @ApiModelProperty("目录在页面的位置：和页面顶部的距离")
+    private double position;
+
+    @ApiModelProperty("当前目录的子目录信息")
+    private List<ChildCatalog> childCatalogList = new ArrayList<>();
+
+    public String getCatalogId() {
+        return catalogId;
+    }
+
+    public void setCatalogId(String catalogId) {
+        this.catalogId = catalogId;
+    }
+
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    public void setCatalogName(String catalogName) {
+        this.catalogName = catalogName;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getCatalogLevel() {
+        return catalogLevel;
+    }
+
+    public void setCatalogLevel(Integer catalogLevel) {
+        this.catalogLevel = catalogLevel;
+    }
+
+    public double getPosition() {
+        return position;
+    }
+
+    public void setPosition(double position) {
+        this.position = position;
+    }
+
+    public List<ChildCatalog> getChildCatalogList() {
+        return childCatalogList;
+    }
+
+    public void setChildCatalogList(List<ChildCatalog> childCatalogList) {
+        this.childCatalogList = childCatalogList;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/dto/PageInfo.java

+package com.yeejoin.amos.file.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+@ApiModel("每一页的pdf和img信息")
+public class PageInfo {
+
+    @ApiModelProperty("页面Id")
+    private String pageId;
+
+    @ApiModelProperty("页码")
+    private Integer pageNum;
+
+    @ApiModelProperty("页面高度")
+    private Double height;
+
+    @ApiModelProperty("页面宽度")
+    private Double width;
+
+    @ApiModelProperty("pdf路径")
+    private String pdfUrl;
+
+    @ApiModelProperty("图片路径")
+    private String imgUrl;
+
+    @ApiModelProperty("正文")
+    private String content;
+
+    public PageInfo(Integer pageNum, Double height, Double width, String pdfUrl, String imgUrl, String content) {
+        this.pageNum = pageNum;
+        this.height = height;
+        this.width = width;
+        this.pdfUrl = pdfUrl;
+        this.imgUrl = imgUrl;
+        this.content = content;
+    }
+
+    public String getPageId() {
+        return pageId;
+    }
+
+    public void setPageId(String pageId) {
+        this.pageId = pageId;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public double getHeight() {
+        return height;
+    }
+
+    public void setHeight(Double height) {
+        this.height = height;
+    }
+
+    public Double getWidth() {
+        return width;
+    }
+
+    public void setWidth(Double width) {
+        this.width = width;
+    }
+
+    public String getPdfUrl() {
+        return pdfUrl;
+    }
+
+    public void setPdfUrl(String pdfUrl) {
+        this.pdfUrl = pdfUrl;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/service/license.xml

+<License>
+  <Data>
+    <Products>
+      <Product>Aspose.Total for Java</Product>
+      <Product>Aspose.Words for Java</Product>
+    </Products>
+    <EditionType>Enterprise</EditionType>
+    <SubscriptionExpiry>20991231</SubscriptionExpiry>
+    <LicenseExpiry>20991231</LicenseExpiry>
+    <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+  </Data>
+  <Signature>
+    sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=
+  </Signature>
+</License>

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/utils/HelpUtil.java

+package com.yeejoin.amos.file.utils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author jinly
+ * @date 2020/9/25
+ */
+public class HelpUtil {
+
+
+    /**
+     * 自动生成id
+     *
+     * @return id
+     */
+    public static String generateId() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
+    /**
+     * date 转 localDateTime
+     */
+    public static Date localDateTimeToDate(LocalDateTime localDateTime) {
+        if (localDateTime == null) {
+            return null;
+        }
+        return Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
+    /**
+     * localDateTime 转date
+     */
+    public static LocalDateTime dateToLocalDateTime(Date date) {
+        if (date == null) {
+            return null;
+        }
+        return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+    }
+
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/utils/MyFileUtil.java

+package com.yeejoin.amos.file.utils;
+
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ZipUtil;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+
+/**
+ * <p>
+ * 文件工具类
+ * </p>
+ *
+ * @author zhengqing
+ * @description
+ * @date 2020/8/27 19:21
+ */
+@Slf4j
+public class MyFileUtil {
+
+    /**
+     * 多文件或目录压缩：将`srcPath`目录以及其目录下的所有文件目录打包到`zipPath`+`suffixFileName`文件中 【采用hutool工具类进行打包文件】
+     *
+     * @param srcPath:        需打包的源目录
+     * @param zipPath:        打包后的路径+文件后缀名
+     * @param isWithSrcDir:   是否带目录显示 （true:表示带目录显示）
+     * @param isDeleteSrcZip: 是否删除源目录
+     * @return java.lang.String
+     * @author zhengqing
+     * @date 2020/8/27 19:25
+     */
+    public static File zip(String srcPath, String zipPath, boolean isWithSrcDir, boolean isDeleteSrcZip) {
+        log.debug("【压缩文件】 源目录路径: 【{}】 打包后的路径+文件后缀名: 【{}】", srcPath, zipPath);
+        File zipFile = ZipUtil.zip(srcPath, zipPath, isWithSrcDir);
+        // 删除目录 -> 保证下次生成文件的时候不会累计上次留下的文件
+        if (isDeleteSrcZip) {
+            MyFileUtil.deleteFileOrFolder(srcPath);
+        }
+        return zipFile;
+    }
+
+    /**
+     * 根据路径删除指定的目录或文件，无论存在与否
+     *
+     * @param fullFileOrDirPath: 要删除的目录或文件
+     * @return 删除成功返回 true，否则返回 false
+     * @author zhengqing
+     * @date 2020/9/5 20:56
+     */
+    public static boolean deleteFileOrFolder(String fullFileOrDirPath) {
+        return FileUtil.del(fullFileOrDirPath);
+    }
+
+    /**
+     * 根据路径创建文件
+     *
+     * @param fullFilePath: 文件生成路径
+     * @return 文件信息
+     * @author zhengqing
+     * @date 2020/9/8 21:41
+     */
+    public static File touch(String fullFilePath) {
+        return FileUtil.touch(fullFilePath);
+    }
+
+    /**
+     * 解压
+     *
+     * @param inputStream: 流
+     * @param zipFilePath: zip文件路径
+     * @param outFileDir:  解压后的目录路径
+     * @param isDeleteZip: 是否删除源zip文件
+     * @return 解压后的文件File信息
+     * @author zhengqing
+     * @date 2020/9/5 20:50
+     */
+    @SneakyThrows(Exception.class)
+    public static File unzip(InputStream inputStream, String zipFilePath, String outFileDir, boolean isDeleteZip) {
+        log.debug("【解压文件】 zip文件路径: 【{}】 解压后的目录路径: 【{}】", zipFilePath, outFileDir);
+        // zip压缩文件
+        File zipFile = FileUtil.newFile(zipFilePath);
+        // 写入文件
+        FileUtils.copyInputStreamToFile(inputStream, zipFile);
+        // 编码方式 "UTF-8" 、"GBK" 【注： gbk编码才能解决报错: java.lang.IllegalArgumentException: MALFORMED】
+        File outFile = ZipUtil.unzip(zipFilePath, outFileDir, Charset.forName("GBK"));
+        // 删除zip -> 保证下次解压后的文件数据不会累计上次解压留下的文件
+        if (isDeleteZip) {
+            MyFileUtil.deleteFileOrFolder(zipFilePath);
+        }
+        return outFile;
+    }
+
+    /**
+     * 读取文件内容
+     *
+     * @param file: 文件数据
+     * @return 文件内容
+     * @author zhengqing
+     * @date 2020/9/5 23:00
+     */
+    public static String readFileContent(File file) {
+        return FileUtil.readUtf8String(file);
+    }
+
+    /**
+     * 读取文件内容
+     *
+     * @param filePath: 文件路径
+     * @return 文件内容
+     * @author zhengqing
+     * @date 2020/9/5 23:00
+     */
+    public static String readFileContent(String filePath) {
+        return FileUtil.readUtf8String(filePath);
+    }
+
+    /**
+     * 读取文件数据
+     *
+     * @param filePath: 文件路径
+     * @return 文件字节码
+     * @author zhengqing
+     * @date 2020/9/5 23:00
+     */
+    public static byte[] readBytes(String filePath) {
+        return FileUtil.readBytes(filePath);
+    }
+
+    /**
+     * 写入文件内容
+     *
+     * @param fileContent: 文件内容
+     * @param filePath:    文件路径
+     * @return 文件信息
+     * @author zhengqing
+     * @date 2020/11/17 21:38
+     */
+    @SneakyThrows(Exception.class)
+    public static File writeFileContent(String fileContent, String filePath) {
+        return FileUtil.writeUtf8String(fileContent, filePath);
+    }
+
+    /**
+     * 字节码写入文件
+     *
+     * @param data:     字节码
+     * @param filePath: 文件路径
+     * @return 文件信息
+     * @author zhengqing
+     * @date 2020/11/24 14:36
+     */
+    @SneakyThrows(Exception.class)
+    public static File writeFileContent(byte[] data, String filePath) {
+        return FileUtil.writeBytes(data, filePath);
+    }
+
+    public static void main(String[] args) {
+        try {
+            String filePath = "E:\\IT_zhengqing\\code\\me-workspace\\最新代码生成器\\code-api\\document\\import\\blog.zip";
+            String filePathX = "E:\\IT_zhengqing\\code\\me-workspace\\最新代码生成器\\code-api\\document\\import";
+            // File file =
+            // FileUtil.newFile(filePath);
+            // InputStream fileInputStream = new FileInputStream(file);
+            File unzip = ZipUtil.unzip(filePath, filePathX);
+            System.out.println(unzip);
+
+            String fileContent = FileUtil.readUtf8String(filePath);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/java/com/yeejoin/amos/file/utils/WkHtmlUtil.java

+package com.yeejoin.amos.file.utils;
+
+import cn.hutool.core.io.FileUtil;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
+
+import java.io.IOException;
+
+import com.yeejoin.amos.file.config.Constants;
+
+/**
+ * <p>
+ * html 转 图片或pdf 工具类
+ * </p>
+ *
+ * @author zhengqingya
+ * @description https://wkhtmltopdf.org
+ * html转pdf： wkhtmltopdf https://zhengqing.blog.csdn.net zhengqingya.pdf
+ * html转图片： wkhtmltoimage https://zhengqing.blog.csdn.net zhengqingya.png
+ * 帮助 wkhtmltopdf -h 或 wkhtmltoimage -h
+ * @date 2021/8/11 9:54 下午
+ */
+@Slf4j
+public class WkHtmlUtil {
+
+    /**
+     * 工具根目录
+     */
+    private static final String TOOL_WIN_ROOT_DIRECTORY = "D:/zhengqingya/soft/soft-dev/wkhtmltopdf/bin/";
+
+    public static void main(String[] args) throws Exception {
+        String sourceFilePath = "https://zhengqing.blog.csdn.net";
+        String targetPngFilePath = Constants.DEFAULT_FOLDER_TMP_GENERATE + "/zhengqingya.png";
+        String targetPdfFilePath = Constants.DEFAULT_FOLDER_TMP_GENERATE + "/zhengqingya.pdf";
+        // 设置宽高
+        String cmdByImage = "--crop-w 150 --crop-h 150 --quality 100";
+//        byte[] imageBytes = html2ImageBytes(cmdByImage, sourceFilePath, targetPngFilePath);
+        byte[] imageBytesByCompress = html2ImageBytesByCompress(cmdByImage, sourceFilePath, targetPngFilePath);
+        byte[] pdfBytes = html2PdfBytes("", sourceFilePath, targetPdfFilePath);
+    }
+
+    /**
+     * html转图片
+     *
+     * @param cmd            工具操作指令
+     * @param sourceFilePath html源资源
+     * @param targetFilePath 生成目标资源
+     * @return 图片字节码
+     * @author zhengqingya
+     * @date 2021/8/12 11:09
+     */
+    public static byte[] html2ImageBytes(String cmd, String sourceFilePath, String targetFilePath) {
+        return baseTool("wkhtmltoimage", cmd, sourceFilePath, targetFilePath);
+    }
+
+    /**
+     * html转图片 - 图片压缩版
+     *
+     * @param cmd            工具操作指令
+     * @param sourceFilePath html源资源
+     * @param targetFilePath 生成目标资源
+     * @return 图片字节码
+     * @author zhengqingya
+     * @date 2021/8/12 11:09
+     */
+    @SneakyThrows(Exception.class)
+    public static byte[] html2ImageBytesByCompress(String cmd, String sourceFilePath, String targetFilePath) {
+        String filePath = baseToolForPath("wkhtmltoimage", cmd, sourceFilePath, targetFilePath);
+        Thumbnails.of(filePath)
+                .scale(1f)
+                .toFile(targetFilePath);
+        return FileUtil.readBytes(targetFilePath);
+    }
+
+    /**
+     * html转pdf
+     *
+     * @param cmd            工具操作指令
+     * @param sourceFilePath html源资源
+     * @param targetFilePath 生成目标资源
+     * @return pdf字节码
+     * @author zhengqingya
+     * @date 2021/8/12 11:09
+     */
+    public static byte[] html2PdfBytes(String cmd, String sourceFilePath, String targetFilePath) {
+        return baseTool("wkhtmltopdf", cmd, sourceFilePath, targetFilePath);
+    }
+
+    /**
+     * 工具基础操作
+     *
+     * @param tool           工具
+     * @param cmd            工具操作指令
+     * @param sourceFilePath html源资源
+     * @param targetFilePath 生成目标资源
+     * @return 字节码
+     * @author zhengqingya
+     * @date 2021/8/12 11:08
+     */
+    @SneakyThrows({Exception.class})
+    private static byte[] baseTool(String tool, String cmd, String sourceFilePath, String targetFilePath) {
+        String filePath = baseToolForPath(tool, cmd, sourceFilePath, targetFilePath);
+        return FileUtil.readBytes(filePath);
+    }
+
+    /**
+     * 工具基础操作
+     *
+     * @param tool           工具
+     * @param cmd            工具操作指令
+     * @param sourceFilePath html源资源
+     * @param targetFilePath 生成目标资源
+     * @return 生成资源路径
+     * @author zhengqingya
+     * @date 2021/8/12 11:08
+     */
+    @SneakyThrows({Exception.class})
+    private static String baseToolForPath(String tool, String cmd, String sourceFilePath, String targetFilePath) {
+        // 先创建父目录
+        FileUtil.mkParentDirs(targetFilePath);
+        String command = String.format("%s %s %s %s", getToolRootPath() + tool, cmd, sourceFilePath, targetFilePath);
+        Process process = null;
+        try {
+            process = Runtime.getRuntime().exec(command);
+        } catch (IOException e) {
+            throw new Exception("工具丢失，请联系系统管理员！");
+        }
+        // 等待当前命令执行完，再往下执行
+        process.waitFor();
+        log.info("=============== FINISH: [{}] ===============", command);
+        return targetFilePath;
+    }
+
+    /**
+     * 根据不同系统获取工具
+     *
+     * @return 工具位置
+     * @author zhengqingya
+     * @date 2021/8/12 11:07
+     */
+    private static String getToolRootPath() {
+        String system = System.getProperty("os.name");
+        if (system.contains("Windows")) {
+            return TOOL_WIN_ROOT_DIRECTORY;
+        } else if (system.contains("Linux") || system.contains("Mac OS X")) {
+            return "";
+        }
+        return "";
+    }
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-file-api/src/main/resources/license.xml

+<License>
+  <Data>
+    <Products>
+      <Product>Aspose.Total for Java</Product>
+    </Products>
+    <EditionType>Enterprise</EditionType>
+    <SubscriptionExpiry>29991231</SubscriptionExpiry>
+    <LicenseExpiry>29991231</LicenseExpiry>
+    <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+  </Data>
+  <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
+</License>
\ No newline at end of file

amos-boot-module/amos-boot-module-api/pom.xml

@@ -28,5 +28,6 @@
     <module>amos-boot-module-ccs-api</module>
 	<module>amos-boot-module-avic-api</module>
 	<module>amos-boot-module-kgd-api</module>
+	<module>amos-boot-module-file-api</module>
   </modules>
 </project>
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-file-biz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>com.amosframework.boot</groupId>
+		<artifactId>amos-boot-module-biz</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>amos-boot-module-file-biz</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>com.amosframework.boot</groupId>
+			<artifactId>amos-boot-module-file-api</artifactId>
+			<version>${amos-biz-boot.version}</version>
+		</dependency>
+	</dependencies>
+
+
+</project>
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/pom.xml

@@ -61,5 +61,6 @@
         <module>amos-boot-module-ccs-biz</module>
 		<module>amos-boot-module-avic-biz</module>
 	    <module>amos-boot-module-kgd-biz</module>
+		<module>amos-boot-module-file-biz</module>
   </modules>
 </project>
\ No newline at end of file

amos-boot-system-file/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.amosframework.boot</groupId>
+        <artifactId>amos-biz-boot</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>amos-boot-system-file</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amosframework.boot</groupId>
+            <artifactId>amos-boot-module-file-biz</artifactId>
+            <version>${amos-biz-boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

amos-boot-system-file/src/main/java/com/yeejoin/amos/AmoFileApplication.java

+package com.yeejoin.amos;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.typroject.tyboot.core.restful.exception.GlobalExceptionHandler;
+
+import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
+
+/**
+ * <pre>
+ * 服务启动类
+ * </pre>
+ */
+@SpringBootApplication
+@EnableTransactionManagement
+@EnableConfigurationProperties
+@EnableDiscoveryClient
+@EnableFeignClients(basePackages = {"com.yeejoin"})
+@EnableAsync
+@MapperScan({"org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
+        "org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
+        "com.yeejoin.amos.boot.module.*.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper",
+		"com.yeejoin.amos.file.face.orm.dao*"})
+@ComponentScan(basePackages = {"org.typroject", "com.yeejoin"})
+public class AmoFileApplication {
+    private static final Logger logger = LoggerFactory.getLogger(AmoFileApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext context = SpringApplication.run(AmoFileApplication.class, args);
+        Environment env = context.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
+        GlobalExceptionHandler.setAlwaysOk(true);
+        logger.info("\n----------------------------------------------------------\n\t"
+                + "Application Amos-Biz-Boot is running! Access URLs:\n\t" + "Swagger文档: \thttp://" + ip + ":" + port
+                + path + "/doc.html\n" + "----------------------------------------------------------");
+    }
+
+}

amos-boot-system-file/src/main/resources/application-dev.properties

+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url = jdbc:mysql://172.16.3.18:3306/book?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.username=root
+spring.datasource.password=Yeejoin@2020
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.minimum-idle= 3
+spring.datasource.hikari.maximum-pool-size= 30
+spring.datasource.hikari.auto-commit= true
+spring.datasource.hikari.idle-timeout= 500000
+spring.datasource.hikari.max-lifetime= 1800000
+spring.datasource.hikari.connection-timeout= 60000
+spring.datasource.hikari.connection-test-query= SELECT 1
+
+
+
+eureka.instance.hostname= 172.16.3.18
+eureka.instance.prefer-ip-address = true
+eureka.client.serviceUrl.defaultZone: http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
+
+#redis
+spring.redis.database=1
+spring.redis.host=172.16.3.18
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.3.18:2883
+emqx.user-name=super
+emqx.password=a123456
+
+
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+spring.boot.admin.client.enabled=true
+spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
+spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
+spring.boot.admin.client.username=admin
+spring.boot.admin.client.password=a1234560
+management.security.enabled=false
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+
+

amos-boot-system-file/src/main/resources/application.properties

+spring.application.name=AMOS-BIZ-FILE-API
+server.servlet.context-path=/file
+server.port=8808
+server.uri-encoding=UTF-8
+spring.profiles.active=dev
+spring.jackson.time-zone=GMT+8
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+logging.config=classpath:logback-${spring.profiles.active}.xml
+## mybatis-plus配置控制台打印完整带参数SQL语句
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+## DB properties:
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=25
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=120000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
+##liquibase
+spring.liquibase.change-log=classpath:/db/changelog/changelog-master.xml
+spring.liquibase.enabled=true
+## eureka properties:
+eureka.client.registry-fetch-interval-seconds=5
+eureka.instance.prefer-ip-address=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url-path=/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
+
+## redis properties:
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+## redis失效时间
+redis.cache.failure.time=10800
+
+spring.servlet.multipart.maxFileSize=100MB
+spring.servlet.multipart.maxRequestSize=100MB
+
+spring.main.allow-bean-definition-overriding=true
+spring.http.encoding.charset=utf-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
\ No newline at end of file

amos-boot-system-file/src/main/resources/db/changelog/changelog-master.xml

+<?xml version="1.0" encoding="utf-8"?>
+
+<databaseChangeLog     
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
+        http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
+
+</databaseChangeLog>

amos-boot-system-file/src/main/resources/logback-dev.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+<property name="LOG_HOME" value="log" />
+<property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %-50.50logger{50} - %msg [%file:%line] %n" />
+<!-- 按照每天生成日志文件 -->
+<appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <!--日志文件输出的文件名-->
+        <FileNamePattern>${LOG_HOME}/ccs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+        <!--日志文件保留天数-->
+        <MaxHistory>7</MaxHistory>
+    </rollingPolicy>
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <pattern>${LOG_PATTERN}</pattern>
+    </encoder>
+    <!--日志文件最大的大小-->
+    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+        <MaxFileSize>30mb</MaxFileSize>
+    </triggeringPolicy>
+</appender>
+<!-- 控制台输出 -->
+<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+        <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+        <pattern>${LOG_PATTERN}</pattern>
+    </encoder>
+</appender>
+<!--myibatis log configure-->
+<logger name="com.apache.ibatis" level="DEBUG"/>
+<logger name="java.sql.Connection" level="DEBUG"/>
+<logger name="java.sql.Statement" level="DEBUG"/>
+<logger name="java.sql.PreparedStatement" level="DEBUG"/>
+<logger name="com.baomidou.mybatisplus" level="DEBUG"/>
+<logger name="org.springframework" level="DEBUG"/>
+<logger name="org.typroject" level="DEBUG"/>
+<logger name="com.yeejoin" level="DEBUG"/>
+<!-- 日志输出级别 -->
+<root level="INFO">
+    <appender-ref ref="FILE" />
+    <appender-ref ref="STDOUT" />
+</root>
+
+</configuration>

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/IdxUjerMaper.xml

@@ -2,21 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.tzs.api.mapper.IdxUjerMapper">
     <select id="getPage" resultType="com.yeejoin.amos.boot.module.tzs.flc.api.dto.IdxUjerDto">
-        SELECT *, IF(b.id is null, '未建', '已建') as bizType
+        SELECT
+        a.`BUSINESS_NAME` as businessName,
+        a.`CREDIT_CODE` as creditCode,
+        a.`BUSINESS_TYPE` as businessType,
+        a.`BUSINESS_ADDRESS` as businessAddress,
+        a.`CONTACTS` as contacts,
+        a.`CONTACT_NUMBER` as contactNumber,
+        a.`COMPANYID` as companyId,
+        IF(b.SEQUENCE_NBR is null, '未建', '已建') as bizType
         FROM idx_biz_odgu a
-        LEFT JOIN idx_biz_ujer b on a.business_name = b.business_name
+        LEFT JOIN idx_biz_ujer b on a.BUSINESS_NAME = b.BUSINESS_NAME
         <where>
             <if test="ids !=null and ids.size()>0">
-                AND a.companyId in
+                AND a.COMPANYID in
                 <foreach collection="ids" item="item" index="index" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
             <if test="bizType=='yingjian'">
-                AND b.id is null
+                AND b.SEQUENCE_NBR is null
             </if>
             <if test="bizType=='yijian'">
-                AND b.id is not null
+                AND b.SEQUENCE_NBR is not null
             </if>
         </where>
     </select>

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/WechatController.java

@@ -144,6 +144,9 @@ public class WechatController extends BaseController {
 		Collections.sort(params);
 		String tokenStr = StringUtils.join(params,"");
 		tokenStr = DigestUtils.sha1Hex(tokenStr);
+		System.out.println("=============回调get消息start=============");
+		System.out.println(echostr);
+		System.out.println("=============回调get消息end=============");
 		if(tokenStr.equals(signature)) {
 			return echostr;
 		} else {
@@ -227,6 +230,9 @@ public class WechatController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "获取微信传回的post信息", notes = "获取微信传回的post信息")
 	public String getWechatInfoPost(@RequestBody String xml, HttpServletResponse resp) {
 		Map<String, String> requtstMap = xmlToMap(xml);
+		System.out.println("=============回调post消息start=============");
+		System.out.println(xml);
+		System.out.println("=============回调post消息end=============");
 		return "1";
 	}
 
@@ -365,9 +371,11 @@ public class WechatController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "根据微信code获取openId和手机号接口", notes = "根据微信code获取openId和手机号接口")
 	public ResponseModel<WechatAccessDto> getOpenIdTel(@PathVariable String code) {
 		logger.info("公众号登录"+code);
+		System.out.println("公众号登录"+code);
 		WechatAccessDto wechatAccessDto = new WechatAccessDto();
 		String openId = wechatService.getOpenId(code);
 		logger.info("公众号登录openId"+openId);
+		System.out.println("公众号登录openId"+openId);
 		if(StringUtils.isNotEmpty(openId)) {
 			JSONObject userInfo = wechatService.getUserInfo(openId);
 			wechatAccessDto.setOpenId(openId);

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/BaseEnterpriseMqTtlListener.java

@@ -147,9 +147,9 @@ public class BaseEnterpriseMqTtlListener extends EmqxListener {
 				userModel.setOrgRoleSeqs(roleSeqMap);
 				FeignClientResult<AgencyUserModel> userResult = Privilege.agencyUserClient.create(userModel);
 				String[] userIds = { userResult.getResult().getUserId() };
-				if (groupSeq != null) {
-					Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
-				}
+//				if (groupSeq != null) {
+//					Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+//				}
 			}
 		}
 	}

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/listener/CarcylUnitInspectMqTtlListener.java

@@ -105,9 +105,9 @@ public class CarcylUnitInspectMqTtlListener extends EmqxListener {
 			userModel.setOrgRoleSeqs(orgRoles);
 			FeignClientResult<AgencyUserModel> userResult  =Privilege.agencyUserClient.create(userModel);
 			String[] userIds = {userResult.getResult().getUserId()};
-			if (groupSeq != null) {
-				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
-			}
+//			if (groupSeq != null) {
+//				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+//			}
 		}
 	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/AlertCalledServiceImpl.java

@@ -112,6 +112,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Autowired
     TzsAuthService tzsAuthService;
 
+    @Value("${duty.seats.role.ids}")
+    private String dutySeatsRoleIds;
+
     private final Logger logger = LogManager.getLogger(AlertCalledServiceImpl.class);
 
 
@@ -388,7 +391,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Override
     public List<DutySeatDto> getSeatInfos() {
         // 获取人员信息
-        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null,null);
+//        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.list(null,null);
+        FeignClientResult<List<AgencyUserModel>> userListResult = Privilege.agencyUserClient.queryByRoleId(dutySeatsRoleIds,null);
+
         List<AgencyUserModel> userList = userListResult.getResult();
         List<DutySeatDto> dutyList = new ArrayList<>();
         userList.stream().forEach(u -> {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/DispatchTaskServiceImpl.java

@@ -606,11 +606,11 @@ public class DispatchTaskServiceImpl extends BaseService<DispatchTaskDto,Dispatc
             temp.setTemplateId(TS_TEMPID);
             temp.setUrl(TS_URL+ "?id=" + dispatchTaskDto.getSequenceNbr());
             data.put("first","投诉建议任务已派遣，请尽快前往救援!");
-            data.put("keyword1","投诉建议");
-            data.put("keyword2", "投诉建议");
-            data.put("keyword3", alertCalled.getEmergencyPerson());
-            data.put("keyword4", alertCalled.getEmergencyCall());
-            data.put("keyword5", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
+            //data.put("keyword1","投诉建议");
+            //data.put("keyword2", "投诉建议");
+            data.put("keyword1", alertCalled.getEmergencyPerson());
+            //data.put("keyword4", alertCalled.getEmergencyCall());
+            data.put("keyword2", DateUtils.date2LongStr(dispatchTaskDto.getDispatchTime()));
             data.put("remark", "任务已派遣，请尽快前往处置！");
             temp.setData(data);
         }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESElevatorServiceImpl.java

@@ -444,7 +444,7 @@ public class ESElevatorServiceImpl {
 
         if(!ValidationUtil.isEmpty(keyword)) {
             BoolQueryBuilder qb0 = QueryBuilders.boolQuery().
-                    must(QueryBuilders.matchQuery("rescueCode.keyword", keyword));
+                    must(QueryBuilders.termQuery("rescueCode", keyword));
             boolMust.should(qb0);
             BoolQueryBuilder qb1 = QueryBuilders.boolQuery().
                     must(QueryBuilders.matchQuery("address", keyword));

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/InspectionServiceImpl.java

@@ -132,7 +132,7 @@ public class InspectionServiceImpl implements InspectionService {
 
     @Override
     public JSONObject getSafetySupervisionCode(String bizTable) {
-        String safetySupervisionCode = "（%s）市监特令中[%s]第  %s 号";
+        String safetySupervisionCode = "（%s）市监特令中[%s]第 %s 号";
         AgencyUserModel agencyUserModel = Privilege.agencyUserClient.getme().getResult();
         Object reginSeq = JsonValueUtils.getValueByKey(JSONObject.parse(JSON.toJSONString(agencyUserModel)), "companys", "companys.0.regionSeq");
         String region = "";
@@ -208,7 +208,7 @@ public class InspectionServiceImpl implements InspectionService {
             }
         });
         JSONObject jsonObject = new JSONObject();
-        String selectSql = "SELECT * FROM " + tableName + " WHERE type=" + StringUtils.str2sqlValue(type);
+        String selectSql = "SELECT * FROM " + tableName + " WHERE TYPE=" + StringUtils.str2sqlValue(type);
         Map<String, Object> objectMap = bizJdbcTemplate.queryForMap(selectSql);
         result.forEach(x -> {
             String regionName = columMap.get(x.getRegionName());

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/WechatServiceImpl.java

@@ -159,6 +159,7 @@ public class WechatServiceImpl implements IWechatService {
         try {
             response = JSONObject.parseObject(responseStr);
         } catch (Exception e) {
+        	e.printStackTrace();
             throw  new BadRequest("发送模板消息出错：" + e.getMessage());
         }
         return response;

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -496,9 +496,9 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			org.setAmosOrgId(companyInfo.getSequenceNbr() + "");
 			org.setAmosOrgCode(companyInfo.getOrgCode());
 			iOrgUsrService.save(org);
-			if (groupSeq != null) {
-				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
-			}
+//			if (groupSeq != null) {
+//				Privilege.groupUserClient.create(groupSeq, Arrays.asList(userIds));
+//			}
 		} catch (Exception e) {
 			// 删除已经创建的 企业信息
 			if (companyInfo != null && companyInfo.getSequenceNbr() != null) {

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application-dev.properties

@@ -53,4 +53,5 @@ rule.definition.model-package=com.yeejoin.amos.boot.module.tzs.api.dto
 rule.definition.default-agency=tzs
 rule.definition.localIp=172.16.3.39
 
-org.filter.group.seq=1564150103147573249
+org.filter.group.seq=1564150103147573249
\ No newline at end of file
+duty.seats.role.ids=1585956200472674305,1585956257590706177
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/resources/application.properties

 spring.application.name=TZS
 server.servlet.context-path=/tzs
 server.port=11000
-spring.profiles.active=dev2
+spring.profiles.active=dev
 
 spring.jackson.time-zone=GMT+8
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
@@ -82,11 +82,14 @@ tzs.wechat.token=yeejoin_2021
 ##wechatTicketUrl
 tzs.wechat.ticketurl=https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=
 
-tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
+#tzs.wechat.tempId.kr=rjW8x9rRitIpa21Jekyx2nzBzpJy7tycssCXSN4YhWw
+tzs.wechat.tempId.kr=bxchKYhYW7aHbGKM2pVyR_yY2-bG4sRMNU3ZRQbMKYM
 tzs.wechat.url.kr=tzs.yeeamos.com/persondetail.html
-tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
+#tzs.wechat.tempId.wx=ofBIZS8Bup9s0zKbrGa8BfhVhS18H_hyC_OYXuBN6hI
+tzs.wechat.tempId.wx=rags-expfNSBB-h2WenuBI2c6pCEndH4uwTtOqlHqDM
 tzs.wechat.url.wx=tzs.yeeamos.com/repairPersondetail.html
-tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
+#tzs.wechat.tempId.ts=Kr7lcV8g4g_lgyW_RpwnNgw_HDxxRuVx759EoFWrIfU
+tzs.wechat.tempId.ts=VWqgY-lXFt4dg2EL4pLjfDCBAU49Z0mRxVaQhAMMW8Q
 tzs.wechat.url.ts=tzs.yeeamos.com/taskComplaintDetail.html
 
 mqtt.topic.task.newtask=tzs-task-newtask
@@ -126,4 +129,21 @@ admin.appkey=AMOS_ADMIN
 admin.user=admin_tzs
 admin.password=a1234560
 admin.product.web=AMOS-WEB-ADMIN
-amos.secret.key=qaz
+amos.secret.key=qazknife4j.production=false
\ No newline at end of file
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true 
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+spring.security.user.roles=SBA_ADMIN
+
+amos.system.user.user-name=admin_tzs
+amos.system.user.password=a1234560
+amos.system.user.app-key=AMOS_STUDIO
+amos.system.user.product=AMOS_STUDIO_WEB
+
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OrgEnum.java

@@ -9,17 +9,17 @@ import java.util.HashMap;
 @Getter
 @AllArgsConstructor
 public enum OrgEnum {
-    公司("COMPANY", "244", "公司",1),
-    部门("DEPARTMENT", "245", "部门",2),
-    普通人员("PERSON", "246", "普通人员",3),
-    焊工("WELDER","247","焊工",3),
-    建设单位负责人("CHARGE","254","建设单位负责人",3),
-    企业管理员("ADMIN","248","企业管理员",3),
-    建设单位("CONSTRUCTION","249","建设单位",1),
-    安装单位("INSTALL","250","安装单位",1),
-    设计单位("DESIGN","251","设计单位",1),
-    监察部门("SUPERVISION","252","监察部门",1),
-    监检机构("MONITORING","253","监检机构",1);
+    公司("COMPANY", "244", "公司",1,"studio_normalapp_4403119"),
+    部门("DEPARTMENT", "245", "部门",2,"studio_normalapp_4403119"),
+    普通人员("PERSON", "246", "普通人员",3,"studio_normalapp_4403119"),
+    焊工("WELDER","247","焊工",3,"studio_normalapp_4403119"),
+    建设单位负责人("CHARGE","254","建设单位负责人",3,"studio_normalapp_4403119"),
+    企业管理员("ADMIN","248","企业管理员",3,"studio_normalapp_4403119"),
+    建设单位("CONSTRUCTION","249","建设单位",1,"studio_normalapp_4403119"),
+    安装单位("INSTALL","250","安装单位",1,"studio_normalapp_4403119"),
+    设计单位("DESIGN","251","设计单位",1,"studio_normalapp_4403119"),
+    监察部门("SUPERVISION","252","监察部门",1,"studio_normalapp_4403119"),
+    监检机构("MONITORING","253","监检机构",1,"studio_normalapp_4403119");
 
     private String key;
     private String code;
@@ -28,12 +28,14 @@ public enum OrgEnum {
      * 1 公司 2 部门 3 人员
      */
     private Integer type;
-
+    private String appCode;
     public static HashMap<String,String>  map= new HashMap();
+    public static HashMap<String, String> codeMap = new HashMap();
 
     static {
-        for(OrgPersonEnum orgPersonEnum:OrgPersonEnum.values()){
+        for(OrgEnum orgPersonEnum:OrgEnum.values()){
             map.put(orgPersonEnum.getKey(),orgPersonEnum.getName());
+            codeMap.put(orgPersonEnum.getKey(),orgPersonEnum.getAppCode());
         }
     }
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/EquipmentDto.java

 package com.yeejoin.amos.boot.module.ugp.api.dto;
 
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -20,6 +21,7 @@ public class EquipmentDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
+    Equipment equipment;
 
     @ApiModelProperty(value = "名称")
     private String name;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.ugp.api.dto;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
@@ -22,6 +24,7 @@ public class ProjectDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
+    Project project;
 
     @ApiModelProperty(value = "项目名称")
     private String name;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/SuperviseRuleDto.java

@@ -39,4 +39,17 @@ public class SuperviseRuleDto  extends BaseDto {
 
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
+
+   @ApiModelProperty(value = "监察部门")
+   private String superviseDept;
+
+   @ApiModelProperty(value = "检验检测单位")
+   private String inspectionUnit;
+
+
+   @ApiModelProperty(value = "创建单位")
+   private String createUnit;
+
+
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/EquipmentMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 设备信息表 Mapper 接口
  *
@@ -12,5 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface EquipmentMapper extends BaseMapper<Equipment> {
+    IPage<EquipmentDto> queryEquipmentPage(IPage<EquipmentDto> page, Equipment equipment);
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/ProjectMapper.java

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,5 +26,6 @@ public interface ProjectMapper extends BaseMapper<Project> {
     ProjectDto selectOneByName(@RequestParam String name);
 
     ProjectDto getDetail(Long sequenceNbr);
-
+    //项目模糊筛选
+    Page<ProjectDto> queryProjectPage(IPage<ProjectDto> page, Project project);
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/ProjectResourceMapper.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Material;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.aspectj.weaver.ast.Test;
 
+import java.util.List;
+
 /**
  * 项目资源表（包括焊工、管材、设备） Mapper 接口
  *
@@ -33,4 +36,10 @@ public interface ProjectResourceMapper extends BaseMapper<ProjectResource> {
 
     //根据resource_id删除项目焊工人员信息
     Boolean deleteByResourceId(Long resourceId);
+
+    /**
+     * 获取当前登录人所在单位下的所有项目
+     * 根据登录人角色去筛选
+     */
+    List<Project> getProjectPage(String roleName, String companyId);
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/WorkHistoryMapper.java

@@ -16,6 +16,6 @@ import java.util.Map;
  */
 public interface WorkHistoryMapper extends BaseMapper<WorkHistory> {
 
-    IPage<WorkHistoryDto> pageList(Page<WorkHistoryDto> page, WorkHistoryDto tzUgpWorkHistory);
+    IPage<WorkHistoryDto> pageList(Page<WorkHistoryDto> page, WorkHistoryDto tzUgpWorkHistory,String sequenceNbr);
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IEquipmentService.java

@@ -2,8 +2,10 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,9 +16,11 @@ import java.util.List;
  * @author system_generator
  * @date 2022-09-22
  */
+
 public interface IEquipmentService {
     //添加设备+附件
     EquipmentDto saveEI(JSONObject object);
+    IPage<EquipmentDto> queryEquipmentPage(IPage<EquipmentDto> page,Equipment equipment);
 
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IProjectService.java

 package com.yeejoin.amos.boot.module.ugp.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+
 /**
  * 项目信息表接口类
  *
@@ -9,4 +16,5 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
  */
 public interface IProjectService {
 
+    Page<ProjectDto> queryProjectPage(Page<ProjectDto> page, Project project);
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/EquipmentMapper.xml

@@ -2,4 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper">
 
+    <select id="queryEquipmentPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Equipment">
+        select * from tz_ugp_equipment
+        <where>
+            <if test="equipment.name != '' and equipment.name != null">
+                and `name` like concat('%',#{equipment.name},'%')
+            </if>
+            <if test="equipment.code != '' and equipment.code != null">
+                and `code` like concat('%',#{equipment.code},'%')
+            </if>
+            <if test="equipment.verifyStatus != '' and equipment.verifyStatus != null">
+                and `verify_status` like concat('%',#{equipment.verifyStatus},'%')
+            </if>
+            <if test="equipment.companyId != '' and equipment.companyId != null">
+                and `company_id` like concat('%',#{equipment.companyId},'%')
+            </if>
+        </where>
+    </select>
+
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectMapper.xml

@@ -17,4 +17,16 @@
                  LEFT JOIN cb_org_usr AS ou2 ON ou2.sequence_nbr = r.supervise_dept_id
         WHERE p.sequence_nbr = #{sequenceNbr}
     </select>
+
+    <select id="queryProjectPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto">
+        select * from tz_ugp_project
+        <where>
+            <if test="project.name != '' and project.name != null">
+                and `name` like concat('%',#{project.name},'%')
+            </if>
+            <if test="project.constructionUnit != '' and project.constructionUnit != null">
+                and `construction_Unit` like concat('%',#{project.constructionUnit},'%')
+            </if>
+        </where>
+    </select>
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectResourceMapper.xml

@@ -111,4 +111,22 @@
         delete  FROM tz_ugp_project_resource where resource_id=#{resourceId}
     </delete>
 
+    <select id="getProjectPage" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Project">
+        SELECT * FROM tz_ugp_project
+        <where>
+            <if test="roleName == '建设单位'">
+                and construction_unit_id = #{companyId}
+            </if>
+            <if test="roleName == '安装单位'">
+                and installation_unit_id = #{companyId}
+            </if>
+            <if test="roleName == '设计单位'">
+                and design_unit_id = #{companyId}
+            </if>
+            <if test="roleName == '监察部门' or roleName == '监检机构'">
+                and install_region_code = #{companyId}
+            </if>
+        </where>
+    </select>
+
 </mapper>

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/WorkHistoryMapper.xml

@@ -23,8 +23,8 @@
             <if test="tzUgpWorkHistory.endDate!='' and tzUgpWorkHistory.endDate!=null">
                 and wh.end_date like concat("%",#{tzUgpWorkHistory.endDate},"%")
             </if>
-            <if test="tzUgpWorkHistory.sequenceNbr!='' and tzUgpWorkHistory.sequenceNbr!=null">
-                and wh.sequence_nbr = #{tzUgpWorkHistory.sequenceNbr}
+            <if test="sequenceNbr!='' and sequenceNbr!=null">
+                and wh.welder_id = #{sequenceNbr}
             </if>
         </where>
     </select>

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/CompanyController.java

@@ -506,5 +506,18 @@ public class CompanyController extends BaseController {
 
 	}
 
+
+	/**
+	 * 验证手机号验证码是否成功
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/tset")
+	@ApiOperation(httpMethod = "GET", value = "验证手机号验证码是否成功", notes = "验证手机号验证码是否成功")
+	public void tset() {
+		orgServiceImpl.getReginParams();
+	}
+
 }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/EquipmentController.java

@@ -4,13 +4,19 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +26,8 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.EquipmentServiceImpl;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -46,6 +54,7 @@ public class EquipmentController extends BaseController {
     @Autowired
     EquipmentServiceImpl equipmentServiceImpl;
 
+
 	@Autowired
 	EquipmentMapper equipmentMapper;
 
@@ -55,6 +64,9 @@ public class EquipmentController extends BaseController {
 	@Autowired
 	AttachmentServiceImpl attachmentService;
 
+	@Autowired
+	OrgServiceImpl orgService;
+
     /**
      * 新增设备信息表
      *
@@ -63,7 +75,9 @@ public class EquipmentController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增设备信息表", notes = "新增设备信息表")
+	@BusinessIdentify
 	public ResponseModel<EquipmentDto> save(@RequestBody EquipmentDto model) {
+		model.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
 		model.setManufactureDate(new Date());
 		model.setInspectionDate(new Date());
 		model = equipmentServiceImpl.createWithModel(model);
@@ -112,26 +126,24 @@ public class EquipmentController extends BaseController {
 	}
 
 	/**
-     * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
-     * @return
-     */
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "设备信息表分页查询",  notes = "设备信息表分页查询")
-	public ResponseModel<Page<EquipmentDto>> queryForPage(
+	@BusinessIdentify
+	public ResponseModel<IPage<EquipmentDto>> queryForPage(
 			@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size,
-			@RequestParam(value = "name",required = false) String name,
-			@RequestParam(value = "code",required = false) String code,
-			@RequestParam(value = "verifyStatus",required = false)String verifyStatus) {
-	    Page<EquipmentDto> page = new Page<EquipmentDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-
-	    return ResponseHelper.buildResponse(equipmentServiceImpl.queryForEquipmentPage(page,name,code,verifyStatus));
+			@RequestParam(value = "size") int size, Equipment equipment) {
+		IPage<EquipmentDto> page = new Page<>();
+		page.setSize(size);
+		page.setCurrent(current);
+		equipment.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
+		return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(page,equipment));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java

@@ -289,8 +289,8 @@ public class InstallNoticeController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@PostMapping(value = "/acceptNotification")
-	@ApiOperation(httpMethod = "get", value = "监察部门接受安装告知", notes = "监察部门接受安装告知")
+	@GetMapping(value = "/acceptNotification")
+	@ApiOperation(httpMethod = "GET", value = "监察部门接受安装告知", notes = "监察部门接受安装告知")
 	public ResponseModel<Boolean> acceptNotification(Long sequenceNbr){
 		InstallNotice installNotice = installNoticeServiceImpl.getById(sequenceNbr);
 		installNotice.setNoticeStatus(NoticeStatusEnum.已接收.getName());
@@ -305,13 +305,15 @@ public class InstallNoticeController extends BaseController {
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@PostMapping(value = "/inspectNotification")
-	@ApiOperation(httpMethod = "get", value = "监检部门审查(通过/退回)安装告知", notes = "监检部门审查(通过/退回)安装告知")
+	@GetMapping(value = "/inspectNotification")
+	@ApiOperation(httpMethod = "GET", value = "监检部门审查(通过/退回)安装告知", notes = "监检部门审查(通过/退回)安装告知")
 	public ResponseModel<Boolean> inspectNotification(Long sequenceNbr,String option){
 		InstallNotice installNotice = installNoticeServiceImpl.getById(sequenceNbr);
 		installNotice.setApproved(true);
+		installNotice.setNoticeStatus(NoticeStatusEnum.已通过.getName());
 		if(NoticeStatusEnum.已退回.equals(option)){
 			installNotice.setApproved(false);
+			installNotice.setNoticeStatus(NoticeStatusEnum.已退回.getName());
 		}
 		Project project = projectServiceImpl.getById(installNotice.getProjectId());
 		projectInitiationServiceImpl.execute(project.getInstanceId(),installNotice,option);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/MaterialController.java

@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.EquipmentServiceImpl;
+import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -39,6 +41,8 @@ public class MaterialController extends BaseController {
 	AttachmentServiceImpl attachmentServiceImpl;
     @Autowired
 	AttachmentMapper attachmentMapper;
+	@Autowired
+	OrgServiceImpl orgService;
 
 
     /**
@@ -104,6 +108,7 @@ public class MaterialController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "材料信息表分页查询",  notes = "材料信息表分页查询")
+	@BusinessIdentify
 	public ResponseModel<Page<MaterialDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,
 					@RequestParam(value = "name",required = false) String name,
@@ -111,7 +116,8 @@ public class MaterialController extends BaseController {
 	    Page<MaterialDto> page = new Page<MaterialDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(materialServiceImpl.queryForMaterialPage(page,name,code));
+		Long companyId = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
+	    return ResponseHelper.buildResponse(materialServiceImpl.queryForMaterialPage(page,name,code,companyId));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -8,12 +8,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
+import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.*;
 import io.swagger.annotations.ApiModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import io.swagger.models.Model;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,10 +28,7 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -69,9 +72,18 @@ public class ProjectController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增项目信息表", notes = "新增项目信息表")
+	@BusinessIdentify
 	public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
+		String regionName = "",regionCode = "";
+		Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
 		model.setStartDate(new Date());
 		model.setSubmitDate(new Date());
+		model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName());
+		model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName());
+		model.setConstructionUnitId(orgServiceImpl.getReginParams().getBusinessInfo().getCompanySequenceNbr());
+		model.setChargePerson(orgServiceImpl.getOrgUsrById(String.valueOf(model.getChargePersonId())).getBizOrgName());
+		model.setInstallRegion(map.get("regionName"));
+		model.setInstallRegionCode(map.get("regionCode"));
 		model = projectServiceImpl.createWithModel(model);
 		Project project = new Project();
 		BeanUtils.copyProperties(model, project);
@@ -79,6 +91,24 @@ public class ProjectController extends BaseController {
 		return ResponseHelper.buildResponse(model);
 	}
 
+	public Map<String,String> getInfo(String regionName,String regionCode,Long sequenceNbr){
+		RegionModel region = Systemctl.regionClient.getRegion(sequenceNbr).getResult();
+		regionName = region.getRegionName() + regionName;
+		if(ValidationUtil.isEmpty(regionCode)){
+			regionCode = String.valueOf(region.getRegionCode());
+		} else {
+			regionCode = region.getRegionCode() +"#" +regionCode;
+		}
+		Map<String,String> map = new HashMap();
+		if(region.getParentId() != 0L){
+			map = getInfo(regionName,regionCode,region.getParentId());
+		} else {
+			map.put("regionName",regionName);
+		}
+		map.put("regionCode",regionCode);
+		return map;
+	}
+
 	/**
 	 * 根据sequenceNbr更新
 	 *
@@ -132,16 +162,14 @@ public class ProjectController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "项目信息表分页查询",  notes = "项目信息表分页查询")
 	public ResponseModel<Page<ProjectDto>> queryForPage(
 			@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size,
-			@RequestParam(value = "name",required = false) String name,
-			@RequestParam(value = "constructionUnit",required = false) String constructionUnit
-	) {
-		Page<ProjectDto> page = new Page<ProjectDto>();
-		page.setCurrent(current);
+			@RequestParam(value = "size") int size, Project project) {
+		Page<ProjectDto> page = new Page<>();
 		page.setSize(size);
-		return ResponseHelper.buildResponse(projectServiceImpl.queryForProjectPage(page, name, constructionUnit));
+		page.setCurrent(current);
+		return ResponseHelper.buildResponse(projectServiceImpl.queryProjectPage(page,project));
 	}
 
+
 	/**
 	 * 列表全部数据查询
      *
@@ -216,9 +244,8 @@ public class ProjectController extends BaseController {
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "项目审核", notes = "项目审核")
-	@PostMapping(value = "/processProject")
-	public ResponseModel<String> processProject(String sequenceNbr,@RequestBody JSONObject json){
-		String option = json.getString(XJConstant.PROCESS_PROJECT_STATE);
+	@GetMapping(value = "/processProject")
+	public ResponseModel<String> processProject(String sequenceNbr,String option){
 		Project project = projectServiceImpl.getById(sequenceNbr);
 		JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(project));
 		jsonObject.put(XJConstant.PROCESS_PROJECT_STATE,"审核不通过");

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectResourceController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
-import com.netflix.ribbon.proxy.annotation.Http;
-import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialDto;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectMaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.MaterialServiceImpl;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -228,4 +226,20 @@ public class ProjectResourceController extends BaseController {
         jsonObject.getLong("sequenceNbr");
         return ResponseHelper.buildResponse(materialServiceImpl.groupBySeq(sequenceNbr));
     }
+
+
+    /**
+     * 根据type获取当前登录所在单位下的项目中的所有资源列表
+     * type:welder(焊工)、equipment（设备）、material（管材）
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @PostMapping(value = "/getResourceInfo")
+    @ApiOperation(httpMethod = "POST",value = "根据type获取当前登录所在单位下的项目中的所有资源列表",  notes = "根据type获取当前登录所在单位下的项目中的所有资源列表")
+    public ResponseModel<IPage> getResourceInfo(Long current,Long size,String type){
+        IPage page = new Page();
+        page.setSize(size);
+        page.setCurrent(current);
+        return ResponseHelper.buildResponse(projectResourceServiceImpl.getResourceInfo(type,page));
+    }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/SuperviseRuleController.java

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.OrgServiceImpl;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.service.impl.SuperviseRuleServiceImp
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,17 +68,19 @@ public class SuperviseRuleController extends BaseController {
 		model.setAdminRegion(map.get(model.getAdminRegionCode()));
     	//外网调不到内网 暂时预留
 		OrgUsr orgUsr = orgServiceImpl.getOrgUsr();
-		model.setSequenceNbr(orgUsr.getSequenceNbr());
+		model.setCreateUnitId(orgUsr.getSequenceNbr());
 		model = superviseRuleServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
 
 	public void getMap(Map map,Collection<RegionModel> collection){
     	Iterator<RegionModel> iterator = collection.iterator();
-    	if(iterator.hasNext()){
+    	while(iterator.hasNext()){
 			RegionModel regionModel = iterator.next();
 			map.put(regionModel.getRegionCode(),regionModel.getRegionName());
-			getMap(map,regionModel.getChildren());
+			if(!ValidationUtil.isEmpty(regionModel.getChildren())){
+				getMap(map,regionModel.getChildren());
+			}
 		}
 	}
 
@@ -139,15 +143,14 @@ public class SuperviseRuleController extends BaseController {
 	public ResponseModel<Page<SuperviseRuleDto>> queryForPage(
 			@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size,
-			@RequestParam(value = "adminRegionCode", required = false) Integer adminRegionCode,
-			@RequestParam(value = "superviseDeptId", required = false) Long superviseDeptId,
-			@RequestParam(value = "inspectionUnitId", required = false) Long inspectionUnitId
+			SuperviseRule superviseRule
 	) {
 		//this.current = current;
-		Page<SuperviseRuleDto> page = new Page<SuperviseRuleDto>();
+		Page<SuperviseRuleDto> page = new Page<>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryForSuperviseRulePage(page, superviseDeptId, inspectionUnitId,adminRegionCode));
+
+	    return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryForSuperviseRulePage(page,superviseRule));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
@@ -65,7 +66,7 @@ public class WelderController extends BaseController {
      *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @RequestMapping(value = "/saveWelder", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
     public ResponseModel<OrgUsrDto> saveWelder(@RequestBody JSONObject jsonObject, @RequestParam String bizOrgType ,
@@ -129,12 +130,27 @@ public class WelderController extends BaseController {
     @GetMapping(value = "/getCompanyWelder")
     public ResponseModel<IPage> getCompanyWelder(
             @RequestParam(value = "current") int current,
-            @RequestParam(value = "size") int size
+            @RequestParam(value = "size") int size,
+            @RequestParam(required = false) String name,
+            @RequestParam(required = false) String idNumber,
+            @RequestParam(required = false) String licensedProject
     ){
         Page page = new Page();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(orgServiceImpl.getCompanyWelder(page));
+        IPage companyWelder = orgServiceImpl.getCompanyWelder(page);
+
+        List<WelderDto> welderRecords = companyWelder.getRecords();
+
+        //模糊查询
+        if (name!=null||idNumber!=null||licensedProject!=null){
+            if (name!=null) {welderRecords = welderRecords.stream().filter(n -> n.getName().indexOf(name)>-1).collect(Collectors.toList());}
+            if (idNumber!=null) {welderRecords = welderRecords.stream().filter(n -> n.getIdNumber().indexOf(idNumber)>-1).collect(Collectors.toList());}
+            if (licensedProject!=null) {welderRecords = welderRecords.stream().filter(n -> n.getLicensedProject().indexOf(licensedProject)>-1).collect(Collectors.toList());}
+        }
+
+        Page records = page.setRecords(welderRecords);
+        return ResponseHelper.buildResponse(records);
     }
 
     /**
@@ -160,7 +176,7 @@ public class WelderController extends BaseController {
     @DeleteMapping(value = "/deleteOneById/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除人员信息表", notes = "根据sequenceNbr删除人员信息表")
     public ResponseModel<String> deleteOneById(@PathVariable String sequenceNbr) throws Exception {
-        Privilege.agencyUserClient.multDeleteUser(orgServiceImpl.getOrgUsrById(sequenceNbr).getAmosOrgId());
+//        Privilege.agencyUserClient.multDeleteUser(orgServiceImpl.getOrgUsrById(sequenceNbr).getAmosOrgId());
         orgServiceImpl.delectInfo(sequenceNbr);
         return ResponseHelper.buildResponse("ok");
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WorkHistoryController.java

@@ -153,9 +153,9 @@ public class WorkHistoryController extends BaseController {
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "分页查询",   notes = "分页查询")
-	@GetMapping(value = "/pageList")
-	public ResponseModel<IPage<WorkHistoryDto>> pageList(String pageNum, String pageSize, WorkHistoryDto tzUgpWorkHistory){
+	@ApiOperation(httpMethod = "POST",value = "分页查询",   notes = "分页查询")
+	@PostMapping(value = "/pageList")
+	public ResponseModel<IPage<WorkHistoryDto>> pageList(String pageNum, String pageSize,String sequenceNbr,@RequestBody WorkHistoryDto tzUgpWorkHistory){
 		if(ValidationUtil.isEmpty(pageNum)){
 			pageNum = "1";
 		}
@@ -163,6 +163,6 @@ public class WorkHistoryController extends BaseController {
 			pageNum = "15";
 		}
 		Page<WorkHistoryDto> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
-		return ResponseHelper.buildResponse(workHistoryServiceImpl.pageList(page, tzUgpWorkHistory));
+		return ResponseHelper.buildResponse(workHistoryServiceImpl.pageList(page, tzUgpWorkHistory,sequenceNbr));
 	}
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/framework/BusinessIdentifyAspect.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.framework;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -42,13 +43,14 @@ public class BusinessIdentifyAspect {
 
     @Before(value = "@annotation(com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify) && @annotation(permission)")
     public void personIdentity(JoinPoint joinPoint, BusinessIdentify permission) throws PermissionException {
-        ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        if (permission.isNeedIdentity() && reginParam != null) {
-            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        if (permission.isNeedIdentity() && reginParams != null) {
             ReginParams.BusinessInfo businessInfo = new ReginParams.BusinessInfo();
             //company
-            Long amosBizCode = reginParams.getCompany().getSequenceNbr();
-            OrgUsr companyOrgUsr = orgUsrService.getById(amosBizCode);
+            Long amosOrgId= reginParams.getCompany().getSequenceNbr();
+            LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OrgUsr :: getAmosOrgId,amosOrgId);
+            OrgUsr companyOrgUsr = orgUsrService.getOne(wrapper);
             String companyName = companyOrgUsr.getBizOrgName();
             Long companySequenceNbr = companyOrgUsr.getSequenceNbr();
             String companyType = companyOrgUsr.getOrgExpandAttr1();
@@ -56,13 +58,15 @@ public class BusinessIdentifyAspect {
                 companyType = companyOrgUsr.getBizOrgType();
             }
             businessInfo.setCompanyName(companyName);
-            businessInfo.setAmosBizCode(amosBizCode);
+            businessInfo.setAmosBizCode(amosOrgId);
             businessInfo.setCompanyType(companyType);
             businessInfo.setCompanySequenceNbr(companySequenceNbr);
 
             //User
-            Long amosUserCode = reginParams.getUserModel().getSequenceNbr();
-            OrgUsr userOrgUsr = orgUsrService.getById(amosUserCode);
+            amosOrgId = reginParams.getUserModel().getSequenceNbr();
+            wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(OrgUsr::getAmosOrgId,amosOrgId);
+            OrgUsr userOrgUsr = orgUsrService.getOne(wrapper);
             String userName = userOrgUsr.getBizOrgName();
             Long userSequenceNbr = userOrgUsr.getSequenceNbr();
             String userType = userOrgUsr.getOrgExpandAttr1();
@@ -72,8 +76,9 @@ public class BusinessIdentifyAspect {
             businessInfo.setUserSequenceNbr(userSequenceNbr);
             businessInfo.setUserName(userName);
             businessInfo.setUserType(userType);
-            businessInfo.setAmosUserCode(amosUserCode);
+            businessInfo.setAmosUserCode(amosOrgId);
             reginParams.setBusinessInfo(businessInfo);
+            redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParams));
         }
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/CompanyServiceImpl.java

@@ -117,6 +117,8 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
         List<Long> roleIds = new ArrayList<>();
         Map<Long, List<Long>> roleSeqsMap = new HashMap<>();
         Map<Long,List<RoleModel>> orgRoles = new HashMap<>();
+        Set<String> appCodeSet = new HashSet<>();
+
 
         Company company = this.getById(sequenceNbr);
         company.setApproved(model.getApproved());
@@ -140,8 +142,18 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             String[] unitTypeCodes = company.getType().split(",");
             for(String code : unitTypeCodes) {
                 roleNameSet.add(OrgEnum.map.get(code));
+                if(!appCodeSet.contains(OrgEnum.codeMap.get(code))){
+                    appCodeSet.add(OrgEnum.codeMap.get(code));
+                }
             }
-            userRoleList = allRoleList.stream().filter(r -> r.getRoleName().equals(roleNameSet)).collect(Collectors.toList());
+            Iterator iterator = roleNameSet.iterator();
+
+            allRoleList.stream().forEach(r -> {
+                if(roleNameSet.contains(r.getRoleName())){
+                    userRoleList.add(r);
+                }
+            });
+
             userRoleList.stream().forEach(r -> {
                 roleIds.add(r.getSequenceNbr());
             });
@@ -162,7 +174,9 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             agencyUserModel.setUserName(adminLoginName);
             agencyUserModel.setPassword(DesUtil.encode(adminPassword, secretKey));
             agencyUserModel.setRePassword(DesUtil.encode(adminPassword, secretKey));
-            Privilege.agencyUserClient.create(agencyUserModel);
+            List<String> appCodes = new ArrayList<>(appCodeSet);
+            agencyUserModel.setAppCodes(appCodes);
+            agencyUserModel = Privilege.agencyUserClient.create(agencyUserModel).getResult();
 
             //企业动态表单存储
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(company));
@@ -175,7 +189,8 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
             jsonObject.put("name",adminName);
             jsonObject.put("phone",adminPhone);
             jsonObject.put("amosOrgId",agencyUserModel.getSequenceNbr());
-            orgServiceImpl.dataHandling(jsonObject, OrgEnum.企业管理员.getKey(),null);
+            jsonObject.put("isCheck",companyModelFeignClient.getSequenceNbr());
+            orgServiceImpl.dataHandling(jsonObject, OrgEnum.普通人员.getKey(),null);
         }
         return this.updateById(company);
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/EquipmentServiceImpl.java

@@ -5,19 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
-import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IEquipmentService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -25,7 +23,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 设备信息表服务实现类
@@ -43,6 +40,9 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
     @Autowired
     AttachmentServiceImpl attachmentServiceImpl;
 
+    @Autowired
+    OrgServiceImpl orgService;
+
 
     /**
      * 分页查询
@@ -97,32 +97,33 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
      */
     public void saveAttachment(JSONArray subForm,Long SequenceNbr){
         AttachmentDto attachmentDto = new AttachmentDto();
+        attachmentDto.setInfo(JSON.toJSONString(subForm));
+        attachmentDto.setSourceId(SequenceNbr);
         if (!subForm.isEmpty()){
             for(Object o:subForm){
                 JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(o));
                 jsonObject.getString("Symbol_key");
                 JSONArray jsonArray = jsonObject.getJSONArray("info");
-                for(Object j:jsonArray){
-                    JSONObject info = JSON.parseObject(JSON.toJSONString(j));
-                    String name = info.getString("name");
-                    attachmentDto.setSourceId(SequenceNbr);
-                    attachmentDto.setName(info.getString("name"));
-//                attachmentDto.setInfo("name: "+name+","+
-//                        "type: "+name.substring(name.lastIndexOf(".")+1)+","+
-//                        "path: "+info.getString("url")+","+
-//                        "certCode: "+jsonObject.getString("certCode")+","+
-//                        "certType: "+jsonObject.getString("certType"));
-                    attachmentDto.setInfo(JSON.toJSONString(subForm));
-                    attachmentDto.setType(name.substring(name.lastIndexOf(".")+1));
-                    attachmentServiceImpl.createWithModel(attachmentDto);
+                if(!ValidationUtil.isEmpty(jsonArray)) {
+                    for (Object j : jsonArray) {
+                        JSONObject info = JSON.parseObject(JSON.toJSONString(j));
+                        String name = info.getString("name");
+                        attachmentDto.setName(info.getString("name"));
+                        attachmentDto.setType(name.substring(name.lastIndexOf(".")+1));
+                        break;
+                    }
                     break;
                 }
             }
+            attachmentServiceImpl.createWithModel(attachmentDto);
         }
 
     }
 
+
+
     @Override
+    @BusinessIdentify
     public EquipmentDto saveEI(JSONObject object) {
         EquipmentDto model = new EquipmentDto();
         model.setName(object.getString("name"));
@@ -134,6 +135,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
         model.setInspectionDate(object.getDate("inspectionDate"));
         model.setUseStatus(object.getString("useStatus"));
         model.setVerifyStatus(object.getString("verifyStatus"));
+        model.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
         EquipmentDto result = this.createWithModel(model);
 
         return result;
@@ -172,6 +174,10 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
 //		BeanUtils.copyProperties(attachmentDto,attachment);
 
     }
+    //设备模糊筛选
+    public IPage<EquipmentDto> queryEquipmentPage(IPage<EquipmentDto> page, Equipment equipment) {
+        return equipmentMapper.queryEquipmentPage(page,equipment);
+    }
 
 
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/MaterialServiceImpl.java

@@ -36,11 +36,13 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
     AttachmentServiceImpl attachmentServiceImpl;
     @Autowired
     AttachmentMapper attachmentMapper;
+    @Autowired
+    OrgServiceImpl orgService;
     /**
      * 分页查询
      */
-    public Page<MaterialDto> queryForMaterialPage(Page<MaterialDto> page,String name ,String code) {
-        return this.queryForPage(page, null, false,name,code);
+    public Page<MaterialDto> queryForMaterialPage(Page<MaterialDto> page,String name ,String code,Long companyId) {
+        return this.queryForPage(page, null, false,name,code,companyId);
     }
 
     /**
@@ -89,6 +91,8 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
         materialDto.setManufactureAddr(jsonObject.getString("manufactureAddr"));
         materialDto.setManufactureDate(jsonObject.getDate("manufactureDate"));
         materialDto.setBatchNum(jsonObject.getString("batchNum"));
+        materialDto.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
+        materialDto.setType(jsonObject.getString("type"));
         MaterialDto result = this.createWithModel(materialDto);
         return result;
     }
@@ -114,6 +118,7 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
         materialDto.setManufactureAddr(jsonObject.getString("manufactureAddr"));
         materialDto.setManufactureDate(jsonObject.getDate("manufactureDate"));
         materialDto.setBatchNum(jsonObject.getString("batchNum"));
+        materialDto.setType(jsonObject.getString("type"));
         this.updateWithModel(materialDto);
 
         JSONArray subForm = jsonObject.getJSONArray("subForm");
@@ -145,6 +150,7 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
         jsonObject.put("manufactureAddr",materialDto.getManufactureAddr());
         jsonObject.put("manufactureDate",materialDto.getManufactureDate());
         jsonObject.put("batchNum",materialDto.getBatchNum());
+        jsonObject.put("type",materialDto.getType());
         if (attachmentDto != null){
             JSONArray jsonArray = JSON.parseArray(attachmentDto.getInfo());
             jsonObject.put("subForm",jsonArray);

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -133,12 +133,21 @@ public class OrgServiceImpl {
             orgUsr.setBizOrgCode(jsonObject.getString("creditCode"));
         }
         if (OrgEnum.普通人员.getKey().equals(bizOrgType)){
-            if (1==jsonObject.getInteger("isWelder")) {
-                orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
-                orgUsr.setCode(getCode());
+            if(!ValidationUtil.isEmpty(jsonObject.getInteger("isWelder"))){
+                if(ValidationUtil.isEmpty(sequenceNbr)){
+                    if (1==jsonObject.getInteger("isWelder")) {
+                        orgUsr.setOrgExpandAttr1(OrgEnum.焊工.getKey());
+                        orgUsr.setCode(getCode());
+                    }
+                }
             }
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
+            if (!ValidationUtil.isEmpty(jsonObject.getLong("isCheck"))) {
+                wrapper.eq(OrgUsr :: getAmosOrgId,jsonObject.getLong("isCheck"));
+            } else {
+                wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
+            }
+
             orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
         }
         if (OrgEnum.部门.getKey().equals(bizOrgType)) {
@@ -168,7 +177,7 @@ public class OrgServiceImpl {
         if(ValidationUtil.isEmpty(code)){
             c = 0001;
         }else{
-            c = Integer.parseInt(code)+1;
+            c = Integer.parseInt(code.substring(code.indexOf("-")+1,code.length()))+1;
         }
 
         String welderCode = OrgEnum.焊工.getKey() +"-"+ c;
@@ -249,8 +258,7 @@ public class OrgServiceImpl {
      */
     public IPage getCompanyWelder(IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
-                .eq(OrgUsr::getBizOrgType,OrgEnum.焊工.getKey());
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
     }
 
@@ -260,8 +268,7 @@ public class OrgServiceImpl {
      */
     public IPage getCompanyDept(IPage page){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()))
-                .eq(OrgUsr::getBizOrgType,OrgEnum.部门.getKey());
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
     }
 
@@ -283,11 +290,10 @@ public class OrgServiceImpl {
      * 查询当前登录单位下的人员列表
      * @return
      */
+    @BusinessIdentify
     public List<OrgUsr> getCharge(){
-        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
-        personWrapper.eq(OrgUsr::getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())
+        personWrapper.eq(OrgUsr::getParentId,String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr()))
                 .eq(OrgUsr :: getBizOrgType,OrgEnum.普通人员.getKey());
         return orgUsrServiceImpl.list(personWrapper);
     }
@@ -362,8 +368,12 @@ public class OrgServiceImpl {
                 throw new Exception("该企业/部门下还有人员，不可删除！");
             }
         }
+        orgUsrServiceImpl.deleteBySeq(Long.valueOf(sequencenNbr));
     }
 
+
+
+
     /**
      * 获取企业下的人员信息列表
      * @param companyId 单位/企业id

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -57,6 +57,9 @@ public class ProblemInitiationServiceImpl {
     @Autowired
     QualityProblemServiceImpl qualityProblemService;
 
+    @Autowired
+    InstallNoticeMsgServiceImpl installNoticeMsgService;
+
 
     @Value("${params.work.flow.problemDefinitionKey}")
     private String problemDefinitionKey;
@@ -200,24 +203,46 @@ public class ProblemInitiationServiceImpl {
                 }
             }
             if (bool) {
-                LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
-                wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
 
                 SmsRecordModel smsRecordModel = sendSmsMassage(smsCode, agencyUserModel.getMobile(), smsParams);
-                RectifyMsg rectifyMsg = new RectifyMsg();
                 if (ValidationUtil.isEmpty(smsRecordModel)) {
                     continue;
                 }
-                rectifyMsg.setContent(smsRecordModel.getSmsContent());
-                rectifyMsg.setProblemId(sequenceNbr);
-                rectifyMsg.setNoticeUnitId(Long.valueOf(noticeUnitId));
-                rectifyMsg.setMsgReceiver(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());
-                rectifyMsg.setSendTime(smsRecordModel.getSendTime());
-                rectifyMsgServiceImpl.save(rectifyMsg);
+                if(SMSEnum.项目安装告知申请.getCode().equals(smsCode) || SMSEnum.项目立项驳回短信.getCode().equals(smsCode)){
+                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
+                }else {
+                    saveProblemSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
+                }
+
             }
         }
     }
 
+    public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel){
+        LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
+        wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
+        InstallNoticeMsg installNoticeMsg = new InstallNoticeMsg();
+        installNoticeMsg.setContent(smsRecordModel.getSmsContent());
+        installNoticeMsg.setInstallNoticeId(smsRecordModel.getSequenceNbr());
+        installNoticeMsg.setTargetUnitId(Long.valueOf(smsRecordModel.getAgencyCode()));
+        installNoticeMsg.setTargetPersonId(Long.valueOf(agencyUserModel.getUserId()));
+        installNoticeMsg.setSendTime(smsRecordModel.getSendTime());
+        installNoticeMsgService.save(installNoticeMsg);
+    }
+
+    public void saveProblemSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel){
+        LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
+        wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
+        RectifyMsg rectifyMsg = new RectifyMsg();
+        rectifyMsg.setContent(smsRecordModel.getSmsContent());
+        rectifyMsg.setProblemId(sequenceNbr);
+        rectifyMsg.setNoticeUnitId(Long.valueOf(noticeUnitId));
+        rectifyMsg.setMsgReceiver(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());
+        rectifyMsg.setSendTime(smsRecordModel.getSendTime());
+        rectifyMsgServiceImpl.save(rectifyMsg);
+    }
+
+
     public SmsRecordModel sendSmsMassage(String smsCode, String mobile, HashMap<String, String> smsParams){
         SmsRecordModel smsRecordModel = new SmsRecordModel();
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
-import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
@@ -60,9 +59,6 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
     WorkflowExcuteServiceImpl workflowExcuteService;
 
     @Autowired
-    WorkflowFeignService workflowFeignService;
-
-    @Autowired
     InstallNoticeMsgServiceImpl installNoticeMsgService;
 
     @Autowired
@@ -122,18 +118,15 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
     @Override
     public void execute(String instanceId,Object objectd, String option){
         JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(objectd));
-        JSONObject jsonObject = workflowFeignService.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         ProjectInitiation projectInitiation = new ProjectInitiation();
         projectInitiation.setInstanceId(instanceId);
         projectInitiation.setContext(JSON.toJSONString(objectd));
-        JSONObject dataObject = jsonObject.getJSONObject("data");
         projectInitiation.setTaskId(dataObject.getString("id"));
         projectInitiation.setTaskName(dataObject.getString("name"));
 
         if (ProjectInitiationEnum.平台审核.getName().equals(dataObject.getString("name"))) {
-            if (true) {
-                option = "1";
-            }
         }
 
         if(ProjectInitiationEnum.监检员审核.getName().equals(dataObject.getString("name"))){
@@ -189,10 +182,11 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
      * @return
      */
     public String getFlowTaskName(String instanceId){
-        JSONObject jsonObject = workflowFeignService.getTask(instanceId);
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
         String taskName = "流程结束！";
         try {
-            taskName=jsonObject.getJSONObject("data").getString("name");
+            taskName=jsonObject.getString("name");
         }catch (Exception e) {}
         return taskName;
     }
@@ -201,7 +195,8 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Project::getInstanceId,instanceId);
         Project project = projectService.getOne(wrapper);
-        project.setStatus(ProjectInitiationEnum.getCodeByNameMap.get(getFlowTaskName(instanceId)));
+//        project.setStatus(ProjectInitiationEnum.getCodeByNameMap.get(getFlowTaskName(instanceId)));
+        project.setStatus(getFlowTaskName(instanceId));
         projectService.updateById(project);
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectResourceServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
+import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectMaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
+import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProjectResourceService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectResourceDto;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import io.swagger.annotations.Api;
 import org.aspectj.weaver.ast.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.Arrays;
+import java.util.*;
 
-import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum.*;
@@ -42,6 +52,18 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
     @Autowired
     EquipmentMapper equipmentMapper;
 
+    @Autowired
+    OrgServiceImpl orgService;
+
+    @Autowired
+    SuperviseRuleServiceImpl superviseRuleService;
+
+    @Autowired
+    MaterialServiceImpl materialService;
+
+    @Autowired
+    EquipmentServiceImpl equipmentService;
+
     /**
      * 分页查询
      */
@@ -147,7 +169,91 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
             this.save(projectResource);
         }
         return Resource;
+    }
+
+
+    /**
+     * 获取当前登录人所在单位下的所有项目列表
+     * @return
+     */
+    @BusinessIdentify
+    List<Project> getProjectList(){
+        ReginParams reginParams = orgService.getReginParams();
+        ReginParams.BusinessInfo businessInfo = reginParams.getBusinessInfo();
+        String companyId = String.valueOf(businessInfo.getCompanySequenceNbr());
+        String roleName = reginParams.getRole().getRoleName();
+        LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
+        List<Project> projectList = new ArrayList<>();
+        String reginCode = "";
+        if(OrgEnum.监察部门.getName().equals(roleName)){
+            wrapper.eq(SuperviseRule::getSuperviseDeptId,companyId);
+            reginCode = superviseRuleService.getOne(wrapper).getAdminRegion();
+        } else if(OrgEnum.监检机构.getName().equals(roleName)){
+            wrapper.eq(SuperviseRule::getInspectionUnitId,companyId);
+            reginCode = superviseRuleService.getOne(wrapper).getAdminRegion();
+        } else {
+            projectList = projectResourceMapper.getProjectPage(roleName,companyId);
+        }
+
+        if(!ValidationUtil.isEmpty(reginCode)){
+            projectList = projectResourceMapper.getProjectPage(roleName,reginCode);
+        }
+        return projectList;
+    }
 
 
+    /**
+     * 获取当前登录所在单位下的项目中的所有资源列表
+     * @return
+     */
+    @BusinessIdentify
+    public IPage getResourceInfo(String type,IPage page){
+        List<Project> projectList = this.getProjectList();
+        List<Long> projectIdList = new ArrayList<>();
+        List<Long> idList = new ArrayList<>();
+        List list = new ArrayList<>();
+        Map map = new HashMap();
+        for(Project project:projectList){
+            projectIdList.add(project.getSequenceNbr());
+            map.put(project.getSequenceNbr(),project.getName());
+        }
+        for(Long projectId:projectIdList){
+            LambdaQueryWrapper<ProjectResource> projectResourceWrapper = new LambdaQueryWrapper<>();
+            projectResourceWrapper.eq(ProjectResource::getType, type)
+                    .eq(ProjectResource::getProjectId,projectId);
+            IPage<ProjectResource> projectResourceList = this.page(page,projectResourceWrapper);
+            for(ProjectResource projectResource : projectResourceList.getRecords()){
+                idList.add(projectResource.getResourceId());
+                map.put(projectResource.getResourceId(),map.get(projectId));
+            }
+        }
+        if(焊工资源.getCode().equals(type)){
+            List<Map> mapList = new ArrayList<>();
+            for(Long welderId:idList){
+                Map detailMap = orgService.getdetialInfo(String.valueOf(welderId));
+                detailMap.put("projectName",map.get(welderId));
+                mapList.add(detailMap);
+            }
+            page.setRecords(mapList);
+        }else if(管材资源.getCode().equals(type)){
+            for(Long id:idList){
+                ProjectMaterialDto projectMaterialDto = new ProjectMaterialDto();
+                BeanUtils.copyProperties(materialService.getById(id),projectMaterialDto);
+                projectMaterialDto.setProjectName(String.valueOf(map.get(id)));
+                projectMaterialDto.setProjectResourceId(id);
+                list.add(projectMaterialDto);
+            }
+            page.setRecords(list);
+        }else {
+            for(Long id:idList){
+                WelderEquipmentDto welderEquipmentDto = new WelderEquipmentDto();
+                BeanUtils.copyProperties(equipmentService.getById(id),welderEquipmentDto);
+                welderEquipmentDto.setProjectName(String.valueOf(map.get(id)));
+                welderEquipmentDto.setProjectResourceId(String.valueOf(id));
+                list.add(welderEquipmentDto);
+            }
+            page.setRecords(list);
+        }
+        return page;
     }
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -4,11 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
+import com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Attachment;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Equipment;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectInitiation;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
@@ -45,6 +49,8 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     EquipmentServiceImpl equipmentService;
 
 
+    @Autowired
+    AttachmentServiceImpl attachmentServiceImpl;
     /**
      * 分页查询
      */
@@ -58,18 +64,21 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
     }
 
     private void getProjectState(ProjectDto project) {
-        String state = "",insDep = "",insPerson = "";
+        String state = "待审核",insDep = "",insPerson = "";
         LambdaQueryWrapper<ProjectInitiation> lambdaQueryWrap = new LambdaQueryWrapper<>();
         lambdaQueryWrap.eq(ProjectInitiation::getInstanceId,project.getInstanceId())
+                .eq(ProjectInitiation ::getTaskName, ProjectInitiationEnum.平台审核.getName())
                 .orderByDesc(ProjectInitiation::getSequenceNbr);
 
         List<ProjectInitiation> projectInitiationList = projectInitiationService.list(lambdaQueryWrap);
         if(!ValidationUtil.isEmpty(projectInitiationList)){
             ProjectInitiation projectInitiation = projectInitiationList.iterator().next();
             JSONObject jsonObject = JSON.parseObject(projectInitiation.getContext());
-            state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
-            insDep = jsonObject.getString(XJConstant.INS_DEP);
-            insPerson = jsonObject.getString(XJConstant.INS_PRESON);
+            if(!ValidationUtil.isEmpty(jsonObject)){
+                state = jsonObject.getString(XJConstant.PROCESS_PROJECT_STATE);
+                insDep = jsonObject.getString(XJConstant.INS_DEP);
+                insPerson = jsonObject.getString(XJConstant.INS_PRESON);
+            }
         }
         project.setExamineProjectState(state);
         project.setInsDep(insDep);
@@ -155,7 +164,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                 design=true;
             }
             if (OrgEnum.安装单位.getKey().equals(type)){
-                design=true;
+                install=true;
             }
         }
 
@@ -165,4 +174,15 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         this.updateById(project);
         return "ok";
     }
+
+    //项目模糊筛选
+    @Override
+    public Page<ProjectDto> queryProjectPage(Page<ProjectDto> page, Project project) {
+        Page<ProjectDto> projectDtoPage = projectMapper.queryProjectPage(page,project);
+        List<ProjectDto> projects = projectDtoPage.getRecords();
+        for(ProjectDto projectDto:projects){
+            getProjectState(projectDto);
+        }
+        return projectDtoPage;
+    }
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/SuperviseRuleServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.module.ugp.api.entity.SuperviseRule;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.SuperviseRuleMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.ISuperviseRuleService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.SuperviseRuleDto;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,11 +19,29 @@ import java.util.List;
  */
 @Service
 public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,SuperviseRule,SuperviseRuleMapper> implements ISuperviseRuleService {
+
+    @Autowired
+    OrgServiceImpl orgServiceImpl;
     /**
      * 分页查询
      */
-    public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page, Long superviseDeptId, Long inspectionUnitId,Integer adminRegionCode)   {
-        return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId,adminRegionCode );
+    public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page,SuperviseRule superviseRule) {
+
+        Integer adminRegionCode = superviseRule.getAdminRegionCode();
+
+        Long superviseDeptId = superviseRule.getSuperviseDeptId();
+        Long inspectionUnitId = superviseRule.getInspectionUnitId();
+
+        page = this.queryForPage(page,null,false,adminRegionCode,superviseDeptId,inspectionUnitId);
+        List<SuperviseRuleDto> superviseRuleDtoList = page.getRecords();
+
+        for(SuperviseRuleDto superviseRuleDto: superviseRuleDtoList){
+            superviseRuleDto.setSuperviseDept(orgServiceImpl.getOrgUsrById(String.valueOf(superviseRuleDto.getSuperviseDeptId())).getBizOrgName());
+            superviseRuleDto.setInspectionUnit(orgServiceImpl.getOrgUsrById(String.valueOf(superviseRuleDto.getInspectionUnitId())).getBizOrgName());
+            superviseRuleDto.setCreateUnit(orgServiceImpl.getOrgUsrById(String.valueOf(superviseRuleDto.getCreateUnitId())).getBizOrgName());
+        }
+
+        return page;
     }
 
     /**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -39,16 +39,13 @@ public class WelderServiceImpl {
     String secretKey;
 
 
-
+    /**
+     * 获取当前登录所在单位下的项目中的所有焊工列表
+     * @return
+     */
     @BusinessIdentify
     public List<Map> getInfo(){
-        ReginParams reginParams = orgService.getReginParams();
-        ReginParams.BusinessInfo businessInfo = reginParams.getBusinessInfo();
-        Long companySequenceNbr = businessInfo.getCompanySequenceNbr();
-        //默认建设单位
-        LambdaQueryWrapper<Project> projectWrapper = new LambdaQueryWrapper<>();
-        projectWrapper.eq(Project::getConstructionUnitId,companySequenceNbr);
-        List<Project> projectList = projectService.list(projectWrapper);
+        List<Project> projectList = projectResourceService.getProjectList();
         List<Long> projectIdList = new ArrayList<>();
         List<Long> welderIdList = new ArrayList<>();
         for(Project project:projectList){

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WorkHistoryServiceImpl.java

@@ -37,7 +37,7 @@ public class WorkHistoryServiceImpl extends BaseService<WorkHistoryDto,WorkHisto
         return this.queryForList("" , false);
     }
 
-    public IPage<WorkHistoryDto> pageList(Page<WorkHistoryDto> page, WorkHistoryDto tzUgpWorkHistory){
-        return workHistoryMapper.pageList(page, tzUgpWorkHistory);
+    public IPage<WorkHistoryDto> pageList(Page<WorkHistoryDto> page, WorkHistoryDto tzUgpWorkHistory,String sequenceNbr){
+        return workHistoryMapper.pageList(page, tzUgpWorkHistory,sequenceNbr);
     }
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -31,7 +31,7 @@ fire-rescue=123
 
 params.work.flow.processDefinitionKey=xiangmulixiangliucheng
 params.work.flow.problemDefinitionKey=zhiliangwentiliucheng
-amos.secret.key=ugp
+amos.secret.key=qaz
 
 
 ugp.sms.tempCode=SMS_UGP_0007
@@ -39,4 +39,6 @@ ugp.sms.tempCode=SMS_UGP_0007
 #logging.level.com.yeejoin.amos=error
 
 amos.system.user.user-name=ugp_cti
-amos.system.user.password=a1234567
+amos.system.user.password=a1234567
\ No newline at end of file
+amos.system.user.product=AMOS_STUDIO_WEB
+amos.system.user.app-key=AMOS_STUDIO
\ No newline at end of file

pom.xml

@@ -318,7 +318,7 @@
 	<modules>
 		<module>amos-boot-module</module>
 		<module>amos-boot-biz-common</module>
-		<module>amos-boot-system-tzs</module>
+	    <module>amos-boot-system-tzs</module>
 		<module>amos-boot-system-jcs</module>
 		<module>amos-boot-system-knowledgebase</module>
 		<module>amos-boot-system-fas</module>
@@ -336,5 +336,6 @@
 		<module>amos-boot-system-ugp</module>
 		<module>amos-boot-system-tdc</module>
 		<module>amos-boot-system-kgd</module>
+		<module>amos-boot-system-file</module>
 	</modules>
 </project>
\ No newline at end of file