Parcourir la source

两票基础数据配置

chenminghua il y a 4 ans
Parent
commit
032f2261c7
27 fichiers modifiés avec 1890 ajouts et 52 suppressions
  1. 46 25
      pom.xml
  2. 199 0
      src/main/java/com/gyee/MpGenerator.java
  3. 57 20
      src/main/java/com/gyee/frame/common/conf/MybatisConfig.java
  4. 2 1
      src/main/java/com/gyee/frame/common/dataSources/DataSourceType.java
  5. 7 0
      src/main/java/com/gyee/frame/common/domain/AjaxResult.java
  6. 43 0
      src/main/java/com/gyee/frame/common/ticket/TicketUtil.java
  7. 51 0
      src/main/java/com/gyee/frame/controller/ticket/WfassignmentController.java
  8. 21 0
      src/main/java/com/gyee/frame/controller/ticket/WobugeqController.java
  9. 71 0
      src/main/java/com/gyee/frame/controller/ticket/WorkticketController.java
  10. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WfassignmentMapper.java
  11. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WobugeqMapper.java
  12. 16 0
      src/main/java/com/gyee/frame/mapper/ticket/WorkticketMapper.java
  13. 104 0
      src/main/java/com/gyee/frame/model/ticket/Wfassignment.java
  14. 230 0
      src/main/java/com/gyee/frame/model/ticket/Wobugeq.java
  15. 527 0
      src/main/java/com/gyee/frame/model/ticket/Workticket.java
  16. 1 1
      src/main/java/com/gyee/frame/service/SysUserService.java
  17. 37 0
      src/main/java/com/gyee/frame/service/impl/ticket/WfassignmentServiceImpl.java
  18. 25 0
      src/main/java/com/gyee/frame/service/impl/ticket/WobugeqServiceImpl.java
  19. 38 0
      src/main/java/com/gyee/frame/service/impl/ticket/WorkticketServiceImpl.java
  20. 26 0
      src/main/java/com/gyee/frame/service/ticket/WfassignmentService.java
  21. 23 0
      src/main/java/com/gyee/frame/service/ticket/WobugeqService.java
  22. 26 0
      src/main/java/com/gyee/frame/service/ticket/WorkticketService.java
  23. 11 5
      src/main/resources/application-dev.yml
  24. BIN
      src/main/resources/lib/sqljdbc42.jar
  25. 37 0
      src/main/resources/mybatis/ticket/WfassignmentMapper.xml
  26. 79 0
      src/main/resources/mybatis/ticket/WobugeqMapper.xml
  27. 181 0
      src/main/resources/mybatis/ticket/WorkticketMapper.xml

+ 46 - 25
pom.xml

@@ -33,11 +33,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<!-- SpringBoot集成mybatis框架 -->
-		<dependency>
-			<groupId>org.mybatis.spring.boot</groupId>
-			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>1.3.2</version>
-		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>org.mybatis.spring.boot</groupId>-->
+			<!--<artifactId>mybatis-spring-boot-starter</artifactId>-->
+			<!--<version>1.3.2</version>-->
+		<!--</dependency>-->
 
 		<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
 		<dependency>
@@ -273,6 +273,27 @@
 			<artifactId>jedis</artifactId>
 			<version>2.9.0</version>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-core</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<!--代码生成器-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-generator</artifactId>
+			<version>3.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-extension</artifactId>
+			<version>3.3.2</version>
+		</dependency>
 	</dependencies>
 
 
@@ -332,26 +353,26 @@
 				</configuration>
 			</plugin>
 			<!-- generator 配置-->
-			<plugin>
-				<groupId>org.mybatis.generator</groupId>
-				<artifactId>mybatis-generator-maven-plugin</artifactId>
-				<version>1.3.7</version>
-				<configuration>
-					<!--允许移动生成的文件 -->
-					<verbose>false</verbose>
-					<!--允许覆盖生成的文件 -->
-					<overwrite>false</overwrite>
-					<!--配置文件的路径 -->
-					<configurationFile>src/main/resources/mybatis-generator.xml</configurationFile>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>com.oracle</groupId>
-						<artifactId>ojdbc6</artifactId>
-						<version>11.2.0.3</version>
-					</dependency>
-				</dependencies>
-			</plugin>
+			<!--<plugin>-->
+				<!--<groupId>org.mybatis.generator</groupId>-->
+				<!--<artifactId>mybatis-generator-maven-plugin</artifactId>-->
+				<!--<version>1.3.7</version>-->
+				<!--<configuration>-->
+					<!--&lt;!&ndash;允许移动生成的文件 &ndash;&gt;-->
+					<!--<verbose>false</verbose>-->
+					<!--&lt;!&ndash;允许覆盖生成的文件 &ndash;&gt;-->
+					<!--<overwrite>false</overwrite>-->
+					<!--&lt;!&ndash;配置文件的路径 &ndash;&gt;-->
+					<!--<configurationFile>src/main/resources/mybatis-generator.xml</configurationFile>-->
+				<!--</configuration>-->
+				<!--<dependencies>-->
+					<!--<dependency>-->
+						<!--<groupId>com.oracle</groupId>-->
+						<!--<artifactId>ojdbc6</artifactId>-->
+						<!--<version>11.2.0.3</version>-->
+					<!--</dependency>-->
+				<!--</dependencies>-->
+			<!--</plugin>-->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>

+ 199 - 0
src/main/java/com/gyee/MpGenerator.java

