Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/config/SwaggerConfig.java

@@ -1,5 +1,6 @@
 package com.jpsoft.picc.config;
 
+import io.swagger.annotations.Api;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,7 +24,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
+                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
                 .paths(PathSelectors.any())
                 .build()
                 //添加登录认证

picc-admin-server/src/main/java/com/jpsoft/picc/config/WebMvcConfig.java

@@ -49,12 +49,6 @@ public class WebMvcConfig implements WebMvcConfigurer {
 				"/webjars/**",
 				"/swagger-ui.html",
 				"/v2/**",
-				"/mobileApi/**")
-				.excludePathPatterns("/wxPay/webPay")
-				.excludePathPatterns("/aliPay/tradePrecreatePay")
-				.excludePathPatterns("/aliPay/payNotify")
-				.excludePathPatterns("/wxPay/payNotify");
-
-
+				"/pub/**");
 	}
 }

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

@@ -239,4 +239,35 @@ public class MessageController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="消息设为已读")
+    @PostMapping("read/{id}")
+    public MessageResult<Integer> read(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Message message = messageService.get(id);
+            message.setStatus(true);
+            message.setUpdateBy(subject);
+            message.setUpdateTime(new Date());
+
+            int affectCount = messageService.update(message);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("设为已读失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

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

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
+import org.joda.time.Months;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -397,10 +398,8 @@ public class InsuranceApplicationController {
 
         DateTime startTime = new DateTime(insuranceApplication.getStartTime());
 
-        Interval interval = new Interval(startTime, endTime);
-
         //投保总月份
-        int months = interval.toPeriod().getMonths();
+        int months = Months.monthsBetween(startTime, endTime).getMonths();
 
         BigDecimal totalAmount = new BigDecimal(0);
 

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

@@ -1,5 +1,6 @@
 package com.jpsoft.picc.modules.business.controller;
 
+import cn.hutool.core.io.FileUtil;
 import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.base.entity.InsuranceAgent;
 import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
@@ -22,9 +23,14 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.File;
 import java.util.*;
 
 @RestController
@@ -33,12 +39,6 @@ import java.util.*;
 public class InsurancePolicyController {
     private Logger logger = LoggerFactory.getLogger(getClass());
 
-    /*@Autowired
-    private ItextPDFUtil itextPDFUtil;*/
-
-    @Autowired
-    private PdfConfig pdfConfig;
-
     @Autowired
     private InsurancePolicyService insurancePolicyService;
 
@@ -60,8 +60,6 @@ public class InsurancePolicyController {
     @Autowired
     private InsuranceDefinitionLimitService insuranceDefinitionLimitService;
 
-
-
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
     public MessageResult<InsurancePolicy> create(){
@@ -549,57 +547,6 @@ public class InsurancePolicyController {
         return msgResult;
     }
 
-
-    @ApiOperation(value="pdf文档生成与下载")
-    @RequestMapping(value = "downloadApplicationData",method = RequestMethod.POST)
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
-            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query")
-
-    })
-    public MessageResult<Integer> downloadApplicationData(String applicationId,String policyId){
-
-        MessageResult<Integer> msgResult = new MessageResult<>();
-        String logoUrl = pdfConfig.getLogoUrl();
-        String downloadFilePath = pdfConfig.getDownloadFilePath();
-
-        try{
-        InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
-        List<InsuranceDefinitionLimit> insuranceDefinitionLimitList = insuranceDefinitionLimitService.findByDefinitionId(insuranceApplication.getDefinitionId());
-
-        List<Map<String,Object>> mapList = new ArrayList<Map<String,Object>>();
-
-        for(InsuranceDefinitionLimit  insuranceDefinitionLimit:insuranceDefinitionLimitList){
-            Map<String,Object> map1 = new HashMap<String,Object>();
-            map1.put("id",insuranceDefinitionLimit.getId());
-            map1.put("name",insuranceDefinitionLimit.getName());
-            map1.put("limit",insuranceDefinitionLimit.getLimit());
-            map1.put("unit",insuranceDefinitionLimit.getUnit());
-            mapList.add(map1);
-        }
-
-        List<InsurancePolicyMember> list = insurancePolicyMemberService.findByPolicyId(policyId);
-
-
-
-            ItextPDFUtil.createPdf(insuranceApplication,mapList,list,logoUrl,downloadFilePath);
-            msgResult.setMessage("pdf文档生成成功");
-            msgResult.setResult(true);
-
-        }catch (Exception ex){
-            logger.error(ex.getMessage(),ex);
-            msgResult.setMessage(ex.getMessage());
-            msgResult.setResult(false);
-
-        }
-
-        return msgResult;
-    }
-
-
-
-
-
     private Integer approval(String applicationId,String id,String processStatus,String opinion,String status,String subject){
 
         int affectCount = 0;
@@ -655,17 +602,24 @@ public class InsurancePolicyController {
         srcPolicy.setStatus(PolicyStatus.SendOutPolicy.getValue() + "");
         srcPolicy.setUpdateTime(new Date());
 
+        InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+
         insurancePolicyService.update(srcPolicy);
 
         InsurancePolicy destPolicy = new InsurancePolicy();
 
         PojoUtils.map(srcPolicy,destPolicy);
 
-        DateTime startTime = new DateTime(srcPolicy.getEndTime()).plusDays(1);
+        DateTime startTime = new DateTime(srcPolicy.getEndTime());
 
         destPolicy.setStartTime(startTime.toDate());
         destPolicy.setEndTime(startTime.plusMonths(1).toDate());
 
+        //已经过期则不生成下月投保单
+        if (destPolicy.getEndTime().after(insuranceApplication.getEndTime())){
+            return;
+        }
+
         destPolicy.setEffectiveDate(startTime.toString("yyyyMM"));
 
         boolean exist = insurancePolicyService.existByApplicationIdAndEffectiveDate(applicationId,destPolicy.getEffectiveDate());

picc-admin-server/src/main/java/com/jpsoft/picc/modules/pub/controller/PolicyPdfController.java

@@ -0,0 +1,108 @@
+package com.jpsoft.picc.modules.pub.controller;
+
+import cn.hutool.core.io.FileUtil;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
+import com.jpsoft.picc.modules.base.service.InsuranceDefinitionLimitService;
+import com.jpsoft.picc.modules.business.entity.InsuranceApplication;
+import com.jpsoft.picc.modules.business.entity.InsurancePolicyMember;
+import com.jpsoft.picc.modules.business.service.InsuranceApplicationService;
+import com.jpsoft.picc.modules.business.service.InsurancePolicyMemberService;
+import com.jpsoft.picc.modules.common.config.PdfConfig;
+import com.jpsoft.picc.modules.common.utils.ItextPDFUtil;
+import com.jpsoft.picc.modules.common.utils.Watermark;
+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.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Api(description="投保单pdf下载")
+@Controller
+@RequestMapping(value = "/pub/policyPdf")
+@Slf4j
+public class PolicyPdfController {
+    @Autowired
+    private PdfConfig pdfConfig;
+
+    @Autowired
+    private InsuranceApplicationService insuranceApplicationService;
+
+    @Autowired
+    private InsuranceDefinitionLimitService insuranceDefinitionLimitService;
+
+    @Autowired
+    private InsurancePolicyMemberService insurancePolicyMemberService;
+
+    @ApiOperation(value="pdf文档生成与下载")
+    @RequestMapping(value = "download",method = RequestMethod.GET)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="applicationId",value = "投保单ID",required = true,paramType = "query"),
+            @ApiImplicitParam(name="policyId",value = "每月投保单ID",required = true,paramType = "query")
+    })
+    public ResponseEntity download(String applicationId, String policyId){
+        String logoUrl = pdfConfig.getLogoUrl();
+        ResponseEntity entity = null;
+
+        try {
+            InsuranceApplication insuranceApplication = insuranceApplicationService.get(applicationId);
+            List<InsuranceDefinitionLimit> insuranceDefinitionLimitList = insuranceDefinitionLimitService.findByDefinitionId(insuranceApplication.getDefinitionId());
+
+            List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
+
+            for (InsuranceDefinitionLimit insuranceDefinitionLimit : insuranceDefinitionLimitList) {
+                Map<String, Object> map1 = new HashMap<String, Object>();
+                map1.put("id", insuranceDefinitionLimit.getId());
+                map1.put("name", insuranceDefinitionLimit.getName());
+                map1.put("limit", insuranceDefinitionLimit.getLimit());
+                map1.put("unit", insuranceDefinitionLimit.getUnit());
+                mapList.add(map1);
+            }
+
+            List<InsurancePolicyMember> list = insurancePolicyMemberService.findByPolicyId(policyId);
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+
+            //设置编码  为了解决中文名称乱码问题
+            String fileName = "投保单电子版.pdf";
+            String downloadFileName = new String(fileName.getBytes("UTF-8"), "iso-8859-1");
+
+            //将编码加到http头信息中
+            headers.setContentDispositionFormData("attachment", downloadFileName);
+
+            String folder=System.getProperty("java.io.tmpdir");
+
+            String filePath = folder + File.separator + DateTime.now().toString("yyyyMMddHHmmssSSS") + ".pdf";
+
+            ItextPDFUtil.createPdf(insuranceApplication, mapList, list, logoUrl,"C:\\Users\\Administrator\\Desktop\\投保单.pdf");
+
+            //pdf文档添加图片水印
+            Watermark.imageWatermark("C:\\Users\\Administrator\\Desktop\\投保单.pdf",filePath,pdfConfig.getImageWaterMarkUrl());
+
+            byte[] buffer = FileUtil.readBytes(filePath);
+
+            entity = new ResponseEntity<byte[]>(buffer, headers, HttpStatus.OK);
+        }
+        catch (Exception ex){
+            log.error(ex.getMessage(),ex);
+            entity = new ResponseEntity<String>(ex.getMessage(),HttpStatus.OK);
+        }
+
+        return entity;
+    }
+}

picc-admin-server/src/main/resources/application-dev.yml

@@ -10,4 +10,7 @@ spring:
 
 logger:
   level: WARN
-  dir: D:\\Logs\\picc\\picc-admin-server\\
+  dir: D:\\Logs\\picc\\picc-admin-server\\
+
+pdf:
+  logoUrl: C:\\picc\\logo.png

picc-admin-server/src/main/resources/application.yml

@@ -104,4 +104,5 @@ oss:
 
 pdf:
   logoUrl: C:/Users/Administrator/Desktop/picc/logo.png
+  imageWaterMarkUrl: C:/Users/Administrator/Desktop/picc/logo.png
   downloadFilePath: C:/Users/Administrator/Desktop/投保单.pdf

picc-common/src/main/java/com/jpsoft/picc/modules/business/entity/InsurancePolicy.java

@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
 
 import com.jpsoft.picc.modules.common.constant.PolicyStatus;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -357,7 +358,11 @@ public class InsurancePolicy {
      */
     public String getStatusN() {
         String statusN = "";
-        if(status.equals("10")){
+
+        if(StringUtils.isEmpty(status)){
+            statusN = "";
+        }
+        else if(status.equals("10")){
             statusN = PolicyStatus.Draft.getText();
         }
         else if(status.equals("15")){

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

@@ -13,5 +13,6 @@ import org.springframework.stereotype.Component;
 @Data
 public class PdfConfig {
     private String logoUrl;
-    private String downloadFilePath;
+    private String imageWaterMarkUrl;
+//    private String downloadFilePath;
 }

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

@@ -108,17 +108,13 @@ public class ItextPDFUtil {
      //   String filePath = "C:/Users/Administrator/Desktop/投保单.pdf";
         File file = new File(downloadFilePath);
 
-
-
-
-
         //创建文件
         Document document = new Document(PageSize.A4, 80, 80, 30, 20);
         //建立一个书写器
         PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
 
 
-        writer.setPageEvent(new Watermark("PICC"));
+    //    writer.setPageEvent(new Watermark("PICC"));
 
 
         // 页眉/页脚

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

@@ -1,13 +1,9 @@
 package com.jpsoft.picc.modules.common.utils;
 
-import com.itextpdf.text.Document;
-import com.itextpdf.text.Element;
-import com.itextpdf.text.Font;
-import com.itextpdf.text.Phrase;
-import com.itextpdf.text.pdf.ColumnText;
-import com.itextpdf.text.pdf.GrayColor;
-import com.itextpdf.text.pdf.PdfPageEventHelper;
-import com.itextpdf.text.pdf.PdfWriter;
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.*;
+
+import java.io.FileOutputStream;
 
 /**
  * @author 墨鱼_mo
@@ -17,6 +13,8 @@ import com.itextpdf.text.pdf.PdfWriter;
 public class Watermark extends PdfPageEventHelper {
 
 
+
+
     Font FONT = new Font(Font.FontFamily.HELVETICA, 30, Font.BOLD, new GrayColor(0.95f));
     private String waterCont;//水印内容
 
@@ -40,4 +38,59 @@ public class Watermark extends PdfPageEventHelper {
         }
     }
 
+
+
+
+    public static void imageWatermark(String inputPath, String outputPath,String images) throws Exception{
+
+        try{
+            PdfReader reader = new PdfReader(inputPath);
+            PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(outputPath));
+            PdfGState gs1 = new PdfGState();
+            gs1.setFillOpacity(0.1f);
+
+            Image image = Image.getInstance(images);
+            int n = reader.getNumberOfPages();
+            PdfContentByte under;
+            for (int i = 1; i <= n; i++) {
+                PdfContentByte pdfContentByte = stamper.getOverContent(i);
+                // 获得PDF最顶层
+                under = stamper.getOverContent(i);
+                pdfContentByte.setGState(gs1);
+
+                for (int y = 0; y < 8; y++) {
+                    for (int x = 0; x < 6; x++) {
+                        // 水印文字成45度角倾斜
+                        image.setRotation(30);// 旋转 弧度
+                        // 设置旋转角度
+                        image.setRotationDegrees(-45);// 旋转 角度
+                        // 设置等比缩放
+                        under.setColorFill(BaseColor.GRAY);
+                        image.scaleToFit(80,120);
+                        image.setRotation(45);
+                        image.setAbsolutePosition(70 + 140 * x, 125 * y);
+                        pdfContentByte.addImage(image);
+                    }
+                }
+            }
+            stamper.close();
+            reader.close();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+    public static void main(String[] args) {
+        try {
+            Watermark.imageWatermark("C:\\Users\\Administrator\\Desktop\\投保单.pdf","C:\\Users\\Administrator\\Desktop\\test.pdf","C:\\Users\\Administrator\\Desktop\\picc\\logo2.png");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.out.println("done");
+
+    }
 }
+
+
+

picc-common/src/main/resources/mapper/business/ApplicationPolicy.xml

@@ -97,9 +97,10 @@
 		order by b.create_time asc
 	</select>
     <select id="findPolicyByApplicationId" resultMap="com.jpsoft.picc.modules.business.dao.InsurancePolicyDAO.InsurancePolicyMap">
-		SELECT b.* FROM business_application_policy a,business_insurance_policy b
+		SELECT b.*,c.name_ as definition_name FROM business_application_policy a
+		inner join business_insurance_policy b on a.policy_id = b.id_
+		left join base_insurance_definition c on b.definition_id = c.id_
 		where a.application_id=#{0}
-		and a.policy_id = b.id_
 		and b.del_flag=0
 		order by b.create_time asc
 	</select>

picc-common/src/main/resources/mapper/business/InsurancePolicyMember.xml

@@ -112,9 +112,9 @@
 		where t1.del_flag=0 and t1.policy_id=#{policyId}
 		and t1.member_id=t2.id_ and t2.jobs_id = #{jobsId}
 	</select>
-	<select id="findByPolicyId" resultMap="InsurancePolicyMemberMap">
+	<select id="findByPolicyId" parameterType="string" resultMap="InsurancePolicyMemberMap">
 		select * from business_insurance_policy_member
-		where del_flag = false and policy_id=#{0}
+		where del_flag = false and policy_id=#{policyId}
 		order by create_time asc
 	</select>
 </mapper>

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

@@ -64,9 +64,14 @@ public class CompanyController {
             //todo
             AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
 
-            if (StringUtils.isEmpty(companyInfoDTO.getId())){
-                Company company = new Company();
+            Company company = null;
 
+            if (!StringUtils.isEmpty(companyInfoDTO.getId())){
+                company = companyService.get(companyInfoDTO.getId());
+            }
+
+            if (company==null) {
+                company = new Company();
                 PojoUtils.map(companyInfoDTO, company);
 
                 company.setId(UUID.randomUUID().toString());
@@ -79,7 +84,6 @@ public class CompanyController {
                 messageResult.setData(company.getId());
             }
             else {
-                Company company = companyService.get(companyInfoDTO.getId());
                 PojoUtils.map(companyInfoDTO, company);
                 company.setUpdateTime(new Date());
                 company.setUpdateBy(principal.getName());

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

@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.jasig.cas.client.authentication.AttributePrincipal;
 import org.joda.time.DateTime;
 import org.joda.time.Interval;
+import org.joda.time.Months;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
@@ -176,9 +177,8 @@ public class InsuranceApplicationController {
 
                 DateTime endTime = new DateTime(insuranceApplication.getEndTime());
                 DateTime startTime = new DateTime(insuranceApplication.getStartTime());
-                Interval interval = new Interval(startTime, endTime);
 
-                insuranceApplicationDTO.setMonthNumber(interval.toPeriod().getMonths());
+                insuranceApplicationDTO.setMonthNumber(Months.monthsBetween(startTime, endTime).getMonths());
             } else {
                 //先生成主键，便于参保人员关联
                 insuranceApplicationDTO.setApplicationId(UUID.randomUUID().toString());
@@ -271,10 +271,8 @@ public class InsuranceApplicationController {
             DateTime startTime = new DateTime(insuranceApplication.getStartTime());
             acceptInsuranceDTO.setStartTime(insuranceApplication.getStartTime());
 
-            Interval interval = new Interval(startTime, endTime);
-
             //投保总月份
-            int months = interval.toPeriod().getMonths();
+            int months = Months.monthsBetween(startTime, endTime).getMonths();
 
             BigDecimal totalAmount = new BigDecimal(0);
             int totalNumber = 0;
@@ -340,10 +338,8 @@ public class InsuranceApplicationController {
             DateTime endTime = new DateTime(insuranceApplication.getEndTime());
             DateTime startTime = new DateTime(insuranceApplication.getStartTime());
 
-            Interval interval = new Interval(startTime, endTime);
-
             //投保总月份
-            int months = interval.toPeriod().getMonths();
+            int months = Months.monthsBetween(startTime, endTime).getMonths();
 
             BigDecimal totalAmount = new BigDecimal(0);
             int totalNumber = 0;

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.jpsoft.picc.modules.auth.dto.AcceptInsuranceDTO;
 import com.jpsoft.picc.modules.auth.dto.InsuranceApplicationDTO;
 import com.jpsoft.picc.modules.auth.dto.InsuranceJobsDTO;
+import com.jpsoft.picc.modules.auth.dto.InsurancePolicyRecordDTO;
 import com.jpsoft.picc.modules.base.entity.*;
 import com.jpsoft.picc.modules.base.service.*;
 import com.jpsoft.picc.modules.business.entity.*;
@@ -13,6 +14,8 @@ import com.jpsoft.picc.modules.common.dto.MessageResult;
 import com.jpsoft.picc.modules.common.dto.Sort;
 import com.jpsoft.picc.modules.common.utils.PojoUtils;
 import com.jpsoft.picc.modules.common.utils.SignUtil;
+import com.jpsoft.picc.modules.sys.entity.User;
+import com.jpsoft.picc.modules.sys.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -73,6 +76,9 @@ public class InsurancePolicyController {
     @Autowired
     private JobsService jobsService;
 
+    @Autowired
+    private UserService userService;
+
     @ApiOperation(value="查看附件")
     @RequestMapping(value = "attachmentList",method = RequestMethod.POST)
     @ApiImplicitParams({
@@ -107,8 +113,8 @@ public class InsurancePolicyController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "policyId",value = "每月投保单ID", required = true, paramType = "form",dataType = "String")
     })
-    public MessageResult<InsurancePolicyRecord> backReason(@RequestParam(value="policyId",defaultValue="") String policyId){
-        MessageResult<InsurancePolicyRecord> msgResult = new MessageResult<>();
+    public MessageResult<InsurancePolicyRecordDTO> backReason(@RequestParam(value="policyId",defaultValue="") String policyId){
+        MessageResult<InsurancePolicyRecordDTO> msgResult = new MessageResult<>();
 
         Map<String,Object> searchParams = new HashMap<>();
         searchParams.put("policyId",policyId);
@@ -118,8 +124,19 @@ public class InsurancePolicyController {
 
         Page<InsurancePolicyRecord> page = insurancePolicyRecordService.pageSearch(searchParams,1,100,sortList);
         if(page.size() > 0){
+            InsurancePolicyRecordDTO insurancePolicyRecordDTO = new InsurancePolicyRecordDTO();
+            PojoUtils.map(page.getResult().get(0), insurancePolicyRecordDTO);
+
+//          Company company = companyService.get(insurancePolicyRecordDTO.getCreateBy());
+//          insurancePolicyRecordDTO.setCreateByName(company.getName());
+            User user = userService.get(insurancePolicyRecordDTO.getCreateBy());
+
+            if(user!=null){
+                insurancePolicyRecordDTO.setCreateByName(user.getRealName());
+            }
+
             msgResult.setResult(true);
-            msgResult.setData(page.getResult().get(0));
+            msgResult.setData(insurancePolicyRecordDTO);
         }else {
             msgResult.setResult(false);
             msgResult.setMessage("没有相关退回理由。");
@@ -483,7 +500,7 @@ public class InsurancePolicyController {
 
         PojoUtils.map(srcPolicy,destPolicy);
 
-        DateTime startTime = new DateTime(srcPolicy.getEndTime()).plusDays(1);
+        DateTime startTime = new DateTime(srcPolicy.getEndTime());
 
         destPolicy.setStartTime(startTime.toDate());
         destPolicy.setEndTime(startTime.plusMonths(1).toDate());

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

@@ -89,21 +89,29 @@ public class MessageController {
     @ApiOperation(value="未读消息数量")
     @GetMapping(value = "unReadCount")
     public MessageResult<Long> unReadCount(HttpServletRequest request){
+
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        Company company = companyService.findByCreateBy(principal.getName());
         MessageResult<Long> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
-        searchParams.put("recipientId",company.getId());
+        Company company = companyService.findByCreateBy(principal.getName());
 
-        List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
-        searchParams.put("status",false);
+        if(company!=null) {
+            Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("recipientId", company.getId());
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time", "desc"));
+            searchParams.put("status", false);
 
-        Page<Message> page = messageService.pageSearch(searchParams,1,1,sortList);
+            Page<Message> page = messageService.pageSearch(searchParams, 1, 1, sortList);
+
+            msgResult.setData(page.getTotal());
+        }
+        else{
+            msgResult.setData(0L);
+        }
 
         msgResult.setResult(true);
-        msgResult.setData(page.getTotal());
 
         return msgResult;
     }

picc-enterprise-server/src/main/java/com/jpsoft/picc/modules/auth/dto/InsurancePolicyRecordDTO.java

@@ -0,0 +1,31 @@
+package com.jpsoft.picc.modules.auth.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jpsoft.picc.modules.base.entity.InsuranceDefinitionLimit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "参保信息")
+public class InsurancePolicyRecordDTO {
+    private String id;
+    private String policyId;
+    private String opinion;
+    private String processStatus;
+    private Boolean delFlag;
+    private String createBy;
+    private String createByName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date createTime;
+    private String updateBy;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date updateTime;
+    @ApiModelProperty(value = "状态:待制单50/待出单60/已出单70")
+    private String status;
+}

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

@@ -51,6 +51,7 @@ public class UserController {
             String serviceTicketUrl = getTGT(casServerTicketUrl, userName, password, service);
 
             if (StringUtils.isEmpty(serviceTicketUrl)) {
+                msgResult.setMessage("用户名或密码错误!");
                 msgResult.setResult(false);
             } else {
                 Map<String, Object> dataMap = new HashMap<>();
@@ -86,7 +87,7 @@ public class UserController {
         }
         catch (Exception ex){
             msgResult.setResult(false);
-            msgResult.setMessage(ex.getMessage());
+            msgResult.setMessage( ex.getMessage());
         }
 
         return  msgResult;
@@ -144,10 +145,10 @@ public class UserController {
         DeleteMethod del = new DeleteMethod(casServerTicketUrl + "/" + tgt);
 
         try {
-            client.executeMethod(del);
-            String html = del.getResponseBodyAsString();
-
-            System.out.println(html);
+//            client.executeMethod(del);
+//            String html = del.getResponseBodyAsString();
+//
+//            System.out.println(html);
 
             msgResult.setResult(true);
         } catch (Exception e) {

picc-enterprise-server/src/main/resources/application-remote.yml

@@ -9,7 +9,7 @@ spring:
 
 logger:
   level: WARN
-  dir: C:\\picc\\logs\\picc-enterprise-server\\
+  dir: C:\\picc\\logs\\picc-enterprise-remote\\
 
 nginx:
   port: 7070

picc-enterprise-server/src/main/resources/application-test.yml

@@ -9,7 +9,7 @@ spring:
 
 logger:
   level: WARN
-  dir: C:\\picc\\logs\\picc-enterprise-test\\
+  dir: C:\\picc\\logs\\picc-enterprise-server\\
 
 nginx:
   port: 7070
@@ -21,6 +21,13 @@ cas:
   # 如果不设则无法获取用户扩展信息
   validation-type: cas
 
+jpcloud:
+  notifyBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-server/pay/orderNotifyBack
+  synchroBackUrl: http://gyxm.jing-zhou.gov.cn/picc-enterprise-server/pay/paySuccess
+  jpcloudUrl: http://gyxm.jing-zhou.gov.cn/jp-cloud-api/payment/tradingOrderPayPc
+  sellerSerialNumber: '000001000020'
+  platformCode: '0008'
+
 springfox:
   documentation:
     swagger: