Selaa lähdekoodia

init: init project step4: biz code support

shc 1 vuosi sitten
vanhempi
commit
01beb863ea

+ 55 - 63
hnqz-auth/src/main/resources/logback-spring.xml

@@ -1,70 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    小技巧: 在根pom里面设置统一存放路径,统一管理方便维护
-    <properties>
-        <log-path>/Users/hnqz</log-path>
-    </properties>
-    1. 其他模块加日志输出,直接copy本文件放在resources 目录即可
-    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
--->
 <configuration debug="false" scan="false">
-	<property name="log.path" value="logs/${project.artifactId}"/>
-	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN"
-			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-	<conversionRule conversionWord="wex"
-					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-	<conversionRule conversionWord="wEx"
-					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-	<!-- Console log output -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
+    <property name="log.path" value="logs/${project.artifactId}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/debug.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-	</appender>
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file error output -->
-	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-	</appender>
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
 
-	<logger name="org.activiti.engine.impl.db" level="DEBUG">
-		<appender-ref ref="debug"/>
-	</logger>
+    <logger name="org.activiti.engine.impl.db" level="DEBUG">
+        <appender-ref ref="debug"/>
+    </logger>
 
-	<!--nacos 心跳 INFO 屏蔽-->
-	<logger name="com.alibaba.nacos" level="OFF">
-		<appender-ref ref="error"/>
-	</logger>
-	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
-		<appender-ref ref="console"/>
-		<appender-ref ref="debug"/>
-	</root>
+    <!--nacos 心跳 INFO 屏蔽-->
+    <logger name="com.alibaba.nacos" level="OFF">
+        <appender-ref ref="error"/>
+    </logger>
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="debug"/>
+    </root>
 </configuration>

+ 55 - 64
hnqz-gateway/src/main/resources/logback-spring.xml

@@ -1,71 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    小技巧: 在根pom里面设置统一存放路径,统一管理方便维护
-    <properties>
-        <log-path>/Users/hnqz</log-path>
-    </properties>
-    1. 其他模块加日志输出,直接copy本文件放在resources 目录即可
-    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
--->
 <configuration debug="false" scan="false">
-	<property name="log.path" value="logs/${project.artifactId}"/>
-	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN"
-			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-	<conversionRule conversionWord="wex"
-					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-	<conversionRule conversionWord="wEx"
-					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-	<!-- Console log output -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
+    <property name="log.path" value="logs/${project.artifactId}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/debug.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-	</appender>
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file error output -->
-	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-	</appender>
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
 
-	<logger name="org.activiti.engine.impl.db" level="DEBUG">
-		<appender-ref ref="debug"/>
-	</logger>
+    <logger name="org.activiti.engine.impl.db" level="DEBUG">
+        <appender-ref ref="debug"/>
+    </logger>
 
-	<!--nacos 心跳 INFO 屏蔽-->
-	<logger name="com.alibaba.nacos" level="OFF">
-		<appender-ref ref="error"/>
-	</logger>
-	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
-		<appender-ref ref="console"/>
-		<appender-ref ref="debug"/>
-	</root>
+    <!--nacos 心跳 INFO 屏蔽-->
+    <logger name="com.alibaba.nacos" level="OFF">
+        <appender-ref ref="error"/>
+    </logger>
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="debug"/>
+    </root>
 </configuration>

+ 55 - 63
hnqz-upms/hnqz-upms-biz/src/main/resources/logback-spring.xml

@@ -1,70 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    小技巧: 在根pom里面设置统一存放路径,统一管理方便维护
-    <properties>
-        <log-path>/Users/hnqz</log-path>
-    </properties>
-    1. 其他模块加日志输出,直接copy本文件放在resources 目录即可
-    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
--->
 <configuration debug="false" scan="false">
-	<property name="log.path" value="logs/${project.artifactId}"/>
-	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN"
-			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-	<conversionRule conversionWord="wex"
-					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-	<conversionRule conversionWord="wEx"
-					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-	<!-- Console log output -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
+    <property name="log.path" value="logs/${project.artifactId}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/debug.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-	</appender>
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file error output -->
-	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-	</appender>
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
 
-	<logger name="org.activiti.engine.impl.db" level="DEBUG">
-		<appender-ref ref="debug"/>
-	</logger>
+    <logger name="org.activiti.engine.impl.db" level="DEBUG">
+        <appender-ref ref="debug"/>
+    </logger>
 
-	<!--nacos 心跳 INFO 屏蔽-->
-	<logger name="com.alibaba.nacos" level="OFF">
-		<appender-ref ref="error"/>
-	</logger>
-	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
-		<appender-ref ref="console"/>
-		<appender-ref ref="debug"/>
-	</root>
+    <!--nacos 心跳 INFO 屏蔽-->
+    <logger name="com.alibaba.nacos" level="OFF">
+        <appender-ref ref="error"/>
+    </logger>
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="debug"/>
+    </root>
 </configuration>

+ 0 - 65
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/ExportTest.java

@@ -1,65 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
-import com.qunzhixinxi.hnqz.admin.api.model.excel.SettlementProofModel;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * 导出测试
- *
- * @author lixuesong
- * @date 2023/12/01
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class})
-public class ExportTest {
-
-//	@Test
-	public void testExport() throws Exception {
-		// 服务器模板文件路径
-		String resourcePath = "D:\\li312\\Desktop\\settlement_application_form_template.docx";
-
-		HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy();
-
-		Configure config = Configure.newBuilder().bind("package_list", policy).build();
-
-		List<SettlementProofModel.PackageDetail> packageList = new ArrayList<>();
-		SettlementProofModel.PackageDetail packageDetail = new SettlementProofModel.PackageDetail();
-		packageDetail.setNumber("666");
-		packageDetail.setScorePackageName("这个积分包名称怎么样12345");
-		packageDetail.setTaskUsername("迪丽热巴");
-		packageDetail.setBankName("中国建设银行");
-		packageDetail.setBankCardNumber("123456789123456789");
-		packageDetail.setSubjectLocation("正启之星");
-		packageDetail.setSettleAmount("100000.00");
-		packageDetail.setActualAmount("100000.00");
-		packageList.add(packageDetail);
-		packageList.add(packageDetail);
-
-		XWPFTemplate template = XWPFTemplate.compile(resourcePath, config).render(
-				new HashMap<String, Object>() {{
-					// 积分包列表
-					put("package_list", packageList);
-					// 实际到账金额
-					put("total_settle_amount", "999999.99");
-					// 实际结算金额
-					put("total_settle_amount_cn", "九十九万九千九百九十九");
-				}}
-		);
-
-		File file = new File("D:\\li312\\Desktop\\temp\\test.docx");
-		FileOutputStream outputStream = new FileOutputStream(file);
-		template.write(outputStream);
-
-	}
-}

