接口bug修改20240109

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

 package com.censoft.censoftrongtong.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.censoft.censoftrongtong.domain.CurrentRiskDetailAbnormal;
+import com.censoft.censoftrongtong.service.ICurrentRiskDetailAbnormalService;
 import com.ruoyi.common.annotation.Log;
 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.censoft.censoftrongtong.domain.CurrentRiskDetailAbnormal;
-import com.censoft.censoftrongtong.service.ICurrentRiskDetailAbnormalService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 现状风险巡查异常信息Controller
@@ -28,7 +22,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-12-05
  */
 @RestController
-@RequestMapping("/risk/currentRiskAbnormal")
+@RequestMapping(value = {"/risk/currentRiskAbnormal", "/app-api/risk/currentRiskAbnormal"})
 public class CurrentRiskDetailAbnormalController extends BaseController
 {
     @Autowired
@@ -74,7 +68,7 @@ public class CurrentRiskDetailAbnormalController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('risk:currentRiskAbnormal:add')")
     @Log(title = "现状风险巡查异常信息", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/save")
     public AjaxResult add(@RequestBody CurrentRiskDetailAbnormal currentRiskDetailAbnormal)
     {
         return toAjax(currentRiskDetailAbnormalService.insertCurrentRiskDetailAbnormal(currentRiskDetailAbnormal));

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

 package com.censoft.censoftrongtong.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.censoft.censoftrongtong.domain.CurrentRiskPost;
 import com.censoft.censoftrongtong.domain.CurrentRiskPostList;
 import com.censoft.censoftrongtong.domain.CurrentRiskPostListSaveVO;
 import com.censoft.censoftrongtong.service.ICurrentRiskPostListService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.censoft.censoftrongtong.service.ICurrentRiskPostService;
 import com.ruoyi.common.annotation.Log;
 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.censoft.censoftrongtong.domain.CurrentRiskPost;
-import com.censoft.censoftrongtong.service.ICurrentRiskPostService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 现状风险岗位Controller
@@ -39,7 +31,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("/system/currentRiskPost")
+@RequestMapping(value = {"/system/currentRiskPost", "/app-api/system/currentRiskPost"})
 public class CurrentRiskPostController extends BaseController
 {
     private ICurrentRiskPostService currentRiskPostService;

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

 package com.censoft.censoftrongtong.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.censoft.censoftrongtong.domain.CurrentRiskPostList;
+import com.censoft.censoftrongtong.service.ICurrentRiskPostListService;
 import com.ruoyi.common.annotation.Log;
 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.censoft.censoftrongtong.domain.CurrentRiskPostList;
-import com.censoft.censoftrongtong.service.ICurrentRiskPostListService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 现状风险岗位用户巡查清单Controller
@@ -28,7 +22,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-12-07
  */
 @RestController
-@RequestMapping("/risk/riskPostList")
+@RequestMapping(value = {"/risk/riskPostList", "/app-api/risk/riskPostList"})
 public class CurrentRiskPostListController extends BaseController
 {
     @Autowired

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

 package com.censoft.censoftrongtong.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.censoft.censoftrongtong.domain.CurrentRiskUserPatrol;
 import com.censoft.censoftrongtong.domain.LedgerProject;
-import com.censoft.censoftrongtong.service.ILedgerProjectService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.censoft.censoftrongtong.service.ICurrentRiskUserPatrolService;
 import com.ruoyi.common.annotation.Log;
 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.censoft.censoftrongtong.domain.CurrentRiskUserPatrol;
-import com.censoft.censoftrongtong.service.ICurrentRiskUserPatrolService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 巡查执行管理Controller
@@ -31,15 +23,16 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2023-12-05
  */
 @RestController
+@AllArgsConstructor
 @RequestMapping(value = {"/risk/riskUserPatrol", "/app-api/risk/riskUserPatrol"})
 public class CurrentRiskUserPatrolController extends BaseController {
-    @Autowired
     private ICurrentRiskUserPatrolService currentRiskUserPatrolService;
 
     @GetMapping("/getPatrolProjectList")
-    private List<LedgerProject> getPatrolProjectList() {
+    public AjaxResult getPatrolProjectList() {
+
         List<LedgerProject> list = currentRiskUserPatrolService.getPatrolProjectList(getUserId());
-        return list;
+        return  success(list) ;
     }
 
 

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

@@ -23,7 +23,6 @@ import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysUploadFileService;
 import com.ruoyi.system.service.ISysUserService;
 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;
 
@@ -559,6 +558,7 @@ public class RiskPlanAppController extends BaseController {
             }
             saveDto.setMeasuresEmergencyFileIds(measuresEmergencyFileIds);
         }
+
         Map<String, String> mapResult = riskPlanExistingListService.getRiskLevelByScoreAndUpd(saveDto.getBuildingId(), saveDto.getLevelScore());
         saveDto.setLevel(mapResult.get("level"));
         saveDto.setRiskColor(mapResult.get("riskColor"));

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/CurrentRiskDetailAbnormal.java

 package com.censoft.censoftrongtong.domain;
 
+import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntityClean;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 现状风险巡查异常信息对象 current_risk_detail_abnormal
@@ -41,6 +38,10 @@ public class CurrentRiskDetailAbnormal extends BaseEntityClean
     @Excel(name = "异常说明")
     private String abnormalDesc;
 
+    /** 异常照片 */
+    @Excel(name = "异常照片")
+    private String abnormalPics;
+
     /** 评估等级 */
     @Excel(name = "评估等级")
     private String assessmentLevel;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/mapper/CurrentRiskUserPatrolMapper.java

 package com.censoft.censoftrongtong.mapper;
 
-import java.util.List;
 import com.censoft.censoftrongtong.domain.CurrentRiskUserPatrol;
 import com.censoft.censoftrongtong.domain.LedgerProject;
 import com.github.yulichang.base.MPJBaseMapper;
 
+import java.util.List;
+
 /**
  * 巡查执行管理Mapper接口
  * 

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

@@ -84,10 +84,10 @@
     </select>
 
     <select id="getPatrolProjectList" resultType="com.censoft.censoftrongtong.domain.LedgerProject">
-        select b.id,b.name.b.type,b.business,b.address from current_risk_user_patrol a LEFT JOIN ledger_project b on
+        select b.id,b.name,b.type,b.business,b.address from current_risk_user_patrol a LEFT JOIN ledger_project b on
         a.project_id=b.id
         <where>
-            and del_flage=0
+            and a.del_flag=0
             <if test="userId != null ">and a.user_id = #{userId}</if>
 
         </where>