zhaowenxuan
9 天以前 1f1410ec21358c69b678af86c561f435ad83ab9d
2025-06-24
3个文件已修改
5个文件已添加
170 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictCommonHisConfig.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/DictCommonHisConfigMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/DictCommonHisConfigService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/DictCommonHisConfigServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/DictCommonHisConfigMapper.xml 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -128,16 +128,17 @@
                    String bldh = water.getJxbz();
//                    lisRevoke(water.getTjNumber(),bldh);
                    if (bldh != null){
                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        remarkService.updateTjOrderRemarkSfbzByJxbz(order.getOrderId().toString(),bldh,null);
/*                        remarkService.deleteTjOrderDetailByjxbz(bldh);
                        tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                        tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                        transitionService.deleteTjOrderDetailByjxbz(bldh);
                        blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, order.getTjNumber()).eq(TjProBl::getBldh, bldh));
                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);
                        tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(order.getTjNumber(), order.getUserId(),bldh);*/
                    }else {
                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
                        customer.setCardId("0");
                        tjCustomerService.updateById(customer);
//                        TjCustomer customer = tjCustomerService.getById(order.getUserId());
//                        customer.setCardId("0");
//                        tjCustomerService.updateById(customer);
                       /* tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
                        tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
@@ -146,7 +147,8 @@
                        transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
                        ycxmService.delOrderYcXmJyByTjh(order.getTjNumber());
                        tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());*/
                        tjOrderService.removeById(order.getOrderId());
//                        tjOrderService.removeById(order.getOrderId());
                        remarkService.updateTjOrderRemarkSfbzByJxbzisnull(order.getOrderId().toString(),null);
                    }
                }
            }
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
@@ -8,8 +8,10 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.db.DataSourceConfig;
import com.ltkj.db.DataSourceContextHolder;
import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.ltkj.hosp.domain.DictHosp;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.DictCommonHisConfigService;
import com.ltkj.hosp.service.IDictHospService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -43,6 +45,10 @@
@Api(tags = "PC端 积木报表接口集")
@Slf4j
public class JimuController {
    @Autowired
    private DictCommonHisConfigService dictCommonHisConfigService;
//    @Value("${jimu.path}")
    private static  String value;
@@ -135,8 +141,9 @@
    @GetMapping("/getBingZhong")
    public String getBingZhongInfo(@RequestParam("start") String start, @RequestParam("end") String end,@RequestParam(required = true,value = "hospId") String hospId){
        try {
            dataSourceConfig.addDataSource(hospId);
            DataSourceContextHolder.setDataSourceKey(hospId);
            DictCommonHisConfig hisConfig = dictCommonHisConfigService.getOne(new LambdaQueryWrapper<DictCommonHisConfig>().eq(DictCommonHisConfig::getHospital, hospId));
            dataSourceConfig.addDataSource(hisConfig.getDbName());
            DataSourceContextHolder.setDataSourceKey(hisConfig.getDbName());
            JSONObject object = JSONUtil.createObj();
            object.putOpt("data",testMapper.getBingZhongInfo(start,end));
            return JSONUtil.toJsonStr(object);
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
@@ -52,7 +52,8 @@
                        "/system/role/execUpdateSql",
                        "/jmreport/**",
                        "/**/*.html", "/**/*.css", "/**/*.js","/swagger-ui.html",
                        "/swagger-resources/**", "/*/api-docs", "/webjars/**"
                        "/swagger-resources/**", "/*/api-docs", "/webjars/**",
                        "/report/jmreport/getBingZhong"
                });
        registry.addInterceptor(jimuInterceptor)
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/DictCommonHisConfig.java
New file
@@ -0,0 +1,53 @@
package com.ltkj.hosp.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import lombok.Data;
/**
 * @TableName dict_common_his_config
 */
@TableName(value ="dict_common_his_config")
@Data
public class DictCommonHisConfig implements Serializable {
    private Integer id;
    private String fullKey;
    private String province;
    private String region;
    private String city;
    private String hospital;
    private String tjUrl;
    private String hisApiUrl;
    private Integer hisApiPort;
    private String hisApiAppend;
    private String czy;
    private String czyId;
    private String kdks;
    private String dbIp;
    private Integer dbPort;
    private String dbName;
    private String dbUser;
    private String dbPassword;
    private static final long serialVersionUID = 1L;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/DictCommonHisConfigMapper.java
New file
@@ -0,0 +1,18 @@
package com.ltkj.hosp.mapper;
import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author w
* @description 针对表【dict_common_his_config(公共组件服务HIS请求管理)】的数据库操作Mapper
* @createDate 2025-06-24 10:18:32
* @Entity com.ltkj.hosp.domain.DictCommonHisConfig
*/
public interface DictCommonHisConfigMapper extends BaseMapper<DictCommonHisConfig> {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/DictCommonHisConfigService.java
New file
@@ -0,0 +1,13 @@
package com.ltkj.hosp.service;
import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author w
* @description 针对表【dict_common_his_config(公共组件服务HIS请求管理)】的数据库操作Service
* @createDate 2025-06-24 10:18:32
*/
public interface DictCommonHisConfigService extends IService<DictCommonHisConfig> {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/DictCommonHisConfigServiceImpl.java
New file
@@ -0,0 +1,22 @@
package com.ltkj.hosp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.DictCommonHisConfig;
import com.ltkj.hosp.service.DictCommonHisConfigService;
import com.ltkj.hosp.mapper.DictCommonHisConfigMapper;
import org.springframework.stereotype.Service;
/**
* @author w
* @description 针对表【dict_common_his_config(公共组件服务HIS请求管理)】的数据库操作Service实现
* @createDate 2025-06-24 10:18:32
*/
@Service
public class DictCommonHisConfigServiceImpl extends ServiceImpl<DictCommonHisConfigMapper, DictCommonHisConfig>
    implements DictCommonHisConfigService{
}
ltkj-hosp/src/main/resources/mapper/DictCommonHisConfigMapper.xml
New file
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.DictCommonHisConfigMapper">
    <resultMap id="BaseResultMap" type="com.ltkj.hosp.domain.DictCommonHisConfig">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <result property="fullKey" column="full_key" jdbcType="VARCHAR"/>
            <result property="province" column="province" jdbcType="VARCHAR"/>
            <result property="region" column="region" jdbcType="VARCHAR"/>
            <result property="city" column="city" jdbcType="VARCHAR"/>
            <result property="hospital" column="hospital" jdbcType="VARCHAR"/>
            <result property="tjUrl" column="tj_url" jdbcType="VARCHAR"/>
            <result property="hisApiUrl" column="his_api_url" jdbcType="VARCHAR"/>
            <result property="hisApiPort" column="his_api_port" jdbcType="SMALLINT"/>
            <result property="hisApiAppend" column="his_api_append" jdbcType="VARCHAR"/>
            <result property="czy" column="czy" jdbcType="VARCHAR"/>
            <result property="czyId" column="czy_id" jdbcType="VARCHAR"/>
            <result property="kdks" column="kdks" jdbcType="VARCHAR"/>
            <result property="dbIp" column="db_ip" jdbcType="VARCHAR"/>
            <result property="dbPort" column="db_port" jdbcType="SMALLINT"/>
            <result property="dbName" column="db_name" jdbcType="VARCHAR"/>
            <result property="dbUser" column="db_user" jdbcType="VARCHAR"/>
            <result property="dbPassword" column="db_password" jdbcType="VARCHAR"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,full_key,province,
        region,city,hospital,
        tj_url,his_api_url,his_api_port,
        his_api_append,czy,czy_id,
        kdks,db_ip,db_port,
        db_name,db_user,db_password
    </sql>
</mapper>