project-admin/src/main/java/com/project/admin/controller/enforce/EnforceOrderController.java
@@ -64,6 +64,24 @@ return AjaxResult.success(list); } @ApiOperation("列表——无特殊查询") @GetMapping("/commonList") public TableDataInfo commonList(EnforceOrderQueryBo bo) { startPage(); List<EnforceOrderVo> list = iEnforceOrderService.queryCommonList(bo); return getDataTable(list); } @ApiOperation("列表——企业执法记录") @GetMapping("/companyList") public TableDataInfo companyList(EnforceOrderQueryBo bo) { startPage(); List<EnforceOrderVo> list = iEnforceOrderService.queryCompanyList(bo); return getDataTable(list); } @ApiOperation("列表——执法申请单") @GetMapping("/list") public TableDataInfo list(EnforceOrderQueryBo bo) project-admin/src/main/java/com/project/admin/controller/system/SysLoginController.java
@@ -53,7 +53,7 @@ @RepeatSubmit public AjaxResult getVerifyCode(@RequestParam("phone") String phone) { return AjaxResult.success(loginService.getVerifyCode(phone)); return AjaxResult.success(loginService.getVerifyCode(phone)?"发送成功":"发送失败"); } @ApiOperation("新注册获取验证码") @@ -61,7 +61,7 @@ @RepeatSubmit public AjaxResult getVerifyCodeNew(@RequestParam("phone") String phone) { return AjaxResult.success(loginService.getVerifyCodeNew(phone)); return AjaxResult.success(loginService.getVerifyCodeNew(phone)?"发送成功":"发送失败"); } @ApiOperation("校验验证码") project-enforce/src/main/java/com/project/enforce/service/IEnforceOrderService.java
@@ -21,6 +21,11 @@ public interface IEnforceOrderService extends IBaseService<EnforceOrder> { /** * 企业执法记录列表 */ List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo); /** * 查询列表 */ List<EnforceOrderVo> queryList(EnforceOrderQueryBo bo); @@ -130,4 +135,11 @@ * @return 节点 */ List<OrderNodeVo> orderComplaintNodeList(Long orderId); /** * 通用列表无权限 * @param bo 参数 * @return 列表 */ List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo); } project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java
@@ -8,13 +8,15 @@ import com.project.common.core.domain.entity.SysUser; import com.project.common.enums.OrderPre; import com.project.common.exception.base.BaseException; import com.project.common.sms.YPSmsApi; import com.project.common.utils.DateUtils; import com.project.common.utils.JsonUtils; import com.project.common.utils.SecurityUtils; import com.project.common.utils.StringUtils; import com.project.enforce.domain.*; import com.project.enforce.domain.bo.editBo.*; import com.project.enforce.domain.bo.editBo.EnforceComplaintLogBo; import com.project.enforce.domain.bo.editBo.EnforceOrderBo; import com.project.enforce.domain.bo.editBo.OrderComplaintBo; import com.project.enforce.domain.bo.editBo.OrderResultBo; import com.project.enforce.domain.bo.queryBo.EnforceOrderQueryBo; import com.project.enforce.domain.bo.queryBo.OrderCheckedQueryBo; import com.project.enforce.domain.vo.EnforceEvaluateVo; @@ -27,7 +29,6 @@ import com.project.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -51,6 +52,24 @@ private final IEnforceCheckLogService checkLogService; private final IEnforceComplaintLogService complaintLogService; private final IEnforceEvaluateLogService evaluateLogService; private final YPSmsService smsService; @Override//通用列表 public List<EnforceOrderVo> queryCommonList(EnforceOrderQueryBo bo) { QueryWrapper<EnforceOrder> qw = getQw(bo); List<EnforceOrder> list = this.list(qw); return Convert.toList(EnforceOrderVo.class , list); } @Override//企业列表 public List<EnforceOrderVo> queryCompanyList(EnforceOrderQueryBo bo) { QueryWrapper<EnforceOrder> qw = getQw(bo); qw.ge("order_status",2); List<EnforceOrder> list = this.list(qw); return Convert.toList(EnforceOrderVo.class , list); } @Override//列表查询 @DataScope(deptAlias = "apply_dept_id", userAlias = "apply_id") @@ -156,7 +175,7 @@ } boolean savePeers = peerService.saveOrUpdateBatch(bo.getPeers()); if (savePeers && StringUtils.isNotEmpty(phones)) { sendApplyMsg(phones, add.getApplyUser()); smsService.sendApplyMsg(phones, add.getApplyUser()); } return savePeers; } @@ -301,20 +320,10 @@ } //------------------------------------------------------------------------------------- /** * 发送审批短信 * @param phones 手机号 * @param applyUser 申请人 */ @Async public void sendApplyMsg(List<String> phones, String applyUser) { String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser)); phones.forEach(phone-> YPSmsApi.sendSms(phone, applyMsg)); } //保存前校验 private void validEntityBeforeSave(EnforceOrder entity) project-enforce/src/main/java/com/project/enforce/service/impl/YPSmsService.java
@@ -1,8 +1,9 @@ package com.project.enforce.service.impl; import com.project.common.sms.YPSmsApi; import com.project.common.utils.DateUtils; import com.project.common.utils.StringUtils; import com.project.system.sms.YPSmsApi; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -17,8 +18,10 @@ */ @Service @RequiredArgsConstructor public class YPSmsService { private final YPSmsApi smsApi; /** * 申请发送审批短信 * @param phones 手机号 @@ -29,7 +32,7 @@ { String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.APPLY_TMP, applyUser)); phones.forEach(phone->{ YPSmsApi.sendSms(phone, applyMsg) ; smsApi.sendSms(phone, applyMsg) ; }); } @@ -46,7 +49,7 @@ result = "审批通过"; } String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.CHECK_TMP, result)); YPSmsApi.sendSms(phone, applyMsg) ; smsApi.sendSms(phone, applyMsg) ; } /** @@ -60,6 +63,6 @@ { String date = DateUtils.getFormatDatedd(planTime); String applyMsg = StringUtils.format(StringUtils.format(YPSmsApi.COMPANY_TMP, applyDeptName, date)); YPSmsApi.sendSms(phone, applyMsg) ; smsApi.sendSms(phone, applyMsg) ; } } project-framework/src/main/java/com/project/framework/web/service/SysLoginService.java
@@ -21,7 +21,6 @@ import com.project.common.exception.user.CaptchaException; import com.project.common.exception.user.CaptchaExpireException; import com.project.common.exception.user.UserPasswordNotMatchException; import com.project.common.sms.YPSmsApi; import com.project.common.utils.DateUtils; import com.project.common.utils.MessageUtils; import com.project.common.utils.ServletUtils; @@ -34,6 +33,7 @@ import com.project.system.mapper.SysUserMapper; import com.project.system.service.ISysConfigService; import com.project.system.service.ISysUserService; import com.project.system.sms.YPSmsApi; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.AuthenticationManager; @@ -61,6 +61,7 @@ private final ISysUserService userService; private final SysUserMapper userMapper; private final ISysConfigService configService; private final YPSmsApi smsApi; /** @@ -149,8 +150,8 @@ return getVerifyCodeNew(phone); } private boolean sendYp(String phone, String code ){ String result = YPSmsApi.sendSms(phone, StringUtils.format(YPSmsApi.CODE_TMP, code, Constants.PHONE_EXPIRATION)); private boolean sendYp(String phone, String code){ String result = smsApi.sendSms(phone, StringUtils.format(YPSmsApi.CODE_TMP, code, Constants.PHONE_EXPIRATION)); if (result.contains("\"code\":0,\"msg\":\"OK\"")){ log.info("发送成功 ->验证码："+code); return true; project-system/src/main/java/com/project/system/sms/YPSmsApi.java
File was renamed from project-common/src/main/java/com/project/common/sms/YPSmsApi.java @@ -1,7 +1,9 @@ package com.project.common.sms; package com.project.system.sms; import com.project.common.constant.Constants; import com.project.common.utils.SslUtils; import com.project.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -10,6 +12,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; @@ -24,7 +27,13 @@ * @author Mr.Zhao */ @Service @RequiredArgsConstructor public class YPSmsApi { private final ISysConfigService configService; /** * 智能匹配模板发送地址 @@ -75,19 +84,18 @@ * @param mobile 接受的手机号 * @param msg 短信内容 */ public static String sendSms(String mobile, String msg) public String sendSms(String mobile, String msg) { Map<String, String> params = new HashMap<>(3); params.put("apikey", API_KEY); params.put("text", msg); params.put("mobile", mobile); return post(YP_SMS_URI, params); String smsFlag = configService.selectConfigByKey("sys.sms.flag"); if ("1".equals(smsFlag)) { Map<String, String> params = new HashMap<>(3); params.put("apikey", API_KEY); params.put("text", msg); params.put("mobile", mobile); return post(YP_SMS_URI, params); } return ""; } public static void main(String[] args) { sendSms("18537821663", "【金明源】您的验证码是1234"); } /** * 基于HttpClient 4.3的通用POST方法 @@ -116,8 +124,13 @@ } method.setEntity(new UrlEncodedFormEntity(paramList, Constants.UTF8)); } response = client.execute(method); HttpEntity entity = response.getEntity(); if (client != null) { response = client.execute(method); } HttpEntity entity = null; if (response != null) { entity = response.getEntity(); } if (entity != null) { responseText = EntityUtils.toString(entity); }
