feats

src/main/java/com/yunzhi/training/controller/TaAttachmentController.java

@@ -4,7 +4,9 @@ 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.yunzhi.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
 import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +48,24 @@ public class TaAttachmentController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taAttachment",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/attachment",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAttachmentList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taAttachmentList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                         @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @ApiParam("附件类型") @RequestParam(value ="attchType", defaultValue = "image") String attchType,
+                                         @ApiParam("所属包组") @RequestParam(value ="packId", required = false) String packId) throws Exception{
 
-		    IPage<TaAttachment> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaAttachment> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaAttachment> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaAttachment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(attchType), "attch_type", attchType);
+        queryWrapper.eq(!StringUtils.isEmpty(packId), "pack_id", packId);
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+        queryWrapper.eq("wx".equals(client), "state", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaAttachment> result = iTaAttachmentService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaAttachment> result = iTaAttachmentService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**
@@ -64,10 +73,22 @@ public class TaAttachmentController extends BaseController {
      * @param taAttachment 实体对象
      * @return
      */
-    @RequestMapping(value="/taAttachment",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/attachment",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taAttachmentAdd(@ApiParam("保存内容") @RequestBody TaAttachment taAttachment) throws Exception{
 
+        if (StringUtils.isEmpty(taAttachment.getUrl())) {
+            return ResponseBean.error("请设置附件地址", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(taAttachment.getPackId())) {
+            return ResponseBean.error("请设置附件包组", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(taAttachment.getAttchType())) {
+            taAttachment.setAttchType("image");
+        }
+
+        taAttachment.setAttchId(null);
+
         if (iTaAttachmentService.save(taAttachment)){
             return ResponseBean.success(taAttachment);
         }else {
@@ -79,10 +100,10 @@ public class TaAttachmentController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taAttachment/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/attachment/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taAttachmentDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaAttachmentService.removeById(id)){
+    public ResponseBean taAttachmentDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaAttachmentService.removeLogicById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -95,10 +116,21 @@ public class TaAttachmentController extends BaseController {
      * @param taAttachment 实体对象
      * @return
      */
-    @RequestMapping(value="/taAttachment/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/attachment/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taAttachmentUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taAttachmentUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaAttachment taAttachment) throws Exception{
+        if (StringUtils.isEmpty(taAttachment.getUrl())) {
+            return ResponseBean.error("请设置附件地址", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(taAttachment.getPackId())) {
+            return ResponseBean.error("请设置附件包组", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (StringUtils.isEmpty(taAttachment.getAttchType())) {
+            taAttachment.setAttchType("image");
+        }
+
+        taAttachment.setAttchId(id);
 
         if (iTaAttachmentService.updateById(taAttachment)){
             return ResponseBean.success(iTaAttachmentService.getById(id));
@@ -107,13 +139,13 @@ public class TaAttachmentController extends BaseController {
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taAttachment/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taAttachmentGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaAttachmentService.getById(id));
-    }
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taAttachment/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taAttachmentGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaAttachmentService.getById(id));
+//    }
 }

src/main/java/com/yunzhi/training/controller/TaAttchPackController.java

@@ -0,0 +1,145 @@
+package com.yunzhi.training.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.yunzhi.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
+import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.training.service.ITaAttchPackService;
+import com.yunzhi.training.entity.TaAttchPack;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 附件包组 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "附件包组")
+@RestController
+@RequestMapping("/")
+public class TaAttchPackController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaAttchPackController.class);
+
+    @Autowired
+    public ITaAttchPackService iTaAttchPackService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/attchPack",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taAttchPackList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                        @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        IPage<TaAttchPack> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaAttchPack> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+        queryWrapper.eq("wx".equals(client), "state", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaAttchPack> result = iTaAttchPackService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taAttchPack 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/attch-pack",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taAttchPackAdd(@ApiParam("保存内容") @RequestBody TaAttchPack taAttchPack) throws Exception{
+
+        if (StringUtils.isEmpty(taAttchPack.getName())) {
+            return ResponseBean.error("请设置名称", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        int cnt = iTaAttchPackService.countBy("name", taAttchPack.getName(), true);
+        if (cnt > 0) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taAttchPack.setPackId(null);
+
+        if (iTaAttchPackService.save(taAttchPack)){
+            return ResponseBean.success(taAttchPack);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/attch-pack/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taAttchPackDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaAttchPackService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taAttchPack 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/attch-pack/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taAttchPackUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaAttchPack taAttchPack) throws Exception{
+        if (StringUtils.isEmpty(taAttchPack.getName())) {
+            return ResponseBean.error("请设置名称", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaAttchPack exist = iTaAttchPackService.getByButNot("name", taAttchPack.getName(), "pack_id", id, true);
+        if (exist != null) {
+            return ResponseBean.error("名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taAttchPack.setPackId(id);
+
+        if (iTaAttchPackService.updateById(taAttchPack)){
+            return ResponseBean.success(iTaAttchPackService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taAttchPack/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taAttchPackGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaAttchPackService.getById(id));
+//    }
+}

src/main/java/com/yunzhi/training/entity/TaAttachment.java

@@ -27,7 +27,7 @@ public class TaAttachment implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "附件ID")
-    @TableId(value = "attch_id", type = IdType.INPUT)
+    @TableId(value = "attch_id", type = IdType.UUID)
     private String attchId;
 
     @ApiModelProperty(value = "附件类型")

src/main/java/com/yunzhi/training/entity/TaAttchPack.java

@@ -0,0 +1,43 @@
+package com.yunzhi.training.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 附件包组
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaAttchPack对象", description="附件包组")
+public class TaAttchPack implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "包组ID")
+    @TableId(value = "pack_id", type = IdType.UUID)
+    private String packId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/training/mapper/TaAttchPackMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.training.mapper;
+
+import com.yunzhi.training.entity.TaAttchPack;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 附件包组 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaAttchPackMapper extends BaseMapper<TaAttchPack> {
+
+}

src/main/java/com/yunzhi/training/service/ITaAttachmentService.java

@@ -1,7 +1,6 @@
 package com.yunzhi.training.service;
 
 import com.yunzhi.training.entity.TaAttachment;
-import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -11,6 +10,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author yansen
  * @since 2022-02-21
  */
-public interface ITaAttachmentService extends IService<TaAttachment> {
+public interface ITaAttachmentService extends IBaseService<TaAttachment> {
 
 }

src/main/java/com/yunzhi/training/service/ITaAttchPackService.java

@@ -0,0 +1,15 @@
+package com.yunzhi.training.service;
+
+import com.yunzhi.training.entity.TaAttchPack;
+
+/**
+ * <p>
+ * 附件包组 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaAttchPackService extends IBaseService<TaAttchPack> {
+
+}

src/main/java/com/yunzhi/training/service/impl/TaAttachmentServiceImpl.java

@@ -3,7 +3,6 @@ package com.yunzhi.training.service.impl;
 import com.yunzhi.training.entity.TaAttachment;
 import com.yunzhi.training.mapper.TaAttachmentMapper;
 import com.yunzhi.training.service.ITaAttachmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +14,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-02-21
  */
 @Service
-public class TaAttachmentServiceImpl extends ServiceImpl<TaAttachmentMapper, TaAttachment> implements ITaAttachmentService {
+public class TaAttachmentServiceImpl extends BaseServiceImpl<TaAttachmentMapper, TaAttachment> implements ITaAttachmentService {
 
 }

src/main/java/com/yunzhi/training/service/impl/TaAttchPackServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yunzhi.training.service.impl;
+
+import com.yunzhi.training.entity.TaAttchPack;
+import com.yunzhi.training.mapper.TaAttchPackMapper;
+import com.yunzhi.training.service.ITaAttchPackService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 附件包组 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaAttchPackServiceImpl extends BaseServiceImpl<TaAttchPackMapper, TaAttchPack> implements ITaAttchPackService {
+
+}

src/main/resources/mapper/TaAttchPackMapper.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.yunzhi.training.mapper.TaAttchPackMapper">
+
+</mapper>