Merge remote-tracking branch 'origin/master'

# Conflicts:
#	picc-admin-server/src/main/resources/application-dev.yml
#	picc-enterprise-server/src/main/resources/application-dev.yml

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/ApprovalRecordController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/approvalRecord")
-@Api(description = "approvalRecord")
+@Api(description = "企业历史投保记录")
 public class ApprovalRecordController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/AttachmentController.java

@@ -0,0 +1,55 @@
+package com.jpsoft.picc.modules.base.controller;
+
+import com.jpsoft.picc.modules.common.config.OSSConfig;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.jpsoft.picc.modules.common.utils.Uploader;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+@Api(description="附件管理")
+@RestController
+@RequestMapping("/base/attachment")
+@Slf4j
+public class AttachmentController {
+    @Autowired
+    private OSSConfig ossConfig;
+
+    @PostMapping("upload")
+    @ApiOperation(value="附件上传")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileName",value = "文件名", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "subFolder",value = "子目录名(如/test)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "uploadFile",value = "上传文件", required = true,paramType="form", dataType = "__file")
+    })
+    public MessageResult<String> upload(String fileName, String subFolder, MultipartFile uploadFile){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            if (StringUtils.isEmpty(fileName)){
+                fileName = uploadFile.getOriginalFilename();
+            }
+
+            String retFileUrl = Uploader.ossUpload(ossConfig,subFolder,fileName,uploadFile.getInputStream());
+
+            messageResult.setResult(true);
+            messageResult.setData(retFileUrl);
+            messageResult.setCode(200);
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+
+            messageResult.setResult(false);
+            messageResult.setMessage(e.getMessage());
+        }
+
+        return messageResult;
+    }
+}

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/company")
-@Api(description = "company")
+@Api(description = "企业信息")
 public class CompanyController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/CompanyMemberController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/companyMember")
-@Api(description = "companyMember")
+@Api(description = "企业人员信息")
 public class CompanyMemberController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceAgentController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insuranceAgent")
-@Api(description = "insuranceAgent")
+@Api(description = "保险代理人")
 public class InsuranceAgentController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insuranceDefinition")
-@Api(description = "insuranceDefinition")
+@Api(description = "险种信息")
 public class InsuranceDefinitionController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceDefinitionLimitController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insuranceDefinitionLimit")
-@Api(description = "insuranceDefinitionLimit")
+@Api(description = "险种限额信息")
 public class InsuranceDefinitionLimitController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/InsuranceJobsController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insuranceJobs")
-@Api(description = "insuranceJobs")
+@Api(description = "险种关联行业收费标准")
 public class InsuranceJobsController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/JobsController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/jobs")
-@Api(description = "jobs")
+@Api(description = "行业/职业类型信息")
 public class JobsController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/MessageController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/message")
-@Api(description = "message")
+@Api(description = "站内消息")
 public class MessageController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/TransactionRecordController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/transactionRecord")
-@Api(description = "transactionRecord")
+@Api(description = "企业账户流水信息")
 public class TransactionRecordController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/ApplicationPolicyController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/applicationPolicy")
-@Api(description = "applicationPolicy")
+@Api(description = "投保单和每月投保单关联表")
 public class ApplicationPolicyController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsuranceApplicationController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insuranceApplication")
-@Api(description = "insuranceApplication")
+@Api(description = "投保单")
 public class InsuranceApplicationController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insurancePolicy")
-@Api(description = "insurancePolicy")
+@Api(description = "每月投保单")
 public class InsurancePolicyController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyMemberController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insurancePolicyMember")
-@Api(description = "insurancePolicyMember")
+@Api(description = "每月投保单花名册")
 public class InsurancePolicyMemberController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyRecordController.java

@@ -20,7 +20,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/insurancePolicyRecord")
-@Api(description = "insurancePolicyRecord")
+@Api(description = "每月投保单审核流水")
 public class InsurancePolicyRecordController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/ApiController.java

