流程节点表

platform-dao/src/main/java/com/platform/dao/dto/workflow/WorkflowVerifyUserDTO.java → platform-dao/src/main/java/com/platform/dao/dto/workflow/WorkflowNodeDTO.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class WorkflowVerifyUserDTO extends BaseDTO implements Serializable {
+public class WorkflowNodeDTO extends BaseDTO implements Serializable {
 
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/entity/workflow/WorkflowVerifyUser.java → platform-dao/src/main/java/com/platform/dao/entity/workflow/WorkflowNode.java

@@ -11,15 +11,15 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * @Description 流程审核人员表实体类
+ * @Description 流程节点表表实体类
  * @Author lsq
  * @Date 2024-06-03 17:01:18
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Data
 @Accessors(chain = true)
-@Table(name = "t_workflow_verify_user")
-public class WorkflowVerifyUser implements Serializable {
+@Table(name = "t_workflow_node")
+public class WorkflowNode implements Serializable {
 
     /**
      * 主键

platform-dao/src/main/java/com/platform/dao/mapper/workflow/WorkflowVerifyUserMapper.java → platform-dao/src/main/java/com/platform/dao/mapper/workflow/WorkflowNodeMapper.java

@@ -1,9 +1,9 @@
 package com.platform.dao.mapper.workflow;
 
-import com.platform.dao.dto.workflow.WorkflowVerifyUserDTO;
+import com.platform.dao.dto.workflow.WorkflowNodeDTO;
 import com.platform.dao.config.MyMapper;
-import com.platform.dao.entity.workflow.WorkflowVerifyUser;
-import com.platform.dao.vo.query.workflow.WorkflowVerifyUserVO;
+import com.platform.dao.entity.workflow.WorkflowNode;
+import com.platform.dao.vo.query.workflow.WorkflowNodeVO;
 import org.springframework.stereotype.Component;
 import java.util.List;
 
@@ -15,12 +15,12 @@ import java.util.List;
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
 @Component
-public interface WorkflowVerifyUserMapper extends MyMapper<WorkflowVerifyUser> {
+public interface WorkflowNodeMapper extends MyMapper<WorkflowNode> {
     /**
      * 分页查询
      * @param dto
      * @return
      */
-    List<WorkflowVerifyUserVO> selectList(WorkflowVerifyUserDTO dto);
+    List<WorkflowNodeVO> selectList(WorkflowNodeDTO dto);
 
 }

platform-dao/src/main/java/com/platform/dao/vo/query/workflow/WorkflowVerifyUserVO.java → platform-dao/src/main/java/com/platform/dao/vo/query/workflow/WorkflowNodeVO.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @Data
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
-public class WorkflowVerifyUserVO extends BaseVO implements Serializable {
+public class WorkflowNodeVO extends BaseVO implements Serializable {
 
     /**
      * 主键

platform-dao/src/main/resources/mapper/workflow/WorkflowVerifyUserMapper.xml → platform-dao/src/main/resources/mapper/workflow/WorkflowNodeMapper.xml

@@ -1,35 +1,6 @@
 <?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.platform.dao.mapper.workflow.WorkflowVerifyUserMapper">
-    <sql id="Base_Column_List">
-        verifyUser
-        .
-        id
-        ,
-                                     verifyUser.created_user_id,
-                                     verifyUser.update_user_id,
-                                     verifyUser.created_time,
-                                     verifyUser.update_time,
-                                     verifyUser.created_user_name,
-                                     verifyUser.update_user_name,
-                                     verifyUser.flow_id,
-                                     verifyUser.type,
-                                     verifyUser.node_level,
-                                     verifyUser.node_sort,
-                                     verifyUser.user_id,
-                                     verifyUser.user_name
-    </sql>
-    <sql id="Ref_Column_List">
-        verifyUser
-        .
-        flow_id
-        ,
-                                     verifyUser.type,
-                                     verifyUser.node_level,
-                                     verifyUser.node_sort,
-                                     verifyUser.user_id,
-                                     verifyUser.user_name
-    </sql>
+<mapper namespace="com.platform.dao.mapper.workflow.WorkflowNodeMapper">
     <sql id="List_Condition">
         <if test="id != null and id != ''">
             and verifyUser.id = #{id}
@@ -86,8 +57,8 @@
             and verifyUser.id like concat(concat('%',#{keyword}),'%')
         </if>
     </sql>
-    <select id="selectList" parameterType="com.platform.dao.dto.workflow.WorkflowVerifyUserDTO"
-            resultType="com.platform.dao.vo.query.workflow.WorkflowVerifyUserVO">
+    <select id="selectList" parameterType="com.platform.dao.dto.workflow.WorkflowNodeDTO"
+            resultType="com.platform.dao.vo.query.workflow.WorkflowNodeVO">
         select verifyUser.*
         from t_workflow_verify_user as verifyUser
         <where>

platform-rest/src/main/java/com/platform/rest/controller/workflow/WorkflowVerifyUserController.java → platform-rest/src/main/java/com/platform/rest/controller/workflow/WorkflowNodeController.java

@@ -1,12 +1,12 @@
 package com.platform.rest.controller.workflow;
 
 import com.platform.common.util.R;
-import com.platform.dao.dto.workflow.WorkflowVerifyUserDTO;
-import com.platform.dao.entity.workflow.WorkflowVerifyUser;
-import com.platform.service.workflow.WorkflowVerifyUserService;
+import com.platform.dao.dto.workflow.WorkflowNodeDTO;
+import com.platform.dao.entity.workflow.WorkflowNode;
+import com.platform.service.workflow.WorkflowNodeService;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.workflow.ExportWorkflowVerifyUserVO;
-import com.platform.dao.vo.query.workflow.WorkflowVerifyUserVO;
+import com.platform.dao.vo.query.workflow.WorkflowNodeVO;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
@@ -28,10 +28,10 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/workflow/verify-user")
-public class WorkflowVerifyUserController {
+@RequestMapping("/workflow/node")
+public class WorkflowNodeController {
 
-    private final WorkflowVerifyUserService workflowVerifyUserService;
+    private final WorkflowNodeService workflowVerifyUserService;
 
     /**
      * 通过id查询单条记录
@@ -40,7 +40,7 @@ public class WorkflowVerifyUserController {
      * @return R
      */
     @GetMapping("/{id}")
-    public R<WorkflowVerifyUser> getById(@PathVariable("id") String id) {
+    public R<WorkflowNode> getById(@PathVariable("id") String id) {
         return new R<>(workflowVerifyUserService.getModelById(id));
     }
 
@@ -50,23 +50,23 @@ public class WorkflowVerifyUserController {
      * @param workflowVerifyUserDTO 流程审核人员表DTO
      * @return R
      */
-    @SysLog("新增流程审核人员表")
+    @SysLog("新增流程节点表")
     @PostMapping
     @PreAuthorize("@pms.hasPermission('workflow-verify-user-add')")
-    public R save(@Validated({AddGroup.class}) @RequestBody WorkflowVerifyUserDTO workflowVerifyUserDTO) {
+    public R save(@Validated({AddGroup.class}) @RequestBody WorkflowNodeDTO workflowVerifyUserDTO) {
         return new R<>(workflowVerifyUserService.saveModelByDTO(workflowVerifyUserDTO));
     }
 
     /**
      * 修改记录
      *
-     * @param workflowVerifyUserDTO 流程审核人员表DTO
+     * @param workflowVerifyUserDTO 流程节点表DTO
      * @return R
      */
-    @SysLog("修改流程审核人员表")
+    @SysLog("修改流程节点表")
     @PutMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('workflow-verify-user-edit')")
-    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody WorkflowVerifyUserDTO workflowVerifyUserDTO) {
+    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody WorkflowNodeDTO workflowVerifyUserDTO) {
         workflowVerifyUserService.modModelByDTO(workflowVerifyUserDTO);
         return new R<>();
     }
@@ -78,7 +78,7 @@ public class WorkflowVerifyUserController {
      * @param id 主键
      * @return R
      */
-    @SysLog("删除流程审核人员表")
+    @SysLog("删除流程节点表")
     @DeleteMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('workflow-verify-user-del')")
     public R removeById(@PathVariable String id) {
@@ -92,7 +92,7 @@ public class WorkflowVerifyUserController {
      * @param ids 主键
      * @return R
      */
-    @SysLog("批量删除流程审核人员表")
+    @SysLog("批量删除流程节点表")
     @DeleteMapping("")
     @PreAuthorize("@pms.hasPermission('workflow-verify-user-del')")
     public R removeIds(@RequestBody List<String> ids) {
@@ -105,37 +105,37 @@ public class WorkflowVerifyUserController {
      *
      * @param pageNum               当前页码
      * @param pageSize              每页条数
-     * @param workflowVerifyUserDTO 流程审核人员表DTO
+     * @param workflowVerifyUserDTO 流程节点表DTO
      * @return R
      */
     @GetMapping("/page")
-    public R<AbstractPageResultBean<WorkflowVerifyUserVO>> query(WorkflowVerifyUserDTO workflowVerifyUserDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+    public R<AbstractPageResultBean<WorkflowNodeVO>> query(WorkflowNodeDTO workflowVerifyUserDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
         return new R<>(workflowVerifyUserService.selectPageList(workflowVerifyUserDTO, pageNum, pageSize));
     }
 
     /**
      * 获取列表
      *
-     * @param workflowVerifyUserDTO 流程审核人员表DTO
+     * @param workflowVerifyUserDTO 流程节点表DTO
      * @return R
      */
     @GetMapping("")
-    public R query(WorkflowVerifyUserDTO workflowVerifyUserDTO) {
+    public R query(WorkflowNodeDTO workflowVerifyUserDTO) {
         return new R<>(workflowVerifyUserService.getModelListByDTO(workflowVerifyUserDTO));
     }
 
     /**
-     * 流程审核人员表导出
+     * 流程节点表导出
      *
-     * @param workflowVerifyUserDTO 流程审核人员表DTO
+     * @param workflowVerifyUserDTO 流程节点表DTO
      * @return R
      */
     @GetMapping("/export")
-    @SysLog("流程审核人员表导出")
+    @SysLog("流程节点表导出")
     @PreAuthorize("@pms.hasPermission('workflow-verify-user-export')")
-    public void export(HttpServletResponse response, WorkflowVerifyUserDTO workflowVerifyUserDTO) {
-        List<WorkflowVerifyUser> list = workflowVerifyUserService.getModelListByDTO(workflowVerifyUserDTO);
-        ExcelUtil.exportResponseDict(response, ExportWorkflowVerifyUserVO.class, BeanConverterUtil.copyListProperties(list, ExportWorkflowVerifyUserVO.class), "流程审核人员表");
+    public void export(HttpServletResponse response, WorkflowNodeDTO workflowVerifyUserDTO) {
+        List<WorkflowNode> list = workflowVerifyUserService.getModelListByDTO(workflowVerifyUserDTO);
+        ExcelUtil.exportResponseDict(response, ExportWorkflowVerifyUserVO.class, BeanConverterUtil.copyListProperties(list, ExportWorkflowVerifyUserVO.class), "流程节点表");
     }
 
 }

platform-service/src/main/java/com/platform/service/custom/impl/CustomFormServiceImpl.java

@@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.exception.DeniedException;
-import com.platform.common.util.BeanConverterUtil;
-import com.platform.common.util.IdGeneratorUtils;
-import com.platform.common.util.SecurityUtils;
-import com.platform.common.util.StringUtils;
+import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.custom.CustomFieldDTO;
 import com.platform.dao.dto.custom.CustomFormDTO;
@@ -29,6 +26,8 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.weekend.Weekend;
 import tk.mybatis.mapper.weekend.WeekendCriteria;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -232,4 +231,27 @@ public class CustomFormServiceImpl extends BaseServiceImpl<CustomFormMapper, Cus
         PageHelper.startPage(pageNum, pageSize);
         return new MyPage(mapper.selectList(record));
     }
+
+    public static void main(String[] args) throws Exception{
+        FileReader fr=new FileReader("E:\\THREEJS视频教程源码\\threejs视频教程集合\\12-【Threejs教程】10.相机基础\\安徽省经纬度集合.txt");
+        BufferedReader br=new BufferedReader(fr);
+        String line="";
+        List<String> lines = new ArrayList<>();
+        int i = 1;
+        while ((line=br.readLine())!=null) {
+            String[] arr = line.split(";");
+            System.out.println("第" + i + "行经纬度集合长度 " + arr.length);
+            for(String item : arr){
+                String[] children = item.split(",");
+                String tempStr = "[" + children[0] + ", "+children[1]+"]";
+                System.out.println(tempStr + ",");
+                lines.add(tempStr);
+            }
+            System.out.println("第" + i + "行经纬度集合长度 " + arr.length);
+            i++;
+        }
+        br.close();
+        fr.close();
+        //System.out.println(JsonUtils.objectToJson(lines));
+    }
 }

platform-service/src/main/java/com/platform/service/workflow/WorkflowVerifyUserService.java → platform-service/src/main/java/com/platform/service/workflow/WorkflowNodeService.java

@@ -1,8 +1,8 @@
 package com.platform.service.workflow;
 
-import com.platform.dao.vo.query.workflow.WorkflowVerifyUserVO;
-import com.platform.dao.dto.workflow.WorkflowVerifyUserDTO;
-import com.platform.dao.entity.workflow.WorkflowVerifyUser;
+import com.platform.dao.vo.query.workflow.WorkflowNodeVO;
+import com.platform.dao.dto.workflow.WorkflowNodeDTO;
+import com.platform.dao.entity.workflow.WorkflowNode;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.service.base.IBaseService;
 
@@ -14,7 +14,7 @@ import java.util.List;
  * @Date 2024-06-03 17:01:18
  * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
  */
-public interface WorkflowVerifyUserService extends IBaseService<WorkflowVerifyUser, WorkflowVerifyUserDTO> {
+public interface WorkflowNodeService extends IBaseService<WorkflowNode, WorkflowNodeDTO> {
 
     /**
      * 批量删除
@@ -32,6 +32,6 @@ public interface WorkflowVerifyUserService extends IBaseService<WorkflowVerifyUs
      * @param pageSize
      * @return
      */
-    AbstractPageResultBean<WorkflowVerifyUserVO> selectPageList(WorkflowVerifyUserDTO record, int pageNum, int pageSize);
+    AbstractPageResultBean<WorkflowNodeVO> selectPageList(WorkflowNodeDTO record, int pageNum, int pageSize);
 
 }

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowNodeServiceImpl.java

@@ -0,0 +1,50 @@
+package com.platform.service.workflow.impl;
+
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.workflow.WorkflowNodeVO;
+import com.platform.dao.dto.workflow.WorkflowNodeDTO;
+import com.platform.dao.entity.workflow.WorkflowNode;
+import com.platform.dao.mapper.workflow.WorkflowNodeMapper;
+import com.platform.service.workflow.WorkflowNodeService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 流程审核人员表 service 实现类
+ * @Author lsq
+ * @Date 2024-06-03 17:01:18
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("workflowNodeService")
+public class WorkflowNodeServiceImpl extends BaseServiceImpl<WorkflowNodeMapper, WorkflowNode, WorkflowNodeDTO> implements WorkflowNodeService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<WorkflowNode> weekend = new Weekend<>(WorkflowNode.class);
+        WeekendCriteria<WorkflowNode, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(WorkflowNode::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<WorkflowNodeVO> selectPageList(WorkflowNodeDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<WorkflowNode> selectPageInfo(WorkflowNodeDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+}

platform-service/src/main/java/com/platform/service/workflow/impl/WorkflowVerifyUserServiceImpl.java

@@ -1,51 +0,0 @@
-package com.platform.service.workflow.impl;
-
-import com.platform.common.bean.AbstractPageResultBean;
-import com.platform.dao.bean.MyPage;
-import com.github.pagehelper.PageHelper;
-import com.platform.dao.vo.query.workflow.WorkflowVerifyUserVO;
-import com.platform.dao.dto.workflow.WorkflowVerifyUserDTO;
-import com.platform.dao.entity.workflow.WorkflowVerifyUser;
-import com.platform.dao.mapper.workflow.WorkflowVerifyUserMapper;
-import com.platform.service.workflow.WorkflowVerifyUserService;
-import org.springframework.stereotype.Service;
-import com.platform.service.base.impl.BaseServiceImpl;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-/**
- * @Description 流程审核人员表 service 实现类
- * @Author lsq
- * @Date 2024-06-03 17:01:18
- * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
- */
-@AllArgsConstructor
-@Service("workflowVerifyUserService")
-public class WorkflowVerifyUserServiceImpl extends BaseServiceImpl<WorkflowVerifyUserMapper, WorkflowVerifyUser, WorkflowVerifyUserDTO> implements WorkflowVerifyUserService {
-
-    @Override
-    public int batchDelete(List<String> ids) {
-        Weekend<WorkflowVerifyUser> weekend = new Weekend<>(WorkflowVerifyUser.class);
-        WeekendCriteria<WorkflowVerifyUser, Object> weekendCriteria = weekend.weekendCriteria();
-        weekendCriteria.andIn(WorkflowVerifyUser::getId, ids);
-        mapper.deleteByExample(weekend);
-        return 1;
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkflowVerifyUserVO> selectPageList(WorkflowVerifyUserDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-    @Override
-    public AbstractPageResultBean<WorkflowVerifyUser> selectPageInfo(WorkflowVerifyUserDTO record, int pageNum, int pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
-        return new MyPage(mapper.selectList(record));
-    }
-
-}