Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-deploy/src/main/resources/application.yml

@@ -100,3 +100,26 @@ simuwang:
       filters: jwt
     - path: "/**"
       filters: jwt
+
+quartz:
+  #quartz相关属性配置
+  org:
+    quartz:
+      scheduler:
+        instanceName: DefaultQuartzScheduler #调度器的实例名
+        instanceId: AUTO #调度器编号自动生成
+      jobStore:
+        class: org.quartz.impl.jdbcjobstore.JobStoreTX
+        driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+        tablePrefix: database.QRTZ_  #数据库表名前缀
+        isClustered: true #开启分布式部署
+        clusterCheckinInterval: 10000 #分布式节点有效性检查时间间隔,单位:秒
+        useProperties: false #是否读取自己写的配置文件
+        dataSource: qzds
+      dataSource:
+        qzds:
+          driver: dm.jdbc.driver.DmDriver #达梦数据库驱动
+          url: jdbc:dm://192.168.1.39:5236/PPW_EMAIL?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&clobAsString=true
+          user: PPW_EMAIL
+          password: Dmppw2024
+          validationQuery: select 0 from dual

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -20,6 +20,7 @@ import java.util.List;
  * Date:     2024/9/6 15:25
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "公司邮箱配置管理")
 @RestController
 @RequestMapping("/v1/company")
 public class CompanyEmailSendHistoryController{

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyInformationController.java

@@ -1,5 +1,6 @@
 package com.simuwang.manage.api.company;
 
+import com.simuwang.logging.SystemLog;
 import com.simuwang.manage.service.CompanyInformationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,6 +16,7 @@ import java.util.Map;
  * Date:     2024/9/6 15:25
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "公司信息管理")
 @RestController
 @RequestMapping("/v1/company")
 public class CompanyInformationController {

service-manage/src/main/java/com/simuwang/manage/api/deletion/DeletionController.java

@@ -34,6 +34,7 @@ import java.util.Map;
  * Date:     2024/9/17 18:16
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "缺失管理")
 @RestController
 @RequestMapping("/v1/deletion")
 public class DeletionController {

service-manage/src/main/java/com/simuwang/manage/api/distribution/DistributionController.java

@@ -13,11 +13,12 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
- * FileName: DistributionController
+ * 分红管理
  * Author:   chenjianhua
  * Date:     2024/9/15 13:36
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "分红管理")
 @RestController
 @RequestMapping("/v1/distribution")
 public class DistributionController {

service-manage/src/main/java/com/simuwang/manage/api/email/EmailAssetDetailController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * Date:     2024/9/10 11:21
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "数据详情")
 @RestController
 @RequestMapping("/v1/asset")
 public class EmailAssetDetailController{

service-manage/src/main/java/com/simuwang/manage/api/email/EmailConfigController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
  * Date:     2024/9/9 11:40
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "接收邮箱配置管理")
 @RestController
 @RequestMapping("/v1/email")
 public class EmailConfigController{

service-manage/src/main/java/com/simuwang/manage/api/email/EmailNavDetailController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
  * Date:     2024/9/10 11:21
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "数据详情")
 @RestController
 @RequestMapping("/v1/nav")
 public class EmailNavDetailController{

service-manage/src/main/java/com/simuwang/manage/api/email/ParseEmailController.java

@@ -30,6 +30,7 @@ import java.util.Map;
  * Date:     2024/9/10 11:21
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "解析详情管理")
 @RestController
 @RequestMapping("/v1/parse")
 public class ParseEmailController{

service-manage/src/main/java/com/simuwang/manage/api/fund/FunAliasController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
  * Date:     2024/9/14 14:05
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "基金别名管理")
 @RestController
 @RequestMapping("/v1/alias")
 public class FunAliasController {

service-manage/src/main/java/com/simuwang/manage/api/fund/FundInformationController.java

@@ -26,6 +26,7 @@ import java.util.Map;
  * Date:     2024/9/6 15:01
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "基金信息管理")
 @RestController
 @RequestMapping("/v1/fund")
 public class FundInformationController{

service-manage/src/main/java/com/simuwang/manage/api/navAsset/FundNavAssetController.java

@@ -19,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
  * Date:     2024/9/15 16:46
  * Description: ${DESCRIPTION}
  */
+@SystemLog(value = "净值规模管理")
 @RestController
 @RequestMapping("/v1/nav-asset")
 public class FundNavAssetController {

service-manage/src/main/java/com/simuwang/manage/init/QuartzConfig.java

@@ -31,7 +31,7 @@ import java.util.List;
  */
 @Configuration
 @Order(2)
-public class QuartzConfig implements ApplicationRunner {
+public class QuartzInitConfig implements ApplicationRunner {
     @Autowired
     private Scheduler scheduler;
     private final Logger logger = LoggerFactory.getLogger(this.getClass());

service-manage/src/main/java/com/simuwang/manage/service/impl/DeletionServiceImpl.java

@@ -69,6 +69,7 @@ public class DeletionServiceImpl implements DeletionService {
             fundDeletionInfoDO.setDeletionType(vo.getDeletionType());
             fundDeletionInfoDO.setFundId(vo.getFundId());
             fundDeletionInfoDO.setDeletionDate(vo.getDeletionDate());
+            fundDeletionInfoDO.setRemark(vo.getRemark());
             fundDeletionInfoDO.setIsvalid(1);
             fundDeletionInfoDO.setUpdateTime(DateUtils.getNowDate());
             fundDeletionInfoDO.setUpdaterId(UserUtils.getLoginUser().getUserId());