+ 0 - 80
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/ImgBase64Test.java

@@ -1,80 +0,0 @@
-//package com.qunzhixinxi.hnqz.admin;
-//
-//import cn.hutool.core.codec.Base64;
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-//import com.qunzhixinxi.hnqz.admin.api.entity.SysUserExtRecord;
-//import com.qunzhixinxi.hnqz.admin.api.entity.SysUserSub;
-//import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-//import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-//import com.qunzhixinxi.hnqz.admin.service.SysUserExtRecordService;
-//import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
-//import org.junit.runner.RunWith;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-//
-//import java.io.File;
-//import java.util.List;
-//import java.util.Set;
-//import java.util.stream.Collectors;
-//
-///**
-// * 图片base64测试类
-// *
-// * @author lixuesong
-// * @date 2023/10/27
-// */
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@SpringBootTest(classes = {HnqzAdminApplication.class})
-//public class ImgBase64Test {
-//
-//	@Autowired
-//	private SysUserSubService sysUserSubService;
-//
-//	@Autowired
-//	private SysUserExtRecordService sysUserExtRecordService;
-//
-//	@Autowired
-//	private SysDeptService sysDeptService;
-//
-////	@Test
-//	public void base64ToImgtest() {
-//		List<SysUserSub> userSubList = sysUserSubService.list(Wrappers.<SysUserSub>lambdaQuery()
-//				.eq(SysUserSub::getCertStatus, 1)
-//				//.eq(SysUserSub::getSubjectLocation, SubjectLocation.HUI_QI_YUN));
-//
-//		Set<Integer> userIds = userSubList.stream().map(SysUserSub::getUserId).collect(Collectors.toSet());
-//
-//		List<SysUserExtRecord> userExtRecordList = sysUserExtRecordService.list(Wrappers.<SysUserExtRecord>lambdaQuery()
-//				.in(SysUserExtRecord::getUserId, userIds)
-//				.eq(SysUserExtRecord::getDelFlag, DelEnum.NOT_DEL.val())
-//				.select(SysUserExtRecord::getIdCardFrontBase64, SysUserExtRecord::getIdCardBackBase64, SysUserExtRecord::getDeptId,
-//						SysUserExtRecord::getRealName, SysUserExtRecord::getIdCardNumber));
-//
-//		userExtRecordList.forEach(sysUserExtRecord -> {
-//
-//			SysDept sysDept = sysDeptService.getById(sysUserExtRecord.getDeptId());
-//
-//			String parentFileName = String.format("D:\\li312\\Desktop\\huiqiyun_cert_user\\%s", sysDept.getName());
-//			File parentFile = new File(parentFileName);
-//			if (!parentFile.exists()) {
-//				parentFile.mkdirs();
-//			}
-//
-//			String frontFileName = String.format("%s\\%s_%s_front.jpg",
-//					parentFileName, sysUserExtRecord.getRealName(), sysUserExtRecord.getIdCardNumber());
-//			System.out.println("frontFileName: " + frontFileName);
-//			File frontFile = new File(frontFileName);
-//
-//			Base64.decodeToFile(sysUserExtRecord.getIdCardFrontBase64(), frontFile);
-//
-//			String backFileName = String.format("%s\\%s_%s_back.jpg",
-//					parentFileName, sysUserExtRecord.getRealName(), sysUserExtRecord.getIdCardNumber());
-//			System.out.println("backFileName: " + backFileName);
-//			File backFile = new File(backFileName);
-//
-//			Base64.decodeToFile(sysUserExtRecord.getIdCardBackBase64(), backFile);
-//		});
-//	}
-//}

+ 0 - 103
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/ManualImportSurveyInfoTest.java

@@ -1,103 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaPharmacy;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.service.WmDaPharmacyService;
-import com.qunzhixinxi.hnqz.admin.util.MapUtil;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-/**
- * 手动导入调查信息测试
- *
- * @author lixuesong
- * @date 2023/09/27
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class})
-public class ManualImportSurveyInfoTest {
-
-    @Autowired
-    private WmDaPharmacyService wmDaPharmacyService;
-
-//    @Test
-    public void testImport() {
-        ExcelReaderBuilder readerBuilder = EasyExcel.read("D:\\li312\\Desktop\\零售终端门店资料1027.xlsx");
-        List<Object> objects = readerBuilder.doReadAllSync();
-        System.out.println(objects);
-
-		List<WmDaPharmacy> pharmacyList = new ArrayList<>();
-        for (int i = 1; i < objects.size(); i++) {
-
-//            try {
-//                Thread.sleep(200);
-//            } catch (InterruptedException e) {
-//                throw new RuntimeException(e);
-//            }
-
-            LinkedHashMap<Integer, String> map = (LinkedHashMap) objects.get(i);
-            String name = map.get(2);
-            String address = map.get(4);
-
-			int count = wmDaPharmacyService.count(Wrappers.<WmDaPharmacy>lambdaQuery()
-					.eq(WmDaPharmacy::getPharmacyName, name)
-					.eq(WmDaPharmacy::getDelFlag, DelEnum.NOT_DEL.val()));
-			if (count > 0) {
-				System.out.println(name + " 已存在,自动跳过");
-			}
-
-			WmDaPharmacy wmDaPharmacy = new WmDaPharmacy();
-            wmDaPharmacy.setPharmacyName(name);
-            wmDaPharmacy.setAddress(address);
-            wmDaPharmacy.setProvince("");
-            wmDaPharmacy.setCity("");
-            wmDaPharmacy.setArea("");
-            //更新审核信息
-            LocalDateTime now = LocalDateTime.now();
-            wmDaPharmacy.setCreateTime(now);
-            wmDaPharmacy.setCreateUser(-1);
-            // 根据地址转换经纬度
-            this.convertToLatAndLong(wmDaPharmacy);
-
-            System.out.println(String.format("第%s条,%s-%s-%s", i, name, address, wmDaPharmacy));
-
-			pharmacyList.add(wmDaPharmacy);
-        }
-		wmDaPharmacyService.saveBatch(pharmacyList);
-
-
-    }
-
-    /**
-     * 根据地址转换经纬度
-     *
-     * @param wmDaPharmacy
-     */
-    private void convertToLatAndLong(WmDaPharmacy wmDaPharmacy) {
-        String fullAddress = wmDaPharmacy.getProvince() + wmDaPharmacy.getCity() + wmDaPharmacy.getArea()
-                + wmDaPharmacy.getAddress();
-        JSONObject jsonObject = MapUtil.getLatAndLogByName(fullAddress);
-        if (jsonObject != null) {
-            wmDaPharmacy.setProvince(jsonObject.getString("province"));
-            wmDaPharmacy.setCity(jsonObject.getString("city"));
-            wmDaPharmacy.setArea(jsonObject.getString("district"));
-            String location = jsonObject.getString("location");
-            if (null != location && location.split(",").length > 0) {
-                wmDaPharmacy.setLongitude(location.split(",")[0]);
-                wmDaPharmacy.setLatitude(location.split(",")[1]);
-            }
-        }
-    }
-}

