From 5c58a8a9fa43c671af54358172f853f02c4acfc7 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期四, 16 一月 2025 21:18:36 +0800 Subject: [PATCH] zjh20250116 --- ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 38 ++++++++ ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java | 19 ++++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java | 27 ++++++ ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjJcycxm.java | 22 +++++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java | 5 + ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 50 ++++++++++++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java | 17 ++++ ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 9 ++ ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java | 2 9 files changed, 184 insertions(+), 5 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java index 59a0f39..f337c90 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java @@ -1,6 +1,7 @@ package com.ltkj.web.config.timer; import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; +import com.ltkj.hosp.domain.TjJcycxm; import com.ltkj.hosp.mapper.TestMapper; import com.ltkj.hosp.service.*; import com.ltkj.hosp.sqlDomain.LtkjExamJcbgd; @@ -8,6 +9,7 @@ import com.ltkj.hosp.sqlDomain.LtkjHybgd; import com.ltkj.hosp.sqlDomain.LtkjHysqd; import com.ltkj.system.service.ISysConfigService; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; @@ -35,7 +37,7 @@ */ @Slf4j @Component -@Profile("!dev") +//@Profile("!dev") public class DefaultScheduled { @@ -55,6 +57,8 @@ private TestMapper testMapper; @Resource private TjAsyncService asyncService; + @Autowired + private TjJcycxmService jcycxmService; private final ReentrantLock reentrantLock = new ReentrantLock(); @@ -84,6 +88,7 @@ private void exec() { String dsqkssj = configService.selectConfigByKey("dsqkssj"); String dsqjssj = configService.selectConfigByKey("dsqjssj"); + String yqbm = configService.selectConfigByKey("common_api_service_hospbm"); boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj); log.info("褰撳墠鏃堕棿鏄惁鍦� " + dsqkssj + " 鐐瑰埌 " + dsqjssj + " 鐐逛箣闂�: " + panduandangqianshijian); String dsrwsjjg = configService.selectConfigByKey("dsrwsjjg"); @@ -103,7 +108,6 @@ if (null != jy && !jy.isEmpty()) { log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size()); for (String s : jy) { -// TjOrder order = orderService.getOrderByTjNum(s); extractedjianyan(s); } } @@ -112,7 +116,6 @@ if (null != jc && !jc.isEmpty()) { log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size()); for (String s : jc) { -// TjOrder order = orderService.getOrderByTjNum(s); extractedjiancha(s); } } @@ -121,6 +124,35 @@ Integer object = (Integer) map.get("total"); log.info("鎵ц瀛樺偍杩囩▼鍚庡嚭鍙�->{}", object); if (null != object && object.equals(1)) { + if (null != jc && !jc.isEmpty()) { + for (String s : jc) { + jcycxmService.deletedByTjh(s); + List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s); + if(null !=list && !list.isEmpty()){ + for (LtkjExamJcsqd jcsqd : list) { + if(jcsqd.getJgbx().contains("銆�")){ + String[] split = jcsqd.getJgbx().split("銆�"); + for (String jg : split) { + if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父") + && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈鏄庢樉")){ + TjJcycxm jcycxm=new TjJcycxm(); + jcycxm.setTjh(s); + jcycxm.setYqid(yqbm); + String[] split1 = jcsqd.getJcxmid().split(";"); + jcycxm.setProId(split1[0]); + jcycxm.setProName(jcsqd.getJcxmmc()); + jcycxm.setCreateTime(new Date()); + jcycxm.setJcjg(jg); + jcycxmService.save(jcycxm); + } + } + } + } + } + + } + } + long end = System.currentTimeMillis(); log.info("鍚屾缁撴潫 鑰楁椂锛歿}绉�", (end - start) / 1000); // 鍔ㄦ�佽幏鍙栦笅娆′换鍔$殑闂撮殧 diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java index f553595..a1d2c5b 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java @@ -12,12 +12,14 @@ import com.ltkj.common.core.domain.entity.SysMenu; import com.ltkj.common.utils.SecurityUtils; import com.ltkj.hosp.domain.DictHosp; +import com.ltkj.hosp.domain.TjJcycxm; import com.ltkj.hosp.domain.TjProject; -import com.ltkj.hosp.service.IDictHospService; -import com.ltkj.hosp.service.ITjProjectService; +import com.ltkj.hosp.service.*; +import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd; import com.ltkj.system.service.ISysMenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jodd.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; @@ -52,6 +54,12 @@ private String secret; @Autowired private ITjProjectService projectService; + @Resource + private ITjOrderService orderService; + @Autowired + private TjJcycxmService jcycxmService; + @Resource + private LtkjExamJcsqdService jcsqdService; /** * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃 @@ -210,4 +218,42 @@ return AjaxResult.success(); } + + + @GetMapping ("/tjjcycxm")//鍚屾his椤圭洰鍗曚环淇℃伅 +// @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')") + @ApiOperation (value = "tjjcycxm") + public AjaxResult tjjcycxm() { + String yqbm = configService.selectConfigByKey("common_api_service_hospbm"); + List<String> jc = orderService.getJianChaTjNum(); + if (null != jc && !jc.isEmpty()) { + for (String s : jc) { + jcycxmService.deletedByTjh(s); + List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(s); + if(null !=list && !list.isEmpty()){ + for (LtkjExamJcsqd jcsqd : list) { + if(jcsqd.getJgbx().contains("銆�")){ + String[] split = jcsqd.getJgbx().split("銆�"); + for (String jg : split) { + if(StringUtil.isNotBlank(jg) && !jg.contains("鏈寮傚父") + && !jg.contains("鏈鏄庢樉寮傚父") && !jg.contains("鏈鍗犱綅") && !jg.contains("鏈鏄庢樉")){ + TjJcycxm jcycxm=new TjJcycxm(); + jcycxm.setTjh(s); + jcycxm.setYqid(yqbm); + String[] split1 = jcsqd.getJcxmid().split(";"); + jcycxm.setProId(split1[0]); + jcycxm.setProName(jcsqd.getJcxmmc()); + jcycxm.setCreateTime(new Date()); + jcycxm.setJcjg(jg); + jcycxmService.save(jcycxm); + } + } + } + } + } + + } + } + return AjaxResult.success(); + } } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjJcycxm.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjJcycxm.java new file mode 100644 index 0000000..f88de61 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjJcycxm.java @@ -0,0 +1,22 @@ +package com.ltkj.hosp.domain; + +import com.ltkj.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * ClassName: TjJcycxm <br/> + * Description: <br/> + * date: 2025/1/16 17:29<br/> + * + * @author zjh<br /> + */ +@Data +public class TjJcycxm extends BaseEntity { + + private String id; + private String tjh; + private String proId; + private String proName; + private String yqid; + private String jcjg; +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java new file mode 100644 index 0000000..9af65e3 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjJcycxmMapper.java @@ -0,0 +1,19 @@ +package com.ltkj.hosp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ltkj.hosp.domain.TjJcycxm; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; + +/** + * ClassName: TjJcycxmMapper <br/> + * Description: <br/> + * date: 2025/1/16 18:21<br/> + * + * @author zjh<br /> + */ +@Mapper +public interface TjJcycxmMapper extends BaseMapper<TjJcycxm> { + @Delete("DELETE FROM tj_jcycxm WHERE tjh=#{s}") + void deletedByTjh(String s); +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java index 14b4e13..51dcd8e 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java @@ -331,4 +331,13 @@ List<List<?>> getTjBgdyList(Map<String, Object> map); + @Select(" SELECT\n" + + " DISTINCT a.tj_number \n" + + "FROM\n" + + " tj_order_remark a\n" + + " JOIN sys_dept b ON b.dept_id = a.dept_id \n" + + "WHERE\n" + + " a.deleted = 0 \n" + + " AND b.org_type = 2 \n") + List<String> getJianChaTjNum(); } diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java index b01ba1e..817fe9e 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderService.java @@ -181,6 +181,8 @@ List<String> getDingShiTongBuJianChaTjNum(); + List<String> getJianChaTjNum(); + void tjQiandaodengji(String tjNum); void tjLispacstongbujianyi(String tjNumber, Long deptId,String nickName, Long userId); diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java new file mode 100644 index 0000000..d692c43 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjJcycxmService.java @@ -0,0 +1,17 @@ +package com.ltkj.hosp.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ltkj.hosp.domain.TjJcycxm; + +/** + * ClassName: TjJcycxmService <br/> + * Description: <br/> + * date: 2025/1/16 18:21<br/> + * + * @author zjh<br /> + */ + + +public interface TjJcycxmService extends IService<TjJcycxm> { + void deletedByTjh(String s); +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java new file mode 100644 index 0000000..7782c12 --- /dev/null +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjJcycxmServiceImpl.java @@ -0,0 +1,27 @@ +package com.ltkj.hosp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ltkj.hosp.domain.TjJcycxm; +import com.ltkj.hosp.mapper.TjJcycxmMapper; +import com.ltkj.hosp.service.TjJcycxmService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * ClassName: TjJcycxmServiceImpl <br/> + * Description: <br/> + * date: 2025/1/16 18:22<br/> + * + * @author zjh<br /> + */ +@Service +public class TjJcycxmServiceImpl extends ServiceImpl<TjJcycxmMapper, TjJcycxm> implements TjJcycxmService { + @Resource + private TjJcycxmMapper mapper; + + @Override + public void deletedByTjh(String s) { + mapper.deletedByTjh(s); + } +} diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java index 5b7cc1b..349778c 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java @@ -405,6 +405,11 @@ } @Override + public List<String> getJianChaTjNum() { + return tjOrderMapper.getJianChaTjNum(); + } + + @Override public void tjQiandaodengji(String tjNum) { Map<String, Object> map = new HashMap<>(); map.put("tjNum",tjNum); -- Gitblit v1.8.0