Эх сурвалжийг харах

1、修改generator链接地址

zhoux 2 жил өмнө
parent
commit
be47a76a52
50 өөрчлөгдсөн 524 нэмэгдсэн , 116 устгасан
  1. 0 5
      src/main/java/com/dk/mdm/controller/common/ExportController.java
  2. 0 1
      src/main/java/com/dk/mdm/controller/core/DictionaryDataController.java
  3. 0 2
      src/main/java/com/dk/mdm/controller/core/FactoryController.java
  4. 0 6
      src/main/java/com/dk/mdm/controller/core/JobController.java
  5. 0 2
      src/main/java/com/dk/mdm/controller/core/RoleRightController.java
  6. 0 1
      src/main/java/com/dk/mdm/controller/core/UserLockedController.java
  7. 24 0
      src/main/java/com/dk/mdm/controller/mst/OrgController.java
  8. 0 1
      src/main/java/com/dk/mdm/controller/sys/BarcodeItemController.java
  9. 5 5
      src/main/java/com/dk/mdm/generator/Generator.java
  10. 0 2
      src/main/java/com/dk/mdm/infrastructure/convert/core/SettingValueConvert.java
  11. 0 1
      src/main/java/com/dk/mdm/infrastructure/util/AuthUtils.java
  12. 1 1
      src/main/java/com/dk/mdm/mapper/core/DictionaryDataMapper.java
  13. 1 2
      src/main/java/com/dk/mdm/mapper/core/FactoryMapper.java
  14. 1 1
      src/main/java/com/dk/mdm/mapper/core/JobMapper.java
  15. 1 1
      src/main/java/com/dk/mdm/mapper/core/OrganizationMapper.java
  16. 1 1
      src/main/java/com/dk/mdm/mapper/core/PostMapper.java
  17. 1 1
      src/main/java/com/dk/mdm/mapper/core/RoleMapper.java
  18. 0 1
      src/main/java/com/dk/mdm/mapper/core/UserLockedMapper.java
  19. 1 1
      src/main/java/com/dk/mdm/mapper/core/UserMapper.java
  20. 14 0
      src/main/java/com/dk/mdm/mapper/mst/OrgMapper.java
  21. 201 0
      src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml
  22. 1 1
      src/main/java/com/dk/mdm/mapper/sys/BarcodeItemMapper.java
  23. 0 2
      src/main/java/com/dk/mdm/model/pojo/core/DictionaryData.java
  24. 0 2
      src/main/java/com/dk/mdm/model/pojo/core/Role.java
  25. 0 2
      src/main/java/com/dk/mdm/model/pojo/core/RoleRight.java
  26. 0 2
      src/main/java/com/dk/mdm/model/pojo/core/SettingValue.java
  27. 238 0
      src/main/java/com/dk/mdm/model/pojo/mst/Org.java
  28. 0 3
      src/main/java/com/dk/mdm/model/pojo/sys/BarcodeItem.java
  29. 0 3
      src/main/java/com/dk/mdm/model/pojo/sys/SettingKind.java
  30. 0 9
      src/main/java/com/dk/mdm/model/query/sys/BarcodeItemQuery.java
  31. 0 1
      src/main/java/com/dk/mdm/model/query/sys/SettingKindQuery.java
  32. 0 1
      src/main/java/com/dk/mdm/model/response/core/RoleResponse.java
  33. 0 2
      src/main/java/com/dk/mdm/model/response/core/StaffResponse.java
  34. 0 5
      src/main/java/com/dk/mdm/model/response/sys/BarcodeItemResponse.java
  35. 0 1
      src/main/java/com/dk/mdm/model/response/sys/SettingKindResponse.java
  36. 0 4
      src/main/java/com/dk/mdm/model/vo/core/RoleRightVO.java
  37. 0 4
      src/main/java/com/dk/mdm/model/vo/core/RoleVO.java
  38. 0 5
      src/main/java/com/dk/mdm/model/vo/core/SettingValueVO.java
  39. 0 3
      src/main/java/com/dk/mdm/model/vo/core/StaffVO.java
  40. 1 1
      src/main/java/com/dk/mdm/service/common/CommonService.java
  41. 0 2
      src/main/java/com/dk/mdm/service/core/DictionaryDataService.java
  42. 3 6
      src/main/java/com/dk/mdm/service/core/FactoryService.java
  43. 0 4
      src/main/java/com/dk/mdm/service/core/JobService.java
  44. 0 1
      src/main/java/com/dk/mdm/service/core/OrganizationService.java
  45. 3 8
      src/main/java/com/dk/mdm/service/core/PostService.java
  46. 1 6
      src/main/java/com/dk/mdm/service/core/RoleRightService.java
  47. 0 1
      src/main/java/com/dk/mdm/service/core/StaffService.java
  48. 1 1
      src/main/java/com/dk/mdm/service/core/UserLockedService.java
  49. 2 1
      src/main/java/com/dk/mdm/service/core/UserService.java
  50. 23 0
      src/main/java/com/dk/mdm/service/mst/OrgService.java