+ 0 - 129
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/SysDeptInvoiceServiceTest.java

@@ -1,129 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageSettleNote;
-import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptInvoiceMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptInvoiceRelationMapper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * @author snows
- * @date 2023/7/6 15:56
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class, Test.class})
-public class SysDeptInvoiceServiceTest {
-
-    @Autowired
-    private WmScorePackageMapper scorePackageMapper;
-
-    @Autowired
-    private SysDeptInvoiceMapper deptInvoiceMapper;
-    @Autowired
-    private SysDeptInvoiceRelationMapper deptInvoiceRelationMapper;
-
-    /**
-     * 初始化已开票的数据
-     */
-//    @Test
-//    @Transactional(rollbackFor = Exception.class)
-//    @Rollback(value = false)
-    public void initInvoicedData() {
-        List<Integer> deptList = null;
-        LocalDateTime startDate = null;
-        LocalDateTime endDate = DateUtil.parseLocalDateTime("2023-07-01 00:00:00");
-        BigDecimal seriveCharge = BigDecimal.ONE;
-
-
-        // 查出所有符合开票的数据
-        LambdaQueryWrapper<WmScorePackage> queryWrapper = Wrappers.<WmScorePackage>lambdaQuery()
-                .eq(WmScorePackage::getPackageType1, "1")
-                .eq(WmScorePackage::getPackageType2, "1")
-                .in(WmScorePackage::getScorePackageStatus, "4", "5")
-                .eq(WmScorePackage::getSettleStatus, "1")
-                .in(WmScorePackage::getTypeid, "3", "4")
-                .and(wrapper -> wrapper.isNull(WmScorePackage::getRelationScoreId)
-                        .or(wrapper1 -> wrapper1.eq(WmScorePackage::getRelationScoreId, "")));
-        if (CollUtil.isNotEmpty(deptList)) {
-            queryWrapper.in(WmScorePackage::getSendPackageDeptId, deptList);
-        }
-
-        List<WmScorePackage> scorePackages = scorePackageMapper.selectList(queryWrapper);
-
-        if (CollUtil.isNotEmpty(scorePackages)) {
-            Set<String> packageIds = scorePackages.stream().map(WmScorePackage::getId).collect(Collectors.toSet());
-
-            // 查询积分包对应的结算成功的数据
-            LambdaQueryWrapper<WmScorePackageSettleNote> queryWrapper1 = Wrappers.<WmScorePackageSettleNote>lambdaQuery()
-                    .in(WmScorePackageSettleNote::getPackageId, packageIds)
-                    .eq(WmScorePackageSettleNote::getSettleNoteStatus, "1");
-            if (startDate != null) {
-                queryWrapper1.gt(WmScorePackageSettleNote::getNotifyTime, startDate);
-            }
-            if (endDate != null) {
-                queryWrapper1.lt(WmScorePackageSettleNote::getNotifyTime, endDate);
-            }
-            // todo
-            //List<WmScorePackageSettleNote> settleNotes = scorePackageSettleNoteMapper.selectList(queryWrapper1);
-            //if (CollUtil.isNotEmpty(settleNotes)) {
-            //    Map<String, List<WmScorePackageSettleNote>> settlePackageMap = settleNotes.stream().collect(Collectors.groupingBy(WmScorePackageSettleNote::getPackageId));
-            //    // 积分包过滤,只要结算成功的数据
-            //    List<WmScorePackage> filterPackages = scorePackages.stream().filter(scorePackage -> {
-            //        List<WmScorePackageSettleNote> settleNotes1 = settlePackageMap.get(scorePackage.getId());
-            //        if (CollUtil.isNotEmpty(settleNotes1)) {
-            //            return true;
-            //        }
-            //        return false;
-            //    }).collect(Collectors.toList());
-            //
-            //    filterPackages.forEach(scorePackage -> {
-            //        Integer deptId = Integer.valueOf(scorePackage.getSendPackageDeptId());
-            //        Integer totalScore = scorePackage.getScore();
-            //        // 存入开票表中
-            //        // 计算开票金额
-            //        // 开票金额 = 开票积分 * (服务费率/100)
-            //        BigDecimal invoiceAmount = seriveCharge.divide(new BigDecimal("100.00"))
-            //                .multiply(BigDecimal.valueOf(totalScore)).setScale(2, RoundingMode.HALF_EVEN);
-            //        // 保存开票信息
-            //        SysDeptInvoice deptInvoice = new SysDeptInvoice();
-            //        deptInvoice.setDeptId(deptId);
-            //        deptInvoice.setInvoiceType(InvoiceType.GENERAL);
-            //        deptInvoice.setAddress("");
-            //        deptInvoice.setAddresseeName("");
-            //        deptInvoice.setAddresseePhone("");
-            //        deptInvoice.setApprovalStatus(InvoiceApprovalStatus.PASSED);
-            //        deptInvoice.setRelationPackageNumber(1);
-            //        deptInvoice.setRelationPackageScore(totalScore);
-            //        deptInvoice.setInvoiceAmount(invoiceAmount);
-            //        deptInvoiceMapper.insert(deptInvoice);
-            //
-            //        // 保存开票积分包关联信息
-            //        SysDeptInvoiceRelation invoiceRelation = new SysDeptInvoiceRelation();
-            //        invoiceRelation.setDeptId(Integer.valueOf(scorePackage.getDeptId()));
-            //        invoiceRelation.setInvoiceId(deptInvoice.getId());
-            //        invoiceRelation.setInvoiceStatus(InvoiceStatus.PASSED);
-            //        invoiceRelation.setCreateUser(1);
-            //        invoiceRelation.setPackageId(scorePackage.getId());
-            //        deptInvoiceRelationMapper.insert(invoiceRelation);
-            //    });
-            //
-            //}
-        }
-
-    }
-}

