jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9d82dbb0776fc65f48213806ad0d069aa5e2d77e

Authored by yangfei
2 parents f0bb524a61 13375f4cdf
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java View file @ 9d82dbb
... ... @@ -85,12 +85,8 @@
85 85 private String sqlId;
86 86  
87 87 public Object intercept(Invocation invocation) throws Throwable {
88   -
89   - long start = System.currentTimeMillis();
90   -
91 88 Object[] args = invocation.getArgs();
92 89 Object returnValue = null;
93   -// System.out.println("args length = "+args.length);
94 90 try
95 91 {
96 92 if (args != null && args.length == 2)
... ... @@ -128,7 +124,6 @@
128 124 }
129 125 }
130 126 returnValue = invocation.proceed();
131   -
132 127 }
133 128 else
134 129 {
... ... @@ -142,7 +137,6 @@
142 137 {
143 138 sql = sql.replaceFirst("\\(","(ID,");
144 139 sql = sql.substring(0,sql.lastIndexOf("(")+1)+list.get(0)+","+sql.substring(sql.lastIndexOf("(")+1,sql.length());
145   - System.out.println("add sync sql = "+sql);
146 140 //发送要同步的sql
147 141 SendMysqlSyncDatUtil.addSqlToQueue(sql, sqlId);
148 142 sql = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BaseServiceImpl.java View file @ 9d82dbb
... ... @@ -37,6 +37,13 @@
37 37  
38 38 @Override
39 39 public <T> PageResult findMongoPage(Class<T> entity, Query query, Integer page, Integer limit) {
  40 + if(page == null) {
  41 + page = 1;
  42 + }
  43 + if(limit == null) {
  44 + limit = 15;
  45 + }
  46 +
40 47 Long count = mongoTemplate.count(query, entity);
41 48 query.skip((page - 1) * limit);
42 49 query.limit(limit);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java View file @ 9d82dbb
... ... @@ -50,7 +50,7 @@
50 50 List<Map<String, Object>> restList = new ArrayList<>();
51 51 for (PlantformConfigModel configModel : configModels) {
52 52 Map<String, Object> tempMap = new HashMap<>();
53   - tempMap.put("id", configModel.getId());
  53 + tempMap.put("id", configModel.getId().toString());
54 54 tempMap.put("name", configModel.getValue());
55 55 tempMap.put("date", DateUtil.getyyyy_MM_dd_hms(configModel.getCreateDate()));
56 56 restList.add(tempMap);
... ... @@ -62,9 +62,8 @@
62 62  
63 63 @Override
64 64 public BaseResponse delCustomType(String id, Integer userId) {
65   - String hospitalId = autoMatchFacade.getHospitalId(userId);
66   - mongoTemplate.remove(Query.query(Criteria.where("key").is(hospitalId).and("type").is(SequenceConstant.CUSTOM_TYPE)), PlantformConfigModel.class);
67   - mongoTemplate.remove(Query.query(Criteria.where("parentId").is(hospitalId).and("type").is(SequenceConstant.CUSTOM_CONTENT)), PlantformConfigModel.class);
  65 + mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), PlantformConfigModel.class);
  66 + mongoTemplate.remove(Query.query(Criteria.where("parentId").is(id)), PlantformConfigModel.class);
68 67 return RespBuilder.buildSuccess();
69 68 }
70 69  
... ... @@ -113,6 +112,7 @@
113 112 List<Map<String, Object>> restList = new ArrayList<>();
114 113 for (PlantformConfigModel configModel : configModels) {
115 114 Map<String, Object> map = ReflectionUtils.beanToMap(configModel);
  115 + map.put("id", configModel.getId().toString());
116 116 map.put("date", DateUtil.getyyyy_MM_dd_hms(configModel.getCreateDate()));
117 117 restList.add(map);
118 118 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java View file @ 9d82dbb
... ... @@ -85,7 +85,6 @@
85 85 {
86 86 for(String url : urls)
87 87 {
88   - System.out.println("sync mysql url = " + url);
89 88 String result = HttpClientUtil.doPostSSL(url,json,"3d19960bf3e81e7d816c4f26051c49ba");
90 89 System.out.println("sync mysql result = " + result);
91 90 }