班结订单下载问题修改

yijia-admin/src/main/java/com/yijia/web/controller/common/CommonController.java

@@ -67,7 +67,7 @@ public class CommonController
     /**
      * 通用上传请求
      */
-    @PostMapping("/common/upload")
+    @PostMapping("/upload")
     public AjaxResult uploadFile(MultipartFile file) throws Exception
     {
         try

yijia-admin/src/main/resources/application.yml

@@ -11,14 +11,14 @@ yijia:
   # 文件路径
   #正式服务器
   #profile: /home/uploadfile/images
-  #imageurl:http://image.huijy.net:8088/images
+    # imageurl: http://image.huijy.net:8088/images
   #测试服务器
-  profile: /home/uploadfile/images
-  imageurl: http://upload.huijy.net:8088/images
+   #profile: /home/uploadfile/images
+   #imageurl: http://upload.huijy.net:8088/images
   #本地测试服务
-  #profile: E:/img
+  profile: E:/img
   #图片地址
-  #imageUrl: http://localhost:8080/profile
+  imageUrl: http://localhost:8080/profile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码开关

yijia-admin/target/classes/application-druid.yml

@@ -6,9 +6,13 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db_debug?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: develop
                 password: 1234.Abcd
+                #url: jdbc:mysql://localhost:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                # username: zgc
+            #password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

yijia-admin/target/classes/application.yml

@@ -5,17 +5,26 @@ yijia:
   # 版本
   version: 1.0.1
   # 版权年份
-  copyrightYear: 2020
+  copyrightYear: 2021
   # 实例演示开关
   demoEnabled: true
   # 文件路径
+  #正式服务器
+  #profile: /home/uploadfile/images
+    # imageurl: http://image.huijy.net:8088/images
+  #测试服务器
+   #profile: /home/uploadfile/images
+   #imageurl: http://upload.huijy.net:8088/images
+  #本地测试服务
   profile: E:/img
+  #图片地址
+  imageUrl: http://localhost:8080/profile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码开关
   captchaEnabled: false
   # 验证码类型 math 数组计算 char 字符
-  captchaType: char
+  captchaType: math
 
 # 开发环境配置
 server:
@@ -86,7 +95,7 @@ token:
     # 令牌密钥
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
-    expireTime: 30
+    expireTime: 3000
 
 # MyBatis配置
 mybatis:

yijia-admin/target/classes/logback.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/Users/suxinghua/Documents/yijia/logs" />
+<!--    <property name="log.path" value="/home/testDemo/logs" />-->
+    <property name="log.path" value="/home/devnote/deBugJar/logs" />
+
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -11,7 +13,7 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
-	
+
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-info.log</file>
@@ -34,7 +36,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
 	</appender>
-	
+
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
@@ -56,7 +58,7 @@
             <onMismatch>DENY</onMismatch>
         </filter>
     </appender>
-	
+
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/sys-user.log</file>
@@ -70,7 +72,7 @@
             <pattern>${log.pattern}</pattern>
         </encoder>
     </appender>
-	
+
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.yijia" level="info" />
 	<!-- Spring日志级别控制  -->
@@ -79,15 +81,15 @@
 	<root level="info">
 		<appender-ref ref="console" />
 	</root>
-	
+
 	<!--系统操作日志-->
     <root level="info">
         <appender-ref ref="file_info" />
         <appender-ref ref="file_error" />
     </root>
-	
+
 	<!--系统用户操作日志-->
     <logger name="sys-user" level="info">
         <appender-ref ref="sys-user"/>
     </logger>
-</configuration> 
+</configuration>

yijia-station/src/main/java/com/yijia/station/controller/PayOrderController.java

@@ -50,13 +50,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null){
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept =new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if(list!=null && list.size()>0){
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         startPage();
         payOrder.setStatus("1");
@@ -69,13 +71,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listInfo")
     public TableDataInfo listInfo(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOrderType("1");
         payOrder.setStatus("1");
@@ -91,13 +95,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDaySources")
     public AjaxResult selectDaySources(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -113,13 +119,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectOilTypeSources")
     public TableDataInfo selectOilTypeSources(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept =new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if(list!=null && list.size()>0){
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -135,13 +143,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/dayOilTypeSources")
     public TableDataInfo dayOilTypeSources(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept =new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if(list!=null && list.size()>0){
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -156,13 +166,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectOverViewData")
     public AjaxResult selectOverViewData(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept =new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if(list!=null && list.size()>0){
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -176,13 +188,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDayReportDetail")
     public TableDataInfo selectDayReportDetail(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept =new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if(list!=null && list.size()>0){
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         //默认当前登陆人的ID 5冯总油站
         startPage();
@@ -200,13 +214,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/selectDayReport")
     public TableDataInfo selectDayReport(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -221,13 +237,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -255,13 +273,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata92")
     public TableDataInfo listQydata92(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept =new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if(list!=null && list.size()>0){
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOilName("92#");
         payOrder.setStatus("1");
@@ -277,13 +297,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata95")
     public TableDataInfo listQydata95(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOilName("95#");
         payOrder.setStatus("1");
@@ -299,13 +321,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata98")
     public TableDataInfo listQydata98(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOilName("98#");
         payOrder.setStatus("1");
@@ -322,13 +346,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata20")
     public TableDataInfo listQydata20(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOilName("-20#");
         payOrder.setStatus("1");
@@ -344,13 +370,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata0")
     public TableDataInfo listQydata0(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOilName("0#");
         payOrder.setStatus("1");
@@ -366,13 +394,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listQydata10")
     public TableDataInfo listQydata10(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setOilName("-10#");
         payOrder.setStatus("1");
@@ -388,13 +418,15 @@ public class PayOrderController extends BaseController
     @GetMapping("/listXdata")
     public TableDataInfo listXdata(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = deptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            payOrder.setStationIdList(list);
-            payOrder.setStationId(null);
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            List<String> list = deptService.selectDeptId(dept);
+            if (list != null && list.size() > 0) {
+                payOrder.setStationIdList(list);
+                payOrder.setStationId(null);
+            }
         }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
@@ -407,8 +439,10 @@ public class PayOrderController extends BaseController
     @GetMapping("/getPayOrderInfoMin")
     public AjaxResult getPayOrderInfoMin(PayOrder payOrder)
     {
-        LoginUser currentUser = SecurityUtils.getLoginUser();
-        payOrder.setStationId(currentUser.getUser().getDeptId());
+        if(payOrder.getStationId() ==null) {
+            LoginUser currentUser = SecurityUtils.getLoginUser();
+            payOrder.setStationId(currentUser.getUser().getDeptId());
+        }
         payOrder.setStatus("1");
         payOrder.setOrderType("1");
         return  AjaxResult.success(payOrderService.getPayOrderInfoMin(payOrder));

yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -404,7 +404,7 @@ public class StationClassStructureController extends BaseController
             String filename = encodingFilename(sheetName);
             out = new FileOutputStream(getAbsoluteFile(filename));
             wb.write(out);
-            out.close();// 关闭输出流
+//            out.close();// 关闭输出流
             return AjaxResult.success(filename);
         }
         catch (Exception e)