+ 0 - 57
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmArticleTest.java

@@ -1,57 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import cn.hutool.core.util.ArrayUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmWkArticle;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.service.WmWkArticleService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 文章数据处理
- *
- * @author lixuesong
- * @date 2023/11/15
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class})
-public class WmArticleTest {
-
-	@Autowired
-	private WmWkArticleService wmWkArticleService;
-
-	/**
-	 * 增量更新文章来源的deptId
-	 */
-//	@Test
-	public void testArticle() {
-		String[] newSourceEnt = new String[]{"1611890564", "1611890570", "1611890587", "1611890597", "1611890619"};
-
-		List<WmWkArticle> articleList = wmWkArticleService.list(Wrappers.<WmWkArticle>lambdaQuery()
-				.eq(WmWkArticle::getDelFlag, DelEnum.NOT_DEL.val())
-				.select(WmWkArticle::getSourceEnt, WmWkArticle::getId));
-		List<WmWkArticle> updateArticles = new ArrayList<>();
-		articleList.forEach(article -> {
-			WmWkArticle updateArticle = new WmWkArticle();
-			updateArticle.setId(article.getId());
-
-			String[] sourceEnt = ArrayUtil.distinct(ArrayUtil.append(article.getSourceEnt(), newSourceEnt));
-			System.out.println("id=" + article.getId() + " sourceEnt=" + ArrayUtil.join(sourceEnt, ","));
-
-			updateArticle.setSourceEnt(sourceEnt);
-			updateArticle.setUpdateTime(LocalDateTime.now());
-			updateArticle.setUpdateUser(1);
-			updateArticles.add(updateArticle);
-		});
-
-		wmWkArticleService.updateBatchById(updateArticles);
-	}
-}

+ 0 - 61
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmReportApprovalTest.java

@@ -1,61 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class})
-public class WmReportApprovalTest {
-
-    @Autowired
-    private WmTaskService wmTaskService;
-
-//    @Test
-    public void testApprovalData() {
-        String taskIdStr = "315679,\n" +
-                "315681,\n" +
-                "315682,\n" +
-                "315683,\n" +
-                "315685,\n" +
-                "315690,\n" +
-                "315695,\n" +
-                "315697,\n" +
-                "315703,\n" +
-                "315704,\n" +
-                "315705,\n" +
-                "315706,\n" +
-                "315707,\n" +
-                "315708,\n" +
-                "315709,\n" +
-                "315710,\n" +
-                "315711\n";
-        List<String> taskIdList = StrUtil.split(taskIdStr, ",")
-                .stream().map(String::trim)
-                .collect(Collectors.toList());;
-
-        taskIdList.forEach(id -> {
-            // 查询这条任务
-            WmTask queryTask = wmTaskService.getById(id);
-            if (queryTask == null) {
-                throw new RuntimeException("任务不存在");
-            }
-
-
-            // STEP4: 如果是源头积分包,则判断是否审核入库调查信息
-//            if (StringUtils.isNotBlank(reportScorePackage.getRelationScoreId())) {
-                wmTaskService.task15_30_16_18ForManualOperation(queryTask, "3", "手动审核通过入库"+ DateUtil.now());
-//            }
-            System.out.println("处理完成taskID="+id);
-        });
-    }
-}

+ 0 - 177
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskSubmissionRuleServiceTest.java

