bug: fix resttemplate

src/main/java/com/yunzhi/training/common/HttpUtils.java

@@ -4,8 +4,9 @@ import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Arrays;
-import java.util.Map;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
 
 @Component
 public class HttpUtils {
@@ -14,7 +15,12 @@ public class HttpUtils {
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
         HttpEntity<String> entity = new HttpEntity<String>(headers);
-        ResponseEntity<String> resp = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.GET, entity, String.class, params);
         return resp.getBody();
     }
 
@@ -26,7 +32,56 @@ public class HttpUtils {
         headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
         headers.setAll(header);
         HttpEntity<String> entity = new HttpEntity<String>(body, headers);
-        ResponseEntity<String> resp = restTemplate.exchange(url, HttpMethod.POST, entity, String.class);
+
+        Map<String, Object> urlAndParams = parseURL(url);
+        String formatURL = (String) urlAndParams.get("url");
+        Map<String, String> params = (Map<String, String>) urlAndParams.get("params");
+
+        ResponseEntity<String> resp = restTemplate.exchange(formatURL, HttpMethod.POST, entity, String.class, params);
         return resp.getBody();
     }
+
+    // RestTemplate 不能正常的处理 querystring, 必须按照约定的方式处理
+    private Map<String, Object> parseURL(String url) {
+        Map<String, Object> res = new HashMap<>();
+
+        String[] parts = url.split("\\?");
+        String baseURL = parts[0];
+
+        if (parts.length < 2) {
+            res.put("url", baseURL);
+            res.put("params", new HashMap<>());
+            return res;
+        }
+
+
+        String[] fields = parts[1].split("&");
+        Map<String, String> params = new HashMap<>();
+        List<String> searchList = new ArrayList<>();
+        for (String field : fields) {
+            String[] pairs = field.split("=");
+            if (2 != pairs.length) {
+                continue;
+            }
+
+            try {
+                String key = URLDecoder.decode(pairs[0].trim(), "UTF-8");
+                String val = URLDecoder.decode(pairs[1].trim(), "UTF-8");
+
+                // 转化为 "foo={foo}" 这种字符串
+                searchList.add(String.format("%s={%s}", key, key));
+                // 把 foo 对应的值存储起来
+                params.put(key, val);
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // url 格式类似 http://foo.org/bar?name={name}
+        String formatURL = baseURL + "?" + String.join("&", searchList);
+        res.put("url", formatURL);
+        res.put("params", params);
+
+        return res;
+    }
 }

src/main/java/com/yunzhi/training/controller/StatsController.java

@@ -0,0 +1,32 @@
+package com.yunzhi.training.controller;
+
+import com.yunzhi.training.common.BaseController;
+import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.service.ITaStudentService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Api(tags = "数据统计")
+@RestController
+public class StatsController  extends BaseController {
+
+    @Autowired
+    ITaStudentService iTaStudentService;
+
+    public ResponseBean totalNum() throws Exception {
+        // 学生总数
+        long totalStudents = iTaStudentService.countALL();
+        //
+
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("totalStudents", totalStudents);
+
+        return ResponseBean.success(res);
+    }
+}

src/main/java/com/yunzhi/training/controller/TaCourseController.java

@@ -3,6 +3,9 @@ package com.yunzhi.training.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.training.common.*;
+import com.yunzhi.training.entity.TaFavorites;
+import com.yunzhi.training.entity.TaPerson;
+import com.yunzhi.training.service.ITaFavoritesService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -18,6 +21,7 @@ import com.yunzhi.training.service.ITaCourseService;
 import com.yunzhi.training.entity.TaCourse;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -39,6 +43,9 @@ public class TaCourseController extends BaseController {
     @Autowired
     public ITaCourseService iTaCourseService;
 
+    @Autowired
+    public ITaFavoritesService iTaFavoritesService;
+
 
     /**
      * 分页查询列表
@@ -151,7 +158,19 @@ public class TaCourseController extends BaseController {
     @RequestMapping(value="/{client}/course/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taCourseGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
-                                    @ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaCourseService.getExistBy("course_id", id, "wx".equals(client), true));
+                                    @ApiParam("对象ID") @PathVariable String id,
+                                    HttpServletRequest request) throws Exception{
+        TaCourse taCourse = iTaCourseService.getExistBy("course_id", id, "wx".equals(client), true);
+
+        // 微信的查询当然人是否收藏
+        if ("wx".equals(client)) {
+            TaPerson taPerson = getCurrentPerson(request);
+            TaFavorites taFavor = iTaFavoritesService.getByPerson("course", id, taPerson.getPersonId());
+            if (null != taFavor) {
+                taCourse.setIsFavored(true);
+            }
+        }
+
+        return ResponseBean.success(taCourse);
     }
 }

src/main/java/com/yunzhi/training/controller/TaFavoritesController.java

@@ -98,23 +98,19 @@ public class TaFavoritesController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     * @param taFavorites  收藏内容
      */
-    @RequestMapping(value="/wx/favorite/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/wx/favorite", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taFavoritesDelete(@ApiParam("对象ID") @PathVariable String id,
+    public ResponseBean taFavoritesDelete(@ApiParam("收藏内容") @RequestBody TaFavorites taFavorites,
                                           HttpServletRequest request) throws Exception{
-        TaFavorites taFavorites = iTaFavoritesService.getById(id);
+        TaPerson taPerson = getCurrentPerson(request);
+        TaFavorites origin = iTaFavoritesService.getByPerson(taFavorites.getTargetType(), taFavorites.getTargetId(), taPerson.getPersonId());
         if (null == taFavorites) {
             ResponseBean.success("success");
         }
 
-        TaPerson taPerson = getCurrentPerson(request);
-        if (!taFavorites.getPersonId().equals(taPerson.getPersonId())) {
-            return ResponseBean.error("您无权操作", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        if(iTaFavoritesService.removeById(id)){
+        if(iTaFavoritesService.removeById(origin.getFavId())){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/training/controller/TaQuestionController.java

@@ -81,6 +81,14 @@ public class TaQuestionController extends BaseController {
         queryWrapper.orderByAsc("sort_no");
 
         IPage<TaQuestion> result = iTaQuestionService.page(pg, queryWrapper);
+
+        // 如果是微信端请求
+        if ("wx".equals(client) && result.getTotal() > 0) {
+            for(TaQuestion question : result.getRecords()) {
+                question.setAnswerList(iTaAnswerService.getListByQuestion(question, true));
+            }
+        }
+
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/training/entity/TaCourse.java

@@ -2,6 +2,8 @@ package com.yunzhi.training.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -36,6 +38,9 @@ public class TaCourse implements Serializable {
     @ApiModelProperty(value = "课程简介")
     private String subTitle;
 
+    @ApiModelProperty(value = "封面图")
+    private String thumb;
+
     @ApiModelProperty(value = "开始时间")
     private LocalDateTime startDate;
 
@@ -51,5 +56,7 @@ public class TaCourse implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否收藏")
+    private Boolean isFavored;
 }

src/main/java/com/yunzhi/training/service/ITaStudentService.java

@@ -14,4 +14,6 @@ import com.yunzhi.training.entity.TaStudent;
 public interface ITaStudentService extends IBaseService<TaStudent> {
 
     IPage<TaStudent> getPageBy(IPage<TaStudent> pg, String termId, String classId, String name, String phone);
+
+    long countALL();
 }

src/main/java/com/yunzhi/training/service/impl/TaStudentServiceImpl.java

@@ -1,6 +1,8 @@
 package com.yunzhi.training.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.common.Constants;
 import com.yunzhi.training.entity.TaStudent;
 import com.yunzhi.training.mapper.TaStudentMapper;
 import com.yunzhi.training.service.ITaStudentService;
@@ -21,4 +23,12 @@ public class TaStudentServiceImpl extends BaseServiceImpl<TaStudentMapper, TaStu
     public IPage<TaStudent> getPageBy(IPage<TaStudent> pg, String termId, String classId, String name, String phone) {
         return baseMapper.getPageBy(pg, termId, classId, name, phone);
     }
+
+    @Override
+    public long countALL() {
+        QueryWrapper<TaStudent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+
+        return count(queryWrapper);
+    }
 }