@@ -0,0 +1,199 @@
+package com.gyee;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
+import com.baomidou.mybatisplus.generator.config.converts.SqlServerTypeConvert;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成器
+ */
+public class MpGenerator {
+
+    //项目路径
+    private static String canonicalPath = "";
+
+    //基本包名
+    private static String basePackage = "com.gyee.frame";
+    //作者
+    private static String authorName = "chenmh";
+    //要生成的表名
+    private static String[] tables = {"WFASSIGNMENT","WOBUGEQ"};
+    //table前缀
+    private static String prefix = "";
+
+    //数据库类型
+    private static DbType dbType = DbType.SQL_SERVER;
+    //数据库配置四要素
+    private static String driverName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+    private static String url = "jdbc:sqlserver://10.155.32.2:1433;DatabaseName=test";
+//    private static String driverName = "com.mysql.jdbc.Driver";
+//    private static String url = "jdbc:mysql://localhost:3306/assemb?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false";
+    private static String username = "sa";
+    private static String password = "ibs";
+
+    public static void main(String[] args) {
+        AutoGenerator gen = new AutoGenerator();
+
+        /**
+         * 获取项目路径
+         */
+        try {
+            canonicalPath = new File("").getCanonicalPath();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        /**
+         * 数据库配置
+         */
+        gen.setDataSource(new DataSourceConfig()
+                .setDbType(dbType)
+                .setDriverName(driverName)
+                .setUrl(url)
+                .setUsername(username)
+                .setPassword(password)
+                .setTypeConvert(new SqlServerTypeConvert() {
+                    // 自定义数据库表字段类型转换【可选】
+                    //@Override
+                    //public DbColumnType processTypeConvert(String fieldType) {
+                    //System.out.println("转换类型:" + fieldType);
+                    // if ( fieldType.toLowerCase().contains( "tinyint" ) ) {
+                    //    return DbColumnType.BOOLEAN;
+                    // }
+                    //return super.processTypeConvert(fieldType);
+                    //}
+                }));
+
+        /**
+         * 全局配置
+         */
+        gen.setGlobalConfig(new GlobalConfig()
+                .setOutputDir( canonicalPath + "/src/main/java")//输出目录
+                .setFileOverride(true)// 是否覆盖文件
+                .setActiveRecord(true)// 开启 activeRecord 模式
+                .setEnableCache(false)// XML 二级缓存
+                .setBaseResultMap(true)// XML ResultMap
+                .setBaseColumnList(true)// XML columList
+                .setOpen(false)//生成后打开文件夹
+                .setAuthor(authorName)
+                // 自定义文件命名,注意 %s 会自动填充表实体属性!
+                .setMapperName("%sMapper")
+                .setXmlName("%sMapper")
+                .setServiceName("%sService")
+                .setServiceImplName("%sServiceImpl")
+                .setControllerName("%sController")
+        );
+
+        /**
+         * 策略配置
+         */
+        gen.setStrategy(new StrategyConfig()
+                        // .setCapitalMode(true)// 全局大写命名
+                        //.setDbColumnUnderline(true)//全局下划线命名
+                        .setTablePrefix(new String[]{prefix})// 此处可以修改为您的表前缀
+                        .setNaming(NamingStrategy.underline_to_camel)// 表名生成策略
+                        .setInclude(tables) // 需要生成的表
+                        .setRestControllerStyle(true)
+                        //.setExclude(new String[]{"test"}) // 排除生成的表
+                        // 自定义实体父类
+                        // .setSuperEntityClass("com.baomidou.demo.TestEntity")
+                        // 自定义实体,公共字段
+                        //.setSuperEntityColumns(new String[]{"test_id"})
+                        //.setTableFillList(tableFillList)
+                        // 自定义 mapper 父类 默认BaseMapper
+                        //.setSuperMapperClass("com.baomidou.mybatisplus.mapper.BaseMapper")
+                        // 自定义 service 父类 默认IService
+                        // .setSuperServiceClass("com.baomidou.demo.TestService")
+                        // 自定义 service 实现类父类 默认ServiceImpl
+                        // .setSuperServiceImplClass("com.baomidou.demo.TestServiceImpl")
+                        // 自定义 controller 父类
+                        //.setSuperControllerClass("com.kichun."+packageName+".controller.AbstractController")
+                        // 【实体】是否生成字段常量(默认 false)
+                        // public static final String ID = "test_id";
+                        // .setEntityColumnConstant(true)
+                        // 【实体】是否为构建者模型(默认 false)
+                        // public User setName(String name) {this.name = name; return this;}
+                        // .setEntityBuilderModel(true)
+                        // 【实体】是否为lombok模型(默认 false)<a href="https://projectlombok.org/">document</a>
+                        .setEntityLombokModel(true)
+                // Boolean类型字段是否移除is前缀处理
+                // .setEntityBooleanColumnRemoveIsPrefix(true)
+                // .setRestControllerStyle(true)
+                // .setControllerMappingHyphenStyle(true)
+        );
+
+        /**
+         * 包配置
+         */
+        gen.setPackageInfo(new PackageConfig()
+                //.setModuleName("User")
+                .setParent(basePackage)// 自定义包路径
+                .setController("controller.ticket")// 这里是控制器包名,默认 web
+                .setEntity("model.ticket") // 设置Entity包名,默认entity
+                .setMapper("mapper.ticket") // 设置Mapper包名,默认mapper
+                .setService("service.ticket") // 设置Service包名,默认service
+                .setServiceImpl("service.impl.ticket") // 设置Service Impl包名,默认service.impl
+//                .setXml("mapper") // 设置Mapper XML包名,默认mapper.xml
+        );
+
+        /**
+         * 注入自定义配置
+         */
+        // 注入自定义配置,可以在 VM 中使用 cfg.abc 设置的值
+        InjectionConfig abc = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("abc", this.getConfig().getGlobalConfig().getAuthor() + "-mp");
+                this.setMap(map);
+            }
+        };
+        //自定义文件输出位置(非必须)
+        List<FileOutConfig> fileOutList = new ArrayList<FileOutConfig>();
+        fileOutList.add(new FileOutConfig("/templates/mapper.xml.vm") {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                return canonicalPath + "/src/main/resources/mybatis/ticket/" + tableInfo.getEntityName() + "Mapper.xml";
+            }
+        });
+        abc.setFileOutConfigList(fileOutList);
+        gen.setCfg(abc);
+
+        /**
+         * 指定模板引擎 默认是VelocityTemplateEngine ,需要引入相关引擎依赖
+         */
+        //gen.setTemplateEngine(new FreemarkerTemplateEngine());
+
+        /**
+         * 模板配置
+         */
+        gen.setTemplate(
+                // 关闭默认 xml 生成,调整生成 至 根目录
+                new TemplateConfig().setXml(null)
+                // 自定义模板配置,模板可以参考源码 /mybatis-plus/src/main/resources/template 使用 copy
+                // 至您项目 src/main/resources/template 目录下,模板名称也可自定义如下配置:
+                // .setController("...");
+                // .setEntity("...");
+                // .setMapper("...");
+                // .setXml("...");
+                // .setService("...");
+                // .setServiceImpl("...");
+        );
+
+        // 执行生成
+        gen.execute();
+
+    }
+}

