4/22

kimi

2020-04-22 e96252ffd9f8368badf065436e2b58930fbd3b8d

4/22

 pom.xml

@@ -32,7 +32,7 @@
        <dependency>
            <groupId>org.mybatis.spring.boot</groupId>
            <artifactId>mybatis-spring-boot-starter</artifactId>
            <version>2.1.1</version>
            <version>1.3.2</version>
        </dependency>
        <dependency>
            <groupId>org.freemarker</groupId>

 src/main/java/com/highdatas/srs/util/CustomDate.java

@@ -57,6 +57,7 @@
        try {
            DateFormat dateFormat = new SimpleDateFormat(format);
            date = dateFormat.parse(dateStr);
            date.setHours(1);
        } catch (Exception e) {

        }

 src/main/java/com/highdatas/srs/util/DbUtils.java

@@ -65,6 +65,23 @@
//        valueOfMethod.invoke(baseWapper, )
    }

    public static int compareDate( Date dt1,  Date dt2) {
        try {
            if (dt1.getTime() > dt2.getTime()) {
                System.out.println("dt1 在dt2前");
                return 1;
            } else if (dt1.getTime() < dt2.getTime()) {
                System.out.println("dt1在dt2后");
                return -1;
            } else {
                return 0;
            }
        } catch (Exception exception) {
            exception.printStackTrace();
        }
        return 0;
    }

    public static String toSqlToJava(String sqlType) {
        if( sqlType == null || sqlType.trim().length() == 0 ) return sqlType;
        sqlType = sqlType.toLowerCase();
@@ -184,6 +201,27 @@
        return sbf.toString();
    }

    public static boolean isEffectiveDate(Date nowTime, Date startTime, Date endTime) {
        if (nowTime.getTime() == startTime.getTime()
                || nowTime.getTime() == endTime.getTime()) {
            return true;
        }

        Calendar date = Calendar.getInstance();
        date.setTime(nowTime);

        Calendar begin = Calendar.getInstance();
        begin.setTime(startTime);

        Calendar end = Calendar.getInstance();
        end.setTime(endTime);

        if (date.after(begin) && date.before(end)) {
            return true;
        } else {
            return false;
        }
    }
    public static int getDayDiffer(Date startDate, Date endDate) throws ParseException {
        //判断是否跨年
        SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy");

 src/main/java/com/highdatas/srs/web/FileController.java

@@ -243,6 +243,7 @@

            detail.setFinish(true);
            detail.setUpdateTime(new Date());
            detail.setFinishTime(new Date());
            detail.updateById();
            return Result.success(CodeMsg.SUCCESS);
        }
@@ -284,6 +285,7 @@
            detail.setFinish(true);
            detail.setAttachment(path + "/" + fileName);
            detail.setUpdateTime(new Date());
            detail.setFinishTime(new Date());
            detail.updateById();
            return Result.success(CodeMsg.SUCCESS);
        } catch (IllegalStateException e) {

 src/main/java/com/highdatas/srs/web/SchemeController.java

@@ -298,7 +298,7 @@


        //目录
        result.fluentPut("paths",childrenFiles );
        result.fluentPut("paths",childrenFiles);
        return Result.success(result);
    }

@@ -377,6 +377,32 @@
            json.fluentPut("delayCnt", delayInt);
            json.fluentPut("finishCnt", finishInt);

            //
            List<SchemeDetail> schemeDetailList = iSchemeDetailService.selectList(new EntityWrapper<SchemeDetail>().eq("parent_id", scheme.getId()).eq("finish", true));
            Date beginDate = null;
            Date endDate = null;
            for (SchemeDetail detail : schemeDetailList) {
                if (beginDate == null) {
                    beginDate = detail.getStartTime();
                }
                else {
                    int i = DbUtils.compareDate(beginDate, detail.getStartTime());
                    if(i == -1) {
                        beginDate = detail.getStartTime();
                    }
                }

                if (endDate == null) {
                    endDate = detail.getFinishTime();
                }else {
                    int i = DbUtils.compareDate(endDate, detail.getFinishTime());
                    if(i == 1) {
                        endDate = detail.getFinishTime();
                    }
                }
            }
            json.fluentPut("beginDate", beginDate);
            json.fluentPut("endDate", endDate);
            result.add(json);
        }
        jsonObjectPage.setRecords(result);
