Browse Source

添加类型区分个微企微任务

lqc 4 years ago
parent
commit
cbf8a6fb3b

+ 1 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashAccountScheduleMapper.xml

@@ -9,6 +9,7 @@
         <result column="group_id" property="groupId" />
         <result column="template_id" property="templateId" />
         <result column="status" property="status" />
+        <result column="type" property="type" />
         <result column="create_uid" property="createUid" />
         <result column="create_user" property="createUser" />
         <result column="update_uid" property="updateUid" />

+ 1 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashScheduleTaskListMapper.xml

@@ -12,6 +12,7 @@
         <result column="remark" property="remark" />
         <result column="task_content" property="taskContent" />
         <result column="status" property="status" />
+        <result column="type" property="type" />
         <result column="err_info" property="errInfo" />
         <result column="send_time" property="sendTime" />
         <result column="create_uid" property="createUid" />

+ 14 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashAccountSchedule.java

@@ -50,6 +50,11 @@ public class FosterwxCashAccountSchedule extends Model<FosterwxCashAccountSchedu
     private Integer status;
 
     /**
+     * 类型(1:个微任务 2:企微任务)
+     */
+    private Integer type;
+
+    /**
      * 创建人
      */
     private Integer createUid;
@@ -129,6 +134,14 @@ public class FosterwxCashAccountSchedule extends Model<FosterwxCashAccountSchedu
         this.status = status;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public Integer getCreateUid() {
         return createUid;
     }
@@ -222,6 +235,7 @@ public class FosterwxCashAccountSchedule extends Model<FosterwxCashAccountSchedu
                 ", groupId=" + groupId +
                 ", templateId=" + templateId +
                 ", status=" + status +
+                ", type=" + type +
                 ", createUid=" + createUid +
                 ", createUser=" + createUser +
                 ", updateUid=" + updateUid +

+ 15 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashScheduleTaskList.java

@@ -62,6 +62,12 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     private Integer status;
 
     /**
+     * 类型(1:个微任务 2:企微任务)
+     */
+    private Integer type;
+
+
+    /**
      * 失败原因
      */
     private String errInfo;
@@ -161,6 +167,14 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
         this.status = status;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
     public String getErrInfo() {
         return errInfo;
     }
@@ -233,6 +247,7 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
         ", remark=" + remark +
         ", taskContent=" + taskContent +
         ", status=" + status +
+        ", type=" + type +
         ", errInfo=" + errInfo +
         ", sendTime=" + sendTime +
         ", createUid=" + createUid +

+ 67 - 69
src/test/java/com/mokamrp/AutoMPPangu.java

