案例管理

src/main/java/com/fdkankan/manage/controller/CaseClassController.java

@@ -1,59 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.Result;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.entity.CaseClass;
-import com.fdkankan.manage.service.ICaseClassService;
-import com.fdkankan.manage.vo.request.CaseParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@RestController
-@RequestMapping("/service/manage/caseClass")
-public class CaseClassController {
-
-    @Autowired
-    ICaseClassService caseClassService;
-
-    @PostMapping("/list")
-    public ResultData list(@RequestBody CaseParam param){
-        return ResultData.ok(caseClassService.pageList(param));
-    }
-
-    @PostMapping("/allList")
-    public ResultData allList(){
-        return ResultData.ok(caseClassService.list());
-    }
-
-    @PostMapping("/addOrUpdate")
-    public ResultData add(@RequestBody CaseClass param){
-        param.setCreateTime(null);
-        param.setUpdateTime(null);
-        caseClassService.saveOrUpdate(param);
-        return ResultData.ok();
-    }
-
-
-    @PostMapping("/del")
-    public ResultData del(@RequestBody CaseClass param){
-        if(param.getId() == null){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        caseClassService.removeById(param.getId());
-        return ResultData.ok();
-    }
-
-}
-

src/main/java/com/fdkankan/manage/controller/CaseController.java

@@ -6,8 +6,6 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.manage.entity.Case;
-import com.fdkankan.manage.entity.CaseClass;
-import com.fdkankan.manage.service.ICaseClassService;
 import com.fdkankan.manage.service.ICaseService;
 import com.fdkankan.manage.vo.request.CaseAddParam;
 import com.fdkankan.manage.vo.request.CaseParam;
@@ -42,7 +40,7 @@ public class CaseController {
 
 
     @PostMapping("/addOrUpdate")
-    public ResultData add(@RequestBody CaseAddParam param){
+    public ResultData addOrUpdate(@RequestBody CaseAddParam param){
         Case caseEntity = new Case();
         BeanUtils.copyProperties(param,caseEntity);
         if(param.getIconIdList() != null && param.getIconIdList().size() >0){
@@ -50,13 +48,13 @@ public class CaseController {
         }
         caseEntity.setCreateTime(null);
         caseEntity.setUpdateTime(null);
-        caseService.save(caseEntity);
+        caseService.saveOrUpdate(caseEntity);
         return ResultData.ok();
     }
 
 
     @PostMapping("/del")
-    public ResultData del(@RequestBody CaseClass param){
+    public ResultData del(@RequestBody CaseAddParam param){
         if(param.getId() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }

src/main/java/com/fdkankan/manage/controller/CaseIconController.java

@@ -1,63 +0,0 @@
-package com.fdkankan.manage.controller;
-
-
-import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.manage.entity.CaseClass;
-import com.fdkankan.manage.entity.CaseIcon;
-import com.fdkankan.manage.service.ICaseClassService;
-import com.fdkankan.manage.service.ICaseIconService;
-import com.fdkankan.manage.vo.request.CaseParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@RestController
-@RequestMapping("/service/manage/caseIcon")
-public class CaseIconController {
-
-    @Autowired
-    ICaseIconService caseIconService;
-
-    @PostMapping("/list")
-    public ResultData list(@RequestBody CaseParam param){
-        return ResultData.ok(caseIconService.pageList(param));
-    }
-
-    @PostMapping("/allList")
-    public ResultData allList(){
-        return ResultData.ok(caseIconService.list());
-    }
-
-    @PostMapping("/addOrUpdate")
-    public ResultData add(@RequestBody CaseIcon param){
-        param.setCreateTime(null);
-        param.setUpdateTime(null);
-        caseIconService.saveOrUpdate(param);
-        return ResultData.ok();
-    }
-
-
-
-    @PostMapping("/del")
-    public ResultData del(@RequestBody CaseClass param){
-        if(param.getId() == null){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        caseIconService.removeById(param.getId());
-        return ResultData.ok();
-    }
-}
-

src/main/java/com/fdkankan/manage/entity/Case.java

@@ -43,8 +43,8 @@ public class Case implements Serializable {
     /**
      * 案例文案
      */
-    @TableField("text")
-    private String text;
+    @TableField("sub_title")
+    private String subTitle;
 
     @TableField("type_id")
     private Integer typeId;
@@ -58,14 +58,12 @@ public class Case implements Serializable {
     @TableField("sort")
     private Integer sort;
 
-    @TableField("detail_title")
-    private String detailTitle;
+    @TableField("logo")
+    private String logo;
 
-    @TableField("detail_content")
-    private String detailContent;
+    @TableField("cover_image_url")
+    private String coverImageUrl;
 
-    @TableField("detail_image")
-    private String detailImage;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
@@ -77,5 +75,11 @@ public class Case implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("is_public")
+    private Integer isPublic;
+
+    @TableField("public_time")
+    private String publicTime;
+
 
 }

src/main/java/com/fdkankan/manage/entity/CaseClass.java

@@ -1,45 +0,0 @@
-package com.fdkankan.manage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@Getter
-@Setter
-@TableName("t_case_class")
-public class CaseClass implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @TableField("name")
-    private String name;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    @TableField("create_time")
-    private String createTime;
-
-    @TableField("update_time")
-    private String updateTime;
-
-
-}

src/main/java/com/fdkankan/manage/entity/CaseIcon.java

@@ -1,54 +0,0 @@
-package com.fdkankan.manage.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@Getter
-@Setter
-@TableName("t_case_icon")
-public class CaseIcon implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * icon名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * iconUrl
-     */
-    @TableField("url")
-    private String url;
-
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
-    private String recStatus;
-
-    @TableField("create_time")
-    private String createTime;
-
-    @TableField("update_time")
-    private String updateTime;
-
-
-}

src/main/java/com/fdkankan/manage/mapper/ICaseClassMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.manage.mapper;
-
-import com.fdkankan.manage.entity.CaseClass;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@Mapper
-public interface ICaseClassMapper extends BaseMapper<CaseClass> {
-
-}

src/main/java/com/fdkankan/manage/mapper/ICaseIconMapper.java

@@ -1,18 +0,0 @@
-package com.fdkankan.manage.mapper;
-
-import com.fdkankan.manage.entity.CaseIcon;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@Mapper
-public interface ICaseIconMapper extends BaseMapper<CaseIcon> {
-
-}

src/main/java/com/fdkankan/manage/service/ICaseClassService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.CaseClass;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.vo.request.CaseParam;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-public interface ICaseClassService extends IService<CaseClass> {
-
-    Object pageList(CaseParam param);
-}

src/main/java/com/fdkankan/manage/service/ICaseIconService.java

@@ -1,18 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.CaseIcon;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.vo.request.CaseParam;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-public interface ICaseIconService extends IService<CaseIcon> {
-
-    Object pageList(CaseParam param);
-}

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
+import com.fdkankan.common.util.MD5;
 import com.fdkankan.manage.common.ExcelErrorUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.Order;

src/main/java/com/fdkankan/manage/service/impl/CaseClassServiceImpl.java

@@ -1,30 +0,0 @@
-package com.fdkankan.manage.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.manage.entity.CaseClass;
-import com.fdkankan.manage.mapper.ICaseClassMapper;
-import com.fdkankan.manage.service.ICaseClassService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.vo.request.CaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@Service
-public class CaseClassServiceImpl extends ServiceImpl<ICaseClassMapper, CaseClass> implements ICaseClassService {
-
-    @Override
-    public Object pageList(CaseParam param) {
-
-        Page<CaseClass> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()));
-
-        return PageInfo.PageInfo(page);
-    }
-}

src/main/java/com/fdkankan/manage/service/impl/CaseIconServiceImpl.java

@@ -1,28 +0,0 @@
-package com.fdkankan.manage.service.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.response.PageInfo;
-import com.fdkankan.manage.entity.CaseIcon;
-import com.fdkankan.manage.mapper.ICaseIconMapper;
-import com.fdkankan.manage.service.ICaseIconService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.manage.vo.request.CaseParam;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2022-10-25
- */
-@Service
-public class CaseIconServiceImpl extends ServiceImpl<ICaseIconMapper, CaseIcon> implements ICaseIconService {
-
-    @Override
-    public Object pageList(CaseParam param) {
-        Page<CaseIcon> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()));
-        return PageInfo.PageInfo(page);
-    }
-}

src/main/java/com/fdkankan/manage/service/impl/CaseServiceImpl.java

@@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Case;
-import com.fdkankan.manage.entity.CaseIcon;
 import com.fdkankan.manage.mapper.ICaseMapper;
-import com.fdkankan.manage.service.ICaseIconService;
 import com.fdkankan.manage.service.ICaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.vo.request.CaseParam;
@@ -33,8 +31,6 @@ import java.util.List;
 @Service
 public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements ICaseService {
 
-    @Autowired
-    ICaseIconService caseIconService;
 
 
     @Override
@@ -43,27 +39,23 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements I
         if(param.getTypeId() != null){
             wrapper.eq(Case::getTypeId,param.getTypeId());
         }
+        if(StringUtils.isNotBlank(param.getTitle())){
+            wrapper.like(Case::getTitle,param.getTitle());
+        }
+        if(StringUtils.isNotBlank(param.getStartTime())){
+            wrapper.gt(Case::getPublicTime,param.getStartTime());
+        }
+        if(StringUtils.isNotBlank(param.getEndTime())){
+            wrapper.lt(Case::getPublicTime,param.getEndTime());
+        }
         wrapper.orderByAsc(Case::getSort);
         wrapper.orderByDesc(Case::getCreateTime);
         Page<Case> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-        List<CaseIcon> list = caseIconService.list();
-        HashMap<Integer,CaseIcon> map = new HashMap<>();
-        for (CaseIcon icon : list) {
-            map.put(icon.getId(),icon);
-        }
 
         List<CaseVo> caseVos = new ArrayList<>();
         for (Case record : page.getRecords()) {
             CaseVo vo = new CaseVo();
             BeanUtils.copyProperties(record,vo);
-            String iconIds = record.getIconIds();
-            JSONArray jsonArray = JSONObject.parseArray(iconIds);
-            List<CaseIcon> iconList = new ArrayList<>();
-            for (Object o : jsonArray) {
-                Integer id = (Integer) o;
-                iconList.add(map.get(id));
-            }
-            vo.setIconList(iconList);
             caseVos.add(vo);
         }
         Page<CaseVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());

src/main/java/com/fdkankan/manage/vo/request/CaseParam.java

@@ -1,9 +1,31 @@
 package com.fdkankan.manage.vo.request;
 
 import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.manage.util.Dateutils;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class CaseParam extends RequestBase {
     private Integer typeId;
+    private String title;
+    private List<String> publicTime;
+    private String startTime;
+    private String endTime;
+
+
+    public String getStartTime() {
+        if(publicTime != null && publicTime.size() >1){
+            return Dateutils.getStartTime(publicTime.get(0));
+        }
+        return Dateutils.getStartTime(startTime);
+    }
+
+    public String getEndTime() {
+        if(publicTime != null && publicTime.size() >1){
+            return Dateutils.getEndTime(publicTime.get(1));
+        }
+        return Dateutils.getEndTime(endTime);
+    }
 }

src/main/resources/mapper/manage/CaseClassMapper.xml

@@ -1,5 +0,0 @@
-<?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.fdkankan.manage.mapper.ICaseClassMapper">
-
-</mapper>

src/main/resources/mapper/manage/CaseIconMapper.xml

@@ -1,5 +0,0 @@
-<?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.fdkankan.manage.mapper.ICaseIconMapper">
-
-</mapper>