+ 0 - 5
src/main/java/com/dk/mdm/controller/common/ExportController.java

@@ -1,17 +1,12 @@
 package com.dk.mdm.controller.common;
 
-import com.dk.common.controller.BaseController;
-import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.common.service.BaseService;
-import com.dk.mdm.service.common.CommonService;
 import com.dk.mdm.service.common.ExportService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**

+ 0 - 1
src/main/java/com/dk/mdm/controller/core/DictionaryDataController.java

@@ -3,7 +3,6 @@ package com.dk.mdm.controller.core;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.core.DictionaryData;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.core.DictionaryDataQuery;
 import com.dk.mdm.model.response.core.DictionaryDataResponse;

+ 0 - 2
src/main/java/com/dk/mdm/controller/core/FactoryController.java

@@ -3,13 +3,11 @@ package com.dk.mdm.controller.core;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.core.Factory;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.core.FactoryQuery;
 import com.dk.mdm.model.response.core.FactoryResponse;
 import com.dk.mdm.model.vo.core.FactoryVO;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;

+ 0 - 6
src/main/java/com/dk/mdm/controller/core/JobController.java

@@ -1,11 +1,8 @@
 package com.dk.mdm.controller.core;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
-import com.dk.common.util.AESUtil;
 import com.dk.mdm.model.pojo.core.Job;
 import com.dk.mdm.model.query.core.JobQuery;
 import com.dk.mdm.model.response.core.JobResponse;
@@ -13,13 +10,10 @@ import com.dk.mdm.model.vo.core.JobVO;
 import com.dk.mdm.service.core.JobService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.json.JSONString;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
