增加设备管理模块

common/pom.xml

@@ -68,5 +68,15 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
     </dependencies>
 </project>

common/src/main/java/com/foreverwin/mesnac/common/util/SendMail.java

@@ -0,0 +1,132 @@
+package com.foreverwin.mesnac.common.util;
+
+
+import cn.hutool.extra.mail.MailAccount;
+import cn.hutool.extra.mail.MailUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.util.Collection;
+
+@Component
+@ConditionalOnProperty(prefix = "mail", name = {"host","from"})
+public class SendMail {
+
+    @Value("${mail.host}")
+    private String host;
+    @Value("${mail.from}")
+    private String from;
+
+    /**
+     * 发送文本消息
+     *
+     * @param to  收件地址： 多个地址中间用","或者","分割
+     * @param subject  主题
+     * @param content  内容
+     * @param files  附件
+     */
+    public void sendText(String to, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), to, subject, content, false, files);
+    }
+
+    /**
+     * 发送文本消息
+     *
+     * @param tos  收件地址
+     * @param subject  主题
+     * @param content  内容
+     * @param files  附件
+     */
+    public void sendText(Collection<String> tos, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), tos, subject, content, false, files);
+    }
+
+    /**
+     * 发送文本消息、抄送
+     *
+     * @param tos  收件地址
+     * @param ccs  抄送地址
+     * @param subject  主题
+     * @param content  内容
+     * @param files  附件
+     */
+    public void sendText(Collection<String> tos, Collection<String> ccs, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), tos, ccs, null, subject, content, false, files);
+    }
+
+    /**
+     * 发送文本消息、抄送、暗抄送
+     *
+     * @param tos  收件地址
+     * @param ccs  抄送地址
+     * @param bccs 暗抄送地址
+     * @param subject  主题
+     * @param content  内容
+     * @param files  附件
+     */
+    public void sendText(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), tos, ccs, bccs, subject, content, false, files);
+    }
+
+    /**
+     * 发送HTML格式信息
+     *
+     * @param to  收件地址： 多个地址中间用","或者","分割
+     * @param subject  主题
+     * @param content  内容
+     * @param files   附件
+     */
+    public void sendHtml(String to, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), to, subject, content, true, files);
+    }
+
+    /**
+     * 发送HTML格式信息
+     *
+     * @param tos  收件地址
+     * @param subject  主题
+     * @param content  内容
+     * @param files   附件
+     */
+    public void sendHtml(Collection<String> tos, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), tos, subject, content, true, files);
+    }
+
+    /**
+     * 发送HTML格式信息、抄送
+     *
+     * @param tos  收件地址
+     * @param ccs  抄送地址
+     * @param subject  主题
+     * @param content  内容
+     * @param files  附件
+     */
+    public void sendHtml(Collection<String> tos, Collection<String> ccs,String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), tos, ccs, null, subject, content, true, files);
+    }
+
+    /**
+     * 发送HTML格式信息、抄送、暗抄送
+     *
+     * @param tos   收件地址
+     * @param ccs   抄送地址
+     * @param bccs  暗抄送地址
+     * @param subject  主题
+     * @param content  内容
+     * @param files  附件
+     */
+    public void sendHtml(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, File... files) {
+        MailUtil.send(getMailAccount(), tos, ccs, bccs, subject, content, true, files);
+    }
+
+
+    private MailAccount getMailAccount() {
+        MailAccount mailAccount = new MailAccount();
+        mailAccount.setHost(host);
+        mailAccount.setFrom(from);
+
+        return mailAccount;
+    }
+}

dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java

@@ -61,8 +61,8 @@ public class MasterObjectDefine {
 		    	cvsHeadsMapping.put("operationType", "操作类型");
 		    	cvsHeadsMapping.put("resourceType", "资源类型");
 		    	cvsHeadsMapping.put("defaultResource", "默认资源");
-
 			 break;
+
 		 case "PRODUCTION":
 
 			 cvsHeadsMapping=new HashMap<String,String>();

dispatch/pom.xml

@@ -39,6 +39,11 @@
             <artifactId>meapi</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.foreverwin.mesnac</groupId>
+            <artifactId>common</artifactId>
+        </dependency>
+
         <!--poi support-->
         <dependency>
             <groupId>org.apache.poi</groupId>

dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/TestController.java

@@ -0,0 +1,23 @@
+package com.foreverwin.mesnac.dispatch.controller;
+
+import com.foreverwin.mesnac.common.util.SendMail;
+import com.foreverwin.modular.core.util.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+
+    @Autowired
+    private SendMail sendMail;
+
+    @GetMapping()
+    public R test(String to, String subject, String content) {
+        sendMail.sendText(to, subject, content);
+        return R.ok(content);
+    }
+}

equip/src/main/java/com/foreverwin/com/equip/controller/EquipTypeController.java

@@ -0,0 +1,4 @@
+package com.foreverwin.com.equip.controller;
+
+public class EquipTypeController {
+}

pom.xml

@@ -146,6 +146,25 @@
                 <artifactId>guava</artifactId>
                 <version>28.0-jre</version>
             </dependency>
+
+            <!--邮件发送-->
+            <dependency>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4.7</version>
+            </dependency>
+
+            <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-all</artifactId>
+                <version>5.0.6</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>