@@ -6,85 +6,83 @@ import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-import com.mokamrp.privates.mapper.pangu.pojo.FosterwxTaskTemplate;
 import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class AutoMPPangu {
-	/**
-	 * 代码生成    示例代码
-	 */
-	@Test
-	public void testGenerator() {
+    /**
+     * 代码生成    示例代码
+     */
+    @Test
+    public void testGenerator() {
 
-		//1. 全局配置
-		String outPutDir = "D://project/moka-private/src/main/java";
-		GlobalConfig config = new GlobalConfig();
-		config.setActiveRecord(true) // 是否支持AR模式
-				.setAuthor("leon") // 作者
-				.setOutputDir(outPutDir) // 生成路径
-				.setFileOverride(true)  // 文件覆盖
-				.setIdType(IdType.AUTO) // 主键策略
-				.setServiceName("%sService")  // 设置生成的service接口的名字的首字母是否为I
-				// IEmployeeService
-				.setBaseResultMap(true) //生成sql映射文件
-				.setBaseColumnList(true);//生成sql片段
+        //1. 全局配置
+        String outPutDir = "D://project/moka-private/src/main/java";
+        GlobalConfig config = new GlobalConfig();
+        config.setActiveRecord(true) // 是否支持AR模式
+                .setAuthor("leon") // 作者
+                .setOutputDir(outPutDir) // 生成路径
+                .setFileOverride(true)  // 文件覆盖
+                .setIdType(IdType.AUTO) // 主键策略
+                .setServiceName("%sService")  // 设置生成的service接口的名字的首字母是否为I
+                // IEmployeeService
+                .setBaseResultMap(true) //生成sql映射文件
+                .setBaseColumnList(true);//生成sql片段
 
-		//2. 数据源配置
-		DataSourceConfig  dsConfig  = new DataSourceConfig();
-		dsConfig.setDbType(DbType.MYSQL)  // 设置数据库类型
-				.setDriverName("com.mysql.cj.jdbc.Driver")
-				.setUrl("jdbc:mysql://172.18.71.27:3306/mochat")
-				.setUsername("typer")
-				.setPassword("jch9sh_shl");
+        //2. 数据源配置
+        DataSourceConfig dsConfig = new DataSourceConfig();
+        dsConfig.setDbType(DbType.MYSQL)  // 设置数据库类型
+                .setDriverName("com.mysql.cj.jdbc.Driver")
+                .setUrl("jdbc:mysql://172.18.71.27:3306/mochat")
+                .setUsername("typer")
+                .setPassword("jch9sh_shl");
 
-		//3. 策略配置
-		StrategyConfig stConfig = new StrategyConfig();
-		stConfig.setCapitalMode(true) //全局大写命名
-				.setRestControllerStyle(true) //.RestController
-				.setSuperControllerClass("BaseController")
-				.setColumnNaming(NamingStrategy.underline_to_camel)
-				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略,下划线转驼峰命名
-				.setTablePrefix("pan_") //表名前缀
-				.setInclude("pan_fosterwx_cash_account_schedule");
-		//4. 包名策略配置
-		PackageConfig pkConfig = new PackageConfig();
-		pkConfig.setParent("com.mokamrp.privates")
-				.setMapper("mapper.pangu")
-				.setService("service.pangu")
-				.setServiceImpl("service.pangu.impl")
-				.setController("controller.pangu")
-				.setEntity("mapper.pangu.pojo")
-				.setXml("mapper.pangu");
-		//5. 注入自定义配置
-		InjectionConfig cfg = new InjectionConfig() {
-			@Override
-			public void initMap() {
-				Map<String, Object> map = new HashMap<String, Object>();
-				this.setMap(map);
-			}
-		};
-
-		//6. 整合配置
-		AutoGenerator  ag = new AutoGenerator();
-		ag.setGlobalConfig(config)
-		  .setDataSource(dsConfig)
-		  .setStrategy(stConfig)
-		  .setPackageInfo(pkConfig);
-		//. @leon 自定义模板
-		TemplateConfig tc = new TemplateConfig();
-		tc.setService("/template/service.java.vm");
-		tc.setServiceImpl("/template/serviceImpl.java.vm");
-		tc.setController("/template/controller.java.vm");
-		tc.setMapper("/template/mapper.java.vm");
-		tc.setXml("/template/mapper.xml.vm");
-		ag.setTemplate(tc);
-		//7. 执行
-		ag.execute();
-	}
+        //3. 策略配置
+        StrategyConfig stConfig = new StrategyConfig();
+        stConfig.setCapitalMode(true) //全局大写命名
+                .setRestControllerStyle(true) //.RestController
+                .setSuperControllerClass("BaseController")
+                .setColumnNaming(NamingStrategy.underline_to_camel)
+                .setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略,下划线转驼峰命名
+                .setTablePrefix("pan_") //表名前缀
+                .setInclude("pan_fosterwx_cash_account_schedule").setInclude("pan_fosterwx_cash_schedule_task_list");
+        //4. 包名策略配置
+        PackageConfig pkConfig = new PackageConfig();
+        pkConfig.setParent("com.mokamrp.privates")
+                .setMapper("mapper.pangu")
+                .setService("service.pangu")
+                .setServiceImpl("service.pangu.impl")
+                .setController("controller.pangu")
+                .setEntity("mapper.pangu.pojo")
+                .setXml("mapper.pangu");
+        //5. 注入自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                Map<String, Object> map = new HashMap<String, Object>();
+                this.setMap(map);
+            }
+        };
 
+        //6. 整合配置
+        AutoGenerator ag = new AutoGenerator();
+        ag.setGlobalConfig(config)
+                .setDataSource(dsConfig)
+                .setStrategy(stConfig)
+                .setPackageInfo(pkConfig);
+        //. @leon 自定义模板
+        TemplateConfig tc = new TemplateConfig();
+        tc.setService("/template/service.java.vm");
+        tc.setServiceImpl("/template/serviceImpl.java.vm");
+        tc.setController("/template/controller.java.vm");
+        tc.setMapper("/template/mapper.java.vm");
+        tc.setXml("/template/mapper.xml.vm");
+        ag.setTemplate(tc);
+        //7. 执行
+        ag.execute();
+    }
 
 
 }