新需求

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

@@ -449,6 +449,12 @@ public class CommConstant {
      */
     public static final String MESSAGE_CONTENT_OF_NOTICE = "notice";
 
+    /**
+     * 需求通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MESSAGE_CONTENT_OF_DEMAND = "demand";
+
     /**
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中

src/main/java/com/huiju/estateagents/sample/controller/TaH5DemandController.java

@@ -8,9 +8,18 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
+import com.huiju.estateagents.sample.entity.TaContact;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
+import com.huiju.estateagents.sample.entity.TaH5Sample;
+import com.huiju.estateagents.sample.entity.TaSampleContact;
+import com.huiju.estateagents.sample.service.ITaContactService;
 import com.huiju.estateagents.sample.service.ITaH5DemandService;
+import com.huiju.estateagents.sample.service.ITaH5SampleService;
+import com.huiju.estateagents.sample.service.ITaSampleContactService;
 import com.huiju.estateagents.service.ITaOrgService;
 import org.apache.poi.ss.formula.functions.T;
 import org.omg.CORBA.INTERNAL;
@@ -33,6 +42,7 @@ import java.util.List;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -52,9 +62,24 @@ public class TaH5DemandController extends BaseController {
     @Autowired
     public ITaH5DemandService iTaH5DemandService;
 
+    @Autowired
+    public ITaH5SampleService iTaH5SampleService;
+
+    @Autowired
+    private ITaSampleContactService iTaSampleContactService;
+
+    @Autowired
+    private ITaContactService taContactService;
+
     @Autowired
     private ITaOrgService iTaOrgService;
 
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
+    @Autowired
+    SMSUtils smsUtils;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -117,6 +142,19 @@ public class TaH5DemandController extends BaseController {
             }else {
                 responseBean.addError("fail");
             }
+            TaH5Sample taH5Sample = iTaH5SampleService.getById(taH5Demand.getSampleId());
+            QueryWrapper<TaSampleContact> queryWrapper = new QueryWrapper();
+            queryWrapper.eq("sample_id",taH5Sample.getSampleId());
+            List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
+            if (sampleContactList.size() > 0) {
+                List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
+                taH5Sample.setTaContactList(taContactList);
+                String[] smsParams = {taH5Demand.getDemandStatus().toString(), taH5Demand.getRemark()};
+                for (TaContact taContact : taContactList){
+                    sendSmsMessage(taContact.getPhone(), CommConstant.MESSAGE_CONTENT_OF_DEMAND, smsParams);
+                }
+
+            }
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taH5DemandAdd -=- {}",e.toString());
@@ -331,4 +369,29 @@ public class TaH5DemandController extends BaseController {
         }
         return responseBean;
     }
+
+    private String sendSmsMessage(String tel, String type, String[] params) {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            return "短信发送失败: 没有手机号或者短信模板";
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+
+            // TODO 写消息发送日志
+
+            return "没有设置有效的【" + type + "】短信模板";
+        }
+
+        boolean success = smsUtils.sendMessage(smsSetting.getTplCode(), tel, params);
+
+        // TODO 写消息发送日志
+
+        return success ? null : "短信发送失败";
+    }
 }

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -75,6 +75,37 @@ public class TaH5SampleController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taH5Sample",method= RequestMethod.GET)
+    public ResponseBean taH5SampleList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "sampleName", required = false) String sampleName,
+                                                @RequestParam(value = "tag", required = false) String tag){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaH5Sample> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaH5Sample> queryWrapper = new QueryWrapper<>();
+            queryWrapper.like(!StringUtils.isEmpty(sampleName),"sample_name",sampleName);
+            queryWrapper.like(!StringUtils.isEmpty(tag),"tag",tag);
+            queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.orderByDesc("order_no","create_date");
+
+            IPage<TaH5Sample> result = iTaH5SampleService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taH5SampleList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param taH5Sample 实体对象
@@ -89,6 +120,7 @@ public class TaH5SampleController extends BaseController {
             }else {
                 responseBean.addError("fail");
             }
+
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taH5SampleAdd -=- {}",e.toString());