feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.22</version>
+	<version>1.0.23</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -931,4 +931,7 @@ public class CommConstant {
      * 微信商户手续费率-前端展示
      */
     public static final String WXMCH_PAY_RATE_STRING = "1%";
+
+    // 维修工单短信
+    public static final String SMS_BIZ_REPAIRE_TICKET = "repaire-ticket";
 }

src/main/java/com/huiju/estateagents/controller/SysSmsEventController.java

@@ -0,0 +1,119 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.common.BaseController;
+import com.huiju.estateagents.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.huiju.estateagents.service.ISysSmsEventService;
+import com.huiju.estateagents.entity.SysSmsEvent;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+
+@Api(tags = "")
+@RestController
+@RequestMapping("/")
+public class SysSmsEventController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysSmsEventController.class);
+
+    @Autowired
+    public ISysSmsEventService iSysSmsEventService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysSmsEvent",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysSmsEventList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<SysSmsEvent> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysSmsEvent> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysSmsEvent> result = iSysSmsEventService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param sysSmsEvent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysSmsEvent",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean sysSmsEventAdd(@ApiParam("保存内容") @RequestBody SysSmsEvent sysSmsEvent) throws Exception{
+
+        if (iSysSmsEventService.save(sysSmsEvent)){
+            return ResponseBean.success(sysSmsEvent);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysSmsEvent/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean sysSmsEventDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iSysSmsEventService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysSmsEvent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysSmsEvent/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean sysSmsEventUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody SysSmsEvent sysSmsEvent) throws Exception{
+
+        if (iSysSmsEventService.updateById(sysSmsEvent)){
+            return ResponseBean.success(iSysSmsEventService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysSmsEvent/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysSmsEventGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iSysSmsEventService.getById(id));
+    }
+}

src/main/java/com/huiju/estateagents/controller/SysSmsTemplateController.java

@@ -0,0 +1,119 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.common.BaseController;
+import com.huiju.estateagents.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.huiju.estateagents.service.ISysSmsTemplateService;
+import com.huiju.estateagents.entity.SysSmsTemplate;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+
+@Api(tags = "")
+@RestController
+@RequestMapping("/")
+public class SysSmsTemplateController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysSmsTemplateController.class);
+
+    @Autowired
+    public ISysSmsTemplateService iSysSmsTemplateService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/sysSmsTemplate",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysSmsTemplateList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<SysSmsTemplate> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<SysSmsTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<SysSmsTemplate> result = iSysSmsTemplateService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param sysSmsTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysSmsTemplate",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean sysSmsTemplateAdd(@ApiParam("保存内容") @RequestBody SysSmsTemplate sysSmsTemplate) throws Exception{
+
+        if (iSysSmsTemplateService.save(sysSmsTemplate)){
+            return ResponseBean.success(sysSmsTemplate);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysSmsTemplate/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean sysSmsTemplateDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iSysSmsTemplateService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param sysSmsTemplate 实体对象
+     * @return
+     */
+    @RequestMapping(value="/sysSmsTemplate/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean sysSmsTemplateUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody SysSmsTemplate sysSmsTemplate) throws Exception{
+
+        if (iSysSmsTemplateService.updateById(sysSmsTemplate)){
+            return ResponseBean.success(iSysSmsTemplateService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/sysSmsTemplate/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sysSmsTemplateGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iSysSmsTemplateService.getById(id));
+    }
+}

src/main/java/com/huiju/estateagents/entity/SysSmsEvent.java

@@ -0,0 +1,52 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysSmsEvent对象", description="")
+public class SysSmsEvent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "事件ID")
+    @TableId(value = "event_id", type = IdType.AUTO)
+    private Integer eventId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "模板code")
+    private String templateCode;
+
+    @ApiModelProperty(value = "事件类型,birthday,festival,business")
+    private String eventType;
+
+    @ApiModelProperty(value = "业务类型")
+    private String businessType;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/entity/SysSmsTemplate.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="SysSmsTemplate对象", description="")
+public class SysSmsTemplate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "模板编码")
+    @TableId(value = "template_code", type = IdType.INPUT)
+    private String templateCode;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "签名")
+    private String sign;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+
+}

src/main/java/com/huiju/estateagents/mapper/SysSmsEventMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.SysSmsEvent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+@Mapper
+public interface SysSmsEventMapper extends BaseMapper<SysSmsEvent> {
+
+}

