jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 896dce4fee193fad78c9a974519d71ff094d7324

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

Merge remote-tracking branch 'origin/master'

Showing 16 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarHearingDiagnoseQuery.java View file @ 896dce4
... ... @@ -5,7 +5,6 @@
5 5 import com.lyms.platform.pojo.BabyModel;
6 6  
7 7 import java.util.Date;
8   -import java.util.List;
9 8  
10 9  
11 10 public class BabyPatientExtendEarHearingDiagnoseQuery extends BaseQuery {
... ... @@ -24,7 +23,7 @@
24 23 /**
25 24 * 儿童档案id
26 25 */
27   - private List<String> babyIds;
  26 + private String[] babyIds;
28 27 /**
29 28 * 创建医院ID
30 29 */
... ... @@ -32,7 +31,7 @@
32 31 /**
33 32 * 要显示的医院集合
34 33 */
35   - private List<String> checkHospitalIds;
  34 + private String[] checkHospitalIds;
36 35 /**
37 36 * 诊断时间
38 37 */
39 38  
... ... @@ -450,11 +449,11 @@
450 449 */
451 450 private Date confirmEndTime;
452 451  
453   - public List<String> getCheckHospitalIds() {
  452 + public String[] getCheckHospitalIds() {
454 453 return checkHospitalIds;
455 454 }
456 455  
457   - public void setCheckHospitalIds(List<String> checkHospitalIds) {
  456 + public void setCheckHospitalIds(String[] checkHospitalIds) {
458 457 this.checkHospitalIds = checkHospitalIds;
459 458 }
460 459  
461 460  
... ... @@ -842,11 +841,11 @@
842 841 this.oaeRight750 = oaeRight750;
843 842 }
844 843  
845   - public List<String> getBabyIds() {
  844 + public String[] getBabyIds() {
846 845 return babyIds;
847 846 }
848 847  
849   - public void setBabyIds(List<String> babyIds) {
  848 + public void setBabyIds(String[] babyIds) {
850 849 this.babyIds = babyIds;
851 850 }
852 851  
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreenQuery.java View file @ 896dce4
... ... @@ -10,7 +10,7 @@
10 10 public class BabyPatientExtendEarScreenQuery extends BaseQuery {
11 11 private String id;
12 12 //听诊儿童档案集合
13   - private List<String> babyIds;
  13 + private String[] babyIds;
14 14  
15 15 private String babyId;
16 16  
17 17  
... ... @@ -174,11 +174,11 @@
174 174  
175 175 }
176 176  
177   - public List<String> getBabyIds() {
  177 + public String[] getBabyIds() {
178 178 return babyIds;
179 179 }
180 180  
181   - public void setBabyIds(List<String> babyIds) {
  181 + public void setBabyIds(String[] babyIds) {
182 182 this.babyIds = babyIds;
183 183 }
184 184  
platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarHearingDiagnoseService.java View file @ 896dce4
... ... @@ -21,7 +21,7 @@
21 21 public List<BabyPatientExtendEarHearingDiagnose> queryBabyPatientExtendEarHearingDiagnose(BabyPatientExtendEarHearingDiagnoseQuery query);
22 22  
23 23 /**
24   - * 查询待诊断、已诊断、本院、外院等....
  24 + * 鏌ヨ寰呰瘖鏂佸凡璇婃柇銆佹湰闄€佸闄㈢瓑....
25 25 * @param query
26 26 * @return
27 27 */
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml View file @ 896dce4
... ... @@ -458,6 +458,13 @@
458 458 <if test="hospitalId != null and hospitalId != ''">
459 459 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
460 460 </if>
  461 + <if test="checkHospitalIds != null and checkHospitalIds != ''">
  462 + and hospital_id in
  463 + <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
  464 + #{item}
  465 + </foreach>
  466 + </if>
  467 +
461 468 <if test="diagnoseTime != null">
462 469 and diagnose_time = #{diagnoseTime,jdbcType=TIMESTAMP}
463 470 </if>
464 471  
... ... @@ -803,10 +810,11 @@
803 810 on hd.baby_id = sc.baby_id
804 811 <where>
805 812 <if test="checkHospitalIds != null">
806   - and sc.check_hospital_id in
807   - <foreach item="item" index="index" collection="checkHospitalIds" open="(" separator="," close=")">
808   - #{item}
  813 + and sc.check_hospital_id in (
  814 + <foreach item="hsId" collection="checkHospitalIds" separator=",">
  815 + #{hsId}
809 816 </foreach>
  817 + )
810 818 </if>
811 819 /*诊断日期*/
812 820 <if test="diagnoseStartTime != null ">
platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java View file @ 896dce4
... ... @@ -455,7 +455,7 @@
455 455 }
456 456  
457 457 deliverAddRequest.setBabies(babies);
458   - deliverAddRequest.setFmHospital("216"); //设置为秦皇岛分娩医院
  458 + deliverAddRequest.setFmHospital("1000000114"); //设置为德州妇幼
459 459 ExceptionUtils.catchException("deliverAddRequest===" + deliverAddRequest);
460 460 matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, users.get(0).getId());
461 461  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java View file @ 896dce4
1 1 package com.lyms.platform.operate.web.controller;
2 2  
  3 +import java.text.SimpleDateFormat;
3 4 import java.util.Date;
4 5  
5 6 import javax.servlet.http.HttpServletRequest;
... ... @@ -15,7 +16,6 @@
15 16 import com.lyms.platform.common.result.BaseObjectResponse;
16 17 import com.lyms.platform.common.result.RespBuilder;
17 18 import com.lyms.platform.common.result.ResponseCode;
18   -import com.lyms.platform.common.utils.DateUtil;
19 19 import com.lyms.platform.common.utils.PropertiesUtils;
20 20 import com.lyms.platform.operate.web.utils.HospitalCouponPrintUtils;
21 21 import com.lyms.platform.pojo.Patients;
... ... @@ -58,8 +58,8 @@
58 58 Integer XSJE =0;// 销售金额
59 59 Integer CZZKL =100;//充值折扣率
60 60 Integer YE = KMJE;//余额
61   - String result = HospitalCouponPrintUtils.getDZdjq(cardType, cardNum, sendReason, sendPersonName, patientUserName, DateUtil.getyyyy_MM_dd(new Date()),remark, JSFS, KMJE, XSJE, CZZKL, YE);
62   - System.out.println("result="+result);
  61 + SimpleDateFormat nowFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  62 + String result = HospitalCouponPrintUtils.getDZdjq(cardType, cardNum, sendReason, sendPersonName, patientUserName, nowFormat.format(new Date()),remark, JSFS, KMJE, XSJE, CZZKL, YE);
63 63 if("0".equals(result)){
64 64 return RespBuilder.buildErro(ResponseCode.SUCCESS);
65 65 }else{
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ 896dce4
... ... @@ -65,6 +65,7 @@
65 65 */
66 66 @RequestMapping(method = RequestMethod.GET, value = "/initFollowUp")
67 67 @ResponseBody
  68 + @TokenRequired
68 69 public BaseResponse initFollowUp(String babyId) {
69 70 if (StringUtils.isNotEmpty(babyId)) {//传入儿童档案id
70 71 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
... ... @@ -123,6 +124,7 @@
123 124 */
124 125 @RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose")
125 126 @ResponseBody
  127 + @TokenRequired
126 128 public BaseResponse initHearingDiagnose(String babyId, HttpServletRequest request) {
127 129 //获取当前登录用户ID
128 130 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
... ... @@ -132,7 +134,7 @@
132 134 //当前登录人医院Id
133 135 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
134 136  
135   - if (StringUtils.isNotEmpty(babyId)) {//传入儿童档案id
  137 + if (StringUtils.isEmpty(babyId)) {//传入儿童档案id
136 138 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
137 139 }
138 140  
... ... @@ -183,6 +185,7 @@
183 185 */
184 186 @RequestMapping(method = RequestMethod.GET, value = "/initHighrChangeHosp")
185 187 @ResponseBody
  188 + @TokenRequired
186 189 public BaseResponse initHighrChangeHosp(String babyId, HttpServletRequest request) {
187 190 //根据babyId和当前医院id
188 191 //获取当前登录用户ID
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FollowUpController.java View file @ 896dce4
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3 import com.lyms.platform.biz.service.BabyService;
  4 +import com.lyms.platform.common.annotation.TokenRequired;
4 5 import com.lyms.platform.common.base.BaseController;
5 6 import com.lyms.platform.common.base.LoginContext;
6 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
... ... @@ -52,6 +53,7 @@
52 53 */
53 54 @RequestMapping(method = RequestMethod.GET, value = "/getFollowUpList")
54 55 @ResponseBody
  56 + @TokenRequired
55 57 public BaseResponse getFollowUpList(String babyId, HttpServletRequest request) {
56 58  
57 59 BabyPatientExtendEarFollowUpQuery query = new BabyPatientExtendEarFollowUpQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java View file @ 896dce4
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.BabyService;
4 4 import com.lyms.platform.biz.service.BasicConfigService;
  5 +import com.lyms.platform.common.annotation.TokenRequired;
5 6 import com.lyms.platform.common.base.BaseController;
6 7 import com.lyms.platform.common.base.LoginContext;
7 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
... ... @@ -10,7 +11,10 @@
10 11 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
11 12 import com.lyms.platform.operate.web.request.HearingDiagnoseRequest;
12 13 import com.lyms.platform.operate.web.result.HearingDiagnoseListResult;
13   -import com.lyms.platform.permission.model.*;
  14 +import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnose;
  15 +import com.lyms.platform.permission.model.BabyPatientExtendEarHearingDiagnoseQuery;
  16 +import com.lyms.platform.permission.model.HighriskChangeHospital;
  17 +import com.lyms.platform.permission.model.HighriskChangeHospitalQuery;
14 18 import com.lyms.platform.permission.service.BabyPatientExtendEarHearingDiagnoseService;
15 19 import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService;
16 20 import com.lyms.platform.permission.service.HighriskChangeHospitalService;
17 21  
18 22  
... ... @@ -74,14 +78,38 @@
74 78 */
75 79 @RequestMapping(method = RequestMethod.GET, value = "/getHearingDiagnose")
76 80 @ResponseBody
77   - public BaseResponse getHearingDiagnose(String babyId) {
  81 + @TokenRequired
  82 + public BaseResponse getHearingDiagnose(String babyId, HttpServletRequest request) {
  83 + //获取当前登录用户ID
  84 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  85 + if (loginState == null) {
  86 + return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
  87 + }
  88 + //当前登录人医院Id
  89 + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
  90 +
78 91 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
79 92 query.setBabyId(babyId);
  93 + //查询听力转诊申请 // e、外院：有申请记录则允许进行新增听力筛查
  94 + HighriskChangeHospitalQuery hcQuery = new HighriskChangeHospitalQuery();
  95 + hcQuery.setIntoOrgid(hospitalId);
  96 + hcQuery.setTargetId(babyId);
  97 + List<String> hospitalIds = new ArrayList<String>();
  98 + hospitalIds.add(hospitalId);
  99 + List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hcQuery);
  100 + if(hchList.size()>0){
  101 + for(HighriskChangeHospital h:hchList){
  102 + hospitalIds.add(h.getOutOrgid());
  103 + }
  104 + }
  105 + query.setCheckHospitalIds((String[])hospitalIds.toArray(new String[hospitalIds.size()]));
  106 +
80 107 List<BabyPatientExtendEarHearingDiagnose> behdList = hearingDiagnoseService.queryBabyPatientExtendEarHearingDiagnose(query);
81 108 List<Map<String, String>> list = new ArrayList<>();
82 109 for (BabyPatientExtendEarHearingDiagnose hd : behdList) {
83 110 Map<String, String> fuMap = new HashMap<>();
84 111 fuMap.put("id", hd.getId());
  112 + fuMap.put("hospitalId", hd.getHospitalId());
85 113 fuMap.put("hdTime", DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime()));
86 114 list.add(fuMap);
87 115 }
88 116  
89 117  
90 118  
... ... @@ -100,18 +128,60 @@
100 128 */
101 129 @RequestMapping(method = RequestMethod.GET, value = "/queryHearingDiagnoseList")
102 130 @ResponseBody
  131 + @TokenRequired
103 132 public BaseResponse queryHearingDiagnoseList(HearingDiagnoseRequest hdReq, HttpServletRequest request) {
104 133 //获取当前登录用户ID
105 134 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
106 135 if (loginState == null) {
107 136 return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
108 137 }
  138 +
  139 + //如果查询号不为空，根据查询号查询儿童档案表，获取儿童档案Id
  140 + if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡
  141 + //调用mysql表查询baby档案。 表还未设计
  142 + }
  143 +
109 144 //当前登录人医院Id
110 145 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
  146 + //医院ID 集合。本院、外院、全部...
  147 + List<String> outOrgids = new ArrayList<>();
  148 + if (hdReq.getSource() == 2) {//2.转诊过来的医院、
  149 + //转诊过来的医院id
  150 + HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
  151 + hchQuery.setTargetType(2);//儿童
  152 + hchQuery.setChangeType(1);//听力转诊
  153 + hchQuery.setStatus(2);//已接受
  154 + hchQuery.setIntoOrgid(hospitalId);
  155 + List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
  156 + if (hchList != null && hchList.size() > 0) {
  157 + for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
  158 + outOrgids.add(hch.getOutOrgid());
  159 + }
  160 + }
  161 + } else if (hdReq.getSource() == 1) {//1.本院
  162 + //当前医院
  163 + outOrgids.add(hospitalId);
  164 + } else {//4.全部医院/默认全部医院
  165 + //当前医院
  166 + outOrgids.add(hospitalId);
  167 + //转诊过来的医院id
  168 + HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
  169 + hchQuery.setTargetType(2);//儿童
  170 + hchQuery.setChangeType(1);//听力转诊
  171 + hchQuery.setStatus(2);//已接受
  172 + hchQuery.setIntoOrgid(hospitalId);
  173 + List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
  174 + if (hchList != null && hchList.size() > 0) {
  175 + for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
  176 + outOrgids.add(hch.getOutOrgid());
  177 + }
  178 + }
  179 + }
  180 +
111 181 BabyPatientExtendEarHearingDiagnoseQuery query = new BabyPatientExtendEarHearingDiagnoseQuery();
112   - //设置分页信息
113   - query.setLimit(hdReq.getLimit());
114   - query.setPage(hdReq.getPage());
  182 + //设置要显示的医院集合（已加入条件本院、外院、全部）
  183 + query.setCheckHospitalIds((String[])outOrgids.toArray(new String[outOrgids.size()]));
  184 +
115 185 if (hdReq.getDiagnoseStartTime() != null) {//诊断开始时间
116 186 query.setDiagnoseStartTime(hdReq.getDiagnoseStartTime());
117 187 }
118 188  
119 189  
... ... @@ -150,48 +220,8 @@
150 220 query.setConfirmEndTime(hdReq.getConfirmEndTime());
151 221 }
152 222  
153   - //医院ID 集合。本院、外院、全部...
154   - List<String> outOrgids = new ArrayList<>();
155   - if (hdReq.getSource() == 2) {//2.*医院、
156   - //转诊过来的医院id
157   - HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
158   - hchQuery.setTargetType(2);//儿童
159   - hchQuery.setChangeType(1);//听力转诊
160   - hchQuery.setStatus(2);//已接受
161   - hchQuery.setIntoOrgid(hospitalId);
162   - List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
163   - if (hchList != null && hchList.size() > 0) {
164   - for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
165   - outOrgids.add(hch.getOutOrgid());
166   - }
167   - }
168   - } else if (hdReq.getSource() == 1) {//1.本院
169   - //当前医院
170   - outOrgids.add(hospitalId);
171   - } else {//4.全部医院/默认全部医院
172   - //当前医院
173   - outOrgids.add(hospitalId);
174   - //转诊过来的医院id
175   - HighriskChangeHospitalQuery hchQuery = new HighriskChangeHospitalQuery();
176   - hchQuery.setTargetType(2);//儿童
177   - hchQuery.setChangeType(1);//听力转诊
178   - hchQuery.setStatus(2);//已接受
179   - hchQuery.setIntoOrgid(hospitalId);
180   - List<HighriskChangeHospital> hchList = highchangeService.queryHighriskChangeHospital(hchQuery);
181   - if (hchList != null && hchList.size() > 0) {
182   - for (HighriskChangeHospital hch : hchList) {//如果存在则修改转诊记录状态为接收
183   - outOrgids.add(hch.getOutOrgid());
184   - }
185   - }
186   - }
187 223  
188   - if (hdReq.getKeyWord() != null) {//关键字：姓名、联系方式、就诊卡
189   - //调用mysql表查询baby档案。 表还未设计
190   - }
191 224  
192   - //设置要显示的医院集合
193   - query.setCheckHospitalIds(outOrgids);
194   -
195 225 //根据当前医院id，和已接受儿童档案的转入医院id 进行查询
196 226 if (hdReq.getEnalble() == 2) {//2待诊断，查询听筛记录，还未做听诊的
197 227 //没有听诊记录
... ... @@ -235,6 +265,7 @@
235 265 */
236 266 @RequestMapping(method = RequestMethod.POST, value = "/delHearingDiagnose")
237 267 @ResponseBody
  268 + @TokenRequired
238 269 public BaseResponse delHearingDiagnose(BabyPatientExtendEarHearingDiagnose obj, HttpServletRequest request) {
239 270 if (StringUtils.isEmpty(obj.getId())) {
240 271 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入要修改的听力诊断id");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ 896dce4
... ... @@ -33,6 +33,9 @@
33 33 @Autowired
34 34 private AutoMatchFacade autoMatchFacade;
35 35  
  36 + //转诊记录
  37 + @Autowired
  38 + private HighriskChangeHospitalService highchangeService;
36 39  
37 40  
38 41  
... ... @@ -85,6 +88,9 @@
85 88 if (loginState == null) {
86 89 return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
87 90 }
  91 + //医院id
  92 + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
  93 +
88 94 //医院id
89 95 List<HighriskChangeHospital> HighriskChangeHospitalList = highriskChangeHospitalService.queryHighriskChangeHospital(query);
90 96 return FrontEndResult.ini().setData(HighriskChangeHospitalList).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ 896dce4
... ... @@ -219,7 +219,7 @@
219 219  
220 220 stopPregnancyService.addStopPreg(model);
221 221 /** 作废产检劵 */
222   - couponService.invalid(request.getPid(), "2");
  222 + couponService.invalid(request.getPid(), "2,4");
223 223  
224 224 //作废产检劵
225 225 patientCheckTicketService.cancelCheckTicket(hospital, pat.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java View file @ 896dce4
... ... @@ -41,23 +41,39 @@
41 41 static {
42 42 uses.add("departments");
43 43 uses.add("organization");
44   - uses.add("permissions");
45   - uses.add("permissions2");
46   - uses.add("regions");
47   - uses.add("role_permission_maps");
48 44 uses.add("roles");
49   - uses.add("user_organization_maps");
50   - uses.add("user_role_maps");
51 45 uses.add("users");
52 46  
  47 + noUses.add("baby_patient_extend_ear");
  48 + noUses.add("baby_patient_extend_ear_birth");
  49 + noUses.add("baby_patient_extend_ear_family");
  50 + noUses.add("baby_patient_extend_ear_follow_up");
  51 + noUses.add("baby_patient_extend_ear_hearing_diagnose");
  52 + noUses.add("baby_patient_extend_ear_mother");
  53 + noUses.add("baby_patient_extend_ear_screen");
  54 + noUses.add("children_father");
  55 + noUses.add("children_person");
  56 + noUses.add("children_record");
  57 + noUses.add("coupon_hospial_area");
53 58 noUses.add("coupon_info");
54 59 noUses.add("coupon_template");
55 60 noUses.add("coupon_template_group");
56 61 noUses.add("coupon_type");
  62 + noUses.add("diagnose_conf");
  63 + noUses.add("diagnose_maps");
  64 + noUses.add("diagnose_source");
  65 + noUses.add("diagnose_version");
  66 + noUses.add("highrisk_change_hospital");
57 67 noUses.add("hospital_coupon_template_group");
58 68 noUses.add("lis_report_tbl");
  69 + noUses.add("permissions");
  70 + noUses.add("permissions2");
  71 + noUses.add("platform_dictionary");
  72 + noUses.add("regions");
59 73 noUses.add("ris_report_tbl");
60   -
  74 + noUses.add("role_permission_maps");
  75 + noUses.add("user_organization_maps");
  76 + noUses.add("user_role_maps");
61 77 }
62 78  
63 79 private String sql;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 896dce4
... ... @@ -174,7 +174,7 @@
174 174 Iterator<Map<String, Object>> iterator = grid.iterator();
175 175 while (iterator.hasNext()) {
176 176 Map<String, Object> map = iterator.next();
177   - List<String> colors = new ArrayList<>();
  177 + Set<String> colors = new HashSet<>();
178 178 Object highRiskGrade = map.get("HIGH_RISK_GRADE");
179 179 if(highRiskGrade != null && StringUtils.isNotBlank(highRiskGrade.toString())) {
180 180 List<String> grades = Arrays.asList(highRiskGrade.toString().split(","));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java View file @ 896dce4
... ... @@ -51,7 +51,7 @@
51 51 request.setSql(Base64.encodeBase64String(sql.getBytes()));
52 52 request.setSqlId(sqlId);
53 53 syncSqlQueue.add(request);
54   - System.out.println("syncSqlQueue size = " + syncSqlQueue.size());
  54 + System.out.println("syncSqlQueue size = " + syncSqlQueue.size());
55 55 }
56 56  
57 57 /**
... ... @@ -77,7 +77,9 @@
77 77 SqlRequest request = null;
78 78 while (true) {
79 79 try {
80   - request = syncSqlQueue.poll();
  80 + Thread.sleep(3000);
  81 + request = syncSqlQueue.take();
  82 + System.out.println(request);
81 83 String json = JsonUtil.obj2Str(request);
82 84 if (CollectionUtils.isNotEmpty(urls))
83 85 {
platform-operate-api/src/main/resources/rebel.xml View file @ 896dce4
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<application generated-by="eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
  2 +<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
3 3  
4 4 <classpath>
5   - <dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/target/classes">
  5 + <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/target/classes">
6 6 </dir>
7 7 </classpath>
8 8  
9 9 <web>
10 10 <link target="/">
11   - <dir name="E:/Workspaces-lyms/regional-platform/platform-operate-api/src/main/webapp">
  11 + <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/src/main/webapp">
12 12 </dir>
13 13 </link>
14 14 </web>
platform-operate-api/src/main/webapp/WEB-INF/web.xml View file @ 896dce4
... ... @@ -87,6 +87,7 @@
87 87 <servlet-name>dispatcher</servlet-name>
88 88 <url-pattern>/</url-pattern>
89 89 </servlet-mapping>
  90 +
90 91 <filter>
91 92 <filter-name>perfFilter</filter-name>
92 93 <filter-class>com.lyms.platform.common.perf.SimpleHttpPerfFilter</filter-class>