Selaa lähdekoodia

feature 代码提交

xiahan 8 kuukautta sitten
vanhempi
commit
0a667bb4c7
27 muutettua tiedostoa jossa 2479 lisäystä ja 22 poistoa
  1. 5 6
      jsglkh-common/pom.xml
  2. 15 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/ApiLogMapper.java
  3. 16 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/PmProjectMapper.java
  4. 25 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SqlServerMapper.java
  5. 15 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SysConfigMapper.java
  6. 18 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/ZProjectMapper.java
  7. 16 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/ApiLogService.java
  8. 12 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/PmProjectService.java
  9. 21 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/RedisService.java
  10. 21 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/SysConfigService.java
  11. 13 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/ZProjectService.java
  12. 14 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApiLogServiceImpl.java
  13. 22 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/PmProjectServiceImpl.java
  14. 54 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RedisServiceImpl.java
  15. 64 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ScheduledTasksServiceBySqlServerImpl.java
  16. 39 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysConfigServiceImpl.java
  17. 21 0
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZProjectServiceImpl.java
  18. 3 3
      jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/AttendanceAssessmentSdk.java
  19. 10 0
      jsglkh-common/src/main/resources/mybatis/PmProjectMapper.xml
  20. 16 0
      jsglkh-common/src/main/resources/mybatis/SqlServerMapper.xml
  21. 12 0
      jsglkh-common/src/main/resources/mybatis/ZProjectMapper.xml
  22. 22 7
      jsglkh-entity/pom.xml
  23. 1009 0
      jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/PmProject.java
  24. 975 0
      jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/ZProject.java
  25. 5 5
      jsglkh-server/pom.xml
  26. 4 1
      jsglkh-server/src/main/java/com/rongwei/BusinessServerApplication.java
  27. 32 0
      jsglkh-server/src/main/java/com/rongwei/controller/ScheduledTasksServiceController.java

+ 5 - 6
jsglkh-common/pom.xml

@@ -23,11 +23,10 @@
             <artifactId>jsglkh-entity</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.baomidou</groupId>-->
-<!--            <artifactId>mybatis-plus-generator</artifactId>-->
-<!--            <version>3.1.2</version>-->
-<!--        </dependency>-->
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
     </dependencies>
 </project>

+ 15 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/ApiLogMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.rwcommon.base.BaseDao;
+import com.rongwei.rwcommonentity.commonservers.domain.ApiLogDo;
+
+/**
+ * 通用接口调用日志
+ *
+ * @author chglee
+ * @email 1992lcg@163.com
+ * @date 2021-09-13 18:06:47
+ */
+public interface ApiLogMapper extends BaseDao<ApiLogDo> {
+
+}

+ 16 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/PmProjectMapper.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.PmProject;
+
+/**
+ * @Entity generator.domain.PmProject
+ */
+public interface PmProjectMapper extends BaseMapper<PmProject> {
+    void truncateThisTable();
+}
+
+
+
+

+ 25 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SqlServerMapper.java

@@ -0,0 +1,25 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.rongwei.bsentity.domain.PmProject;
+import com.rongwei.bsentity.domain.ZProject;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * @Entity generator.domain.PmProject
+ */
+@DS("slave")
+@Mapper
+public interface SqlServerMapper {
+    @DS("slave")
+    List<PmProject> getPmProjectList();
+    @DS("slave")
+    List<ZProject> getZProjectList();
+}
+
+
+
+

+ 15 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/SysConfigMapper.java

@@ -0,0 +1,15 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.rwcommon.base.BaseDao;
+import com.rongwei.rwcommonentity.commonservers.domain.SysConfigDo;
+
+/**
+ * 系统配置表
+ * 
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2019-10-10 09:46:12
+ */
+public interface SysConfigMapper extends BaseDao<SysConfigDo> {
+	
+}

+ 18 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/dao/ZProjectMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.ZProject;
+
+
+/**
+ * @Entity generator.domain.ZProject
+ */
+public interface ZProjectMapper extends BaseMapper<ZProject> {
+
+    void truncateThisTable();
+}
+
+
+
+

+ 16 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/ApiLogService.java

@@ -0,0 +1,16 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.rwcommonentity.commonservers.domain.ApiLogDo;
+
+/**
+ * 通用接口调用日志
+ *
+ * @author chglee返回值json
+ * @email 1992lcg@163.com
+ * @date 2021-09-13 18:06:47
+ */
+public interface ApiLogService extends IService<ApiLogDo> {
+
+}
+

+ 12 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/PmProjectService.java

@@ -0,0 +1,12 @@
+package com.rongwei.bscommon.sys.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.PmProject;
+
+/**
+ *
+ */
+public interface PmProjectService extends IService<PmProject> {
+
+}