-
 /**
  * @desc   : 工种API接口
  * @author : 姜宁

+ 0 - 2
src/main/java/com/dk/mdm/controller/core/RoleRightController.java

@@ -2,10 +2,8 @@ package com.dk.mdm.controller.core;
 
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.core.RoleRight;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.model.vo.core.RoleRightVO;
-import com.dk.mdm.model.vo.core.RoleVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

+ 0 - 1
src/main/java/com/dk/mdm/controller/core/UserLockedController.java

@@ -1,7 +1,6 @@
 package com.dk.mdm.controller.core;
 
 import com.dk.mdm.model.pojo.core.UserLocked;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;

+ 24 - 0
src/main/java/com/dk/mdm/controller/mst/OrgController.java

@@ -0,0 +1,24 @@
+package com.dk.mdm.controller.mst;
+
+import com.dk.mdm.model.pojo.mst.Org;
+import com.dk.common.controller.BaseController;
+import com.dk.common.service.BaseService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import com.dk.mdm.service.mst.OrgService;
+
+@Api(tags = "组织机构API接口")
+@RestController
+@RequestMapping("/org")
+public class OrgController{
+
+    public BaseService<Org> getService() {
+        return orgService;
+    }
+
+    @Autowired
+    private OrgService orgService;
+
+}

+ 0 - 1
src/main/java/com/dk/mdm/controller/sys/BarcodeItemController.java

@@ -3,7 +3,6 @@ package com.dk.mdm.controller.sys;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.sys.BarcodeItem;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.model.query.sys.BarcodeItemQuery;
 import com.dk.mdm.model.response.sys.BarcodeItemResponse;

+ 5 - 5
src/main/java/com/dk/mdm/generator/Generator.java

@@ -67,10 +67,10 @@ public class Generator {
 
         //2、设置数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUsername("mes_dev");
+        dsc.setUsername("dkic_b");
         dsc.setPassword("dk");
-        dsc.setUrl("jdbc:postgresql://s.dev01.dkiboss.com:15000/dkmes3");
-        dsc.setSchemaName("mst");
+        dsc.setUrl("jdbc:postgresql://dkdev.dkiboss.com:15000/dkic_dev_b1");
+        dsc.setSchemaName("dkic_b");
         dsc.setDriverName("org.postgresql.Driver");
         dsc.setDbType(DbType.POSTGRE_SQL);
         mpg.setDataSource(dsc);
@@ -94,8 +94,8 @@ public class Generator {
 
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setTablePrefix("t");                                             //表名前缀
-        strategy.setInclude("t_model_car_load_limit");                                        //设置要映射的表名,只需改这里即可,可以是一个数组,一次性生成多张表。
+        strategy.setTablePrefix("t_mst");                                             //表名前缀
+        strategy.setInclude("t_mst_org");                                        //设置要映射的表名,只需改这里即可,可以是一个数组,一次性生成多张表。
         strategy.setNaming(NamingStrategy.underline_to_camel);                      //转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);                //字段下划线转驼峰
         strategy.setEntityLombokModel(true);                                        //是否使用lombok开启注解

+ 0 - 2
src/main/java/com/dk/mdm/infrastructure/convert/core/SettingValueConvert.java

@@ -1,9 +1,7 @@
 package com.dk.mdm.infrastructure.convert.core;
 
 import com.dk.mdm.model.pojo.core.SettingValue;
-import com.dk.mdm.model.pojo.core.Staff;
 import com.dk.mdm.model.vo.core.SettingValueVO;
-import com.dk.mdm.model.vo.core.StaffVO;
 import org.mapstruct.Mapper;
 
 /**

+ 0 - 1
src/main/java/com/dk/mdm/infrastructure/util/AuthUtils.java

@@ -9,7 +9,6 @@ import com.dk.common.util.oauth.AESSecurityUtil;
 import com.dk.common.util.oauth.JwtUtil;
 import com.dk.mdm.infrastructure.convert.core.UserConvert;
 import com.dk.mdm.mapper.core.UserMapper;
-import com.dk.mdm.model.pojo.core.User;
 import com.dk.common.model.response.core.UserResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

+ 1 - 1
src/main/java/com/dk/mdm/mapper/core/DictionaryDataMapper.java

@@ -1,8 +1,8 @@
 package com.dk.mdm.mapper.core;
 
 import com.dk.mdm.model.pojo.core.DictionaryData;
-import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.DictionaryDataQuery;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.response.core.DictionaryDataResponse;
 import org.springframework.stereotype.Repository;
 

+ 1 - 2
src/main/java/com/dk/mdm/mapper/core/FactoryMapper.java

@@ -1,10 +1,9 @@
 package com.dk.mdm.mapper.core;
 
 import com.dk.mdm.model.pojo.core.Factory;
-import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.FactoryQuery;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.response.core.FactoryResponse;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

+ 1 - 1
src/main/java/com/dk/mdm/mapper/core/JobMapper.java

@@ -1,8 +1,8 @@
 package com.dk.mdm.mapper.core;
 
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.core.Job;
 import com.dk.mdm.model.query.core.JobQuery;
+import com.dk.mdm.model.pojo.core.Job;
 import com.dk.mdm.model.response.core.JobResponse;
 import org.springframework.stereotype.Repository;
 

+ 1 - 1
src/main/java/com/dk/mdm/mapper/core/OrganizationMapper.java

@@ -1,8 +1,8 @@
 package com.dk.mdm.mapper.core;
 
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.pojo.core.Organization;
 import com.dk.mdm.model.query.core.OrganizationQuery;
+import com.dk.mdm.model.pojo.core.Organization;
 import com.dk.mdm.model.response.core.OrganizationResponse;
 import org.springframework.stereotype.Repository;
 

+ 1 - 1
src/main/java/com/dk/mdm/mapper/core/PostMapper.java

@@ -1,8 +1,8 @@
 package com.dk.mdm.mapper.core;
 
+import com.dk.mdm.model.query.core.PostQuery;
 import com.dk.mdm.model.pojo.core.Post;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.core.PostQuery;
 import com.dk.mdm.model.response.core.PostResponse;
 import org.springframework.stereotype.Repository;
 

+ 1 - 1
src/main/java/com/dk/mdm/mapper/core/RoleMapper.java

@@ -1,8 +1,8 @@
 package com.dk.mdm.mapper.core;
 
 import com.dk.mdm.model.pojo.core.Role;
-import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.core.RoleQuery;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.response.core.RoleResponse;
 import com.dk.mdm.model.vo.core.RoleVO;
 import org.springframework.stereotype.Repository;

+ 0 - 1
src/main/java/com/dk/mdm/mapper/core/UserLockedMapper.java

@@ -2,7 +2,6 @@ package com.dk.mdm.mapper.core;
 
 import com.dk.mdm.model.pojo.core.UserLocked;
 import com.dk.common.mapper.BaseMapper;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

+ 1 - 1
src/main/java/com/dk/mdm/mapper/core/UserMapper.java

@@ -3,10 +3,10 @@ package com.dk.mdm.mapper.core;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.vo.core.UserVO;
 import com.dk.mdm.model.pojo.core.User;
+import com.dk.mdm.model.query.core.UserQuery;
 import com.dk.mdm.model.pojo.core.UserLoginLog;
 import com.dk.mdm.model.pojo.core.UserRight;
 import com.dk.mdm.model.pojo.core.WorkTeam;
-import com.dk.mdm.model.query.core.UserQuery;
 import com.dk.common.model.response.core.UserResponse;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

+ 14 - 0
src/main/java/com/dk/mdm/mapper/mst/OrgMapper.java

@@ -0,0 +1,14 @@
+package com.dk.mdm.mapper.mst;
+
+import com.dk.mdm.model.pojo.mst.Org;
+import com.dk.common.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+*  组织机构 Mapper
+*/
+@Repository
+public interface OrgMapper extends BaseMapper<Org>{
+	
+}
+

