Merge branch 'lvzhoushi' into stock

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

@@ -0,0 +1,23 @@
+package com.izouma.nineth.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+public class RockRecord extends BaseEntity {
+    private Long userId;
+
+    private String operation;
+
+    private int num;
+
+    private int lastNum;
+}

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

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.RockRecord;
+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 RockRecordRepo extends JpaRepository<RockRecord, Long>, JpaSpecificationExecutor<RockRecord> {
+    @Query("update RockRecord t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -0,0 +1,24 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.RockRecord;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.RockRecordRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RockRecordService {
+
+    private RockRecordRepo rockRecordRepo;
+
+    public Page<RockRecord> all(PageQuery pageQuery) {
+        return rockRecordRepo.findAll(JpaUtils.toSpecification(pageQuery, RockRecord.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public void addRock(){
+
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.RockRecord;
+import com.izouma.nineth.service.RockRecordService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.RockRecordRepo;
+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("/rockRecord")
+@AllArgsConstructor
+public class RockRecordController extends BaseController {
+    private RockRecordService rockRecordService;
+    private RockRecordRepo rockRecordRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public RockRecord save(@RequestBody RockRecord record) {
+        if (record.getId() != null) {
+            RockRecord orig = rockRecordRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return rockRecordRepo.save(orig);
+        }
+        return rockRecordRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<RockRecord> all(@RequestBody PageQuery pageQuery) {
+        return rockRecordService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public RockRecord get(@PathVariable Long id) {
+        return rockRecordRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        rockRecordRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<RockRecord> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/RockRecord.json

@@ -0,0 +1 @@
+{"tableName":"RockRecord","className":"RockRecord","remark":"绿洲石记录","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/raex_back/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"userId","showInList":true,"showInForm":true,"formType":"number"},{"name":"operation","modelName":"operation","remark":"operation","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"num","modelName":"num","remark":"num","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"lastNum","modelName":"lastNum","remark":"lastNum","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.RockRecord"}