diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java index 39f2f04..f61a602 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -2,6 +2,7 @@ public enum MessageEnum { + TEST_MESSAGE("0", "访客申请"), APPLY_SUBMITTED("1", "申请已提交"), APPLY_PASSED("2", "申请通过"), APPLY_FAILED("3", "申请不通过"); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java index 39f2f04..f61a602 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -2,6 +2,7 @@ public enum MessageEnum { + TEST_MESSAGE("0", "访客申请"), APPLY_SUBMITTED("1", "申请已提交"), APPLY_PASSED("2", "申请通过"), APPLY_FAILED("3", "申请不通过"); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 120b1af..4495157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -53,9 +53,9 @@ @Override public Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request) { JSONObject jsonObject = userActionService.getLoginStatus(request); - if(null == jsonObject){ - return ResponseData.error(2401,Status.TOKEN_EXPIRES); - } +// if(null == jsonObject){ +// return ResponseData.error(2401,Status.TOKEN_EXPIRES); +// } VisitorApply visitorApply = new VisitorApply(); UserDto userDto = new UserDto(); BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); @@ -73,9 +73,9 @@ for (String openid : list) { //String[] dataArr = {visitorApply.getApplyNo(),visitorApply.getStaffCode(),visitorApply.getStaffName(),accTime}; //JSONObject result = SendMassage(openid, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); - String[] dataArr = {"测试消息推送",visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; + String[] dataArr = {MessageEnum.TEST_MESSAGE.getValue(),visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; JSONObject result = SendMassage(openid, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); - if(result.get("errcode").equals("0")){ + if(result.get("errmsg").equals("ok")){ insertMessageLog(messageId,"0",openid); }else{ insertMessageLog(messageId,"1",openid); @@ -198,7 +198,7 @@ String toUser = getToUser(visitorApply.getStaffCode()); //JSONObject result = SendMassage(toUser, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); JSONObject result = SendMassage(toUser, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); - if(result.get("errcode").equals("0")){ + if(result.get("errmsg").equals("ok")){ insertMessageLog(visitorApply.getApplyNo(),"0",toUser); }else{ insertMessageLog(visitorApply.getApplyNo(),"1",toUser); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java index 39f2f04..f61a602 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -2,6 +2,7 @@ public enum MessageEnum { + TEST_MESSAGE("0", "访客申请"), APPLY_SUBMITTED("1", "申请已提交"), APPLY_PASSED("2", "申请通过"), APPLY_FAILED("3", "申请不通过"); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 120b1af..4495157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -53,9 +53,9 @@ @Override public Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request) { JSONObject jsonObject = userActionService.getLoginStatus(request); - if(null == jsonObject){ - return ResponseData.error(2401,Status.TOKEN_EXPIRES); - } +// if(null == jsonObject){ +// return ResponseData.error(2401,Status.TOKEN_EXPIRES); +// } VisitorApply visitorApply = new VisitorApply(); UserDto userDto = new UserDto(); BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); @@ -73,9 +73,9 @@ for (String openid : list) { //String[] dataArr = {visitorApply.getApplyNo(),visitorApply.getStaffCode(),visitorApply.getStaffName(),accTime}; //JSONObject result = SendMassage(openid, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); - String[] dataArr = {"测试消息推送",visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; + String[] dataArr = {MessageEnum.TEST_MESSAGE.getValue(),visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; JSONObject result = SendMassage(openid, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); - if(result.get("errcode").equals("0")){ + if(result.get("errmsg").equals("ok")){ insertMessageLog(messageId,"0",openid); }else{ insertMessageLog(messageId,"1",openid); @@ -198,7 +198,7 @@ String toUser = getToUser(visitorApply.getStaffCode()); //JSONObject result = SendMassage(toUser, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); JSONObject result = SendMassage(toUser, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); - if(result.get("errcode").equals("0")){ + if(result.get("errmsg").equals("ok")){ insertMessageLog(visitorApply.getApplyNo(),"0",toUser); }else{ insertMessageLog(visitorApply.getApplyNo(),"1",toUser); diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index b5b1bc7..d15d637 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -43,8 +43,8 @@ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S')) - INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`) - VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S')) + INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`,`OPEN_ID`) + VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'),#{message.openId}) UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java index 39f2f04..f61a602 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -2,6 +2,7 @@ public enum MessageEnum { + TEST_MESSAGE("0", "访客申请"), APPLY_SUBMITTED("1", "申请已提交"), APPLY_PASSED("2", "申请通过"), APPLY_FAILED("3", "申请不通过"); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java index 120b1af..4495157 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java @@ -53,9 +53,9 @@ @Override public Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request) { JSONObject jsonObject = userActionService.getLoginStatus(request); - if(null == jsonObject){ - return ResponseData.error(2401,Status.TOKEN_EXPIRES); - } +// if(null == jsonObject){ +// return ResponseData.error(2401,Status.TOKEN_EXPIRES); +// } VisitorApply visitorApply = new VisitorApply(); UserDto userDto = new UserDto(); BeanUtils.copyProperties(visitorApplyAddRequest, visitorApply); @@ -73,9 +73,9 @@ for (String openid : list) { //String[] dataArr = {visitorApply.getApplyNo(),visitorApply.getStaffCode(),visitorApply.getStaffName(),accTime}; //JSONObject result = SendMassage(openid, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); - String[] dataArr = {"测试消息推送",visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; + String[] dataArr = {MessageEnum.TEST_MESSAGE.getValue(),visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; JSONObject result = SendMassage(openid, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); - if(result.get("errcode").equals("0")){ + if(result.get("errmsg").equals("ok")){ insertMessageLog(messageId,"0",openid); }else{ insertMessageLog(messageId,"1",openid); @@ -198,7 +198,7 @@ String toUser = getToUser(visitorApply.getStaffCode()); //JSONObject result = SendMassage(toUser, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); JSONObject result = SendMassage(toUser, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); - if(result.get("errcode").equals("0")){ + if(result.get("errmsg").equals("ok")){ insertMessageLog(visitorApply.getApplyNo(),"0",toUser); }else{ insertMessageLog(visitorApply.getApplyNo(),"1",toUser); diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml index b5b1bc7..d15d637 100644 --- a/casic-web/src/main/resources/mapper/UserActionMapper.xml +++ b/casic-web/src/main/resources/mapper/UserActionMapper.xml @@ -43,8 +43,8 @@ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S')) - INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`) - VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S')) + INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`,`OPEN_ID`) + VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'),#{message.openId}) UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid} diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml index 1189202..c9ea512 100644 --- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml +++ b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml @@ -36,7 +36,7 @@ LEFT JOIN bus_visit_apply t2 ON t1.message_id = t2.apply_no WHERE 1 = 1 - AND t1.`status` = '0' and t1.open_id = #{openid} + AND t1.open_id = #{openid} ORDER BY t1.create_time desc