@@ -1,177 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.constant.UpmsType;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionPercentRule;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskSubmissionRule;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
-import com.qunzhixinxi.hnqz.common.core.constant.enums.CommonFlag;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @author snows
- * @date 2023/7/18 17:00
- */
-@Slf4j
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class, Test.class})
-public class WmTaskSubmissionRuleServiceTest {
-
-    @Autowired
-    private WmTaskSubmissionPercentRuleService taskSubmissionPercentRuleService;
-	@Autowired
-	private WmTaskSubmissionRuleService taskSubmissionRuleService;
-    @Autowired
-    private SysDeptService deptService;
-	@Autowired
-	private WmTaskMapper wmTaskMapper;
-
-	/**
-	 * 初始化企业的特定任务规则
-	 */
-//	@Test
-	public void initDeptTaskSubmissionRule() {
-		// 查询源数据企业的配置
-		List<WmTaskSubmissionRule> platformRules = taskSubmissionRuleService.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
-				.eq(WmTaskSubmissionRule::getDeptId, 1)
-				.eq(WmTaskSubmissionRule::getSubCategory, UpmsType.TaskSubCategory.PHARMACY_VISIT));
-
-		// 查询需要初始化的企业
-		List<SysDept> deptList = deptService.list(Wrappers.<SysDept>lambdaQuery()
-				.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.val())
-				.ne(SysDept::getDeptId, 1));
-		Set<Integer> deptIds = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toSet());
-
-		List<WmTaskSubmissionRule> deptRules = new ArrayList<>(deptIds.size() * platformRules.size());
-
-		deptIds.forEach(deptId -> {
-			platformRules.forEach(r -> {
-				WmTaskSubmissionRule deptRule = new WmTaskSubmissionRule();
-				deptRule.setRule(r.getRule());
-				deptRule.setDeptId(deptId);
-				deptRule.setOptFlag(r.getOptFlag());
-				deptRule.setSubCategory(r.getSubCategory());
-				deptRules.add(deptRule);
-			});
-
-		});
-
-		taskSubmissionRuleService.saveBatch(deptRules);
-	}
-
-
-//    @Test
-    public void initTaskTypeConfig() {
-
-        // 查询所有企业
-        List<SysDept> depts = deptService.list();
-
-        // 查询平台企业的规则
-        List<WmTaskSubmissionPercentRule> baseRules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
-                .eq(WmTaskSubmissionPercentRule::getDeptId, 1)
-                .eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG));
-        WmTaskSubmissionPercentRule.PercentRule rule = baseRules.get(0).getRule();
-
-
-        depts.forEach(sysDept -> {
-            // 查询待修改企业的规则
-            List<WmTaskSubmissionPercentRule> queryRules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
-                    .eq(WmTaskSubmissionPercentRule::getDeptId, sysDept.getDeptId())
-                    .eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG));
-            if (CollUtil.isEmpty(queryRules)) {
-                log.info("初始化deptId={}", sysDept.getDeptId());
-                WmTaskSubmissionPercentRule percentRule = new WmTaskSubmissionPercentRule();
-                percentRule.setDeptId(sysDept.getDeptId());
-                percentRule.setRule(rule);
-                percentRule.setSubCategory(UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG);
-                percentRule.setOptFlag(CommonFlag.OptFlag.OK);
-                taskSubmissionPercentRuleService.save(percentRule);
-            }
-        });
-    }
-
-    /**
-     * 增量更新企业的任务类型配置数据
-     */
-    @Test
-    public void initNewTaskTypeConfig() {
-
-        // 平台新增的任务类型
-        Set<String> taskTypeIds = new HashSet<>();
-        taskTypeIds.add("73");
-
-            // 查询待修改企业的规则
-            List<WmTaskSubmissionPercentRule> queryRules = taskSubmissionPercentRuleService.list(Wrappers.<WmTaskSubmissionPercentRule>lambdaQuery()
-                    .eq(WmTaskSubmissionPercentRule::getSubCategory, UpmsType.TaskSubCategory2.TASK_TYPE_CONFIG));
-            if (CollUtil.isNotEmpty(queryRules)) {
-                queryRules.forEach(percentRule -> {
-                    log.info("初始化deptId={}", percentRule.getDeptId());
-
-                    String[] oldTaskTypeIds = percentRule.getRule().getTaskTypeIds();
-
-                    WmTaskSubmissionPercentRule updateRule = new WmTaskSubmissionPercentRule();
-                    updateRule.setRuleId(percentRule.getRuleId());
-                    Set<String> newTaskTypeIdSet = Stream.of(oldTaskTypeIds).collect(Collectors.toSet());
-                    newTaskTypeIdSet.addAll(taskTypeIds);
-                    WmTaskSubmissionPercentRule.PercentRule updatePercentRule = BeanUtil.copyProperties(percentRule.getRule(), WmTaskSubmissionPercentRule.PercentRule.class);
-                    updatePercentRule.setTaskTypeIds(newTaskTypeIdSet.stream().sorted(Comparator.comparingInt(Integer::parseInt)).toArray(String[]::new));
-                    updateRule.setRule(updatePercentRule);
-                    updateRule.setUpdateTime(LocalDateTime.now());
-                    taskSubmissionPercentRuleService.updateById(updateRule);
-                });
-            }
-    }
-
-	/**
-	 * 月度积分限制校验
-	 */
-//	@Test
-	public void checkMonthScoreLimit() {
-		Integer entId = 1611890565;
-		// 月度积分限制
-		String monthLimitValue;
-		List<WmTaskSubmissionRule> monthScoreLimitRuleList = taskSubmissionRuleService.list(Wrappers.<WmTaskSubmissionRule>lambdaQuery()
-				.in(WmTaskSubmissionRule::getDeptId, CollUtil.newHashSet("entId", 1))
-				.eq(WmTaskSubmissionRule::getOptFlag, CommonFlag.OptFlag.OK)
-				.eq(WmTaskSubmissionRule::getSubCategory, UpmsType.TaskSubCategory.MONTH_SCORE_LIMIT));
-		if (CollUtil.isNotEmpty(monthScoreLimitRuleList)) {
-			Map<Integer, WmTaskSubmissionRule.SubmissionRule> submissionRuleMap = monthScoreLimitRuleList.stream()
-					.collect(Collectors.toMap(WmTaskSubmissionRule::getDeptId, rules ->
-							BeanUtil.toBean(rules.getRule().get(0), WmTaskSubmissionRule.SubmissionRule.class)));
-			WmTaskSubmissionRule.SubmissionRule submissionRule = submissionRuleMap.containsKey(entId) ? submissionRuleMap.get(entId) : submissionRuleMap.get(1);
-			monthLimitValue = String.valueOf(submissionRule.getFrequency().get(0).get("quantity"));
-		} else {
-			monthLimitValue = "300000";
-		}
-
-		LocalDate localDate = LocalDate.now();
-		LocalDateTime startOfMonth = localDate.withDayOfMonth(1).atStartOfDay();
-		LocalDateTime startOfNextMonth = localDate.plusMonths(1).withDayOfMonth(1).atStartOfDay();
-		int total = wmTaskMapper.getUserTaskSubScore("4714", startOfMonth, startOfNextMonth);
-
-		System.out.println("total=" + total + " limit=" + monthLimitValue);
-	}
-}

+ 0 - 314
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/WmTaskTypeServiceTest.java

@@ -1,314 +0,0 @@
-package com.qunzhixinxi.hnqz.admin;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptRelation;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaAgent;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.SysDeptRelationMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmDaAgentMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmDaDrugEntMapper;
-import com.qunzhixinxi.hnqz.admin.mapper.WmTaskTypeMapper;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 批量同步指定的任务类型给所有企业
- *
- * @author lixuesong
- * @date 2021年11月22日 18:55
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = {HnqzAdminApplication.class, Test.class})
-public class WmTaskTypeServiceTest {
-
-	@Autowired
-	private WmTaskTypeMapper wmTaskTypeMapper;
-
-	@Autowired
-	private SysDeptMapper sysDeptMapper;
-
-	@Autowired
-	private SysDeptRelationMapper sysDeptRelationMapper;
-
-	@Autowired
-	private WmDaDrugEntMapper wmDaDrugEntMapper;
-
-	@Autowired
-	private WmDaAgentMapper wmDaAgentMapper;
-	
-	// 任务类型list
-	private static final List<String> taskTypeIdList = new ArrayList<String>(){{
-		add("58");
-		add("59");
-		add("60");
-	}};
-
-	/**
-	 * 批量同步指定的任务类型给所有企业
-	 */
-//	@Test
-	public void test() {
-		List<WmTaskType> tempList = wmTaskTypeMapper.selectBatchIds(taskTypeIdList);
-
-		// 1.第一级是药企的情况
-//		List<SysDept> deptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-//				.eq(SysDept::getLevel, 2));
-		List<SysDept> sysDepts1 = sysDeptMapper.listAllDept();
-		List<SysDept> deptList = new ArrayList<>();
-		if (CollectionUtil.isNotEmpty(sysDepts1)) {
-			deptList = sysDepts1.stream()
-					.filter(sysDept -> sysDept.getLevel().equals(2))
-					.collect(Collectors.toList());
-		}
-		// 遍历药企
-		for (SysDept dept : deptList) {
-			// 生成药企任务类型
-			WmDaDrugEnt wmDaDrugEnt = wmDaDrugEntMapper.selectOne(Wrappers.<WmDaDrugEnt>lambdaQuery()
-					.eq(WmDaDrugEnt::getDeptId, dept.getDeptId())
-//					.eq(WmDaDrugEnt::getEnableFlag, EnableEnum.ENABLE.val())
-					.eq(WmDaDrugEnt::getDelFlag, DelEnum.NOT_DEL.val()));
-			if (wmDaDrugEnt == null) {
-				continue;
-			}
-			for (WmTaskType wmTaskType1 : tempList) {
-				WmTaskType newOne = BeanUtil.copyProperties(wmTaskType1, WmTaskType.class);
-				newOne.setCreateTime(null);
-				newOne.setId(null);
-				newOne.setDurgentId(wmDaDrugEnt.getId());
-				newOne.setTaskTypeLevel("2");
-				newOne.setTaskEntId(wmDaDrugEnt.getId());
-				newOne.setDeptId(wmDaDrugEnt.getDeptId());
-				newOne.setStatus("0");
-				newOne.setBaseId(wmTaskType1.getId());
-				newOne.setRuleId(wmDaDrugEnt.getId().toString());
-				newOne.setParentId(wmTaskType1.getParentId());
-				newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
-				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, wmTaskType1.getTaskTypeName())
-						.eq(WmTaskType::getRuleId, newOne.getRuleId())
-						.eq(WmTaskType::getDeptId, newOne.getDeptId())
-						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-				if (CollectionUtil.isEmpty(taskTypeList)) {
-					newOne.setCreateTime(LocalDateTime.now());
-					wmTaskTypeMapper.insert(newOne);
-				}
-			}
-
-			// 查询一级CSO
-			List<SysDeptRelation> deptRelationList = sysDeptRelationMapper.selectList(Wrappers.<SysDeptRelation>lambdaQuery()
-					.eq(SysDeptRelation::getAncestor, dept.getDeptId())
-					.ne(SysDeptRelation::getDescendant, dept.getDeptId()));
-			if (CollectionUtil.isEmpty(deptRelationList)) {
-				continue;
-			}
-			List<Integer> oneCSODeptIdList = deptRelationList.stream()
-					.map(SysDeptRelation::getDescendant)
-					.collect(Collectors.toList());
-			List<SysDept> oneCSODeptList = sysDeptMapper.selectByIds(oneCSODeptIdList);
-//			List<SysDept> oneCSODeptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-//					.eq(SysDept::getParentId, dept.getDeptId())
-//					.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.val())
-//					.eq(SysDept::getLevel, 3));
-			for (SysDept oneCSODept : oneCSODeptList) {
-				// 生成药企给一级CSO的任务类型
-				WmDaAgent wmDaAgent = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-						.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val())
-//						.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-						.eq(WmDaAgent::getDeptId, oneCSODept.getDeptId()));
-				if (wmDaAgent == null) {
-					continue;
-				}
-				for (WmTaskType wmTaskType1 : tempList) {
-					WmTaskType newOne = BeanUtil.copyProperties(wmTaskType1, WmTaskType.class);
-					newOne.setCreateTime(null);
-					newOne.setId(null);
-					newOne.setLevel1Id(wmDaAgent.getId());
-					newOne.setDurgentId(wmDaDrugEnt.getId());
-					newOne.setTaskTypeLevel("2");
-					newOne.setRuleId(""+wmDaDrugEnt.getId() + wmDaAgent.getId());
-					newOne.setTaskEntId(wmDaAgent.getId());
-					newOne.setDeptId(wmDaAgent.getDeptId());
-					newOne.setStatus("0");
-					newOne.setBaseId(wmTaskType1.getId());
-					newOne.setTaskReceiverType(wmTaskType1.getTaskReceiverType());
-					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getTaskTypeName, wmTaskType1.getTaskTypeName())
-							.eq(WmTaskType::getRuleId, newOne.getRuleId())
-							.eq(WmTaskType::getDeptId, newOne.getDeptId())
-							.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-					if (CollectionUtil.isEmpty(taskTypeList)) {
-						newOne.setCreateTime(LocalDateTime.now());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-				// 生成一级CSO的任务类型
-				for (WmTaskType wmTaskType2 : tempList) {
-					WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-					newOne.setCreateTime(null);
-					newOne.setId(null);
-					newOne.setLevel1Id(wmDaAgent.getId());
-					newOne.setTaskTypeLevel("2");
-					newOne.setTaskEntId(wmDaAgent.getId());
-					newOne.setRuleId(wmDaAgent.getId().toString());
-					newOne.setDeptId(wmDaAgent.getDeptId());
-					newOne.setStatus("0");
-					newOne.setBaseId(wmTaskType2.getId());
-					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-							.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-							.eq(WmTaskType::getRuleId, newOne.getRuleId())
-							.eq(WmTaskType::getDeptId, newOne.getDeptId())
-							.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-					if (CollectionUtil.isEmpty(taskTypeList)) {
-						newOne.setCreateTime(LocalDateTime.now());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-
-				// 查询二级CSO
-				List<SysDept> twoCSODeptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-						.eq(SysDept::getParentId, oneCSODept.getDeptId())
-//						.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.val())
-						.eq(SysDept::getLevel, 4));
-				for (SysDept twoCSODept : twoCSODeptList) {
-					// 生成二级CSO任务类型
-					WmDaAgent wmDaAgent2 = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-							.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val())
-//							.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-							.eq(WmDaAgent::getDeptId, twoCSODept.getDeptId()));
-					if (wmDaAgent2 == null) {
-						continue;
-					}
-					for (WmTaskType wmTaskType2 : tempList) {
-						WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-						newOne.setCreateTime(null);
-						newOne.setId(null);
-						newOne.setLevel1Id(wmDaAgent2.getId());
-						newOne.setTaskTypeLevel("2");
-						newOne.setTaskEntId(wmDaAgent2.getId());
-						newOne.setRuleId(wmDaAgent2.getId().toString());
-						newOne.setDeptId(wmDaAgent2.getDeptId());
-						newOne.setStatus("0");
-						newOne.setBaseId(wmTaskType2.getId());
-						newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-						List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-								.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-								.eq(WmTaskType::getRuleId, newOne.getRuleId())
-								.eq(WmTaskType::getDeptId, newOne.getDeptId())
-								.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-						if (CollectionUtil.isEmpty(taskTypeList)) {
-							newOne.setCreateTime(LocalDateTime.now());
-							wmTaskTypeMapper.insert(newOne);
-						}
-					}
-				}
-
-			}
-
-		}
-
-		// 2.第一级是CSO的情况
-//		List<SysDept> deptList2 = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-//				.eq(SysDept::getLevel, 3)
-//				.isNull(SysDept::getParentId));
-		List<SysDept> sysDepts = sysDeptMapper.listAllDept();
-		List<SysDept> deptList2 = new ArrayList<>();
-		if (CollectionUtil.isNotEmpty(sysDepts)) {
-			deptList2 = sysDepts.stream()
-					.filter(sysDept -> sysDept.getLevel().equals(3) && sysDept.getParentId() == null)
-					.collect(Collectors.toList());
-		}
-		// 查询一级CSO
-		for (SysDept oneCSODept : deptList2) {
-			// 生成药企给一级CSO的任务类型
-			WmDaAgent wmDaAgent = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-					.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val())
-//					.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-					.eq(WmDaAgent::getDeptId, oneCSODept.getDeptId()));
-			if (wmDaAgent == null) {
-				continue;
-			}
-			// 生成一级CSO的任务类型
-			for (WmTaskType wmTaskType2 : tempList) {
-				WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-				newOne.setCreateTime(null);
-				newOne.setId(null);
-				newOne.setLevel1Id(wmDaAgent.getId());
-				newOne.setTaskTypeLevel("2");
-				newOne.setTaskEntId(wmDaAgent.getId());
-				newOne.setRuleId(wmDaAgent.getId().toString());
-				newOne.setDeptId(wmDaAgent.getDeptId());
-				newOne.setStatus("0");
-				newOne.setBaseId(wmTaskType2.getId());
-				newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-				List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-						.eq(WmTaskType::getRuleId, newOne.getRuleId())
-						.eq(WmTaskType::getDeptId, newOne.getDeptId())
-						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-				if (CollectionUtil.isEmpty(taskTypeList)) {
-					newOne.setCreateTime(LocalDateTime.now());
-					wmTaskTypeMapper.insert(newOne);
-				}
-			}
-
-			// 查询二级CSO
-			List<SysDept> twoCSODeptList = sysDeptMapper.selectList(Wrappers.<SysDept>lambdaQuery()
-					.eq(SysDept::getParentId, oneCSODept.getDeptId())
-//					.eq(SysDept::getDelFlag, DelEnum.NOT_DEL.val())
-					.eq(SysDept::getLevel, 4));
-			for (SysDept twoCSODept : twoCSODeptList) {
-				// 生成二级CSO任务类型
-				WmDaAgent wmDaAgent2 = wmDaAgentMapper.selectOne(Wrappers.<WmDaAgent>lambdaQuery()
-						.eq(WmDaAgent::getDelFlag, DelEnum.NOT_DEL.val())
-//						.eq(WmDaAgent::getEnableFlag, EnableEnum.ENABLE.val())
-						.eq(WmDaAgent::getDeptId, twoCSODept.getDeptId()));
-				if (wmDaAgent2 == null) {
-					continue;
-				}
-				for (WmTaskType wmTaskType2 : tempList) {
-					WmTaskType newOne = BeanUtil.copyProperties(wmTaskType2, WmTaskType.class);
-					newOne.setCreateTime(null);
-					newOne.setId(null);
-					newOne.setLevel1Id(wmDaAgent2.getId());
-					newOne.setTaskTypeLevel("2");
-					newOne.setTaskEntId(wmDaAgent2.getId());
-					newOne.setRuleId(wmDaAgent2.getId().toString());
-					newOne.setDeptId(wmDaAgent2.getDeptId());
-					newOne.setStatus("0");
-					newOne.setBaseId(wmTaskType2.getId());
-					newOne.setTaskReceiverType(wmTaskType2.getTaskReceiverType());
-					List<WmTaskType> taskTypeList = wmTaskTypeMapper.selectList(Wrappers.<WmTaskType>lambdaQuery()
-						.eq(WmTaskType::getTaskTypeName, wmTaskType2.getTaskTypeName())
-						.eq(WmTaskType::getRuleId, newOne.getRuleId())
-						.eq(WmTaskType::getDeptId, newOne.getDeptId())
-						.eq(WmTaskType::getTaskEntId, newOne.getTaskEntId()));
-					if (CollectionUtil.isEmpty(taskTypeList)) {
-						newOne.setCreateTime(LocalDateTime.now());
-						wmTaskTypeMapper.insert(newOne);
-					}
-				}
-			}
-		}
-	}
-
-
-//	public static void main(String[] args) {
-//		String s = AmountToCNUtil.number2CNMontrayUnit(new BigDecimal("323337.08"));
-//		System.out.println(s);
-//	}
-}

