Merge branch 'dev' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/RiceTask.java

@@ -1,46 +0,0 @@
-package com.izouma.nineth.domain;
-
-
-import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-
-/**
- * id：任务的唯一标识，使用自增长主键。
- * name：任务的名称。
- * description：任务的描述。
- * type：任务的类型，例如签到任务、邀请任务、积分兑换任务等。
- * score：任务完成后可以获得的积分数。
- * maxTimesPerDay：每天最多可以完成的次数。
- * lastResetTime：最近一次重置任务的时间戳，用于判断是否需要重置任务进度。
- * 这个实体类还可以根据实际情况进行扩展，例如可以增加任务的开始时间、结束时间等字段。
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@ApiModel("水稻定时任务")
-public class RiceTask extends BaseEntity {
-
-    @Column(name = "name")
-    private String name;
-
-    @Column(name = "description")
-    private String description;
-
-    @Column(name = "type")
-    private String type;
-
-    @Column(name = "score")
-    private Integer score;
-
-    @Column(name = "max_times_per_day")
-    private Integer maxTimesPerDay;
-
-    @Column(name = "last_reset_time")
-    private Long lastResetTime;
-}

src/main/java/com/izouma/nineth/domain/RiceWaterTypeForWatreing.java

@@ -1,56 +0,0 @@
-package com.izouma.nineth.domain;
-
-
-import com.izouma.nineth.enums.RiceBubbleStatus;
-import com.izouma.nineth.enums.RiceWaterType;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import java.time.LocalDateTime;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@ApiModel("水稻水滴类型对应浇水")
-public class RiceWaterTypeForWatreing  extends BaseEntity {
-
-    @ApiModelProperty("用户ID")
-    @Column(name = "user_id")
-    private Long userId;
-
-    @ApiModelProperty("类型:水滴，活动积分,积分,经验值")
-    @Enumerated(EnumType.STRING)
-    private RiceWaterType type;
-
-
-    @ApiModelProperty("类型数量")
-    private Long counts;
-
-    @ApiModelProperty("气泡状态类型，未点击，已点击，已过期")
-    @Column(name = "rice_bubble_status")
-    private RiceBubbleStatus riceBubbleStatus;
-
-    @ApiModelProperty("气泡创建时间")
-    @Column(name = "bubble_created_at")
-    private LocalDateTime bubbleCreatedAt;
-
-    public  Long getCounts(){
-        return  counts == null ? 0 : counts;
-    }
-
-
-
-}
-
-
-
-
-

src/main/java/com/izouma/nineth/enums/RiceBubbleStatus.java

@@ -1,21 +0,0 @@
-package com.izouma.nineth.enums;
-
-
-public enum RiceBubbleStatus {
-
-    NOT_CLICKED("未点击"),
-    CLICKED("已点击"),
-    EXPIRED("已过期");
-
-
-
-    private final String description;
-
-    RiceBubbleStatus(String description) {
-        this.description = description;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-}

src/main/java/com/izouma/nineth/repo/RiceWaterTypeForWatreingRepo.java

@@ -1,16 +0,0 @@
-package com.izouma.nineth.repo;
-
-import com.izouma.nineth.domain.RiceWaterTypeForWatreing;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-
-import javax.transaction.Transactional;
-
-public interface RiceWaterTypeForWatreingRepo extends JpaRepository<RiceWaterTypeForWatreing, Long>, JpaSpecificationExecutor<RiceWaterTypeForWatreing> {
-    @Query("update RiceWaterTypeForWatreing t set t.del = true where t.id = ?1")
-    @Modifying
-    @Transactional
-    void softDelete(Long id);
-}

src/main/java/com/izouma/nineth/service/RiceWaterTypeForWatreingService.java

@@ -1,20 +0,0 @@
-package com.izouma.nineth.service;
-
-import com.izouma.nineth.domain.RiceWaterTypeForWatreing;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.repo.RiceWaterTypeForWatreingRepo;
-import com.izouma.nineth.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class RiceWaterTypeForWatreingService {
-
-    private RiceWaterTypeForWatreingRepo riceWaterTypeForWatreingRepo;
-
-    public Page<RiceWaterTypeForWatreing> all(PageQuery pageQuery) {
-        return riceWaterTypeForWatreingRepo.findAll(JpaUtils.toSpecification(pageQuery, RiceWaterTypeForWatreing.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/nineth/web/RiceWaterTypeForWatreingController.java

@@ -1,60 +0,0 @@
-package com.izouma.nineth.web;
-import com.izouma.nineth.domain.RiceWaterTypeForWatreing;
-import com.izouma.nineth.service.RiceWaterTypeForWatreingService;
-import com.izouma.nineth.dto.PageQuery;
-import com.izouma.nineth.exception.BusinessException;
-import com.izouma.nineth.repo.RiceWaterTypeForWatreingRepo;
-import com.izouma.nineth.utils.ObjUtils;
-import com.izouma.nineth.utils.excel.ExcelUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@RestController
-@RequestMapping("/riceWaterTypeForWatreing")
-@AllArgsConstructor
-public class RiceWaterTypeForWatreingController extends BaseController {
-    private RiceWaterTypeForWatreingService riceWaterTypeForWatreingService;
-    private RiceWaterTypeForWatreingRepo riceWaterTypeForWatreingRepo;
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/save")
-    public RiceWaterTypeForWatreing save(@RequestBody RiceWaterTypeForWatreing record) {
-        if (record.getId() != null) {
-            RiceWaterTypeForWatreing orig = riceWaterTypeForWatreingRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
-            ObjUtils.merge(orig, record);
-            return riceWaterTypeForWatreingRepo.save(orig);
-        }
-        return riceWaterTypeForWatreingRepo.save(record);
-    }
-
-
-    //@PreAuthorize("hasRole('ADMIN')")
-    @PostMapping("/all")
-    public Page<RiceWaterTypeForWatreing> all(@RequestBody PageQuery pageQuery) {
-        return riceWaterTypeForWatreingService.all(pageQuery);
-    }
-
-    @GetMapping("/get/{id}")
-    public RiceWaterTypeForWatreing get(@PathVariable Long id) {
-        return riceWaterTypeForWatreingRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-    }
-
-    @PostMapping("/del/{id}")
-    public void del(@PathVariable Long id) {
-        riceWaterTypeForWatreingRepo.softDelete(id);
-    }
-
-    @GetMapping("/excel")
-    @ResponseBody
-    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<RiceWaterTypeForWatreing> data = all(pageQuery).getContent();
-        ExcelUtils.export(response, data);
-    }
-}
-