fix:维护一下日志的类型

service-base/src/main/java/com/simuwang/logging/SystemLog.java

@@ -45,6 +45,10 @@ public @interface SystemLog {
          */
         UPDATE(3),
         /**
+         * 新增和修改
+         */
+        INSERT_AND_UPDATE(4),
+        /**
          * 删除
          */
         DELETE(5),
@@ -57,13 +61,13 @@ public @interface SystemLog {
          */
         LOGOUT(7),
         /**
-         * 导入
+         * 上传或导入
          */
-        IMPORT(8),
+        UPLOAD_OR_IMPORT(8),
         /**
-         * 导出
+         * 下载或导出
          */
-        EXPORT(9),
+        DOWNLOAD_OR_EXPORT(9),
         /**
          * 其他
          */

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

@@ -73,7 +73,7 @@ public class CompanyEmailSendHistoryController{
      * @param idListVO
      * @return
      */
-    @SystemLog(value = "删除公司邮箱配置")
+    @SystemLog(value = "删除公司邮箱配置", type = SystemLog.Type.DELETE)
     @PostMapping("delete-company-email")
     public boolean deleteEmail(@RequestBody IdListVO idListVO){
         companyEmailSendHistoryService.deleteEmail(idListVO.getIdList());
@@ -85,7 +85,7 @@ public class CompanyEmailSendHistoryController{
      * @param comyanyEmailIdVO 已选行的idList
      * @return
      */
-    @SystemLog(value = "删除公司邮箱发送历史")
+    @SystemLog(value = "删除公司邮箱发送历史", type = SystemLog.Type.DELETE)
     @PostMapping("delete-email-history")
     public boolean deleteEmailHistory(@RequestBody IdListVO comyanyEmailIdVO){
         companyEmailSendHistoryService.deleteEmailHistory(comyanyEmailIdVO.getIdList());
@@ -97,7 +97,7 @@ public class CompanyEmailSendHistoryController{
      * @param companyEmailConfigVOList
      * @return
      */
-    @SystemLog(value = "保存公司邮箱")
+    @SystemLog(value = "保存公司邮箱", type = SystemLog.Type.INSERT)
     @PostMapping("save-email-config")
     public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
         ResultVo vo = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
@@ -109,7 +109,7 @@ public class CompanyEmailSendHistoryController{
      * @param companyEmailConfigVO
      * @return
      */
-    @SystemLog(value = "修改公司邮箱")
+    @SystemLog(value = "修改公司邮箱", type = SystemLog.Type.UPDATE)
     @PostMapping("update-email-config")
     public boolean updateCompanyEmailConfig(@RequestBody CompanyEmailConfigVO companyEmailConfigVO){
         companyEmailConfigService.updateCompanyEmailConfig(companyEmailConfigVO);
@@ -121,7 +121,7 @@ public class CompanyEmailSendHistoryController{
      * @param comyanyEmailIdVO --id
      * @return
      */
-    @SystemLog(value = "删除公司邮箱")
+    @SystemLog(value = "删除公司邮箱", type = SystemLog.Type.DELETE)
     @PostMapping("delete-email-config")
     public boolean deleteCompanyEmailConfig(@RequestBody IdVO comyanyEmailIdVO){
         companyEmailConfigService.deleteCompanyEmailConfig(comyanyEmailIdVO.getId());

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

@@ -73,7 +73,7 @@ public class DeletionController {
      * @param fundDeletionInfoVOList
      * @return
      */
-    @SystemLog(value = "保存缺失备注")
+    @SystemLog(value = "保存缺失备注", type = SystemLog.Type.INSERT)
     @RequestMapping("save-fund-deletion")
     public ResultVo saveFundDeletionList(@RequestBody List<FundDeletionInfoVO> fundDeletionInfoVOList){
         deletionService.saveFundDeletionList(fundDeletionInfoVOList);
@@ -85,7 +85,7 @@ public class DeletionController {
      * @param fundDeletionRemarkVO
      * @return
      */
-    @SystemLog(value = "批量修改缺失备注")
+    @SystemLog(value = "批量修改缺失备注", type = SystemLog.Type.UPDATE)
     @RequestMapping("batch-deletion-remark")
     public ResultVo saveBatchDeletionRemark(@RequestBody FundDeletionRemarkVO fundDeletionRemarkVO){
         deletionService.saveBatchDeletionRemark(fundDeletionRemarkVO);
@@ -97,7 +97,7 @@ public class DeletionController {
      * @param fundDeletionListVO
      * @return
      */
-    @SystemLog(value = "下载缺失数据")
+    @SystemLog(value = "下载缺失数据", type = SystemLog.Type.DOWNLOAD_OR_EXPORT)
     @ExcludeGlobalResult
     @PostMapping("/download-fund-deletion")
     public void downloadFundDeletion(@RequestBody FundDeletionListVO fundDeletionListVO, HttpServletResponse response){

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

@@ -45,7 +45,7 @@ public class DistributionController {
      * @param distributionVO
      * @return
      */
-    @SystemLog(value = "保存分红信息")
+    @SystemLog(value = "保存分红信息", type = SystemLog.Type.INSERT)
     @RequestMapping("save-distribution")
     public ResultVo saveDistribution(@RequestBody DistributionVO distributionVO) {
         ResultVo vo = distributionService.saveDistribution(distributionVO);
@@ -58,7 +58,7 @@ public class DistributionController {
      * @param idListVO
      * @return
      */
-    @SystemLog(value = "删除分红")
+    @SystemLog(value = "删除分红", type = SystemLog.Type.DELETE)
     @PostMapping("delete-distribution")
     public boolean deleteDistribution(@RequestBody IdListVO idListVO) {
         distributionService.deleteDistribution(idListVO);
@@ -71,6 +71,7 @@ public class DistributionController {
      * @param file
      * @return
      */
+    @SystemLog(value = "上传分红", type = SystemLog.Type.UPLOAD_OR_IMPORT)
     @PostMapping("upload-distribution")
     public ResultVo uploadDistribution(@RequestPart(value = "file") MultipartFile file) {
         ResultVo vo = distributionService.uploadDistribution(file);

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

@@ -43,7 +43,7 @@ public class EmailConfigController{
      * @param mailboxInfoVO
      * @return
      */
-    @SystemLog(value = "保存邮箱配置")
+    @SystemLog(value = "保存邮箱配置", type = SystemLog.Type.INSERT)
     @PostMapping("save-email-config")
     public ResultVo saveEmailConfig(@RequestBody MailboxInfoVO mailboxInfoVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
@@ -67,7 +67,7 @@ public class EmailConfigController{
      * @param openStatusVO
      * @return
      */
-    @SystemLog(value = "开启关闭邮箱启动状态")
+    @SystemLog(value = "开启关闭邮箱启动状态", type = SystemLog.Type.UPDATE)
     @PostMapping("control-email-status")
     public ResultVo controlEmailConfig(@RequestBody OpenStatusVO openStatusVO){
         ResultVo vo = new ResultVo(ResultCode.SAVE_SUCCESS.getCode());
@@ -105,7 +105,7 @@ public class EmailConfigController{
      * @param idVO
      * @return
      */
-    @SystemLog(value = "批量删除邮箱配置")
+    @SystemLog(value = "批量删除邮箱配置", type = SystemLog.Type.DELETE)
     @RequestMapping("delete-email-config")
     public boolean deleteEmailConfig(@RequestBody IdVO idVO){
         emailConfigService.deleteEmailConfig(idVO.getId());

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

@@ -106,6 +106,7 @@ public class ParseEmailController{
      * @param fileId
      * @return
      */
+    @SystemLog(value = "下载附件", type = SystemLog.Type.DOWNLOAD_OR_EXPORT)
     @PostMapping("/download-email-file")
     public void downloadEmailFile(@RequestBody FileIdVO fileId,HttpServletResponse response, HttpServletRequest request){
         try {

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

@@ -54,7 +54,7 @@ public class FunAliasController {
      * @param fundAliasVO
      * @return
      */
-    @SystemLog(value = "保存基金别名")
+    @SystemLog(value = "保存基金别名", type = SystemLog.Type.INSERT)
     @PostMapping("/save-fund-alias")
     public ResultVo saveFundAlias(@RequestBody FundAliasVO fundAliasVO){
         fundAliasService.saveFundAlias(fundAliasVO);
@@ -66,7 +66,7 @@ public class FunAliasController {
      * @param idListVO
      * @return
      */
-    @SystemLog(value = "删除基金别名")
+    @SystemLog(value = "删除基金别名", type = SystemLog.Type.DELETE)
     @PostMapping("/delete-fund-alias")
     public ResultVo deleteFundAlias(@RequestBody IdListVO idListVO){
         fundAliasService.deleteFundAlias(idListVO);

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

@@ -68,7 +68,7 @@ public class FundInformationController{
      * @param fundReportFrequency
      * @return
      */
-    @SystemLog(value = "保存基金报送频率")
+    @SystemLog(value = "保存基金报送频率", type = SystemLog.Type.INSERT)
     @PostMapping("/save-frequency")
     public boolean saveFundReportFrequency(@RequestBody FundReportFrequencyVO fundReportFrequency){
         fundReportFrequencyService.saveFundReportFrequency(fundReportFrequency);

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

@@ -44,7 +44,7 @@ public class FundNavAssetController {
      * @param fundAssetVO
      * @return
      */
-    @SystemLog(value = "新增基金规模")
+    @SystemLog(value = "新增基金规模", type = SystemLog.Type.INSERT)
     @PostMapping("/save-fund-asset")
     public ResultVo saveFundAsset(@RequestBody FundAssetVO fundAssetVO){
         fundNavAssetService.saveFundAsset(fundAssetVO);
@@ -56,13 +56,13 @@ public class FundNavAssetController {
      * @param fundNavVO
      * @return
      */
-    @SystemLog(value = "新增基金规模")
+    @SystemLog(value = "新增基金规模", type = SystemLog.Type.INSERT)
     @PostMapping("/save-fund-nav")
     public ResultVo saveFundNav(@RequestBody FundNavVO fundNavVO){
         fundNavAssetService.saveFundNav(fundNavVO);
         return ResultVo.ok(true);
     }
-    @SystemLog(value = "删除基金规模")
+    @SystemLog(value = "删除基金规模", type = SystemLog.Type.DELETE)
     @RequestMapping("/delete-fund-nav-asset")
     public ResultVo deleteFundNavAsset(@RequestBody FundNavAssetDelListVO fundNavAssetDelListVO){
         fundNavAssetService.deleteFundNavAsset(fundNavAssetDelListVO);
@@ -76,6 +76,7 @@ public class FundNavAssetController {
      * @param request
      * @return
      */
+    @SystemLog(value = "上传规模", type = SystemLog.Type.UPLOAD_OR_IMPORT)
     @RequestMapping("upload-nav-asset")
     public ResultVo uploadNavAsset(@RequestParam(value = "file",required = false) MultipartFile file, HttpServletResponse response, HttpServletRequest request){
         ResultVo vo = fundNavAssetService.uploadNavAsset(file);