src/main/java/com/huiju/estateagents/mapper/SysSmsTemplateMapper.java

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.SysSmsTemplate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+@Mapper
+public interface SysSmsTemplateMapper extends BaseMapper<SysSmsTemplate> {
+
+    List<SysSmsTemplate> getSysSmsTemplateByBizType(@Param("businessType") String businessType);
+}

src/main/java/com/huiju/estateagents/service/ISysSmsEventService.java

@@ -0,0 +1,25 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.SysSmsEvent;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+public interface ISysSmsEventService extends IService<SysSmsEvent> {
+
+    /**
+     * 发送工单提醒给维修工人
+     * @param to                维修工手机
+     * @param lifeConsultant    管家姓名
+     * @param phone             管家手机
+     * @param propPhone         业主手机
+     * @return
+     */
+    boolean sendSMSOfRepairTicket(String to, String lifeConsultant, String phone, String propPhone);
+}

src/main/java/com/huiju/estateagents/service/ISysSmsTemplateService.java

@@ -0,0 +1,15 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.SysSmsTemplate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+public interface ISysSmsTemplateService extends IService<SysSmsTemplate> {
+}

src/main/java/com/huiju/estateagents/service/impl/SysSmsEventServiceImpl.java

@@ -0,0 +1,70 @@
+package com.huiju.estateagents.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.SysSmsEvent;
+import com.huiju.estateagents.entity.SysSmsTemplate;
+import com.huiju.estateagents.mapper.SysSmsEventMapper;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
+import com.huiju.estateagents.mapper.SysSmsTemplateMapper;
+import com.huiju.estateagents.service.ISysSmsEventService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+@Service
+public class SysSmsEventServiceImpl extends ServiceImpl<SysSmsEventMapper, SysSmsEvent> implements ISysSmsEventService {
+
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
+    @Autowired
+    SysSmsTemplateMapper sysSmsTemplateMapper;
+
+    @Autowired
+    com.huiju.estateagents.common.smsService.Service smsService;
+
+    @Override
+    public boolean sendSMSOfRepairTicket(String to, String lifeConsultant, String phone, String propPhone) {
+        List<SysSmsTemplate> sysSmsTemplateByBizType = getSysSmsTemplateByBizType(CommConstant.SMS_BIZ_REPAIRE_TICKET);
+        if (null == sysSmsTemplateByBizType || sysSmsTemplateByBizType.size() < 1) {
+            return false;
+        }
+
+        Map<String, String> content = new HashMap<String, String>(){{
+            put("name", lifeConsultant);
+            put("phone", phone);
+            put("phone2", propPhone);
+        }};
+
+        com.huiju.estateagents.common.smsService.Service.Message message = new com.huiju.estateagents.common.smsService.Service.Message();
+        message.setTel(to)
+                .setCode(sysSmsTemplateByBizType.get(0).getTemplateCode())
+                .setSign(sysSmsTemplateByBizType.get(0).getSign())
+                .setContent(JSONObject.toJSONString(content));
+
+        try {
+            smsService.sendMessage(message);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    private List<SysSmsTemplate> getSysSmsTemplateByBizType(String bizType) {
+        return sysSmsTemplateMapper.getSysSmsTemplateByBizType(bizType);
+    }
+}

src/main/java/com/huiju/estateagents/service/impl/SysSmsTemplateServiceImpl.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.SysSmsTemplate;
+import com.huiju.estateagents.mapper.SysSmsTemplateMapper;
+import com.huiju.estateagents.service.ISysSmsTemplateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-12-21
+ */
+@Service
+public class SysSmsTemplateServiceImpl extends ServiceImpl<SysSmsTemplateMapper, SysSmsTemplate> implements ISysSmsTemplateService {
+}

src/main/resources/mapper/SysSmsEventMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.SysSmsEventMapper">
+
+</mapper>

src/main/resources/mapper/SysSmsTemplateMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.SysSmsTemplateMapper">
+
+    <select id="getSysSmsTemplateByBizType" resultType="com.huiju.estateagents.entity.SysSmsTemplate">
+        SELECT
+            t.*
+        FROM
+            sys_sms_template t
+        INNER JOIN sys_sms_event s ON t.template_code = s.template_code
+        WHERE
+            s.business_type = #{businessType}
+        AND s.`status` = 1
+    </select>
+</mapper>