评论

platform-admin/src/main/java/com/platform/controller/TbCfUserInfoController.java

 package com.platform.controller;
 
 import com.platform.entity.TbCfUserInfoEntity;
+import com.platform.entity.VirtualUserEntity;
 import com.platform.service.TbCfUserInfoService;
 import com.platform.utils.PageUtils;
 import com.platform.utils.Query;
@@ -163,4 +164,11 @@ public class TbCfUserInfoController {
         String rate = tbCfUserInfoService.getDayRate();
         return R.ok().put("rate", rate);
     }
+
+    @ResponseBody
+    @GetMapping("/queryVirtualUser")
+    public R queryVirtualUser(){
+        List<VirtualUserEntity> list = tbCfUserInfoService.queryVirtualUser();
+        return R.ok().put("list", list);
+    }
 }

platform-admin/src/main/java/com/platform/controller/VirtualUserController.java

-package com.platform.controller;
-
-import com.platform.entity.VirtualUserEntity;
-import com.platform.service.VirtualUserService;
-import com.platform.utils.PageUtils;
-import com.platform.utils.Query;
-import com.platform.utils.R;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Controller
- *
- * @author lipengjun
- * @date 2021-01-27 10:21:45
- */
-@Controller
-@RequestMapping("virtualuser")
-public class VirtualUserController {
-    @Autowired
-    private VirtualUserService virtualUserService;
-
-    /**
-     * 查看列表
-     */
-    @RequestMapping("/list")
-    @RequiresPermissions("virtualuser:list")
-    @ResponseBody
-    public R list(@RequestParam Map<String, Object> params) {
-        //查询列表数据
-        Query query = new Query(params);
-
-        List<VirtualUserEntity> virtualUserList = virtualUserService.queryList(query);
-        int total = virtualUserService.queryTotal(query);
-
-        PageUtils pageUtil = new PageUtils(virtualUserList, total, query.getLimit(), query.getPage());
-
-        return R.ok().put("page", pageUtil);
-    }
-
-    /**
-     * 查看信息
-     */
-    @RequestMapping("/info/{id}")
-    @RequiresPermissions("virtualuser:info")
-    @ResponseBody
-    public R info(@PathVariable("id") String id) {
-        VirtualUserEntity virtualUser = virtualUserService.queryObject(id);
-
-        return R.ok().put("virtualUser", virtualUser);
-    }
-
-    /**
-     * 保存
-     */
-    @RequestMapping("/save")
-    @RequiresPermissions("virtualuser:save")
-    @ResponseBody
-    public R save(@RequestBody VirtualUserEntity virtualUser) {
-        virtualUserService.save(virtualUser);
-
-        return R.ok();
-    }
-
-    /**
-     * 修改
-     */
-    @RequestMapping("/update")
-    @RequiresPermissions("virtualuser:update")
-    @ResponseBody
-    public R update(@RequestBody VirtualUserEntity virtualUser) {
-        virtualUserService.update(virtualUser);
-
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @RequestMapping("/delete")
-    @RequiresPermissions("virtualuser:delete")
-    @ResponseBody
-    public R delete(@RequestBody String[] ids) {
-        virtualUserService.deleteBatch(ids);
-
-        return R.ok();
-    }
-
-    /**
-     * 查看所有列表
-     */
-    @RequestMapping("/queryAll")
-    @ResponseBody
-    public R queryAll(@RequestParam Map<String, Object> params) {
-
-        List<VirtualUserEntity> list = virtualUserService.queryList(params);
-
-        return R.ok().put("list", list);
-    }
-}

platform-admin/src/main/java/com/platform/dao/TbCfUserInfoDao.java

 package com.platform.dao;
 
 import com.platform.entity.TbCfUserInfoEntity;
+import com.platform.entity.VirtualUserEntity;
 import com.platform.vo.StatisticalVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,4 +39,6 @@ public interface TbCfUserInfoDao extends BaseDao<TbCfUserInfoEntity> {
     int getYesterdayRegistered();
 
     int getTodayRegistered();
+
+    List<VirtualUserEntity> queryVirtualUser();
 }

platform-admin/src/main/java/com/platform/entity/TbCfUserInfoEntity.java

@@ -103,6 +103,16 @@ public class TbCfUserInfoEntity implements Serializable {
 
     private String country;
 
+    private Integer real;
+
+    public Integer getReal() {
+        return real;
+    }
+
+    public void setReal(Integer real) {
+        this.real = real;
+    }
+
     public String getCountry() {
         return country;
     }

platform-admin/src/main/java/com/platform/entity/VirtualUserEntity.java

@@ -16,7 +16,7 @@ public class VirtualUserEntity implements Serializable {
     /**
      * 虚拟用户ID
      */
-    private String id;
+    private String userId;
     /**
      * 虚拟账号
      */
@@ -29,32 +29,14 @@ public class VirtualUserEntity implements Serializable {
      * 头像
      */
     private String avatar;
-    /**
-     * 状态 0：已删除 1：正常
-     */
-    private Integer status;
+
     /**
      * 创建时间
      */
     private Date createTime;
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
 
-    /**
-     * 设置：虚拟用户ID
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
 
-    /**
-     * 获取：虚拟用户ID
-     */
-    public String getId() {
-        return id;
-    }
+
     /**
      * 设置：虚拟账号
      */
@@ -94,19 +76,7 @@ public class VirtualUserEntity implements Serializable {
     public String getAvatar() {
         return avatar;
     }
-    /**
-     * 设置：状态 0：已删除 1：正常
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
 
-    /**
-     * 获取：状态 0：已删除 1：正常
-     */
-    public Integer getStatus() {
-        return status;
-    }
     /**
      * 设置：创建时间
      */
@@ -120,17 +90,5 @@ public class VirtualUserEntity implements Serializable {
     public Date getCreateTime() {
         return createTime;
     }
-    /**
-     * 设置：更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 
-    /**
-     * 获取：更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
 }

platform-admin/src/main/java/com/platform/service/TbCfUserInfoService.java

 package com.platform.service;
 
 import com.platform.entity.TbCfUserInfoEntity;
+import com.platform.entity.VirtualUserEntity;
 import com.platform.vo.StatisticalVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -90,4 +91,6 @@ public interface TbCfUserInfoService {
     List<StatisticalVo> getRegisteredByDate(String start, String end);
 
     String getDayRate();
+
+    List<VirtualUserEntity> queryVirtualUser();
 }

platform-admin/src/main/java/com/platform/service/VirtualUserService.java

-package com.platform.service;
-
-import com.platform.entity.VirtualUserEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service接口
- *
- * @author lipengjun
- * @date 2021-01-27 10:21:45
- */
-public interface VirtualUserService {
-
-    /**
-     * 根据主键查询实体
-     *
-     * @param id 主键
-     * @return 实体
-     */
-    VirtualUserEntity queryObject(String id);
-
-    /**
-     * 分页查询
-     *
-     * @param map 参数
-     * @return list
-     */
-    List<VirtualUserEntity> queryList(Map<String, Object> map);
-
-    /**
-     * 分页统计总数
-     *
-     * @param map 参数
-     * @return 总数
-     */
-    int queryTotal(Map<String, Object> map);
-
-    /**
-     * 保存实体
-     *
-     * @param virtualUser 实体
-     * @return 保存条数
-     */
-    int save(VirtualUserEntity virtualUser);
-
-    /**
-     * 根据主键更新实体
-     *
-     * @param virtualUser 实体
-     * @return 更新条数
-     */
-    int update(VirtualUserEntity virtualUser);
-
-    /**
-     * 根据主键删除
-     *
-     * @param id
-     * @return 删除条数
-     */
-    int delete(String id);
-
-    /**
-     * 根据主键批量删除
-     *
-     * @param ids
-     * @return 删除条数
-     */
-    int deleteBatch(String[] ids);
-}

platform-admin/src/main/java/com/platform/service/impl/TbCfItemCommentServiceImpl.java

@@ -48,25 +48,7 @@ public class TbCfItemCommentServiceImpl implements TbCfItemCommentService {
 
     @Override
     public List<TbCfItemCommentEntity> queryList(Map<String, Object> map) {
-        List<TbCfItemCommentEntity> comments = new ArrayList<>();
-        List<TbCfItemCommentEntity> list = tbCfItemCommentDao.queryList(map);
-        list.forEach(comment -> {
-            String real = comment.getReal().toString();
-            String userId = comment.getUserId();
-            //真实评论
-            if ("1".equals(real)) {
-                TbCfUserInfoEntity user = tbCfUserInfoDao.queryObject(userId);
-                if (user != null)
-                    comment.setUserName(user.getNick());
-            } else {
-                //虚拟评论
-                VirtualUserEntity virtualUser = virtualUserDao.queryObject(userId);
-                if (virtualUser != null)
-                    comment.setUserName(virtualUser.getNick());
-            }
-            comments.add(comment);
-        });
-        return comments;
+        return tbCfItemCommentDao.queryList(map);
     }
 
     @Override

platform-admin/src/main/java/com/platform/service/impl/TbCfUserInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.platform.service.impl;
 
 import com.platform.dao.TbCfUserInfoDao;
 import com.platform.entity.TbCfUserInfoEntity;
+import com.platform.entity.VirtualUserEntity;
 import com.platform.service.TbCfUserInfoService;
 import com.platform.utils.IdUtil;
 import com.platform.vo.StatisticalVo;
@@ -127,4 +128,9 @@ public class TbCfUserInfoServiceImpl implements TbCfUserInfoService {
         rate = (dayRegistered - yesterdayRegistered) / yesterdayRegistered * 100d;
         return dcmFmt.format(rate);
     }
+
+    @Override
+    public List<VirtualUserEntity> queryVirtualUser() {
+        return tbCfUserInfoDao.queryVirtualUser();
+    }
 }

platform-admin/src/main/java/com/platform/service/impl/VirtualUserServiceImpl.java

-package com.platform.service.impl;
-
-import com.platform.dao.VirtualUserDao;
-import com.platform.entity.VirtualUserEntity;
-import com.platform.service.VirtualUserService;
-import com.platform.utils.IdUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Service实现类
- *
- * @author lipengjun
- * @date 2021-01-27 10:21:45
- */
-@Service("virtualUserService")
-public class VirtualUserServiceImpl implements VirtualUserService {
-    @Autowired
-    private VirtualUserDao virtualUserDao;
-
-    @Override
-    public VirtualUserEntity queryObject(String id) {
-        return virtualUserDao.queryObject(id);
-    }
-
-    @Override
-    public List<VirtualUserEntity> queryList(Map<String, Object> map) {
-        return virtualUserDao.queryList(map);
-    }
-
-    @Override
-    public int queryTotal(Map<String, Object> map) {
-        return virtualUserDao.queryTotal(map);
-    }
-
-    @Override
-    public int save(VirtualUserEntity virtualUser) {
-        virtualUser.setId(IdUtil.createIdbyUUID());
-        virtualUser.setCreateTime(new Date());
-        virtualUser.setUpdateTime(new Date());
-        virtualUser.setStatus(1);
-        return virtualUserDao.save(virtualUser);
-    }
-
-    @Override
-    public int update(VirtualUserEntity virtualUser) {
-        virtualUser.setUpdateTime(new Date());
-        return virtualUserDao.update(virtualUser);
-    }
-
-    @Override
-    public int delete(String id) {
-        return virtualUserDao.delete(id);
-    }
-
-    @Override
-    public int deleteBatch(String[] ids) {
-        return virtualUserDao.deleteBatch(ids);
-    }
-}