修改pacage目录2024010901

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/BigScreenController.java

@@ -9,9 +9,8 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.RiskLevelProportion;
-import com.ruoyi.system.service.IRiskLevelProportionService;
+import com.censoft.censoftrongtong.domain.RiskLevelProportion;
+import com.censoft.censoftrongtong.service.IRiskLevelProportionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/CurrentRiskDetailAbnormalController.java

@@ -3,17 +3,24 @@ package com.censoft.censoftrongtong.controller;
 import com.censoft.censoftrongtong.domain.CurrentRiskDetailAbnormal;
 import com.censoft.censoftrongtong.service.ICurrentRiskDetailAbnormalService;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.service.ISysUploadFileService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 现状风险巡查异常信息Controller
@@ -27,6 +34,14 @@ public class CurrentRiskDetailAbnormalController extends BaseController
 {
     @Autowired
     private ICurrentRiskDetailAbnormalService currentRiskDetailAbnormalService;
+    @Resource
+    private ISysUploadFileService uploadFileService;
+
+    /**
+     * 服务器地址
+     */
+    @Value("${ruoyi.serverAddress}")
+    private String serverAddress;
 
     /**
      * 查询现状风险巡查异常信息列表
@@ -68,9 +83,28 @@ public class CurrentRiskDetailAbnormalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('risk:currentRiskAbnormal:add')")
     @Log(title = "现状风险巡查异常信息", businessType = BusinessType.INSERT)
+    @PostMapping("/save1")
+    public AjaxResult add1(@RequestBody CurrentRiskDetailAbnormal currentRiskDetailAbnormal)
+    {
+        return toAjax(currentRiskDetailAbnormalService.insertCurrentRiskDetailAbnormal(currentRiskDetailAbnormal));
+    }
+
+    /**
+     * 新增现状风险巡查异常信息(附件处理)
+     */
+    @PreAuthorize("@ss.hasPermi('risk:currentRiskAbnormal:add')")
+    @Log(title = "现状风险巡查异常信息", businessType = BusinessType.INSERT)
     @PostMapping("/save")
-    public AjaxResult add(@RequestBody CurrentRiskDetailAbnormal currentRiskDetailAbnormal)
+    public AjaxResult add(@RequestBody CurrentRiskDetailAbnormal currentRiskDetailAbnormal , @RequestParam(value = "file[]", required = false) MultipartFile[] file)
     {
+        if (file != null) {
+            String userId = getUserId() + "";
+            String pictureFileIds = Arrays.stream(file)
+                    .filter(multipartFile -> !multipartFile.isEmpty())
+                    .map(multipartFile -> uploadFileService.upload(multipartFile, RuoYiConfig.getUploadPath(), userId, serverAddress).toString())
+                    .collect(Collectors.joining(","));
+            currentRiskDetailAbnormal.setAbnormalPics(pictureFileIds);
+        }
         return toAjax(currentRiskDetailAbnormalService.insertCurrentRiskDetailAbnormal(currentRiskDetailAbnormal));
     }
 

censoft-rongtong/src/main/java/com/ruoyi/system/controller/RiskLevelProportionController.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskLevelProportionController.java

-package com.ruoyi.system.controller;
+package com.censoft.censoftrongtong.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.censoft.censoftrongtong.domain.RiskLevelProportion;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.RiskLevelProportion;
-import com.ruoyi.system.service.IRiskLevelProportionService;
+import com.censoft.censoftrongtong.service.IRiskLevelProportionService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 

censoft-rongtong/src/main/java/com/ruoyi/system/controller/RiskNumIndexController.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskNumIndexController.java

-package com.ruoyi.system.controller;
+package com.censoft.censoftrongtong.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.censoft.censoftrongtong.domain.RiskNumIndex;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.RiskNumIndex;
-import com.ruoyi.system.service.IRiskNumIndexService;
+import com.censoft.censoftrongtong.service.IRiskNumIndexService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 

censoft-rongtong/src/main/java/com/ruoyi/system/domain/RiskLevelProportion.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskLevelProportion.java

-package com.ruoyi.system.domain;
+package com.censoft.censoftrongtong.domain;
 
 import java.math.BigDecimal;
 

censoft-rongtong/src/main/java/com/ruoyi/system/domain/RiskNumIndex.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskNumIndex.java

-package com.ruoyi.system.domain;
+package com.censoft.censoftrongtong.domain;
 
 import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;

censoft-rongtong/src/main/java/com/ruoyi/system/mapper/RiskLevelProportionMapper.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskLevelProportionMapper.java

-package com.ruoyi.system.mapper;
+package com.censoft.censoftrongtong.mapper;
 
 import java.util.List;
-import com.ruoyi.system.domain.RiskLevelProportion;
+
+import com.censoft.censoftrongtong.domain.RiskLevelProportion;
 import com.github.yulichang.base.MPJBaseMapper;
 
 /**

censoft-rongtong/src/main/java/com/ruoyi/system/mapper/RiskNumIndexMapper.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/RiskNumIndexMapper.java

-package com.ruoyi.system.mapper;
+package com.censoft.censoftrongtong.mapper;
 
 import java.util.List;
-import com.ruoyi.system.domain.RiskNumIndex;
+
+import com.censoft.censoftrongtong.domain.RiskNumIndex;
 import com.github.yulichang.base.MPJBaseMapper;
 
 /**

censoft-rongtong/src/main/java/com/ruoyi/system/service/IRiskLevelProportionService.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskLevelProportionService.java

-package com.ruoyi.system.service;
+package com.censoft.censoftrongtong.service;
 
 import java.util.List;
-import com.ruoyi.system.domain.RiskLevelProportion;
+
+import com.censoft.censoftrongtong.domain.RiskLevelProportion;
 import com.github.yulichang.base.MPJBaseService;
 /**
  * 风险等级占比和系数Service接口

censoft-rongtong/src/main/java/com/ruoyi/system/service/IRiskNumIndexService.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/IRiskNumIndexService.java

-package com.ruoyi.system.service;
+package com.censoft.censoftrongtong.service;
 
 import java.util.List;
-import com.ruoyi.system.domain.RiskNumIndex;
+
+import com.censoft.censoftrongtong.domain.RiskNumIndex;
 import com.github.yulichang.base.MPJBaseService;
 /**
  * 风险数量系数Service接口

censoft-rongtong/src/main/java/com/ruoyi/system/service/impl/RiskLevelProportionServiceImpl.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskLevelProportionServiceImpl.java

-package com.ruoyi.system.service.impl;
+package com.censoft.censoftrongtong.service.impl;
 
 import java.util.List;
+
+import com.censoft.censoftrongtong.domain.RiskLevelProportion;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.RiskLevelProportionMapper;
-import com.ruoyi.system.domain.RiskLevelProportion;
-import com.ruoyi.system.service.IRiskLevelProportionService;
+import com.censoft.censoftrongtong.mapper.RiskLevelProportionMapper;
+import com.censoft.censoftrongtong.service.IRiskLevelProportionService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 /**
  * 风险等级占比和系数Service业务层处理

censoft-rongtong/src/main/java/com/ruoyi/system/service/impl/RiskNumIndexServiceImpl.java → censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskNumIndexServiceImpl.java

-package com.ruoyi.system.service.impl;
+package com.censoft.censoftrongtong.service.impl;
 
 import java.util.List;
+
+import com.censoft.censoftrongtong.domain.RiskNumIndex;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.RiskNumIndexMapper;
-import com.ruoyi.system.domain.RiskNumIndex;
-import com.ruoyi.system.service.IRiskNumIndexService;
+import com.censoft.censoftrongtong.mapper.RiskNumIndexMapper;
+import com.censoft.censoftrongtong.service.IRiskNumIndexService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 /**
  * 风险数量系数Service业务层处理

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanExistingListServiceImpl.java

@@ -13,13 +13,11 @@ import com.censoft.censoftrongtong.service.ILedgerProjectService;
 import com.censoft.censoftrongtong.service.IRiskPlanExistingListService;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.RiskLevelProportion;
-import com.ruoyi.system.domain.RiskNumIndex;
-import com.ruoyi.system.mapper.RiskLevelProportionMapper;
-import com.ruoyi.system.service.IRiskLevelProportionService;
-import com.ruoyi.system.service.IRiskNumIndexService;
+import com.censoft.censoftrongtong.domain.RiskLevelProportion;
+import com.censoft.censoftrongtong.domain.RiskNumIndex;
+import com.censoft.censoftrongtong.service.IRiskLevelProportionService;
+import com.censoft.censoftrongtong.service.IRiskNumIndexService;
 import com.ruoyi.system.service.ISysUploadFileService;
-import org.apache.poi.hpsf.Decimal;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

censoft-rongtong/src/main/resources/mapper/system/RiskLevelProportionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.RiskLevelProportionMapper">
+<mapper namespace="com.censoft.censoftrongtong.mapper.RiskLevelProportionMapper">
     
     <resultMap type="RiskLevelProportion" id="RiskLevelProportionResult">
         <result property="id"    column="id"    />

censoft-rongtong/src/main/resources/mapper/system/RiskNumIndexMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.RiskNumIndexMapper">
+<mapper namespace="com.censoft.censoftrongtong.mapper.RiskNumIndexMapper">
     
     <resultMap type="RiskNumIndex" id="RiskNumIndexResult">
         <result property="id"    column="id"    />