Merge remote-tracking branch 'origin/master'

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

@@ -271,4 +271,24 @@ public class MessageController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="获取是否有未读消息和消息条数")
+    @PostMapping("getMessageCount")
+    public MessageResult<Integer> getMessageCount(@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            //查询未读消息
+            List<Message> messageList = messageService.findNewByRecipientId(subject,"0");
+            msgResult.setData(messageList.size());
+            msgResult.setResult(true);
+        }
+        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/sys/controller/UserController.java

@@ -279,6 +279,94 @@ public class UserController {
 
         msgResult.setData(PojoUtils.pageWrapper(page));
 
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="修改密码")
+    @PostMapping("changePassword")
+    public MessageResult<Integer> changePassword(String oldPwd,String newPwd,@RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+
+            User user = userService.get(subject);
+
+            String curPwd = user.getPassword();
+
+            DES3 des3 = new DES3();
+
+            String oldPwdDes3 = des3.encrypt(jwtSecret, oldPwd);
+
+            if(curPwd.equals(oldPwdDes3)){
+                user.setPassword(des3.encrypt(jwtSecret, newPwd));
+                user.setUpdateBy(subject);
+                user.setUpdateTime(new Date());
+                int affectCount = userService.update(user);
+
+                if(affectCount>0){
+                    msgResult.setResult(true);
+                    msgResult.setData(affectCount);
+                }
+                else{
+                    msgResult.setResult(false);
+                    msgResult.setMessage("数据库更新失败！");
+                }
+            }
+            else{
+                msgResult.setResult(false);
+                msgResult.setMessage("原密码错误！");
+            }
+
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+
+
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value="修改用户密码")
+    @PostMapping("changeUserPassword")
+    public MessageResult<Integer> changeUserPassword(String userId,String newPwd,@RequestAttribute String subject) {
+
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+
+            User user = userService.get(userId);
+
+            DES3 des3 = new DES3();
+
+            user.setPassword(des3.encrypt(jwtSecret, newPwd));
+            user.setUpdateBy(subject);
+            user.setUpdateTime(new Date());
+
+            int affectCount = userService.update(user);
+
+            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-common/src/main/java/com/jpsoft/picc/modules/base/dao/MessageDAO.java

@@ -15,5 +15,6 @@ public interface MessageDAO {
 	int delete(String id);
 	List<Message> list();
 	List<Message> findByRecipientId(String recipientId);
+	List<Message> findNewByRecipientId(String recipientId,String status);
 	List<Message> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/MessageService.java

@@ -14,5 +14,6 @@ public interface MessageService {
 	int delete(String id);
 	List<Message> list();
 	List<Message> findByRecipientId(String recipientId);
+	List<Message> findNewByRecipientId(String recipientId,String status);
 	Page<Message> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, List<Sort> sortList);
 }

picc-common/src/main/java/com/jpsoft/picc/modules/base/service/impl/MessageServiceImpl.java

@@ -63,6 +63,11 @@ public class MessageServiceImpl implements MessageService {
 	public List<Message> findByRecipientId(String recipientId){
 		return messageDAO.findByRecipientId(recipientId);
 	}
+
+	@Override
+	public List<Message> findNewByRecipientId(String recipientId,String status){
+		return messageDAO.findNewByRecipientId(recipientId,status);
+	}
 		
 	@Override
 	public Page<Message> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,List<Sort> sortList) {

picc-common/src/main/resources/mapper/base/Message.xml

@@ -93,6 +93,9 @@ id_,title_,content_,sender_id,recipient_id,status_,create_by,create_time,update_
 	<select id="findByRecipientId" parameterType="string" resultMap="MessageMap">
 		select * from base_message where recipient_id=#{0} and del_flag=false
 	</select>
+	<select id="findNewByRecipientId" parameterType="string" resultMap="MessageMap">
+		select * from base_message where recipient_id=#{recipientId} and status_=#{status} and del_flag=false
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="MessageMap">
 		<![CDATA[
 			select * from base_message

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

@@ -99,6 +99,9 @@
 			<if test="searchParams.policyId != null">
 				and policy_id=#{searchParams.policyId}
 			</if>
+			<if test="searchParams.memberId != null">
+				and member_id=#{searchParams.memberId}
+			</if>
 			<if test="searchParams.jobsId != null">
 				and jobs_id=#{searchParams.jobsId}
 			</if>

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

@@ -361,6 +361,7 @@ public class CompanyMemberController {
 
             int affectCount = 0;
             int existCount = 0;
+            List<String> existName = new ArrayList<>();
             for(Object[] array : list){
                 String name = array[1].toString();
                 String cardType = array[2].toString();
@@ -378,6 +379,7 @@ public class CompanyMemberController {
 
                 if(page.size() > 0) {
                     existCount++;
+                    existName.add(page.get(0).getName());
                 }else {
                     companyMember.setId(UUID.randomUUID().toString());
                     if (StringUtils.isNotEmpty(company.getId())) companyMember.setCompanyId(company.getId());
@@ -407,10 +409,15 @@ public class CompanyMemberController {
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData("有" + existCount + "条记录已存在，成功导入" + affectCount + "条记录。");
+                if(existCount > 0) {
+                    msgResult.setData("您有<" + existCount + ">条数据未导入成功，错误数据姓名为<" + String.join(",", existName) + ">，失败原因为<数据重复>。");
+                    msgResult.setMessage("您有<" + existCount + ">条数据未导入成功，错误数据姓名为<" + String.join(",", existName) + ">，失败原因为<数据重复>。");
+                }else{
+                    msgResult.setMessage("数据导入成功。");
+                }
             } else {
                 msgResult.setResult(false);
-                msgResult.setMessage("数据库添加失败");
+                msgResult.setMessage("数据导入失败。");
             }
         }
         catch(Exception ex){

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

@@ -296,7 +296,12 @@ public class InsurancePolicyUserController {
             list.remove(0);
 
             int affectCount = 0;
+            int existCount = 0;
             for(Object[] array : list){
+                if(StringUtils.isEmpty(array[1].toString())){
+                    continue;
+                }
+
                 String name = array[1].toString();
                 String cardType = array[2].toString();
                 String cardNo = array[3].toString();
@@ -306,6 +311,7 @@ public class InsurancePolicyUserController {
                 String healthStatus = array[7].toString();
 
                 Map<String,Object> searchParams = new HashMap<>();
+                searchParams.put("delFlag",false);
                 searchParams.put("companyId",company.getId());
                 searchParams.put("cardNo",cardNo);
                 List<Sort> sortList = new ArrayList<>();
@@ -333,25 +339,33 @@ public class InsurancePolicyUserController {
                     companyMember.setCreateBy(principal.getName());
                     companyMember.setCreateTime(new Date());
                     companyMemberService.insert(companyMember);
+                    existCount++;
                 }
 
-                InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
-                insurancePolicyMember.setId(UUID.randomUUID().toString());
-                if(StringUtils.isNotEmpty(policyId)) insurancePolicyMember.setPolicyId(policyId);
-                insurancePolicyMember.setMemberId(companyMember.getId());
-                insurancePolicyMember.setStatus("0");
-                insurancePolicyMember.setDelFlag(false);
-                insurancePolicyMember.setCreateBy(principal.getName());
-                insurancePolicyMember.setCreateTime(new Date());
-
-                if(insurancePolicyMemberService.insert(insurancePolicyMember) > 0){
-                    affectCount++;
+                Map<String,Object> searchParams1 = new HashMap<>();
+                searchParams1.put("policyId",policyId);
+                searchParams1.put("memberId",companyMember.getId());
+                List<Sort> sortList1 = new ArrayList<>();
+                Page<InsurancePolicyMember> page1 = insurancePolicyMemberService.pageSearch(searchParams1,1,100,sortList1);
+                if(page1.size() <= 0) {
+                    InsurancePolicyMember insurancePolicyMember = new InsurancePolicyMember();
+                    insurancePolicyMember.setId(UUID.randomUUID().toString());
+                    if (StringUtils.isNotEmpty(policyId)) insurancePolicyMember.setPolicyId(policyId);
+                    insurancePolicyMember.setMemberId(companyMember.getId());
+                    insurancePolicyMember.setStatus("0");
+                    insurancePolicyMember.setDelFlag(false);
+                    insurancePolicyMember.setCreateBy(principal.getName());
+                    insurancePolicyMember.setCreateTime(new Date());
+
+                    if (insurancePolicyMemberService.insert(insurancePolicyMember) > 0) {
+                        affectCount++;
+                    }
                 }
             }
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
-                msgResult.setData("成功导入" + affectCount + "条记录。");
+                msgResult.setData("成功导入" + affectCount + "人，其中" + existCount + "人是新人，需在企业人员中完善信息。");
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");