Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/MessageController.java

@@ -38,7 +38,6 @@ public class MessageController extends BaseController {
 	@RequestMapping(value = "/message/{communityId}/total",method = RequestMethod.GET)
 	public ResponseBean getMessageTotal(@PathVariable Integer communityId, HttpSession session){
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
 
 		if (!check(communityId)) {
@@ -46,7 +45,7 @@ public class MessageController extends BaseController {
 			return responseBean;
 		}
 
-		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userId);
+		Map<String,Object> totalMap = messageService.getMessageTotal(communityId, userElement.getUserVerifyId());
 		responseBean.addSuccess(totalMap);
 		return responseBean;
 	}
@@ -61,13 +60,12 @@ public class MessageController extends BaseController {
 	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 	                            @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpSession session){
 		UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-		Integer userId = userElement.getId();
 		ResponseBean responseBean = new ResponseBean();
 		if (!check(communityId)) {
 			responseBean.addError("小区不存在");
 			return responseBean;
 		}
-		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userId);
+		Map<String,Object> map = messageService.getMessages(communityId,pageNum,pageSize, Constant.MODEL_TYPE_NEWS, userElement.getUserVerifyId());
 		responseBean.addSuccess(map);
 		return responseBean;
 	}

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -215,7 +215,7 @@ public class TicketController extends BaseController {
     @RequestMapping(value = "/addRecordComment", method = RequestMethod.POST)
     public ResponseBean addRecordComment(@RequestBody String parameter, HttpSession session){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        ResponseBean  responseBean = iTicketService.addRecordComment(parameter,userElement.getId(),userElement.getCommunityId(),userElement.getUserName());
+        ResponseBean  responseBean = iTicketService.addRecordComment(parameter,userElement.getUserVerifyId(),userElement.getCommunityId(),userElement.getUserName());
         return responseBean;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java

@@ -31,7 +31,7 @@ public interface ITicketService {
      * @param pageSize
      * @return 返回 维修/投诉/联系单 记录列表
      */
-    ResponseBean getByTypeList(TpTicket tpTicket,Integer pageNum, Integer pageSize);
+    ResponseBean getByTypeList(TpTicket tpTicket, Integer pageNum, Integer pageSize);
 	
 	/**
 	 * 获取报修详情
@@ -77,10 +77,10 @@ public interface ITicketService {
 	/**
 	 * 添加工单对话
 	 * @param parameter
-	 * @param id
+	 * @param verifyId
 	 * @param communityId
 	 * @param userName
 	 * @return
 	 */
-	ResponseBean addRecordComment(String parameter, Integer id, Integer communityId, String userName);
+	ResponseBean addRecordComment(String parameter, Integer verifyId, Integer communityId, String userName);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/MessageServiceI.java

@@ -11,7 +11,7 @@ public interface MessageServiceI {
 	 * @param communityId
 	 * @return
 	 */
-	Map<String, Object> getMessageTotal(Integer communityId, Integer userId);
+	Map<String, Object> getMessageTotal(Integer communityId, Integer verifyId);
 	
 	/**
 	 * 分页获取消息或待办
@@ -21,7 +21,7 @@ public interface MessageServiceI {
 	 * @param modelType
 	 * @return
 	 */
-	Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId);
+	Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer verifyId);
 
 	/**
 	 * 全部已读

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MessageServiceImpl.java

@@ -39,8 +39,8 @@ public class MessageServiceImpl implements MessageServiceI {
 	 * @return
 	 */
 	@Override
-	public Map<String, Object> getMessageTotal(Integer communityId, Integer userId) {
-		return tpMessageMapper.getMessageTotal(userId,communityId);
+	public Map<String, Object> getMessageTotal(Integer communityId, Integer verifyId) {
+		return tpMessageMapper.getMessageTotal(verifyId,communityId);
 	}
 	
 	/**
@@ -52,11 +52,11 @@ public class MessageServiceImpl implements MessageServiceI {
 	 * @return
 	 */
 	@Override
-	public Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer userId) {
+	public Map<String,Object> getMessages(Integer communityId, Integer pageNum, Integer pageSize,Integer modelType, Integer verifyId) {
 		//使用分页插件
 		Page page = PageHelper.startPage(pageNum, pageSize);
 		// 获取数据
-		List<TpMessage> messageList = tpMessageMapper.getMessages(userId,communityId, modelType);
+		List<TpMessage> messageList = tpMessageMapper.getMessages(verifyId,communityId, modelType);
 		messageList.stream().forEach(tpMessage -> {
 			//缴费相关信息
 			//if (tpMessage.getMessageType().equals(Constant.MESSAGE_TYPE_BILL)){
@@ -127,7 +127,7 @@ public class MessageServiceImpl implements MessageServiceI {
 		}
 		tpMessage.setReadStatus("1");
 		tpMessage.setUpdateDate(new Date());
-		tpMessage.setUpdateUser(userElement.getId());
+		tpMessage.setUpdateUser(userElement.getUserVerifyId());
 		int row = tpMessageMapper.updateByPrimaryKeySelective(tpMessage);
 		if (row > 0) {
 			responseBean.addSuccess("操作成功!");

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServicelmpl.java

@@ -287,7 +287,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
                 message.setMessageType("9");
                 message.setAdviceType("1");
                 message.setModelType("1");
-                message.setUuid(userElement.getId());
+                message.setUuid(userElement.getUserVerifyId());
                 message.setUuidType("1");
                 message.setSource("1");
                 message.setMessageContent(count);

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java

@@ -278,10 +278,12 @@ public class TicketServiceImpl implements ITicketService {
          */
 
         tpTicket.setCommunityId(userElement.getCommunityId());
-        tpTicket.setTaUserId(userElement.getId());
+        // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
+        tpTicket.setTaUserId(userElement.getUserVerifyId());
         // 默认待分配
         tpTicket.setStatus("0");
-        tpTicket.setCreateUser(userElement.getId());
+        // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
+        tpTicket.setCreateUser(userElement.getUserVerifyId());
         tpTicket.setCreateDate(new Date());
         tpTicket.setUpdateUser(userElement.getId());
 //        tpTicket.setUpdateDate(new Date());
@@ -331,7 +333,8 @@ public class TicketServiceImpl implements ITicketService {
              message.setMessageContent(userName+ taUser.getUserName()+"发起了一个工单“"+tpTicket.getTicketTitle()+"”，点击受理分配给合适的人处理");
              message.setStatus("1");
              message.setReadStatus("0");
-             message.setCreateUser(userElement.getId());
+             // 以房产ID为中心
+             message.setCreateUser(userElement.getUserVerifyId());
              message.setCreateDate(new Date());
              tpMessageMapper.insert(message);
          }
@@ -523,7 +526,7 @@ public class TicketServiceImpl implements ITicketService {
 
     }
     @Override
-    public ResponseBean addRecordComment(String parameter, Integer id,Integer communityId,String userName) {
+    public ResponseBean addRecordComment(String parameter, Integer verifyId,Integer communityId,String userName) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
 
@@ -538,7 +541,7 @@ public class TicketServiceImpl implements ITicketService {
         tpTicketRecordComment.setContent(content);
         tpTicketRecordComment.setTicketId(ticketId);
         tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
-        tpTicketRecordComment.setUuid(id);
+        tpTicketRecordComment.setUuid(verifyId);
         tpTicketRecordComment.setUserType("1");
         tpTicketRecordComment.setUserName(userName);
         tpTicketRecordComment.setCreateDate(new Date());
@@ -554,7 +557,7 @@ public class TicketServiceImpl implements ITicketService {
                 tdImages.setType("reply");
                 tdImages.setUuid(tpTicketRecordComment.getId());
                 tdImages.setCreateTime(new Date());
-                tdImages.setCreateUser(id);
+                tdImages.setCreateUser(verifyId);
                 tdImagesMapper.insert(tdImages);
             }
         }
@@ -579,7 +582,7 @@ public class TicketServiceImpl implements ITicketService {
         message.setMessageContent("工单“"+ tpTicket.getTicketTitle()+"”发起人发来消息："+content+"，点击查看并处理");
         message.setStatus("1");
         message.setReadStatus("0");
-        message.setCreateUser(id);
+        message.setCreateUser(verifyId);
         message.setCreateDate(new Date());
         tpMessageMapper.insert(message);
         response.addSuccess("成功");

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -52,7 +52,7 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
      */
     List<TaUser> selectUser(@Param("id")Integer userId);
     /**
-     * 根据工单创建人和小区，查询到工单创建人名字
+     * 查询到工单创建人名字
      */
-    String selectLongNameAndcommunityId(@Param("createUser")Integer createUser,@Param("communityId")Integer communityId);
+    String selectLongNameAndcommunityId(@Param("createUser")Integer createUser);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -315,7 +315,7 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
-            message.setUuid(user.getId());
+            message.setUuid(taUserVerify.getId());
             message.setUuidType("1");
             message.setSource("1");
             message.setMessageContent(count);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -138,7 +138,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
-            message.setUuid(userVerify.getUserId());
+            message.setUuid(userVerify.getId());
             message.setUuidType("1");
             message.setSource("1");
             message.setMessageContent(count);
@@ -278,7 +278,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             message.setMessageType("9");
             message.setAdviceType("1");
             message.setModelType("1");
-            message.setUuid(userVerify.getUserId());
+            message.setUuid(userVerify.getId());
             message.setUuidType("1");
             message.setSource("1");
             message.setMessageContent(count);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -53,6 +53,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     @Autowired
     private MessageMapper messageMapper;
 
+    @Autowired
+    private TaUserVerifyMapper taUserVerifyMapper;
+
     @Override
     public ResponseBean ticketLiset(String parameter,Integer communityId) {
          ResponseBean response= new ResponseBean<>();
@@ -80,7 +83,9 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             tpTicketVO.setTpUserNmae(userName);
 
             /*查询当前工单创建人*/
-            String createUserNmae=taUserMapper.selectLongNameAndcommunityId(tpTicket.getCreateUser(),communityId);
+            TaUserVerify taUserVerify= taUserVerifyMapper.selectById(tpTicket.getCreateUser());
+
+            String createUserNmae=taUserMapper.selectLongNameAndcommunityId(taUserVerify.getUserId());
             tpTicketVO.setCreateUserNmae(createUserNmae);
             tpTicketArrayList.add(tpTicketVO);
         }
@@ -99,12 +104,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         JSONObject object= JSONObject.parseObject(parameter);
         Integer ticketId = object.getInteger("id");
         TpTicketVO ticketVO= tpTicketMapper.ticketDetails(ticketId);
-        /*查询当前工单创建人（发起人）*/
-        ticketVO.setCreateUserNmae(taUserMapper.selectLongNameAndcommunityId(ticketVO.getCreateUser(),communityId));
+        // 从taUserVerify里面获取userID
+        TaUserVerify taUserVerify= taUserVerifyMapper.selectById(ticketVO.getCreateUser());
+        TaUser taUser= taUserMapper.selectById(taUserVerify.getUserId());
+        /*发起人*/
+        ticketVO.setCreateUserNmae(taUser.getUserName());
         /*发起人手机号码*/
-        ticketVO.setLoginName( taUserMapper.selectById(ticketVO.getCreateUser()).getLoginName());
-
-          /*查询当前受理人*/
+        ticketVO.setLoginName(taUser.getLoginName());
+        /*查询当前受理人*/
         ticketVO.setTpUserNmae(userMapper.selectByIdUserName(ticketVO.getTpUserId()));
         /*所有物业端本小区的人员*/
         ticketVO.setUserList(userMapper.getUser( userID,communityId));

CODE/smart-community/property-api/src/main/resources/application.yml

@@ -14,4 +14,4 @@ mybatis-plus:
 
 # 二维码生成地址
 qr-code:
-  url: http://ycapi.jcjyhn.com/#/forum/sign?id=
+  url: http://106.14.20.193:8011/#/forum/sign?id=

CODE/smart-community/property-api/src/main/resources/mapper/TaUserMapper.xml

@@ -73,7 +73,7 @@
     select
     user_name
     from ta_user
-    where id=#{createUser,jdbcType=VARCHAR} and community_id=#{communityId,jdbcType=INTEGER};
+    where id=#{createUser,jdbcType=VARCHAR}
   </select>
 
 </mapper>