@@ -385,11 +411,9 @@

    @RequestMapping(value = "/addOrUpdate", method = RequestMethod.GET)
    public Result add(@RequestParam String reseachType, @RequestParam String name, @RequestParam Date startTime, @RequestParam Date endTime, HttpServletRequest request)  {

        String id = request.getParameter("id");
        String desp = request.getParameter("desp");
        String userId = request.getParameter("userId");

        Scheme scheme;
        if (StringUtils.isEmpty(id)) {
            scheme = new Scheme();
@@ -403,8 +427,29 @@
        if (StringUtils.isEmpty(scheme.getId())) {
            scheme.setId(DbUtils.getUUID());
        }
        boolean insert = scheme.setUserId(userId).setCreateTime(new Date()).setName(name).setStartTime(startTime).setEndTime(endTime)
                .setDesp(desp).setReseachType(reseachType).insertOrUpdate();
        scheme.setUserId(userId).setCreateTime(new Date()).setName(name).setStartTime(startTime).setEndTime(endTime)
                .setDesp(desp).setReseachType(reseachType);

        List<SchemeDetail> schemeDetailList = iSchemeDetailService.selectList(new EntityWrapper<SchemeDetail>().eq("parent_id", scheme.getId()));
        for (SchemeDetail detail : schemeDetailList) {
            Date detailStartTime = detail.getStartTime();
            if (detailStartTime != null) {
                boolean effectiveDate = DbUtils.isEffectiveDate(detailStartTime, startTime, endTime);
                if(!effectiveDate) {
                    detail.setStartTime(startTime);
                }
            }
            Date detailEndTime = detail.getEndTime();
            if (detailEndTime != null) {
                boolean effectiveDate = DbUtils.isEffectiveDate(detailEndTime, startTime, endTime);
                if(!effectiveDate) {
                    detail.setEndTime(endTime);
                }
            }
            boolean updated = detail.updateById();

        }
        boolean insert = scheme.insertOrUpdate();
        if (insert) {
            return Result.success(scheme.getId());
        } else {
@@ -416,7 +461,28 @@
    public Result add(@PathVariable String id, HttpServletRequest request) throws JsonProcessingException {
        String data = request.getParameter("data");
        Scheme scheme = DbUtils.json2Bean(data, Scheme.class);
        boolean b = scheme.insertOrUpdate();
        Date startTime = scheme.getStartTime();
        Date endTime = scheme.getEndTime();

        List<SchemeDetail> schemeDetailList = iSchemeDetailService.selectList(new EntityWrapper<SchemeDetail>().eq("parent_id", scheme.getId()));
        for (SchemeDetail detail : schemeDetailList) {
            Date detailStartTime = detail.getStartTime();
            if (detailStartTime != null) {
                boolean effectiveDate = DbUtils.isEffectiveDate(detailStartTime, startTime, endTime);
                if(!effectiveDate) {
                    detail.setStartTime(startTime);
                }
            }
            Date detailEndTime = detail.getEndTime();
            if (detailEndTime != null) {
                boolean effectiveDate = DbUtils.isEffectiveDate(detailEndTime, startTime, endTime);
                if(!effectiveDate) {
                    detail.setEndTime(endTime);
                }
            }
            detail.updateById();
        }
        boolean b = scheme.updateById();
        // reseachType to enum

        if (b) {

 src/main/java/com/highdatas/srs/web/SchemeDetailController.java

@@ -156,6 +156,7 @@
        schemeDetailEntityWrapper.eq("finish", false);
        schemeDetailEntityWrapper.eq("edit", false);
        List<SchemeDetail> schemeDetails = schemeDetailService.selectList(schemeDetailEntityWrapper);

        Set<Scheme> parent = new HashSet<>();
        for (SchemeDetail schemeDetail : schemeDetails) {
            schemeDetail.setTypeStr(schemeDetail.getType().covert());

 src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
server:
  port: 8090
  port: 9010
#url: jdbc:mysql://180.169.94.250:8306/data_admin?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC&nullCatalogMeansCurrent=true
base:
  file:

 src/main/resources/application-prod.yml

@@ -35,6 +35,7 @@
  global-config:
    db-config:
      column-underline: true

logging:
  level:
    com:

 src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active:
      dev
      prod