+ 21 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/RedisService.java

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service;
+
+
+
+import org.springframework.data.redis.core.RedisTemplate;
+import java.util.Set;
+
+public interface RedisService {
+
+
+    void redisCatchInit(String key, Object obj, int expireTime);
+
+    Object getRedisCatchObj(String key);
+
+
+    Set<String> getPatternKey(String pattern);
+
+    boolean hasKey(String key);
+
+
+}

+ 21 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/SysConfigService.java

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.rwcommonentity.commonservers.domain.SysConfigDo;
+
+
+/**
+ * 系统配置表
+ *
+ * @author chenshun
+ * @email sunlightcs@gmail.com
+ * @date 2019-10-10 09:46:12
+ */
+public interface SysConfigService extends IService<SysConfigDo> {
+
+    String getContentByConfigCode(String code);
+
+    SysConfigDo getObjByConfigCode(String code);
+
+}
+

+ 13 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/ZProjectService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ZProject;
+
+/**
+ * ZProjectService class
+ *
+ * @author XH
+ * @date 2024/12/04
+ */
+public interface ZProjectService extends IService<ZProject> {
+}

+ 14 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApiLogServiceImpl.java

@@ -0,0 +1,14 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ApiLogMapper;
+import com.rongwei.bscommon.sys.service.ApiLogService;
+import com.rongwei.rwcommonentity.commonservers.domain.ApiLogDo;
+import org.springframework.stereotype.Service;
+
+@Service("apiLogService")
+public class ApiLogServiceImpl extends ServiceImpl<ApiLogMapper, ApiLogDo> implements ApiLogService {
+
+
+}

+ 22 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/PmProjectServiceImpl.java

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.PmProjectMapper;
+import com.rongwei.bscommon.sys.service.PmProjectService;
+import com.rongwei.bsentity.domain.PmProject;
+import org.springframework.stereotype.Service;
+
+
+/**
+ *
+ */
+@Service
+public class PmProjectServiceImpl extends ServiceImpl<PmProjectMapper, PmProject>
+implements PmProjectService {
+
+}
+
+
+
+

+ 54 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RedisServiceImpl.java