@@ -1,5 +1,6 @@
 package com.jpsoft.picc.modules.sys.controller;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("/sys/api")
+@Api(description = "后端api信息")
 public class ApiController {
     @ApiOperation("获取后端api列表")
     @GetMapping("selectAll")

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/DataDictionaryController.java

@@ -6,6 +6,7 @@ import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.sys.entity.DataDictionary;
 import com.jpsoft.picc.modules.sys.service.DataDictionaryService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -17,6 +18,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/sys/dataDictionary")
+@Api(description = "数据字典")
 public class DataDictionaryController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/MenuController.java

@@ -6,6 +6,7 @@ import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.sys.entity.Menu;
 import com.jpsoft.picc.modules.sys.service.MenuService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -17,6 +18,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/sys/menu")
+@Api(description = "系统菜单")
 public class MenuController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/PermissionController.java

@@ -6,6 +6,7 @@ import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.sys.entity.Permission;
 import com.jpsoft.picc.modules.sys.service.PermissionService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -17,6 +18,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/sys/permission")
+@Api(description = "系统权限")
 public class PermissionController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/RoleController.java

@@ -11,6 +11,7 @@ import com.jpsoft.picc.modules.sys.entity.RolePermission;
 import com.jpsoft.picc.modules.sys.service.RoleMenuService;
 import com.jpsoft.picc.modules.sys.service.RolePermissionService;
 import com.jpsoft.picc.modules.sys.service.RoleService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -23,6 +24,7 @@ import java.util.*;
 
 @RestController
 @RequestMapping("/sys/role")
+@Api(description = "系统角色")
 public class RoleController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/UserController.java

@@ -10,6 +10,7 @@ import com.jpsoft.picc.modules.sys.entity.User;
 import com.jpsoft.picc.modules.sys.entity.UserRole;
 import com.jpsoft.picc.modules.sys.service.UserRoleService;
 import com.jpsoft.picc.modules.sys.service.UserService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/sys/user")
+@Api(description = "系统用户")
 public class UserController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 

picc-common/pom.xml

@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>picc-common</artifactId>
-
     <dependencies>
         <dependency>
             <groupId>com.github.pagehelper</groupId>

picc-common/src/main/java/com/jpsoft/picc/modules/common/config/OSSConfig.java

@@ -0,0 +1,17 @@
+package com.jpsoft.picc.modules.common.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "oss" )
+@Data
+public class OSSConfig {
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String endpoint;
+    private String bucketName;
+    private String urlPrefix;
+    private String objectPre;
+}

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/PojoUtils.java

@@ -3,6 +3,7 @@ package com.jpsoft.picc.modules.common.utils;
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;
 import com.github.pagehelper.Page;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,14 +55,20 @@ public class PojoUtils {
         return map;
     }
 
