Merge pull request #93 from codingapi/dev

Dev

Author: xlorne

admin-ui/src/pages/flow/leave/index.tsx

@@ -62,7 +62,7 @@ const LeavePage = () => {
                     view={LeaveForm}
                     workCode={"leave"}
                     formParams={{
-                        clazzName: 'com.codingapi.example.domain.Leave',
+                        clazzName: 'com.codingapi.example.infra.flow.form.LeaveForm',
                         username: username
                     }}
                 />

example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/configuration/LeaveDomainConfiguration.java

@@ -0,0 +1,15 @@
+package com.codingapi.example.app.cmd.domain.configuration;
+
+import com.codingapi.example.domain.leave.repository.LeaveRepository;
+import com.codingapi.example.domain.leave.service.LeaveService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class LeaveDomainConfiguration {
+
+    @Bean
+    public LeaveService leaveService(LeaveRepository leaveRepository){
+        return new LeaveService(leaveRepository);
+    }
+}

example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/configuration/UserDomainConfiguration.java

@@ -0,0 +1,17 @@
+package com.codingapi.example.app.cmd.domain.configuration;
+
+import com.codingapi.example.domain.user.gateway.PasswordEncoder;
+import com.codingapi.example.domain.user.repository.UserRepository;
+import com.codingapi.example.domain.user.service.UserService;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class UserDomainConfiguration {
+
+    @Bean
+    public UserService userService(UserRepository userRepository, PasswordEncoder passwordEncoder) {
+        return new UserService(userRepository, passwordEncoder);
+    }
+
+}

example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/pojo/UserCmd.java

@@ -1,5 +1,6 @@
 package com.codingapi.example.app.cmd.domain.pojo;
 
+import com.codingapi.example.domain.user.entity.UserMetric;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +13,11 @@ public static class UpdateRequest{
         private String name;
         private String username;
         private String password;
+
+        public UserMetric toMetric(){
+            return new UserMetric(name, username, password);
+        }
+
         private boolean flowManager;
 
         public boolean hasId(){

example/example-app/example-app-cmd-domain/src/main/java/com/codingapi/example/app/cmd/domain/router/UserRouter.java

@@ -1,34 +1,37 @@
 package com.codingapi.example.app.cmd.domain.router;
 
 import com.codingapi.example.app.cmd.domain.pojo.UserCmd;
-import com.codingapi.example.domain.user.entity.User;
-import com.codingapi.example.domain.user.gateway.PasswordEncoder;
-import com.codingapi.example.domain.user.repository.UserRepository;
+import com.codingapi.example.domain.user.service.UserService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 @Component
 @AllArgsConstructor
 public class UserRouter {
 
-    private final UserRepository userRepository;
-    private final PasswordEncoder passwordEncoder;
-
-    public void save(UserCmd.UpdateRequest request){
-        if(request.hasId()){
-            User user = userRepository.getUserById(request.getId());
-            user.setName(request.getName());
-            user.setPassword(request.getPassword());
-            user.setFlowManager(request.isFlowManager());
-            user.encodePassword(passwordEncoder);
-            userRepository.save(user);
-        }else {
-            User user = new User();
-            user.setName(request.getName());
-            user.setPassword(request.getPassword());
-            user.setFlowManager(request.isFlowManager());
-            user.encodePassword(passwordEncoder);
-            userRepository.save(user);
+    private final UserService userService;
+
+    public void createOrUpdate(UserCmd.UpdateRequest request) {
+        if (request.hasId()) {
+            userService.update(request.getId(), request.toMetric());
+        } else {
+            userService.create(request.toMetric());
         }
     }
+
+    public void removeEntrust(long id) {
+        userService.removeEntrust(id);
+    }
+
+    public void createEntrust(UserCmd.EntrustRequest request) {
+        userService.createEntrust(request.getId(),request.getEntrustUserId());
+    }
+
+    public void changeManager(long id) {
+        userService.changeManager(id);
+    }
+
+    public void removeUser(long id) {
+        userService.removeUser(id);
+    }
 }

example/example-app/example-app-cmd-meta/pom.xml

@@ -23,6 +23,18 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.codingapi.springboot</groupId>
+            <artifactId>example-infra-flow</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.codingapi.springboot</groupId>
+            <artifactId>example-infra-security</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 
 </project>

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java renamed to example/example-app/example-app-cmd-meta/src/main/java/com/codingapi/example/app/cmd/meta/pojo/FlowCmd.java

@@ -1,4 +1,4 @@
-package com.codingapi.example.pojo.cmd;
+package com.codingapi.example.app.cmd.meta.pojo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.codingapi.springboot.flow.bind.IBindData;

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowWorkCmd.java renamed to example/example-app/example-app-cmd-meta/src/main/java/com/codingapi/example/app/cmd/meta/pojo/FlowWorkCmd.java

@@ -1,4 +1,4 @@
-package com.codingapi.example.pojo.cmd;
+package com.codingapi.example.app.cmd.meta.pojo;
 
 import com.codingapi.springboot.security.gateway.TokenContext;
 import lombok.Getter;

example/example-app/example-app-cmd-meta/src/main/java/com/codingapi/example/app/cmd/meta/service/FlowRecordRouter.java

@@ -0,0 +1,92 @@
+package com.codingapi.example.app.cmd.meta.service;
+
+import com.codingapi.example.app.cmd.meta.pojo.FlowCmd;
+import com.codingapi.example.infra.flow.user.FlowUserRepository;
+import com.codingapi.springboot.flow.pojo.FlowResult;
+import com.codingapi.springboot.flow.pojo.FlowStepResult;
+import com.codingapi.springboot.flow.pojo.FlowSubmitResult;
+import com.codingapi.springboot.flow.result.MessageResult;
+import com.codingapi.springboot.flow.service.FlowService;
+import com.codingapi.springboot.flow.user.IFlowOperator;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class FlowRecordRouter {
+
+
+    private final FlowService flowService;
+    private final FlowUserRepository flowUserRepository;
+
+    public FlowResult startFlow(FlowCmd.StartFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        return flowService.startFlow(request.getWorkCode(), current, request.getBindData(), request.getAdvice());
+    }
+
+    public FlowStepResult getFlowStep(FlowCmd.FlowStep request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        return flowService.getFlowStep(request.getWorkCode(), request.getBindData(), current);
+    }
+
+
+    public FlowSubmitResult trySubmitFlow(FlowCmd.SubmitFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        if (request.getRecordId() > 0) {
+            return flowService.trySubmitFlow(request.getRecordId(), current, request.getBindData(), request.getOpinion());
+        } else {
+            return flowService.trySubmitFlow(request.getWorkCode(), current, request.getBindData(), request.getOpinion());
+        }
+    }
+
+
+    public FlowResult submitFlow(FlowCmd.SubmitFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        if (current.isFlowManager()) {
+            return flowService.interfere(request.getRecordId(), current, request.getBindData(), request.getOpinion());
+        } else {
+            return flowService.submitFlow(request.getRecordId(), current, request.getBindData(), request.getOpinion());
+        }
+    }
+
+    public MessageResult customFlowEvent(FlowCmd.CustomFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        return flowService.customFlowEvent(request.getRecordId(), current, request.getButtonId(), request.getBindData(), request.getOpinion());
+    }
+
+
+    public void save(FlowCmd.SaveFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.save(request.getRecordId(), current, request.getBindData(), request.getAdvice());
+    }
+
+    public void recall(FlowCmd.RecallFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.recall(request.getRecordId(), current);
+    }
+
+
+    public void transfer(FlowCmd.TransferFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        IFlowOperator target = flowUserRepository.getFlowOperatorById(request.getTargetUserId());
+        flowService.transfer(request.getRecordId(), current, target, request.getBindData(), request.getAdvice());
+    }
+
+
+    public void postponed(FlowCmd.PostponedFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.postponed(request.getRecordId(), current, request.getTimeOut());
+    }
+
+
+    public void urge(FlowCmd.UrgeFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.urge(request.getRecordId(), current);
+    }
+
+
+    public void remove(FlowCmd.RemoveFlow request) {
+        IFlowOperator current = flowUserRepository.getUserByUsername(request.getUserName());
+        flowService.remove(request.getRecordId(), current);
+    }
+}

example/example-application/src/main/java/com/codingapi/example/router/FlowWorkRouter.java renamed to example/example-app/example-app-cmd-meta/src/main/java/com/codingapi/example/app/cmd/meta/service/FlowWorkRouter.java

@@ -1,32 +1,31 @@
-package com.codingapi.example.router;
+package com.codingapi.example.app.cmd.meta.service;
 
-import com.codingapi.example.domain.User;
-import com.codingapi.example.entity.FlowWorkEntity;
-import com.codingapi.example.jpa.FlowWorkEntityRepository;
-import com.codingapi.example.pojo.cmd.FlowWorkCmd;
-import com.codingapi.example.repository.UserRepository;
+import com.codingapi.example.app.cmd.meta.pojo.FlowWorkCmd;
+import com.codingapi.example.infra.flow.entity.FlowWorkEntity;
+import com.codingapi.example.infra.flow.jpa.FlowWorkEntityRepository;
+import com.codingapi.example.infra.flow.user.FlowUserRepository;
 import com.codingapi.springboot.flow.domain.FlowWork;
 import com.codingapi.springboot.flow.repository.FlowWorkRepository;
+import com.codingapi.springboot.flow.user.IFlowOperator;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-
 @Service
 @AllArgsConstructor
 @Transactional
 public class FlowWorkRouter {
 
     private final FlowWorkRepository flowWorkRepository;
     private final FlowWorkEntityRepository flowWorkEntityRepository;
-    private final UserRepository userRepository;
+    private final FlowUserRepository flowUserRepository;
 
     public void delete(long id) {
         flowWorkRepository.delete(id);
     }
 
     public void save(FlowWorkCmd.CreateRequest request) {
-        User user = userRepository.getUserByUsername(request.getUsername());
+        IFlowOperator user = flowUserRepository.getUserByUsername(request.getUsername());
         long id = request.getId();
         if (id == 0) {
             FlowWork flowWork = new FlowWork(