修正生成车非数据的bug。
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<spring.version>5.3.24</spring.version>
|
||||
<!-- <spring.version>6.0.8</spring.version> -->
|
||||
<!-- <spring.version>6.0.11</spring.version> -->
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@@ -86,8 +86,8 @@
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
<version>2.13.4</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
|
||||
<!-- <dependency>
|
||||
<groupId>com.oracle</groupId>
|
||||
<artifactId>ojdbc8</artifactId>
|
||||
<version>19.3.0.0.0</version>
|
||||
@@ -98,6 +98,11 @@
|
||||
<artifactId>ojdbc10</artifactId>
|
||||
<version>19.19.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.oracle.database.nls</groupId>
|
||||
<artifactId>orai18n</artifactId>
|
||||
<version>23.2.0.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
|
||||
<dependency>
|
||||
|
@@ -0,0 +1,37 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.cpic.xim.mybatis.mapper.StaffMapper">
|
||||
<select id="queryCpicStaff" resultMap="CpicXIMStaff" >
|
||||
SELECT ry.p13uid,
|
||||
ry.staff_code,
|
||||
ry.staff_name,
|
||||
bm.department_code,
|
||||
bm.department_name,
|
||||
ksh.section_office_code,
|
||||
ksh.section_office_name
|
||||
FROM idst0.rydm_t ry,
|
||||
idst0.ks_t ksh,
|
||||
idst0.bm_t bm
|
||||
WHERE ry.staff_code = #{staffCode,mode=IN}
|
||||
AND ry.department_code = bm.department_code
|
||||
AND ry.section_office_code = ksh.section_office_code
|
||||
</select>
|
||||
<resultMap id="CpicXIMStaff" type="com.cpic.xim.mybatis.pojo.CpicStaff">
|
||||
<!-- <constructor>
|
||||
<arg column="p13uid" name="p13uid"/>
|
||||
<arg column="staff_code" name="staffCode"/>
|
||||
<arg column="staff_name" name="staffName"/>
|
||||
<arg column="department_code" name="departmentCode"/>
|
||||
<arg column="department_name" name="departmentName"/>
|
||||
<arg column="section_office_code" name="sectionOfficeCode"/>
|
||||
<arg column="section_office_name" name="sectionOfficeName"/>
|
||||
</constructor> -->
|
||||
<id property="staffCode" column="staff_code"/>
|
||||
<result property="staffName" column="staff_name"/>
|
||||
<result property="p13UID" column="p13uid"/>
|
||||
<result property="departmentCode" column="department_code"/>
|
||||
<result property="departmentName" column="department_name"/>
|
||||
<result property="sectionOfficeCode" column="section_office_code"/>
|
||||
<result property="sectionOfficeName" column="section_office_name"/>
|
||||
</resultMap>
|
||||
</mapper>
|
@@ -4,8 +4,8 @@
|
||||
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} ### %msg%n" />
|
||||
<ThresholdFilter level="trace" onMatch="ACCEPT" onMismatch="DENY" />
|
||||
</Console>
|
||||
<RollingFile name="rolling_file" filename="./logs/app.log"
|
||||
filePattern="./logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
|
||||
<RollingFile name="rolling_file" filename="d:/logs/桌面霸屏/app.log"
|
||||
filePattern="d:/logs/桌面霸屏/logs/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
|
||||
<PatternLayout>
|
||||
<Pattern>[%t][%level][%d{HH:mm:ss.SSS}][%logger.%M{36}#%L] %msg%n</Pattern>
|
||||
</PatternLayout>
|
||||
|
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<!-- <properties resource="mybatis/jdbc.properties" /> -->
|
||||
<environments default="development">
|
||||
<environment id="development">
|
||||
<transactionManager type="JDBC" />
|
||||
<dataSource type="POOLED">
|
||||
<property name="driver" value="oracle.jdbc.driver.OracleDriver" />
|
||||
<property name="url" value="jdbc:oracle:thin:@10.39.0.86:1521:xmcx1" />
|
||||
<property name="username" value="desktop_archievement_admin" />
|
||||
<property name="password" value="Cpic123456" />
|
||||
</dataSource>
|
||||
</environment>
|
||||
</environments>
|
||||
<mappers>
|
||||
<mapper resource="mybatis/mappers/StaffMapper.xml" />
|
||||
</mappers>
|
||||
</configuration>
|
@@ -1,4 +0,0 @@
|
||||
jdbc.oracle.driver=oracle.jdbc.driver.OracleDriver
|
||||
jdbc.oracle.xmcx1.url=jdbc:oracle:thin:@10.39.0.86:1521:xmcx1
|
||||
jdbc.oracle.xmcx1.username=desktop_archievement_admin
|
||||
jdbc.oracle.xmcx1.password=Cpic123456
|
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<properties resource="jdbc.properties" />
|
||||
<environments default="development">
|
||||
<environment id="development">
|
||||
<transactionManager type="JDBC" />
|
||||
<dataSource type="POOLED">
|
||||
<property name="driver" value="${jdbc.oracle.driver}" />
|
||||
<property name="url" value="${jdbc.oracle.xmcx1.url}" />
|
||||
<property name="username" value="${jdbc.oracle.xmcx1.username}" />
|
||||
<property name="password" value="${jdbc.oracle.xmcx1.password}" />
|
||||
</dataSource>
|
||||
</environment>
|
||||
</environments>
|
||||
<mappers>
|
||||
<mapper resource="org/mybatis/example/BlogMapper.xml" />
|
||||
</mappers>
|
||||
</configuration>
|
@@ -11,6 +11,7 @@ package com.cpic.xim.DesktopArchievement.test;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import org.junit.Test;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import com.cpic.xim.utils.archievement.DepartmentArchievement;
|
||||
import com.cpic.xim.utils.ranking.CallerRankingList;
|
||||
|
||||
@@ -37,10 +38,11 @@ public class DesktopArchievementTest
|
||||
@Test
|
||||
public void testCallerRankingList()
|
||||
{
|
||||
CallerRankingList rankingList = null;
|
||||
|
||||
try
|
||||
{
|
||||
CallerRankingList rankingList =
|
||||
CallerRankingList.getCallerRankingList( "QDI", "2023", "05" );
|
||||
rankingList = CallerRankingList.getCallerRankingList( "QDI", "2023", "06" );
|
||||
}
|
||||
catch ( SQLException error )
|
||||
{
|
||||
@@ -50,17 +52,7 @@ public class DesktopArchievementTest
|
||||
{
|
||||
error.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testArray()
|
||||
{
|
||||
int[] num =
|
||||
{ 12, 3, 4, 5, 4, 45654,};
|
||||
|
||||
for ( int item : num )
|
||||
{
|
||||
|
||||
}
|
||||
assertNotNull( rankingList );
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user