+ 57 - 20
src/main/java/com/gyee/frame/common/conf/MybatisConfig.java

@@ -1,12 +1,18 @@
 package com.gyee.frame.common.conf;
 
-import java.util.HashMap;
-import java.util.Map;
-import javax.sql.DataSource;
+
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.optimize.JsqlParserCountOptimize;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.dataSources.DynamicDataSource;
+import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,9 +21,11 @@ import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.gyee.frame.common.dataSources.DataSourceType;
-import com.gyee.frame.common.dataSources.DynamicDataSource;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * Mybatis多数据源配置
@@ -30,51 +38,80 @@ import com.gyee.frame.common.dataSources.DynamicDataSource;
 @MapperScan(basePackages = "com.gyee.frame.mapper")
 public class MybatisConfig {
 	
-	@Bean
+	@Bean(name = "master")
     @ConfigurationProperties("spring.datasource.druid.master")
     public DataSource masterDataSource()
     {
         return DruidDataSourceBuilder.create().build();
     }
 
-    @Bean
+    @Bean(name = "slave")
     @ConfigurationProperties("spring.datasource.druid.slave")
-    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
+//    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
     public DataSource slaveDataSource()
     {
         return DruidDataSourceBuilder.create().build();
     }
 
-    @Bean(name = "dynamicDataSource")
+    @Bean(name = "ticket")
+    @ConfigurationProperties("spring.datasource.druid.ticket")
+//    @ConditionalOnProperty(prefix = "spring.datasource.druid.ticket", name = "enabled", havingValue = "true")
+    public DataSource ticketDataSource()
+    {
+        return DruidDataSourceBuilder.create().build();
+    }
+
+    @Autowired
+    PaginationInterceptor paginationInterceptor;
+
+    @Bean
     @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource, DataSource slaveDataSource)
+    public DataSource dataSource(@Qualifier("master") DataSource masterDataSource,
+                                         @Qualifier("slave") DataSource slaveDataSource,
+                                         @Qualifier("ticket") DataSource ticketDataSource)
     {
         Map<Object, Object> targetDataSources = new HashMap<>();
         targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
     	targetDataSources.put(DataSourceType.SLAVE.name(),slaveDataSource);
+        targetDataSources.put(DataSourceType.TICKET.name(),ticketDataSource);
         return new DynamicDataSource(masterDataSource(), targetDataSources);
     }
 
     @Bean
-    public SqlSessionFactory sqlSessionFactory(DynamicDataSource dynamicDataSource) throws Exception {
-        SqlSessionFactoryBean factoryBean = new SqlSessionFactoryBean();
-        factoryBean.setDataSource(dynamicDataSource);
-//        factoryBean.setTypeAliasesPackage();
+    public SqlSessionFactory sqlSessionFactory() throws Exception {
+        MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean ();
+        factoryBean.setDataSource(dataSource(masterDataSource(), slaveDataSource(), ticketDataSource()));
         // 设置mapper.xml的位置路径
         Resource[] resources = new PathMatchingResourcePatternResolver().getResources("classpath*:mybatis/*/*.xml");
+        // 设置model路径
+        factoryBean.setTypeAliasesPackage("com.gyee.frame.model.*");
         factoryBean.setMapperLocations(resources);
+        // 设置 MyBatis-Plus 分页插件
+        Interceptor[] plugins = {paginationInterceptor};
+        factoryBean.setPlugins(plugins);
         return factoryBean.getObject();
     }
     
     /**
      * 配置@Transactional注解事务
-     * @param dynamicDataSource
+     * @param dataSource
      * @return
      * @author gyee
      * @Date 2019年12月7日 上午11:31:33
      */
     @Bean
-    public PlatformTransactionManager transactionManager(DynamicDataSource dynamicDataSource){
-        return new DataSourceTransactionManager(dynamicDataSource);
+    public PlatformTransactionManager transactionManager(DataSource dataSource){
+        return new DataSourceTransactionManager(dataSource);
+    }
+
+    /**
+     * 分页插件
+     */
+    @Bean(name = "paginationInterceptor")
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
+        return paginationInterceptor;
     }
+
 }

+ 2 - 1
src/main/java/com/gyee/frame/common/dataSources/DataSourceType.java

@@ -8,5 +8,6 @@ package com.gyee.frame.common.dataSources;
  */
 public enum DataSourceType {
 	MASTER,
-	SLAVE
+	SLAVE,
+	TICKET
 }

+ 7 - 0
src/main/java/com/gyee/frame/common/domain/AjaxResult.java

@@ -79,6 +79,13 @@ public class AjaxResult extends HashMap<String, Object>
     {
         return AjaxResult.success("操作成功");
     }
