Merge branch 'usky-zyj' of uskycloud/usky-modules into master

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionPlanController.java

@@ -34,7 +34,7 @@ public class PatrolInspectionPlanController {
      * @param patrolInspectionPlanVo
      * @return
      */
-    @Log(title = "巡检计划", businessType = BusinessType.INSERT)
+    @Log(title = "新增巡检计划", businessType = BusinessType.INSERT)
     @PostMapping("addPatrolInspectionPlan")
     public ApiResult<Void> addPatrolInspectionPlan(@RequestBody PatrolInspectionPlanVo patrolInspectionPlanVo) {
         patrolInspectionPlanService.addPatrolInspectionPlan(patrolInspectionPlanVo);
@@ -47,7 +47,7 @@ public class PatrolInspectionPlanController {
      * @param patrolInspectionPlanVo
      * @return
      */
-    @Log(title = "巡检计划", businessType = BusinessType.UPDATE)
+    @Log(title = "修改巡检计划", businessType = BusinessType.UPDATE)
     @PostMapping("updatePatrolInspectionPlan")
     public ApiResult<Void> updatePatrolInspectionPlan(@RequestBody PatrolInspectionPlanVo patrolInspectionPlanVo) {
         patrolInspectionPlanService.updatePatrolInspectionPlan(patrolInspectionPlanVo);
@@ -60,7 +60,7 @@ public class PatrolInspectionPlanController {
      * @param id 计划ID
      * @return
      */
-    @Log(title = "巡检计划", businessType = BusinessType.DELETE)
+    @Log(title = "删除巡检计划", businessType = BusinessType.DELETE)
     @GetMapping("delPatrolInspectionPlan")
     public ApiResult<Void> delPatrolInspectionPlan(@RequestParam(value = "id") Integer id) {
         patrolInspectionPlanService.delPatrolInspectionPlan(id);

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/DmpDeviceInfo.java

@@ -132,6 +132,16 @@ public class DmpDeviceInfo implements Serializable {
      */
     private String deviceUuid;
 
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
     /**
      * 设备状态;1：在线，2：离线
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/DmpDeviceInfoServiceImpl.java

@@ -395,6 +395,7 @@ public class DmpDeviceInfoServiceImpl extends AbstractCrudService<DmpDeviceInfoM
                 devList.get(i).setCreatedTime(LocalDateTime.now());
                 devList.get(i).setTenantId(list.get(0).getTenantId());
                 devList.get(i).setServiceStatus(1);
+                devList.get(i).setDeviceUuid(UUIDUtils.uuid());
 
                 DmpDeviceStatus dmpDeviceStatus = new DmpDeviceStatus();
                 dmpDeviceStatus.setDeviceId(devList.get(i).getDeviceId());

service-meeting/service-meeting-biz/pom.xml

@@ -17,11 +17,11 @@
             <artifactId>service-meeting-api</artifactId>
             <version>0.0.1</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.usky</groupId>-->
-<!--            <artifactId>data-transfer-api</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>data-transfer-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
         <dependency>
             <groupId>com.usky</groupId>
             <artifactId>common-cloud-starter</artifactId>

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingDeviceController.java

@@ -3,6 +3,8 @@ package com.usky.meeting.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.meeting.domain.MeetingDevice;
 import com.usky.meeting.service.MeetingDeviceService;
 import com.usky.meeting.service.vo.MeetingDeviceRequestVO;
@@ -43,6 +45,7 @@ public class MeetingDeviceController {
      * @param meetingDevice
      * @return
      */
+    @Log(title = "新增-会议设备", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult<Void> add(@RequestBody MeetingDevice meetingDevice){
         meetingDeviceService.add(meetingDevice);
@@ -54,6 +57,7 @@ public class MeetingDeviceController {
      * @param meetingDevice
      * @return
      */
+    @Log(title = "修改-会议设备", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult<Void> edit(@RequestBody MeetingDevice meetingDevice){
         meetingDeviceService.edit(meetingDevice);
@@ -65,6 +69,7 @@ public class MeetingDeviceController {
      * @param deviceId
      * @return
      */
+    @Log(title = "删除-会议设备", businessType = BusinessType.DELETE)
     @DeleteMapping
     public ApiResult<Void> remove(@RequestParam Long deviceId){
         meetingDeviceService.remove(deviceId);

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFaceController.java

@@ -12,6 +12,7 @@ import com.usky.meeting.annotation.FaceLog;
 import com.usky.meeting.domain.MeetingFace;
 import com.usky.meeting.service.MeetingFaceService;
 import com.usky.meeting.service.vo.FaceResultVO;
+import com.usky.meeting.service.vo.MeetingFaceRequestVO;
 import com.usky.meeting.service.vo.MeetingFaceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,8 +43,8 @@ public class MeetingFaceController {
     @PostMapping("/vef")
     @ApiOperation(value="人脸验证", notes="根据传入的base64编码和数据的base64编码进行对比")
     @FaceLog
-    public MeetingFaceVO faceVef(@RequestBody String imageBase){
-        return faceService.vef(imageBase);
+    public MeetingFaceVO faceVef(@RequestBody MeetingFaceRequestVO requestVO){
+        return faceService.vef(requestVO);
     }
 
     @GetMapping("/faceList")

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingFloorController.java

@@ -3,6 +3,8 @@ package com.usky.meeting.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.meeting.domain.MeetingFloor;
 import com.usky.meeting.service.MeetingFloorService;
 import com.usky.meeting.service.vo.MeetingFloorRequestVO;
@@ -43,6 +45,7 @@ public class MeetingFloorController {
      * @param meetingFloor
      * @return
      */
+    @Log(title = "新增-会议楼层", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult<Void> add(@RequestBody MeetingFloor meetingFloor){
         meetingFloorService.add(meetingFloor);
@@ -54,6 +57,7 @@ public class MeetingFloorController {
      * @param meetingFloor
      * @return
      */
+    @Log(title = "修改-会议楼层", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult<Void> edit(@RequestBody MeetingFloor meetingFloor){
         meetingFloorService.edit(meetingFloor);
@@ -65,6 +69,7 @@ public class MeetingFloorController {
      * @param floorId
      * @return
      */
+    @Log(title = "删除-会议楼层", businessType = BusinessType.DELETE)
     @DeleteMapping
     public ApiResult<Void> remove(@RequestParam(value = "floorId") Long floorId){
         meetingFloorService.remove(floorId);

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/MeetingRoomController.java

@@ -1,15 +1,20 @@
 package com.usky.meeting.controller.web;
 
 
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.meeting.domain.MeetingRoom;
 import com.usky.meeting.repository.MeetingDeviceRepository;
+import com.usky.meeting.repository.MeetingRoomRepository;
 import com.usky.meeting.service.MeetingRoomService;
 import com.usky.meeting.service.dto.DmMeetingRoomDto;
 import com.usky.meeting.service.vo.MeetingRoomRequestVO;
 import com.usky.meeting.service.vo.MeetingRoomReservationVO;
-//import com.usky.transfer.RemoteTransferService;
+import com.usky.transfer.RemoteTransferService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -32,19 +37,27 @@ import java.util.Map;
 public class MeetingRoomController {
     @Autowired
     private MeetingRoomService meetingRoomService;
-//    @Autowired
-//    private RemoteTransferService remoteTransferService;
-
-//    /**
-//     * 下发门禁开门
-//     */
-//    @GetMapping("/{productCode}/{deviceId}/control")
-//    public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
-//                                                 @PathVariable("deviceId") String deviceId,
-//                                                 @RequestParam(value = "requestBody") String requestBody){
-//        String topic = "/"+productCode+"/"+deviceId+"/control";
-//        return ApiResult.success(remoteTransferService.deviceControl(topic,requestBody));
-//    }
+    @Autowired
+    private RemoteTransferService remoteTransferService;
+    @Autowired
+    private MeetingRoomRepository dmMeetingRoomRepository;
+
+    /**
+     * 下发门禁开门
+     */
+    @GetMapping("/{productCode}/{deviceId}/control")
+    public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
+                                                 @PathVariable("deviceId") String deviceId,
+                                                 @RequestParam(value = "commandStr") String commandStr,
+                                                 @RequestParam(value = "domain",required = false) String domain){
+        Integer tenantId;
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+        }
+        return ApiResult.success(remoteTransferService.deviceControl(productCode,deviceId,commandStr,tenantId));
+    }
 
     /**
      * 首页统计
@@ -82,6 +95,7 @@ public class MeetingRoomController {
      * @param meetingRoom
      * @return
      */
+    @Log(title = "新增-会议室", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult<Void> add(@RequestBody MeetingRoom meetingRoom){
         meetingRoomService.add(meetingRoom);
@@ -93,6 +107,7 @@ public class MeetingRoomController {
      * @param meetingRoom
      * @return
      */
+    @Log(title = "修改-会议室", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult<Void> edit(@RequestBody MeetingRoom meetingRoom){
         meetingRoomService.edit(meetingRoom);
@@ -104,6 +119,7 @@ public class MeetingRoomController {
      * @param roomId
      * @return
      */
+    @Log(title = "删除-会议室", businessType = BusinessType.DELETE)
     @DeleteMapping
     public ApiResult<Void> remove(@RequestParam Long roomId){
         meetingRoomService.remove(roomId);
@@ -118,8 +134,11 @@ public class MeetingRoomController {
      * @return
      */
     @GetMapping("attendee")
-    public ApiResult<Map<String,Object>> attendee(Long meetingId, Long userId, String userName){
-        return ApiResult.success(meetingRoomService.attendee(meetingId,userId,userName));
+    public ApiResult<Map<String,Object>> attendee(@RequestParam(value = "meetingId") Long meetingId,
+                                                  @RequestParam(value = "userId") Long userId,
+                                                  @RequestParam(value = "userName") String userName,
+                                                  @RequestParam(value = "domain",required = false) String domain){
+        return ApiResult.success(meetingRoomService.attendee(meetingId,userId,userName,domain));
     }
 
     /**

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/controller/web/SignOnOutRequestVO.java

@@ -24,4 +24,9 @@ public class SignOnOutRequestVO {
      */
     private Integer signType;
 
+    /**
+     * 域名
+     */
+    private String domain;
+
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingFaceService.java

@@ -3,6 +3,7 @@ package com.usky.meeting.service;
 import com.usky.meeting.domain.MeetingFace;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.meeting.service.vo.FaceResultVO;
+import com.usky.meeting.service.vo.MeetingFaceRequestVO;
 import com.usky.meeting.service.vo.MeetingFaceVO;
 
 /**
@@ -20,5 +21,5 @@ public interface MeetingFaceService extends CrudService<MeetingFace> {
      * @param imageBase
      * @return
      */
-    MeetingFaceVO vef(String imageBase);
+    MeetingFaceVO vef(MeetingFaceRequestVO requestVO);
 }

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingRoomService.java

@@ -36,7 +36,7 @@ public interface MeetingRoomService extends CrudService<MeetingRoom> {
 
     void remove(Long roomId);
 
-    Map<String,Object> attendee(Long meetingId, Long userId, String userName);
+    Map<String,Object> attendee(Long meetingId, Long userId, String userName, String domain);
 
     List<DmMeetingRoomDto> getMeetingRoomReservationList(MeetingRoomReservationVO reservationVO)  throws ParseException;
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingFaceServiceImpl.java

@@ -1,15 +1,18 @@
 package com.usky.meeting.service.impl;
 
 import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.meet.utils.JwtUtils;
 import com.usky.meet.utils.TimeUtils;
 import com.usky.meeting.domain.MeetingFace;
 import com.usky.meeting.mapper.MeetingFaceMapper;
+import com.usky.meeting.repository.MeetingRoomRepository;
 import com.usky.meeting.server.FaceContrastServer;
 import com.usky.meeting.service.MeetingFaceService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.meeting.service.vo.FaceResultVO;
+import com.usky.meeting.service.vo.MeetingFaceRequestVO;
 import com.usky.meeting.service.vo.MeetingFaceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,11 +35,21 @@ public class MeetingFaceServiceImpl extends AbstractCrudService<MeetingFaceMappe
 
     @Autowired
     FaceContrastServer faceContrastServer;
+    @Autowired
+    private MeetingRoomRepository dmMeetingRoomRepository;
 
     @Override
-    public MeetingFaceVO vef(String imageBase) {
-        imageBase = JSONUtil.parseObj(imageBase).getStr("imageBase");
-        List<MeetingFace> faceList = lambdaQuery().eq(MeetingFace::getTenantId,SecurityUtils.getTenantId()).orderByDesc(MeetingFace::getVefNum).list();
+    public MeetingFaceVO vef(MeetingFaceRequestVO requestVO) {
+
+        String domain = requestVO.getDomain();
+        Integer tenantId;
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+        }
+
+        List<MeetingFace> faceList = lambdaQuery().eq(MeetingFace::getTenantId,tenantId).orderByDesc(MeetingFace::getVefNum).list();
         MeetingFaceVO faceState = new MeetingFaceVO();
         MeetingFaceVO faceState1 = new MeetingFaceVO();
         // 如果人脸库为空,则第一次登录为录入人脸
@@ -45,7 +58,7 @@ public class MeetingFaceServiceImpl extends AbstractCrudService<MeetingFaceMappe
 //        }else {
             int faceLength = faceList.size();
             for (MeetingFace face : faceList) {
-                FaceResultVO faceResult = faceContrastServer.faceContrast(face.getFaceBase(), imageBase);
+                FaceResultVO faceResult = faceContrastServer.faceContrast(face.getFaceBase(), requestVO.getImageBase());
                 // 是否比对成功
                 if (faceResult.getCode() == MeetingFaceVO.SUCCESS_CODE ){
                     // 相似度是否大于80

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -499,22 +499,32 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
     public void signOnOut(SignOnOutRequestVO requestVO){
         LambdaQueryWrapper<MeetingAttendee> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(MeetingAttendee::getMeetingId,requestVO.getMeetingId())
-                .eq(MeetingAttendee::getUserId,requestVO.getUserId())
-                .eq(MeetingAttendee::getTenantId,SecurityUtils.getTenantId());
-        MeetingAttendee one = meetingAttendeeService.getOne(queryWrapper);
-        //签到签退类别(0.签到 1.签退)
-        if(requestVO.getMothodType().equals(0)){
-            one.setIsSign(1);
-            one.setSignDate(LocalDateTime.now());
-            //签到签退方式(0.人工 1.人脸)
-            one.setSignType(requestVO.getSignType());
+                .eq(MeetingAttendee::getUserId,requestVO.getUserId());
 
+        String domain = requestVO.getDomain();
+        if(StringUtils.isNotBlank(domain)){
+            Integer tenantId = meetingRoomRepository.getTenantIdByDomain(domain);
+            queryWrapper.eq(MeetingAttendee::getTenantId, tenantId);
         }else{
-            one.setIsSignOut(1);
-            one.setSignOutDate(LocalDateTime.now());
-            one.setSignOutType(requestVO.getSignType());
+            queryWrapper.eq(MeetingAttendee::getTenantId, SecurityUtils.getTenantId());
+        }
+
+        MeetingAttendee one = meetingAttendeeService.getOne(queryWrapper);
+        if(one != null){
+            //签到签退类别(0.签到 1.签退)
+            if(requestVO.getMothodType().equals(0)){
+                one.setIsSign(1);
+                one.setSignDate(LocalDateTime.now());
+                //签到签退方式(0.人工 1.人脸)
+                one.setSignType(requestVO.getSignType());
+
+            }else{
+                one.setIsSignOut(1);
+                one.setSignOutDate(LocalDateTime.now());
+                one.setSignOutType(requestVO.getSignType());
+            }
+            meetingAttendeeService.updateById(one);
         }
-        meetingAttendeeService.updateById(one);
 
     }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -209,9 +209,16 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
     }
 
     @Override
-    public Map<String, Object> attendee(Long meetingId, Long userId, String userName) {
+    public Map<String, Object> attendee(Long meetingId, Long userId, String userName, String domain) {
         Map<String, Object> map = new HashMap<>();
-        Integer tenantId = SecurityUtils.getTenantId();
+        Integer tenantId ;
+
+        if(StringUtils.isNotBlank(domain)){
+            tenantId = dmMeetingRoomRepository.getTenantIdByDomain(domain);
+        }else{
+            tenantId = SecurityUtils.getTenantId();
+        }
+
         map.put("userName", userName);
         List<MeetingAttendee> list = meetingAttendeeRepository.findMeetingAttendeeList(meetingId, userId, tenantId);
         if (org.springframework.util.CollectionUtils.isEmpty(list)) {

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/MeetingFaceRequestVO.java

@@ -0,0 +1,16 @@
+package com.usky.meeting.service.vo;
+
+import lombok.Data;
+
+@Data
+public class MeetingFaceRequestVO {
+    /**
+     * 图片编码
+     */
+    private String imageBase;
+
+    /**
+     * 域名
+     */
+    private String domain;
+}

service-website/service-website-api/src/main/java/com/usky/website/factory/RemoteUserFallbackFactory.java

@@ -1,48 +1,48 @@
-package com.usky.website.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.website.RemoteUserService;
-import com.usky.website.domain.SysUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}
+//package com.usky.website.factory;
+//
+//import com.usky.common.core.bean.ApiResult;
+//import com.usky.common.core.exception.BusinessException;
+//import com.usky.website.RemoteUserService;
+//import com.usky.website.domain.SysUserVO;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import org.springframework.cloud.openfeign.FallbackFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.util.List;
+//
+//
+///**
+// * 用户服务降级处理
+// *
+// * @author ruoyi
+// */
+//@Component
+//public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+//{
+//    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+//
+//    @Override
+//    public RemoteUserService create(Throwable throwable)
+//    {
+//        log.error("用户服务调用失败:{}", throwable.getMessage());
+//        return new RemoteUserService() {
+//            @Override
+//            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//
+//            @Override
+//            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//
+//            @Override
+//            public ApiResult<String> upload(MultipartFile file) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//        };
+//    }
+//}

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteArticleController.java

@@ -3,6 +3,8 @@ package com.usky.website.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.website.domain.SiteArticle;
 import com.usky.website.service.SiteArticleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +54,7 @@ public class SiteArticleController {
      * @param siteArticle
      * @return
      */
+    @Log(title = "新增-官网内容", businessType = BusinessType.INSERT)
     @CacheEvict(cacheNames = "siteArticle",allEntries = true)
     @PostMapping("addSiteArticle")
     public ApiResult<Void> addSiteArticle(@RequestBody SiteArticle siteArticle) {
@@ -65,6 +68,7 @@ public class SiteArticleController {
      * @param siteArticle
      * @return
      */
+    @Log(title = "修改-官网内容", businessType = BusinessType.UPDATE)
     @CacheEvict(cacheNames = "siteArticle",allEntries = true)
     @PutMapping("updateSiteArticle")
     public ApiResult<Void> updateSiteArticle(@RequestBody SiteArticle siteArticle) {
@@ -78,6 +82,7 @@ public class SiteArticleController {
      * @param id 主键ID
      * @return
      */
+    @Log(title = "删除-官网内容", businessType = BusinessType.DELETE)
     @CacheEvict(cacheNames = "siteArticle",allEntries = true)
     @DeleteMapping("delSiteArticle")
     public ApiResult<Void> delSiteArticle(@RequestParam(value = "id") Integer id) {

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteCategoryController.java

@@ -2,6 +2,8 @@ package com.usky.website.controller.web;
 
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.website.domain.SiteCategory;
 import com.usky.website.service.SiteCategoryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +56,7 @@ public class SiteCategoryController {
      * @param siteCategory
      * @return
      */
+    @Log(title = "新增官网栏目", businessType = BusinessType.INSERT)
     @CacheEvict(cacheNames="siteCategory", allEntries=true)
     @PostMapping("addSiteCategory")
     public ApiResult<Void> addSiteCategory(@RequestBody SiteCategory siteCategory) {
@@ -67,6 +70,7 @@ public class SiteCategoryController {
      * @param siteCategory
      * @return
      */
+    @Log(title = "修改官网栏目", businessType = BusinessType.UPDATE)
     @CacheEvict(cacheNames="siteCategory", allEntries=true)
     @PutMapping("updateSiteCategory")
     public ApiResult<Void> updateSiteCategory(@RequestBody SiteCategory siteCategory) {
@@ -80,6 +84,7 @@ public class SiteCategoryController {
      * @param id 主键ID
      * @return
      */
+    @Log(title = "删除官网栏目", businessType = BusinessType.DELETE)
     @CacheEvict(cacheNames="siteCategory", allEntries=true)
     @DeleteMapping("delSiteCategory")
     public ApiResult<Void> delSiteCategory(@RequestParam(value = "id") Integer id) {

service-website/service-website-biz/src/main/java/com/usky/website/controller/web/SiteReviewController.java

@@ -4,6 +4,8 @@ package com.usky.website.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.utils.poi.ExcelUtil;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
 import com.usky.website.domain.SiteReview;
 import com.usky.website.service.SiteReviewService;
 import com.usky.website.service.vo.SiteReviewExportVO;
@@ -38,6 +40,7 @@ public class SiteReviewController {
      * @param siteReview
      * @return
      */
+    @Log(title = "新增-客户信息渠道", businessType = BusinessType.INSERT)
     @PostMapping
     public ApiResult<Void> add(@RequestBody SiteReview siteReview){
         siteReviewService.add(siteReview);
@@ -61,12 +64,14 @@ public class SiteReviewController {
      * @param siteReview
      * @return
      */
+    @Log(title = "修改-客户信息反馈表", businessType = BusinessType.UPDATE)
     @PutMapping
     public ApiResult<Void> edit(@RequestBody SiteReview siteReview){
         siteReviewService.edit(siteReview);
         return ApiResult.success();
     }
 
+    @Log(title = "导出-客户信息反馈表", businessType = BusinessType.EXPORT)
     @PostMapping("export")
     public void export(@RequestBody SiteReviewRequestVO requestVO, HttpServletResponse response) throws IOException{
         List<SiteReviewExportVO> list = siteReviewService.recordListExport(requestVO);

usky-module-demo/usky-module-demo-api/src/main/java/com/usky/demo/factory/RemoteUserFallbackFactory.java

@@ -1,48 +1,48 @@
-package com.usky.demo.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessException;
-import com.usky.demo.RemoteUserService;
-import com.usky.demo.domain.SysUserVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-
-/**
- * 用户服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService() {
-            @Override
-            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
-                throw new BusinessException(throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<String> upload(MultipartFile file) {
-                throw new BusinessException(throwable.getMessage());
-            }
-        };
-    }
-}
+//package com.usky.demo.factory;
+//
+//import com.usky.common.core.bean.ApiResult;
+//import com.usky.common.core.exception.BusinessException;
+//import com.usky.demo.RemoteUserService;
+//import com.usky.demo.domain.SysUserVO;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//
+//import org.springframework.cloud.openfeign.FallbackFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.util.List;
+//
+//
+///**
+// * 用户服务降级处理
+// *
+// * @author ruoyi
+// */
+//@Component
+//public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
+//{
+//    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
+//
+//    @Override
+//    public RemoteUserService create(Throwable throwable)
+//    {
+//        log.error("用户服务调用失败:{}", throwable.getMessage());
+//        return new RemoteUserService() {
+//            @Override
+//            public ApiResult<List<SysUserVO>> getByUserName(String userName) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//
+//            @Override
+//            public ApiResult<List<SysUserVO>> add(SysUserVO sysUserVO) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//
+//            @Override
+//            public ApiResult<String> upload(MultipartFile file) {
+//                throw new BusinessException(throwable.getMessage());
+//            }
+//        };
+//    }
+//}