Merge branch 'medicare' of liubing/wlyy2.0 into medicare

gateway/ag-basic/pom.xml

@@ -137,20 +137,103 @@
        </dependency>
    </dependencies>
<!--    <build>-->
<!--        <finalName>ag-basic</finalName>-->
<!--        <plugins>-->
<!--            <plugin>-->
<!--                <groupId>org.springframework.boot</groupId>-->
<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
<!--            </plugin>-->
<!--            <plugin>-->
<!--                <artifactId>maven-war-plugin</artifactId>-->
<!--                <configuration>-->
<!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
<!--                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>-->
<!--                </configuration>-->
<!--            </plugin>-->
<!--        </plugins>-->
<!--    </build>-->
    <build>
        <finalName>ag-basic</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <archive>
                        <!-- 生成的jar中，不要包含pom.xml和pom.properties这两个文件 -->
                        <addMavenDescriptor>false</addMavenDescriptor>
                        <manifest>
                            <!-- 是否要把第三方jar加入到类构建路径 -->
                            <addClasspath>true</addClasspath>
                            <!-- 外部依赖jar包的最终位置 -->
                            <classpathPrefix>lib/</classpathPrefix>
                            <mainClass>com.yihu.AgBasicServer</mainClass>
                        </manifest>
                    </archive>
                </configuration>
            </plugin>
            <!--拷贝依赖到jar外面的lib目录-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-dependency-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-lib</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                        <configuration>
                            <!-- 依赖包输出目录，将来不打进jar包里 -->
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <excludeTransitive>false</excludeTransitive>
                            <stripVersion>false</stripVersion>
                            <includeScope>runtime</includeScope>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <!--指定配置文件，将resources打成外部resource-->
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
                    <archive>
                        <!-- 指定配置文件目录，这样jar运行时会去找到同目录下的resources文件夹下查找 -->
                        <manifestEntries>
                            <Class-Path>resources/</Class-Path>
                        </manifestEntries>
                    </archive>
                    <!-- 打包时忽略的文件（也就是不打进jar包里的文件） -->
                    <excludes>
                        <exclude>**/*.yml</exclude>
                        <exclude>**/*.xml</exclude>
                    </excludes>
                </configuration>
            </plugin>
            <!-- 拷贝资源文件 外面的resource目录-->
            <plugin>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-dependencies</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-resources</goal>
                        </goals>
                        <configuration>
                            <!-- 资源文件输出目录 -->
                            <outputDirectory>${project.build.directory}/resources</outputDirectory>
                            <resources>
                                <resource>
                                    <directory>src/main/resources</directory>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>
</project>

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/YlzService.java

@@ -2,6 +2,7 @@ package com.yihu.jw.base.service.a3service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.util.AesEncryptUtils;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.wlyy.wlyyhttp.WlyyHttpService;
@@ -37,7 +38,7 @@ public class YlzService {
    @Value("${spring.profiles}")
    private String springProfiles;
    private final String entranceUrl="http://10.90.32.3:22174/cityihealth/base/";
    private final String entranceUrl="https://zb.xmtyw.cn/medicine/cityihealth/base";
    /**
     *药柜预缴金充值--易慧
@@ -137,23 +138,36 @@ public class YlzService {
            String url = "http://"+deviceIp+":9000/api/Mi";
            String result =  httpClientUtil.get(url,params,"UTF-8");
            WlyyHttpLogDO logDO = new WlyyHttpLogDO();
            logDO.setCode(apiStr);
            logDO.setName("药柜医保接口");
            logDO.setRequest(url+JSONObject.toJSONString(params));
            logDO.setResponse(result);
            httpLogDao.save(logDO);
            return result;
        }else {
            List<NameValuePair> params = new ArrayList<>();
            params.add(new BasicNameValuePair("apiStr", apiStr));
            params.add(new BasicNameValuePair("orgCode",orgCode));
            params.add(new BasicNameValuePair("apiStr", dataInfo));
            String url = entranceUrl+"/common/test/open/deviceYBApi";
            String resultStr =  httpClientUtil.get(url,params,"UTF-8");
//           String resultStr="{\"message\":\"success\",\"status\":200,\"obj\":\"\\\"{\\\\\\\"func\\\\\\\":\\\\\\\"fsi.terminal.readcard\\\\\\\",\\\\\\\"retCode\\\\\\\":\\\\\\\"-4\\\\\\\",\\\\\\\"retMsg\\\\\\\":\\\\\\\"服务器连接失败。\\\\\\\"}\\\"\"}";
            JSONObject resultObj = JSONObject.parseObject(resultStr);
            if (200==resultObj.getInteger("status")){
                return resultObj.getString("obj");
            Map map = new HashMap<String, String>();
            map.put("apiStr", apiStr);
            map.put("orgCode", orgCode);
            map.put("dataInfo",dataInfo);
            String content = com.alibaba.fastjson.JSONObject.toJSONString(map);
            String params = AesEncryptUtils.agEncrypt(content);
            String resultStr =  httpClientUtil.getBodyRawForm(url,params);
            JSONObject resultObject = com.alibaba.fastjson.JSONObject.parseObject(resultStr);
            if (resultObject.get("status").equals("200")) {
                JSONObject jsonObjectData = JSONObject.parseObject(AesEncryptUtils.agDecrypt(resultObject.get("data").toString()));
                logger.info(jsonObjectData.toJSONString());
//                String resultStr="{\"message\":\"success\",\"status\":200,\"obj\":\"\\\"{\\\\\\\"func\\\\\\\":\\\\\\\"fsi.terminal.readcard\\\\\\\",\\\\\\\"retCode\\\\\\\":\\\\\\\"-4\\\\\\\",\\\\\\\"retMsg\\\\\\\":\\\\\\\"服务器连接失败。\\\\\\\"}\\\"\"}";
                if (200==jsonObjectData.getInteger("status")){
                    return jsonObjectData.getString("obj");
                }else {
                    throw new Exception(jsonObjectData.getString("message"));
                }
            }else {
                return resultObj.getString("message");
                throw new Exception("请求失败");
            }
        }
    }
}