增加log字段

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidCommitteeController.java

@@ -104,6 +104,7 @@ public class BidCommitteeController extends BaseController
         return toAjax(bidCommitteeService.deleteBidCommitteeByPbIds(pbIds));
     }
 
+    @Log(title = "删除评标委员会", businessType = BusinessType.DELETE)
     @DeleteMapping("/delComBySid/{sid}")
     public AjaxResult remove(@PathVariable Long sid)
     {
@@ -130,6 +131,7 @@ public class BidCommitteeController extends BaseController
      * @param committee
      * @return
      */
+    @Log(title = "添加评标委员会", businessType = BusinessType.INSERT)
     @PostMapping("/addCommittee")
     public AjaxResult addCommittee(@RequestBody Committee committee){
         BidCommittee bidCommittee = new BidCommittee();
@@ -204,6 +206,7 @@ public class BidCommitteeController extends BaseController
         return getDataTable(list);
     }
 
+    @Log(title = "选择评标委员会组长", businessType = BusinessType.UPDATE)
     @PutMapping("/updateLeader")
     public AjaxResult updateLeader(@RequestParam("pbId") Long pbId){
         return toAjax(bidCommitteeService.updateLeader(pbId));

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidInvoiceController.java

@@ -260,6 +260,7 @@ public class BidInvoiceController extends BaseController
     }
 
     // 开票信息导出
+    @Log(title = "开票信息导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportList")
     public void exportList(HttpServletResponse response, String startTime,String endTime)
     {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidIvrController.java

@@ -131,6 +131,7 @@ public class BidIvrController extends BaseController
      * @param
      * @return
      */
+    @Log(title = "发送语音通话", businessType = BusinessType.OTHER)
     @PostMapping("/sendCall")
     public AjaxResult sendCall(@RequestBody VoiceTts voiceTts) throws Exception {
         DyvmsUtil dyvmsUtil = new DyvmsUtil();
@@ -150,6 +151,7 @@ public class BidIvrController extends BaseController
      * @param voiceReports
      * @return
      */
+    @Log(title = "电话通知回执", businessType = BusinessType.INSERT)
     @PostMapping("/saveCall")
     public AjaxResult saveCall(@RequestBody VoiceReport[] voiceReports){
         System.out.println(voiceReports[0].toString());
@@ -223,6 +225,7 @@ public class BidIvrController extends BaseController
     }
 
     // 短信回执信息地址
+    @Log(title = "短信回执", businessType = BusinessType.INSERT)
     @PostMapping("/smsMes")
     public void getSmsMessage(@RequestBody SmsMessage smsMessage){
         String mobile = smsMessage.getMobile();
@@ -243,6 +246,7 @@ public class BidIvrController extends BaseController
     }
 
     // 短信发送接口(专家）
+    @Log(title = "短信发送", businessType = BusinessType.OTHER)
     @PostMapping("/sendSmsExpert")
     public AjaxResult sendSmsExpert(SmsParam smsParam) throws UnsupportedEncodingException, NoSuchAlgorithmException {
         String[] param = new String[8];
@@ -310,6 +314,7 @@ public class BidIvrController extends BaseController
     }
 
     // 短信发送接口 (供应商)
+    @Log(title = "供应商发送短信", businessType = BusinessType.OTHER)
     @PostMapping("/sendSmsSupplier")
     public AjaxResult sendSmsSupplier(@RequestBody SmsParam smsParam) throws UnsupportedEncodingException, NoSuchAlgorithmException {
         String[] param = new String[6];

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidQuoteController.java

@@ -150,6 +150,7 @@ public class BidQuoteController extends BaseController
      * @return
      * @throws Exception
      */
+    @Log(title = "供应商报价", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/updateQuote")
     public AjaxResult updateQuote(@RequestBody BidQuote bidQuote) throws Exception {

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidTenderController.java

@@ -356,6 +356,7 @@ public class BidTenderController extends BaseController {
     }
 
     // 竞价+评审的手动开标
+    @Log(title = "手动开标", businessType = BusinessType.UPDATE)
     @PutMapping("/openTender")
     public AjaxResult openTender(@RequestBody BidQuote bidQuote){
         Long sid = bidQuote.getSid();
@@ -375,6 +376,7 @@ public class BidTenderController extends BaseController {
     }
 
     // 询比的手动开标
+    @Log(title = "询比手动开标", businessType = BusinessType.UPDATE)
     @PutMapping("/openTenderTwo")
     public AjaxResult openTenderTwo(@RequestBody ScoreSummary scoreSummary){
         List<ScoreSummary> scoreSummaries = scoreSummaryService.selectScoreSummaryList(scoreSummary);
@@ -417,6 +419,7 @@ public class BidTenderController extends BaseController {
      * @param sid
      * @return
      */
+    @Log(title = "招标项目更新", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTender")
     public AjaxResult updateTender(@RequestParam("sid") Long sid){
         return toAjax(bidTenderService.updateTenderStatus(9L,sid));
@@ -427,6 +430,7 @@ public class BidTenderController extends BaseController {
      *
      * @return
      */
+    @Log(title = "专家抽取申请", businessType = BusinessType.INSERT)
     @PostMapping ("/updateIsApply")
     public AjaxResult updateIsApply(@RequestBody BidTender bidTender){
         Long sid = bidTender.getSid();
@@ -1116,6 +1120,7 @@ public class BidTenderController extends BaseController {
 
     // 中标终止审批
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "中标终止审批", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTenderByState")
     public AjaxResult updateTenderByState(@RequestBody BidTender bidTender){
         BidTender res = bidTenderService.selectBidTenderBySid(bidTender.getSid());
@@ -1182,6 +1187,7 @@ public class BidTenderController extends BaseController {
 
     // 中标变更申请
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "中标变更申请", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTenderByCState")
     public AjaxResult updateTenderByCState(@RequestBody BidTender bidTender){
         System.out.println("DDDDDDDDDDDDDD");
@@ -1502,6 +1508,7 @@ public class BidTenderController extends BaseController {
         return success(bidTender);
     }
 
+    @Log(title = "删除项目", businessType = BusinessType.INSERT)
     @DeleteMapping(value = "/deleteBySid/{sid}")
     public AjaxResult deleteBySid(@PathVariable Long sid){
         if(bidNoticeService.selectBidNoticeBySid(sid) != null){

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidWinnerController.java

@@ -441,6 +441,7 @@ public class BidWinnerController extends BaseController
     }
 
     // 同步开票信息
+    @Log(title = "同步开票信息", businessType = BusinessType.INSERT)
     @PostMapping("/addInvoice")
     public AjaxResult addInvoice(@RequestParam("wid") Long wid){
         BidWinner bidWinner = bidWinnerService.selectBidWinnerByWid(wid);

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidWinningResultsController.java

@@ -293,6 +293,7 @@ public class BidWinningResultsController extends BaseController {
 
     // 中标结果变更
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "中标变更", businessType = BusinessType.UPDATE)
     @PostMapping("/alterBid")
     public AjaxResult alterBid(@RequestBody BidChangeRecord param){
         Long sid = param.getSid();

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/ExpertMarkController.java

@@ -6,6 +6,8 @@ import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteMaterialService;
 import com.ruoyi.system.api.RemotePlanService;
@@ -99,6 +101,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 编写各表评分标准
+    @Log(title = "添加评分标准", businessType = BusinessType.INSERT)
     @PostMapping("/addReview")
     public AjaxResult addReview(@RequestBody Mark mark){
         List<BidExamine> examineList = mark.getExamineList();
@@ -143,6 +146,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 资格审查表评分
+    @Log(title = "资格审查", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertExamine")
     public AjaxResult addExpertExamine(@RequestBody Mark mark){
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -164,6 +168,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 技术审查表评分
+    @Log(title = "技术审查", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertTech")
     public AjaxResult addExpertTech(@RequestBody Mark mark){
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -185,6 +190,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 响应性审查表评分
+    @Log(title = "响应性审查", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertRespond")
     public AjaxResult addExpertRespond(@RequestBody Mark mark){
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -325,6 +331,7 @@ public class ExpertMarkController extends BaseController{
 
     // 专家打分
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "专家打分", businessType = BusinessType.INSERT)
     @PostMapping("/addMark")
     public AjaxResult addMark(@RequestBody Mark mark){
         Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId();

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/QuoteInfoController.java

@@ -4,14 +4,7 @@ import java.util.List;
 import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 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 org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -65,7 +58,7 @@ public class QuoteInfoController extends BaseController
      */
     // @RequiresPermissions("system:quoteInfo:query")
     @GetMapping(value = "/getInfo")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@RequestParam("id") Long id)
     {
         return success(quoteInfoService.selectQuoteInfoById(id));
     }

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementDetailController.java

@@ -131,6 +131,7 @@ public class PpmProcurementDetailController extends BaseController
         return list;
     }
 
+    @Log(title = "导入采购明细", businessType = BusinessType.IMPORT)
     @PostMapping("/importDetail")
     public AjaxResult importDetail(MultipartFile file,Long materialId) throws Exception {
         ExcelUtil<PpmProcurementDetail> excelUtil = new ExcelUtil<>(PpmProcurementDetail.class);

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementPlanController.java

@@ -369,6 +369,7 @@ public class PpmProcurementPlanController extends BaseController {
 
     // @RequiresPermissions("system:plan:edit")
     @PostMapping("/otherInformation")
+    @Log(title = "修改项目其他信息", businessType = BusinessType.UPDATE)
     @Transactional
     public AjaxResult ModifyPlanAndOtherInformation(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
         List<PpmLineItems> list = ppmProcurementPlan.getItems();
@@ -398,6 +399,7 @@ public class PpmProcurementPlanController extends BaseController {
         return AjaxResult.success(ppmProcurementPlanService.updatePpmProcurementPlan(ppmProcurementPlan));
     }
 
+    @Log(title = "寻源", businessType = BusinessType.UPDATE)
     @PostMapping("/updateStateAndAddBidWinning")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult updateStateAndAddBidWinning(@RequestBody List<PpmProcurementPlan> ppmProcurementPlan, Integer type, Integer noBidType) throws Exception {
@@ -547,6 +549,7 @@ public class PpmProcurementPlanController extends BaseController {
         return ppmProcurementPlanService.selectPpmProcurementPlanByAid(aid);
     }
 
+    @Log(title = "更新采购计划", businessType = BusinessType.UPDATE)
     @PutMapping("/recall")
     public AjaxResult recall(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
         return toAjax(ppmProcurementPlanService.updatePpmProcurementPlan(ppmProcurementPlan));