+ 0 - 55
hnqz-upms/hnqz-upms-biz/src/test/java/com/qunzhixinxi/hnqz/admin/testpoitl/PoitlTest.java

@@ -1,55 +0,0 @@
-package com.qunzhixinxi.hnqz.admin.testpoitl;
-
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
-import com.qunzhixinxi.hnqz.admin.api.model.excel.SettlementProofModel;
-import com.qunzhixinxi.hnqz.admin.util.OsEnvUtils;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-
-public class PoitlTest {
-
-    public static void main(String[] args) {
-        // 导出模板渲染
-        // 拼装数据
-        SettlementProofModel.PackageDetail packageDetail = new SettlementProofModel.PackageDetail();
-        packageDetail.setScorePackageName("111");
-        packageDetail.setSubjectLocation("12312");
-        packageDetail.setActualAmount("11");
-        packageDetail.setSettleAmount("123");
-        packageDetail.setNumber("1");
-        SettlementProofModel settlementProofModel = new SettlementProofModel();
-        settlementProofModel.setPackageList(Collections.singletonList(packageDetail));
-
-        // 服务器模板文件路径
-        String resourcePath = OsEnvUtils.getEachEnvPaths().get("EXCEL_FILE_PATH") + "settlement_application_form_template.docx";
-        // 缓存路径
-        String targetPath = OsEnvUtils.getEachEnvPaths().get("EXCEL_FILE_PATH")
-                + String.format("out\\settlement_application_form_%s.docx", System.currentTimeMillis());
-
-        HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy();
-
-        Configure config = Configure.newBuilder().bind("package_list", policy).build();
-
-        XWPFTemplate template = XWPFTemplate.compile(resourcePath, config).render(
-                new HashMap<String, Object>() {{
-                    put("package_list", settlementProofModel.getPackageList());
-                    put("total_settle_amount", "111");
-                    put("total_settle_amount_cn", "222");
-                    put("collection_name", "222");
-                    put("collection_account", "333");
-                    put("collection_bank_name", "444");
-                }}
-        );
-
-        try {
-            template.writeToFile(targetPath);
-
-        } catch (IOException e) {
-            throw new RuntimeException("导出失败");
-        }
-    }
-}

