Pārlūkot izejas kodu

添加版本号编辑接口

fengyanjie 4 gadi atpakaļ
vecāks
revīzija
b3a96480c4

+ 31 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/controller/RwdeditVersionController.java

@@ -0,0 +1,31 @@
+package com.persagy.dmp.rwd.edit.controller;
+
+import com.persagy.common.criteria.JacksonCriteria;
+import com.persagy.common.web.MapResponse;
+import com.persagy.common.web.PagedResponse;
+import com.persagy.dmp.rwd.edit.entity.RwdeditVersion;
+import com.persagy.dmp.rwd.edit.service.RwdeditVersionService;
+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;
+
+@RestController
+@RequestMapping("/rwdedit/version")
+public class RwdeditVersionController {
+
+    @Autowired
+    private RwdeditVersionService service;
+
+    @PostMapping("/query")
+    public PagedResponse<RwdeditVersion> query(@RequestBody JacksonCriteria criteria) {
+        return service.query(criteria);
+    }
+
+    @PostMapping("/create")
+    public MapResponse create(@RequestBody RwdeditVersion param) {
+        return service.create(param);
+    }
+
+}

+ 24 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/entity/RwdeditVersion.java

@@ -0,0 +1,24 @@
+package com.persagy.dmp.rwd.edit.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Setter
+@Getter
+@Entity
+@Table(name = "rwdedit_version")
+public class RwdeditVersion {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+    private String version;
+
+    @Column(name = "create_time", insertable = false, updatable = false)
+    private Date createTime;
+    private String createUser;
+
+}

+ 9 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/repository/RwdeditVersionRepository.java

@@ -0,0 +1,9 @@
+package com.persagy.dmp.rwd.edit.repository;
+
+import com.persagy.dmp.rwd.edit.entity.RwdeditVersion;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+
+public interface RwdeditVersionRepository extends JpaRepository<RwdeditVersion, Integer>, QuerydslPredicateExecutor<RwdeditVersion> {
+}
+

+ 0 - 9
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/ClassDefChangeRecordService.java

@@ -93,15 +93,6 @@ public class ClassDefChangeRecordService {
 
     private Boolean isExists(String code) {
         JacksonCriteria criteria = JacksonCriteria.newInstance();
-//        if (infoCode != null) {
-//            criteria.add("type", "common");
-//            criteria.add("classCode", code);
-//            criteria.add("code", infoCode);
-//            StringBuilder url = new StringBuilder(dmpServer);
-//            url.append("/rwd/def/funcid");
-//            url.append("?groupCode=0");
-//            result = httpUtils.post(url.toString(), JacksonMapper.toSimpleJson(criteria), 300000);
-//        } else {
         criteria.add("type", "common");
         criteria.add("code", code);
         PagedResponse<ClassDefModel> query = classDefService.query(criteria);

+ 1 - 2
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/FuncidDefChangeRecordService.java

@@ -68,8 +68,7 @@ public class FuncidDefChangeRecordService {
             response.setFail("code is required");
             return response;
         }
-        if (classCode == null) {
-            response.setFail("classCode is required");
+        if (classCode == null) {            response.setFail("classCode is required");
             return response;
         }
         if (EnumOperationType.create.equals(param.getOperationType())) {

+ 62 - 0
dmp-rwd-edit/src/main/java/com/persagy/dmp/rwd/edit/service/RwdeditVersionService.java

@@ -0,0 +1,62 @@
+package com.persagy.dmp.rwd.edit.service;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.persagy.common.criteria.CriteriaUtils;
+import com.persagy.common.criteria.JacksonCriteria;
+import com.persagy.common.web.MapResponse;
+import com.persagy.common.web.PagedResponse;
+import com.persagy.dmp.rwd.edit.config.web.UserUtils;
+import com.persagy.dmp.rwd.edit.entity.QRwdeditVersion;
+import com.persagy.dmp.rwd.edit.entity.RwdeditVersion;
+import com.persagy.dmp.rwd.edit.repository.RwdeditVersionRepository;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class RwdeditVersionService {
+
+    @Autowired
+    private CriteriaUtils criteriaUtils;
+
+    @Autowired
+    private RwdeditVersionRepository repository;
+
+    private List<BooleanExpression> parse(ObjectNode criteria) {
+        // TODO
+        return null;
+    }
+
+    public PagedResponse<RwdeditVersion> query(JacksonCriteria criteria) {
+        return criteriaUtils.query(QRwdeditVersion.rwdeditVersion, this::parse, criteria);
+    }
+
+    @Transactional
+    public MapResponse create(RwdeditVersion param) {
+        MapResponse response = new MapResponse();
+        // TODO
+        String version = param.getVersion();
+        if (version == null) {
+            response.setFail("版本编号不可为空!");
+            return response;
+        }
+        long count = repository.count(QRwdeditVersion.rwdeditVersion.version.eq(version));
+        if (count > 0) {
+            response.setFail("版本编号已存在!");
+            return response;
+        }
+
+        RwdeditVersion entity = new RwdeditVersion();
+        entity.setVersion(version);
+        entity.setCreateTime(new Date());
+        entity.setCreateUser(UserUtils.currentUserId() + "");
+        repository.save(entity);
+        response.add("id", entity.getId());
+        return response;
+    }
+}
+