From cec5b33ef98e41ab9806dba09411690ce7aac11f Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Sun, 13 Sep 2020 01:12:00 +0800 Subject: [PATCH] . --- ...java => StartAndEndIntervalValidator.java} | 2 +- .../src/main/java/com/cowr/model/SmsLog.java | 14 + .../main/java/com/cowr/model/_MappingKit.java | 1 + .../java/com/cowr/model/base/BaseSmsLog.java | 378 ++++++++++++++++++ .../java/com/cowr}/sms/AliyunSmsService.java | 6 +- .../cowr/ssjygl/smslog/SmsLogPKValidator.java | 24 ++ .../com/cowr/ssjygl/smslog/SmsLogService.java | 72 ++++ .../src/main/java/generator/Main.java | 1 + .../com/cowr/local/ssjygl/main/Config.java | 4 + .../local/ssjygl/smslog/SmsLogController.java | 42 ++ .../ssjygl/stat/sale/OrderStatController.java | 6 +- .../service/aliyun/sms/AliyunSmsService.java | 84 ---- .../com/cowr/service/ssjygl/main/Config.java | 4 + .../ssjygl/smslog/SmsLogController.java | 42 ++ .../ssjygl/stat/sale/OrderStatController.java | 6 +- 15 files changed, 592 insertions(+), 94 deletions(-) rename ssjygl-xsx-common/src/main/java/com/cowr/common/validator/{StartAndEndintervalValidator.java => StartAndEndIntervalValidator.java} (95%) create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/model/SmsLog.java create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java rename {ssjygl-xsx-local/src/main/java/com/cowr/local/aliyun => ssjygl-xsx-common/src/main/java/com/cowr}/sms/AliyunSmsService.java (96%) create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogPKValidator.java create mode 100644 ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java create mode 100644 ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/smslog/SmsLogController.java delete mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/aliyun/sms/AliyunSmsService.java create mode 100644 ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsLogController.java diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndintervalValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java similarity index 95% rename from ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndintervalValidator.java rename to ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java index 065685a..3e90d29 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndintervalValidator.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/common/validator/StartAndEndIntervalValidator.java @@ -9,7 +9,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -public class StartAndEndintervalValidator extends ParamValidator { +public class StartAndEndIntervalValidator extends ParamValidator { private static DateFormat ymdhms = new SimpleDateFormat(DateTimeUtil.ymdhms); @Override diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/SmsLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/SmsLog.java new file mode 100644 index 0000000..8d8ac1c --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/SmsLog.java @@ -0,0 +1,14 @@ +package com.cowr.model; + +import com.cowr.model.base.BaseSmsLog; + +/** + * Generated by COWR Sun Sep 13 00:58:42 CST 2020 + * TableName: sms_log + * Remarks: 日志相关 - 短信发送日志 + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public class SmsLog extends BaseSmsLog { + public static final SmsLog dao = new SmsLog().dao(); +} diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java index 5b1fe65..5ecd7d1 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/_MappingKit.java @@ -47,6 +47,7 @@ public class _MappingKit { arp.addMapping("refund_detail_state_history", "id", RefundDetailStateHistory.class); arp.addMapping("prepay_customer", "id", PrepayCustomer.class); arp.addMapping("prepay_truck", "id", PrepayTruck.class); + arp.addMapping("sms_log", "id", SmsLog.class); arp.addMapping("sync_task", "id", SyncTask.class); arp.addMapping("modify_log", "id", ModifyLog.class); arp.addMapping("action_cmd_log", "id", ActionCmdLog.class); diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java new file mode 100644 index 0000000..f8193e6 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSmsLog.java @@ -0,0 +1,378 @@ +package com.cowr.model.base; + +import com.cowr.common.base.BaseModel; +import com.jfinal.plugin.activerecord.IBean; +import com.alibaba.fastjson.annotation.JSONField; + +/** + * Generated by COWR Sun Sep 13 00:58:42 CST 2020 + * TableName: sms_log + * Remarks: 日志相关 - 短信发送日志 + * PrimaryKey: id + */ +@SuppressWarnings("serial") +public abstract class BaseSmsLog> extends BaseModel implements IBean { + + public static final String tablename = "sms_log"; + + @JSONField(serialize=false) + public String getTablename(){ + return tablename; + } + + /** + * name: id + * type: CHAR(1) + * isNullable: NO + * isPrimaryKey: YES + * defaultValue: + * @param id uuid + */ + @JSONField(name="id") + public void setId(String id) { + set("id", id); + } + + + /** + * @return id uuid + */ + @JSONField(name="id") + public String getId() { + return getStr("id"); + } + + /** + * name: phone + * type: VARCHAR(20) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param phone 手机号 + */ + @JSONField(name="phone") + public void setPhone(String phone) { + set("phone", phone); + } + + + /** + * @return phone 手机号 + */ + @JSONField(name="phone") + public String getPhone() { + return getStr("phone"); + } + + /** + * name: content + * type: JSON(1073741824) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param content 发送内容json + */ + @JSONField(name="content") + public void setContent(String content) { + set("content", content); + } + + + /** + * @return content 发送内容json + */ + @JSONField(name="content") + public String getContent() { + return getStr("content"); + } + + /** + * name: create_time + * type: DATETIME(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: + * @param createTime 创建时间 + */ + @JSONField(name="create_time") + public void setCreateTime(java.util.Date createTime) { + set("create_time", createTime); + } + + + /** + * @return create_time 创建时间 + */ + @JSONField(name="create_time") + public java.util.Date getCreateTime() { + return get("create_time"); + } + + /** + * name: change_time + * type: TIMESTAMP(19) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: CURRENT_TIMESTAMP + * @param changeTime 最后修改时间 + */ + @JSONField(name="change_time") + public void setChangeTime(java.util.Date changeTime) { + set("change_time", changeTime); + } + + + /** + * @return change_time 最后修改时间 + */ + @JSONField(name="change_time") + public java.util.Date getChangeTime() { + return get("change_time"); + } + + /** + * name: bizid + * type: VARCHAR(50) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param bizid 发送回执ID，可根据该ID在接口QuerySendDetails中查询具体的发送状态。 + */ + @JSONField(name="bizid") + public void setBizid(String bizid) { + set("bizid", bizid); + } + + + /** + * @return bizid 发送回执ID，可根据该ID在接口QuerySendDetails中查询具体的发送状态。 + */ + @JSONField(name="bizid") + public String getBizid() { + return getStr("bizid"); + } + + /** + * name: code + * type: VARCHAR(100) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param code 请求状态码。 + +返回OK代表请求成功。 + */ + @JSONField(name="code") + public void setCode(String code) { + set("code", code); + } + + + /** + * @return code 请求状态码。 + +返回OK代表请求成功。 + */ + @JSONField(name="code") + public String getCode() { + return getStr("code"); + } + + /** + * name: requestid + * type: VARCHAR(50) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param requestid 请求 ID。无论调用接口成功与否，都会返回请求 ID。 + */ + @JSONField(name="requestid") + public void setRequestid(String requestid) { + set("requestid", requestid); + } + + + /** + * @return requestid 请求 ID。无论调用接口成功与否，都会返回请求 ID。 + */ + @JSONField(name="requestid") + public String getRequestid() { + return getStr("requestid"); + } + + /** + * name: sendstatus + * type: INT(10) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: 0 + * @param sendstatus 短信发送状态，包括： +0：待发送 +1：等待回执。 +2：发送失败。 +3：发送成功。 + */ + @JSONField(name="sendstatus") + public void setSendstatus(Integer sendstatus) { + set("sendstatus", sendstatus); + } + + + /** + * @return sendstatus 短信发送状态，包括： +0：待发送 +1：等待回执。 +2：发送失败。 +3：发送成功。 + */ + @JSONField(name="sendstatus") + public Integer getSendstatus() { + return getInt("sendstatus"); + } + + /** + * name: sendcontent + * type: VARCHAR(500) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param sendcontent 实际发送的内容字符串 + */ + @JSONField(name="sendcontent") + public void setSendcontent(String sendcontent) { + set("sendcontent", sendcontent); + } + + + /** + * @return sendcontent 实际发送的内容字符串 + */ + @JSONField(name="sendcontent") + public String getSendcontent() { + return getStr("sendcontent"); + } + + /** + * name: bill_num + * type: INT(10) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param billNum 计费条数 +国内短信内容计费规则 +短信字数＝短信模版内容字数 + 签名字数。 + +短信字数<=70个字数，按照70个字数一条短信计算。 + +短信字数>70个字数，即为长短信，按照67个字数记为一条短信计算。 + */ + @JSONField(name="bill_num") + public void setBillNum(Integer billNum) { + set("bill_num", billNum); + } + + + /** + * @return bill_num 计费条数 +国内短信内容计费规则 +短信字数＝短信模版内容字数 + 签名字数。 + +短信字数<=70个字数，按照70个字数一条短信计算。 + +短信字数>70个字数，即为长短信，按照67个字数记为一条短信计算。 + */ + @JSONField(name="bill_num") + public Integer getBillNum() { + return getInt("bill_num"); + } + + /** + * name: receivedate + * type: DATETIME(19) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param receivedate 接收时间 + */ + @JSONField(name="receivedate") + public void setReceivedate(java.util.Date receivedate) { + set("receivedate", receivedate); + } + + + /** + * @return receivedate 接收时间 + */ + @JSONField(name="receivedate") + public java.util.Date getReceivedate() { + return get("receivedate"); + } + + /** + * name: senddate + * type: DATETIME(19) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param senddate 实际发送时间 + */ + @JSONField(name="senddate") + public void setSenddate(java.util.Date senddate) { + set("senddate", senddate); + } + + + /** + * @return senddate 实际发送时间 + */ + @JSONField(name="senddate") + public java.util.Date getSenddate() { + return get("senddate"); + } + + /** + * name: relate_table + * type: VARCHAR(50) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param relateTable 关联业务表名 + */ + @JSONField(name="relate_table") + public void setRelateTable(String relateTable) { + set("relate_table", relateTable); + } + + + /** + * @return relate_table 关联业务表名 + */ + @JSONField(name="relate_table") + public String getRelateTable() { + return getStr("relate_table"); + } + + /** + * name: relate_id + * type: VARCHAR(32) + * isNullable: YES + * isPrimaryKey: NO + * defaultValue: + * @param relateId 关联业务表主键值 + */ + @JSONField(name="relate_id") + public void setRelateId(String relateId) { + set("relate_id", relateId); + } + + + /** + * @return relate_id 关联业务表主键值 + */ + @JSONField(name="relate_id") + public String getRelateId() { + return getStr("relate_id"); + } + + +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/aliyun/sms/AliyunSmsService.java b/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java similarity index 96% rename from ssjygl-xsx-local/src/main/java/com/cowr/local/aliyun/sms/AliyunSmsService.java rename to ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java index c72fd5f..7179e72 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/aliyun/sms/AliyunSmsService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/sms/AliyunSmsService.java @@ -1,4 +1,4 @@ -package com.cowr.local.aliyun.sms; +package com.cowr.sms; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.CommonRequest; @@ -73,12 +73,12 @@ public class AliyunSmsService { public static void main(String[] args) { AliyunSmsService sms = new AliyunSmsService(); // sms.send( -// "13388888888", +// "13627293906", // "SMS_66850327", // new JSONObject() // .fluentPut("time", DateTimeUtil.sdf.get().format(new Date())) // .fluentPut("code", System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")) // ); - sms.query("13388888888", "20200831", "777907498887368271^0"); + sms.query("13627293906", "20200913", "198008899928089627^0"); } } diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogPKValidator.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogPKValidator.java new file mode 100644 index 0000000..3650ef1 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogPKValidator.java @@ -0,0 +1,24 @@ +package com.cowr.ssjygl.smslog; + + +import com.cowr.common.validator.CrudParamValidator; +import com.cowr.common.view.Result; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Sun Sep 13 00:58:48 CST 2020 + * TableName: sms_log + * Remarks: 日志相关 - 短信发送日志 + * PrimaryKey: id + */ +public class SmsLogPKValidator extends CrudParamValidator { + @Override + protected void validate(Controller c) { + validateRequired("id", "id", "id 必填"); + validateString("id", 1, 1, "id", "id 长度 1~1"); + } + + protected void handleError(Controller c) { + c.renderJson(Result.failed(getErrmsg())); + } +} \ No newline at end of file diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java new file mode 100644 index 0000000..ab153a5 --- /dev/null +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/smslog/SmsLogService.java @@ -0,0 +1,72 @@ +package com.cowr.ssjygl.smslog; + +import com.cowr.common.Const; +import com.cowr.common.base.BaseService; +import com.cowr.common.view.PageParam; +import com.cowr.model.SmsLog; +import com.jfinal.kit.StrKit; +import com.jfinal.plugin.activerecord.Db; +import com.jfinal.plugin.activerecord.Page; +import com.jfinal.plugin.activerecord.Record; + +import java.util.ArrayList; +import java.util.List; + +/** + * Generated by COWR Sun Sep 13 00:58:47 CST 2020 + * TableName: sms_log + * Remarks: 日志相关 - 短信发送日志 + * PrimaryKey: id + */ +public class SmsLogService extends BaseService { + public static final SmsLogService me = new SmsLogService(); + + public Page find(PageParam pp, String stm, String etm, String phone, Integer sendstatus, String sendcontent) { + String selectsql = "select * "; + String fromsql = "from sms_log t where 1=1 \n"; + List paraList = new ArrayList<>(); + + if (StrKit.notBlank(stm)) { + fromsql += " and t.create_time >= ? \n"; + paraList.add(stm); + } + + if (StrKit.notBlank(etm)) { + fromsql += " and t.create_time <= ? \n"; + paraList.add(etm); + } + + if (StrKit.notBlank(phone)) { + fromsql += " and t.phone like ? \n"; + paraList.add("%" + phone + "%"); + } + + if (sendstatus != null) { + fromsql += " and t.sendstatus = ? \n"; + paraList.add(sendstatus); + } + + if (StrKit.notBlank(sendcontent)) { + fromsql += " and t.sendcontent like ? \n"; + paraList.add("%" + sendcontent + "%"); + } + + String totalRowSql = "select count(*) " + fromsql; + String findSql = selectsql + fromsql; + + // 前端传了排序字段，并且排序字段存在相关表中 + if (StrKit.notBlank(pp.getSort_field()) && SmsLog.dao.hasColunm(pp.getSort_field())) { + findSql += " order by t." + pp.getSort_field() + " is null, t." + pp.getSort_field(); + + if (Const.ORDER_BY_ASC.equals(pp.getSort_order())) { + findSql += " " + Const.ORDER_BY_ASC; + } else { + findSql += " " + Const.ORDER_BY_DESC; + } + } else { + findSql += " order by t.create_time desc "; + } + + return Db.paginateByFullSql(pp.getPage(), pp.getSize(), totalRowSql, findSql, paraList.toArray()); + } +} diff --git a/ssjygl-xsx-common/src/main/java/generator/Main.java b/ssjygl-xsx-common/src/main/java/generator/Main.java index acde8d5..f1507fc 100644 --- a/ssjygl-xsx-common/src/main/java/generator/Main.java +++ b/ssjygl-xsx-common/src/main/java/generator/Main.java @@ -72,6 +72,7 @@ public class Main { "customer_register", "invoice_receive", "invoice_log", + "sms_log", }; PropKit.use("db.properties"); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java index 9181a8e..993b1e3 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java @@ -31,6 +31,7 @@ import com.cowr.local.ssjygl.prepay.refunddetail.RefundDetailController; import com.cowr.local.ssjygl.product.ProductController; import com.cowr.local.ssjygl.purchase.PurchaseController; import com.cowr.local.ssjygl.sandfarm.SandfarmController; +import com.cowr.local.ssjygl.smslog.SmsLogController; import com.cowr.local.ssjygl.supermarket.SupermarketController; import com.cowr.local.ssjygl.supermarket.customerdistance.SupermarketCustomerDistanceController; import com.cowr.local.ssjygl.supermarket.receiverdistance.SupermarketReceiverDistanceController; @@ -215,6 +216,9 @@ public class Config extends JFinalConfig { // -- 发票管理 me.add("/invoice/log", InvoiceLogController.class); me.add("/invoice/receive", InvoiceReceiveController.class); + + // -- 日志 + me.add("/log/sms", SmsLogController.class); } @Override diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/smslog/SmsLogController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/smslog/SmsLogController.java new file mode 100644 index 0000000..cab3f04 --- /dev/null +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/smslog/SmsLogController.java @@ -0,0 +1,42 @@ +package com.cowr.local.ssjygl.smslog; + +import com.cowr.common.validator.StartAndEndIntervalValidator; +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.SmsLog; +import com.cowr.ssjygl.smslog.SmsLogPKValidator; +import com.cowr.ssjygl.smslog.SmsLogService; +import com.jfinal.aop.Before; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Sun Sep 13 00:58:47 CST 2020 + * TableName: sms_log + * Remarks: 日志相关 - 短信发送日志 + * PrimaryKey: id + */ +public class SmsLogController extends Controller { + + /** + * 分页查找 sms_log 日志相关 - 短信发送日志 + */ + @Before(StartAndEndIntervalValidator.class) + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String stm = get("stm"); + String etm = get("etm"); + String phone = get("phone"); + Integer sendstatus = getInt("sendstatus"); + String sendcontent = get("sendcontent"); + renderJson(Result.object(SmsLogService.me.find(pp, stm, etm, phone, sendstatus, sendcontent))); + } + + /** + * 按主键查找单个对象 sms_log 日志相关 - 短信发送日志 + */ + @Before(SmsLogPKValidator.class) + public void get() { + SmsLog model = getModel(SmsLog.class, "", true); // 忽略不在model中的字段 + renderJson(SmsLogService.me.findByPk(model)); + } +} diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java index 6938f5f..03b0e75 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/stat/sale/OrderStatController.java @@ -3,7 +3,7 @@ package com.cowr.local.ssjygl.stat.sale; import com.cowr.common.base.BaseController; import com.cowr.common.validator.DayValidator; import com.cowr.common.validator.MonthValidator; -import com.cowr.common.validator.StartAndEndintervalValidator; +import com.cowr.common.validator.StartAndEndIntervalValidator; import com.cowr.common.view.ExcelRender; import com.cowr.common.view.Result; import com.cowr.ssjygl.stat.sale.OrderStatService; @@ -197,7 +197,7 @@ public class OrderStatController extends BaseController { } } - @Before(StartAndEndintervalValidator.class) + @Before(StartAndEndIntervalValidator.class) public void statRangeTrans() { String stm = get("stm"); // 前端将 YYYY-MM-DD 后面补 " 00:00:00" String etm = get("etm"); // 前端将 YYYY-MM-DD 后面补 " 23:59:59" @@ -260,7 +260,7 @@ public class OrderStatController extends BaseController { } } - @Before(StartAndEndintervalValidator.class) + @Before(StartAndEndIntervalValidator.class) public void statRangeCustomer() { String stm = get("stm"); // 前端将 YYYY-MM-DD 后面补 " 00:00:00" String etm = get("etm"); // 前端将 YYYY-MM-DD 后面补 " 23:59:59" diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/aliyun/sms/AliyunSmsService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/aliyun/sms/AliyunSmsService.java deleted file mode 100644 index 0f205dc..0000000 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/aliyun/sms/AliyunSmsService.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.cowr.service.aliyun.sms; - -import com.alibaba.fastjson.JSONObject; -import com.aliyuncs.CommonRequest; -import com.aliyuncs.CommonResponse; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.profile.DefaultProfile; - -public class AliyunSmsService { - private static final String regionId = "cn-hangzhou"; // 短信 api 里面固定的 - private static final String accessKeyId = "LTAI4GBjCx9Hjxg9LtaTLD43"; // 发短信专用，定死的 - private static final String secret = "xsf8w9KUArVGiXIMcM94d0iIqL7q5O"; // 发短信专用，定死的 - private static final String SignName = "智慧砂石"; // 阿里云申请的签名，定死的 - private IAcsClient client; - - public AliyunSmsService() { - this.client = new DefaultAcsClient(DefaultProfile.getProfile(regionId, accessKeyId, secret)); - } - - public JSONObject send(String phone, String temp_code, JSONObject param) { - CommonRequest request = new CommonRequest(); - request.setSysMethod(MethodType.POST); - request.setSysDomain("dysmsapi.aliyuncs.com"); - request.setSysVersion("2017-05-25"); - request.setSysAction("SendSms"); - request.putQueryParameter("SignName", SignName); - request.putQueryParameter("RegionId", regionId); - - request.putQueryParameter("PhoneNumbers", phone); - request.putQueryParameter("TemplateCode", temp_code); - request.putQueryParameter("TemplateParam", param.toJSONString()); - try { - CommonResponse response = client.getCommonResponse(request); - - JSONObject responseData = JSONObject.parseObject(response.getData()); - - System.out.println(responseData); - - return responseData; - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public JSONObject query(String phone, String send_date, String bizid) { - CommonRequest request = new CommonRequest(); - request.setSysMethod(MethodType.POST); - request.setSysDomain("dysmsapi.aliyuncs.com"); - request.setSysVersion("2017-05-25"); - request.setSysAction("QuerySendDetails"); - request.putQueryParameter("RegionId", regionId); - - request.putQueryParameter("PhoneNumber", phone); - request.putQueryParameter("SendDate", send_date); - request.putQueryParameter("PageSize", "10"); - request.putQueryParameter("CurrentPage", "1"); - request.putQueryParameter("BizId", bizid); - try { - CommonResponse response = client.getCommonResponse(request); - JSONObject responseData = JSONObject.parseObject(response.getData()); - - System.out.println(responseData); - - } catch (Exception e) { - e.printStackTrace(); - } - return null; - } - - public static void main(String[] args) { - AliyunSmsService sms = new AliyunSmsService(); -// sms.send( -// "13388888888", -// "SMS_66850327", -// new JSONObject() -// .fluentPut("time", DateTimeUtil.sdf.get().format(new Date())) -// .fluentPut("code", System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")+System.getProperty("os.name")) -// ); - sms.query("13388888888", "20200831", "777907498887368271^0"); - } -} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java index 59671af..80a41f2 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java @@ -26,6 +26,7 @@ import com.cowr.service.ssjygl.prepay.refunddetail.RefundDetailController; import com.cowr.service.ssjygl.product.ProductController; import com.cowr.service.ssjygl.purchase.PurchaseController; import com.cowr.service.ssjygl.sandfarm.SandfarmController; +import com.cowr.service.ssjygl.smslog.SmsLogController; import com.cowr.service.ssjygl.supermarket.SupermarketController; import com.cowr.service.ssjygl.supermarket.SupermarketSyncService; import com.cowr.service.ssjygl.supermarket.customerdistance.SupermarketCustomerDistanceController; @@ -181,6 +182,9 @@ public class Config extends JFinalConfig { // -- 发票管理 me.add("/invoice/log", InvoiceLogController.class); me.add("/invoice/receive", InvoiceReceiveController.class); + + // -- 日志 + me.add("/log/sms", SmsLogController.class); } @Override diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsLogController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsLogController.java new file mode 100644 index 0000000..4f1a4c0 --- /dev/null +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/smslog/SmsLogController.java @@ -0,0 +1,42 @@ +package com.cowr.service.ssjygl.smslog; + +import com.cowr.common.validator.StartAndEndIntervalValidator; +import com.cowr.common.view.PageParam; +import com.cowr.common.view.Result; +import com.cowr.model.SmsLog; +import com.cowr.ssjygl.smslog.SmsLogPKValidator; +import com.cowr.ssjygl.smslog.SmsLogService; +import com.jfinal.aop.Before; +import com.jfinal.core.Controller; + +/** + * Generated by COWR Sun Sep 13 00:58:47 CST 2020 + * TableName: sms_log + * Remarks: 日志相关 - 短信发送日志 + * PrimaryKey: id + */ +public class SmsLogController extends Controller { + + /** + * 分页查找 sms_log 日志相关 - 短信发送日志 + */ + @Before(StartAndEndIntervalValidator.class) + public void find() { + PageParam pp = getBean(PageParam.class, "", true); + String stm = get("stm"); + String etm = get("etm"); + String phone = get("phone"); + Integer sendstatus = getInt("sendstatus"); + String sendcontent = get("sendcontent"); + renderJson(Result.object(SmsLogService.me.find(pp, stm, etm, phone, sendstatus, sendcontent))); + } + + /** + * 按主键查找单个对象 sms_log 日志相关 - 短信发送日志 + */ + @Before(SmsLogPKValidator.class) + public void get() { + SmsLog model = getModel(SmsLog.class, "", true); // 忽略不在model中的字段 + renderJson(SmsLogService.me.findByPk(model)); + } +} diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java index cfaff2b..965937b 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/stat/sale/OrderStatController.java @@ -4,7 +4,7 @@ import com.cowr.common.base.BaseController; import com.cowr.common.enums.UserTypeEnum; import com.cowr.common.validator.DayValidator; import com.cowr.common.validator.MonthValidator; -import com.cowr.common.validator.StartAndEndintervalValidator; +import com.cowr.common.validator.StartAndEndIntervalValidator; import com.cowr.common.view.ExcelRender; import com.cowr.common.view.Result; import com.cowr.model.Sysuser; @@ -222,7 +222,7 @@ public class OrderStatController extends BaseController { } } - @Before(StartAndEndintervalValidator.class) + @Before(StartAndEndIntervalValidator.class) public void statRangeTrans() { String stm = get("stm"); // 前端将 YYYY-MM-DD 后面补 " 00:00:00" String etm = get("etm"); // 前端将 YYYY-MM-DD 后面补 " 23:59:59" @@ -309,7 +309,7 @@ public class OrderStatController extends BaseController { } } - @Before(StartAndEndintervalValidator.class) + @Before(StartAndEndIntervalValidator.class) public void statRangeCustomer() { String stm = get("stm"); // 前端将 YYYY-MM-DD 后面补 " 00:00:00" String etm = get("etm"); // 前端将 YYYY-MM-DD 后面补 " 23:59:59"