Commit 54938d68f41883428a4dd406432bbcb3f9c798b8
1 parent
b8c596d781
Exists in
master
and in
8 other branches
platform permission
add return pageinfo
Showing 8 changed files with 164 additions and 1 deletions
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java
- platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
- platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
- platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java
View file @
54938d6
... | ... | @@ -56,6 +56,7 @@ |
56 | 56 | |
57 | 57 | public void updateForList(List<AssayConfig> assayConfigs) { |
58 | 58 | for(AssayConfig tmp : assayConfigs) { |
59 | + tmp.setModifiedDate(System.currentTimeMillis()); | |
59 | 60 | assayConfigDao.updateAssayConfig(new MongoQuery(new MongoCondition("id", tmp.getId(), MongoOper.IS)),tmp); |
60 | 61 | } |
61 | 62 | } |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java
View file @
54938d6
... | ... | @@ -4,6 +4,7 @@ |
4 | 4 | |
5 | 5 | import com.lyms.platform.biz.param.ReferConfigQuery; |
6 | 6 | import com.lyms.platform.common.dao.operator.MongoQuery; |
7 | +import com.lyms.platform.common.utils.SystemConfig; | |
7 | 8 | import org.springframework.beans.factory.annotation.Autowired; |
8 | 9 | import org.springframework.stereotype.Service; |
9 | 10 | |
10 | 11 | |
11 | 12 | |
... | ... | @@ -35,17 +36,20 @@ |
35 | 36 | |
36 | 37 | public void addRefer(ReferValue referValue) { |
37 | 38 | referValue.setYn(YnEnums.YES.getId()); |
39 | + referValue.setCreateDate(System.currentTimeMillis()); | |
38 | 40 | referConfigDao.addRefer(referValue); |
39 | 41 | } |
40 | 42 | |
41 | 43 | public void updateRefer(ReferValue referValue) { |
42 | 44 | MongoCondition mongoCondition = MongoCondition.newInstance("id",referValue.getId(), MongoOper.IS); |
45 | + referValue.setModifiedDate(System.currentTimeMillis()); | |
43 | 46 | referConfigDao.updateRefer(mongoCondition.toMongoQuery(), referValue); |
44 | 47 | } |
45 | 48 | |
46 | 49 | public void delRefer(ReferValue referValue) { |
47 | 50 | MongoCondition mongoCondition = MongoCondition.newInstance(); |
48 | 51 | mongoCondition.and("id", referValue.getId(), MongoOper.IS); |
52 | + referValue.setModifiedDate(System.currentTimeMillis()); | |
49 | 53 | referValue.setYn(YnEnums.NO.getId()); //软删除 |
50 | 54 | referConfigDao.updateRefer(mongoCondition.toMongoQuery(), referValue); |
51 | 55 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java
View file @
54938d6
... | ... | @@ -24,6 +24,42 @@ |
24 | 24 | private String classify; //检验分类 |
25 | 25 | private String resultType; //结果类型 |
26 | 26 | |
27 | + private String publishName; | |
28 | + private String publishId; | |
29 | + private Long createDate; | |
30 | + private Long modifiedDate; | |
31 | + | |
32 | + public String getPublishName() { | |
33 | + return publishName; | |
34 | + } | |
35 | + | |
36 | + public void setPublishName(String publishName) { | |
37 | + this.publishName = publishName; | |
38 | + } | |
39 | + | |
40 | + public String getPublishId() { | |
41 | + return publishId; | |
42 | + } | |
43 | + | |
44 | + public void setPublishId(String publishId) { | |
45 | + this.publishId = publishId; | |
46 | + } | |
47 | + | |
48 | + public Long getCreateDate() { | |
49 | + return createDate; | |
50 | + } | |
51 | + | |
52 | + public void setCreateDate(Long createDate) { | |
53 | + this.createDate = createDate; | |
54 | + } | |
55 | + | |
56 | + public Long getModifiedDate() { | |
57 | + return modifiedDate; | |
58 | + } | |
59 | + | |
60 | + public void setModifiedDate(Long modifiedDate) { | |
61 | + this.modifiedDate = modifiedDate; | |
62 | + } | |
27 | 63 | |
28 | 64 | public static long getSerialVersionUID() { |
29 | 65 | return serialVersionUID; |
platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
View file @
54938d6
... | ... | @@ -28,6 +28,47 @@ |
28 | 28 | |
29 | 29 | private String typeId; |
30 | 30 | |
31 | + private String publishName; | |
32 | + private String publishId; | |
33 | + private Long createDate; | |
34 | + private Long modifiedDate; | |
35 | + | |
36 | + public static long getSerialVersionUID() { | |
37 | + return serialVersionUID; | |
38 | + } | |
39 | + | |
40 | + public String getPublishName() { | |
41 | + return publishName; | |
42 | + } | |
43 | + | |
44 | + public void setPublishName(String publishName) { | |
45 | + this.publishName = publishName; | |
46 | + } | |
47 | + | |
48 | + public String getPublishId() { | |
49 | + return publishId; | |
50 | + } | |
51 | + | |
52 | + public void setPublishId(String publishId) { | |
53 | + this.publishId = publishId; | |
54 | + } | |
55 | + | |
56 | + public Long getCreateDate() { | |
57 | + return createDate; | |
58 | + } | |
59 | + | |
60 | + public void setCreateDate(Long createDate) { | |
61 | + this.createDate = createDate; | |
62 | + } | |
63 | + | |
64 | + public Long getModifiedDate() { | |
65 | + return modifiedDate; | |
66 | + } | |
67 | + | |
68 | + public void setModifiedDate(Long modifiedDate) { | |
69 | + this.modifiedDate = modifiedDate; | |
70 | + } | |
71 | + | |
31 | 72 | public String getTypeId() { |
32 | 73 | return typeId; |
33 | 74 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java
View file @
54938d6
... | ... | @@ -19,6 +19,43 @@ |
19 | 19 | private List<String> areas; |
20 | 20 | private String areaNames; |
21 | 21 | |
22 | + private String publishName; | |
23 | + private String publishId; | |
24 | + private Long createDate; | |
25 | + private Long modifiedDate; | |
26 | + | |
27 | + public String getPublishName() { | |
28 | + return publishName; | |
29 | + } | |
30 | + | |
31 | + public void setPublishName(String publishName) { | |
32 | + this.publishName = publishName; | |
33 | + } | |
34 | + | |
35 | + public String getPublishId() { | |
36 | + return publishId; | |
37 | + } | |
38 | + | |
39 | + public void setPublishId(String publishId) { | |
40 | + this.publishId = publishId; | |
41 | + } | |
42 | + | |
43 | + public Long getCreateDate() { | |
44 | + return createDate; | |
45 | + } | |
46 | + | |
47 | + public void setCreateDate(Long createDate) { | |
48 | + this.createDate = createDate; | |
49 | + } | |
50 | + | |
51 | + public Long getModifiedDate() { | |
52 | + return modifiedDate; | |
53 | + } | |
54 | + | |
55 | + public void setModifiedDate(Long modifiedDate) { | |
56 | + this.modifiedDate = modifiedDate; | |
57 | + } | |
58 | + | |
22 | 59 | public String getAreaNames() { |
23 | 60 | return areaNames; |
24 | 61 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java
View file @
54938d6
... | ... | @@ -61,6 +61,43 @@ |
61 | 61 | private String sampleVal; |
62 | 62 | private String featureVal; |
63 | 63 | |
64 | + private String publishName; | |
65 | + private String publishId; | |
66 | + private Long createDate; | |
67 | + private Long modifiedDate; | |
68 | + | |
69 | + public String getPublishName() { | |
70 | + return publishName; | |
71 | + } | |
72 | + | |
73 | + public void setPublishName(String publishName) { | |
74 | + this.publishName = publishName; | |
75 | + } | |
76 | + | |
77 | + public String getPublishId() { | |
78 | + return publishId; | |
79 | + } | |
80 | + | |
81 | + public void setPublishId(String publishId) { | |
82 | + this.publishId = publishId; | |
83 | + } | |
84 | + | |
85 | + public Long getCreateDate() { | |
86 | + return createDate; | |
87 | + } | |
88 | + | |
89 | + public void setCreateDate(Long createDate) { | |
90 | + this.createDate = createDate; | |
91 | + } | |
92 | + | |
93 | + public Long getModifiedDate() { | |
94 | + return modifiedDate; | |
95 | + } | |
96 | + | |
97 | + public void setModifiedDate(Long modifiedDate) { | |
98 | + this.modifiedDate = modifiedDate; | |
99 | + } | |
100 | + | |
64 | 101 | public String getSampleVal() { |
65 | 102 | return sampleVal; |
66 | 103 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java
View file @
54938d6
... | ... | @@ -73,6 +73,7 @@ |
73 | 73 | } else { |
74 | 74 | communityConfig.setGxxq( names.substring(1, names.length())); |
75 | 75 | } |
76 | + communityConfig.setCreateDate(System.currentTimeMillis()); | |
76 | 77 | communityConfigService.updateCommunity(communityConfig); |
77 | 78 | return new BaseResponse() |
78 | 79 | .setErrorcode(ErrorCodeConstants.SUCCESS) |
... | ... | @@ -88,6 +89,7 @@ |
88 | 89 | CommunityConfig communityConfig = new CommunityConfig(); |
89 | 90 | communityConfig.setId(id); |
90 | 91 | communityConfig.setGxxq(""); |
92 | + communityConfig.setModifiedDate(System.currentTimeMillis()); | |
91 | 93 | communityConfigService.updateCommunity(communityConfig); |
92 | 94 | |
93 | 95 | return new BaseResponse() |
... | ... | @@ -149,7 +151,7 @@ |
149 | 151 | } |
150 | 152 | Collections.reverse(areaIds); |
151 | 153 | communityConfig.setAreas(areaIds); |
152 | - | |
154 | + communityConfig.setCreateDate(System.currentTimeMillis()); | |
153 | 155 | communityConfigService.appendCommunity(communityConfig); |
154 | 156 | } |
155 | 157 | return new BaseResponse() |
... | ... | @@ -171,6 +173,7 @@ |
171 | 173 | |
172 | 174 | CommunityConfig communityConfig = new CommunityConfig(); |
173 | 175 | communityConfig.setId(id); |
176 | + communityConfig.setModifiedDate(System.currentTimeMillis()); | |
174 | 177 | communityConfigService.deleteCommunity(communityConfig); |
175 | 178 | return new BaseResponse() |
176 | 179 | .setErrorcode(ErrorCodeConstants.SUCCESS) |
... | ... | @@ -185,6 +188,7 @@ |
185 | 188 | CommunityConfig communityConfig = new CommunityConfig(); |
186 | 189 | communityConfig.setId(id); |
187 | 190 | communityConfig.setName(name); |
191 | + communityConfig.setModifiedDate(System.currentTimeMillis()); | |
188 | 192 | communityConfigService.updateCommunity(communityConfig); |
189 | 193 | return new BaseResponse() |
190 | 194 | .setErrorcode(ErrorCodeConstants.SUCCESS) |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
View file @
54938d6
... | ... | @@ -87,6 +87,7 @@ |
87 | 87 | List<BasicConfig> data = basicConfigService.queryBasicConfig(basicConfigQuery); |
88 | 88 | if (CollectionUtils.isNotEmpty(data)) { |
89 | 89 | obj.setYn(data.get(0).getYn()); |
90 | + obj.setModifiedDate(System.currentTimeMillis()); | |
90 | 91 | basicConfigService.updateBasicConfig(obj); |
91 | 92 | return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); |
92 | 93 | } |
... | ... | @@ -102,6 +103,7 @@ |
102 | 103 | public BaseResponse deleteOneBasicConfig(String id) { |
103 | 104 | BasicConfig obj = new BasicConfig(); |
104 | 105 | obj.setId(id); |
106 | + obj.setModifiedDate(System.currentTimeMillis()); | |
105 | 107 | obj.setYn(YnEnums.NO.getId()); |
106 | 108 | basicConfigService.updateBasicConfig(obj); |
107 | 109 | return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); |
... | ... | @@ -137,6 +139,7 @@ |
137 | 139 | //转换的时候验证如果为空就跳过添加数据 |
138 | 140 | BasicConfig basicConfig = ba.convertToDataModel(); |
139 | 141 | if (null != basicConfig) { |
142 | + basicConfig.setCreateDate(System.currentTimeMillis()); | |
140 | 143 | basicConfigService.addBasicConfig(basicConfig); |
141 | 144 | } |
142 | 145 | } |