Merge branch 'medal-mybatis' into 'master'

Medal mybatis







See merge request !17

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/mapper/MedalMapper.java

@@ -24,8 +24,8 @@ public interface MedalMapper {
     void save(Medal medal);
 
     @Update("update medal set name=#{name},description=#{description},is_deleted=#{isDeleted} where id=#{id}")
-    void update(Medal medal);
+    void gupdate(Medal medal);
 
-    @Select("select * from medal where name like concat('%',#{keyword},'%')")
+    @Select("select * from medal where name like concat('%',#{keyword},'%') and is_deleted=0")
     List<Medal> findAll(String keyword);
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/IntegralController.java

@@ -11,12 +11,10 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 
@@ -53,4 +51,11 @@ public class IntegralController extends BaseController{
                                        HttpServletRequest request){
         return medalLogic.getMedals(keyword,userId);
     }
+
+    @RequestMapping(value = UrlConstants.API_MEDAL,method = RequestMethod.DELETE)
+    public boolean getIntegrals(@RequestParam(value = "medalId")Long medalId,
+                                       HttpServletRequest request){
+        medalLogic.deleteMedal(medalId);
+        return true;
+    }
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/logic/impl/MedalLogicImpl.java

@@ -58,7 +58,7 @@ public class MedalLogicImpl extends BaseLogic implements MedalLogic {
         medal.setName(dto.getName());
         medal.setDescription(dto.getDescription());
         medal.setImgUrl(dto.getImgUrl());
-        medalService.saveMedal(medal);
+        medalService.updateMedal(medal);
         return dto;
     }
 
@@ -69,7 +69,7 @@ public class MedalLogicImpl extends BaseLogic implements MedalLogic {
             throw new HttpBadRequestException("medal not exists");
         }
         medal.setDeleted(DeleteStatus.IS_DELETED);
-        medalService.saveMedal(medal);
+        medalService.updateMedal(medal);
     }
 
     @Override