+ 0 - 8
hnqz-visual/hnqz-daemon-elastic-job/src/main/resources/logback-spring.xml

@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    小技巧: 在根pom里面设置统一存放路径,统一管理方便维护
-    <properties>
-        <log-path>/Users/hnqz</log-path>
-    </properties>
-    1. 其他模块加日志输出,直接copy本文件放在resources 目录即可
-    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
--->
 <configuration debug="false" scan="false">
 	<property name="log.path" value="logs/${project.artifactId}"/>
 	<!-- 彩色日志格式 -->

+ 55 - 63
hnqz-visual/hnqz-daemon-quartz/src/main/resources/logback-spring.xml

@@ -1,70 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    小技巧: 在根pom里面设置统一存放路径,统一管理方便维护
-    <properties>
-        <log-path>/Users/hnqz</log-path>
-    </properties>
-    1. 其他模块加日志输出,直接copy本文件放在resources 目录即可
-    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
--->
 <configuration debug="false" scan="false">
-	<property name="log.path" value="logs/${project.artifactId}"/>
-	<!-- 彩色日志格式 -->
-	<property name="CONSOLE_LOG_PATTERN"
-			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-	<!-- 彩色日志依赖的渲染类 -->
-	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-	<conversionRule conversionWord="wex"
-					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-	<conversionRule conversionWord="wEx"
-					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-	<!-- Console log output -->
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
+    <property name="log.path" value="logs/${project.artifactId}"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- Console log output -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/debug.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-	</appender>
+    <!-- Log file debug output -->
+    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/debug.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+    </appender>
 
-	<!-- Log file error output -->
-	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-			<maxFileSize>50MB</maxFileSize>
-			<maxHistory>30</maxHistory>
-		</rollingPolicy>
-		<encoder>
-			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-			<level>ERROR</level>
-		</filter>
-	</appender>
+    <!-- Log file error output -->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+            <maxFileSize>50MB</maxFileSize>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>ERROR</level>
+        </filter>
+    </appender>
 
-	<logger name="org.activiti.engine.impl.db" level="DEBUG">
-		<appender-ref ref="debug"/>
-	</logger>
+    <logger name="org.activiti.engine.impl.db" level="DEBUG">
+        <appender-ref ref="debug"/>
+    </logger>
 
-	<!--nacos 心跳 INFO 屏蔽-->
-	<logger name="com.alibaba.nacos" level="OFF">
-		<appender-ref ref="error"/>
-	</logger>
-	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-	<root level="INFO">
-		<appender-ref ref="console"/>
-		<appender-ref ref="debug"/>
-	</root>
+    <!--nacos 心跳 INFO 屏蔽-->
+    <logger name="com.alibaba.nacos" level="OFF">
+        <appender-ref ref="error"/>
+    </logger>
+    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+    <root level="INFO">
+        <appender-ref ref="console"/>
+        <appender-ref ref="debug"/>
+    </root>
 </configuration>

+ 0 - 58
hnqz-visual/hnqz-daemon-quartz/src/test/java/RemoteScorePackageServiceTest.java

@@ -1,58 +0,0 @@
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import com.alibaba.excel.EasyExcelFactory;
-import com.qunzhixinxi.hnqz.admin.api.feign.RemoteScorePackageService;
-import com.qunzhixinxi.hnqz.admin.api.model.WmScorePackageSettleExcelModel;
-import com.qunzhixinxi.hnqz.common.core.constant.SecurityConstants;
-import com.qunzhixinxi.hnqz.daemon.quartz.HnqzDaemonQuartzApplication;
-import com.qunzhixinxi.hnqz.daemon.quartz.config.LocalDateTimeConverter;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author lixuesong
- * @date 2024/02/23
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = HnqzDaemonQuartzApplication.class)
-public class RemoteScorePackageServiceTest {
-
-	@Autowired
-	private RemoteScorePackageService remoteScorePackageService;
-
-//	@Test
-	public void exportPackageSettleTest() {
-		Map<String, Object> reqParams = new HashMap<>();
-		reqParams.put("sendPackageDeptId", 1611890565);
-		LocalDateTime startOfDay = LocalDate.now().minusDays(100L).atStartOfDay();
-		LocalDateTime endOfDay = startOfDay.plusDays(100L);
-		reqParams.put("notifyTime", new LocalDateTime[]{startOfDay, endOfDay});
-		List<WmScorePackageSettleExcelModel> excelModels = remoteScorePackageService.exportPackageSettle(reqParams, SecurityConstants.FROM_IN);
-		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-		EasyExcelFactory.write(byteArrayOutputStream, WmScorePackageSettleExcelModel.class)
-				.registerConverter(new LocalDateTimeConverter())
-				.autoCloseStream(false).sheet("本企业结算成功数据")
-				.doWrite(excelModels);
-
-		File file = new File("D:\\li312\\Desktop\\tmp\\" + DateUtil.today() + ".xlsx");
-		try {
-			byteArrayOutputStream.writeTo(Files.newOutputStream(file.toPath()));
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}