+ 201 - 0
src/main/java/com/dk/mdm/mapper/mst/OrgMapper.xml

@@ -0,0 +1,201 @@
+<?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.dk.mdm.mapper.mst.OrgMapper">
+
+    <!-- 通用设置 -->
+    <!-- 通用查询列 -->
+    <sql id="Base_Column_List">
+        org_id, org_name, parent_id, display_no, top_id, level_upper, level_lower, level_leaf, level_no, level_code, level_name, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user, org_code
+    </sql>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.Org">
+        <id column="org_id" property="orgId"/>
+                <result column="org_name" property="orgName"/>
+                <result column="parent_id" property="parentId" typeHandler="UuidTypeHandler"/>
+                <result column="display_no" property="displayNo"/>
+                <result column="top_id" property="topId" typeHandler="UuidTypeHandler"/>
+                <result column="level_upper" property="levelUpper" typeHandler="UuidListTypeHandler"/>
+                <result column="level_lower" property="levelLower" typeHandler="UuidListTypeHandler"/>
+                <result column="level_leaf" property="levelLeaf"/>
+                <result column="level_no" property="levelNo"/>
+                <result column="level_code" property="levelCode"/>
+                <result column="level_name" property="levelName"/>
+                <result column="remarks" property="remarks"/>
+                <result column="flg_valid" property="flgValid"/>
+                <result column="cp_id" property="cpId"/>
+            <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
+                <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
+            <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
+                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
+                <result column="op_app_code" property="opAppCode"/>
+            <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
+                <result column="op_db_user" property="opDbUser"/>
+                <result column="org_code" property="orgCode"/>
+    </resultMap>
+
+    <!-- 通用条件列 -->
+    <sql id="Condition">
+        <where>
+            <if test="orgName != null and orgName != ''">
+                AND org_name = #{orgName}
+            </if>
+            <if test="parentId != null and parentId != ''">
+                AND parent_id = #{parentId}
+            </if>
+            <if test="displayNo != null">
+                AND display_no = #{displayNo}
+            </if>
+            <if test="topId != null and topId != ''">
+                AND top_id = #{topId}
+            </if>
+            <if test="levelUpper != null and levelUpper != ''">
+                AND level_upper = #{levelUpper}
+            </if>
+            <if test="levelLower != null and levelLower != ''">
+                AND level_lower = #{levelLower}
+            </if>
+            <if test="levelLeaf != null">
+                AND level_leaf = #{levelLeaf}
+            </if>
+            <if test="levelNo != null">
+                AND level_no = #{levelNo}
+            </if>
+            <if test="levelCode != null and levelCode != ''">
+                AND level_code = #{levelCode}
+            </if>
+            <if test="levelName != null and levelName != ''">
+                AND level_name = #{levelName}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND remarks = #{remarks}
+            </if>
+            <if test="flgValid != null">
+                AND flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND cp_id = #{cpId}
+            </if>
+            <if test="opCreateTime != null">
+                AND op_create_time = #{opCreateTime}
+            </if>
+            <if test="opCreateUserId != null and opCreateUserId != ''">
+                AND op_create_user_id = #{opCreateUserId}
+            </if>
+            <if test="opUpdateTime != null">
+                AND op_update_time = #{opUpdateTime}
+            </if>
+            <if test="opUpdateUserId != null and opUpdateUserId != ''">
+                AND op_update_user_id = #{opUpdateUserId}
+            </if>
+            <if test="opAppCode != null and opAppCode != ''">
+                AND op_app_code = #{opAppCode}
+            </if>
+            <if test="opTimestamp != null">
+                AND op_timestamp = #{opTimestamp}
+            </if>
+            <if test="opDbUser != null and opDbUser != ''">
+                AND op_db_user = #{opDbUser}
+            </if>
+            <if test="orgCode != null and orgCode != ''">
+                AND org_code = #{orgCode}
+            </if>
+        </where>
+    </sql>
+
+    <sql id="idsForeach">
+        <!-- 根据主键orgId批量操作 -->
+        WHERE org_id in
+        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </sql>
+
+    <!-- 查询表t_mst_org,(条件查询+分页)列表 -->
+    <select id="selectByCond" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_mst_org
+        <include refid="Condition"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表t_mst_org,(条件查询)个数 -->
+    <select id="countByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM t_mst_org
+        <include refid="Condition"/>
+    </select>
+
+    <!-- 根据主键查询表t_mst_org的一行数据 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_mst_org
+        WHERE org_id = #{orgId}::uuid
+    </select>
+
+    <!-- 根据主键锁定表t_mst_org的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_mst_org
+        WHERE org_id = #{orgId}
+        for update
+    </select>
+
+    <!-- 根据主键锁定表t_mst_org的多行数据 -->
+    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_mst_org
+        <include refid="idsForeach"/>
+        for update
+    </select>
+
+    <insert id="insertBatch">
+        insert into t_mst_org
+        (
+        <trim suffixOverrides=",">
+            org_name,
+            parent_id,
+            display_no,
+            top_id,
+            level_upper,
+            level_lower,
+            level_leaf,
+            level_no,
+            level_code,
+            level_name,
+            remarks,
+            cp_id,
+            op_app_code,
+            org_code,
+        </trim>
+        )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (
+            <trim suffixOverrides=",">
+                #{item.orgName},
+                #{item.parentId}::uuid,
+                #{item.displayNo},
+                #{item.topId}::uuid,
+                #{item.levelUpper},
+                #{item.levelLower},
+                #{item.levelLeaf},
+                #{item.levelNo},
+                #{item.levelCode},
+                #{item.levelName},
+                #{item.remarks},
+                #{item.cpId},
+                #{item.opAppCode},
+                #{item.orgCode},
+            </trim>
+            )
+        </foreach>
+    </insert>
+</mapper>

