Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
E
EIP-Integration
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
李炎
EIP-Integration
Commits
e68b9e2d
提交
e68b9e2d
authored
9月 24, 2021
作者:
李炎
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加手动同步接口
上级
269eac37
显示空白字符变更
内嵌
并排
正在显示
21 个修改的文件
包含
139 行增加
和
81 行删除
+139
-81
PurchaseorderApi.java
.../modules/iost/API/ExternalInterface/PurchaseorderApi.java
+0
-1
PurchaseorderTimed.java
.../jeecg/modules/iost/API/TimedTask/PurchaseorderTimed.java
+1
-1
MaterialinventoryController.java
...ules/iost/API/controller/MaterialinventoryController.java
+2
-1
PhysicalIDerrorController.java
...odules/iost/API/controller/PhysicalIDerrorController.java
+2
-1
ProductInventoryController.java
...dules/iost/API/controller/ProductInventoryController.java
+2
-1
ProductionOrderController.java
...odules/iost/API/controller/ProductionOrderController.java
+2
-2
ProductionSchedulingController.java
...s/iost/API/controller/ProductionSchedulingController.java
+2
-2
MaterialinventoryPojoController.java
.../API/controller/pojo/MaterialinventoryPojoController.java
+12
-4
PhysicalidController.java
...odules/iost/API/controller/pojo/PhysicalidController.java
+13
-17
ProductInventoryPojoController.java
...t/API/controller/pojo/ProductInventoryPojoController.java
+18
-5
ProductionOrderPojoController.java
...st/API/controller/pojo/ProductionOrderPojoController.java
+12
-5
ProductionSchedulingPojoController.java
...I/controller/pojo/ProductionSchedulingPojoController.java
+12
-5
PurchaseorderController.java
...les/iost/API/controller/pojo/PurchaseorderController.java
+5
-17
ReserveStockPojoController.java
.../iost/API/controller/pojo/ReserveStockPojoController.java
+17
-4
SalesOrderPojoController.java
...es/iost/API/controller/pojo/SalesOrderPojoController.java
+13
-5
SupplyListPojoController.java
...es/iost/API/controller/pojo/SupplyListPojoController.java
+17
-4
HlsAlterController.java
...modules/iost/API/controller/video/HlsAlterController.java
+4
-2
HlsController.java
...eecg/modules/iost/API/controller/video/HlsController.java
+1
-1
Physicalid.java
...in/java/org/jeecg/modules/iost/API/entity/Physicalid.java
+1
-0
application-docker.yml
...t-module-system/src/main/resources/application-docker.yml
+0
-0
SecurityToolsTest.java
...ule-system/src/test/java/org/jeecg/SecurityToolsTest.java
+3
-3
没有找到文件。
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/ExternalInterface/PurchaseorderApi.java
浏览文件 @
e68b9e2d
...
...
@@ -45,7 +45,6 @@ public class PurchaseorderApi implements API {
public
String
selectList
(
Map
map
)
throws
IOException
{
hreader
.
put
(
"Content-Type"
,
"application/json;charset=utf-8"
);
//格式 传参json
hreader
.
put
(
"operatetype"
,
"QUERY"
);
String
mapjson
=
JsonUtil
.
Mapjson
(
map
);
String
result
=
HttpUtil
.
post
(
url
+
"queryByDate"
,
JsonUtil
.
Mapjson
(
map
),
hreader
);
// System.out.println(result);
return
result
;
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/TimedTask/PurchaseorderTimed.java
浏览文件 @
e68b9e2d
...
...
@@ -30,7 +30,7 @@ public class PurchaseorderTimed implements Job {
public
void
Materialinventory
()
throws
IOException
,
ParseException
{
iPurchaseorderService
.
synchronizationList
(
null
);
System
.
out
.
println
(
"执行了"
);
//
System.out.println("执行了");
}
@Override
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/MaterialinventoryController.java
浏览文件 @
e68b9e2d
...
...
@@ -94,6 +94,7 @@ public class MaterialinventoryController {
@ApiOperation
(
value
=
"国网供应商重点原材料库存API-同步"
,
notes
=
"国网供应商重点原材料库存API-同步"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
return
Result
.
OK
(
iMaterialinventoryService
.
synchronization
(
null
));
Boolean
synchronization
=
iMaterialinventoryService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/PhysicalIDerrorController.java
浏览文件 @
e68b9e2d
...
...
@@ -92,6 +92,7 @@ public class PhysicalIDerrorController {
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
return
Result
.
OK
(
physicalIDService
.
synchronization
(
null
));
Boolean
synchronization
=
physicalIDService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ProductInventoryController.java
浏览文件 @
e68b9e2d
...
...
@@ -99,6 +99,7 @@ public class ProductInventoryController {
@ApiOperation
(
value
=
"国网产成品库存信息API-同步今天的产成品"
,
notes
=
"国网产成品库存信息API-同步今天的产成品"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
return
Result
.
OK
(
productInventoryService
.
synchronization
(
null
));
Boolean
synchronization
=
productInventoryService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ProductionOrderController.java
浏览文件 @
e68b9e2d
...
...
@@ -88,7 +88,7 @@ public class ProductionOrderController {
@ApiOperation
(
value
=
"生产订单API-同步至国网"
,
notes
=
"生产订单API-同步至国网"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
productionOrderService
.
synchronization
(
null
);
return
Result
.
OK
(
"同步成功"
);
Boolean
synchronization
=
productionOrderService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/ProductionSchedulingController.java
浏览文件 @
e68b9e2d
...
...
@@ -65,8 +65,8 @@ public class ProductionSchedulingController {
@ApiOperation
(
value
=
"排产计划API-同步至国网"
,
notes
=
"排产计划API-同步至国网"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
productionSchedulingService
.
synchronization
(
null
);
return
Result
.
OK
(
"同步成功"
);
Boolean
synchronization
=
productionSchedulingService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
@AutoLog
(
value
=
"国网排产计划日志-排产计划接口-分页列表查询"
)
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/MaterialinventoryPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -10,14 +10,13 @@ import org.jeecg.common.api.vo.Result;
import
org.jeecg.common.aspect.annotation.AutoLog
;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.Materialinventory
;
import
org.jeecg.modules.iost.API.service.IMaterialinventoryService
;
import
org.jeecg.modules.iost.API.service.pojo.MaterialinventoryPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"存放国网重点材料数据信息"
)
@RestController
...
...
@@ -26,6 +25,8 @@ import javax.servlet.http.HttpServletRequest;
public
class
MaterialinventoryPojoController
{
@Autowired
MaterialinventoryPojoService
materialinventoryPojoService
;
@Autowired
IMaterialinventoryService
iMaterialinventoryService
;
/**
* 分页列表查询
*
...
...
@@ -47,4 +48,11 @@ public class MaterialinventoryPojoController {
IPage
<
Materialinventory
>
pageList
=
materialinventoryPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
@AutoLog
(
value
=
"国网供应商重点原材料库存API-同步"
)
@ApiOperation
(
value
=
"国网供应商重点原材料库存API-同步"
,
notes
=
"国网供应商重点原材料库存API-同步"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
iMaterialinventoryService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/PhysicalidController.java
浏览文件 @
e68b9e2d
...
...
@@ -12,17 +12,16 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.Physicalid
;
import
org.jeecg.modules.iost.API.entity.Purchaseorder
;
import
org.jeecg.modules.iost.API.service.IPhysicalIDerrorService
;
import
org.jeecg.modules.iost.API.service.IPurchaseorderService
;
import
org.jeecg.modules.iost.API.service.PhysicalidService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"实物ID明细接口"
)
@Api
(
tags
=
"实物ID明细接口"
)
@RestController
@RequestMapping
(
"/API/supplier-send-physicalid"
)
@Slf4j
...
...
@@ -30,7 +29,8 @@ public class PhysicalidController {
@Autowired
PhysicalidService
physicalidService
;
@Autowired
IPurchaseorderService
purchaseorderService
;
IPhysicalIDerrorService
physicalIDService
;
/**
* 分页列表查询
*
...
...
@@ -53,15 +53,11 @@ public class PhysicalidController {
return
Result
.
OK
(
pageList
);
}
@GetMapping
(
value
=
"test"
)
Result
test
(){
QueryWrapper
<
Purchaseorder
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
select
(
"F_Id"
);
queryWrapper
.
eq
(
"F_Id"
,
"10052"
);
//查询是否为集成平台生成的订单,并过滤
Purchaseorder
purchaseorders1
=
purchaseorderService
.
getBaseMapper
().
selectOne
(
queryWrapper
);
boolean
b
=
purchaseorders1
==
null
;
System
.
out
.
println
(
"purchaseorders1"
+
b
);
return
Result
.
OK
(
purchaseorders1
);
}
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
physicalIDService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/ProductInventoryPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -11,14 +11,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.Materialinventory
;
import
org.jeecg.modules.iost.API.entity.pojo.Productinventory
;
import
org.jeecg.modules.iost.API.service.IProductInventoryService
;
import
org.jeecg.modules.iost.API.service.pojo.ProductinventoryPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"存放国网产成品数据信息"
)
@RestController
...
...
@@ -28,7 +27,8 @@ public class ProductInventoryPojoController {
@Autowired
ProductinventoryPojoService
productinventoryPojoService
;
@Autowired
IProductInventoryService
productInventoryService
;
/**
* 分页列表查询
*
...
...
@@ -50,4 +50,17 @@ public class ProductInventoryPojoController {
IPage
<
Productinventory
>
pageList
=
productinventoryPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
/**
* 从金蝶云即时库存中同步今天的产成品
* @return
*/
@AutoLog
(
value
=
"国网产成品库存信息API-同步今天的产成品"
)
@ApiOperation
(
value
=
"国网产成品库存信息API-同步今天的产成品"
,
notes
=
"国网产成品库存信息API-同步今天的产成品"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
productInventoryService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/ProductionOrderPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -10,14 +10,13 @@ import org.jeecg.common.api.vo.Result;
import
org.jeecg.common.aspect.annotation.AutoLog
;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.ProductionOrder
;
import
org.jeecg.modules.iost.API.service.IProductionOrderService
;
import
org.jeecg.modules.iost.API.service.pojo.ProductionOrderPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"生产订单明细信息"
)
@RestController
...
...
@@ -26,6 +25,8 @@ import javax.servlet.http.HttpServletRequest;
public
class
ProductionOrderPojoController
{
@Autowired
ProductionOrderPojoService
productionOrderPojoService
;
@Autowired
IProductionOrderService
productionOrderService
;
/**
* 分页列表查询
*
...
...
@@ -47,5 +48,11 @@ public class ProductionOrderPojoController {
IPage
<
ProductionOrder
>
pageList
=
productionOrderPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
@AutoLog
(
value
=
"生产订单API-同步至国网"
)
@ApiOperation
(
value
=
"生产订单API-同步至国网"
,
notes
=
"生产订单API-同步至国网"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
productionOrderService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/ProductionSchedulingPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -10,14 +10,13 @@ import org.jeecg.common.api.vo.Result;
import
org.jeecg.common.aspect.annotation.AutoLog
;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.Productionscheduling
;
import
org.jeecg.modules.iost.API.service.IProductionSchedulingService
;
import
org.jeecg.modules.iost.API.service.pojo.ProductionschedulingPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"排产计划明细信息"
)
@RestController
...
...
@@ -26,7 +25,8 @@ import javax.servlet.http.HttpServletRequest;
public
class
ProductionSchedulingPojoController
{
@Autowired
ProductionschedulingPojoService
productionschedulingPojoService
;
@Autowired
IProductionSchedulingService
productionSchedulingService
;
@AutoLog
(
value
=
"排产计划明细信息接口-分页列表查询"
)
@ApiOperation
(
value
=
"排产计划明细信息接口-分页列表查询"
,
notes
=
"排产计划明细信息接口-分页列表查询"
)
@GetMapping
(
value
=
"list"
)
...
...
@@ -40,4 +40,11 @@ public class ProductionSchedulingPojoController {
IPage
<
Productionscheduling
>
pageList
=
productionschedulingPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
@AutoLog
(
value
=
"排产计划API-同步至国网"
)
@ApiOperation
(
value
=
"排产计划API-同步至国网"
,
notes
=
"排产计划API-同步至国网"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
productionSchedulingService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/PurchaseorderController.java
浏览文件 @
e68b9e2d
...
...
@@ -58,12 +58,12 @@ public class PurchaseorderController {
return
Result
.
OK
(
pageList
);
}
@AutoLog
(
value
=
"同步生成销售订单接口-
添加
"
)
@ApiOperation
(
value
=
"同步生成销售订单接口-
添加"
,
notes
=
"同步生成销售订单接口-添加
"
)
@GetMapping
(
value
=
"/synchronization
List
"
)
@AutoLog
(
value
=
"同步生成销售订单接口-
同步至金蝶
"
)
@ApiOperation
(
value
=
"同步生成销售订单接口-
同步至金蝶"
,
notes
=
"同步生成销售订单接口-同步至金蝶
"
)
@GetMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronizationList
()
throws
IOException
,
ParseException
{
iPurchaseorderService
.
synchronizationList
(
null
);
return
Result
.
OK
();
Boolean
aBoolean
=
iPurchaseorderService
.
synchronizationList
(
null
);
return
Result
.
OK
(
aBoolean
);
}
...
...
@@ -113,18 +113,6 @@ public class PurchaseorderController {
System
.
out
.
println
(
webreq
);
return
Result
.
OK
(
s
);
}
/**
* 添加
*
* @param object
* @return
*/
@AutoLog
(
value
=
"采购订单接口-添加"
)
@ApiOperation
(
value
=
"采购订单接口-添加"
,
notes
=
"采购订单接口-添加"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
(
@RequestBody
Object
object
)
{
return
Result
.
OK
(
iPurchaseorderService
.
synchronization
(
object
));
}
/**
* 同步
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/ReserveStockPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -11,14 +11,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.Productinventory
;
import
org.jeecg.modules.iost.API.entity.pojo.Reservestock
;
import
org.jeecg.modules.iost.API.service.IReserveStockService
;
import
org.jeecg.modules.iost.API.service.pojo.ReservestockPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"存放国网备品数据信息"
)
@RestController
...
...
@@ -28,6 +27,8 @@ public class ReserveStockPojoController {
@Autowired
ReservestockPojoService
reservestockPojoService
;
@Autowired
IReserveStockService
reserveStockService
;
/**
* 分页列表查询
*
...
...
@@ -49,4 +50,16 @@ public class ReserveStockPojoController {
IPage
<
Reservestock
>
pageList
=
reservestockPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
/**
* 从金蝶生产入库单获取备品添加到国网
*
* @return
*/
@AutoLog
(
value
=
"国网备品库存信息API-同步"
)
@ApiOperation
(
value
=
"国网备品库存信息API-同步"
,
notes
=
"国网备品库存信息API-同步"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
return
Result
.
OK
(
reserveStockService
.
synchronization
(
null
));
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/SalesOrderPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -10,14 +10,13 @@ import org.jeecg.common.api.vo.Result;
import
org.jeecg.common.aspect.annotation.AutoLog
;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.Salesorder
;
import
org.jeecg.modules.iost.API.service.ISalesOrderService
;
import
org.jeecg.modules.iost.API.service.pojo.SalesorderPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"销售订单明细信息"
)
@RestController
...
...
@@ -26,7 +25,8 @@ import javax.servlet.http.HttpServletRequest;
public
class
SalesOrderPojoController
{
@Autowired
SalesorderPojoService
salesorderPojoService
;
@Autowired
ISalesOrderService
salesOrderService
;
@AutoLog
(
value
=
"销售订单明细信息接口-分页列表查询"
)
@ApiOperation
(
value
=
"销售订单明细信息接口-分页列表查询"
,
notes
=
"销售订单明细信息接口-分页列表查询"
)
@GetMapping
(
value
=
"list"
)
...
...
@@ -40,4 +40,12 @@ public class SalesOrderPojoController {
IPage
<
Salesorder
>
pageList
=
salesorderPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
@AutoLog
(
value
=
"销售API-同步至国网"
)
@ApiOperation
(
value
=
"销售API-同步至国网"
,
notes
=
"销售API-同步至国网"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
salesOrderService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/pojo/SupplyListPojoController.java
浏览文件 @
e68b9e2d
...
...
@@ -11,14 +11,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
import
org.jeecg.common.system.query.QueryGenerator
;
import
org.jeecg.modules.iost.API.entity.pojo.Reservestock
;
import
org.jeecg.modules.iost.API.entity.pojo.Supplylist
;
import
org.jeecg.modules.iost.API.service.ISupplyListIService
;
import
org.jeecg.modules.iost.API.service.pojo.SupplylistPojoService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
@Api
(
tags
=
"存放国网供货单数据信息"
)
@RestController
...
...
@@ -27,6 +26,8 @@ import javax.servlet.http.HttpServletRequest;
public
class
SupplyListPojoController
{
@Autowired
SupplylistPojoService
supplylistPojoService
;
@Autowired
ISupplyListIService
supplyListIService
;
/**
* 分页列表查询
*
...
...
@@ -48,4 +49,16 @@ public class SupplyListPojoController {
IPage
<
Supplylist
>
pageList
=
supplylistPojoService
.
page
(
page
,
queryWrapper
);
return
Result
.
OK
(
pageList
);
}
/**
* 同步今天金蝶云新增的销售出货单到国网
* @return
*/
@AutoLog
(
value
=
"国网供货单信息API-同步"
)
@ApiOperation
(
value
=
"国网供货单信息API-同步"
,
notes
=
"国网供货单信息API-同步"
)
@PostMapping
(
value
=
"/synchronization"
)
public
Result
<?>
synchronization
()
throws
ParseException
{
Boolean
synchronization
=
supplyListIService
.
synchronization
(
null
);
return
Result
.
OK
(
synchronization
);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/video/HlsAlterController.java
浏览文件 @
e68b9e2d
...
...
@@ -52,16 +52,18 @@ public class HlsAlterController {
String
indexStr
=
getIndexFile
(
originUrlpath
);
//解析originUrlpath 返回为文本
List
urlList
=
analysisIndex
(
indexStr
);
//解析indexStr获取.ts文件地址
String
inIp
=
"192.168.2.209"
;
String
localPath
=
"http://"
+
dockerip
+
":"
+
port
+
path
+
"/"
;
String
localPath
=
"http://"
+
ip
+
":"
+
port
+
path
+
"/"
;
Map
<
String
,
InputStream
>
urlPathnew
=
new
HashMap
<>();
for
(
int
i
=
0
;
i
<
urlList
.
size
();
i
++)
{
String
url
=
urlList
.
get
(
i
).
toString
();
//
InputStream
fileInputStream
=
getFileInputStream
(
url
);
String
tsUrl
=
UUID
.
randomUUID
().
toString
()
+
".ts"
;
//文件后缀,key
String
localPathTs
=
localPath
+
"asAlter/GetTs/"
+
tsUrl
;
String
resultA
=
indexStr
.
replaceAll
(
url
,
localPathTs
);
//文本中的“url”替换为“localPathTs”
urlPath
.
put
(
tsUrl
,
fileInputStream
);
urlPath
new
.
put
(
tsUrl
,
fileInputStream
);
indexStr
=
resultA
;
}
urlPath
=
urlPathnew
;
InputStream
in
=
new
ByteArrayInputStream
(
indexStr
.
getBytes
());
OutputStream
outputStream
=
new
BufferedOutputStream
(
response
.
getOutputStream
());
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/video/HlsController.java
浏览文件 @
e68b9e2d
...
...
@@ -56,7 +56,7 @@ public class HlsController {
//读取指定路径下面的文件
String
indexStr
=
getIndexFile
(
originUrlpath
);
//解析originUrlpath 返回为文本
List
urlList
=
analysisIndex
(
indexStr
);
//解析indexStr获取.ts文件地址
String
localPath
=
"http://"
+
docker
ip
+
":"
+
port
+
path
+
"/"
;
String
localPath
=
"http://"
+
ip
+
":"
+
port
+
path
+
"/"
;
System
.
out
.
println
(
urlList
);
for
(
int
i
=
0
;
i
<
urlList
.
size
();
i
++)
{
String
tsUrl
=
UUID
.
randomUUID
().
toString
()
+
".ts"
;
//文件后缀,key
...
...
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/entity/Physicalid.java
浏览文件 @
e68b9e2d
...
...
@@ -27,6 +27,7 @@ import java.util.Date;
@EqualsAndHashCode
(
callSuper
=
false
)
@ApiModel
(
value
=
"physicalid对象"
,
description
=
"实物ID信息明细"
)
public
class
Physicalid
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 主键
*/
...
...
jeecg-boot-module-system/src/main/resources/application-docker.yml
浏览文件 @
e68b9e2d
jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java
浏览文件 @
e68b9e2d
...
...
@@ -20,10 +20,10 @@ import java.util.*;
@Slf4j
@EnableScheduling
public
class
SecurityToolsTest
{
static
String
K3CloudURL
=
"http://1
92.168.2.243
/k3cloud/"
;
//指定地址
static
String
dbId
=
"60
8102e4df263c
"
;
static
String
K3CloudURL
=
"http://1
ar8696937.iok.la
/k3cloud/"
;
//指定地址
static
String
dbId
=
"60
ef9f7f48f36d
"
;
static
String
uid
=
"Administrator"
;
static
String
pwd
=
"
888888
"
;
static
String
pwd
=
"
Kingdee$2021
"
;
static
int
lang
=
2052
;
K3CloudApiClient
client
=
new
K3CloudApiClient
(
K3CloudURL
);
@Test
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论