bug修改

api-admin/src/main/java/com/glxp/api/admin/config/HdSchemaExecutor.java

@@ -9,6 +9,8 @@ import com.glxp.api.admin.entity.info.SchemaData;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.InputStream;
@@ -16,8 +18,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-//@Order(1)
-//@Component
+@Order(1)
+@Component
 @Slf4j
 public class HdSchemaExecutor implements ApplicationRunner {
 

api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java

@@ -1132,7 +1132,6 @@ public class WareHouseController {
         }
 
         Integer userId = customerService.getUserId();
-        try {
         PostOrderRequest inPostOrder = new PostOrderRequest();
         List<PostOrderRequest.PostOrder> inPostOrders = new ArrayList<>();
         PostOrderRequest outPostOrder = new PostOrderRequest();
@@ -1166,12 +1165,6 @@ public class WareHouseController {
             inPostOrder.setUserId(userId);
             ioTransInoutService.creatOrder(inPostOrder, null);
         }
-
-
-        } catch (Exception e) {
-            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
-        }
-
         return ResultVOUtils.success("上传成功，等待后台处理");
     }
 

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java

@@ -107,10 +107,13 @@ public class InvSubWarehouseController {
             } else {
                 //允许调拨
                 //查询总库信息
+                if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getCode())) {
                     InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode());
                     filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId());
                     filterInvWarehouseRequest.setCode(null);
                 }
+
+            }
         }
 
         List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java

@@ -193,8 +193,11 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
 
     @Override
     public InvSubWarehouseEntity filterGroupInvSubAndcode(String code) {
+        if (StrUtil.isEmpty(code))
+            return null;
         return invSubWarehouseDao.filterGroupInvSubAndcode(code);
     }
+
     @Override
     public List<InvSubWarehouseEntity> filterGroupInvSubDown(FilterInvWarehouseRequest filterInvSubWarehouseRequest) {
         return invSubWarehouseDao.filterGroupInvSubDown(filterInvSubWarehouseRequest);

api-admin/src/main/java/com/glxp/api/admin/thread/CleanDataTask.java

@@ -59,11 +59,14 @@ public class CleanDataTask implements SchedulingConfigurer {
                     ScheduledRequest scheduledRequest = new ScheduledRequest();
                     scheduledRequest.setCronName("ScheduledDeletion");
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+                    if (scheduledEntity == null) {
+                        log.error("CleanDataTask 定时任务缺少  ScheduledDeletion字段，请注意新增后重启！");
+                        return null;
+                    } else {
                         String cron = scheduledEntity.getCron();
-                    if (cron.isEmpty()) {
-                        log.error("cron is null");
-                    }
                         return new CronTrigger(cron).nextExecutionTime(triggerContext);
+                    }
+
                 });
     }
 

api-admin/src/main/java/com/glxp/api/admin/thread/DownloadSpDataTask.java

@@ -37,12 +37,14 @@ public class DownloadSpDataTask implements SchedulingConfigurer {
         taskRegistrar.addTriggerTask(this::process, triggerContext -> {
             ScheduledRequest scheduledRequest = new ScheduledRequest();
             scheduledRequest.setCronName("downloadSpDataTask");
-            ScheduledEntity scheduled = scheduledDao.findScheduled(scheduledRequest);
-            String cron = scheduled.getCron();
-            if (StrUtil.isBlank(cron)) {
-                log.error("cron is null");
-            }
+            ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
+            if (scheduledEntity == null) {
+                log.error("DownloadSpDataTask 定时任务缺少  downloadSpDataTask字段，请注意新增后重启！");
+                return null;
+            } else {
+                String cron = scheduledEntity.getCron();
                 return new CronTrigger(cron).nextExecutionTime(triggerContext);
+            }
         });
     }
 

api-admin/src/main/resources/application-dev.properties

@@ -1,8 +1,8 @@
-server.port=9991
+server.port=9992
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph3?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.14:3306/udiwms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Glxp@6066
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -10,3 +10,17 @@ CALL Pro_Temp_ColumnWork ('stock_order_remak','zczbhhzbapzbh','varchar(255)', 1)
 -- 新增数据
 
 -- 创建表时必须  create table if not exists 表名
+
+-- 新增数据
+INSERT
+ignore INTO  sys_scheduled(id, cronName, cron, customerId, remark)
+VALUES
+    (16, 'ScheduledDeletion', '0 0 2 1/1 * ? ', NULL, '删除30天数据');
+
+INSERT
+ignore INTO sys_param_config ( id, parentId, paramName, paramKey, paramValue, paramStatus, paramType, paramExplain )
+VALUES
+    ( 20009, 0, '删除30天数据', 'ScheduledDeletion', '1', 1, 0, '1:是，0：否' );
+
+INSERT
+ignore INTO sys_scheduled (id,`cronName`, `cron`, `customerId`, `remark`) VALUES (119,'downloadSpDataTask', '0 0/1 * * * ?', NULL, '立即下载自助平台数据');