diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 78747cd..ae37544 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import com.casic.missiles.modular.system.enums.MessageDict; +import com.casic.missiles.modular.system.enums.MessageEnum; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.service.VisitorApplyService; import com.casic.missiles.modular.system.utils.WXUserUtils; @@ -92,8 +93,9 @@ HashMap map = new HashMap<>(); map.put("touser",toUser); map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); + map.put("miniprogram_state","developer"); HashMap dataMap = new HashMap<>(); - String [] arr = {"11","22","33","44","55"}; + String[] arr = {MessageEnum.APPLY_PASSED.getValue(),"202212230001","张三","目的","2楼"}; String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 78747cd..ae37544 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import com.casic.missiles.modular.system.enums.MessageDict; +import com.casic.missiles.modular.system.enums.MessageEnum; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.service.VisitorApplyService; import com.casic.missiles.modular.system.utils.WXUserUtils; @@ -92,8 +93,9 @@ HashMap map = new HashMap<>(); map.put("touser",toUser); map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); + map.put("miniprogram_state","developer"); HashMap dataMap = new HashMap<>(); - String [] arr = {"11","22","33","44","55"}; + String[] arr = {MessageEnum.APPLY_PASSED.getValue(),"202212230001","张三","目的","2楼"}; String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); 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 new file mode 100644 index 0000000..39f2f04 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.system.enums; + +public enum MessageEnum { + + APPLY_SUBMITTED("1", "申请已提交"), + APPLY_PASSED("2", "申请通过"), + APPLY_FAILED("3", "申请不通过"); + + private String code; + private String value; + + MessageEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 78747cd..ae37544 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import com.casic.missiles.modular.system.enums.MessageDict; +import com.casic.missiles.modular.system.enums.MessageEnum; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.service.VisitorApplyService; import com.casic.missiles.modular.system.utils.WXUserUtils; @@ -92,8 +93,9 @@ HashMap map = new HashMap<>(); map.put("touser",toUser); map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); + map.put("miniprogram_state","developer"); HashMap dataMap = new HashMap<>(); - String [] arr = {"11","22","33","44","55"}; + String[] arr = {MessageEnum.APPLY_PASSED.getValue(),"202212230001","张三","目的","2楼"}; String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); 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 new file mode 100644 index 0000000..39f2f04 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.system.enums; + +public enum MessageEnum { + + APPLY_SUBMITTED("1", "申请已提交"), + APPLY_PASSED("2", "申请通过"), + APPLY_FAILED("3", "申请不通过"); + + private String code; + private String value; + + MessageEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 6af8dfb..fa73027 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -205,7 +205,7 @@ if(StringUtil.isEmpty(token)){ JSONObject accessToken = WXUserUtils.getAccessToken(); operations.set("AccessToken", accessToken.get("access_token")); - redisTemplate.expire("AccessToken", 90 , TimeUnit.MINUTES); + redisTemplate.expire("AccessToken", 60, TimeUnit.MINUTES); token = accessToken.get("access_token").toString(); } return token; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java index 78747cd..ae37544 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java @@ -5,6 +5,7 @@ import com.casic.missiles.modular.system.dto.VisitorApplyListRequest; import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest; import com.casic.missiles.modular.system.enums.MessageDict; +import com.casic.missiles.modular.system.enums.MessageEnum; import com.casic.missiles.modular.system.service.UserActionService; import com.casic.missiles.modular.system.service.VisitorApplyService; import com.casic.missiles.modular.system.utils.WXUserUtils; @@ -92,8 +93,9 @@ HashMap map = new HashMap<>(); map.put("touser",toUser); map.put("template_id",MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID); + map.put("miniprogram_state","developer"); HashMap dataMap = new HashMap<>(); - String [] arr = {"11","22","33","44","55"}; + String[] arr = {MessageEnum.APPLY_PASSED.getValue(),"202212230001","张三","目的","2楼"}; String [] mbarr = MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA; for (int i = 0; i< mbarr.length; i++) { HashMap valueMap = new HashMap<>(); 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 new file mode 100644 index 0000000..39f2f04 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/enums/MessageEnum.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.system.enums; + +public enum MessageEnum { + + APPLY_SUBMITTED("1", "申请已提交"), + APPLY_PASSED("2", "申请通过"), + APPLY_FAILED("3", "申请不通过"); + + private String code; + private String value; + + MessageEnum(String code, String value) { + this.code = code; + this.value = value; + } + + public String getCode() { + return code; + } + + public String getValue() { + return value; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java index 6af8dfb..fa73027 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/UserActionServiceImpl.java @@ -205,7 +205,7 @@ if(StringUtil.isEmpty(token)){ JSONObject accessToken = WXUserUtils.getAccessToken(); operations.set("AccessToken", accessToken.get("access_token")); - redisTemplate.expire("AccessToken", 90 , TimeUnit.MINUTES); + redisTemplate.expire("AccessToken", 60, TimeUnit.MINUTES); token = accessToken.get("access_token").toString(); } return token; 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 7bd9060..120b1af 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 @@ -10,6 +10,7 @@ import com.casic.missiles.modular.system.dao.VisitorApplyMapper; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.enums.MessageDict; +import com.casic.missiles.modular.system.enums.MessageEnum; import com.casic.missiles.modular.system.enums.Status; import com.casic.missiles.modular.system.enums.VisitorApplyStatusDict; import com.casic.missiles.modular.system.model.VisitorApply; @@ -66,12 +67,14 @@ visitorApply.setApplyNo(messageId); visitorApply.setVisitorApplyStatus(VisitorApplyStatusDict.APPLY_SUBMITTED); if(visitorApplyMapper.insert(visitorApply) > 0){ - /*List list = userActionMapper.getPropertyManager(); + String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); + List list = userActionMapper.getPropertyManager(); // 向物业管理员推送消息 for (String openid : list) { - String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); - 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.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()}; + JSONObject result = SendMassage(openid, MessageDict.APPLICANT_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.APPLICANT_MESSAGE_TEMPLATE_DATA); if(result.get("errcode").equals("0")){ insertMessageLog(messageId,"0",openid); }else{ @@ -79,7 +82,8 @@ } } // 向提报人推送消息 - sentMessage(visitorApply);*/ + String[] dataArr = {MessageEnum.APPLY_SUBMITTED.getValue(),visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; + sentMessage(visitorApply,dataArr); return ResponseData.success(); } return ResponseData.error("访客申请失败"); @@ -111,16 +115,19 @@ visitorApply.setId(Long.valueOf(id)); visitorApply.setVisitorApplyStatus(visitorApplyStatusRequest.getStatus()); if(visitorApplyMapper.updateById(visitorApply) > 0){ + String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); VisitorApply apply = visitorApplyMapper.selectById(visitorApplyStatusRequest.getId()); //申请通过 if(VisitorApplyStatusDict.APPLY_PASSED.equals(visitorApply.getVisitorApplyStatus())){ // 向申请人推送消息 - //sentMessage(apply); + String[] dataArr = {MessageEnum.APPLY_PASSED.getValue(),visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; + sentMessage(apply,dataArr); } //申请不通过 if(VisitorApplyStatusDict.APPLY_FAILED.equals(visitorApply.getVisitorApplyStatus())){ // 向申请人推送消息 - //sentMessage(apply); + String[] dataArr = {MessageEnum.APPLY_FAILED.getValue(),visitorApply.getApplyNo(),visitorApply.getVisitorName(),visitorApply.getVisitReason(),visitorApply.getVisitPosition()}; + sentMessage(apply,dataArr); } } } @@ -187,11 +194,10 @@ } } - private void sentMessage(VisitorApply visitorApply) { - String accTime = visitorApply.getInTime()+"-"+visitorApply.getOutTime(); + private void sentMessage(VisitorApply visitorApply,String[] dataArr) { String toUser = getToUser(visitorApply.getStaffCode()); - String[] dataArr = {visitorApply.getApplyNo(),visitorApply.getVisitorApplyStatus(),visitorApply.getStaffCode(),visitorApply.getStaffName(),accTime}; - JSONObject result = SendMassage(toUser, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_ID, dataArr, MessageDict.ADMINISTRATOR_MESSAGE_TEMPLATE_DATA); + //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")){ insertMessageLog(visitorApply.getApplyNo(),"0",toUser); }else{ @@ -201,8 +207,8 @@ public JSONObject SendMassage(String toUser,String templateId,String[] dataArr,String[] templateArr) { HashMap map = new HashMap<>(); - map.put("toUser",toUser); - map.put("templateId",templateId); + map.put("touser",toUser); + map.put("template_id",templateId); HashMap dataMap = new HashMap<>(); for (int i = 0; i< templateArr.length; i++) { HashMap valueMap = new HashMap<>();