1.临时存储文件存储时效性过期增加配置；2.人员职务新增

suishenbang-admin/src/main/java/com/dgtly/DgtlyApplication.java

@@ -4,12 +4,14 @@ import org.apache.http.client.HttpClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.web.servlet.MultipartConfigFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import javax.servlet.MultipartConfigElement;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -49,4 +51,11 @@ public class DgtlyApplication
         });
          return restTemplate;
     }
+
+    @Bean
+    public MultipartConfigElement multipartConfigElement() {
+        MultipartConfigFactory factory = new MultipartConfigFactory();
+        factory.setLocation("/tmp/tomcat");
+        return factory.createMultipartConfig();
+    }
 }

suishenbang-admin/src/main/resources/application-dev.yml

@@ -49,7 +49,7 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
- 
+    basedir: /tmp/tomcat
 # 日志配置
 logging:
   level:
@@ -89,6 +89,7 @@ spring:
        max-file-size:  10MB
        # 设置总上传的文件大小
        max-request-size:  20MB
+       location: /data/upload_tmp
   # 服务模块
   devtools:
     restart:

suishenbang-admin/src/main/resources/application-prod.yml

@@ -49,7 +49,7 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
- 
+    basedir: /tmp/tomcat
 # 日志配置
 logging:
   level:
@@ -87,6 +87,7 @@ spring:
        max-file-size:  10MB
        # 设置总上传的文件大小
        max-request-size:  20MB
+       location: /data/upload_tmp
   # 服务模块
   devtools:
     restart:

suishenbang-admin/src/main/resources/application-test.yml

@@ -39,6 +39,7 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
+    basedir: /tmp/tomcat
  
 # 日志配置
 logging:
@@ -97,6 +98,7 @@ spring:
        max-file-size:  10MB
        # 设置总上传的文件大小
        max-request-size:  20MB
+       location: /data/upload_tmp
   # 服务模块
   devtools:
     restart:

suishenbang-admin/src/main/resources/application-uat.yml

@@ -49,6 +49,7 @@ server:
     max-threads: 800
     # Tomcat启动初始化的线程数，默认值25
     min-spare-threads: 30
+    basedir: /tmp/tomcat
  
 # 日志配置
 logging:
@@ -87,6 +88,7 @@ spring:
        max-file-size:  10MB
        # 设置总上传的文件大小
        max-request-size:  20MB
+       location: /data/upload_tmp
   mail:
     #邮件服务器地址
     host: mail.dgtis.com

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -33,7 +33,7 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
+//立邦员工
 @Service("analysisDiyCustomerService")
 public class AnalysisSysUserService implements IAnalysisSysUserService {
 
@@ -143,6 +143,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     SysUserExt userExt = new SysUserExt();
                     userExt.setBossEmployeeId(m.getBossEmployeeId());
                     userExt.setBossName(m.getBossName());
+                    userExt.setDuty(m.getDuty());
+                    userExt.setDutyName(m.getDutyName());
                     userExt.setSapEmployeeId(m.getSapEmployeeId());
                     userExt.setPostCode(m.getEmployeePost());
                     String postName = m.getEmployeePostName();
@@ -358,6 +360,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     userExt.setBossName(m.getBossName());
                     userExt.setSapEmployeeId(m.getSapEmployeeId());
                     userExt.setPostCode(m.getEmployeePost());
+                    userExt.setDuty(m.getDuty());
+                    userExt.setDutyName(m.getDutyName());
                     String postName = m.getEmployeePostName();
                     userExt.setPostName(postName);
 
@@ -613,6 +617,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     userExt.setBossName(m.getBossName());
                     userExt.setSapEmployeeId(m.getSapEmployeeId());
                     userExt.setPostCode(m.getEmployeePost());
+                    userExt.setDuty(m.getDuty());
+                    userExt.setDutyName(m.getDutyName());
                     String postName = m.getEmployeePostName();
                     userExt.setPostName(postName);
 
@@ -832,6 +838,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     userExt.setBossName(m.getBossName());
                     userExt.setSapEmployeeId(m.getSapEmployeeId());
                     userExt.setPostCode(m.getEmployeePost());
+                    userExt.setDuty(m.getDuty());
+                    userExt.setDutyName(m.getDutyName());
                     String postName = m.getEmployeePostName();
                     userExt.setPostName(postName);
 
@@ -1012,6 +1020,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     userExt.setBossName(m.getBossName());
                     userExt.setSapEmployeeId(m.getSapEmployeeId());
                     userExt.setPostCode(m.getEmployeePost());
+                    userExt.setDuty(m.getDuty());
+                    userExt.setDutyName(m.getDutyName());
                     String postName = m.getEmployeePostName();
                     userExt.setPostName(postName);
 

suishenbang-system/src/main/java/com/dgtly/system/domain/SysUserExt.java

@@ -50,6 +50,26 @@ public class SysUserExt extends BaseEntity
     private Integer isChangeExt  =0;
 
     private String  identity;
+    /**职务*/
+    private String duty;
+
+    private String dutyName;
+
+    public String getDuty() {
+        return duty;
+    }
+
+    public void setDuty(String duty) {
+        this.duty = duty;
+    }
+
+    public String getDutyName() {
+        return dutyName;
+    }
+
+    public void setDutyName(String dutyName) {
+        this.dutyName = dutyName;
+    }
 
     public String getIdentity() {
         return identity;

suishenbang-system/src/main/resources/mapper/system/SysUserSalesExtMapper.xml

@@ -16,10 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isCustomerManager"    column="is_customer_manager"    />
         <result property="postCode"    column="post_code"    />
         <result property="postName"    column="post_name"    />
+        <result property="duty"    column="duty"    />
+        <result property="dutyName"    column="duty_name"    />
     </resultMap>
 
     <sql id="selectSysUserExtVo">
-        select user_id, org_code, sales_level, org_name, sap_employee_id, boss_employee_id, boss_name,customer_code,is_customer_manager,post_code,post_name,identity from sys_user_ext
+        select user_id, org_code, sales_level, org_name, sap_employee_id, boss_employee_id, boss_name,customer_code,is_customer_manager,post_code,post_name,identity,duty,duty_name from sys_user_ext
     </sql>
 
     <select id="selectSysUserExtList" parameterType="SysUserExt" resultMap="SysUserExtResult">
@@ -133,7 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postCode != null and postCode != ''"> post_code ,</if>
             <if test="postName != null  and postName != ''"> post_name ,</if>
             <if test="identity != null  and identity != ''"> identity ,</if>
-
+            <if test="duty != null  and duty != ''"> duty ,</if>
+            <if test="dutyName != null  and dutyName != ''"> duty_name ,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             #{userId},
@@ -148,7 +151,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postCode != null and postCode != ''">  #{postCode},</if>
             <if test="postName != null  and postName != ''">#{postName}, </if>
             <if test="identity != null  and identity != ''">#{identity}, </if>
-
+            <if test="duty != null  and duty != ''">#{duty}, </if>
+            <if test="dutyName != null  and dutyName != ''">#{dutyName}, </if>
         </trim>
         ON DUPLICATE KEY UPDATE
         <trim suffixOverrides=",">
@@ -163,7 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postCode != null and postCode != ''"> post_code = #{postCode}, </if>
             <if test="postName != null  and postName != ''">  post_name = #{postName}, </if>
             <if test="identity != null  and identity != ''">  identity = #{identity}, </if>
-
+            <if test="duty != null  and duty != ''">  duty = #{duty}, </if>
+            <if test="dutyName != null  and dutyName != ''">  duty_name = #{dutyName}, </if>
         </trim>
   </insert>