@@ -0,0 +1,54 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bscommon.sys.service.RedisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+@Service("MyRedisService")
+public class RedisServiceImpl implements RedisService {
+
+    @Value("${jwt.expire}")
+    private int expire;
+
+    @Autowired
+    private RedisTemplate redisTemplate;
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+
+
+    @Override
+    public void redisCatchInit(String key, Object obj, int expireTime) {
+        if (expireTime > 0) {
+            redisTemplate.opsForValue().set(key, obj, expireTime, TimeUnit.SECONDS);
+        } else {
+            redisTemplate.opsForValue().set(key, obj);
+        }
+    }
+
+    @Override
+    public Object getRedisCatchObj(String key) {
+        return redisTemplate.opsForValue().get(key);
+    }
+
+    //    判断key是否存在
+    public boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 根据 pattern 模糊查询,查所有传入 "*" 即可
+     *
+     * @param pattern
+     * @return
+     */
+    public Set<String> getPatternKey(String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+
+}

+ 64 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ScheduledTasksServiceBySqlServerImpl.java

@@ -0,0 +1,64 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+
+import com.rongwei.bscommon.sys.dao.SqlServerMapper;
+import com.rongwei.bscommon.sys.service.ScheduledTasksServiceBySqlServer;
+import com.rongwei.bsentity.domain.PmProject;
+import com.rongwei.bsentity.domain.ZProject;
+import org.apache.commons.collections4.ListUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * ScheduledTasksServiceImpl class
+ *
+ * @author XH
+ * @date 2024/12/04
+ */
+@Service
+public class ScheduledTasksServiceBySqlServerImpl implements ScheduledTasksServiceBySqlServer {
+    @Autowired
+    private SqlServerMapper sqlServerMapper;
+    @Autowired
+    private PmProjectServiceImpl pmProjectService;
+    @Autowired
+    private ZProjectServiceImpl zProjectService;
+
+    @Override
+    public void projectAboutSync() {
+        pmProjectService.getBaseMapper().truncateThisTable();
+        zProjectService.getBaseMapper().truncateThisTable();
+        List<ZProject> zProjectList = sqlServerMapper.getZProjectList();
+        List<PmProject> pmProjectList = sqlServerMapper.getPmProjectList();
+        zProjectList.forEach(data -> {
+            data.setDeleted("0");
+        });
+        List<ZProject> collect = zProjectList.stream().filter(info -> info.getId() == 14237).collect(Collectors.toList());
+        List<List<ZProject>>partition1  = ListUtils.partition(collect, 3);
+        try {
+            partition1.parallelStream().forEach(data->{
+                zProjectService.saveBatch(data,3);
+            });
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+
+        pmProjectList.forEach(data -> {
+            data.setId(data.getProjectid());
+            data.setDeleted("0");
+        });
+        List<List<PmProject>> partition = ListUtils.partition(pmProjectList, 20);
+        partition.parallelStream().forEach(data->{
+            pmProjectService.saveBatch(data,20);
+        });
+
+    }
+}
+
+
+

+ 39 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysConfigServiceImpl.java

@@ -0,0 +1,39 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.SysConfigMapper;
+import com.rongwei.bscommon.sys.service.SysConfigService;
+import com.rongwei.rwcommonentity.commonservers.domain.SysConfigDo;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service("sysConfigService")
+public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfigDo> implements SysConfigService {
+
+    @Override
+    public String getContentByConfigCode(String code){
+        Map<String,Object> map = new HashMap<>();
+        map.put("CONFIGCODE", code);
+        List<SysConfigDo> lists = (List<SysConfigDo>) this.listByMap(map);
+        if(lists != null && lists.size()>0){
+            return lists.get(0).getConfigcontent();
+        }
+        return null;
+    }
+
+    @Override
+    public SysConfigDo getObjByConfigCode(String code){
+        Map<String,Object> map = new HashMap<>();
+        map.put("CONFIGCODE", code);
+        List<SysConfigDo> lists = (List<SysConfigDo>) this.listByMap(map);
+        if(lists != null && lists.size()>0){
+            return lists.get(0);
+        }
+        return null;
+    }
+
+}

+ 21 - 0
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZProjectServiceImpl.java

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.ZProjectMapper;
+import com.rongwei.bscommon.sys.service.ZProjectService;
+import com.rongwei.bsentity.domain.ZProject;
+import org.springframework.stereotype.Service;
+
+
+/**
+ *
+ */
+@Service
+public class ZProjectServiceImpl extends ServiceImpl<ZProjectMapper, ZProject>
+implements ZProjectService {
+
+}
+
+
+
+

+ 3 - 3
jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/AttendanceAssessmentSdk.java

@@ -7,9 +7,9 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.rongwei.bsentity.dto.ApiCallDto;
 import com.rongwei.bsentity.dto.ApiReturnDto;
-import com.rongwei.commonservice.service.ApiLogService;
-import com.rongwei.commonservice.service.RedisService;
-import com.rongwei.commonservice.service.SysConfigService;
+import com.rongwei.bscommon.sys.service.ApiLogService;
+import com.rongwei.bscommon.sys.service.RedisService;
+import com.rongwei.bscommon.sys.service.SysConfigService;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.Constants;
 import com.rongwei.rwcommon.utils.SecurityUtil;

+ 10 - 0
jsglkh-common/src/main/resources/mybatis/PmProjectMapper.xml

@@ -0,0 +1,10 @@
+<?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.rongwei.bscommon.sys.dao.PmProjectMapper">
+
+   <delete id="truncateThisTable">
+       TRUNCATE TABLE PM_Project;
+   </delete>
+</mapper>

+ 16 - 0
jsglkh-common/src/main/resources/mybatis/SqlServerMapper.xml

@@ -0,0 +1,16 @@
+<?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.rongwei.bscommon.sys.dao.SqlServerMapper">
+
+
+    <select id="getPmProjectList" resultType="com.rongwei.bsentity.domain.PmProject">
+        select *
+        from PM_Project
+    </select>
+    <select id="getZProjectList" resultType="com.rongwei.bsentity.domain.ZProject">
+        select *
+        from Z_Project
+    </select>
+</mapper>

+ 12 - 0
jsglkh-common/src/main/resources/mybatis/ZProjectMapper.xml

@@ -0,0 +1,12 @@
+<?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.rongwei.bscommon.sys.dao.ZProjectMapper">
+
+
+
+   <delete id="truncateThisTable">
+       TRUNCATE TABLE Z_PROJECT
+   </delete>
+</mapper>

+ 22 - 7
jsglkh-entity/pom.xml

@@ -14,21 +14,36 @@
     <version>1.0-SNAPSHOT</version>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.rongwei</groupId>-->
+<!--            <artifactId>rw-common-config</artifactId>-->
+<!--            <version>1.1-SNAPSHOT</version>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>com.rongwei</groupId>-->
+<!--                    <artifactId>rw-common-license</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.rongwei</groupId>
-            <artifactId>rw-common-config</artifactId>
+            <artifactId>rw-common-entity</artifactId>
             <version>1.1-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.rongwei</groupId>
-                    <artifactId>rw-common-license</artifactId>
-                </exclusion>
-            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.24</version>
         </dependency>
         <dependency>
             <groupId>com.rongwei</groupId>
             <artifactId>rw-common-utils</artifactId>
             <version>1.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>5.3.7</version>
+        </dependency>
     </dependencies>
 </project>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1009 - 0
jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/PmProject.java


+ 975 - 0
jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/ZProject.java

@@ -0,0 +1,975 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 财务云——生产项目
+ * @TableName Z_PROJECT
+ */
+@TableName(value ="Z_PROJECT")
+@Data
+public class ZProject implements Serializable {
+
+    @TableId(value = "ID")
+    private Long id;
+    /**
+     * 经营项目id
+     */
+    @TableField(value = "MMPROJECTID")
+    private Long mmprojectid;
+    /**
+     * 删除标识
+     */
+    private String deleted;
+    /**
+     * 项目主数据编码
+     */
+    @TableField(value = "PROJECTMASTERCODE")
+    private String projectmastercode;
+
+    /**
+     * 中标交底项目编号
+     */
+    @TableField(value = "ZAWARDP")
+    private String zawardp;
+
+    /**
+     * 项目名称
+     */
+    @TableField(value = "PROJECTCENTERNAME")
+    private String projectcentername;
+
+    /**
+     * 项目简称
+     */
+    @TableField(value = "PROJECTABBREVIATION")
+    private String projectabbreviation;
+
+    /**
+     * 项目外文名称
+     */
+    @TableField(value = "PROJECTFOREIGNNAME")
+    private String projectforeignname;
+
+    /**
+     * 曾用名
+     */
+    @TableField(value = "BEFORENAME")
+    private String beforename;
+
+    /**
+     * 中交项目业务分类值域
+     */
+    @TableField(value = "BUSINESSTYPEFIELD")
+    private String businesstypefield;
+
+    /**
+     * 中标主体单位
+     */
+    @TableField(value = "ZBZTDW")
+    private String zbztdw;
+
+    /**
+     * 中标主体单位名称
+     */
+    @TableField(value = "ZBZTDWNAME")
+    private String zbztdwname;
+
+    /**
+     * 项目机构
+     */
+    @TableField(value = "PROJECTORG")
+    private String projectorg;
+
+    /**
+     * 项目类别:选择工程承包,设计,其他类
+     */
+    @TableField(value = "PROJECTCATEGORY")
+    private String projectcategory;
+
+    /**
+     * 项目类型一级code
+     */
+    @TableField(value = "PROJECTTYPE1")
+    private String projecttype1;
+
+    /**
+     * 项目类型二级code
+     */
+    @TableField(value = "PROJECTTYPE2")
+    private String projecttype2;
+
+    /**
+     * 项目类型三级code
+     */
+    @TableField(value = "PROJECTTYPE3")
+    private String projecttype3;
+
+    /**
+     * 中交项目业务分类值域一级编码
+     */
+    @TableField(value = "ZCPBCCODE1")
+    private String zcpbccode1;
+
+    /**
+     * 中交项目业务分类值域二级编码
+     */
+    @TableField(value = "ZCPBCCODE2")
+    private String zcpbccode2;
+
+    /**
+     * 上级项目主数据编码
+     */
+    @TableField(value = "SUP_PROJECTCODE")
+    private String supProjectcode;
+
+    /**
+     * 项目年份
+     */
+    @TableField(value = "PROJECTYEAR")
+    private String projectyear;
+
+    /**
+     * 计划开始日期
+     */
+    @TableField(value = "STARTTIME")
+    private Date starttime;
+
+    /**
+     * 计划结束日期
+     */
+    @TableField(value = "ENDTIME")
+    private Date endtime;
+
+    /**
+     * 项目停用状态
+     */
+    @TableField(value = "ZSTATE")
+    private String zstate;
+
+    /**
+     * 停用原因
+     */
+    @TableField(value = "TYYY")
+    private String tyyy;
+
+    /**
+     * 区域总部
+     */
+    @TableField(value = "RHQ")
+    private String rhq;
+
+    /**
+     * 是否集团内投资项目
+     */
+    @TableField(value = "INVSET")
+    private String invset;
+
+    /**
+     * 是否“一带一路”
+     */
+    @TableField(value = "BR")
+    private String br;
+
+    /**
+     * 项目状态
+     */
+    @TableField(value = "PROJECTCENTERSTATUS")
+    private String projectcenterstatus;
+
+    /**
+     * 计税方式
+     */
+    @TableField(value = "TAXMETHOD")
+    private String taxmethod;
+
+    /**
+     * 平台关联状态(10:待同步,20:已同步,30:已同步未更新)
+     */
+    @TableField(value = "DCSYNCSTATUS")
+    private String dcsyncstatus;
+
+    /**
+     * 中交关联状态(10:待同步,20:已同步,30:已同步未更新)
+     */
+    @TableField(value = "JTSYNCSTATUS")
+    private String jtsyncstatus;
+
+    /**
+     * 日志信息
+     */
+    @TableField(value = "LOGMESSAGE")
+    private String logmessage;
+
+    /**
+     * 关联投资项目编号
+     */
+    @TableField(value = "RELATEDINVESTMENTPROJECTNO")
+    private String relatedinvestmentprojectno;
+
+    /**
+     * 国家:大洲代码
+     */
+    @TableField(value = "CONTRY1")
+    private String contry1;
+
+    /**
+     * 国家:国家地区代码
+     */
+    @TableField(value = "CONTRY2")
+    private String contry2;
+
+    /**
+     * 项目所在地:省
+     */
+    @TableField(value = "LOCATION1")
+    private String location1;
+
+    /**
+     * 项目所在地:市
+     */
+    @TableField(value = "LOCATION2")
+    private String location2;
+
+    /**
+     * 项目所在地:区
+     */
+    @TableField(value = "LOCATION3")
+    private String location3;
+
+    /**
+     * 发送记录ID
+     */
+    @TableField(value = "ZZSERIAL")
+    private String zzserial;
+
+    /**
+     * 项目组织模式一级
+     */
+    @TableField(value = "XMZZMS")
+    private String xmzzms;
+
+    /**
+     * 项目组织模式二级
+     */
+    @TableField(value = "XMZZMSEJ")
+    private String xmzzmsej;
+
+    /**
+     * 所属事业部
+     */
+    @TableField(value = "SSSYB")
+    private String sssyb;
+
+    /**
+     * 项目管理方式
+     */
+    @TableField(value = "ZMANAGE_MODE")
+    private String zmanageMode;
+
+    /**
+     * 是否联合体项目
+     */
+    @TableField(value = "ZWINNINGC")
+    private String zwinningc;
+
+    /**
+     * 投资主体
+     */
+    @TableField(value = "ZINVERSTOR")
+    private String zinverstor;
+
+    /**
+     * 项目批复/决议文号
+     */
+    @TableField(value = "ZAPPROVAL")
+    private String zapproval;
+
+    /**
+     * 项目批复/决议时间
+     */
+    @TableField(value = "ZAPVLDATE")
+    private Date zapvldate;
+
+    /**
+     * 收入来源
+     */
+    @TableField(value = "ZSI")
+    private String zsi;
+
+    /**
+     * 往来单位类别
+     */
+    @TableField(value = "WLDWLB")
+    private String wldwlb;
+
+    /**
+     * 项目状态
+     */
+    @TableField(value = "PROJSTATUS")
+    private String projstatus;
+
+    /**
+     * 项目资金来源
+     */
+    @TableField(value = "XMZJLY")
+    private String xmzjly;
+
+    /**
+     * 项目实际开工日期
+     */
+    @TableField(value = "ACTUALSTARTDATE")
+    private Date actualstartdate;
+
+    /**
+     * 业主单位名称
+     */
+    @TableField(value = "YZDWMC")
+    private String yzdwmc;
+
+    /**
+     * 是否房产并表项目
+     */
+    @TableField(value = "SFBB")
+    private String sfbb;
+
+    /**
+     * 项目业务模式
+     */
+    @TableField(value = "XMYWMS")
+    private String xmywms;
+
+    /**
+     * 国民经济行业分类
+     */
+    @TableField(value = "NEIC")
+    private String neic;
+
+    /**
+     * 项目阶段
+     */
+    @TableField(value = "PROJSTAGE")
+    private String projstage;
+
+    /**
+     * 项目所在地纬度
+     */
+    @TableField(value = "LATITUDE")
+    private String latitude;
+
+    /**
+     * 项目所在地经度
+     */
+    @TableField(value = "LONGITUDE")
+    private String longitude;
+
+    /**
+     * 是否关联投资项目
+     */
+    @TableField(value = "SFGLTZXM")
+    private String sfgltzxm;
+
+    /**
+     * 关联投资批复项目名称
+     */
+    @TableField(value = "GLTZXMMC")
+    private String gltzxmmc;
+
+    /**
+     * 是否CCCC直属项目
+     */
+    @TableField(value = "SFCCCC")
+    private String sfcccc;
+
+    /**
+     * 是否本年中交集团重点监控项目
+     */
+    @TableField(value = "SFZDJK")
+    private String sfzdjk;
+
+    /**
+     * 项目概况及规模
+     */
+    @TableField(value = "XMGKJGM")
+    private String xmgkjgm;
+
+    /**
+     * 主体工程结构及特点
+     */
+    @TableField(value = "ZTGCJGJTD")
+    private String ztgcjgjtd;
+
+    /**
+     * 监理单位名称
+     */
+    @TableField(value = "JLDWMC")
+    private String jldwmc;
+
+    /**
+     * 项目计划交工日期
+     */
+    @TableField(value = "PDDATE")
+    private Date pddate;
+
+    /**
+     * 项目计划竣工日期
+     */
+    @TableField(value = "PFDATE")
+    private Date pfdate;
+
+    /**
+     * 项目实际完工日期
+     */
+    @TableField(value = "ACTUALENDDATE")
+    private Date actualenddate;
+
+    /**
+     * 项目实际竣工日期
+     */
+    @TableField(value = "ACTUALCOMPDATE")
+    private Date actualcompdate;
+
+    /**
+     * 主要原因
+     */
+    @TableField(value = "MAJOR_REASON")
+    private String majorReason;
+
+    /**
+     * 参建外部单位
+     */
+    @TableField(value = "CJWBDW")
+    private String cjwbdw;
+
+    /**
+     * 参建外部单位类型
+     */
+    @TableField(value = "CJWBDWLX")
+    private String cjwbdwlx;
+
+    /**
+     * 贷款配套资金比例
+     */
+    @TableField(value = "DKPTZJBL")
+    private String dkptzjbl;
+
+    /**
+     * 设计施工技术标准
+     */
+    @TableField(value = "SJSGJSBZ")
+    private String sjsgjsbz;
+
+    /**
+     * 是否是见签项目
+     */
+    @TableField(value = "SFJQ")
+    private String sfjq;
+
+    /**
+     * 卫星电话配备
+     */
+    @TableField(value = "WXDHPB")
+    private String wxdhpb;
+
+    /**
+     * 周边应急资源分布
+     */
+    @TableField(value = "ZBYJZYFB")
+    private String zbyjzyfb;
+
+    /**
+     * 医务室建设情况
+     */
+    @TableField(value = "YWSJSQK")
+    private String ywsjsqk;
+
+    /**
+     * 涉及危大或超危大工程数量
+     */
+    @TableField(value = "WDGCSL")
+    private BigDecimal wdgcsl;
+
+    /**
+     * 涉及危大或超危大工程类型
+     */
+    @TableField(value = "WDGCLX")
+    private String wdgclx;
+
+    /**
+     * 参建二级单位
+     */
+    @TableField(value = "SECONDARYUNIT")
+    private String secondaryunit;
+
+    /**
+     * 参建三级单位
+     */
+    @TableField(value = "THIRDLEVELUNIT")
+    private String thirdlevelunit;
+
+    /**
+     * 项目实际交工日期
+     */
+    @TableField(value = "ACTUALDLVDATE")
+    private Date actualdlvdate;
+
+    /**
+     * 是否是一带一路沿线项目
+     */
+    @TableField(value = "SFYDYL")
+    private String sfydyl;
+
+    /**
+     * 中标项目名称
+     */
+    @TableField(value = "WIN_PROJNAME")
+    private String winProjname;
+
+    /**
+     * 基础信息同步状态
+     */
+    @TableField(value = "JCSYNCSTATUS")
+    private String jcsyncstatus;
+
+    /**
+     * 基础信息同步日志
+     */
+    @TableField(value = "JCSYNCLOG")
+    private String jcsynclog;
+
+    /**
+     * 管理信息同步状态
+     */
+    @TableField(value = "MANAGESYNCSTATUS")
+    private String managesyncstatus;
+
+    /**
+     * 管理信息同步日志
+     */
+    @TableField(value = "MANAGESYNCLOG")
+    private String managesynclog;
+
+    /**
+     * 合同约定应收款总额
+     */
+    @TableField(value = "HTYSK")
+    private BigDecimal htysk;
+
+    /**
+     * 竣工结算日期
+     */
+    @TableField(value = "JGJSRQ")
+    private Date jgjsrq;
+
+    /**
+     * 竣工结算金额_含税
+     */
+    @TableField(value = "JGJSJE_HS")
+    private BigDecimal jgjsjeHs;
+
+    /**
+     * 项目总人数
+     */
+    @TableField(value = "XMZRS")
+    private Integer xmzrs;
+
+    /**
+     * 中方人员数量
+     */
+    @TableField(value = "ZFRYSL")
+    private Integer zfrysl;
+
+    /**
+     * 外籍人员数量
+     */
+    @TableField(value = "WJRYSL")
+    private Integer wjrysl;
+
+    /**
+     * 项目安全应急联系人
+     */
+    @TableField(value = "XMAQYJLXR")
+    private String xmaqyjlxr;
+
+    /**
+     * 接口项目主数据编码(废弃)
+     */
+    @TableField(value = "ZPROJECT")
+    private String zproject;
+
+    /**
+     * 接口项目名称(废弃)
+     */
+    @TableField(value = "ZPROJNAME")
+    private String zprojname;
+
+    /**
+     * 项目子类
+     */
+    @TableField(value = "PROJECT_SUB_TYPE")
+    private String projectSubType;
+
+    /**
+     * 项目性质代码
+     */
+    @TableField(value = "PROJECT_NATURE")
+    private String projectNature;
+
+    /**
+     * 项目资金来源代码
+     */
+    @TableField(value = "PROJECT_FUNDING_SOURCE")
+    private String projectFundingSource;
+
+    /**
+     * 实际开工日期
+     */
+    @TableField(value = "ACTUAL_COMMENCEMENT_DATE")
+    private Date actualCommencementDate;
+
+    /**
+     * 业主单位名称
+     */
+    @TableField(value = "OWNER_UNIT_NAME")
+    private String ownerUnitName;
+
+    /**
+     * 实际交工日期
+     */
+    @TableField(value = "ACTUAL_DELIVERY_DATE")
+    private Date actualDeliveryDate;
+
+    /**
+     * 关联投资批复项目名称
+     */
+    @TableField(value = "GLTZPFXMMC")
+    private String gltzpfxmmc;
+
+    /**
+     * 质保金到期日
+     */
+    @TableField(value = "WARRANTY_DEPOSIT_EXPIRY_DATE")
+    private Date warrantyDepositExpiryDate;
+
+    /**
+     * 验收日期
+     */
+    @TableField(value = "ACCEPTANCE_DATE")
+    private Date acceptanceDate;
+
+    /**
+     * 实际开工日期新
+     */
+    @TableField(value = "STARTDATE")
+    private Date startdate;
+
+    /**
+     * 国民经济行业分类
+     */
+    @TableField(value = "GMJJHYFL")
+    private String gmjjhyfl;
+
+    /**
+     * SPV公司
+     */
+    @TableField(value = "ZSPV")
+    private String zspv;
+
+    /**
+     * 关联的实体项目编码
+     */
+    @TableField(value = "ZPELPROJ")
+    private String zpelproj;
+
+    /**
+     * 是否存在现汇类SPV公司
+     */
+    @TableField(value = "ZIF_SPV")
+    private String zifSpv;
+
+    /**
+     * 施工单位
+     */
+    @TableField(value = "ZSGDW")
+    private String zsgdw;
+
+    /**
+     * 项目主数据ID
+     */
+    @TableField(value = "CWYPJID")
+    private String cwypjid;
+
+    /**
+     * 项目获取方式
+     */
+    @TableField(value = "ACQUIRE_TYPE")
+    private String acquireType;
+
+    /**
+     * 签约品牌
+     */
+    @TableField(value = "CONTRACTED_BRAND")
+    private String contractedBrand;
+
+    /**
+     * 关联投资项目主数据编码
+     */
+    @TableField(value = "INVEST_ZPROJECT")
+    private String investZproject;
+
+    /**
+     * 项目资金来源
+     */
+    @TableField(value = "PROJ_FUND_SOURCE")
+    private String projFundSource;
+
+    /**
+     * 资质单位4A码
+     */
+    @TableField(value = "ZORG_QUAL")
+    private String zorgQual;
+
+    /**
+     * 是否关联投资项目
+     */
+    @TableField(value = "IS_FROM_INVEST")
+    private String isFromInvest;
+
+    /**
+     * 项目来源
+     */
+    @TableField(value = "PROJ_SOURCE")
+    private String projSource;
+
+    /**
+     * 境内外标识
+     */
+    @TableField(value = "ISOVERSEAS")
+    private String isoverseas;
+
+    /**
+     * 是否基于建设项目
+     */
+    @TableField(value = "IS_CAPITAL_PROJECT")
+    private String isCapitalProject;
+
+    /**
+     * 项目等级
+     */
+    @TableField(value = "PROJ_GRADE")
+    private String projGrade;
+
+    /**
+     * 币种
+     */
+    @TableField(value = "ZZCURRENCY")
+    private String zzcurrency;
+
+    /**
+     * 投资来源
+     */
+    @TableField(value = "INVEST_SOURCE")
+    private String investSource;
+
+    /**
+     * 计划开发周期(月)
+     */
+    @TableField(value = "PLAN_DEVELOP_CYCLE")
+    private String planDevelopCycle;
+
+    /**
+     * 资审日期
+     */
+    @TableField(value = "APPRAISAL_DATE")
+    private Date appraisalDate;
+
+    /**
+     * 资审结果
+     */
+    @TableField(value = "APPRAISAL_RESULT")
+    private String appraisalResult;
+
+    /**
+     * 项目性质
+     */
+    @TableField(value = "PROJ_NATURE")
+    private String projNature;
+
+    /**
+     * 项目合作方式
+     */
+    @TableField(value = "PROJ_COOP_MODE")
+    private String projCoopMode;
+
+    /**
+     * 设计单位名称
+     */
+    @TableField(value = "DESIGN_CO_NAME")
+    private String designCoName;
+
+    /**
+     * 预计总投资额
+     */
+    @TableField(value = "EXPE_TOT_INVE_AMT")
+    private BigDecimal expeTotInveAmt;
+
+    /**
+     * 招商方/业主单位ID
+     */
+    @TableField(value = "BUSIUNITID")
+    private String busiunitid;
+
+    /**
+     * 招商方/业主单位
+     */
+    @TableField(value = "BUSIUNIT")
+    private String busiunit;
+
+    /**
+     * 中标金额/土地成交金额
+     */
+    @TableField(value = "WIN_BID_AMT")
+    private BigDecimal winBidAmt;
+
+    /**
+     * 设计合同额
+     */
+    @TableField(value = "DESG_CON_AMT")
+    private BigDecimal desgConAmt;
+
+    /**
+     * 是否收到委托书(合同)
+     */
+    @TableField(value = "ISWBNOTICE")
+    private String iswbnotice;
+
+    /**
+     * 委托接收日期
+     */
+    @TableField(value = "BIDACCEPTANCEDATE")
+    private Date bidacceptancedate;
+
+    /**
+     * 录入人所在公司
+     */
+    @TableField(value = "ORG_CODE")
+    private String orgCode;
+
+    /**
+     * 录入人所在部门
+     */
+    @TableField(value = "USER_DEPT_ID")
+    private String userDeptId;
+
+    /**
+     * 中交内的行政单位ID
+     */
+    @TableField(value = "INNER_ORGID")
+    private String innerOrgid;
+
+    /**
+     * 中交内的行政单位名称
+     */
+    @TableField(value = "INNER_ORGNAME")
+    private String innerOrgname;
+
+    /**
+     * 项目推进目标
+     */
+    @TableField(value = "TAKE_TARGET")
+    private String takeTarget;
+
+    /**
+     * 设计单位ID
+     */
+    @TableField(value = "DESIGN_CO_ID")
+    private String designCoId;
+
+    /**
+     * 单位名称ID
+     */
+    @TableField(value = "BID_UNIT_ID")
+    private String bidUnitId;
+
+    /**
+     * 单位名称
+     */
+    @TableField(value = "BID_UNIT_NAME")
+    private String bidUnitName;
+
+    /**
+     * 委托(合同)日期
+     */
+    @TableField(value = "BIDNOTICEDATE")
+    private Date bidnoticedate;
+
+    /**
+     * 录入人
+     */
+    @TableField(value = "USER_CODE")
+    private String userCode;
+
+    /**
+     * 中标类型
+     */
+    @TableField(value = "BID_TYPE")
+    private String bidType;
+
+    /**
+     * 投标标段
+     */
+    @TableField(value = "BIDDING")
+    private String bidding;
+
+    /**
+     * 投标负责人ID
+     */
+    @TableField(value = "BID_PERSON_CHARGE_ID")
+    private String bidPersonChargeId;
+
+    /**
+     * 投标负责人名称
+     */
+    @TableField(value = "BID_PERSON_CHARGE")
+    private String bidPersonCharge;
+
+    /**
+     * 未中标分析
+     */
+    @TableField(value = "WINNINGBIDANALYSIS")
+    private String winningbidanalysis;
+
+    /**
+     * 中标项目名称
+     */
+    @TableField(value = "ISWINBID")
+    private String iswinbid;
+
+    /**
+     * 中标公示开始日期
+     */
+    @TableField(value = "BIDANNOUNCEDATES")
+    private Date bidannouncedates;
+
+    /**
+     * 是否政府框架项目
+     */
+    @TableField(value = "GOVFRAMEWORK")
+    private String govframework;
+
+    /**
+     * 中标公示截止日期
+     */
+    @TableField(value = "BIDANNOUNCEDATEE")
+    private Date bidannouncedatee;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

+ 5 - 5
jsglkh-server/pom.xml

@@ -64,11 +64,11 @@
         </dependency>
 
         <!-- druid -->
-        <dependency>
-            <groupId>com.github.drtrang</groupId>
-            <artifactId>druid-spring-boot2-starter</artifactId>
-            <version>1.1.10</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.drtrang</groupId>-->
+<!--            <artifactId>druid-spring-boot2-starter</artifactId>-->
+<!--            <version>1.1.10</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

+ 4 - 1
jsglkh-server/src/main/java/com/rongwei/BusinessServerApplication.java

@@ -3,12 +3,15 @@ package com.rongwei;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @EnableAsync
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+        DataSourceAutoConfiguration.class,
+})
 @EnableDiscoveryClient
 @EnableFeignClients
 @MapperScan("com.rongwei.*.*.dao")

+ 32 - 0
jsglkh-server/src/main/java/com/rongwei/controller/ScheduledTasksServiceController.java

@@ -0,0 +1,32 @@
+package com.rongwei.controller;
+
+import com.rongwei.bscommon.sys.service.impl.ScheduledTasksServiceBySqlServerImpl;
+import com.rongwei.rwcommon.base.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * ScheduledTasksServiceController class
+ *
+ * @author XH
+ * @date 2024/12/04
+ */
+@Slf4j
+@RestController
+@RequestMapping("/scheduled")
+public class ScheduledTasksServiceController {
+    @Autowired
+    private ScheduledTasksServiceBySqlServerImpl scheduledTasksServiceBySqlServer;
+
+    /**
+     * 新增和修改接口同步方法
+     */
+    @PostMapping("/project")
+    public R pushDataSync() {
+        scheduledTasksServiceBySqlServer.projectAboutSync();
+        return R.ok();
+    }
+}