From 7713280e8a01f1f6d488883bb47400a0785ca307 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 十二月 2024 14:30:09 +0800
Subject: [PATCH] 验光师
---
/dev/null | 9 ---
optometrist/src/main/resources/mapping/TOrderAftersalesMapper.xml | 50 ++++++++++++++++
manage/target/classes/application.yml | 14 ++--
.idea/modules.xml | 2
optometrist/src/main/resources/mapping/LoginLogMapper.xml | 53 +++++++++++++++++
optometrist/src/main/resources/mapping/SecRoleResourceMapper.xml | 16 +++++
optometrist/src/main/resources/mapping/TOrderAccountingMapper.xml | 32 ++++++++++
7 files changed, 159 insertions(+), 17 deletions(-)
diff --git a/.idea/eyes.iml b/.idea/eyes.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/eyes.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a8c54e9..1b5b42c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/eyes.iml" filepath="$PROJECT_DIR$/.idea/eyes.iml" />
+ <module fileurl="file://$PROJECT_DIR$/optometrist.iml" filepath="$PROJECT_DIR$/optometrist.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/manage/target/classes/application.yml b/manage/target/classes/application.yml
index a48e6c9..05850e2 100644
--- a/manage/target/classes/application.yml
+++ b/manage/target/classes/application.yml
@@ -1,9 +1,9 @@
server:
- port: 9090
+ port: 9092
tomcat:
max-swallow-size: 500MB
- servlet:
- context-path: /api
+# servlet:
+# context-path: /api
spring:
thymeleaf:
cache: false
@@ -13,7 +13,7 @@
max-request-size: 500MB
resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
profiles:
- active: prod
+ active: dev
main:
allow-bean-definition-overriding: true
#sagger文档属性配置
@@ -90,8 +90,8 @@
# 数据源
datasource:
username: root #测试环境
- password: 123456
- url: jdbc:mysql://127.0.0.1:3306/jilongda?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+ password: root
+ url: jdbc:mysql://192.168.110.64:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
type: com.zaxxer.hikari.HikariDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
@@ -141,7 +141,7 @@
on-profile: prod
# 数据源
datasource:
- url: jdbc:mysql://127.0.0.1:3306/jilongda?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.110.64:3306/eyes?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
username: root
password: Xiwang2024!
type: com.zaxxer.hikari.HikariDataSource
diff --git a/optometrist/src/main/resources/mapping/LoginLogMapper.xml b/optometrist/src/main/resources/mapping/LoginLogMapper.xml
new file mode 100644
index 0000000..14365f6
--- /dev/null
+++ b/optometrist/src/main/resources/mapping/LoginLogMapper.xml
@@ -0,0 +1,53 @@
+<?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.jilongda.optometrist.mapper.LoginLogMapper">
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.jilongda.common.model.LoginLog">
+ <id column="id" property="id"/>
+ <result column="user_name" property="userName"/>
+ <result column="account" property="account"/>
+ <result column="work_address" property="workAddress"/>
+ <result column="login_address" property="loginAddress"/>
+ <result column="login_time" property="loginTime"/>
+ <result column="login_ip" property="loginIp"/>
+ <result column="equipment" property="equipment"/>
+ <result column="open_id" property="openId"/>
+ <result column="applet_or_manage" property="appletOrManage"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id
+ , user_name, account, work_address, login_address, login_time, login_ip,equipment,open_id,applet_or_manage
+ </sql>
+
+ <select id="pageList" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List">
+ </include>
+ from login_log
+ <where>
+ <if test="query.account != null and query.account != ''">
+ AND account like concat('%',#{query.account},'%')
+ </if>
+ <if test="query.shortName != null and query.shortName != ''">
+ AND user_name like concat('%',#{query.shortName},'%')
+ </if>
+ <if test="query.startTime != null and query.endTime != null">
+ AND DATE_FORMAT(login_time, '%Y-%m-%d %H:%i:%s') >= #{query.startTime}
+ AND DATE_FORMAT(login_time, '%Y-%m-%d %H:%i:%s') <= #{query.endTime}
+ </if>
+ </where>
+ ORDER BY login_time DESC
+ </select>
+ <select id="countToday" resultType="java.lang.Long">
+ select count(DISTINCT (account))
+ from login_log
+ where login_time like concat('%', #{today,jdbcType=DATE}, '%')
+ </select>
+ <select id="countYesterday" resultType="java.lang.Long">
+ select count(DISTINCT (account))
+ from login_log
+ where login_time like concat('%', #{yesterday,jdbcType=DATE}, '%')
+ </select>
+</mapper>
diff --git a/optometrist/src/main/resources/mapping/SecRoleResourceMapper.xml b/optometrist/src/main/resources/mapping/SecRoleResourceMapper.xml
new file mode 100644
index 0000000..e7efeb4
--- /dev/null
+++ b/optometrist/src/main/resources/mapping/SecRoleResourceMapper.xml
@@ -0,0 +1,16 @@
+<?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.jilongda.optometrist.authority.mapper.SecRoleResourceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.jilongda.optometrist.authority.model.SecRoleResource">
+ <result column="role_id" property="roleId" />
+ <result column="resource_id" property="resourceId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ role_id, resource_id
+ </sql>
+
+</mapper>
diff --git a/optometrist/src/main/resources/mapping/TOrderAccountingMapper.xml b/optometrist/src/main/resources/mapping/TOrderAccountingMapper.xml
new file mode 100644
index 0000000..74953f8
--- /dev/null
+++ b/optometrist/src/main/resources/mapping/TOrderAccountingMapper.xml
@@ -0,0 +1,32 @@
+<?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.jilongda.optometrist.mapper.TOrderAccountingMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TOrderAccounting">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="orderId" property="orderId" />
+ <result column="rLens" property="rLens" />
+ <result column="lLens" property="lLens" />
+ <result column="frame" property="frame" />
+ <result column="createTime" property="createTime" />
+ <result column="updateTime" property="updateTime" />
+ <result column="createBy" property="createBy" />
+ <result column="updateBy" property="updateBy" />
+ <result column="isDelete" property="isDelete" />
+ <result column="commission" property="commission" />
+ <result column="rLensProfit" property="rLensProfit" />
+ <result column="lLensProfit" property="lLensProfit" />
+ <result column="frameProfit" property="frameProfit" />
+ <result column="payMoney" property="payMoney" />
+ <result column="profitMoney" property="profitMoney" />
+ <result column="profitRating" property="profitRating" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, orderId, rLens, lLens, frame, createTime, updateTime, createBy, updateBy, isDelete, commission, rLensProfit, lLensProfit, frameProfit, payMoney, profitMoney, profitRating
+ </sql>
+
+</mapper>
diff --git a/optometrist/src/main/resources/mapping/TOrderAftersalesMapper.xml b/optometrist/src/main/resources/mapping/TOrderAftersalesMapper.xml
new file mode 100644
index 0000000..a8aa49b
--- /dev/null
+++ b/optometrist/src/main/resources/mapping/TOrderAftersalesMapper.xml
@@ -0,0 +1,50 @@
+<?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.jilongda.optometrist.mapper.TOrderAftersalesMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.jilongda.optometrist.model.TOrderAftersales">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="sysId" property="sysId" />
+ <result column="optometristId" property="optometristId" />
+ <result column="orderId" property="orderId" />
+ <result column="reason" property="reason" />
+ <result column="handleResult" property="handleResult" />
+ <result column="createTime" property="createTime" />
+ <result column="updateTime" property="updateTime" />
+ <result column="createBy" property="createBy" />
+ <result column="updateBy" property="updateBy" />
+ <result column="isDelete" property="isDelete" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, sysId, optometristId, orderId, reason, handleResult, createTime, updateTime, createBy, updateBy, isDelete
+ </sql>
+ <select id="pageList" resultType="com.jilongda.optometrist.vo.TOrderAftersalesVO">
+ select toa.id, toa.code, toa.sysId, toa.optometristId, toa.orderId, toa.reason, toa.handleResult, toa.createTime, toa.updateTime,
+ toa.createBy, toa.updateBy, toa.isDelete,tau.name, tau.phone, tau.realName, ts.storeName, o.orderMoney
+ from t_order_aftersales toa
+ left join t_app_user tau on toa.sysId = tau.id
+ left join t_store ts on toa.storeId = ts.id
+ left join t_order o on toa.orderId = o.id
+ <where>
+ <if test="query.name != null and query.name != ''">
+ and tau.name like concat('%',#{query.name},'%')
+ </if>
+ <if test="query.phone != null and query.phone != ''">
+ and tau.phone like concat('%',#{query.phone},'%')
+ </if>
+ <if test="query.storeId != null">
+ and toa.storeId = #{query.phone}
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ and toa.createTime between #{query.startTime} and #{query.endTime}
+ </if>
+ and toa.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY toa.createTime DESC
+ </select>
+
+</mapper>
--
Gitblit v1.7.1