Selaa lähdekoodia

Merge branch 'test' of https://gitee.com/hcst/adsp-boot into test

xuzuoyun 5 vuotta sitten
vanhempi
commit
00cfbb6551
19 muutettua tiedostoa jossa 115 lisäystä ja 237 poistoa
  1. 6 0
      jeecg-boot-module-system/pom.xml
  2. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  3. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java
  4. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  5. 20 92
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  6. 0 0
      lib/jave-1.0.2.jar
  7. BIN
      lib/webmagic-core-0.7.3.jar
  8. 0 35
      module-common/pom.xml
  9. 54 55
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  10. 2 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  11. 0 1
      module-toutiao/pom.xml
  12. 0 1
      performance-appraisal/pom.xml
  13. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java
  14. 12 14
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java
  15. 10 14
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java
  16. 5 2
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java
  17. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java
  18. 0 13
      performance-appraisal/src/test/java/cn/com/ctop/performanceappraisal/PerformanceAppraisalApplicationTests.java
  19. 2 1
      pom.xml

+ 6 - 0
jeecg-boot-module-system/pom.xml

@@ -74,6 +74,12 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>performance-appraisal</artifactId>
+            <version>2.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
             <version>3.5.0</version>

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -132,7 +132,7 @@ public class ProjectController {
 
         String roleCode = materialReportMapper.getRoleCodeByUserId(sysUser.getId());
         if (!"admin".equals(roleCode)) {
-            queryWrapper.eq("user_id", sysUser.getId());
+            queryWrapper.eq("responsible_id", sysUser.getId());
             queryWrapper.orderByDesc("create_time");
         }
         IPage<Project> pageList = projectService.page(page, queryWrapper);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/aspect/DictAspect.java

@@ -41,7 +41,7 @@ public class DictAspect {
     /**
      * 定义切点Pointcut
      */
-    @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..))")
+    @Pointcut("execution(public * org.jeecg.modules..*.*Controller.*(..))||execution(public * cn.com.ctop..*.*Controller.*(..))")
     public void excudeService() {
     }
 

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -14,7 +14,6 @@ import lombok.val;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
 import me.chanjar.weixin.cp.api.WxCpUserService;
-import me.chanjar.weixin.cp.api.impl.WxCpOAuth2ServiceImpl;
 import me.chanjar.weixin.cp.api.impl.WxCpServiceImpl;
 import me.chanjar.weixin.cp.api.impl.WxCpUserServiceImpl;
 import me.chanjar.weixin.cp.bean.WxCpOauth2UserInfo;
