bug fix

foyo-service/src/main/java/com/huiju/foyo/controller/LoginController.java

@@ -2,6 +2,9 @@ package com.huiju.foyo.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.huiju.foyo.common.ResponseBean;
+import com.huiju.foyo.model.SysUser;
+import com.huiju.foyo.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,16 +18,54 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/")
 public class LoginController {
+
+	@Autowired
+	ISysUserService iSysUserService;
 	
 	@PostMapping("/admin/login/login")
 	public ResponseBean login(@RequestBody String jsonString){
 		ResponseBean responseBean = new ResponseBean();
-		responseBean.addSuccess(jsonString);
+
+		JSONObject params = JSONObject.parseObject(jsonString);
+		if (null == params) {
+			responseBean.addError("请填写用户名及密码");
+			return responseBean;
+		}
+
+		String name = params.getString("name");
+		String passed = params.getString("password");
+
+		if (null == name || "".equals(name.trim()) || null == passed || "".equals(passed.trim())) {
+			responseBean.addError("用户名或者密码不正确");
+			return responseBean;
+		}
+
+		SysUser sysUser = iSysUserService.getUserByLoginName(name);
+
+		// 比较密码是否一致
+		// todo
+
+		// 生成 session 或者 token
+		// todo
+
+		// 返回内容密码为空
+		sysUser.setPasswd(null);
+
+		responseBean.addSuccess(sysUser);
 		return responseBean;
 	}
+
+	@PostMapping("/admin/login/logout")
+	public ResponseBean logout() {
+		// todo
+		return new ResponseBean();
+	}
 	
 	@GetMapping("/admin/user/info")
 	public String info(){
+		// 判断是否登录
+		// todo
+
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("roles","['admin']");
 		jsonObject.put("token","admin");

foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseController.java

@@ -49,12 +49,14 @@ public class TaCaseController extends BaseController {
      */
     @RequestMapping(value="/admin/case/list",method= RequestMethod.GET)
     public ResponseBean taCaseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(required = false) String type){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaCase> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCase> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != type, "type", type);
             queryWrapper.eq("status", ConstantFoyo.STATUS_EFFECTIVE);
             queryWrapper.orderByDesc("sort");
             queryWrapper.orderByDesc("create_time");
@@ -174,7 +176,9 @@ public class TaCaseController extends BaseController {
     @RequestMapping(value="/pc/case/{state}/list",method= RequestMethod.GET)
     public ResponseBean pcCaseList(@PathVariable String state,
                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(required = false) String caseType
+                                   ){
         ResponseBean responseBean = new ResponseBean();
         if (!state.equals(ConstantFoyo.TYPE_CASE) && !state.equals(ConstantFoyo.TYPE_MOVEMENT)){
             responseBean.addError("不符合的类型");
@@ -183,6 +187,7 @@ public class TaCaseController extends BaseController {
         try {
             IPage<TaCase> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCase> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != caseType && !"".equals(caseType.trim()), "ta_case_type_id", caseType);
             queryWrapper.eq("status", ConstantFoyo.STATUS_EFFECTIVE);
             queryWrapper.eq("type",state);
             queryWrapper.orderByDesc("topping");

foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseTypeController.java

@@ -47,14 +47,16 @@ public class TaCaseTypeController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/caseType/list",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/caseType/{type}/list",method= RequestMethod.GET)
     public ResponseBean taCaseTypeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                       @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @PathVariable String type){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaCaseType> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaCaseType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type", type);
             queryWrapper.orderByDesc("create_time");
 
             IPage<TaCaseType> result = iTaCaseTypeService.page(pg, queryWrapper);

foyo-service/src/main/java/com/huiju/foyo/controller/TaCaseIndexCoverController.java → foyo-service/src/main/java/com/huiju/foyo/controller/TaCoverController.java

@@ -1,13 +1,11 @@
 package com.huiju.foyo.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.foyo.common.BaseController;
 import com.huiju.foyo.common.ConstantFoyo;
 import com.huiju.foyo.common.ResponseBean;
-import com.huiju.foyo.model.TaCaseIndexCover;
-import com.huiju.foyo.service.ITaCaseIndexCoverService;
+import com.huiju.foyo.model.TaCover;
+import com.huiju.foyo.service.ITaCoverService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,12 +30,12 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/")
-public class TaCaseIndexCoverController extends BaseController {
+public class TaCoverController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCaseIndexCoverController.class);
+    private final Logger logger = LoggerFactory.getLogger(TaCoverController.class);
 
     @Autowired
-    public ITaCaseIndexCoverService iTaCaseIndexCoverService;
+    public ITaCoverService iTaCaseIndexCoverService;
 
 
     /**
@@ -46,12 +44,18 @@ public class TaCaseIndexCoverController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/case/cover",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/cover", method= RequestMethod.GET)
     public ResponseBean taCaseIndexCoverList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(required = false) String type
+                                             ){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaCaseIndexCoverService.list());
+            QueryWrapper<TaCover> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != type, "type", type);
+            queryWrapper.orderByDesc("create_time");
+
+            responseBean.addSuccess(iTaCaseIndexCoverService.list(queryWrapper));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taCaseIndexCoverList -=- {}",e.toString());
@@ -65,13 +69,16 @@ public class TaCaseIndexCoverController extends BaseController {
      * @param taCaseIndexCover 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/case/cover/add",method= RequestMethod.POST)
-    public ResponseBean taCaseIndexCoverAdd(@RequestBody TaCaseIndexCover taCaseIndexCover){
+    @RequestMapping(value="/admin/cover/add", method= RequestMethod.POST)
+    public ResponseBean taCaseIndexCoverAdd(
+            @RequestBody TaCover taCaseIndexCover){
         ResponseBean responseBean = new ResponseBean();
         try {
-            List<TaCaseIndexCover> taCaseIndexCoverList = iTaCaseIndexCoverService.list();
+            QueryWrapper<TaCover> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type", taCaseIndexCover.getType());
+            List<TaCover> taCaseIndexCoverList = iTaCaseIndexCoverService.list(queryWrapper);
             if (taCaseIndexCoverList.size() > 0){
-                TaCaseIndexCover taCaseIndexCoverUpdate = taCaseIndexCoverList.get(0);
+                TaCover taCaseIndexCoverUpdate = taCaseIndexCoverList.get(0);
                 taCaseIndexCoverUpdate.setUpdateTime(LocalDateTime.now());
                 taCaseIndexCoverUpdate.setCoverImg(taCaseIndexCover.getCoverImg());
                 if (iTaCaseIndexCoverService.updateById(taCaseIndexCoverUpdate)){
@@ -127,7 +134,7 @@ public class TaCaseIndexCoverController extends BaseController {
      */
     @RequestMapping(value="/taCaseIndexCover/{id}",method= RequestMethod.PUT)
     public ResponseBean taCaseIndexCoverUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCaseIndexCover taCaseIndexCover){
+                                        @RequestBody TaCover taCaseIndexCover){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCaseIndexCoverService.updateById(taCaseIndexCover)){
@@ -164,11 +171,14 @@ public class TaCaseIndexCoverController extends BaseController {
      * 分页查询列表
      * @return
      */
-    @RequestMapping(value="/pc/case/cover",method= RequestMethod.GET)
-    public ResponseBean pcCaseIndexCoverList(){
+    @RequestMapping(value="/pc/cover",method= RequestMethod.GET)
+    public ResponseBean pcCaseIndexCoverList(
+            @RequestParam(required = false) String type
+    ){
         ResponseBean responseBean = new ResponseBean();
         try {
-            QueryWrapper<TaCaseIndexCover> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<TaCover> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(null != type, "type", type);
             queryWrapper.last(" limit 1");
             responseBean.addSuccess(iTaCaseIndexCoverService.list(queryWrapper));
         }catch (Exception e){

foyo-service/src/main/java/com/huiju/foyo/controller/TdCompanyInfoController.java

@@ -1,12 +1,8 @@
 package com.huiju.foyo.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.foyo.common.BaseController;
 import com.huiju.foyo.common.ConstantFoyo;
 import com.huiju.foyo.common.ResponseBean;
-import com.huiju.foyo.model.TaCaseIndexCover;
 import com.huiju.foyo.model.TdCompanyInfo;
 import com.huiju.foyo.service.ITdCompanyInfoService;
 import org.slf4j.Logger;
@@ -21,7 +17,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.List;
 
 /**

foyo-service/src/main/java/com/huiju/foyo/dao/SysUserMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.foyo.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.foyo.model.SysUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 案例表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-21
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapper<SysUser> {
+
+}

foyo-service/src/main/java/com/huiju/foyo/dao/TaCaseIndexCoverMapper.java

@@ -1,7 +1,7 @@
 package com.huiju.foyo.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.foyo.model.TaCaseIndexCover;
+import com.huiju.foyo.model.TaCover;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2019-08-21
  */
 @Mapper
-public interface TaCaseIndexCoverMapper extends BaseMapper<TaCaseIndexCover> {
+public interface TaCaseIndexCoverMapper extends BaseMapper<TaCover> {
 
 }

foyo-service/src/main/java/com/huiju/foyo/model/SysUser.java

@@ -0,0 +1,52 @@
+package com.huiju.foyo.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private Integer userId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    private String loginName;
+
+    private String passwd;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+}

foyo-service/src/main/java/com/huiju/foyo/model/TaCaseType.java

@@ -57,5 +57,13 @@ public class TaCaseType implements Serializable {
      */
     private String typeName;
 
+    /**
+     * 发布类型
+     */
+    private String type;
 
+    /**
+     * 发布类型
+     */
+    private String description;
 }

foyo-service/src/main/java/com/huiju/foyo/model/TaCaseIndexCover.java → foyo-service/src/main/java/com/huiju/foyo/model/TaCover.java

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TaCaseIndexCover implements Serializable {
+public class TaCover implements Serializable {
 
     private static final long serialVersionUID = 1L;
     
@@ -57,5 +57,8 @@ public class TaCaseIndexCover implements Serializable {
      */
     private String coverImg;
 
-
+    /**
+     * 类型
+     */
+    private String type;
 }

foyo-service/src/main/java/com/huiju/foyo/service/ISysUserService.java

@@ -0,0 +1,8 @@
+package com.huiju.foyo.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.foyo.model.SysUser;
+
+public interface ISysUserService extends IService<SysUser> {
+    SysUser getUserByLoginName(String name);
+}

foyo-service/src/main/java/com/huiju/foyo/service/ITaCaseIndexCoverService.java → foyo-service/src/main/java/com/huiju/foyo/service/ITaCoverService.java

@@ -1,7 +1,7 @@
 package com.huiju.foyo.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.foyo.model.TaCaseIndexCover;
+import com.huiju.foyo.model.TaCover;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.huiju.foyo.model.TaCaseIndexCover;
  * @author jobob
  * @since 2019-08-21
  */
-public interface ITaCaseIndexCoverService extends IService<TaCaseIndexCover> {
+public interface ITaCoverService extends IService<TaCover> {
 
 }

foyo-service/src/main/java/com/huiju/foyo/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,33 @@
+package com.huiju.foyo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.foyo.dao.SysUserMapper;
+import com.huiju.foyo.model.SysUser;
+import com.huiju.foyo.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 案例表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-21
+ */
+@Service
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
+
+    @Autowired
+    SysUserMapper sysUserMapper;
+
+    @Override
+    public SysUser getUserByLoginName(String name) {
+        QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
+        wrapper.eq("login_name", name);
+        wrapper.last("limit 1");
+
+        return sysUserMapper.selectOne(wrapper);
+    }
+}

foyo-service/src/main/java/com/huiju/foyo/service/impl/TaCaseIndexCoverServiceImpl.java → foyo-service/src/main/java/com/huiju/foyo/service/impl/TaCoverServiceImpl.java

@@ -2,8 +2,8 @@ package com.huiju.foyo.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.foyo.dao.TaCaseIndexCoverMapper;
-import com.huiju.foyo.model.TaCaseIndexCover;
-import com.huiju.foyo.service.ITaCaseIndexCoverService;
+import com.huiju.foyo.model.TaCover;
+import com.huiju.foyo.service.ITaCoverService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2019-08-21
  */
 @Service
-public class TaCaseIndexCoverServiceImpl extends ServiceImpl<TaCaseIndexCoverMapper, TaCaseIndexCover> implements ITaCaseIndexCoverService {
+public class TaCoverServiceImpl extends ServiceImpl<TaCaseIndexCoverMapper, TaCover> implements ITaCoverService {
 
 }

foyo-service/src/main/resources/mapper/SysUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.foyo.dao.SysUserMapper">
+
+</mapper>