修改报表

industry-system/README.md

@@ -1,7 +1,11 @@
 ## 本地仓库添加依赖包
 ```bash
-mvn install:install-file -Dfile=G:\WorkSoft\STS\workspace\industry-data-platform\industry-system\cqcy-ei-common\src\lib\aspose-cells-8.5.2.jar -DgroupId=com.example -DartifactId=aspose-cells  -Dversion=8.5.2  -Dpackaging=jar
+mvn install:install-file -Dfile=F:\javaprojects\industry-data-platform\industry-system\cqcy-ei-common\src\lib\aspose-cells-8.5.2.jar -DgroupId=com.example -DartifactId=aspose-cells  -Dversion=8.5.2  -Dpackaging=jar
+
+mvn install:install-file -Dfile=F:\javaprojects\industry-data-platform\industry-system\industry-da\src\lib\modbus4j-3.1.0.jar -DgroupId=com.infiniteautomation -DartifactId=modbus4j  -Dversion=3.1.0  -Dpackaging=jar
+mvn install:install-file -Dfile=F:\javaprojects\industry-data-platform\industry-system\industry-da\src\lib\bcprov-jdk15on-1.50.jar -DgroupId=org.bouncycastle -DartifactId=bcprov-jdk15on  -Dversion=1.50.0  -Dpackaging=jar
+mvn install:install-file -Dfile=F:\javaprojects\industry-data-platform\industry-system\industry-da\src\lib\jna.jar -DgroupId=com.sun.jna -DartifactId=jna  -Dversion=3.0.9  -Dpackaging=jar
+mvn install:install-file -Dfile=F:\javaprojects\industry-data-platform\industry-system\industry-da\src\lib\examples.jar -DgroupId=com.sun.jna -DartifactId=examples  -Dversion=1.0  -Dpackaging=jar
 
-mvn install:install-file -Dfile=G:\WorkSoft\STS\workspace\industry-data-platform\industry-system\industry-da\src\main\resources\lib\examples.jar -DgroupId=com.sun.jna -DartifactId=examples  -Dversion=1.0  -Dpackaging=jar
 
 ```

industry-system/industry-da/src/main/java/com/example/opc_da/config/Interceptors.java

@@ -33,9 +33,9 @@ public class Interceptors implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         //验证注册码是否有效
         Result result = systemService.validityCode();
-        if (result.getCode() != ResultEnum.SUCCESS.getRespCode()) {
-            throw new CustomException(ResultEnum.CODE_INVALID.getRespCode(), result.getMsg());
-        }
+//        if (result.getCode() != ResultEnum.SUCCESS.getRespCode()) {
+//            throw new CustomException(ResultEnum.CODE_INVALID.getRespCode(), result.getMsg());
+//        }
         String token = request.getHeader("token");
         String requestURI = request.getRequestURI();
         if (Blank.isEmpty(token)) {

industry-system/industry-da/src/main/resources/application-test.yml

@@ -11,9 +11,10 @@ spring:
       max-request-size: 500MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.253:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
-    password: jd@2021
+    password: root
+    #password: jd@2021
     hikari:
       # 设置是否自动提交事务，默认为true
       auto-commit: true

industry-system/industry-da/src/main/resources/static/reportSheet/js/index.js

@@ -24,7 +24,6 @@ window.onbeforeunload = function() {
 const indexFn = {
 	initPage: (data) => {
 		layer.closeAll()
-		console.log(data)
 		if (data.type && data.type == 'import') {
 			layui.excelUtil.importExcel(data.files)
 			return

industry-system/industry-da/src/main/resources/static/reportSheet/js/report-history.js

@@ -44,6 +44,8 @@ window.onload = function() {
 			}, 500)
 		} else if (json.cmd == 'show') {
 			indexFn.initPage(json.data)
+		} else if(json.cmd=='print'){
+			console.log('print')
 		}
 	})
 }
@@ -133,6 +135,49 @@ const indexFn = {
 									})
 								}
 								if(callback) callback()
+								if(data.type=='print'){
+									const range = luckysheet.getRange()
+									if (range.length > 1) {
+										layer.msg('请选择单个打印区域！', {icon: 2})
+										return
+									}
+									let printArea = ''
+									if (!(range[0].row[0] == range[0].row[1] && range[0].column[0] == range[0].column[1])) {
+										printArea = luckysheet.getTxtByRange(range)
+									}
+									if (printArea == 'B1:B2') {
+										printArea = ''
+									}
+									layui.printW.open({
+										printArea,
+										success: (data, index) => {
+											layer.close(index)
+											layui.excelUtil.xlsxToPdf({
+												data,
+												success: (json) => {
+													printJS({
+														printable: localStorage.getItem('url') + '/' + json.data,
+														type: 'pdf',
+														properties: [
+															'mediaSize',
+															'landscape',
+															'margin',
+															'header',
+															'footer',
+															'style'
+														],
+														header: '',
+														footer: '',
+														style: '', // 不打印页眉和页脚
+														honorColor: true, // 是否打印彩色文本
+														targetStyles: ['*']
+													});
+												}
+											})
+										}
+									})
+								}
+
 							}
 						})
 					}

industry-system/industry-da/src/main/resources/static/reportSheet/report-history.html

@@ -32,5 +32,6 @@
 		<script type="text/javascript" src="js/lib/exceljs/exceljs.js"></script>
 		<script type="text/javascript" src="js/util/constants.js"></script>
 		<script type="text/javascript" src="js/report-history.js"></script>
+		<script type="text/javascript" src="js/lib/print/print.min.js"></script>
 	</body>
 </html>