修改页面

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserCollectDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.math.BigDecimal;
+
+/**
+ * 我的收藏
+ */
+@Data
+public class AppUserCollectDTO {
+
+    @ApiModelProperty("主键id")
+    @GeneratedValue(generator = "JDBC")
+    private Integer id;
+
+    @ApiModelProperty("用户id")
+    private Integer userId;
+
+    @ApiModelProperty("收藏类型;1-租车；2-旅游")
+    private Integer type;
+
+    @ApiModelProperty("类型id")
+    private Integer typeId;
+
+    @ApiModelProperty("类型id名称")
+    private String name;
+
+    @ApiModelProperty("封面")
+    private String cover;
+
+    @ApiModelProperty("价格")
+    private BigDecimal price;
+
+    @ApiModelProperty("单位")
+    private BigDecimal unit;
+
+    @ApiModelProperty("是否删除；0-正常；1-删除")
+    private Integer isDel;
+
+}
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserCollectBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.dto.AppUserCollectDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserCollect;
 import com.github.wxiaoqi.security.admin.mapper.AppUserCollectMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
 
 /**
  * ${DESCRIPTION}
@@ -20,11 +29,52 @@ public class AppUserCollectBiz extends BaseBiz<AppUserCollectMapper, AppUserColl
 
 
     //新增收藏
-    public ObjectRestResponse addUserCollect(){
-
+    public ObjectRestResponse addUserCollect(AppUserCollectDTO collectDTO){
+          if(collectDTO==null){
+              return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+          }
+          AppUserCollect collect=new AppUserCollect();
+          BeanUtils.copyProperties(collect,collectDTO);
+          insertSelective(collect);
+         return  ObjectRestResponse.succ();
+    }
 
-          return  ObjectRestResponse.succ();
+    //更新收藏
+    public ObjectRestResponse upUserCollect(AppUserCollectDTO collectDTO){
+        if(collectDTO==null){
+            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        AppUserCollect collect=new AppUserCollect();
+        BeanUtils.copyProperties(collect,collectDTO);
+        updateSelectiveById(collect);
+        return  ObjectRestResponse.succ();
     }
+    //查看是否收藏
+    public ObjectRestResponse checkUserCollect(Integer id,Integer userId){
+        Example example = new Example(AppUserCollect.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("user_id",userId).andEqualTo("type_id",id).andEqualTo("is_del",0);
+       int count=selectCountByExample(example);
+       boolean falg=count>0?false:true;
+        return  ObjectRestResponse.succ(falg);
+    }
+    //我的收藏
+    public ObjectRestResponse getCollectList(Integer userId,int page,int limit){
+        Example example = new Example(AppUserCollect.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("user_id",userId).andEqualTo("is_del",0);
+        example.setOrderByClause("`id` desc");
+        List<AppUserCollect> list=selectByExample(example);
+        PageHelper.startPage(page,limit);
+        PageInfo<AppUserCollect> pageInfo = new PageInfo<>(mapper.selectByExample(example));
+        return  ObjectRestResponse.succ(PageDataVO.pageInfo(pageInfo));
+    }
+
+
+
+
+
+
 
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -10,8 +10,6 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
-
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 /**

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserCollectController.java

+package com.github.wxiaoqi.security.admin.rest;
+
+import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserCollectBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
+import com.github.wxiaoqi.security.admin.dto.AppUserCollectDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUser;
+import com.github.wxiaoqi.security.admin.entity.Group;
+import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.msg.TableResultResponse;
+import com.github.wxiaoqi.security.common.rest.CommonBaseController;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author keliii
+ */
+@RestController
+@RequestMapping("app/user")
+@Slf4j
+public class AppUserCollectController extends CommonBaseController {
+
+
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+    @Autowired
+    AppUserCollectBiz collectBiz;
+
+
+    /**
+     * 我的收藏
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GetMapping("/collect/page")
+    @ApiModelProperty("我的收藏")
+    public ObjectRestResponse list(
+            @RequestParam(value = "page",defaultValue = "1")Integer page,
+            @RequestParam(value = "limit",defaultValue = "10")Integer limit
+    ) {
+        try {
+            String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
+            if (username == null) {
+                throw new Exception();
+            }
+            Integer userid=Integer.parseInt(username);
+            return collectBiz.getCollectList(userid,page,limit);
+        }catch (Exception e) {
+            log.error(e.getMessage());
+            return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
+        }
+    }
+
+    @RequestMapping(value = "/collect/add",method = RequestMethod.POST)
+    @ApiModelProperty("添加收藏")
+    public ObjectRestResponse add(@RequestBody AppUserCollectDTO collectDTO)throws Exception{
+        String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
+        if (username == null) {
+            throw new Exception();
+        }
+        Integer userid=Integer.parseInt(username);
+        collectDTO.setUserId(userid);
+        return collectBiz.addUserCollect(collectDTO);
+    }
+
+    @RequestMapping(value = "/collect/{id}",method = RequestMethod.GET)
+    @ApiModelProperty("查看是否收藏")
+    public ObjectRestResponse<AppUser> get(@PathVariable Integer id)throws Exception{
+        String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
+        if (username == null) {
+            throw new Exception();
+        }
+        Integer userid=Integer.parseInt(username);
+        return collectBiz.checkUserCollect(userid,id);
+    }
+    /**
+     * 取消收藏
+     * @param collectDTO
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/collect/remove")
+    @ApiModelProperty("取消收藏")
+    public ObjectRestResponse remove(@RequestBody AppUserCollectDTO collectDTO)throws Exception {
+        return collectBiz.upUserCollect(collectDTO);
+    }
+
+
+}