From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 05 六月 2025 12:36:47 +0800 Subject: [PATCH] zjh20250605 --- ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 183 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 156 insertions(+), 27 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java index 8fac456..3f4bde8 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java @@ -3,21 +3,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.ltkj.common.annotation.RepeatSubmit; import com.ltkj.common.core.controller.BaseController; import com.ltkj.common.core.domain.AjaxResult; import com.ltkj.common.core.redis.RedisCache; import com.ltkj.common.enums.DataSourceType; +import com.ltkj.framework.config.UserHoder; import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; -import com.ltkj.hosp.domain.TjCustomer; -import com.ltkj.hosp.domain.TjOrder; -import com.ltkj.hosp.domain.TjOrderRemark; +import com.ltkj.hosp.domain.*; import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.*; import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.system.service.ISysDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.checkerframework.checker.units.qual.A; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.ConvertingCursor; import org.springframework.data.redis.core.Cursor; @@ -27,12 +27,12 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log; import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save; @@ -44,13 +44,10 @@ public class TjSqlController extends BaseController { @Resource private TestMapper testMapper; - @Resource private TjvLtkjvtjpatService tjvLtkjvtjpatService; - @Resource private LtkjMiddleDetailService middleDetailService; - @Resource private LtkjMiddleHeadService headService; @Resource @@ -61,40 +58,52 @@ private LtkjHybgdService ltkjHybgdService; @Resource private LtkjHysqdService ltkjHysqdService; - @Autowired - public RedisTemplate<Object,Object> redisTemplate; @Resource private ITjCustomerService tjCustomerService; - @Resource - private RedisCache redisCache; - @Resource - private TjAsyncService asyncService; - @Resource - private ITjOrderRemarkService remarkService; @Resource private ITjOrderService orderService; @Resource private ISysDeptService deptService; + @Resource + private LtkjHisUserService hisUserService; + @Resource + private ITjProjectService tjProjectService; + @Autowired + private ITjOrderDetailService tjOrderDetailService; + @Resource + private ITjOrderRemarkService tjOrderRemarkService; + @Resource + private ITjProjectService projectService; + @GetMapping("/getTjHyBgList") @ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�") - public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode, - @RequestParam(required = false)String pacName, - @RequestParam(required = false)String pacRemark) { - List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark); - DynamicDataSourceContextHolder.clearDataSourceType(); - return AjaxResult.success(maps); + public AjaxResult getTjHyBgList(@RequestParam(defaultValue = "1")Integer page, + @RequestParam(defaultValue = "10")Integer pageSize, + @RequestParam(required = false)String pname, + @RequestParam(required = false)String pid, + @RequestParam(required = false)String pym, + @RequestParam(required = false)String checktype) { +// List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark); +// DynamicDataSourceContextHolder.clearDataSourceType(); + Map<String,Object> map= projectService.getTjHyBgList(page,pageSize,pname,pid,pym,checktype); + return AjaxResult.success(map); } @GetMapping("/newGetTjPat") - @ApiOperation(value = "鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛") + @ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛") public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode, @RequestParam(required = false)String pacName, @RequestParam(required = false)String pacRemark) { -// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName); List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark); DynamicDataSourceContextHolder.clearDataSourceType(); + List<String> strings = orderService.selectTjOrderByCardId1(); + if(null !=strings && strings.size()>0){ + List<Map<String, Object>> collect = maps.stream() + .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList()); + return AjaxResult.success(collect); + } return AjaxResult.success(maps); } @@ -333,5 +342,125 @@ } + @GetMapping("/getLtkjHisUser") + @ApiOperation(value = "鍚屾his鐢ㄦ埛") + public AjaxResult getLtkjHisUser() { + List<LtkjHisUser> list = testMapper.getLtkjHisUser(); + if(null !=list && list.size()>0){ + DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); + for (LtkjHisUser user : list) { + LtkjHisUser hisUser= hisUserService.getHisUserByHisGh(user.getHisgh()); + if(null == hisUser){ + hisUserService.save(user); + } + } + DynamicDataSourceContextHolder.clearDataSourceType(); + } + return AjaxResult.success(); + } + + + + + @GetMapping("/dataSynchronization") + @ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛") + @RepeatSubmit + public AjaxResult dataSynchronization(@RequestParam String tjNumber) { + //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12 +// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData"); +// if ("Y".equals(getInfoFromSqlData)) { + TjOrder order = orderService.getOrderByTjNum(tjNumber); + if (null != order) { + List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId()); + if (one != null && one.size() > 0) { + for (LtkjHysqd ltkjHysqd : one) { +// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); + LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh()); + if(hysqd==null){ + ltkjHysqdService.save(ltkjHysqd); + DynamicDataSourceContextHolder.clearDataSourceType(); + List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh()); + if (one1 != null && one1.size() > 0) { + DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); + ltkjHybgdService.saveBatch(one1); + DynamicDataSourceContextHolder.clearDataSourceType(); + } + } + } + } + +// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber); +// if (one2 != null && one2.size() > 0) { +// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); +// ltkjExamJcsqdService.saveBatch(one2); +// DynamicDataSourceContextHolder.clearDataSourceType(); +// for (LtkjExamJcsqd ltkjExamJcsqd : one2) { +// List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(ltkjExamJcsqd.getTmh()); +// if (one3 != null && one3.size() > 0) { +// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name()); +// ltkjExamJcbgdService.saveBatch(one3); +// DynamicDataSourceContextHolder.clearDataSourceType(); +// } +// } +// } + //鍚屾鍖栭獙椤圭洰 + testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(), "1"); + //鍚屾妫�鏌ラ」鐩� +// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1"); + } +// } + return AjaxResult.success("鍚屾鎴愬姛"); + } + + + + @GetMapping("/getTjYxjcList") + @ApiOperation(value = "鏌ヨ褰卞搷妫�鏌ラ」鐩�") + public AjaxResult getTjYxjcList() { + List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("鏉ㄤ簯浜�",null,null); + return AjaxResult.success(tjYxjcList); + } + + + + @GetMapping("/getPacTjProjectList") + @ApiOperation(value = "缁存姢濂楅椤甸潰鏂板椤圭洰鏃惰皟鐢�") + public AjaxResult getPacTjProjectList() { +// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>(); +// wq.eq(TjProject::getProParentId, 0); +// wq.eq(TjProject::getProStatus, 0); + List<TjProject> tjProjects = tjProjectService.getPacTjProjectList(); +// if (tjProjects != null) { +// for (TjProject project : tjProjects) { +// List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId())); +// project.setTjProjectList(projectList); +// } +// return AjaxResult.success(tjProjects); +// } + return AjaxResult.success(tjProjects); + } + + + @GetMapping("/getHuaYanProByTjNum") + @ApiOperation(value = "鏍规嵁浣撴鍙锋煡璇㈠寲楠岄」鐩帴鍙�") + public AjaxResult getHuaYanProByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) { + Map<String,Object> map=new HashMap<>(); + + List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber); + List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber); + map.put("tjOrderDetails",tjOrderDetails); + map.put("tjOrderRemarks",tjOrderRemarks); + return AjaxResult.success(map); + } + + + @GetMapping("/getWsxmLtkjHysqdByLisViBySLAVEWS") + @ApiOperation(value = "鏌ヨ澶栭�侀」鐩甋qlServer鎺ュ彛") + public AjaxResult getWsxmLtkjHysqdByLisViBySLAVEWS(@RequestParam String s) { +// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisViBySLAVEWS(s); +// log.info(wsbg.toString()); + return AjaxResult.success(testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s)); + } + } -- Gitblit v1.8.0