+
     public static Map pageWrapper(Page page){
         Map<String,Object> pageMap = new HashMap<>();
 
+        //记录总数
         pageMap.put("recordsTotal",page.getTotal());
         pageMap.put("recordsFiltered",page.getTotal());
+        //总页数
         pageMap.put("totalPage",page.getPages());
+        //当前页
         pageMap.put("pageNumber",page.getPageNum());
+        //每页条数
         pageMap.put("pageSize",page.getPageSize());
+        //本页数据
         pageMap.put("data", page.getResult());
 
         return pageMap;

picc-common/src/main/java/com/jpsoft/picc/modules/common/utils/Uploader.java

@@ -0,0 +1,44 @@
+package com.jpsoft.picc.modules.common.utils;
+
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.PutObjectResult;
+import com.jpsoft.picc.modules.common.config.OSSConfig;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Date;
+
+public class Uploader {
+    public static String ossUpload(OSSConfig ossConfig,
+                                   String subFolder, String fileName,
+                                   InputStream fileInputStream){
+        Date now = new Date();
+
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(now);
+
+        String savePath = ossConfig.getObjectPre();
+
+        if(!subFolder.startsWith("/")){
+            savePath += "/";
+        }
+
+        savePath += subFolder;
+
+        savePath = savePath + "/" + cal.get(Calendar.YEAR) + "/" +  (cal.get(Calendar.MONTH)+1) + "/";
+
+        OSS ossClient = new OSSClientBuilder().build(ossConfig.getEndpoint(), ossConfig.getAccessKeyId(), ossConfig.getAccessKeySecret());
+
+        String retFileUrl = savePath + fileName;
+
+        // 上传文件流
+        PutObjectResult result = ossClient.putObject(ossConfig.getBucketName(), retFileUrl, fileInputStream);
+
+        // 关闭OSSClient
+        ossClient.shutdown();
+
+        return ossConfig.getUrlPrefix() + "/" + retFileUrl;
+    }
+}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/controller/AttachmentController.java

@@ -1,9 +1,57 @@
 package com.jpsoft.picc.modules.auth.controller;
 
+import com.alibaba.druid.util.StringUtils;
+import com.jpsoft.picc.modules.common.config.OSSConfig;
+import com.jpsoft.picc.modules.common.dto.MessageResult;
+import com.jpsoft.picc.modules.common.utils.Uploader;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 
 @Api(description="附件管理")
 @RestController
+@RequestMapping("/auth/attachment")
+@Slf4j
 public class AttachmentController {
+    @Autowired
+    private OSSConfig ossConfig;
+
+    @PostMapping("upload")
+    @ApiOperation(value="附件上传")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "fileName",value = "文件名", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "subFolder",value = "子目录名(如/test)", required = false, paramType = "form"),
+            @ApiImplicitParam(name = "uploadFile",value = "上传文件", required = true,paramType="form", dataType = "__file")
+    })
+    public MessageResult<String> upload(String fileName,String subFolder,MultipartFile uploadFile){
+        MessageResult<String> messageResult = new MessageResult<>();
+
+        try {
+            if (StringUtils.isEmpty(fileName)){
+                fileName = uploadFile.getOriginalFilename();
+            }
+
+            String retFileUrl = Uploader.ossUpload(ossConfig,subFolder,fileName,uploadFile.getInputStream());
+
+            messageResult.setResult(true);
+            messageResult.setData(retFileUrl);
+            messageResult.setCode(200);
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+
+            messageResult.setResult(false);
+            messageResult.setMessage(e.getMessage());
+        }
+
+        return messageResult;
+    }
 }

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/CompanyController.java

@@ -0,0 +1,4 @@
+package com.jpsoft.picc.modules.pub.controller;
+
+public class CompanyController {
+}

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/company/controller/DemoController.java → picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/DemoController.java

@@ -1,4 +1,4 @@
-package com.jpsoft.picc.modules.company.controller;
+package com.jpsoft.picc.modules.pub.controller;
 
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.GetMapping;

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/company/controller/UserController.java → picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/pub/controller/UserController.java

@@ -1,4 +1,4 @@
-package com.jpsoft.picc.modules.company.controller;
+package com.jpsoft.picc.modules.pub.controller;
 
 import com.alibaba.druid.util.StringUtils;
 import com.jpsoft.picc.modules.common.dto.MessageResult;

pom.xml

@@ -3,7 +3,6 @@
          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">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>com.jpsoft</groupId>
     <artifactId>picc</artifactId>
     <packaging>pom</packaging>
@@ -21,7 +20,6 @@
         <module>picc-common</module>
         <module>picc-enterprise-server</module>
     </modules>
-
     <properties>
         <java.version>1.8</java.version>
         <lombok.version>1.16.12</lombok.version>
@@ -108,5 +106,13 @@
             <scope>compile</scope>
         </dependency>
         <!-- apache poi end -->
+
+        <!-- aliyun oss start -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <!-- aliyun oss end -->
     </dependencies>
 </project>