Skip to content

O
OA-Integration
提交 b018cd83 authored 作者: 李炎's avatar 李炎
浏览文件
操作

更新数据库

上级 fb09e7f2
隐藏空白字符变更
内嵌 并排
正在显示 包含 48 行增加 和 41 行删除
db/API.sql
浏览文件 @ b018cd83
This source diff could not be displayed because it is too large. You can view the blob instead.
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/QueryLoanDetailsController.java → jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/OaSelectJournalController.java
浏览文件 @ b018cd83
......@@ -10,7 +10,8 @@ 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.QueryLoanDetails;
import org.jeecg.modules.iost.API.service.IQueryLoanDetailsService;
import org.jeecg.modules.iost.API.entity.oajournal.OaSelectJournal;
import org.jeecg.modules.iost.API.service.oajournal.IOaSelectJournalService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -19,13 +20,13 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@Api(tags = "查询借款信息-明细")
@Api(tags = "oa查询信息-日志")
@RestController
@RequestMapping("/API/queryLoandetails")
@RequestMapping("/API/oaSelectJournal")
@Slf4j
public class QueryLoanDetailsController {
public class OaSelectJournalController {
@Autowired
private IQueryLoanDetailsService queryLoanDetailsService;
private IOaSelectJournalService oaSelectJournalService;
/**
* 分页列表查询
*
......@@ -34,17 +35,17 @@ public class QueryLoanDetailsController {
* @param req
* @return
*/
@AutoLog(value = "查询借款明细接口-分页列表查询")
@ApiOperation(value = "查询借款明细接口-分页列表查询", notes = "查询借款明细接口-分页列表查询")
@AutoLog(value = "查询oa日志接口-分页列表查询")
@ApiOperation(value = "查询oa日志接口-分页列表查询", notes = "查询oa日志信息-分页列表查询")
@GetMapping(value = "list")
public Result<?> queryPageList(QueryLoanDetails queryLoanDetails,
public Result<?> queryPageList(OaSelectJournal oaSelectJournal,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<QueryLoanDetails> queryWrapper = QueryGenerator.initQueryWrapper(queryLoanDetails, req.getParameterMap());
Page<QueryLoanDetails> page = new Page<QueryLoanDetails>(pageNo, pageSize);
IPage<QueryLoanDetails> pageList = queryLoanDetailsService.page(page, queryWrapper);
QueryWrapper<OaSelectJournal> queryWrapper = QueryGenerator.initQueryWrapper(oaSelectJournal, req.getParameterMap());
Page<OaSelectJournal> page = new Page<OaSelectJournal>(pageNo, pageSize);
IPage<OaSelectJournal> pageList = oaSelectJournalService.page(page, queryWrapper);
return Result.OK(pageList);
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/controller/OaUpdateJournalController.java
浏览文件 @ b018cd83
......@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
@Api(tags = "oa更新信息-日志")
@Api(tags = "更新oa信息-日志")
@RestController
@RequestMapping("/API/oaUpdateJournal")
@Slf4j
......@@ -36,8 +36,8 @@ public class OaUpdateJournalController {
* @param req
* @return
*/
@AutoLog(value = "查询金蝶日志接口-分页列表查询")
@ApiOperation(value = "查询金蝶日志接口-分页列表查询", notes = "查询金蝶日志接口-分页列表查询")
@AutoLog(value = "更新oa日志接口-分页列表查询")
@ApiOperation(value = "更新oa日志接口-分页列表查询", notes = "更新oa日志接口-分页列表查询")
@GetMapping(value = "list")
public Result<?> queryPageList(OaUpdateJournal oaUpdateJournal,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
......
jeecg-boot-module-system/src/test/java/org/jeecg/ToolsTest.java
浏览文件 @ b018cd83
......@@ -33,6 +33,7 @@ public class ToolsTest {
static String pwd = "888888";
static int lang = 2052;
K3CloudApiClient client = new K3CloudApiClient(K3CloudURL);
@Test
public void Test() {
MyKeyPair mkeyPair = SecurityTools.generateKeyPair();
......@@ -93,6 +94,7 @@ public class ToolsTest {
log.info(jsonObject.get(data).toString());
return jsonObject;
}
@Test
public void S() {
Random r = new Random();
......@@ -112,14 +114,14 @@ public class ToolsTest {
@Test
// @Scheduled(fixedDelay = 5000)
public void timed() {
String servicenameTable="LQKJ.WebApi.Stub.CustomWebApiService.ExecutDataSet,LQKJ.WebApi.Stub";
String servicenameMap="LQKJ.WebApi.Stub.CustomWebApiService.ExecuteDynamicObject,LQKJ.WebApi.Stub";
String servicenameTable = "LQKJ.WebApi.Stub.CustomWebApiService.ExecutDataSet,LQKJ.WebApi.Stub";
String servicenameMap = "LQKJ.WebApi.Stub.CustomWebApiService.ExecuteDynamicObject,LQKJ.WebApi.Stub";
log.info("123");
List<List<Object>> list = null;
try {
Boolean result = client.login(dbId, uid, pwd, lang);
if(result){
String sql="SELECT F_LQKJ_SYNCCHECK,ds FROM LQKJ_t_IMSSync where F_LQKJ_SyncCheck = 3;";
if (result) {
String sql = "SELECT F_LQKJ_SYNCCHECK,ds FROM LQKJ_t_IMSSync where F_LQKJ_SyncCheck = 3;";
System.out.println(sql);
String[] strings = new String[]{sql};
// List execute = client.execute(servicenameMap, strings, List.class);
......@@ -130,9 +132,9 @@ public class ToolsTest {
for (Object o : execute) {
System.out.println(execute);
}
if (null==execute) {
if (null == execute) {
System.out.println("你好");
}else {
} else {
System.out.println("你好2");
}
System.out.println(execute.size());
......@@ -141,7 +143,6 @@ public class ToolsTest {
// }
}
} catch (Exception e) {
System.out.println("nb");
......@@ -149,6 +150,7 @@ public class ToolsTest {
}
System.out.println("end");
}
@Test
// @Scheduled(fixedDelay = 5000)
public void timdsaded() throws InterruptedException {
......@@ -157,19 +159,22 @@ public class ToolsTest {
objects.add(i);
}
for (int i = 0; i < objects.size(); i++) {
if (i==3) {
if (i == 3) {
objects.remove(i);
}
System.out.println(objects.get(i));
}
}
@Async
public void Async() throws InterruptedException {
Thread.sleep(50000);
public void Async() throws InterruptedException {
Thread.sleep(50000);
System.out.println("nkklkjnlkkkkkkk");
}
@Autowired
private LQKJ_t_IMSSyncDetailsWebapi webapi;
@Test
// @Scheduled(fixedDelay = 5000)
public void sadsad() {
......@@ -177,29 +182,30 @@ Thread.sleep(50000);
for (int i1 = 0; i1 < 10; i1++) {
fid.put(new String("fid"), String.valueOf(i1));
}
if (0<fid.size()) {
Map Obj=fid;
if (0 < fid.size()) {
Map Obj = fid;
String s = StringCompareIn(Obj);
System.out.println(s);
}
}
// fid in ('0fb6a3a7-9c09-4720-820e-8c64618b7cbe','16cde038-2101-4eea-a05c-78becc60f0a9')
private String StringCompareIn(Map<String, String> map) {
String where = null;
for (String key : map.keySet()) {
String value = String.valueOf(map.get(key));
if (value != null && value != "") {
if (where != null) {
where = where + "," + value;
} else {
where = key + " in (" + value + "";
// fid in ('0fb6a3a7-9c09-4720-820e-8c64618b7cbe','16cde038-2101-4eea-a05c-78becc60f0a9')
private String StringCompareIn(Map<String, String> map) {
String where = null;
for (String key : map.keySet()) {
String value = String.valueOf(map.get(key));
if (value != null && value != "") {
if (where != null) {
where = where + "," + value;
} else {
where = key + " in (" + value + "";
}
}
}
if (where != null) {
return " where " + where + ")";
}
return "";
}
if (where != null) {
return " where " + where + ")";
}
return "";
}
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论