jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d62435a6fd7e97b026014840027cea0df015c5f5

Authored by jiangjiazhi
2 parents f266e2165c 0f6ab13c29
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java View file @ d62435a
... ... @@ -9,7 +9,7 @@
9 9  
10 10 public interface LisService {
11 11  
12   - BaseResponse saveLisData(String lisData);
  12 + BaseResponse saveLisData(List<LisReportModel> models);
13 13  
14 14 List<LisReportModel> queryLisDataByModel(LisReportModel model);
15 15  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ d62435a
... ... @@ -23,10 +23,10 @@
23 23 private MasterLisMapper masterLisMapper;
24 24  
25 25 @Override
26   - public BaseResponse saveLisData(String lisData) {
  26 + public BaseResponse saveLisData(final List<LisReportModel> lisList) {
27 27  
28 28 try {
29   - final List<LisReportModel> lisList =JsonUtil.jkstr2List(lisData, new TypeReference<List<LisReportModel>>() {});
  29 + //final List<LisReportModel> lisList =JsonUtil.jkstr2List(lisData, new TypeReference<List<LisReportModel>>() {});
30 30 System.out.println("saveLis data size = "+ lisList.size());
31 31  
32 32 if (CollectionUtils.isNotEmpty(lisList))
platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java View file @ d62435a
... ... @@ -12,7 +12,7 @@
12 12 * Created by Administrator on 2016/6/29 0029.
13 13 */
14 14 @Document(collection = "lyms_sieveresult")
15   -public class SieveResultModel extends BaseModel {
  15 +public class SieveResultModel{
16 16  
17 17 private static final long serialVersionUID = SerialIdEnum.SieveResultModel.getCid();
18 18  
platform-dal/src/main/java/com/lyms/platform/pojo/SmsConfigModel.java View file @ d62435a
... ... @@ -12,7 +12,7 @@
12 12 * @author lqy
13 13 */
14 14 @Document(collection = "lyms_smsconfig")
15   -public class SmsConfigModel extends BaseModel {
  15 +public class SmsConfigModel{
16 16  
17 17 private static final long serialVersionUID = SerialIdEnum.SmsConfigModel.getCid();
18 18  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java View file @ d62435a
... ... @@ -5,15 +5,14 @@
5 5 import com.lyms.platform.common.base.LoginContext;
6 6 import com.lyms.platform.common.result.BaseResponse;
7 7 import com.lyms.platform.operate.web.facade.LisFacade;
  8 +import com.lyms.platform.permission.model.LisReportModel;
8 9 import com.lyms.platform.permission.service.LisService;
9 10 import org.springframework.beans.factory.annotation.Autowired;
10 11 import org.springframework.stereotype.Controller;
11   -import org.springframework.web.bind.annotation.RequestMapping;
12   -import org.springframework.web.bind.annotation.RequestMethod;
13   -import org.springframework.web.bind.annotation.RequestParam;
14   -import org.springframework.web.bind.annotation.ResponseBody;
  12 +import org.springframework.web.bind.annotation.*;
15 13  
16 14 import javax.servlet.http.HttpServletRequest;
  15 +import java.util.List;
17 16  
18 17 /**
19 18 * Created by lqy on 2017-04-11.
20 19  
21 20  
... ... @@ -30,15 +29,15 @@
30 29 * 保存各个医院上传上来的lis数据，该数据保存在mysql数据库
31 30 * 每条lis数据中保存了属于那个医院的id
32 31 * 每个医院id是配置在相应单独部署的his项目中
33   - * @param lisData
  32 + * @param models
34 33 * @param httpServletRequest
35 34 * @return
36 35 */
37 36 @RequestMapping(method = RequestMethod.POST, value = "/saveLisData")
38 37 @ResponseBody
39   - public BaseResponse saveLisData(@RequestParam("lisData") String lisData,
  38 + public BaseResponse saveLisData(@RequestBody List<LisReportModel> models,
40 39 HttpServletRequest httpServletRequest) {
41   - return lisService.saveLisData(lisData);
  40 + return lisService.saveLisData(models);
42 41 }
43 42  
44 43