From 3ce27b7faf8850d101a1511a685250fe562dca18 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 15 九月 2025 11:38:28 +0800
Subject: [PATCH] 起落架DNC项目更改sql 更改yml配置
---
src/main/resources/com.lxzn.ucenter.dao/ButtonMapper.xml | 8
src/main/resources/com.lxzn.nc.dao/DeviceInfoMapper.xml | 2
pom.xml | 1
src/main/resources/com.lxzn.nc.dao/ComponentPermissionMapper.xml | 4
src/main/resources/com.lxzn.nc.dao/DocRelativeMapper.xml | 2
src/main/resources/com.lxzn.nc.dao/DeviceGroupPermissionMapper.xml | 4
src/main/resources/com.lxzn.nc.dao/ProductDepartmentMapper.xml | 6
src/main/resources/com.lxzn.nc.dao/ProductInfoMapper.xml | 2
src/main/resources/com.lxzn.nc.dao/ProductPermissionMapper.xml | 4
src/main/resources/processes/assign_nc_to_device.bpmn | 116 +++++++++++-----------
src/main/resources/com.lxzn.nc.dao/PartsPermissionMapper.xml | 4
src/main/resources/com.lxzn.ucenter.dao/UserMapper.xml | 6
src/main/resources/com.lxzn.nc.dao/DocInfoMapper.xml | 10 +-
src/main/resources/com.lxzn.base.dao/MdcPassLogMapper.xml | 12 +-
src/main/resources/com.lxzn.nc.dao/DeviceGroupDepartMapper.xml | 6
src/main/resources/com.lxzn.nc.dao/PartsInfoMapper.xml | 2
src/main/resources/com.lxzn.ucenter.dao/MenuMapper.xml | 12 +-
src/main/resources/com.lxzn.nc.dao/DevicePermissionMapper.xml | 4
src/main/resources/com.lxzn.ucenter.dao/RoleMapper.xml | 6
src/main/resources/com.lxzn.nc.dao/DeviceGroupMapper.xml | 6
src/main/resources/com.lxzn.nc.dao/PartsDepartmentMapper.xml | 6
src/main/resources/com.lxzn.ucenter.dao/DepartmentMapper.xml | 10 +-
src/main/resources/com.lxzn.nc.dao/ComponentDepartmentMapper.xml | 6
src/main/java/com/lxzn/framework/domain/webservice/PlmProgramSourceInfo.java | 2
src/main/resources/application.yml | 4
25 files changed, 125 insertions(+), 120 deletions(-)
diff --git a/pom.xml b/pom.xml
index a4db2ba..81a3747 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
+ <scope>runtime</scope>
</dependency>
diff --git a/src/main/java/com/lxzn/framework/domain/webservice/PlmProgramSourceInfo.java b/src/main/java/com/lxzn/framework/domain/webservice/PlmProgramSourceInfo.java
index 476a0f0..6fdb5f9 100644
--- a/src/main/java/com/lxzn/framework/domain/webservice/PlmProgramSourceInfo.java
+++ b/src/main/java/com/lxzn/framework/domain/webservice/PlmProgramSourceInfo.java
@@ -14,7 +14,7 @@
*/
@Data
@NoArgsConstructor
-@TableName(value = "PLM_PROGRAM_SOURCE")
+@TableName(value = "plm_program_source")
public class PlmProgramSourceInfo implements Serializable {
@TableId(value = "id")
private String id;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9bafa8a..568c464 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
application:
name: lxzn-dev-admin
datasource:
- url: jdbc:mysql://127.0.0.1:3316/lxzn_qlj_nc?useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://127.0.0.1:3316/lxzn_qlj_nc?serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true&tinyInt1isBit=false&nullCatalogMeansCurrent=true&characterEncoding=utf8
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -42,11 +42,13 @@
maxIdle: 3
minIdle: 1
maxWait: -1 #杩炴帴姹犳渶澶х瓑琛屾椂闂� -1娌℃湁闄愬埗
+ database: 5
activiti:
check-process-definitions: true
database-schema-update: true
db-history-used: true
history-level: full
+ async-executor-activate: false
servlet:
multipart:
#榛樿鏀寔鏂囦欢涓婁紶.
diff --git a/src/main/resources/com.lxzn.base.dao/MdcPassLogMapper.xml b/src/main/resources/com.lxzn.base.dao/MdcPassLogMapper.xml
index 060d2d1..dd994bb 100644
--- a/src/main/resources/com.lxzn.base.dao/MdcPassLogMapper.xml
+++ b/src/main/resources/com.lxzn.base.dao/MdcPassLogMapper.xml
@@ -1,9 +1,11 @@
<?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.lxzn.base.dao.DncPassLogMapper">
- <select id="findDateTimeDay" resultType="DncPassLog" parameterType="String">
- select top 1 *
- from dnc_pass_log u
- where day_time = #{dayTime} order by create_time desc
+ <select id="findDateTimeDay" resultType="com.lxzn.framework.domain.base.DncPassLog" parameterType="String">
+ SELECT *
+ FROM dnc_pass_log u
+ WHERE day_time = #{dayTime}
+ ORDER BY create_time DESC
+ LIMIT 1;
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/ComponentDepartmentMapper.xml b/src/main/resources/com.lxzn.nc.dao/ComponentDepartmentMapper.xml
index 6307baf..9379d19 100644
--- a/src/main/resources/com.lxzn.nc.dao/ComponentDepartmentMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/ComponentDepartmentMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.ComponentDepartmentMapper">
- <select id="getDepartPermsByComponentId" resultType="Department" parameterType="String">
+ <select id="getDepartPermsByComponentId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -14,7 +14,7 @@
on u.depart_id=p.depart_id
</select>
- <select id="getDepartNonPermsByComponentId" resultType="Department" parameterType="String">
+ <select id="getDepartNonPermsByComponentId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -24,4 +24,4 @@
from sys_department u
where u.depart_id not in (select depart_id from nc_component_department where component_id=#{componentId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/ComponentPermissionMapper.xml b/src/main/resources/com.lxzn.nc.dao/ComponentPermissionMapper.xml
index 2d9d2bd..21ad8a8 100644
--- a/src/main/resources/com.lxzn.nc.dao/ComponentPermissionMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/ComponentPermissionMapper.xml
@@ -14,7 +14,7 @@
on u.user_id=p.user_id
</select>
- <select id="getUserNonPermsByComponentId" resultType="User" parameterType="String">
+ <select id="getUserNonPermsByComponentId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
select u.user_id
, u.username
, u.nickname
@@ -24,4 +24,4 @@
from sys_user u
where u.user_id not in (select user_id from nc_component_permission where component_id=#{componentId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/DeviceGroupDepartMapper.xml b/src/main/resources/com.lxzn.nc.dao/DeviceGroupDepartMapper.xml
index eba6b62..917d603 100644
--- a/src/main/resources/com.lxzn.nc.dao/DeviceGroupDepartMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DeviceGroupDepartMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.DeviceGroupDepartMapper">
- <select id="getDepartPermsByGroupId" resultType="Department" parameterType="String">
+ <select id="getDepartPermsByGroupId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -14,7 +14,7 @@
on u.depart_id=p.depart_id
</select>
- <select id="getDepartNonPermsByGroupId" resultType="Department" parameterType="String">
+ <select id="getDepartNonPermsByGroupId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -24,4 +24,4 @@
from sys_department u
where u.depart_id not in (select depart_id from nc_device_group_department where group_id=#{groupId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/DeviceGroupMapper.xml b/src/main/resources/com.lxzn.nc.dao/DeviceGroupMapper.xml
index 90de523..5906e14 100644
--- a/src/main/resources/com.lxzn.nc.dao/DeviceGroupMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DeviceGroupMapper.xml
@@ -39,17 +39,17 @@
where parent_id=#{parentId} and delete_flag=0
</select>
- <resultMap id="deviceGroupExtPermsMap" type="DeviceGroupExt">
+ <resultMap id="deviceGroupExtPermsMap" type="com.lxzn.framework.domain.nc.ext.DeviceGroupExt">
<id column="group_id" property="groupId" />
<result column="user_id" property="userId" />
<collection column="{parentId=group_id, userId=user_id}" property="children"
- javaType="ArrayList" ofType="DeviceGroupExt" select="getByParentIdAndUserPerms">
+ javaType="ArrayList" ofType="com.lxzn.framework.domain.nc.ext.DeviceGroupExt" select="getByParentIdAndUserPerms">
<id column="group_id" property="groupId" />
<result column="user_id" property="userId" />
</collection>
</resultMap>
- <resultMap id="deviceGroupExtPermsMapAs" type="DeviceGroupExt">
+ <resultMap id="deviceGroupExtPermsMapAs" type="com.lxzn.framework.domain.nc.ext.DeviceGroupExt">
<id column="group_id" property="groupId" />
<association property="parent" column="{id=parent_id}" select="findById">
</association>
diff --git a/src/main/resources/com.lxzn.nc.dao/DeviceGroupPermissionMapper.xml b/src/main/resources/com.lxzn.nc.dao/DeviceGroupPermissionMapper.xml
index cf86bb5..aed27fb 100644
--- a/src/main/resources/com.lxzn.nc.dao/DeviceGroupPermissionMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DeviceGroupPermissionMapper.xml
@@ -14,7 +14,7 @@
on u.user_id=p.user_id
</select>
- <select id="getUserNonPermsByGroupId" resultType="User" parameterType="String">
+ <select id="getUserNonPermsByGroupId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
select u.user_id
, u.username
, u.nickname
@@ -24,4 +24,4 @@
from sys_user u
where u.user_id not in (select user_id from nc_device_group_permission where group_id=#{groupId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/DeviceInfoMapper.xml b/src/main/resources/com.lxzn.nc.dao/DeviceInfoMapper.xml
index 47307b0..6eddc8f 100644
--- a/src/main/resources/com.lxzn.nc.dao/DeviceInfoMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DeviceInfoMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.DeviceInfoMapper">
- <select id="getDeviceByUserPermed" resultType="DeviceInfo" parameterType="String">
+ <select id="getDeviceByUserPermed" resultType="com.lxzn.framework.domain.nc.DeviceInfo" parameterType="String">
select d.device_id
, d.group_id
, d.device_no
diff --git a/src/main/resources/com.lxzn.nc.dao/DevicePermissionMapper.xml b/src/main/resources/com.lxzn.nc.dao/DevicePermissionMapper.xml
index bc657d1..4beb7a7 100644
--- a/src/main/resources/com.lxzn.nc.dao/DevicePermissionMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DevicePermissionMapper.xml
@@ -14,7 +14,7 @@
on u.user_id=p.user_id
</select>
- <select id="getUserNonPermsByDeviceId" resultType="User" parameterType="String">
+ <select id="getUserNonPermsByDeviceId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
select u.user_id
, u.username
, u.nickname
@@ -24,4 +24,4 @@
from sys_user u
where u.user_id not in (select user_id from nc_device_permission where device_id=#{deviceId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/DocInfoMapper.xml b/src/main/resources/com.lxzn.nc.dao/DocInfoMapper.xml
index 2e4fad6..2f3559f 100644
--- a/src/main/resources/com.lxzn.nc.dao/DocInfoMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DocInfoMapper.xml
@@ -4,7 +4,7 @@
<delete id="deleteByDocId">
delete from nc_doc_info where doc_id = #{docId}
</delete>
- <select id="findDocExtList" parameterType="String" resultType="DocInfo">
+ <select id="findDocExtList" parameterType="String" resultType="com.lxzn.framework.domain.nc.DocInfo">
select
u.doc_id
,r.classification_id
@@ -36,7 +36,7 @@
</select>
- <select id="findDeviceDocExtList" parameterType="String" resultType="DocInfo">
+ <select id="findDeviceDocExtList" parameterType="String" resultType="com.lxzn.framework.domain.nc.DocInfo">
select
u.doc_id
,r.classification_id
@@ -70,7 +70,7 @@
${ew.customSqlSegment}
</select>
- <select id="findByAttrAndDocName" parameterType="Map" resultType="DocInfo">
+ <select id="findByAttrAndDocName" parameterType="Map" resultType="com.lxzn.framework.domain.nc.DocInfo">
select r.doc_id
,r.attribution_id
,r.attribution_type
@@ -89,7 +89,7 @@
where d.delete_flag=0 and d.doc_name=#{docName} and d.doc_suffix=#{docSuffix}
</select>
- <select id="getByDocAttrAndDocId" parameterType="Map" resultType="DocInfo">
+ <select id="getByDocAttrAndDocId" parameterType="Map" resultType="com.lxzn.framework.domain.nc.DocInfo">
select r.doc_id
,r.attribution_id
,r.attribution_type
@@ -109,7 +109,7 @@
where d.delete_flag=0
</select>
- <select id="getByDocId" parameterType="String" resultType="DocInfo">
+ <select id="getByDocId" parameterType="String" resultType="com.lxzn.framework.domain.nc.DocInfo">
select r.doc_id
,r.attribution_id
,r.attribution_type
diff --git a/src/main/resources/com.lxzn.nc.dao/DocRelativeMapper.xml b/src/main/resources/com.lxzn.nc.dao/DocRelativeMapper.xml
index 6ef9657..6e64543 100644
--- a/src/main/resources/com.lxzn.nc.dao/DocRelativeMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/DocRelativeMapper.xml
@@ -4,7 +4,7 @@
<delete id="deleteById">
delete from nc_doc_relative where doc_id = #{docId}
</delete>
- <select id="findDeviceByDocId" resultType="DeviceInfo" parameterType="String">
+ <select id="findDeviceByDocId" resultType="com.lxzn.framework.domain.nc.DeviceInfo" parameterType="String">
select d.device_id
, d.group_id
, d.device_no
diff --git a/src/main/resources/com.lxzn.nc.dao/PartsDepartmentMapper.xml b/src/main/resources/com.lxzn.nc.dao/PartsDepartmentMapper.xml
index c638005..1db8117 100644
--- a/src/main/resources/com.lxzn.nc.dao/PartsDepartmentMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/PartsDepartmentMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.PartsDepartmentMapper">
- <select id="getDepartPermsByPartsId" resultType="Department" parameterType="String">
+ <select id="getDepartPermsByPartsId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -14,7 +14,7 @@
on u.depart_id=p.depart_id
</select>
- <select id="getDepartNonPermsByProductId" resultType="Department" parameterType="String">
+ <select id="getDepartNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -24,4 +24,4 @@
from sys_department u
where u.depart_id not in (select depart_id from nc_parts_department where parts_id=#{partsId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/PartsInfoMapper.xml b/src/main/resources/com.lxzn.nc.dao/PartsInfoMapper.xml
index f5906c8..e97836a 100644
--- a/src/main/resources/com.lxzn.nc.dao/PartsInfoMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/PartsInfoMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.PartsInfoMapper">
- <select id="getByUserPerms" resultType="PartsInfo" parameterType="String">
+ <select id="getByUserPerms" resultType="com.lxzn.framework.domain.nc.PartsInfo" parameterType="String">
select p.parts_id
, p.parts_name
, p.product_id
diff --git a/src/main/resources/com.lxzn.nc.dao/PartsPermissionMapper.xml b/src/main/resources/com.lxzn.nc.dao/PartsPermissionMapper.xml
index b33e34e..243ce62 100644
--- a/src/main/resources/com.lxzn.nc.dao/PartsPermissionMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/PartsPermissionMapper.xml
@@ -14,7 +14,7 @@
on u.user_id=p.user_id
</select>
- <select id="getUserNonPermsByProductId" resultType="User" parameterType="String">
+ <select id="getUserNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
select u.user_id
, u.username
, u.nickname
@@ -24,4 +24,4 @@
from sys_user u
where u.user_id not in (select user_id from nc_parts_permission where parts_id=#{partsId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/ProductDepartmentMapper.xml b/src/main/resources/com.lxzn.nc.dao/ProductDepartmentMapper.xml
index edb493d..7e34750 100644
--- a/src/main/resources/com.lxzn.nc.dao/ProductDepartmentMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/ProductDepartmentMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.ProductDepartmentMapper">
- <select id="getDepartPermsByProductId" resultType="Department" parameterType="String">
+ <select id="getDepartPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -14,7 +14,7 @@
on u.depart_id=p.depart_id
</select>
- <select id="getDepartNonPermsByProductId" resultType="Department" parameterType="String">
+ <select id="getDepartNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select u.depart_id
, u.depart_name
, u.depart_code
@@ -24,4 +24,4 @@
from sys_department u
where u.depart_id not in (select depart_id from nc_product_department where product_id=#{productId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.nc.dao/ProductInfoMapper.xml b/src/main/resources/com.lxzn.nc.dao/ProductInfoMapper.xml
index 918f3ee..0e05e87 100644
--- a/src/main/resources/com.lxzn.nc.dao/ProductInfoMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/ProductInfoMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.nc.dao.ProductInfoMapper">
- <select id="getByUserPerms" resultType="ProductInfo" parameterType="String">
+ <select id="getByUserPerms" resultType="com.lxzn.framework.domain.nc.ProductInfo" parameterType="String">
select p.product_id
, p.product_no
, p.product_model
diff --git a/src/main/resources/com.lxzn.nc.dao/ProductPermissionMapper.xml b/src/main/resources/com.lxzn.nc.dao/ProductPermissionMapper.xml
index d50dc4b..bbac5f4 100644
--- a/src/main/resources/com.lxzn.nc.dao/ProductPermissionMapper.xml
+++ b/src/main/resources/com.lxzn.nc.dao/ProductPermissionMapper.xml
@@ -14,7 +14,7 @@
on u.user_id=p.user_id
</select>
- <select id="getUserNonPermsByProductId" resultType="User" parameterType="String">
+ <select id="getUserNonPermsByProductId" resultType="com.lxzn.framework.domain.ucenter.User" parameterType="String">
select u.user_id
, u.username
, u.nickname
@@ -24,4 +24,4 @@
from sys_user u
where u.user_id not in (select user_id from nc_product_permission where product_id=#{productId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.ucenter.dao/ButtonMapper.xml b/src/main/resources/com.lxzn.ucenter.dao/ButtonMapper.xml
index 440bb99..08fa28b 100644
--- a/src/main/resources/com.lxzn.ucenter.dao/ButtonMapper.xml
+++ b/src/main/resources/com.lxzn.ucenter.dao/ButtonMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.ucenter.dao.ButtonMapper">
- <select id="getButtonPerms" parameterType="String" resultType="Button">
+ <select id="getButtonPerms" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.Button">
select distinct b.button_id
, b.button_perm
, b.button_name
@@ -15,7 +15,7 @@
</select>
- <select id="getMenuButtonPerms" parameterType="java.util.Map" resultType="Button">
+ <select id="getMenuButtonPerms" parameterType="java.util.Map" resultType="com.lxzn.framework.domain.ucenter.Button">
select distinct b.button_id
, b.button_perm
, b.button_name
@@ -33,7 +33,7 @@
where u.user_id=#{userId}
</select>
- <select id="getObjectButtonPerms" parameterType="java.util.Map" resultType="Button">
+ <select id="getObjectButtonPerms" parameterType="java.util.Map" resultType="com.lxzn.framework.domain.ucenter.Button">
select distinct b.button_id
, b.button_perm
, b.button_name
@@ -50,4 +50,4 @@
on u.role_id=r.role_id
where u.user_id=#{userId}
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.ucenter.dao/DepartmentMapper.xml b/src/main/resources/com.lxzn.ucenter.dao/DepartmentMapper.xml
index 7997710..bdd469d 100644
--- a/src/main/resources/com.lxzn.ucenter.dao/DepartmentMapper.xml
+++ b/src/main/resources/com.lxzn.ucenter.dao/DepartmentMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.ucenter.dao.DepartmentMapper">
- <select id="getUserPermDepart" resultType="Department" parameterType="String">
+ <select id="getUserPermDepart" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select r.depart_id, r.depart_name, r.depart_code, r.description
from
(select depart_id, depart_name, depart_code, description from sys_department where delete_flag=0) r
@@ -10,7 +10,7 @@
on r.depart_id=ur.depart_id
</select>
- <select id="getUserNonPermDepart" resultType="Department" parameterType="String">
+ <select id="getUserNonPermDepart" resultType="com.lxzn.framework.domain.ucenter.Department" parameterType="String">
select r.depart_id, r.depart_name, r.depart_code, r.description
from (select depart_id, depart_name, depart_code, description from sys_department where delete_flag=0) r
where r.depart_id not in
@@ -51,7 +51,7 @@
where delete_flag = 0 and parent_id=#{parentId}
</select>
- <select id="getUserApproveDepart" parameterType="String" resultType="User">
+ <select id="getUserApproveDepart" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.User">
select u.user_id
, u.username
, u.nickname
@@ -68,7 +68,7 @@
on u.user_id=d.user_id
</select>
- <select id="getUserNonApproveDepart" parameterType="String" resultType="User">
+ <select id="getUserNonApproveDepart" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.User">
select u.user_id
, u.username
, u.nickname
@@ -83,4 +83,4 @@
from sys_user u
where u.user_id not in (select user_id from sys_depart_approve_user where depart_id=#{departId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.ucenter.dao/MenuMapper.xml b/src/main/resources/com.lxzn.ucenter.dao/MenuMapper.xml
index 2e19dbb..4168303 100644
--- a/src/main/resources/com.lxzn.ucenter.dao/MenuMapper.xml
+++ b/src/main/resources/com.lxzn.ucenter.dao/MenuMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.ucenter.dao.MenuMapper">
- <select id="findByUserId" parameterType="String" resultType="Menu">
+ <select id="findByUserId" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.Menu">
select m.menu_id
, m.perm_code
, m.menu_name
@@ -23,13 +23,13 @@
3銆佸绾у叧鑱旇鍙ユ槸鍒嗗紑鏌ヨ鐨� 鏁版嵁閲忓ぇ鐨勬儏鍐典笅鎬ц兘浣庝笅
4銆佸鏋滅‘瀹氱骇鏍� 鍙互浣跨敤绾ц仈鏌ヨ涓�娆℃煡璇� 渚嬪瓙锛�
-->
- <resultMap id="menuExtBaseResult" type="MenuExt">
+ <resultMap id="menuExtBaseResult" type="com.lxzn.framework.domain.ucenter.ext.MenuExt">
<id column="menu_id" property="menuId" />
<collection column="menu_id" property="childList" select="findByParentId">
</collection>
</resultMap>
- <resultMap id="menuExtSingleSelectResult" type="MenuExt">
+ <resultMap id="menuExtSingleSelectResult" type="com.lxzn.framework.domain.ucenter.ext.MenuExt">
<id column="menu_id_one" property="menuId" />
<result column="perm_code_one" property="permCode" />
<result column="menu_name_one" property="menuName" />
@@ -38,7 +38,7 @@
<result column="icon_cls_one" property="iconCls" />
<result column="priority_one" property="priority" />
<result column="rank_level_one" property="rankLevel" />
- <collection property="childList" ofType="MenuExt">
+ <collection property="childList" ofType="com.lxzn.framework.domain.ucenter.ext.MenuExt">
<id column="menu_id_two" property="menuId" />
<result column="perm_code_two" property="permCode" />
<result column="menu_name_two" property="menuName" />
@@ -47,7 +47,7 @@
<result column="icon_cls_two" property="iconCls" />
<result column="priority_two" property="priority" />
<result column="rank_level_two" property="rankLevel" />
- <collection property="childList" ofType="MenuExt">
+ <collection property="childList" ofType="com.lxzn.framework.domain.ucenter.ext.MenuExt">
<id column="menu_id_three" property="menuId" />
<result column="perm_code_three" property="permCode" />
<result column="menu_name_three" property="menuName" />
@@ -120,4 +120,4 @@
on cm.parent_id = bm.menu_id
where am.rank_level=1 and am.delete_flag=0
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.ucenter.dao/RoleMapper.xml b/src/main/resources/com.lxzn.ucenter.dao/RoleMapper.xml
index 5c74b4f..0d9a18b 100644
--- a/src/main/resources/com.lxzn.ucenter.dao/RoleMapper.xml
+++ b/src/main/resources/com.lxzn.ucenter.dao/RoleMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.ucenter.dao.RoleMapper">
- <select id="getUserPermRole" resultType="Role" parameterType="String">
+ <select id="getUserPermRole" resultType="com.lxzn.framework.domain.ucenter.Role" parameterType="String">
select r.role_id, r.role_code, r.role_name, r.description
from
(select role_id, role_code, role_name, description from sys_role where delete_flag=0) r
@@ -10,10 +10,10 @@
on r.role_id=ur.role_id
</select>
- <select id="getUserNonPermRole" resultType="Role" parameterType="String">
+ <select id="getUserNonPermRole" resultType="com.lxzn.framework.domain.ucenter.Role" parameterType="String">
select r.role_id, r.role_code, r.role_name, r.description
from (select role_id, role_code, role_name, description from sys_role where delete_flag=0) r
where r.role_id not in
(select role_id from sys_user_role where user_id=#{userId})
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/com.lxzn.ucenter.dao/UserMapper.xml b/src/main/resources/com.lxzn.ucenter.dao/UserMapper.xml
index 6baec58..b1da5f3 100644
--- a/src/main/resources/com.lxzn.ucenter.dao/UserMapper.xml
+++ b/src/main/resources/com.lxzn.ucenter.dao/UserMapper.xml
@@ -1,7 +1,7 @@
<?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.lxzn.ucenter.dao.UserMapper">
- <select id="findUserExtByUsername" parameterType="String" resultType="UserExt">
+ <select id="findUserExtByUsername" parameterType="String" resultType="com.lxzn.framework.domain.ucenter.ext.UserExt">
select
u.user_id
,u.username
@@ -18,7 +18,7 @@
${ew.customSqlSegment}
</select>
- <resultMap id="userDepartExt" type="UserDepartExt">
+ <resultMap id="userDepartExt" type="com.lxzn.framework.domain.ucenter.ext.UserDepartExt">
<id column="user_id" property="userId" />
<collection column="user_id" property="departs" select="com.lxzn.ucenter.dao.DepartmentMapper.getUserPermDepart">
</collection>
@@ -55,4 +55,4 @@
from sys_user u
where u.delete_flag=0
</select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/processes/assign_nc_to_device.bpmn b/src/main/resources/processes/assign_nc_to_device.bpmn
index 4e6181e..87fa824 100644
--- a/src/main/resources/processes/assign_nc_to_device.bpmn
+++ b/src/main/resources/processes/assign_nc_to_device.bpmn
@@ -1,61 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1589077876043" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
- <process id="assign_nc_to_device" isClosed="false" isExecutable="true" name="鎸囨淳NC鏂囨。鍒拌澶�" processType="None">
- <startEvent id="_2" name="StartEvent"/>
- <userTask activiti:assignee="${apply_user}" activiti:exclusive="true" id="_3" name="鎻愪氦鐢宠"/>
- <userTask activiti:candidateUsers="${approve_users}" activiti:exclusive="true" id="_4" name="瀹℃壒"/>
- <endEvent id="_5" name="EndEvent"/>
- <sequenceFlow id="_6" sourceRef="_2" targetRef="_3"/>
- <sequenceFlow id="_7" sourceRef="_3" targetRef="_4"/>
- <sequenceFlow id="_8" sourceRef="_4" targetRef="_5"/>
- </process>
- <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
- <bpmndi:BPMNPlane bpmnElement="assign_nc_to_device">
- <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
- <omgdc:Bounds height="32.0" width="32.0" x="40.0" y="135.0"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
- <omgdc:Bounds height="55.0" width="85.0" x="145.0" y="125.0"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
- <omgdc:Bounds height="55.0" width="85.0" x="335.0" y="125.0"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
- <omgdc:Bounds height="32.0" width="32.0" x="545.0" y="135.0"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_3">
- <omgdi:waypoint x="72.0" y="151.0"/>
- <omgdi:waypoint x="145.0" y="152.5"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_3" targetElement="_4">
- <omgdi:waypoint x="230.0" y="152.5"/>
- <omgdi:waypoint x="335.0" y="152.5"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_4" targetElement="_5">
- <omgdi:waypoint x="420.0" y="152.5"/>
- <omgdi:waypoint x="545.0" y="151.0"/>
- <bpmndi:BPMNLabel>
- <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- </bpmndi:BPMNPlane>
- </bpmndi:BPMNDiagram>
+ <process id="assign_nc_to_device" isClosed="false" isExecutable="true" name="鎸囨淳NC鏂囨。鍒拌澶�" processType="None">
+ <startEvent id="_2" name="StartEvent"/>
+ <userTask activiti:assignee="${apply_user}" activiti:exclusive="true" id="_3" name="鎻愪氦鐢宠"/>
+ <userTask activiti:candidateUsers="${approve_users}" activiti:exclusive="true" id="_4" name="瀹℃壒"/>
+ <endEvent id="_5" name="EndEvent"/>
+ <sequenceFlow id="_6" sourceRef="_2" targetRef="_3"/>
+ <sequenceFlow id="_7" sourceRef="_3" targetRef="_4"/>
+ <sequenceFlow id="_8" sourceRef="_4" targetRef="_5"/>
+ </process>
+ <bpmndi:BPMNDiagram documentation="background=#3C3F41;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
+ <bpmndi:BPMNPlane bpmnElement="assign_nc_to_device">
+ <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
+ <omgdc:Bounds height="32.0" width="32.0" x="40.0" y="135.0"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
+ <omgdc:Bounds height="55.0" width="85.0" x="145.0" y="125.0"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4">
+ <omgdc:Bounds height="55.0" width="85.0" x="335.0" y="125.0"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5">
+ <omgdc:Bounds height="32.0" width="32.0" x="545.0" y="135.0"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge bpmnElement="_6" id="BPMNEdge__6" sourceElement="_2" targetElement="_3">
+ <omgdi:waypoint x="72.0" y="151.0"/>
+ <omgdi:waypoint x="145.0" y="152.5"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="_7" id="BPMNEdge__7" sourceElement="_3" targetElement="_4">
+ <omgdi:waypoint x="230.0" y="152.5"/>
+ <omgdi:waypoint x="335.0" y="152.5"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_4" targetElement="_5">
+ <omgdi:waypoint x="420.0" y="152.5"/>
+ <omgdi:waypoint x="545.0" y="151.0"/>
+ <bpmndi:BPMNLabel>
+ <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ </bpmndi:BPMNPlane>
+ </bpmndi:BPMNDiagram>
</definitions>
--
Gitblit v1.9.3