@@ -81,7 +80,6 @@ public class LoginController {
 
         service.setWxCpConfigStorage(configStorage);
         WxCpOAuth2Service wxCpOAuth2Service = service.getOauth2Service();
-        ;
         try {
             WxCpOauth2UserInfo userInfo = wxCpOAuth2Service.getUserInfo(1000002, code);
             if (userInfo != null && userInfo.getUserId() != null) {

+ 20 - 92
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -1,21 +1,17 @@
 package org.jeecg;
 
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.utils.HttpUtils2;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumJobService;
 import cn.com.ctop.crawler.modules.appium.service.IAppiumTaskService;
-import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.impl.client.BasicCookieStore;
-import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.ctop.service.IBidWarningService;
 import org.jeecg.modules.ctop.service.ICreateInternalService;
 import org.jeecg.modules.mq.Sender;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeDriver;
@@ -25,15 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
-import java.util.Properties;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -121,93 +109,33 @@ public class SampleTest {
         sender.send();
     }
 
-    @Autowired
-    private IKuaishouInterfaceService kuaishouInterfaceService;
-    @Autowired
-    private CtopOauthTokenMapper tokenMapper;
-
     @Test
-    public void loadKuaishouDataSingle() {
-
-
-        Date endDate = new Date();
-        QueryWrapper<CtopOauthToken> tokenQueryWrapper = new QueryWrapper<>();
-        tokenQueryWrapper.eq("media_id", 2);
-        List<CtopOauthToken> ctopOauthTokens = tokenMapper.selectList(tokenQueryWrapper);
-        for (CtopOauthToken token : ctopOauthTokens) {
-
-
-            for (int i = 0; i < 7; i++) {
-                Date getStartDate = DateUtils.addDay(endDate, -i);
-
-                //3:获取广告组信息数据
-                kuaishouInterfaceService.getAdvertiserGroupReportHourly(token, getStartDate, getStartDate);
-
-            }
-            for (int i = 0; i < 6; i++) {
-                Date getStartDate = new Date();
-                Date getEndDate = new Date();
-                if (i == 0) {
-                    getStartDate = DateUtils.addDay(endDate, -175 + i * 30);
-                    getEndDate = DateUtils.addDay(endDate, -150 + i * 30);
-                } else {
-                    getStartDate = DateUtils.addDay(endDate, -180 + i * 30);
-                    getEndDate = DateUtils.addDay(endDate, -150 + i * 30);
-                }
-
-                //3:获取广告组信息数据
-                kuaishouInterfaceService.getAdvertiserGroupReportDaily(token, getStartDate, getEndDate);
-
-            }
-
-
+    public void loadKuaishouDataSingle() throws Exception {
+        String url = "https://a201903112120030590198943.szwego.com/static/index.html#/shop_detail/A201903112120030590198943";
+        System.getProperties().setProperty("webdriver.chrome.driver", chromeDriver);
+        ChromeOptions chromeOptions = new ChromeOptions();
+//        chromeOptions.addArguments("--headless");
+        chromeOptions.addArguments("--incognito");
+        chromeOptions.addArguments("--disable-gpu");
+//        chromeOptions.addArguments("--no-sandbox");
+        chromeOptions.addArguments("--window-size=1920,1080");
+        chromeOptions.addArguments("--user-agent=" + HttpUtils2.USER_AGENT);
+        chromeOptions.setAcceptInsecureCerts(true);
+        WebDriver webDriver = new ChromeDriver(chromeOptions);
+        webDriver.get(url);
+        Thread.sleep(3000L);
+        ((JavascriptExecutor) webDriver).executeScript("window.scrollTo(0,document.body.scrollHeight)");
+        Thread.sleep(3000L);
+        List<WebElement> elementList = webDriver.findElements(By.xpath("//div[@class='word-break ellipsis-two f14 g3']"));
+        for (WebElement element : elementList) {
+            System.out.println(element.getText());
         }
 
-
     }
 
     @Test
     public void testMail() throws Exception {
-        Properties properties = new Properties();
-        properties.put("mail.transport.protocol", "smtp");// 连接协议
-        properties.put("mail.smtp.host", "smtp.exmail.qq.com");// 主机名
-        properties.put("mail.smtp.port", 465);// 端口号
-        properties.put("mail.smtp.auth", "true");
-        properties.put("mail.smtp.ssl.enable", "true");// 设置是否使用ssl安全连接 ---一般都使用
-        properties.put("mail.debug", "true");// 设置是否显示debug信息 true 会在控制台显示相关信息
-        // 得到回话对象
-        Session session = Session.getInstance(properties);
-        // 获取邮件对象
-        Message message = new MimeMessage(session);
-        // 设置发件人邮箱地址
-        message.setFrom(new InternetAddress("notice@c-top.com.cn"));
-        // 设置收件人邮箱地址
-
-
-        List<String> mails = new ArrayList<>();
-        mails.add("yumengmeng@c-top.com.cn");
-        mails.add("zhuxinbo@c-top.com.cn");
-
-        InternetAddress[] internetAddresses = new InternetAddress[mails.size()];
-        for (int i = 0; i < mails.size(); i++) {
-            InternetAddress addr = new InternetAddress(mails.get(i));
-            internetAddresses[i] = addr;
-        }
 
-        message.setRecipients(Message.RecipientType.TO, internetAddresses);
-        //  message.setRecipients(Message.RecipientType.TO, new InternetAddress[]{new InternetAddress("yumengmeng@c-top.com.cn"),new InternetAddress("zhuxinbo@c-top.com.cn")});
-        //message.setRecipient(Message.RecipientType.TO, new InternetAddress("xxx@qq.com"));//一个收件人
-        // 设置邮件标题
-        message.setSubject("测试邮件");
-        // 设置邮件内容
-        message.setText("你好啊");
-        // 得到邮差对象
-        Transport transport = session.getTransport();
-        // 连接自己的邮箱账户
-        transport.connect("notice@c-top.com.cn", "Hcst@2019");// 密码为QQ邮箱开通的stmp服务后得到的客户端授权码
-        // 发送邮件
-        transport.sendMessage(message, message.getAllRecipients());
-        transport.close();
     }
 
 

module-common/lib/jave-1.0.2.jar → lib/jave-1.0.2.jar


BIN
lib/webmagic-core-0.7.3.jar


+ 0 - 35
module-common/pom.xml

@@ -23,27 +23,6 @@
     </properties>
 
     <dependencies>
-        <!--<dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-toutiao</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-kuaishou</artifactId>
-            <version>2.0.2</version>
-        </dependency>-->
-
-
-        <dependency>
-            <groupId>com.lgg.jave</groupId>
-            <artifactId>jave</artifactId>
-            <scope>system</scope>
-            <version>1.0.2</version>
-            <systemPath>${project.basedir}/lib/jave-1.0.2.jar</systemPath>
-        </dependency>
-
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -76,21 +55,7 @@
 
     </dependencies>
     <build>
-        <!--
-                <plugins>
-                    <plugin>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-maven-plugin</artifactId>
-                        <configuration>
-                            <includeSystemScope>true</includeSystemScope>
-                        </configuration>
-                    </plugin>
-                </plugins>-->
-
-
         <resources>
-
-
             <resource>
                 <directory>lib</directory>
                 <targetPath>BOOT-INF/lib/</targetPath>

+ 54 - 55
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -14,7 +14,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import it.sauronsoftware.jave.Encoder;
+// import it.sauronsoftware.jave.Encoder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -146,7 +146,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                     }
                 }
             }
-            //  getFile(info);
+          //  getFile(info);
             ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
         } catch (Exception e) {
             ResultMapUtils.setResultMap(resultMap, StatusCode.MATERIAL_UPLOAD_FAIL.getCode());
@@ -252,63 +252,62 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     @Autowired
     private MaterialParameterMapper materialParameterMapper;
 
-    public void getFile(MaterialInfo materialInfo) {
-       /* uploadExecutorService.submit(new Runnable() {
+   /* public void getFile(MaterialInfo materialInfo) {
+        uploadExecutorService.submit(new Runnable() {
             @Override
-            public void run() {*/
-        try {
-            System.err.println("开始获取素材基本信息");
-            System.err.println(materialInfo);
-            if (!Check.isNull(materialInfo)) {
-                String url = materialInfo.getUrl();
-                long l = System.currentTimeMillis();
-                //PropertiesUtils.getValue("kuaishou_config", "video_sava_path")
-                String localUrl = LoadFileUtil.downLoadFromUrl(url, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));
-                File file = new File(localUrl);
-                it.sauronsoftware.jave.Encoder encoder = new Encoder();
-                /*try {*/
-                it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
-                long duration = m.getDuration();
-                long secondDuration = duration / 1000;
-                MaterialParameter materialParameter = new MaterialParameter();
-                materialParameter.setMaterialId(materialInfo.getId());
-                // 视频秒数
-                materialParameter.setSecond(secondDuration);
-                // 视频格式
-                materialParameter.setFormat(m.getFormat());
-                // 视频宽
-                materialParameter.setWidth(String.valueOf(m.getVideo().getSize().getWidth()));
-                // 视频高
-                materialParameter.setHeight(String.valueOf(m.getVideo().getSize().getHeight()));
-
-                FileInputStream fis = new FileInputStream(file);
-                FileChannel fc = fis.getChannel();
-                BigDecimal fileSize = new BigDecimal(fc.size());
-                String size = fileSize.divide(new BigDecimal(1048576), 2, RoundingMode.HALF_UP) + "MB";
-                materialParameter.setSize(size);
-
-                Map<String, Object> deleteMap = new HashMap<>();
-                deleteMap.put("material_id", materialInfo.getId());
-                materialParameterMapper.deleteByMap(deleteMap);
-
-                int insert = materialParameterMapper.insert(materialParameter);
-                if (insert > 0) {
-                    log.info("素材基本信息入库完成,用时:{} s", (System.currentTimeMillis() - l) / 1000);
-
-                }
-                System.err.println(2222222);
-               /* } catch (Exception e) {
+            public void run() {
+                try {
+                    System.err.println("开始获取素材基本信息");
+                    System.err.println(materialInfo);
+                    if (!Check.isNull(materialInfo)) {
+                        String url = materialInfo.getUrl();
+                        long l = System.currentTimeMillis();
+                        //PropertiesUtils.getValue("kuaishou_config", "video_sava_path")
+                        String localUrl = LoadFileUtil.downLoadFromUrl(url, PropertiesUtils.getValue("kuaishou_config", "video_sava_path"));
+                        File file = new File(localUrl);
+                        it.sauronsoftware.jave.Encoder encoder = new Encoder();
+                        *//*try {*//*
+                        it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
+                        long duration = m.getDuration();
+                        long secondDuration = duration / 1000;
+                        MaterialParameter materialParameter = new MaterialParameter();
+                        materialParameter.setMaterialId(materialInfo.getId());
+                        // 视频秒数
+                        materialParameter.setSecond(secondDuration);
+                        // 视频格式
+                        materialParameter.setFormat(m.getFormat());
+                        // 视频宽
+                        materialParameter.setWidth(String.valueOf(m.getVideo().getSize().getWidth()));
+                        // 视频高
+                        materialParameter.setHeight(String.valueOf(m.getVideo().getSize().getHeight()));
+
+                        FileInputStream fis = new FileInputStream(file);
+                        FileChannel fc = fis.getChannel();
+                        BigDecimal fileSize = new BigDecimal(fc.size());
+                        String size = fileSize.divide(new BigDecimal(1048576), 2, RoundingMode.HALF_UP) + "MB";
+                        materialParameter.setSize(size);
+
+                        Map<String, Object> deleteMap = new HashMap<>();
+                        deleteMap.put("material_id", materialInfo.getId());
+                        materialParameterMapper.deleteByMap(deleteMap);
+
+                        int insert = materialParameterMapper.insert(materialParameter);
+                        if (insert > 0) {
+                            log.info("素材基本信息入库完成,用时:{} s", (System.currentTimeMillis() - l) / 1000);
+
+                        }
+               *//* } catch (Exception e) {
                     e.printStackTrace();
-                } *//*finally {
+                } *//**//*finally {
                     file.delete();
-                }*/
+                }*//*
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-       /*     }
-        });*/
-    }
+        });
+    }*/
 
 
 }

+ 2 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -361,11 +361,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         if (!Check.isNull(startDate)) {
             param.put("start_date", DateUtils.formatDate(startDate));
         }
-        if (Check.isNull(endDate)) {
+        if (!Check.isNull(endDate)) {
             param.put("end_date", DateUtils.formatDate(endDate));
         }
-
-
         param.put("advertiser_id", token.getAccountId());
         param.put("temporal_granularity", "DAILY");
         param.put("page_size", 500);
@@ -2043,6 +2041,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                             }
                         }
                     }
+                    log.info("获取视频信息完成,advertiserId:{}", advertiserId);
                 } else {
                     log.error("获取广告视频失败,advertiser_id:{},返回信息:{}", advertiserId, resultJson);
                 }

+ 0 - 1
module-toutiao/pom.xml

@@ -13,7 +13,6 @@
     <artifactId>module-toutiao</artifactId>
 
     <name>module-toutiao</name>
-    <!-- FIXME change it to the project's website -->
     <url>http://www.example.com</url>
 
     <properties>

+ 0 - 1
performance-appraisal/pom.xml

@@ -12,7 +12,6 @@
     <artifactId>performance-appraisal</artifactId>
 
     <name>performance-appraisal</name>
-    <!-- FIXME change it to the project's website -->
     <url>http://www.example.com</url>
 
     <properties>

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java

@@ -1,7 +1,7 @@
 package cn.com.ctop.performanceappraisal.controller;
 
-import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.service.IPerformanceService;
+import cn.com.ctop.performanceappraisal.entity.Performance;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 12 - 14
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java

@@ -3,14 +3,13 @@ package cn.com.ctop.performanceappraisal.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -31,20 +30,22 @@ public class Performance {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * sys_user的主键id
      */
     @Excel(name = "sys_user的主键id", width = 15)
     @ApiModelProperty(value = "sys_user的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     private String userId;
     /**
      * sys_role的主键id
      */
     @Excel(name = "sys_role的主键id", width = 15)
     @ApiModelProperty(value = "sys_role的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 年度
@@ -61,19 +62,15 @@ public class Performance {
     /**
      * 绩效统计开始时间
      */
-    @Excel(name = "绩效统计开始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绩效统计开始时间", width = 15)
     @ApiModelProperty(value = "绩效统计开始时间")
-    private Date startTime;
+    private String startTime;
     /**
      * 绩效统计结束时间
      */
-    @Excel(name = "绩效统计结束时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "绩效统计结束时间", width = 15)
     @ApiModelProperty(value = "绩效统计结束时间")
-    private Date endTime;
+    private String endTime;
     /**
      * 总消耗(单位元)
      */
@@ -107,8 +104,9 @@ public class Performance {
     /**
      * 1_快手2_抖音
      */
-    @Excel(name = "1_快手2_抖音", width = 15)
-    @ApiModelProperty(value = "1_快手2_抖音")
+    @Excel(name = "媒体类型", width = 15)
+    @ApiModelProperty(value = "媒体类型")
+    @Dict(dicCode = "media_type")
     private Integer appType;
     /**
      * 创建时间

+ 10 - 14
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -1,21 +1,17 @@
 package cn.com.ctop.performanceappraisal.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import java.util.Date;
+
 /**
  * 角色提点比例
  *
@@ -33,9 +29,9 @@ public class RolePerformancRraise {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 角色id
      */
@@ -61,6 +57,12 @@ public class RolePerformancRraise {
     @ApiModelProperty(value = "n 百分之n")
     private java.math.BigDecimal videoEfficiencyRate;
     /**
+     * 1:快手 2:头条
+     */
+    @Excel(name = "1:快手 2:头条", width = 15)
+    @ApiModelProperty(value = "1:快手 2:头条")
+    private Integer appType;
+    /**
      * 是否可用
      */
     @Excel(name = "是否可用", width = 15)
@@ -76,10 +78,4 @@ public class RolePerformancRraise {
      */
     @ApiModelProperty(value = "updateTime")
     private Date updateTime;
-    /**
-     * 1:快手 2:头条
-     */
-    @Excel(name = "1:快手 2:头条", width = 15)
-    @ApiModelProperty(value = "1:快手 2:头条")
-    private Integer appType;
 }

+ 5 - 2
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.Date;
@@ -29,14 +30,15 @@ public class RolePerformanceCommission {
     /**
      * 主键id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键id")
-    private Integer id;
+    private Long id;
     /**
      * sys_role的主键id
      */
     @Excel(name = "sys_role的主键id", width = 15)
     @ApiModelProperty(value = "sys_role的主键id")
+    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
     private String roleId;
     /**
      * 角色提成比例
@@ -55,6 +57,7 @@ public class RolePerformanceCommission {
      */
     @Excel(name = "1:快手  2:头条", width = 15)
     @ApiModelProperty(value = "1:快手  2:头条")
+    @Dict(dicCode = "media_type")
     private Integer appType;
     /**
      * 开始时间

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java

@@ -1,8 +1,8 @@
 package cn.com.ctop.performanceappraisal.service.impl;
 
+import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import cn.com.ctop.performanceappraisal.entity.Performance;
 import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 

+ 0 - 13
performance-appraisal/src/test/java/cn/com/ctop/performanceappraisal/PerformanceAppraisalApplicationTests.java

@@ -1,13 +0,0 @@
-package cn.com.ctop.performanceappraisal;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class PerformanceAppraisalApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

+ 2 - 1
pom.xml

@@ -22,8 +22,9 @@
         <module>module-toutiao</module>
         <module>module-media</module>
         <module>module-report</module>
-        <module>jeecg-boot-module-system</module>
         <module>module-ctop</module>
+        <module>performance-appraisal</module>
+        <module>jeecg-boot-module-system</module>
 
     </modules>