Merge pull request #3 from easywecom/dev

V1.17.0版本更新
lianluoyi · Jul 27, 2022 · b14c115 · b14c115
2 parents 5643ca1 + 7d4188f
commit b14c115
Show file tree

Hide file tree

Showing 144 changed files with 6,592 additions and 786 deletions.
diff --git a/easywecom-admin/src/main/java/com/easywecom/web/controller/common/ShortUrlController.java b/easywecom-admin/src/main/java/com/easywecom/web/controller/common/ShortUrlController.java
@@ -0,0 +1,49 @@
+package com.easywecom.web.controller.common;
+
+import com.easywecom.common.core.domain.AjaxResult;
+import com.easywecom.wecom.service.radar.MiniAppQrCodeUrlHandler;
+import com.easywecom.wecom.service.radar.RadarUrlHandler;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 类名: 短链相关接口
+ *
+ * @author : silver_chariot
+ * @date : 2022/7/18 17:08
+ **/
+@RestController
+@RequestMapping("/url")
+@Api(value = "ShortUrlController", tags = "短链相关")
+public class ShortUrlController {
+
+
+    private final MiniAppQrCodeUrlHandler miniAppQrCodeUrlHandler;
+    private final RadarUrlHandler radarUrlHandler;
+
+    public ShortUrlController(MiniAppQrCodeUrlHandler miniAppQrCodeUrlHandler, RadarUrlHandler radarUrlHandler) {
+        this.miniAppQrCodeUrlHandler = miniAppQrCodeUrlHandler;
+        this.radarUrlHandler = radarUrlHandler;
+    }
+
+    @GetMapping("/empleCode")
+    @ApiOperation("根据短链获取员工活码")
+    public AjaxResult<String> empleCode(@ApiParam("短链后缀的code") @Validated @NotBlank(message = "missing param") String code) {
+        return AjaxResult.success("success", miniAppQrCodeUrlHandler.getQrCode(code));
+    }
+
+    @GetMapping("/radar")
+    @ApiOperation("根据短链获取雷达链接并记录")
+    public AjaxResult<String> radar(@ApiParam("短链后缀的code") String shortCode, @ApiParam("用户的公众号openid") String openId) {
+        return AjaxResult.success("success", radarUrlHandler.getOriginUrlAndRecord(shortCode, openId));
+    }
+
+
+}
diff --git a/...com-admin/src/main/java/com/easywecom/web/controller/wechatopen/WechatOpenController.java b/...com-admin/src/main/java/com/easywecom/web/controller/wechatopen/WechatOpenController.java
@@ -0,0 +1,55 @@
+package com.easywecom.web.controller.wechatopen;
+
+import com.easywecom.common.core.controller.BaseController;
+import com.easywecom.common.core.domain.AjaxResult;
+import com.easywecom.common.core.domain.model.LoginUser;
+import com.easywecom.wecom.domain.entity.wechatopen.WeOpenConfig;
+import com.easywecom.wecom.domain.vo.AppIdVO;
+import com.easywecom.wecom.login.util.LoginTokenService;
+import com.easywecom.wecom.service.wechatopen.WechatOpenService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 类名: 微信小程序/公众号相关接口
+ *
+ * @author : silver_chariot
+ * @date : 2022/7/20 10:03
+ **/
+@RestController
+@RequestMapping("/wechatopen")
+public class WechatOpenController extends BaseController {
+
+    private final WechatOpenService wechatOpenService;
+
+    public WechatOpenController(WechatOpenService wechatOpenService) {
+        this.wechatOpenService = wechatOpenService;
+    }
+
+    @GetMapping("/appId")
+    @ApiOperation("获取公众号的appId")
+    public AjaxResult<AppIdVO> getAppId(String shortCode) {
+        return AjaxResult.success("操作成功", wechatOpenService.getAppId(shortCode));
+    }
+
+    @GetMapping("/openId")
+    @ApiOperation("获取公众号Openid")
+    public AjaxResult<String> getOpenId(@ApiParam("用户的code") String code ,@ApiParam("corpId")String corpId) {
+        return AjaxResult.success("操作成功", wechatOpenService.getOpenId(code,corpId));
+    }
+
+    @GetMapping("/config")
+    @ApiOperation("获取企业的公众号配置")
+    public AjaxResult<WeOpenConfig> getConfig() {
+        LoginUser user = LoginTokenService.getLoginUser();
+        return AjaxResult.success(wechatOpenService.getConfig(user.getCorpId()));
+    }
+
+    @PostMapping("/config")
+    @ApiOperation("修改企业的公众号配置")
+    public AjaxResult updateConfig(@RequestBody WeOpenConfig config) {
+        wechatOpenService.updateConfig(config);
+        return AjaxResult.success();
+    }
+}
diff --git a/easywecom-admin/src/main/java/com/easywecom/web/controller/wecom/WeDepartmentController.java b/easywecom-admin/src/main/java/com/easywecom/web/controller/wecom/WeDepartmentController.java
@@ -41,8 +41,8 @@ public class WeDepartmentController extends BaseController {
     @ApiOperation("获取部门列表")
     public AjaxResult list(Integer isActivate) {
         LoginUser loginUser = LoginTokenService.getLoginUser();
-        List<WeDepartment> list = weDepartmentService.selectWeDepartmentList(loginUser.getCorpId(), isActivate);
-        return AjaxResult.success(sysDeptService.filterDataScope(list, loginUser));
+        List<WeDepartment> list = weDepartmentService.selectWeDepartmentList(loginUser.getCorpId(), isActivate, loginUser);
+        return AjaxResult.success(list);
     }
 
 

diff --git a/...dmin/src/main/java/com/easywecom/web/controller/wecom/radar/WeRadarChannelController.java b/...dmin/src/main/java/com/easywecom/web/controller/wecom/radar/WeRadarChannelController.java
@@ -0,0 +1,89 @@
+package com.easywecom.web.controller.wecom.radar;
+
+import com.easywecom.common.annotation.Log;
+import com.easywecom.common.constant.radar.RadarConstants;
+import com.easywecom.common.core.controller.BaseController;
+import com.easywecom.common.core.domain.AjaxResult;
+import com.easywecom.common.core.page.TableDataInfo;
+import com.easywecom.common.enums.BusinessType;
+import com.easywecom.common.enums.radar.RadarChannelEnum;
+import com.easywecom.wecom.domain.dto.common.AttachmentParam;
+import com.easywecom.wecom.domain.dto.radar.DeleteRadarChannelDTO;
+import com.easywecom.wecom.domain.dto.radar.GetRadarShortUrlDTO;
+import com.easywecom.wecom.domain.dto.radar.RadarChannelDTO;
+import com.easywecom.wecom.domain.dto.radar.SearchRadarChannelDTO;
+import com.easywecom.wecom.domain.vo.radar.WeRadarChannelVO;
+import com.easywecom.wecom.login.util.LoginTokenService;
+import com.easywecom.wecom.service.radar.WeRadarChannelService;
+import io.swagger.annotations.Api;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * ClassName： weRadarChannelController
+ *
+ * @author wx
+ * @date 2022/7/19 14:48
+ */
+@Api(tags = "雷达渠道Controller")
+@RestController
+@RequestMapping("/wecom/radar/channel")
+public class WeRadarChannelController extends BaseController {
+
+    private final WeRadarChannelService radarChannelService;
+
+    @Autowired
+    public WeRadarChannelController(WeRadarChannelService radarChannelService) {
+        this.radarChannelService = radarChannelService;
+    }
+
+    @Log(title = "新增雷达渠道", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增雷达渠道")
+//    @PreAuthorize("@ss.hasPermi('redeeomCode:activity:add')")
+    public <T> AjaxResult add(@RequestBody @Validated RadarChannelDTO radarChannelDTO) {
+        radarChannelService.saveRadarChannel(radarChannelDTO);
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/list")
+    @ApiOperation("查询雷达渠道序列")
+    public TableDataInfo<WeRadarChannelVO> list(SearchRadarChannelDTO radarChannelDTO) {
+        startPage();
+        List<WeRadarChannelVO> list = radarChannelService.getRadarChannelList(radarChannelDTO);
+        return getDataTable(list);
+    }
+
+    //@PreAuthorize("@ss.hasPermi('wecom:redeemcode:remove')")
+    @Log(title = "删除雷达渠道", businessType = BusinessType.DELETE)
+    @DeleteMapping("/remove")
+    @ApiOperation("删除雷达渠道")
+    public <T> AjaxResult remove(@Validated @RequestBody DeleteRadarChannelDTO deleteDTO) {
+        radarChannelService.batchRemoveRadarChannel(deleteDTO);
+        return AjaxResult.success();
+    }
+
+
+    @GetMapping("/get")
+    @ApiOperation("获取雷达渠道详情")
+    public AjaxResult<WeRadarChannelVO> get(@RequestParam("id") Long id) {
+        String corpId = LoginTokenService.getLoginUser().getCorpId();
+        return AjaxResult.success(radarChannelService.getRadarChannel(corpId, id));
+    }
+
+    //@PreAuthorize("@ss.hasPermi('wecom:redeemcode:edit')")
+    @Log(title = "修改雷达渠道", businessType = BusinessType.UPDATE)
+    @PutMapping("/update")
+    @ApiOperation("修改雷达渠道")
+    //  @PreAuthorize("@ss.hasPermi('redeeomCode:activity:edit')")
+    public <T> AjaxResult<T> edit(@Validated @RequestBody RadarChannelDTO radarChannelDTO) {
+        radarChannelService.updateRadarChannel(radarChannelDTO);
+        return AjaxResult.success();
+    }
+
+}
diff --git a/.../src/main/java/com/easywecom/web/controller/wecom/radar/WeRadarClickRecordController.java b/.../src/main/java/com/easywecom/web/controller/wecom/radar/WeRadarClickRecordController.java
@@ -0,0 +1,96 @@
+package com.easywecom.web.controller.wecom.radar;
+
+import com.easywecom.common.annotation.Log;
+import com.easywecom.common.core.controller.BaseController;
+import com.easywecom.common.core.domain.AjaxResult;
+import com.easywecom.common.core.page.TableDataInfo;
+import com.easywecom.common.enums.BusinessType;
+import com.easywecom.wecom.domain.dto.radar.*;
+import com.easywecom.wecom.domain.vo.moment.MomentTotalVO;
+import com.easywecom.wecom.domain.vo.radar.*;
+import com.easywecom.wecom.login.util.LoginTokenService;
+import com.easywecom.wecom.service.radar.WeRadarClickRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * ClassName： WeRadarClickRecordController
+ *
+ * @author wx
+ * @date 2022/7/19 19:54
+ */
+@Api(tags = "雷达点击记录Controller")
+@RestController
+@RequestMapping("/wecom/radar/record")
+public class WeRadarClickRecordController extends BaseController {
+
+    private final WeRadarClickRecordService radarClickRecordService;
+
+
+    @Autowired
+    public WeRadarClickRecordController(WeRadarClickRecordService radarClickRecordService) {
+        this.radarClickRecordService = radarClickRecordService;
+    }
+
+    @Log(title = "新增雷达点击记录", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增雷达点击记录")
+//    @PreAuthorize("@ss.hasPermi('redeeomCode:activity:add')")
+    public <T> AjaxResult add(@RequestBody @Validated RadarClickRecordDTO clickRecordDTO) {
+        radarClickRecordService.saveClickRecord(clickRecordDTO);
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/getTotal")
+    @ApiOperation("雷达详情数据总览")
+    public AjaxResult<RadarRecordTotalVO> getTotal(@RequestParam("radarId") Long radarId) {
+        return AjaxResult.success(radarClickRecordService.getTotal(radarId));
+    }
+
+    @GetMapping("/getTimeRangeAnalyseCount")
+    @ApiOperation("时间段内雷达点击数据统计")
+    public AjaxResult<RadarAnalyseVO> getTimeRangeAnalyseCount(SearchRadarAnalyseDTO radarAnalyseDTO) {
+        return AjaxResult.success(radarClickRecordService.getTimeRangeAnalyseCount(radarAnalyseDTO));
+    }
+
+    @GetMapping("/getChannelSort")
+    @ApiOperation("获得渠道排序")
+    public AjaxResult<RadarChannelSortVO> getChannelSort(@RequestParam("radarId") Long radarId) {
+        return AjaxResult.success(radarClickRecordService.getChannelSort(radarId));
+    }
+
+
+    @GetMapping("/getCustomerClickRecord")
+    @ApiOperation("获取客户点击记录")
+    public TableDataInfo<RadarCustomerRecordVO> getCustomerClickRecord(SearchCustomerRecordDTO customerRecordDTO) {
+        startPage();
+        return getDataTable(radarClickRecordService.getCustomerClickRecord(customerRecordDTO));
+    }
+
+    @GetMapping("/getCustomerClickRecordDetail")
+    @ApiOperation("获取客户点击记录详情")
+    public AjaxResult<RadarCustomerClickRecordDetailVO> getCustomerClickRecordDetail(SearchCustomerRecordDetailDTO customerRecordDTO) {
+        return AjaxResult.success(radarClickRecordService.getCustomerClickRecordDetail(customerRecordDTO));
+    }
+
+
+    @GetMapping("/getChannelClickRecord")
+    @ApiOperation("获取渠道点击记录")
+    public TableDataInfo<RadarChannelRecordVO> getChannelClickRecord(SearchChannelRecordDTO channelRecordDTO) {
+        startPage();
+        return getDataTable(radarClickRecordService.getChannelClickRecord(channelRecordDTO));
+    }
+
+    @GetMapping("/getChannelClickRecordDetail")
+    @ApiOperation("获取渠道点击记录详情")
+    public TableDataInfo<RadarCustomerRecordVO> getChannelClickRecordDetail(SearchChannelRecordDetailDTO channelRecordDetailDTO) {
+        startPage();
+        return getDataTable(radarClickRecordService.getChannelClickRecordDetail(channelRecordDetailDTO));
+    }
+
+}