+
+    public static AjaxResult successData(Object value){
+        AjaxResult json = new AjaxResult();
+        json.put("code", 200);
+        json.put("data", value);
+        return json;
+    }
     
     public static AjaxResult successData(int code, Object value){
     	 AjaxResult json = new AjaxResult();

+ 43 - 0
src/main/java/com/gyee/frame/common/ticket/TicketUtil.java

@@ -0,0 +1,43 @@
+package com.gyee.frame.common.ticket;
+
+/**
+ * 工作票
+ */
+public class TicketUtil {
+
+    /**
+     * 工作票类型
+     * @param type
+     * @return
+     */
+    public static String ticketType(String type){
+        if (type == null)
+            return null;
+
+        switch (type){
+            case "wind":
+                type = "风场风机";
+                break;
+            case "ele1":
+                type = "电气一种";
+                break;
+            case "ele2":
+                type = "电气二种";
+                break;
+            case "fire1":
+                type = "风场动火";
+                break;
+            case "fire2":
+                type = "二级动火";
+                break;
+            case "line1":
+                type = "线路一种";
+                break;
+            case "line2":
+                type = "线路二种";
+                break;
+        }
+
+        return type;
+    }
+}

+ 51 - 0
src/main/java/com/gyee/frame/controller/ticket/WfassignmentController.java

@@ -0,0 +1,51 @@
+package com.gyee.frame.controller.ticket;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.ticket.Wfassignment;
+import com.gyee.frame.service.ticket.WfassignmentService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Optional;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+@RestController
+@RequestMapping("/wfassignment")
+public class WfassignmentController {
+
+    @Autowired
+    WfassignmentService wfassignmentService;
+
+    /**
+     * 分页查询待办任务
+     * @param page
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getList(@Param("page") Optional<Long> page){
+        Long pageNum = page.orElse(1L);
+
+        IPage<Wfassignment> wfassignment = wfassignmentService.selectPage(pageNum);
+        if(wfassignment != null)
+            return AjaxResult.successData(wfassignment);
+        else
+            return AjaxResult.error(4004,"数据读取异常");
+    }
+}
+

+ 21 - 0
src/main/java/com/gyee/frame/controller/ticket/WobugeqController.java

@@ -0,0 +1,21 @@
+package com.gyee.frame.controller.ticket;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+@RestController
+@RequestMapping("/wobugeq")
+public class WobugeqController {
+
+}
+

+ 71 - 0
src/main/java/com/gyee/frame/controller/ticket/WorkticketController.java

@@ -0,0 +1,71 @@
+package com.gyee.frame.controller.ticket;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.common.dataSources.DataSource;
+import com.gyee.frame.common.dataSources.DataSourceType;
+import com.gyee.frame.common.domain.AjaxResult;
+import com.gyee.frame.model.ticket.Workticket;
+import com.gyee.frame.service.ticket.WorkticketService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-01
+ */
+@RestController
+@RequestMapping("/workticket")
+public class WorkticketController {
+
+    @Autowired
+    WorkticketService workticketService;
+
+    /**
+     * 分页查询工作票
+     * @param page
+     * @param type
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "list")
+    public AjaxResult getList(@Param("page")  Optional<Long> page,
+                              @Param("type") Optional<String> type){
+        Long pageNum = page.orElse(1L);
+        String ticketType = type.orElse("wind");
+
+        IPage<Workticket> ticket = workticketService.selectPage(pageNum, ticketType);
+        if(ticket != null)
+            return AjaxResult.successData(ticket);
+        else
+            return AjaxResult.error(4004,"数据读取异常");
+    }
+
+    /**
+     * 根据 id 查询
+     * @param id
+     * @return
+     */
+    @DataSource(value = DataSourceType.TICKET)
+    @GetMapping(value = "detail")
+    public AjaxResult getTicketDetail(@Param("id") String id){
+        Workticket ticket = workticketService.getById(id);
+        if (ticket != null)
+            return AjaxResult.successData(ticket);
+        else
+            return AjaxResult.error(4004,"数据读取异常");
+    }
+}
+

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WfassignmentMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.model.ticket.Wfassignment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+public interface WfassignmentMapper extends BaseMapper<Wfassignment> {
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WobugeqMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Wobugeq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+public interface WobugeqMapper extends BaseMapper<Wobugeq> {
+
+}

+ 16 - 0
src/main/java/com/gyee/frame/mapper/ticket/WorkticketMapper.java

@@ -0,0 +1,16 @@
+package com.gyee.frame.mapper.ticket;
+
+import com.gyee.frame.model.ticket.Workticket;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-01
+ */
+public interface WorkticketMapper extends BaseMapper<Workticket> {
+    Integer getCount();
+}

+ 104 - 0
src/main/java/com/gyee/frame/model/ticket/Wfassignment.java

@@ -0,0 +1,104 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("WFASSIGNMENT")
+public class Wfassignment extends Model<Wfassignment> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Double id;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("ASSIGNCODE")
+    private String assigncode;
+
+    @TableField("APP")
+    private String app;
+
+    @TableField("STARTDATE")
+    private Date startdate;
+
+    @TableField("EMAILNOTIFY")
+    private String emailnotify;
+
+    @TableField("ASSIGNSTATUS")
+    private String assignstatus;
+
+    @TableField("WFINSTID")
+    private Double wfinstid;
+
+    @TableField("WFNAME")
+    private String wfname;
+
+    @TableField("WFREVISION")
+    private Double wfrevision;
+
+    @TableField("INITPERSON")
+    private String initperson;
+
+    @TableField("OWNERTABLE")
+    private String ownertable;
+
+    @TableField("OWNERID")
+    private Double ownerid;
+
+    @TableField("WFROLE")
+    private String wfrole;
+
+    @TableField("DEALTIMEOUT")
+    private Double dealtimeout;
+
+    @TableField("UPWFROLE")
+    private String upwfrole;
+
+    @TableField("LASTMEMO")
+    private String lastmemo;
+
+    @TableField("DEALTYPE")
+    private String dealtype;
+
+    @TableField("PRIORITY")
+    private Double priority;
+
+    @TableField("ENDDATE")
+    private Date enddate;
+
+    @TableField("NODEID")
+    private Double nodeid;
+
+    @TableField("TASKID")
+    private Double taskid;
+
+    @TableField("NEEDPASS")
+    private String needpass;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 230 - 0
src/main/java/com/gyee/frame/model/ticket/Wobugeq.java

@@ -0,0 +1,230 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("WOBUGEQ")
+public class Wobugeq extends Model<Wobugeq> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Double id;
+
+    @TableField("BUGNUM")
+    private String bugnum;
+
+    @TableField("EQNUM")
+    private String eqnum;
+
+    @TableField("EQTYPE")
+    private String eqtype;
+
+    @TableField("EQCLASS")
+    private String eqclass;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("REPORTLABORNUM")
+    private String reportlabornum;
+
+    @TableField("FINDLABORNUM")
+    private String findlabornum;
+
+    @TableField("FINDTIME")
+    private Date findtime;
+
+    @TableField("BUGTYPE")
+    private String bugtype;
+
+    @TableField("RUNDEPTOPINION")
+    private String rundeptopinion;
+
+    @TableField("RUNDEPTLABORNUM")
+    private String rundeptlabornum;
+
+    @TableField("RUNDEPTBUGTYPE")
+    private String rundeptbugtype;
+
+    @TableField("ISPOWERCUT")
+    private String ispowercut;
+
+    @TableField("TRANSMITTIME")
+    private Date transmittime;
+
+    @TableField("TRANSMITDEPTNUM")
+    private String transmitdeptnum;
+
+    @TableField("PRODTDEPTOPINION")
+    private String prodtdeptopinion;
+
+    @TableField("PRODTDEPTTIME")
+    private Date prodtdepttime;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("PRODTDEPTLABORNUM")
+    private String prodtdeptlabornum;
+
+    @TableField("REPAIRDEPTOPINION")
+    private String repairdeptopinion;
+
+    @TableField("REPAIRDEPTBUGTYPE")
+    private String repairdeptbugtype;
+
+    @TableField("REPAIRDEPTTIME")
+    private Date repairdepttime;
+
+    @TableField("REPAIRDEPTLABORNUM")
+    private String repairdeptlabornum;
+
+    @TableField("REPAIREDTIME")
+    private Date repairedtime;
+
+    @TableField("REPAIREDCOMMENT")
+    private String repairedcomment;
+
+    @TableField("ISRESOLVED")
+    private String isresolved;
+
+    @TableField("UNRESOLVEDBUG")
+    private String unresolvedbug;
+
+    @TableField("ISDEGRADED")
+    private String isdegraded;
+
+    @TableField("DEGRADEBUGTYPE")
+    private String degradebugtype;
+
+    @TableField("CHECKDEPTOPINION")
+    private String checkdeptopinion;
+
+    @TableField("CHECKTIME")
+    private Date checktime;
+
+    @TableField("CHECKDEPTLABORNUM")
+    private String checkdeptlabornum;
+
+    @TableField("LASTBUGTYPE")
+    private String lastbugtype;
+
+    @TableField("BUGANALIS")
+    private String buganalis;
+
+    @TableField("REMARK")
+    private String remark;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("STATUSDATE")
+    private Date statusdate;
+
+    @TableField("APPROVELABORNUM")
+    private String approvelabornum;
+
+    @TableField("SITENUM")
+    private String sitenum;
+
+    @TableField("CORPNUM")
+    private String corpnum;
+
+    @TableField("LOADEROPINION")
+    private String loaderopinion;
+
+    @TableField("CJZROPINION")
+    private String cjzropinion;
+
+    @TableField("YIJICHUSHI")
+    private String yijichushi;
+
+    @TableField("YXISPOWERCUT")
+    private String yxispowercut;
+
+    @TableField("DEPARTURETIME")
+    private Date departuretime;
+
+    @TableField("ARRIVALTIME")
+    private Date arrivaltime;
+
+    @TableField("WORKLEADER")
+    private String workleader;
+
+    @TableField("WORKGROUP")
+    private String workgroup;
+
+    @TableField("STAFFNUMBER")
+    private String staffnumber;
+
+    @TableField("WORKGROUP1")
+    private String workgroup1;
+
+    @TableField("WORKGROUP2")
+    private String workgroup2;
+
+    @TableField("ACUSSTA")
+    private String acussta;
+
+    @TableField("GRIDTIME")
+    private Date gridtime;
+
+    @TableField("NODETYPE")
+    private String nodetype;
+
+    @TableField("WTNUM")
+    private String wtnum;
+
+    @TableField("FAILURECODE")
+    private String failurecode;
+
+    @TableField("WFNUM")
+    private String wfnum;
+
+    @TableField("AVGWINSPE")
+    private Double avgwinspe;
+
+    @TableField("CLASSIFICATION")
+    private String classification;
+
+    @TableField("REPAIRDEPTBUGTYPE1")
+    private String repairdeptbugtype1;
+
+    @TableField("WSPEED")
+    private Double wspeed;
+
+    @TableField("WARNID")
+    private Double warnid;
+
+    @TableField("SNAPID")
+    private String snapid;
+
+    @TableField("SNAPNAME")
+    private String snapname;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 527 - 0
src/main/java/com/gyee/frame/model/ticket/Workticket.java

@@ -0,0 +1,527 @@
+package com.gyee.frame.model.ticket;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 工作票表
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("WORKTICKET")
+public class Workticket extends Model<Workticket> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("ID")
+    private Double id;
+
+    @TableField("WONUM")
+    private String wonum;
+
+    @TableField("STATION")
+    private String station;
+
+    @TableField("WTICKETTYPE")
+    private String wtickettype;
+
+    @TableField("PRINCIPAL")
+    private String principal;
+
+    @TableField("DEPTGROUP")
+    private String deptgroup;
+
+    @TableField("FINALTYPE")
+    private String finaltype;
+
+    @TableField("STARTDATE")
+    private Date startdate;
+
+    @TableField("ENDDATE")
+    private Date enddate;
+
+    @TableField("WORKTASK")
+    private String worktask;
+
+    @TableField("WORKADDRESS")
+    private String workaddress;
+
+    @TableField("STOPLINENAME")
+    private String stoplinename;
+
+    @TableField("RUNDEPT")
+    private String rundept;
+
+    @TableField("CONSDEPT")
+    private String consdept;
+
+    @TableField("SIGNATORY")
+    private String signatory;
+
+    @TableField("TKCHAMBER")
+    private String tkchamber;
+
+    @TableField("REMARK1")
+    private String remark1;
+
+    @TableField("INCEPTDATE")
+    private Date inceptdate;
+
+    @TableField("INCEPTMAN")
+    private String inceptman;
+
+    @TableField("YORN")
+    private String yorn;
+
+    @TableField("ADJUSTORADD")
+    private String adjustoradd;
+
+    @TableField("ADJUSTUSER")
+    private String adjustuser;
+
+    @TableField("PRESERVING")
+    private String preserving;
+
+    @TableField("REMARK2")
+    private String remark2;
+
+    @TableField("FIATQUOMODO")
+    private String fiatquomodo;
+
+    @TableField("FIATDATE")
+    private Date fiatdate;
+
+    @TableField("FIATUSER1")
+    private String fiatuser1;
+
+    @TableField("PRINCIPAL1")
+    private String principal1;
+
+    @TableField("REMARK3")
+    private String remark3;
+
+    @TableField("PROJECT")
+    private String project;
+
+    @TableField("PRINCIPAL2")
+    private String principal2;
+
+    @TableField("FIATUSER2")
+    private String fiatuser2;
+
+    @TableField("SIGNATORY1")
+    private String signatory1;
+
+    @TableField("CHANGEDATE")
+    private Date changedate;
+
+    @TableField("PRINCIPAL3")
+    private String principal3;
+
+    @TableField("NEWPRINCIPAL")
+    private String newprincipal;
+
+    @TableField("FIATUSER3")
+    private String fiatuser3;
+
+    @TableField("NEWDATE")
+    private Date newdate;
+
+    @TableField("PRINCIPAL4")
+    private String principal4;
+
+    @TableField("INCEPTMAN1")
+    private String inceptman1;
+
+    @TableField("FINALTIME")
+    private Date finaltime;
+
+    @TableField("PRINCIPAL5")
+    private String principal5;
+
+    @TableField("FIATUSER4")
+    private String fiatuser4;
+
+    @TableField("LINENUM")
+    private String linenum;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("STATUSDATE")
+    private Date statusdate;
+
+    @TableField("EQNUM")
+    private String eqnum;
+
+    @TableField("LOCATION")
+    private String location;
+
+    @TableField("SECYORN")
+    private String secyorn;
+
+    @TableField("OUTYORN")
+    private String outyorn;
+
+    @TableField("SAFEYORN")
+    private String safeyorn;
+
+    @TableField("SITENUM")
+    private String sitenum;
+
+    @TableField("CORPNUM")
+    private String corpnum;
+
+    @TableField("EQNUMDIS")
+    private String eqnumdis;
+
+    @TableField("LOCATIONDIS")
+    private String locationdis;
+
+    @TableField("WORKDEPT")
+    private String workdept;
+
+    @TableField("SIGNDATE")
+    private Date signdate;
+
+    @TableField("MEMBERCHANGE")
+    private String memberchange;
+
+    @TableField("UNLINENAME")
+    private String unlinename;
+
+    @TableField("UNLINECOUNT")
+    private String unlinecount;
+
+    @TableField("SWITCHCOUNT")
+    private String switchcount;
+
+    @TableField("BAFFLECOUNT")
+    private Double bafflecount;
+
+    @TableField("FIATUSER5")
+    private String fiatuser5;
+
+    @TableField("TICKETFINALTIME")
+    private Date ticketfinaltime;
+
+    @TableField("SUBNUM")
+    private String subnum;
+
+    @TableField("SUBPRINCIPAL")
+    private String subprincipal;
+
+    @TableField("FINALTYPE1")
+    private String finaltype1;
+
+    @TableField("FINALTIME1")
+    private Date finaltime1;
+
+    @TableField("PRINCIPAL6")
+    private String principal6;
+
+    @TableField("FIATUSER6")
+    private String fiatuser6;
+
+    @TableField("FIATDATE1")
+    private Date fiatdate1;
+
+    @TableField("FIATUSER7")
+    private String fiatuser7;
+
+    @TableField("SAFETY")
+    private String safety;
+
+    @TableField("PRINCIPAL7")
+    private String principal7;
+
+    @TableField("WORKLINE")
+    private String workline;
+
+    @TableField("EQUI")
+    private String equi;
+
+    @TableField("SAFENOTICE")
+    private String safenotice;
+
+    @TableField("SEQUENCE")
+    private Double sequence;
+
+    @TableField("STANTICKETTYPE")
+    private String stantickettype;
+
+    @TableField("STLITICKETTYPE")
+    private String stlitickettype;
+
+    @TableField("INITIALUSER")
+    private String initialuser;
+
+    @TableField("INITIALUSERDEPT")
+    private String initialuserdept;
+
+    @TableField("WORKUSER")
+    private String workuser;
+
+    @TableField("TICKETNUM")
+    private String ticketnum;
+
+    @TableField("ADDPEOPLE")
+    private String addpeople;
+
+    @TableField("ADDTIME")
+    private Date addtime;
+
+    @TableField("AWAYPEOPLE")
+    private String awaypeople;
+
+    @TableField("AWAYTIME")
+    private Date awaytime;
+
+    @TableField("WORKSTEERPEOPLE")
+    private String worksteerpeople;
+
+    @TableField("WORKADDPEOPLE")
+    private String workaddpeople;
+
+    @TableField("STOPSCOPE")
+    private String stopscope;
+
+    @TableField("COUNTERSIGNDATE")
+    private Date countersigndate;
+
+    @TableField("COUNTERSIGNPERSON")
+    private String countersignperson;
+
+    @TableField("CHECKDATE")
+    private Date checkdate;
+
+    @TableField("CHECKPERSON")
+    private String checkperson;
+
+    @TableField("CHECKQUESTION")
+    private String checkquestion;
+
+    @TableField("REMARK4")
+    private String remark4;
+
+    @TableField("CHECKSTATE")
+    private String checkstate;
+
+    @TableField("STARTWORKTIME")
+    private Date startworktime;
+
+    @TableField("ENDWORKTIME")
+    private Date endworktime;
+
+    @TableField("PRINCIPAL8")
+    private String principal8;
+
+    @TableField("BUGNUM")
+    private String bugnum;
+
+    @TableField("WORKAREA")
+    private String workarea;
+
+    @TableField("FIREPRINCIPAL")
+    private String fireprincipal;
+
+    @TableField("FIRELOCATION")
+    private String firelocation;
+
+    @TableField("SURVEYLOCATION")
+    private String surveylocation;
+
+    @TableField("CONTENTS")
+    private String contents;
+
+    @TableField("INSTRUMENT")
+    private String instrument;
+
+    @TableField("SURVEYPERSON")
+    private String surveyperson;
+
+    @TableField("SURVEYTIME")
+    private Date surveytime;
+
+    @TableField("APPLYFIRESTARTTIME")
+    private Date applyfirestarttime;
+
+    @TableField("APPLYFIREENDTIME")
+    private Date applyfireendtime;
+
+    @TableField("LEADERSHIP")
+    private String leadership;
+
+    @TableField("SAFEPRINCIPAL")
+    private String safeprincipal;
+
+    @TableField("FIREFIGHTINGPERSON")
+    private String firefightingperson;
+
+    @TableField("SHIFTFOREMAN")
+    private String shiftforeman;
+
+    @TableField("FIREOPERATOR")
+    private String fireoperator;
+
+    @TableField("FIREPERMITTIME")
+    private Date firepermittime;
+
+    @TableField("FIREENDTIME")
+    private Date fireendtime;
+
+    @TableField("DEPTGROUP1")
+    private String deptgroup1;
+
+    @TableField("FIREWORKCONTENT")
+    private String fireworkcontent;
+
+    @TableField("FIATUSER8")
+    private String fiatuser8;
+
+    @TableField("GUARDIAN")
+    private String guardian;
+
+    @TableField("GUARDIAN1")
+    private String guardian1;
+
+    @TableField("GUARDIAN2")
+    private String guardian2;
+
+    @TableField("FIREOPERATOR1")
+    private String fireoperator1;
+
+    @TableField("SHIFTFOREMAN1")
+    private String shiftforeman1;
+
+    @TableField("DESCRIPTION")
+    private String description;
+
+    @TableField("EQUNAME")
+    private String equname;
+
+    @TableField("BARNAME")
+    private String barname;
+
+    @TableField("BARNAME1")
+    private String barname1;
+
+    @TableField("LINEADDDATE")
+    private Date lineadddate;
+
+    @TableField("LINEENDDATE")
+    private Date lineenddate;
+
+    @TableField("LINEAGREEMODE")
+    private String lineagreemode;
+
+    @TableField("LINEAGEEPEOPLE")
+    private String lineageepeople;
+
+    @TableField("LINEAGEEPEOPLE2")
+    private String lineageepeople2;
+
+    @TableField("LINEBEGINDATE")
+    private Date linebegindate;
+
+    @TableField("LINEREPORTMODE")
+    private String linereportmode;
+
+    @TableField("LINEAGEEPEOPLE4")
+    private String lineageepeople4;
+
+    @TableField("LINEAGEEPEOPLE3")
+    private String lineageepeople3;
+
+    @TableField("LINEREPOPTMODE")
+    private String linerepoptmode;
+
+    @TableField("EQUIPMENT")
+    private String equipment;
+
+    @TableField("SBMS")
+    private String sbms;
+
+    @TableField("EQNAME")
+    private String eqname;
+
+    @TableField("FIATUSER")
+    private String fiatuser;
+
+    @TableField("INCEPTMAN2")
+    private String inceptman2;
+
+    @TableField("LEADERSHIP1")
+    private String leadership1;
+
+    @TableField("SAFEPRINCIPAL1")
+    private String safeprincipal1;
+
+    @TableField("FIREFIGHTPERSON1")
+    private String firefightperson1;
+
+    @TableField("WTNUM")
+    private String wtnum;
+
+    @TableField("WORKREPORT")
+    private String workreport;
+
+    @TableField("SAFEMEASURE")
+    private String safemeasure;
+
+    @TableField("ADDSAFEMEASURE")
+    private String addsafemeasure;
+
+    @TableField("PRINCIPALDATE")
+    private Date principaldate;
+
+    @TableField("FIATUSERDATE")
+    private Date fiatuserdate;
+
+    @TableField("GWNUM")
+    private String gwnum;
+
+    @TableField("ISEND")
+    private String isend;
+
+    @TableField("WSPEED")
+    private String wspeed;
+
+    @TableField("COMPLETION")
+    private String completion;
+
+    @TableField("RELINECOUNT")
+    private String relinecount;
+
+    @TableField("UNSWITCHCOUNT")
+    private String unswitchcount;
+
+    @TableField("RESWITCHCOUNT")
+    private String reswitchcount;
+
+    @TableField("FIREMODE")
+    private String firemode;
+
+    @TableField("FIREOPERATORNUM")
+    private String fireoperatornum;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 1 - 1
src/main/java/com/gyee/frame/service/SysUserService.java

@@ -25,7 +25,7 @@ import com.github.pagehelper.PageInfo;
 
 /**
  * 系统用户
- * @ClassName: SysUserService
+ * @ClassName: SysUsersService
  * @author gyee
  * @date 2018年8月26日
  *

+ 37 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WfassignmentServiceImpl.java

@@ -0,0 +1,37 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.frame.model.ticket.Wfassignment;
+import com.gyee.frame.mapper.ticket.WfassignmentMapper;
+import com.gyee.frame.service.ticket.WfassignmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+@Service
+public class WfassignmentServiceImpl extends ServiceImpl<WfassignmentMapper, Wfassignment> implements WfassignmentService {
+
+    @Override
+    public IPage<Wfassignment> selectPage(long pageNum) {
+        QueryWrapper<Wfassignment> wrapper = new QueryWrapper();
+        wrapper.eq("ASSIGNSTATUS", "活动");
+        wrapper.eq("APP", "WINDELEC");
+        wrapper.orderByDesc("ID");
+
+        Page<Wfassignment> page = new Page<>(pageNum, 15);
+        IPage<Wfassignment> iPage = baseMapper.selectPage(page, wrapper);
+
+        return iPage;
+    }
+}

+ 25 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WobugeqServiceImpl.java

@@ -0,0 +1,25 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.model.ticket.Wobugeq;
+import com.gyee.frame.mapper.ticket.WobugeqMapper;
+import com.gyee.frame.service.ticket.WobugeqService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+@Service
+public class WobugeqServiceImpl extends ServiceImpl<WobugeqMapper, Wobugeq> implements WobugeqService {
+
+    @Override
+    public IPage<Wobugeq> selectPage(long pageNum) {
+        return null;
+    }
+}

+ 38 - 0
src/main/java/com/gyee/frame/service/impl/ticket/WorkticketServiceImpl.java

@@ -0,0 +1,38 @@
+package com.gyee.frame.service.impl.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gyee.frame.common.ticket.TicketUtil;
+import com.gyee.frame.model.ticket.Workticket;
+import com.gyee.frame.mapper.ticket.WorkticketMapper;
+import com.gyee.frame.service.ticket.WorkticketService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-01
+ */
+@Service
+public class WorkticketServiceImpl extends ServiceImpl<WorkticketMapper, Workticket> implements WorkticketService {
+
+
+    @Override
+    public IPage<Workticket> selectPage(long pageNum, String type) {
+        String ticketType = TicketUtil.ticketType(type);
+        QueryWrapper<Workticket> wrapper = new QueryWrapper();
+
+        wrapper.eq("WTICKETTYPE", ticketType);
+        wrapper.orderByDesc("ID");
+
+        Page<Workticket> page = new Page<>(pageNum, 15);
+        IPage<Workticket> iPage = baseMapper.selectPage(page, wrapper);
+
+        return iPage;
+    }
+}

+ 26 - 0
src/main/java/com/gyee/frame/service/ticket/WfassignmentService.java

@@ -0,0 +1,26 @@
+package com.gyee.frame.service.ticket;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.model.ticket.Wfassignment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+public interface WfassignmentService extends IService<Wfassignment> {
+
+    /**
+     * 分页
+     * @param pageNum
+     * @return
+     */
+    IPage<Wfassignment> selectPage(long pageNum);
+}

+ 23 - 0
src/main/java/com/gyee/frame/service/ticket/WobugeqService.java

@@ -0,0 +1,23 @@
+package com.gyee.frame.service.ticket;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.model.ticket.Wobugeq;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-02
+ */
+public interface WobugeqService extends IService<Wobugeq> {
+
+    /**
+     * 分页
+     * @param pageNum
+     * @return
+     */
+    IPage<Wobugeq> selectPage(long pageNum);
+}

+ 26 - 0
src/main/java/com/gyee/frame/service/ticket/WorkticketService.java

@@ -0,0 +1,26 @@
+package com.gyee.frame.service.ticket;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gyee.frame.model.ticket.Workticket;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author chenmh
+ * @since 2020-06-01
+ */
+public interface WorkticketService extends IService<Workticket> {
+
+    /**
+     * 分页
+     * @param pageNum
+     * @param type
+     * @return
+     */
+    IPage<Workticket> selectPage(long pageNum, String type);
+
+}

+ 11 - 5
src/main/resources/application-dev.yml

@@ -2,7 +2,6 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: oracle.jdbc.driver.OracleDriver
     #druid连接池配置
     druid:
      #主库数据源
@@ -12,13 +11,20 @@ spring:
         url: jdbc:oracle:thin:@192.168.1.105:1521:gdnxfd
         username: nxfdprod
         password: gdnxfd123
+        driver-class-name: oracle.jdbc.driver.OracleDriver
      #备数据源 #关闭
      slave:
-        enabled: false
-        url: jdbc:mysql://localhost:3306/gyee?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+        url: jdbc:mysql://127.0.0.1:3306/assemb?characterEncoding=utf8&serverTimezone=UTC
         username: root
-        password: 123456
-        #配置初始化连接数大小
+        password:
+        driver-class-name: com.mysql.jdbc.Driver
+     #两票数据源
+     ticket:
+        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeam
+        username: sa
+        password: ibs
+        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+     #配置初始化连接数大小
      initial-size: 10
      # 最大连接数
      max-active: 50

BIN
src/main/resources/lib/sqljdbc42.jar


+ 37 - 0
src/main/resources/mybatis/ticket/WfassignmentMapper.xml

@@ -0,0 +1,37 @@
+<?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.gyee.frame.mapper.ticket.WfassignmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.gyee.frame.model.ticket.Wfassignment">
+        <id column="ID" property="id" />
+        <result column="DESCRIPTION" property="description" />
+        <result column="ASSIGNCODE" property="assigncode" />
+        <result column="APP" property="app" />
+        <result column="STARTDATE" property="startdate" />
+        <result column="EMAILNOTIFY" property="emailnotify" />
+        <result column="ASSIGNSTATUS" property="assignstatus" />
+        <result column="WFINSTID" property="wfinstid" />
+        <result column="WFNAME" property="wfname" />
+        <result column="WFREVISION" property="wfrevision" />
+        <result column="INITPERSON" property="initperson" />
+        <result column="OWNERTABLE" property="ownertable" />
+        <result column="OWNERID" property="ownerid" />
+        <result column="WFROLE" property="wfrole" />
+        <result column="DEALTIMEOUT" property="dealtimeout" />
+        <result column="UPWFROLE" property="upwfrole" />
+        <result column="LASTMEMO" property="lastmemo" />
+        <result column="DEALTYPE" property="dealtype" />
+        <result column="PRIORITY" property="priority" />
+        <result column="ENDDATE" property="enddate" />
+        <result column="NODEID" property="nodeid" />
+        <result column="TASKID" property="taskid" />
+        <result column="NEEDPASS" property="needpass" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ID, DESCRIPTION, ASSIGNCODE, APP, STARTDATE, EMAILNOTIFY, ASSIGNSTATUS, WFINSTID, WFNAME, WFREVISION, INITPERSON, OWNERTABLE, OWNERID, WFROLE, DEALTIMEOUT, UPWFROLE, LASTMEMO, DEALTYPE, PRIORITY, ENDDATE, NODEID, TASKID, NEEDPASS
+    </sql>
+
+</mapper>

Fichier diff supprimé car celui-ci est trop grand
+ 79 - 0
src/main/resources/mybatis/ticket/WobugeqMapper.xml


Fichier diff supprimé car celui-ci est trop grand
+ 181 - 0
src/main/resources/mybatis/ticket/WorkticketMapper.xml