+ 1 - 1
src/main/java/com/dk/mdm/mapper/sys/BarcodeItemMapper.java

@@ -1,8 +1,8 @@
 package com.dk.mdm.mapper.sys;
 
+import com.dk.mdm.model.query.sys.BarcodeItemQuery;
 import com.dk.mdm.model.pojo.sys.BarcodeItem;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.sys.BarcodeItemQuery;
 import com.dk.mdm.model.response.sys.BarcodeItemResponse;
 import org.springframework.stereotype.Repository;
 

+ 0 - 2
src/main/java/com/dk/mdm/model/pojo/core/DictionaryData.java

@@ -15,9 +15,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
 import java.time.LocalDateTime;
 
 /**

+ 0 - 2
src/main/java/com/dk/mdm/model/pojo/core/Role.java

@@ -15,9 +15,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
 import java.time.LocalDateTime;
 
 /**

+ 0 - 2
src/main/java/com/dk/mdm/model/pojo/core/RoleRight.java

@@ -16,9 +16,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
 import java.time.LocalDateTime;
 
 /**

+ 0 - 2
src/main/java/com/dk/mdm/model/pojo/core/SettingValue.java

@@ -17,9 +17,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
 import java.time.LocalDateTime;
 
 /**

+ 238 - 0
src/main/java/com/dk/mdm/model/pojo/mst/Org.java

@@ -0,0 +1,238 @@
+package com.dk.mdm.model.pojo.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.time.LocalDateTime;
+
+/**
+ *  组织机构
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("组织机构")
+@TableName(value = "t_mst_org", autoResultMap = true)
+@ApiModel(value="实体类:组织机构", description="表名:t_mst_org")
+public class Org extends PageInfo<Org> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 组织ID
+     */
+    @TableId(value = "org_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "组织ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 组织名称
+     */
+    @Excel(name = "组织名称")
+    @ApiModelProperty(value = "组织名称")
+    private String orgName;
+
+
+    /**
+     * 父级ID
+     */
+    @Excel(name = "父级ID")
+    @ApiModelProperty(value = "父级ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String parentId;
+
+
+    /**
+     * 显示顺序 (【1 ~ 46655】)
+     */
+    @Excel(name = "显示顺序 (【1 ~ 46655】)")
+    @ApiModelProperty(value = "显示顺序 (【1 ~ 46655】)")
+    private Integer displayNo;
+
+
+    /**
+     * 顶层ID
+     */
+    @Excel(name = "顶层ID")
+    @ApiModelProperty(value = "顶层ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String topId;
+
+
+    /**
+     * 上层ID
+     */
+    @Excel(name = "上层ID")
+    @ApiModelProperty(value = "上层ID")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private String levelUpper;
+
+
+    /**
+     * 下层ID
+     */
+    @Excel(name = "下层ID")
+    @ApiModelProperty(value = "下层ID")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private String levelLower;
+
+
+    /**
+     * 末级标识
+     */
+    @Excel(name = "末级标识")
+    @ApiModelProperty(value = "末级标识")
+    private Boolean levelLeaf;
+
+
+    /**
+     * 层级序号
+     */
+    @Excel(name = "层级序号")
+    @ApiModelProperty(value = "层级序号")
+    private Integer levelNo;
+
+
+    /**
+     * 层级代码
+     */
+    @Excel(name = "层级代码")
+    @ApiModelProperty(value = "层级代码")
+    private String levelCode;
+
+
+    /**
+     * 层级全称 (【 / 】)
+     */
+    @Excel(name = "层级全称 (【 / 】)")
+    @ApiModelProperty(value = "层级全称 (【 / 】)")
+    private String levelName;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1:正常 0:停用)
+     */
+    @Excel(name = "有效标识 (1:正常 0:停用)")
+    @ApiModelProperty(value = "有效标识 (1:正常 0:停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+
+    /**
+     * 创建时间 (触发器自动处理)
+     */
+    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opCreateTime;
+
+
+    /**
+     * 创建用户 (触发器自动处理)
+     */
+    @Excel(name = "创建用户 (触发器自动处理)")
+    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opUpdateTime;
+
+
+    /**
+     * 修改用户 (触发器自动处理)
+     */
+    @Excel(name = "修改用户 (触发器自动处理)")
+    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
+
+
+    /**
+     * 数据操作应用 (触发器自动处理)
+     */
+    @Excel(name = "数据操作应用 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
+    private String opAppCode;
+
+
+    /**
+     * 数据时间戳 (触发器自动处理)
+     */
+    @Excel(name = "数据时间戳 (触发器自动处理)")
+    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime opTimestamp;
+
+
+    /**
+     * 数据操作数据库用户 (触发器自动处理)
+     */
+    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
+    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
+    private String opDbUser;
+
+
+    @ApiModelProperty(value = "")
+    private String orgCode;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
+    private static final long serialVersionUID = 1L;
+
+}

+ 0 - 3
src/main/java/com/dk/mdm/model/pojo/sys/BarcodeItem.java

@@ -7,7 +7,6 @@ import java.io.Serializable;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -17,8 +16,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
-
 /**
  * @desc   : 生成条码项目数据库对应类
  * @date   : 2023/6/16 15:52

+ 0 - 3
src/main/java/com/dk/mdm/model/pojo/sys/SettingKind.java

@@ -7,7 +7,6 @@ import java.io.Serializable;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -17,8 +16,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.List;
-
 /**
  *  系统参数分类
  */

+ 0 - 9
src/main/java/com/dk/mdm/model/query/sys/BarcodeItemQuery.java

@@ -1,20 +1,11 @@
 package com.dk.mdm.model.query.sys;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;

+ 0 - 1
src/main/java/com/dk/mdm/model/query/sys/SettingKindQuery.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 

+ 0 - 1
src/main/java/com/dk/mdm/model/response/core/RoleResponse.java

@@ -10,7 +10,6 @@ import com.dk.common.infrastructure.annotaiton.LogItem;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.dk.common.model.response.core.UserResponse;
-import com.dk.mdm.model.pojo.core.RoleRight;
 import com.dk.mdm.model.pojo.sys.AppMenu;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

+ 0 - 2
src/main/java/com/dk/mdm/model/response/core/StaffResponse.java

@@ -1,12 +1,10 @@
 package com.dk.mdm.model.response.core;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.StringListTypeHandler;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidListTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;

+ 0 - 5
src/main/java/com/dk/mdm/model/response/sys/BarcodeItemResponse.java

@@ -2,18 +2,13 @@ package com.dk.mdm.model.response.sys;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.JsonTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 

+ 0 - 1
src/main/java/com/dk/mdm/model/response/sys/SettingKindResponse.java

@@ -13,7 +13,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 

+ 0 - 4
src/main/java/com/dk/mdm/model/vo/core/RoleRightVO.java

@@ -6,20 +6,16 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

+ 0 - 4
src/main/java/com/dk/mdm/model/vo/core/RoleVO.java

@@ -2,13 +2,10 @@ package com.dk.mdm.model.vo.core;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,7 +15,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

+ 0 - 5
src/main/java/com/dk/mdm/model/vo/core/SettingValueVO.java

@@ -2,24 +2,19 @@ package com.dk.mdm.model.vo.core;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.annotaiton.LogMain;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  *  系统参数

+ 0 - 3
src/main/java/com/dk/mdm/model/vo/core/StaffVO.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidListTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -20,7 +18,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

+ 1 - 1
src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -10,8 +10,8 @@ import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
-import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.common.CommonMapper;
+import com.dk.mdm.infrastructure.util.AuthUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.postgresql.util.PGobject;
 import org.springframework.beans.factory.annotation.Autowired;

+ 0 - 2
src/main/java/com/dk/mdm/service/core/DictionaryDataService.java

@@ -1,10 +1,8 @@
 package com.dk.mdm.service.core;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
-import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.pojo.PageList;
-import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
 import com.dk.mdm.infrastructure.convert.core.DictionaryDataConvert;

+ 3 - 6
src/main/java/com/dk/mdm/service/core/FactoryService.java

@@ -3,22 +3,19 @@ package com.dk.mdm.service.core;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
-import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.core.FactoryConvert;
-import com.dk.mdm.model.pojo.core.Factory;
 import com.dk.mdm.mapper.core.FactoryMapper;
-import com.dk.common.service.BaseService;
-import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.core.Factory;
 import com.dk.mdm.model.query.core.FactoryQuery;
 import com.dk.mdm.model.response.core.FactoryResponse;
+import com.dk.common.service.BaseService;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.vo.core.FactoryVO;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 @Service
 @Transactional

+ 0 - 4
src/main/java/com/dk/mdm/service/core/JobService.java

@@ -1,14 +1,10 @@
 package com.dk.mdm.service.core;
 
-import com.alibaba.fastjson.JSON;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.pojo.PageList;
-import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.common.service.BaseService;
-import com.dk.common.util.AESUtil;
-import com.dk.common.util.EncryptUtil;
 import com.dk.mdm.infrastructure.convert.core.JobConvert;
 import com.dk.mdm.mapper.core.JobMapper;
 import com.dk.mdm.model.pojo.core.Job;

+ 0 - 1
src/main/java/com/dk/mdm/service/core/OrganizationService.java

@@ -1,7 +1,6 @@
 package com.dk.mdm.service.core;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
-import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseCodeEnum;

+ 3 - 8
src/main/java/com/dk/mdm/service/core/PostService.java

@@ -1,20 +1,15 @@
 package com.dk.mdm.service.core;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
-import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.model.pojo.PageList;
-import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.core.PostConvert;
-import com.dk.mdm.model.pojo.core.Post;
 import com.dk.mdm.mapper.core.PostMapper;
-import com.dk.common.service.BaseService;
-import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.core.FactoryQuery;
+import com.dk.mdm.model.pojo.core.Post;
 import com.dk.mdm.model.query.core.PostQuery;
-import com.dk.mdm.model.response.core.FactoryResponse;
 import com.dk.mdm.model.response.core.PostResponse;
-import com.dk.mdm.model.vo.core.FactoryVO;
+import com.dk.common.service.BaseService;
+import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.vo.core.PostVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

+ 1 - 6
src/main/java/com/dk/mdm/service/core/RoleRightService.java

@@ -3,17 +3,12 @@ package com.dk.mdm.service.core;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.mdm.infrastructure.convert.core.PostConvert;
 import com.dk.mdm.infrastructure.convert.core.RoleRightConvert;
-import com.dk.mdm.model.pojo.core.Factory;
-import com.dk.mdm.model.pojo.core.Post;
-import com.dk.mdm.model.pojo.core.RoleRight;
 import com.dk.mdm.mapper.core.RoleRightMapper;
+import com.dk.mdm.model.pojo.core.RoleRight;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.vo.core.PostVO;
 import com.dk.mdm.model.vo.core.RoleRightVO;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

+ 0 - 1
src/main/java/com/dk/mdm/service/core/StaffService.java

@@ -1,7 +1,6 @@
 package com.dk.mdm.service.core;
 
 import com.dk.common.infrastructure.annotaiton.Pagination;
-import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.infrastructure.enums.ErrorCodeEnum;
 import com.dk.common.infrastructure.util.AuthUtils;
 import com.dk.common.mapper.BaseMapper;

+ 1 - 1
src/main/java/com/dk/mdm/service/core/UserLockedService.java

@@ -1,7 +1,7 @@
 package com.dk.mdm.service.core;
 
-import com.dk.mdm.model.pojo.core.UserLocked;
 import com.dk.mdm.mapper.core.UserLockedMapper;
+import com.dk.mdm.model.pojo.core.UserLocked;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import org.springframework.stereotype.Service;

+ 2 - 1
src/main/java/com/dk/mdm/service/core/UserService.java

@@ -17,13 +17,14 @@ import com.dk.common.service.BaseService;
 import com.dk.common.util.oauth.JwtUtil;
 import com.dk.mdm.infrastructure.convert.core.UserConvert;
 import com.dk.mdm.infrastructure.convert.core.UserRightConvert;
-import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.common.CommonMapper;
 import com.dk.mdm.mapper.core.FactoryMapper;
 import com.dk.mdm.mapper.core.UserLockedMapper;
 import com.dk.mdm.mapper.core.UserMapper;
 import com.dk.mdm.model.pojo.core.*;
 import com.dk.mdm.model.query.core.UserQuery;
+import com.dk.mdm.infrastructure.util.AuthUtils;
+import com.dk.mdm.model.pojo.core.*;
 import com.dk.common.model.response.core.UserResponse;
 import com.dk.mdm.model.vo.core.UserRightVO;
 import eu.bitwalker.useragentutils.UserAgent;

+ 23 - 0
src/main/java/com/dk/mdm/service/mst/OrgService.java

@@ -0,0 +1,23 @@
+package com.dk.mdm.service.mst;
+
+import com.dk.mdm.model.pojo.mst.Org;
+import com.dk.mdm.mapper.mst.OrgMapper;
+import com.dk.common.service.BaseService;
+import com.dk.common.mapper.BaseMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class OrgService extends BaseService<Org> {
+
+	@Override
+	public BaseMapper<Org> getRepository() {
+		return orgMapper;
+	}
+
+	@Autowired
+	private OrgMapper orgMapper;
+
+}