Skip to content

Y
YX_IDENT_REFACTORING
Commit 4749c5fa authored by Administrator's avatar Administrator
Browse files
Options

添加查询主线API

parent 59271442
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 30 deletions
src/main/java/com/yxproject/start/Main.java
View file @ 4749c5fa
package com.yxproject.start; package com.yxproject.start;
//import com.yxproject.start.config.JerseyConfig; //import com.yxproject.start.config.JerseyConfig;
import org.glassfish.jersey.servlet.ServletContainer;
import org.glassfish.jersey.servlet.ServletProperties;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Bean;
/** /**
* @author Administrator * @author Administrator
......
src/main/resources/application.properties
View file @ 4749c5fa
...@@ -4,20 +4,56 @@ mybatis.type-aliases-package=com.yx_project.start.entity ...@@ -4,20 +4,56 @@ mybatis.type-aliases-package=com.yx_project.start.entity
mybatis.mapper-locations = classpath:mapper/*Mapper.xml mybatis.mapper-locations = classpath:mapper/*Mapper.xml
mybatis.config-location = classpath:mapper/config/mybatis-config.xml mybatis.config-location = classpath:mapper/config/mybatis-config.xml
#配置调度生产库数据库
#配置数据库
spring.datasource.driver-class-name= oracle.jdbc.driver.OracleDriver spring.datasource.driver-class-name= oracle.jdbc.driver.OracleDriver
spring.datasource.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX spring.datasource.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX
spring.datasource.username = dahai spring.datasource.username = dahai
spring.datasource.password = dahai spring.datasource.password = dahai
##配置调度生产库数据库
#spring.01.datasource.driver-class-name= oracle.jdbc.driver.OracleDriver
#spring.01.datasource.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX
#spring.01.datasource.username = dahai
#spring.01.datasource.password = dahai
#
##配置受理库数据库
#spring.02.datasource.driver-class-name= oracle.jdbc.driver.OracleDriver
#spring.02.datasource.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX
#spring.02.datasource.username = dahai
#spring.02.datasource.password = dahai
#
##配置制证库数据库
#spring.03.datasource.driver-class-name= oracle.jdbc.driver.OracleDriver
#spring.03.datasource.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX
#spring.03.datasource.username = dahai
#spring.03.datasource.password = dahai
#自动根据实体类生成数据库表 #自动根据实体类生成数据库表
spring.jpa.hibernate.ddl-auto= update #spring.jpa.hibernate.ddl-auto= update
spring.jpa.show-sql=true spring.jpa.show-sql=true
##jsp 支持
#spring.mvc.view.suffix=.jsp
#spring.mvc.view.prefix=/WEB-INF/jsp/
# thymeleaf # thymeleaf
spring.thymeleaf.prefix=classpath:/templates/ spring.thymeleaf.prefix=classpath:/templates/
spring.thymeleaf.suffix=.html spring.thymeleaf.suffix=.html
spring.thymeleaf.mode=HTML spring.thymeleaf.mode=HTML
spring.thymeleaf.encoding=UTF-8 spring.thymeleaf.encoding=UTF-8
#the first datasource
jdbc.driverClassName = oracle.jdbc.driver.OracleDriver
jdbc.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX
jdbc.username = dahai
jdbc.password = dahai
#the second datasource
jdbc2.driverClassName = oracle.jdbc.driver.OracleDriver
jdbc2.url = jdbc:oracle:thin:@192.168.10.208:1521:GTYX
jdbc2.username = dahai
jdbc2.password = dahai
src/main/resources/mapper/ProductionTaskListMapper.xml 0 → 100644
View file @ 4749c5fa
<?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.yxproject.start.mapper.ProductionTaskListMapper">
<resultMap id="ProductionTaskListMap" type="com.yxproject.start.entity.ProductionTaskListEntity">
<id column="PRODUCTION_TASK_LIST_ID" property="productionTaskListId" />
<result column="MAKE_TYPE" property="makeType"/>
<result column="OLD_MAKE_TYPE" property="oldMakeType"/>
<result column="WORKSHOP" property="workshop"/>
<result column="SUBMIT_DATE" property="submitDate"/>
<result column="HANDOUT_DATE" property="handoutDate"/>
<result column="IS_PRINT" property="isPrint"/>
<result column="DOWNLOAD_DATE" property="downloadDate"/>
<result column="PRINT_OUT" property="printOut"/>
<result column="PERMANENT_POSITION_DATE" property="permanentPositionDate"/>
<result column="ROLL_OUT_WORKSHOP_DATE" property="rollOutWorkshopDate"/>
<result column="QUALITYINSPECTION_NAME" property="qualityinspectionName"/>
<result column="QUALITYINSPECTION_DATE" property="qualityinspectionDate"/>
<result column="EXCEPTION_INFORMATION" property="exceptionInformation"/>
<result column="OUTBOUND_DATE" property="outboundDate"/>
<result column="PUTINSTORAGE_DATE" property="putinstorageDate"/>
</resultMap>
<select id="findProductionTaskListEntity" resultType="com.yxproject.start.entity.ProductionTaskListEntity" parameterType="String">
select * from PRODUCTION_TASK_LIST where PRODUCTION_TASK_LIST_ID=#{username}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/SysPermissionMapper.xml
View file @ 4749c5fa
...@@ -13,6 +13,6 @@ ...@@ -13,6 +13,6 @@
</resultMap> </resultMap>
<insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission"> <insert id="addPermissionByMap" parameterType="com.yxproject.start.entity.SysPermission">
Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url}) Insert into DAHAI.SYS_PERMISSION (ID,AVAILABLE,NAME,PARENT_ID,PARENT_IDS,PERMISSION,RESOURCE_TYPE,URL) values (PERMISSION_seq.nextval,0,#{name},#{parentId},#{parentIds},#{permission},#{resourceType},#{url})
</insert> </insert>
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/SystemUserMapper.xml
View file @ 4749c5fa
<?xml version="1.0" encoding="UTF-8" ?> <?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" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yxproject.start.mapper.UserInfoMapper"> <mapper namespace="com.yxproject.start.mapper.UserInfoMapper">
<!--&lt;!&ndash;用户&ndash;&gt;--> <!--用户-->
<!--<resultMap id="UserRoleMenuMap" type="com.yxproject.start.entity.UserInfo">--> <resultMap id="UserRoleMenuMap" type="com.yxproject.start.entity.UserInfo">
<!--<id property="uid" column="uid"/>--> <id property="uid" column="uid"/>
<!--<result column="username" property="username"/>--> <result column="username" property="username"/>
<!--<result column="password" property="password"/>--> <result column="password" property="password"/>
<!--<result column="state" property="state"/>--> <result column="state" property="state"/>
<!--<result column="name" property="name"/>--> <result column="name" property="name"/>
<!--&lt;!&ndash;角色集合&ndash;&gt;--> <!--角色集合-->
<!--<collection property="roleList" ofType="com.yxproject.start.entity.SysRole">--> <collection property="roleList" ofType="com.yxproject.start.entity.SysRole">
<!--<id column="id" property="rid" />--> <id column="id" property="rid" />
<!--<result column="description" property="description"/>--> <result column="description" property="description"/>
<!--<result column="role" property="role"/>--> <result column="role" property="role"/>
<!--&lt;!&ndash;权限集合&ndash;&gt;--> <!--权限集合-->
<!--<collection property="permissions" ofType="com.yxproject.start.entity.SysPermission">--> <collection property="permissions" ofType="com.yxproject.start.entity.SysPermission">
<!--<id column="id" property="pid" />--> <id column="id" property="pid" />
<!--<result column="name" property="pname"/>--> <result column="name" property="pname"/>
<!--<result column="url" property="url"/>--> <result column="url" property="url"/>
<!--</collection>--> </collection>
<!--</collection>--> </collection>
<!--</resultMap>--> </resultMap>
<!--<select id="findUserByUsername" resultMap="UserRoleMenuMap" parameterType="string">--> <!--<select id="findUserByUsername" resultMap="UserRoleMenuMap" parameterType="string">-->
<!--select user_info.uid,user_info.username,user_info.password,user_info.name,sys_role.id as rid,sys_role.role,sys_role.description,--> <!--select user_info.uid,user_info.username,user_info.password,user_info.name,sys_role.id as rid,sys_role.role,sys_role.description,-->
<!--sys_permission.id as pid,sys_permission.name as pname,sys_permission.url--> <!--sys_permission.id as pid,sys_permission.name as pname,sys_permission.url-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment