Procházet zdrojové kódy

添加绩效考核子项目

syh před 5 roky
rodič
revize
d9bad3d95d

+ 0 - 26
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActorController.java

@@ -286,32 +286,6 @@ public class ActorController {
             }
 
             boolean ok = actorService.updateById(actor);
-//            ActorPhoto actorPhoto = new ActorPhoto();
-//            actorPhoto.setActorId(actor.getId());
-//            QueryWrapper photoQueryWrapper = QueryGenerator.initQueryWrapper(actorPhoto, null);
-//            actorPhotoService.remove(photoQueryWrapper);
-//
-//            ActorVideo actorVideo = new ActorVideo();
-//            actorVideo.setActorId(actor.getId());
-//            QueryWrapper videoQueryWrapper = QueryGenerator.initQueryWrapper(actorVideo, null);
-//            actorVideoService.remove(videoQueryWrapper);
-//            if (actor.getImageUrl() != null && actor.getImageUrl().size() > 0) {
-//                for (String url : actor.getImageUrl()) {
-//                    ActorPhoto photo = new ActorPhoto();
-//                    photo.setActorId(actor.getId());
-//                    photo.setPhotoUrl("http:" + url);
-//                    actorPhotoService.save(photo);
-//                }
-//            }
-//            if (actor.getVideoUrl() != null && actor.getVideoUrl().size() > 0) {
-//                for (String url : actor.getVideoUrl()) {
-//                    ActorVideo video = new ActorVideo();
-//                    video.setActorId(actor.getId());
-//                    video.setVideoUrl("http:" + url);
-//                    actorVideoService.save(video);
-//                }
-//            }
-            //TODO 返回false说明什么?
             if (ok) {
                 result.success("修改成功!");
             }

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdCoverController.java

@@ -7,7 +7,6 @@ import cn.com.ctop.kuaishou.modules.app.entity.AppVideo;
 import cn.com.ctop.kuaishou.modules.app.service.IAppAdService;
 import cn.com.ctop.kuaishou.modules.app.service.IAppVideoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.system.service.ISysCategoryService;
@@ -103,9 +102,7 @@ public class AdCoverController {
         String orderByType = paramMap.get("orderByType")!=null?paramMap.get("orderByType")[0]:null;
         Integer pageSize = paramMap.get("pageSize")!=null?Integer.parseInt(paramMap.get("pageSize")[0]):null;
         Integer pageNo = paramMap.get("pageNo")!=null?Integer.parseInt(paramMap.get("pageNo")[0]):null;
-//        Integer pageSize = paramMap.get("pageSize")!=null?paramMap.get("orderByType")[0]:null;
         int pageStart = (pageNo-1)*pageSize;
-        Page<AppAd> page = new Page<AppAd>(pageNo, pageSize);
         List<AppAd> list = appAdService.queryAdFeeds(userName, industry, company, product, start, end, orderByColumn, orderByType, pageStart, pageSize);
         result.setResult(list);
         result.setSuccess(true);

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

@@ -174,7 +174,6 @@ public class AdvertiserController {
             result.error500("未找到对应实体");
         } else {
             boolean ok = advertiserService.updateById(advertiser);
-            //TODO 返回false说明什么?
             if (ok) {
                 result.success("修改成功!");
             }

+ 26 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestMqController.java

@@ -12,6 +12,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -47,4 +52,25 @@ public class TestMqController {
         ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS.getCode());
         return result;
     }
+
+    @GetMapping("task33")
+    public void task1(HttpServletResponse response) throws Exception {
+        File f = new File("C:\\Users\\宋英豪\\Desktop\\OKR\\2.png");
+        if (!f.exists()) {
+            return;
+        }
+        BufferedInputStream br = new BufferedInputStream(new FileInputStream(f));
+        byte[] buf = new byte[1024];
+        int len = 0;
+        response.reset(); // 非常重要
+        // 纯下载方式
+        response.setContentType("application/x-msdownload");
+        response.setHeader("Content-Disposition", "attachment; filename=" + f.getName());
+        OutputStream out = response.getOutputStream();
+        while ((len = br.read(buf)) > 0) {
+            out.write(buf, 0, len);
+        }
+        br.close();
+        out.close();
+    }
 }

binární
lib/webmagic-core-0.7.3.jar


+ 6 - 6
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/BytedanceReportServiceImpl.java

@@ -311,11 +311,11 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
                 JSONObject comparedJson = new JSONObject();
 
                 if ("month".equals(sign)) {
-                    Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM", bigDate, smallDate);
+                    Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM", bigDate, smallDate);
                     beComparedJson = reportMapper.selectMonthReportByDate((String) dateMap.get("smallDate"));
                     comparedJson = reportMapper.selectMonthReportByDate((String) dateMap.get("bigDate"));
                 } else if ("day".equals(sign)) {
-                    Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM-dd", bigDate, smallDate);
+                    Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM-dd", bigDate, smallDate);
                     beComparedJson = reportMapper.selectDayReportByDate((String) dateMap.get("smallDate"));
                     comparedJson = reportMapper.selectDayReportByDate((String) dateMap.get("bigDate"));
                 }
@@ -468,11 +468,11 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
                 List<JSONObject> comparedArr = new ArrayList<>();
                 String comparedDate = "";
                 if ("month".equals(sign)) {
-                    Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM", bigDate, smallDate);
+                    Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM", bigDate, smallDate);
                     comparedDate = (String) dateMap.get("smallDate");
                     comparedArr = reportMapper.selectDayDetailsByMonth((String) dateMap.get("bigDate"));
                 } else if ("day".equals(sign)) {
-                    Map<String, Object> dateMap = DateUtils.compare_date("yyyy-MM-dd", bigDate, smallDate);
+                    Map<String, Object> dateMap = DateUtils.compareDate("yyyy-MM-dd", bigDate, smallDate);
                     comparedDate = (String) dateMap.get("smallDate");
                     comparedArr = reportMapper.selectHourlyDetailsByDate((String) dateMap.get("bigDate"));
                 }
@@ -606,9 +606,9 @@ public class BytedanceReportServiceImpl implements IBytedanceReportService {
                 String smallDate = requestJson.getString("smallDate");
                 Map<String, Object> dateMap = new HashMap<>();
                 if ("month".equals(sign)) {
-                    dateMap = DateUtils.compare_date("yyyy-MM", bigDate, smallDate);
+                    dateMap = DateUtils.compareDate("yyyy-MM", bigDate, smallDate);
                 } else if ("day".equals(sign)) {
-                    dateMap = DateUtils.compare_date("yyyy-MM-dd", bigDate, smallDate);
+                    dateMap = DateUtils.compareDate("yyyy-MM-dd", bigDate, smallDate);
                 }
                 String comparedDate = (String) dateMap.get("bigDate");
                 String beComparedDate = (String) dateMap.get("smallDate");

+ 13 - 0
mondule-jbpm/src/main/java/cn/com/ctop/jbpm/JbpmApplication.java

@@ -0,0 +1,13 @@
+package cn.com.ctop.jbpm;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class JbpmApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(JbpmApplication.class, args);
+    }
+
+}

+ 1 - 0
mondule-jbpm/src/main/resources/application.properties

@@ -0,0 +1 @@
+

+ 13 - 0
mondule-jbpm/src/test/java/cn/com/ctop/jbpm/JbpmApplicationTests.java

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

+ 67 - 0
performance-appraisal/pom.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>jeecg-boot-parent</artifactId>
+        <groupId>org.jeecgframework.boot</groupId>
+        <version>2.0.2</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.com.ctop</groupId>
+    <artifactId>performance-appraisal</artifactId>
+
+    <name>performance-appraisal</name>
+    <!-- FIXME change it to the project's website -->
+    <url>http://www.example.com</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-common</artifactId>
+            <version>2.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-common</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.ctop</groupId>
+            <artifactId>module-kuaishou</artifactId>
+            <version>2.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <!-- 解决MyBatis配置文件引入问题 -->
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.properties</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <!-- 是否替换资源中的属性-->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

+ 13 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/PerformanceAppraisalApplication.java

@@ -0,0 +1,13 @@
+package cn.com.ctop.performanceappraisal;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class PerformanceAppraisalApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(PerformanceAppraisalApplication.class, args);
+    }
+
+}

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

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