WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改名

Browse Source
This commit is contained in:
zc
2026-02-27 10:50:07 +08:00
parent 0ee56404c2
commit 86527b9c21
611 changed files with 2741 additions and 2752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms-module-system/src/main/resources/mapper/BranchMapper.xml
View File

@@ -1,9 +1,9 @@
<?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="top.ysoft.admin.peopleBranch.mapper.BranchMapper">
<mapper namespace="top.wms.admin.peopleBranch.mapper.BranchMapper">
<select id="queryJuniorBranch" resultType="top.ysoft.admin.peopleBranch.model.resp.BranchResp">
<select id="queryJuniorBranch" resultType="top.wms.admin.peopleBranch.model.resp.BranchResp">
WITH RECURSIVE subdepartments AS (
SELECT id, name, parent_id
FROM sys_branch

4
wms-module-system/src/main/resources/mapper/BranchRuleMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.peopleBranch.mapper.BranchRuleMapper">
<mapper namespace="top.wms.admin.peopleBranch.mapper.BranchRuleMapper">
<select id="selectRuleNames" resultType="top.ysoft.admin.peopleBranch.model.resp.BranchRuleResp">
<select id="selectRuleNames" resultType="top.wms.admin.peopleBranch.model.resp.BranchRuleResp">
SELECT
br.branch_id branchId,
br.rule_id ruleId,

2
wms-module-system/src/main/resources/mapper/DeptMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.system.mapper.DeptMapper">
<mapper namespace="top.wms.admin.system.mapper.DeptMapper">
</mapper>

2
wms-module-system/src/main/resources/mapper/DictItemMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.system.mapper.DictItemMapper">
<mapper namespace="top.wms.admin.system.mapper.DictItemMapper">
<select id="listByDictCode" resultType="top.continew.starter.extension.crud.model.resp.LabelValueResp">
SELECT t1.label, t1.value, t1.color AS extra
FROM sys_dict_item AS t1

4
wms-module-system/src/main/resources/mapper/DownRecordMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.consume.mapper.DownRecordMapper">
<mapper namespace="top.wms.admin.consume.mapper.DownRecordMapper">
<select id="selectRecordsPage" resultType="top.ysoft.admin.consume.model.resp.DownRecordResp">
<select id="selectRecordsPage" resultType="top.wms.admin.consume.model.resp.DownRecordResp">
SELECT
r.*,
p.`name` peopleName,

6
wms-module-system/src/main/resources/mapper/EmpowerRecordMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.rule.mapper.EmpowerRecordMapper">
<mapper namespace="top.wms.admin.rule.mapper.EmpowerRecordMapper">
<select id="selectEmpowerRecordPage" resultType="top.ysoft.admin.rule.model.resp.EmpowerRecordResp">
<select id="selectEmpowerRecordPage" resultType="top.wms.admin.rule.model.resp.EmpowerRecordResp">
select ser.id, ser.name, ser.people_id, ser.info_down, ser.empower, ser.equipment_id, ser.status, ser.remark, ser.create_user,
ser.create_time, ser.update_user, ser.update_time, ser.rule_id, p.name peopleName,p.avatar peopleAvatar,e.name equipmentName,
e.entry_exit_type entryExitType
@@ -12,7 +12,7 @@
${ew.customSqlSegment}
</select>
<select id="selectForEmpowerDel" resultType="top.ysoft.admin.rule.model.resp.EmpowerRecordDetailResp">
<select id="selectForEmpowerDel" resultType="top.wms.admin.rule.model.resp.EmpowerRecordDetailResp">
SELECT
er.people_id,
er.equipment_id,

2
wms-module-system/src/main/resources/mapper/GroupMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.consume.mapper.GroupMapper">
<mapper namespace="top.wms.admin.consume.mapper.GroupMapper">
</mapper>

26
wms-module-system/src/main/resources/mapper/LogMapper.xml
View File

@@ -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="top.ysoft.admin.system.mapper.LogMapper">
<select id="selectLogPage" resultType="top.ysoft.admin.system.model.resp.log.LogResp">
<mapper namespace="top.wms.admin.system.mapper.LogMapper">
<select id="selectLogPage" resultType="top.wms.admin.system.model.resp.log.LogResp">
SELECT
t1.id,
t1.description,
@@ -21,7 +21,7 @@
${ew.customSqlSegment}
</select>
<select id="selectLogList" resultType="top.ysoft.admin.system.model.resp.log.LogResp">
<select id="selectLogList" resultType="top.wms.admin.system.model.resp.log.LogResp">
SELECT
t1.id,
t1.description,
@@ -41,14 +41,14 @@
${ew.customSqlSegment}
</select>
<select id="selectDashboardOverviewPv" resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
<select id="selectDashboardOverviewPv" resultType="top.wms.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
SELECT
(SELECT COUNT(*) FROM sys_log) AS total,
(SELECT COUNT(*) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
(SELECT COUNT(*) FROM sys_log WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY) AND create_time &lt; CURDATE()) AS yesterday
</select>
<select id="selectDashboardOverviewIp" resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
<select id="selectDashboardOverviewIp" resultType="top.wms.admin.system.model.resp.dashboard.DashboardOverviewCommonResp">
SELECT
(SELECT COUNT(DISTINCT ip) FROM sys_log) AS total,
(SELECT COUNT(DISTINCT ip) FROM sys_log WHERE create_time >= CURDATE() AND create_time &lt; DATE_ADD(CURDATE(), INTERVAL 1 DAY)) AS today,
@@ -56,7 +56,7 @@
</select>
<select id="selectListDashboardAnalysisPv"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
DATE_FORMAT(create_time, '%Y-%m') AS name,
COUNT(*) AS value
@@ -70,7 +70,7 @@
</select>
<select id="selectListDashboardAnalysisIp"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
DATE_FORMAT(create_time, '%Y-%m') AS name,
COUNT(DISTINCT ip) AS value
@@ -83,7 +83,7 @@
ORDER BY name
</select>
<select id="selectListDashboardAnalysisGeo" resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
<select id="selectListDashboardAnalysisGeo" resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
CASE
WHEN POSITION(' ' IN address) > 0 THEN SUBSTRING(address FROM 1 FOR POSITION(' ' IN address) - 1)
@@ -96,7 +96,7 @@
</select>
<select id="selectListDashboardAccessTrend"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardAccessTrendResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardAccessTrendResp">
SELECT
DATE(create_time) AS date,
COUNT(*) AS pvCount,
@@ -108,7 +108,7 @@
</select>
<select id="selectListDashboardAnalysisTimeslot"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
LPAD(CONCAT(FLOOR(HOUR(create_time) / 2) * 2, ':00'), 5, '0') AS name,
COUNT(*) AS value
@@ -118,7 +118,7 @@
</select>
<select id="selectListDashboardAnalysisModule"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
module AS name,
COUNT(*) AS value
@@ -130,7 +130,7 @@
</select>
<select id="selectListDashboardAnalysisOs"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
os AS name,
COUNT(*) AS value
@@ -142,7 +142,7 @@
</select>
<select id="selectListDashboardAnalysisBrowser"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardChartCommonResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardChartCommonResp">
SELECT
SUBSTRING_INDEX(browser, ' ', 1) AS name,
COUNT(*) AS value

4
wms-module-system/src/main/resources/mapper/MenuMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.system.mapper.MenuMapper">
<mapper namespace="top.wms.admin.system.mapper.MenuMapper">
<select id="selectPermissionByUserId" resultType="java.lang.String">
SELECT DISTINCT t1.permission
FROM sys_menu AS t1
@@ -13,7 +13,7 @@
AND t1.permission IS NOT NULL
</select>
<select id="selectListByRoleId" resultType="top.ysoft.admin.system.model.entity.MenuDO">
<select id="selectListByRoleId" resultType="top.wms.admin.system.model.entity.MenuDO">
SELECT t1.*
FROM sys_menu AS t1
LEFT JOIN sys_role_menu AS t2 ON t2.menu_id = t1.id

4
wms-module-system/src/main/resources/mapper/MessageMapper.xml
View File

@@ -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="top.ysoft.admin.system.mapper.MessageMapper">
<select id="selectPageByUserId" resultType="top.ysoft.admin.system.model.resp.message.MessageResp">
<mapper namespace="top.wms.admin.system.mapper.MessageMapper">
<select id="selectPageByUserId" resultType="top.wms.admin.system.model.resp.message.MessageResp">
SELECT
t1.*,
t2.user_id,

2
wms-module-system/src/main/resources/mapper/MessageUserMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.system.mapper.MessageUserMapper">
<mapper namespace="top.wms.admin.system.mapper.MessageUserMapper">
<select id="selectUnreadCountByUserIdAndType" resultType="Long">
SELECT
COUNT(t1.message_id)

4
wms-module-system/src/main/resources/mapper/NoticeMapper.xml
View File

@@ -1,9 +1,9 @@
<?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="top.ysoft.admin.system.mapper.NoticeMapper">
<mapper namespace="top.wms.admin.system.mapper.NoticeMapper">
<select id="selectDashboardList"
resultType="top.ysoft.admin.system.model.resp.dashboard.DashboardNoticeResp">
resultType="top.wms.admin.system.model.resp.dashboard.DashboardNoticeResp">
SELECT
id, title, type
FROM sys_notice

8
wms-module-system/src/main/resources/mapper/PeopleDownMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.peopleDownRecord.mapper.PeopleDownMapper">
<mapper namespace="top.wms.admin.peopleDownRecord.mapper.PeopleDownMapper">
<insert id="upsert" parameterType="top.ysoft.admin.peopleDownRecord.model.req.PeopleDownReq">
<insert id="upsert" parameterType="top.wms.admin.peopleDownRecord.model.req.PeopleDownReq">
INSERT INTO equipment_down_record (
people_id,
equipment_id,
@@ -33,7 +33,7 @@
oper_type = values(oper_type)
</insert>
<select id="selectListExport" resultType="top.ysoft.admin.peopleDownRecord.model.resp.PeopleDownResp">
<select id="selectListExport" resultType="top.wms.admin.peopleDownRecord.model.resp.PeopleDownResp">
SELECT
sp.name peopleName,
se.name equipmentName,
@@ -49,7 +49,7 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectDownPage" resultType="top.ysoft.admin.peopleDownRecord.model.resp.PeopleDownResp">
<select id="selectDownPage" resultType="top.wms.admin.peopleDownRecord.model.resp.PeopleDownResp">
SELECT
pd.*,
sp.name peopleName,

2
wms-module-system/src/main/resources/mapper/PeopleEquipmentMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.system.mapper.PeopleEquipmentMapper">
<mapper namespace="top.wms.admin.system.mapper.PeopleEquipmentMapper">
</mapper>

10
wms-module-system/src/main/resources/mapper/PeopleMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.peopleBranch.mapper.PeopleMapper">
<mapper namespace="top.wms.admin.peopleBranch.mapper.PeopleMapper">
<select id="selectExportConsume" resultType="top.ysoft.admin.peopleBranch.model.resp.ConsumePeopleResp">
<select id="selectExportConsume" resultType="top.wms.admin.peopleBranch.model.resp.ConsumePeopleResp">
select
p.`name`,
p.sex,
@@ -17,7 +17,7 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectPageConsume" resultType="top.ysoft.admin.peopleBranch.model.resp.ConsumePeopleResp">
<select id="selectPageConsume" resultType="top.wms.admin.peopleBranch.model.resp.ConsumePeopleResp">
select
p.*,
b.name as branch_name
@@ -26,7 +26,7 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectPeoplePage" resultType="top.ysoft.admin.peopleBranch.model.resp.PeopleResp">
<select id="selectPeoplePage" resultType="top.wms.admin.peopleBranch.model.resp.PeopleResp">
select
p.*,
b.name as branch_name
@@ -35,7 +35,7 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectExportPeople" resultType="top.ysoft.admin.peopleBranch.model.resp.PeopleResp">
<select id="selectExportPeople" resultType="top.wms.admin.peopleBranch.model.resp.PeopleResp">
select
p.`name`,
p.phone,

4
wms-module-system/src/main/resources/mapper/PeopleRecordMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.rule.mapper.PeopleRecordMapper">
<mapper namespace="top.wms.admin.rule.mapper.PeopleRecordMapper">
<select id="selectPeopleRecordPage" resultType="top.ysoft.admin.rule.model.resp.PeopleRecordResp">
<select id="selectPeopleRecordPage" resultType="top.wms.admin.rule.model.resp.PeopleRecordResp">
select spr.id, spr.people_id, spr.equipment_id, spr.device_ip, spr.admit_guid, spr.rec_mode, spr.file_path, spr.show_time, spr.show_date, spr.alive_type,
spr.rec_score, spr.device_no, spr.device_version, spr.source, spr.type, spr.card_no, spr.device_name, spr.rec_type, spr.result, spr.permission_time_type,
spr.pass_time_type, spr.rec_mode_type, spr.storage_id, spr.timestamp, spr.admit_name, spr.remark, spr.create_user, spr.create_time, spr.update_user, spr.update_time,

4
wms-module-system/src/main/resources/mapper/PointMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.space.mapper.PointMapper">
<mapper namespace="top.wms.admin.space.mapper.PointMapper">
<sql id="selectUser">
SELECT
@@ -18,7 +18,7 @@
LEFT JOIN sys_space AS t2 ON t2.id = t1.space_id
</sql>
<select id="selectPointPage" resultType="top.ysoft.admin.space.model.resp.PointResp">
<select id="selectPointPage" resultType="top.wms.admin.space.model.resp.PointResp">
<include refid="selectUser" />
${ew.customSqlSegment}
</select>

2
wms-module-system/src/main/resources/mapper/ProductMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.equipment.mapper.ProductMapper">
<mapper namespace="top.wms.admin.equipment.mapper.ProductMapper">
</mapper>

6
wms-module-system/src/main/resources/mapper/RechargeRecordMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.consume.mapper.RechargeRecordMapper">
<mapper namespace="top.wms.admin.consume.mapper.RechargeRecordMapper">
<select id="selectRechargePage" resultType="top.ysoft.admin.consume.model.resp.RechargeRecordResp">
<select id="selectRechargePage" resultType="top.wms.admin.consume.model.resp.RechargeRecordResp">
SELECT
r.id,
r.account_id,
@@ -30,7 +30,7 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectExport" resultType="top.ysoft.admin.consume.model.resp.RechargeRecordResp">
<select id="selectExport" resultType="top.wms.admin.consume.model.resp.RechargeRecordResp">
SELECT
r.consume_money consumeMoney,
ifnull(r.emp_id, p.gh) empId,

6
wms-module-system/src/main/resources/mapper/RecordMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.consume.mapper.RecordMapper">
<mapper namespace="top.wms.admin.consume.mapper.RecordMapper">
<select id="selectRecordsPage" resultType="top.ysoft.admin.consume.model.resp.RecordResp">
<select id="selectRecordsPage" resultType="top.wms.admin.consume.model.resp.RecordResp">
SELECT
r.*,
p.`name` accountName,
@@ -15,7 +15,7 @@
${ew.getCustomSqlSegment}
</select>
<select id="selectRecordsExport" resultType="top.ysoft.admin.consume.model.resp.RecordResp">
<select id="selectRecordsExport" resultType="top.wms.admin.consume.model.resp.RecordResp">
SELECT
r.*,
p.`name` accountName,

14
wms-module-system/src/main/resources/mapper/ReportMapper.xml
View File

@@ -1,9 +1,9 @@
<?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="top.ysoft.admin.consume.mapper.ReportMapper">
<mapper namespace="top.wms.admin.consume.mapper.ReportMapper">
<select id="queryMerchantReport" resultType="top.ysoft.admin.consume.model.resp.report.MerchantReport">
<select id="queryMerchantReport" resultType="top.wms.admin.consume.model.resp.report.MerchantReport">
SELECT
ct.`name` AS merchant,
e.`name` AS equipmentName,
@@ -30,7 +30,7 @@
GROUP BY cr.dev_id
</select>
<select id="totalReport" resultType="top.ysoft.admin.consume.model.resp.report.BaseReport">
<select id="totalReport" resultType="top.wms.admin.consume.model.resp.report.BaseReport">
SELECT
sum(CASE WHEN cr.consume_type = 0 THEN cr.consume_money ELSE 0 END) AS unitPriceAmount,
sum(CASE WHEN cr.consume_type = 0 THEN 1 ELSE 0 END) AS unitPriceCount,
@@ -52,7 +52,7 @@
</where>
</select>
<select id="queryMealReport" resultType="top.ysoft.admin.consume.model.resp.report.MealReport">
<select id="queryMealReport" resultType="top.wms.admin.consume.model.resp.report.MealReport">
SELECT
ct.`name` AS merchant,
e.`name` AS equipmentName,
@@ -83,7 +83,7 @@
GROUP BY cr.dev_id,cti.tmrtype
</select>
<select id="queryBranchReport" resultType="top.ysoft.admin.consume.model.resp.report.BranchReport">
<select id="queryBranchReport" resultType="top.wms.admin.consume.model.resp.report.BranchReport">
SELECT
b.`name` AS branchName,
sum(CASE WHEN cr.consume_type = 0 THEN cr.consume_money ELSE 0 END) AS unitPriceAmount,
@@ -111,7 +111,7 @@
GROUP BY b.id
</select>
<select id="queryPeopleReport" resultType="top.ysoft.admin.consume.model.resp.report.PeopleReport">
<select id="queryPeopleReport" resultType="top.wms.admin.consume.model.resp.report.PeopleReport">
SELECT
p.`name` AS peopleName,
b.`name` AS branchName,
@@ -167,7 +167,7 @@
</where>
</select>
<select id="queryPeopleExport" resultType="top.ysoft.admin.consume.model.resp.report.PeopleReport">
<select id="queryPeopleExport" resultType="top.wms.admin.consume.model.resp.report.PeopleReport">
SELECT
p.`name` AS peopleName,
b.`name` AS branchName,

2
wms-module-system/src/main/resources/mapper/RoleMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.system.mapper.RoleMapper">
<mapper namespace="top.wms.admin.system.mapper.RoleMapper">
</mapper>

2
wms-module-system/src/main/resources/mapper/RoleMenuMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.system.mapper.RoleMenuMapper">
<mapper namespace="top.wms.admin.system.mapper.RoleMenuMapper">
<select id="selectMenuIdByRoleIds" resultType="java.lang.Long">
SELECT menu_id
FROM sys_role_menu

6
wms-module-system/src/main/resources/mapper/RuleMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.rule.mapper.RuleMapper">
<mapper namespace="top.wms.admin.rule.mapper.RuleMapper">
<resultMap type="RuleDO" id="SysRuleResult">
@@ -29,7 +29,7 @@
</sql>
<select id="querySysRuleList" resultType="top.ysoft.admin.rule.model.entity.RuleDO">
<select id="querySysRuleList" resultType="top.wms.admin.rule.model.entity.RuleDO">
<include refid="selectSysRuleVo"/>
where sr.id in
<foreach collection="ruleIds" item="id" open="(" separator="," close=")">
@@ -37,7 +37,7 @@
</foreach>
</select>
<select id="getEquipmentRulesByPeoples" resultType="top.ysoft.admin.rule.model.resp.YFPeopleResp">
<select id="getEquipmentRulesByPeoples" resultType="top.wms.admin.rule.model.resp.YFPeopleResp">
SELECT
er.rule_id ruleId,
er.equipment_id equipmentId,

4
wms-module-system/src/main/resources/mapper/RuleRelationMapper.xml
View File

@@ -1,9 +1,9 @@
<?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="top.ysoft.admin.system.mapper.RuleRelationMapper">
<mapper namespace="top.wms.admin.system.mapper.RuleRelationMapper">
<delete id="deleteByRuleId" parameterType="top.ysoft.admin.system.model.entity.RuleRelationDO">
<delete id="deleteByRuleId" parameterType="top.wms.admin.system.model.entity.RuleRelationDO">
DELETE FROM equipment_rule_relation
WHERE 1=1
<!-- 判空规则：字段不为 null 且 不为空字符串（兼容字符串/数字类型） -->

4
wms-module-system/src/main/resources/mapper/SpaceMapper.xml
View File

@@ -1,9 +1,9 @@
<?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="top.ysoft.admin.space.mapper.SpaceMapper">
<mapper namespace="top.wms.admin.space.mapper.SpaceMapper">
<select id="queryJuniorSpace" resultType="top.ysoft.admin.space.model.resp.SpaceResp">
<select id="queryJuniorSpace" resultType="top.wms.admin.space.model.resp.SpaceResp">
WITH RECURSIVE subdepartments AS (
SELECT id, name, parent_id
FROM sys_space

2
wms-module-system/src/main/resources/mapper/TenantMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.consume.mapper.TenantMapper">
<mapper namespace="top.wms.admin.consume.mapper.TenantMapper">
</mapper>

2
wms-module-system/src/main/resources/mapper/TimeIntervalMapper.xml
View File

@@ -1,4 +1,4 @@
<?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="top.ysoft.admin.consume_.mapper.TimeIntervalMapper">
<mapper namespace="top.wms.admin.consume_.mapper.TimeIntervalMapper">
</mapper>

6
wms-module-system/src/main/resources/mapper/UserMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.system.mapper.UserMapper">
<mapper namespace="top.wms.admin.system.mapper.UserMapper">
<sql id="selectUser">
SELECT
@@ -26,12 +26,12 @@
LEFT JOIN sys_dept AS t2 ON t2.id = t1.dept_id
</sql>
<select id="selectUserPage" resultType="top.ysoft.admin.system.model.resp.user.UserDetailResp">
<select id="selectUserPage" resultType="top.wms.admin.system.model.resp.user.UserDetailResp">
<include refid="selectUser" />
${ew.customSqlSegment}
</select>
<select id="selectUserList" resultType="top.ysoft.admin.system.model.resp.user.UserDetailResp">
<select id="selectUserList" resultType="top.wms.admin.system.model.resp.user.UserDetailResp">
<include refid="selectUser" />
${ew.customSqlSegment}
</select>

2
wms-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml
View File

@@ -1,6 +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="top.ysoft.admin.system.mapper.UserPasswordHistoryMapper">
<mapper namespace="top.wms.admin.system.mapper.UserPasswordHistoryMapper">
<delete id="deleteExpired">
DELETE t1 FROM sys_user_password_history AS t1
LEFT JOIN (

4
wms-module-system/src/main/resources/mapper/UserRoleMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.system.mapper.UserRoleMapper">
<mapper namespace="top.wms.admin.system.mapper.UserRoleMapper">
<select id="selectUserPage" resultType="top.ysoft.admin.system.model.resp.role.RoleUserResp">
<select id="selectUserPage" resultType="top.wms.admin.system.model.resp.role.RoleUserResp">
SELECT
t1.*,
t2.nickname,

4
wms-module-system/src/main/resources/mapper/UserSocialMapper.xml
View File

@@ -1,8 +1,8 @@
<?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="top.ysoft.admin.system.mapper.UserSocialMapper">
<mapper namespace="top.wms.admin.system.mapper.UserSocialMapper">
<select id="selectBySourceAndOpenId"
resultType="top.ysoft.admin.system.model.entity.UserSocialDO">
resultType="top.wms.admin.system.model.entity.UserSocialDO">
SELECT t1.*
FROM sys_user_social AS t1
LEFT JOIN sys_user AS t2 ON t2.id = t1.user_id