修改方案查询记录2

wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml

@@ -88,17 +88,15 @@
         </where>
     </select>
 
-    <select id="getList" resultType="cn.wisenergy.model.app.SchemeQueryRecord">
+    <select id="getList" parameterType="map" resultType="cn.wisenergy.model.app.SchemeQueryRecord">
         select
         <include refid="cols_all"/>
         from
         <include refid="table"/>
         <where>
             is_delete=0
-            <if test="userId != null">
-                and user_id=#{userId}
-            </if>
-            order by create_time
+            and user_id=#{userId}
+            order by create_time desc
             limit #{startNum},#{endNum}
         </where>
     </select>

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -113,9 +113,9 @@
             <if test="downGrade != null">
                 and lowest_mark >#{downGrade}
             </if>
-            <if test="volunteerIds != null and volunteerIds.size() >0">
-                and id IN
-                <foreach collection="list" index="index" item="id" separator="," open="(" close=")">
+            <if test="volunteerIds != null ">
+                and id NOT IN
+                <foreach collection="volunteerIds" index="index" item="id" separator="," open="(" close=")">
                     #{id}
                 </foreach>
             </if>

wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeVo.java

@@ -24,6 +24,12 @@ public class SchemeVo implements Serializable {
     @ApiModelProperty(value = "用户id", name = "userId")
     private Integer userId;
 
+    /**
+     * 大专业名称
+     */
+    @ApiModelProperty(value = "大专业名称：如 ‘法学、文学、外语’", name = "bigMajorNames")
+    private String bigMajorNames;
+
     /**
      * 专业ids
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java

@@ -15,7 +15,7 @@ public interface SendSmsSerVice {
      * @param phone 手机号
      * @return true 成功 false 失败
      */
-    R<Boolean> sendSmCode(String phone);
+    R<Boolean> sendSmCode(String phone) throws Exception;
 
     /**
      * 在缓存中记录验证码

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java

@@ -214,7 +214,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         }
 
         //4保存用户方案记录、志愿之间的关联关系
-        boolean bool = saveUserVolunteer(user, list, scoreInfo);
+        boolean bool = saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
         if (!bool) {
             return R.error("保存方案查询记录失败!");
         }
@@ -293,10 +293,10 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
      * @return true 成功  false 失败
      */
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo) {
+    public boolean saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo, String name) {
         //1、保存方案查询记录
         SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
-        schemeQueryRecord.setMajorName("");
+        schemeQueryRecord.setMajorName(name);
         schemeQueryRecord.setStudentType(user.getExamType());
         schemeQueryRecord.setUserId(user.getId());
         schemeQueryRecord.setIsDelete(0);
@@ -383,7 +383,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             //判断分数是否小于对低分与向下浮动分数之和
             double upMark = secondRule.getUpMark();
             double upGrade = secondCulture + upMark;
-            double secondCultureMin=secondRule.getCultureMin();
+            double secondCultureMin = secondRule.getCultureMin();
             if (upGrade > secondRule.getCultureMax()) {
                 upGrade = secondRule.getCultureMax();
             }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java

@@ -6,10 +6,18 @@ import cn.wisenergy.service.app.SendSmsSerVice;
 import cn.wisenergy.service.cache.Cache;
 import cn.wisenergy.service.common.CachePrefix;
 import cn.wisenergy.service.common.Common;
+import cn.wisenergy.service.util.SmsSign;
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * @author 86187
@@ -23,13 +31,21 @@ public class SendSmsSerViceImpl implements SendSmsSerVice {
     @Autowired
     private Cache cache;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
     @Override
-    public R<Boolean> sendSmCode(String phone) {
+    public R<Boolean> sendSmCode(String phone) throws Exception {
         log.info("volunteer-service[]SendSmsSerViceImpl[]sendSmCode[]input.param.phone:" + phone);
         if (StringUtils.isBlank(phone)) {
             return R.error("入参不能为空!");
         }
+        final HttpHeaders requestHeaders = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        requestHeaders.setContentType(type);
 
+        String url = SmsSign.getUrl();
+        String responseEntity = this.restTemplate.getForObject(url, String.class);
 
         return R.ok();
     }

wisenergy-service/src/main/java/cn/wisenergy/service/util/SmsSign.java

@@ -10,8 +10,8 @@ import java.util.Map;
  */
 public class SmsSign {
     public static String getUrl() throws Exception {
-        String accessKeyId = "testId";
-        String accessSecret = "testSecret";
+        String accessKeyId = "LTAIuFVMscvCNpMU";
+        String accessSecret = "AvotjHvvGzEm8sX9vZaUhVypnZfUk7";
         java.text.SimpleDateFormat df = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
         // 这里一定要设置GMT时区
         df.setTimeZone(new java.util.SimpleTimeZone(0, "GMT"));
@@ -23,16 +23,16 @@ public class SmsSign {
         paras.put("AccessKeyId", accessKeyId);
         paras.put("SignatureVersion", "1.0");
         paras.put("Timestamp", df.format(new java.util.Date()));
-        paras.put("Format", "XML");
+        paras.put("Format", "json");
 
         // 2. 业务API参数
         paras.put("Action", "SendSms");
-        paras.put("Version", "2017-05-25");
+        paras.put("Version", "2021-01-25");
         paras.put("RegionId", "cn-hangzhou");
-        paras.put("PhoneNumbers", "15300000001");
+        paras.put("PhoneNumbers", "18757121665");
         paras.put("SignName", "阿里云短信测试专用");
         paras.put("TemplateParam", "{\"customer\":\"test\"}");
-        paras.put("TemplateCode", "SMS_71390007");
+        paras.put("TemplateCode", "SMS_157970381");
         paras.put("OutId", "123");
         // 3. 去除签名关键字Key
         if (paras.containsKey("Signature")) {

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeRecordController.java

 package cn.wisenergy.web.admin.controller.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.PayRecord;
 import cn.wisenergy.model.app.SchemeQueryRecord;
 import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.model.vo.PayRecordQueryVo;
-import cn.wisenergy.model.vo.PayRecordShowVo;
 import cn.wisenergy.model.vo.SchemeRecordQueryVo;
 import cn.wisenergy.service.app.SchemeRecordService;
 import com.github.pagehelper.PageInfo;

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java

@@ -27,7 +27,7 @@ public class SendSmsController {
     @ApiOperation(value = "发送短信验证码", notes = "发送短信验证码", httpMethod = "GET")
     @ApiImplicitParam(name = "phone", value = "手机号码", dataType = "String", required = true)
     @GetMapping("/sendSms")
-    public R<Boolean> sendSms(String phone) {
+    public R<Boolean> sendSms(String phone) throws Exception {
         log.info("SendSmsController[]sendSms[]input.param:phone:" + phone);
         if (StringUtils.isBlank(phone)) {
             return R.error("入参为空!");