dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
nyoung 2024-08-31 00:08:49 +08:00
parent 254c983fdf
commit e188fbd3a2
90 changed files with 1120 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dl-module-base/pom.xml
View File

@ -113,4 +113,4 @@
<version>3.1.837</version>
</dependency>
</dependencies>
</project>
</project>

46
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java
View File

@ -1,16 +1,27 @@
package cn.iocoder.yudao.module.appBase.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.security.core.LoginUser;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.appBase.entity.AppSwiper;
import cn.iocoder.yudao.module.appBase.service.IAppSwiperService;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.util.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.thoughtworks.xstream.core.SecurityUtils;
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.HashMap;
import java.util.List;
import java.util.Map;
/**
* 【请填写功能名称】Controller
@ -19,17 +30,21 @@ import java.util.List;
* @date 2023-08-01
*/
@RestController
@RequestMapping("/system/appSwiper")
@RequestMapping("/admin-api")
public class AppSwiperController extends BaseController
{
@Autowired
private IAppSwiperService appSwiperService;
@Autowired
private IShopMallPartnersService partnersService;
@Autowired
private AdminUserService userService;
/**
* 查询【请填写功能名称】列表
*/
@PreAuthorize("@ss.hasPermi('system:swiper:list')")
@GetMapping("/list")
@GetMapping("/system/appSwiper/list")
public TableDataInfo list(AppSwiper appSwiper)
{
startPage();
@ -41,7 +56,7 @@ public class AppSwiperController extends BaseController
* 导出【请填写功能名称】列表
*/
@PreAuthorize("@ss.hasPermi('system:swiper:export')")
@PostMapping("/export")
@PostMapping("/system/appSwiper/export")
public void export(HttpServletResponse response, AppSwiper appSwiper)
{
List<AppSwiper> list = appSwiperService.selectAppSwiperList(appSwiper);
@ -53,7 +68,7 @@ public class AppSwiperController extends BaseController
* 获取【请填写功能名称】详细信息
*/
@PreAuthorize("@ss.hasPermi('system:swiper:query')")
@GetMapping(value = "/{swiperId}")
@GetMapping(value = "/system/appSwiper/{swiperId}")
public CommonResult getInfo(@PathVariable("swiperId") Long swiperId)
{
return success(appSwiperService.selectAppSwiperBySwiperId(swiperId));
@ -63,7 +78,7 @@ public class AppSwiperController extends BaseController
* 新增【请填写功能名称】
*/
@PreAuthorize("@ss.hasPermi('system:swiper:add')")
@PostMapping("/add")
@PostMapping("/system/appSwiper/add")
public CommonResult add(@RequestBody AppSwiper appSwiper)
{
return toAjax(appSwiperService.insertAppSwiper(appSwiper));
@ -72,7 +87,7 @@ public class AppSwiperController extends BaseController
/**
* 修改【请填写功能名称】
*/
@PostMapping("/edit")
@PostMapping("/system/appSwiper/edit")
public CommonResult edit(@RequestBody AppSwiper appSwiper)
{
return toAjax(appSwiperService.updateAppSwiper(appSwiper));
@ -81,9 +96,26 @@ public class AppSwiperController extends BaseController
/**
* 删除【请填写功能名称】
*/
@PostMapping("/del")
@PostMapping("/system/appSwiper/del")
public CommonResult remove(@RequestParam("idList") Long[] idList)
{
return toAjax(appSwiperService.deleteAppSwiperBySwiperIds(idList));
}
@GetMapping("/getJcPartnerInfo")
public CommonResult getJcPartnerInfo()
{
LambdaQueryWrapper<ShopMallPartners> queryWrapper =new LambdaQueryWrapper<>();
LoginUser user = SecurityFrameworkUtils.getLoginUser();
queryWrapper.eq(ShopMallPartners::getUserId,user.getId()).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0");
ShopMallPartners partner = partnersService.getOne(queryWrapper);
if (ObjectUtil.isEmpty(partner)){
return error("信息有误");
}
AdminUserDO sysUser = userService.getUser(user.getId());
Map<String,Object> map = new HashMap<>();
map.put("user", sysUser);
return CommonResult.success(map);
}
}

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppGoodsController.java
View File

@ -16,7 +16,7 @@ import cn.iocoder.yudao.module.core.controller.BaseController;
import java.util.List;
@RestController
@RequestMapping("/appInspection/goods")
@RequestMapping("/admin-api/appInspection/goods")
public class AppGoodsController extends BaseController {
@Autowired
private AppInspectionGoodsService appInspectionGoodsService;

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppHomeController.java
View File

@ -22,7 +22,7 @@ import java.util.List;
* @since 2023-08-01 16:04:12
*/
@RestController("AppShopInspectionGoods")
@RequestMapping("/appInspection/appHome")
@RequestMapping("/admin-api/appInspection/appHome")
public class AppHomeController extends BaseController {
/**
* 服务对象

15
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppNewsController.java
View File

@ -16,6 +16,7 @@ import cn.iocoder.yudao.module.system.service.dict.DictDataService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
import cn.iocoder.yudao.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
@ -34,7 +35,7 @@ import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/appInspection/news")
@RequestMapping("/admin-api/appInspection/news")
public class AppNewsController extends BaseController {
@Autowired
private IInspectionNewsService inspectionNewsService;
@ -104,21 +105,21 @@ public class AppNewsController extends BaseController {
return success(list);
}
@GetMapping("/list")
public TableDataInfo list(InspectionNews inspectionNews)
public TableDataInfo list(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
startPage();
List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(inspectionNews);
Page<InspectionNews> page = new Page<>(pageNum, pageSize);
List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
return getDataTable(list);
}
@GetMapping("/ownList")
public TableDataInfo ownList(InspectionNews inspectionNews)
public TableDataInfo ownList(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
//当前登录用户
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
inspectionNews.setCreator(loginUser.getId().toString());
startPage();
List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(inspectionNews);
Page<InspectionNews> page = new Page<>(pageNum, pageSize);
List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
return getDataTable(list);
}
@PostMapping("/add")

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppOrderController.java
View File

@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping("/appInspection/order")
@RequestMapping("/admin-api/appInspection/order")
public class AppOrderController extends BaseController {
@Autowired
private AppInspectionOrderService appInspectionOrderService;

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppPartnerController.java
View File

@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/appInspection/partner")
@RequestMapping("/admin-api/appInspection/partner")
public class AppPartnerController extends BaseController {
@Autowired
private AppInspectionPartnerService partnerList;

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/AppUserOwnController.java
View File

@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/appInspection/userOwn")
@RequestMapping("/admin-api/appInspection/userOwn")
public class AppUserOwnController extends BaseController {
@Autowired
private AppUserOwnService ownService;

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/DelInspectionInfoController.java
View File

@ -27,7 +27,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2024-05-08
*/
@RestController
@RequestMapping("/system/delInfo")
@RequestMapping("/admin-api/system/delInfo")
public class DelInspectionInfoController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionAppointmentController.java
View File

@ -20,7 +20,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-08-24
*/
@RestController
@RequestMapping("/inspection/appointment")
@RequestMapping("/admin-api/inspection/appointment")
public class InspectionAppointmentController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionCategoryTemplateController.java
View File

@ -28,7 +28,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-09-07
*/
@RestController
@RequestMapping("/inspection/template")
@RequestMapping("/admin-api/inspection/template")
public class InspectionCategoryTemplateController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionEquInfoController.java
View File

@ -27,7 +27,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-10-13
*/
@RestController
@RequestMapping("/system/equInfo")
@RequestMapping("/admin-api/system/equInfo")
public class InspectionEquInfoController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionFileController.java
View File

@ -26,7 +26,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-10-13
*/
@RestController
@RequestMapping("/inspectionFile/inspectionFile")
@RequestMapping("/admin-api/inspectionFile/inspectionFile")
public class InspectionFileController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionGoodsSkuController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* @since 2023-08-08 16:59:29
*/
@RestController
@RequestMapping("/system/inspectionGoodsSku")
@RequestMapping("/admin-api/system/inspectionGoodsSku")
public class InspectionGoodsSkuController extends BaseController {
/**
* 服务对象

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionHomePartnerController.java
View File

@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.core.controller.BaseController;
* @date 2023-08-02
*/
@RestController
@RequestMapping("/system/homePartner")
@RequestMapping("/admin-api/system/homePartner")
public class InspectionHomePartnerController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionInfoController.java
View File

@ -20,7 +20,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-08-13
*/
@RestController
@RequestMapping("/system/info")
@RequestMapping("/admin-api/system/info")
public class InspectionInfoController extends BaseController
{
@Autowired

9
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
View File

@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.permission.RoleService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
@ -38,7 +39,7 @@ import java.util.stream.Collectors;
@RestController
@RequestMapping("/system/inspectionMallPartners")
@RequestMapping("/admin-api/system/inspectionMallPartners")
public class InspectionMallPartnersController extends BaseController {
@Autowired
private IShopMallPartnersService shopMallPartnersService;
@ -57,11 +58,11 @@ public class InspectionMallPartnersController extends BaseController {
* 查询合作商管理列表
*/
@GetMapping("/list")
public TableDataInfo list(ShopMallPartners shopMallPartners)
public TableDataInfo list(ShopMallPartners shopMallPartners,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
shopMallPartners.setType("jc");
startPage();
List<ShopMallPartners> list = shopMallPartnersService.selectShopMallPartnersList(shopMallPartners);
Page<ShopMallPartners> page = new Page<>(pageNum, pageSize);
List<ShopMallPartners> list = shopMallPartnersService.selectShopMallPartnersList(page,shopMallPartners);
return getDataTable(list);
}

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsAssociationController.java
View File

@ -27,7 +27,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-08-07
*/
@RestController
@RequestMapping("/system/association")
@RequestMapping("/admin-api/system/association")
public class InspectionNewsAssociationController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsCommentController.java
View File

@ -27,7 +27,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-08-07
*/
@RestController
@RequestMapping("/system/comment")
@RequestMapping("/admin-api/system/comment")
public class InspectionNewsCommentController extends BaseController
{
@Autowired

12
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionNewsController.java
View File

@ -5,6 +5,8 @@ import java.util.List;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
import cn.iocoder.yudao.module.inspection.service.IInspectionNewsService;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -18,7 +20,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-08-03
*/
@RestController
@RequestMapping("/system/inspectionNews")
@RequestMapping("/admin-api/system/inspectionNews")
public class InspectionNewsController extends BaseController
{
@Autowired
@ -27,12 +29,12 @@ public class InspectionNewsController extends BaseController
/**
* 查询【请填写功能名称】列表
*/
@PreAuthorize("@ss.hasPermi('system:news:list')")
// @PreAuthorize("@ss.hasPermi('system:news:list')")
@GetMapping("/list")
public TableDataInfo list(InspectionNews inspectionNews)
public TableDataInfo list(InspectionNews inspectionNews,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
startPage();
List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(inspectionNews);
Page<InspectionNews> page = new Page<>(pageNum, pageSize);
List<InspectionNews> list = inspectionNewsService.selectInspectionNewsList(page,inspectionNews);
return getDataTable(list);
}

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionPickCarController.java
View File

@ -27,7 +27,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-09-02
*/
@RestController
@RequestMapping("/inspection/pickCar")
@RequestMapping("/admin-api/inspection/pickCar")
public class InspectionPickCarController extends BaseController
{
@Autowired

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java
View File

@ -36,7 +36,7 @@ import java.util.List;
import java.util.stream.Collectors;
@RestController
@RequestMapping("/partnerOwn/partner")
@RequestMapping("/admin-api/partnerOwn/partner")
public class PartnerOwnController extends BaseController {
@Autowired
private AppInspectionPartnerService partnerList;

14
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionCategoryController.java
View File

@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.inspection.controller;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
@ -17,7 +19,7 @@ import java.util.List;
* @since 2023-08-01 19:59:23
*/
@RestController
@RequestMapping("/system/shopInspectionCategory")
@RequestMapping("/admin-api/system/shopInspectionCategory")
public class ShopInspectionCategoryController extends BaseController {
/**
* 服务对象
@ -31,11 +33,13 @@ public class ShopInspectionCategoryController extends BaseController {
* @return 所有数据
*/
@GetMapping("/list")
public TableDataInfo list(ShopInspectionCategory shopInspectionCategory)
public CommonResult list(ShopInspectionCategory shopInspectionCategory,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize)
{
startPage();
List<ShopInspectionCategory> list = this.shopInspectionCategoryService.listVo(shopInspectionCategory);
return getDataTable(list);
PageParam pageParam = new PageParam();
pageParam.setPageNo(pageNum);
pageParam.setPageSize(pageSize);
PageResult<ShopInspectionCategory> res = this.shopInspectionCategoryService.listVo(shopInspectionCategory,pageParam);
return CommonResult.success(res);
}
/**

19
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionGoodsController.java
View File

@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
import cn.iocoder.yudao.module.payment.entity.OrderInfo;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.access.prepost.PreAuthorize;
@ -36,7 +37,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-07-08
*/
@RestController
@RequestMapping("/system/inspectionGoods")
@RequestMapping("/admin-api/system/inspectionGoods")
public class ShopInspectionGoodsController extends BaseController
{
@Autowired
@ -56,12 +57,12 @@ public class ShopInspectionGoodsController extends BaseController
/**
* 查询检测商品列表
*/
@PreAuthorize("@ss.hasPermi('system:inspectionGoods:list')")
// @PreAuthorize("@ss.hasPermi('system:inspectionGoods:list')")
@GetMapping("/listSystem")
public TableDataInfo listSystem(ShopInspectionGoods shopInspectionGoods)
public TableDataInfo listSystem(ShopInspectionGoods shopInspectionGoods,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
startPage();
List<ShopInspectionGoods> list = shopInspectionGoodsService.listSystem(shopInspectionGoods);
Page<ShopInspectionGoods> page = new Page<>(pageNum, pageSize);
List<ShopInspectionGoods> list = shopInspectionGoodsService.listSystem(page,shopInspectionGoods);
return getDataTable(list);
}
@ -219,7 +220,7 @@ public class ShopInspectionGoodsController extends BaseController
/**
* 新增检测商品
*/
@PreAuthorize("@ss.hasPermi('system:inspectionGoods:add')")
// @PreAuthorize("@ss.hasPermi('system:inspectionGoods:add')")
@PostMapping("/add")
public CommonResult add(@RequestBody ShopInspectionGoods shopInspectionGoods)
{
@ -230,7 +231,7 @@ public class ShopInspectionGoodsController extends BaseController
/**
* 修改检测商品
*/
@PreAuthorize("@ss.hasPermi('system:inspectionGoods:edit')")
// @PreAuthorize("@ss.hasPermi('system:inspectionGoods:edit')")
@PostMapping("/edit")
public CommonResult edit(@RequestBody ShopInspectionGoods shopInspectionGoods)
{
@ -240,7 +241,7 @@ public class ShopInspectionGoodsController extends BaseController
/**
* 审核检测商品
*/
@PreAuthorize("@ss.hasPermi('system:inspectionGoods:edit')")
// @PreAuthorize("@ss.hasPermi('system:inspectionGoods:edit')")
@PostMapping("/examine")
public CommonResult examine(@RequestBody ShopInspectionGoods shopInspectionGoods)
{
@ -250,7 +251,7 @@ public class ShopInspectionGoodsController extends BaseController
/**
* 删除检测商品
*/
@PreAuthorize("@ss.hasPermi('system:inspectionGoods:remove')")
// @PreAuthorize("@ss.hasPermi('system:inspectionGoods:remove')")
@PostMapping("/del")
public CommonResult remove(@RequestParam("idList") Long[] ids)
{

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/ShopInspectionOrderController.java
View File

@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.core.controller.BaseController;
* @date 2023-07-08
*/
@RestController
@RequestMapping("/system/inspectionOrder")
@RequestMapping("/admin-api/system/inspectionOrder")
public class ShopInspectionOrderController extends BaseController
{
@Autowired

29
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/SiteInfoController.java
View File

@ -5,16 +5,10 @@ import javax.servlet.http.HttpServletResponse;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.util.ExcelUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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 org.springframework.web.bind.annotation.*;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.inspection.entity.SiteInfo;
import cn.iocoder.yudao.module.inspection.service.ISiteInfoService;
@ -27,7 +21,7 @@ import cn.iocoder.yudao.module.core.page.TableDataInfo;
* @date 2023-09-01
*/
@RestController
@RequestMapping("/inspection/info")
@RequestMapping("/admin-api/inspection/info")
public class SiteInfoController extends BaseController
{
@Autowired
@ -37,10 +31,10 @@ public class SiteInfoController extends BaseController
* 查询inspection列表
*/
@GetMapping("/list")
public TableDataInfo list(SiteInfo siteInfo)
public TableDataInfo list(SiteInfo siteInfo, @RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize)
{
startPage();
List<SiteInfo> list = siteInfoService.selectSiteInfoList(siteInfo);
Page<SiteInfo> page = new Page<>(pageNum, pageSize);
List<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
return getDataTable(list);
}
@ -51,7 +45,8 @@ public class SiteInfoController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SiteInfo siteInfo)
{
List<SiteInfo> list = siteInfoService.selectSiteInfoList(siteInfo);
Page<SiteInfo> page = new Page<>();
List<SiteInfo> list = siteInfoService.selectSiteInfoList(page,siteInfo);
ExcelUtil<SiteInfo> util = new ExcelUtil<SiteInfo>(SiteInfo.class);
util.exportExcel(response, list, "inspection数据");
}
@ -59,7 +54,7 @@ public class SiteInfoController extends BaseController
/**
* 获取inspection详细信息
*/
@PreAuthorize("@ss.hasPermi('inspection:info:query')")
// @PreAuthorize("@ss.hasPermi('inspection:info:query')")
@GetMapping(value = "/{id}")
public CommonResult getInfo(@PathVariable("id") Long id)
{
@ -69,7 +64,7 @@ public class SiteInfoController extends BaseController
/**
* 新增inspection
*/
@PreAuthorize("@ss.hasPermi('inspection:info:add')")
// @PreAuthorize("@ss.hasPermi('inspection:info:add')")
@PostMapping
public CommonResult add(@RequestBody SiteInfo siteInfo)
{
@ -79,7 +74,7 @@ public class SiteInfoController extends BaseController
/**
* 修改inspection
*/
@PreAuthorize("@ss.hasPermi('inspection:info:edit')")
// @PreAuthorize("@ss.hasPermi('inspection:info:edit')")
@PutMapping
public CommonResult edit(@RequestBody SiteInfo siteInfo)
{
@ -89,7 +84,7 @@ public class SiteInfoController extends BaseController
/**
* 删除inspection
*/
@PreAuthorize("@ss.hasPermi('inspection:info:remove')")
// @PreAuthorize("@ss.hasPermi('inspection:info:remove')")
@DeleteMapping("/{ids}")
public CommonResult remove(@PathVariable Long[] ids)
{

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/WarnMessageController.java
View File

@ -24,7 +24,7 @@ import cn.iocoder.yudao.module.inspection.service.IWarnMessageService;
* @date 2023-10-13
*/
@RestController
@RequestMapping("/warnMsg/warnMsg")
@RequestMapping("/admin-api/warnMsg/warnMsg")
public class WarnMessageController extends BaseController
{
@Autowired

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionCategoryTemplateMapper.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.mapper;
import java.util.List;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate;
import org.apache.ibatis.annotations.Mapper;
@ -13,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2023-09-07
*/
@Mapper
public interface InspectionCategoryTemplateMapper extends BaseMapper<InspectionCategoryTemplate>
public interface InspectionCategoryTemplateMapper extends BaseMapperX<InspectionCategoryTemplate>
{
/**
* 查询分类模版
@ -62,4 +63,6 @@ public interface InspectionCategoryTemplateMapper extends BaseMapper<Inspection
* @return 结果
*/
public int deleteInspectionCategoryTemplateByIds(Long[] ids);
void deleteByCategoryId(Long id);
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/InspectionNewsMapper.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -30,7 +31,7 @@ public interface InspectionNewsMapper extends BaseMapper<InspectionNews>
* @param inspectionNews 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<InspectionNews> selectInspectionNewsList(InspectionNews inspectionNews);
public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, @Param("vo") InspectionNews inspectionNews);
/**
* 新增【请填写功能名称】

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionCategoryMapper.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.inspection.mapper;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
import org.apache.ibatis.annotations.Mapper;
@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper;
* @since 2023-08-01 19:59:23
*/
@Mapper
public interface ShopInspectionCategoryMapper extends BaseMapper<ShopInspectionCategory> {
public interface ShopInspectionCategoryMapper extends BaseMapperX<ShopInspectionCategory> {
}

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/ShopInspectionGoodsMapper.java
View File

@ -4,7 +4,9 @@ import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 检测商品Mapper接口
@ -31,8 +33,9 @@ public interface ShopInspectionGoodsMapper extends BaseMapper<ShopInspectionGood
*/
public List<ShopInspectionGoods> selectShopInspectionGoodsListWx(ShopInspectionGoods shopInspectionGoods);
List<ShopInspectionGoods> listSystem(ShopInspectionGoods shopInspectionGoods);
List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,@Param("vo") ShopInspectionGoods shopInspectionGoods);
List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods);
int deleteByList(List<Long> list);
}

4
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/SiteInfoMapper.java
View File

@ -2,7 +2,9 @@ package cn.iocoder.yudao.module.inspection.mapper;
import java.util.List;
import cn.iocoder.yudao.module.inspection.entity.SiteInfo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* inspectionMapper接口
@ -27,7 +29,7 @@ public interface SiteInfoMapper
* @param siteInfo inspection
* @return inspection集合
*/
public List<SiteInfo> selectSiteInfoList(SiteInfo siteInfo);
public List<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,@Param("vo") SiteInfo siteInfo);
/**
* 新增inspection

2
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionCategoryTemplateService.java
View File

@ -60,4 +60,6 @@ public interface IInspectionCategoryTemplateService extends IService<Inspection
* @return 结果
*/
public int deleteInspectionCategoryTemplateById(Long id);
void deleteByCategoryId(Long id);
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IInspectionNewsService.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.inspection.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.iocoder.yudao.module.inspection.entity.InspectionNews;
import cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation;
@ -29,7 +30,7 @@ public interface IInspectionNewsService extends IService<InspectionNews>
* @param inspectionNews 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<InspectionNews> selectInspectionNewsList(InspectionNews inspectionNews);
public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page,InspectionNews inspectionNews);
List<InspectionNews> appHomeNewsList();
List<String> listGfClass(String type);

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/IShopInspectionGoodsService.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.inspection.service;
import java.util.List;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
import cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods;
@ -78,7 +79,7 @@ public interface IShopInspectionGoodsService extends IService<ShopInspectionGood
* @param shopInspectionGoods 检测商品
* @return 检测商品集合
*/
public List<ShopInspectionGoods> listSystem(ShopInspectionGoods shopInspectionGoods);
public List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods);
public List<ShopInspectionGoods> listPartnerGoods(ShopInspectionGoods shopInspectionGoods) throws Exception;
List<ShopInspectionCategory> categoryList() throws Exception;

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ISiteInfoService.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.inspection.service;
import java.util.List;
import cn.iocoder.yudao.module.inspection.entity.SiteInfo;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* inspectionService接口
@ -25,7 +26,7 @@ public interface ISiteInfoService
* @param siteInfo inspection
* @return inspection集合
*/
public List<SiteInfo> selectSiteInfoList(SiteInfo siteInfo);
public List<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,SiteInfo siteInfo);
/**
* 新增inspection

4
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/ShopInspectionCategoryService.java
View File

@ -1,5 +1,7 @@
package cn.iocoder.yudao.module.inspection.service;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.iocoder.yudao.module.inspection.entity.ShopInspectionCategory;
@ -15,7 +17,7 @@ public interface ShopInspectionCategoryService extends IService<ShopInspectionCa
void saveVo(ShopInspectionCategory category);
void updateByIdVo(ShopInspectionCategory category);
void removeByIdsVo(List<Long> idList) throws Exception;
List<ShopInspectionCategory> listVo(ShopInspectionCategory shopInspectionCategory);
PageResult<ShopInspectionCategory> listVo(ShopInspectionCategory shopInspectionCategory, PageParam pageParam);
ShopInspectionCategory getByIdVo(Long id);

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionCategoryTemplateServiceImpl.java
View File

@ -91,4 +91,9 @@ public class InspectionCategoryTemplateServiceImpl extends ServiceImpl<Inspectio
{
return baseMapper.deleteInspectionCategoryTemplateById(id);
}
@Override
public void deleteByCategoryId(Long id) {
baseMapper.deleteByCategoryId(id);
}
}

7
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/InspectionNewsServiceImpl.java
View File

@ -10,6 +10,7 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.iocoder.yudao.util.DateUtils;
import cn.iocoder.yudao.util.StringUtils;
@ -60,13 +61,13 @@ public class InspectionNewsServiceImpl extends ServiceImpl<InspectionNewsMapper,
* @return 【请填写功能名称】
*/
@Override
public List<InspectionNews> selectInspectionNewsList(InspectionNews inspectionNews)
public List<InspectionNews> selectInspectionNewsList(Page<InspectionNews> page, InspectionNews inspectionNews)
{
if (inspectionNews.getPublishUnit().equals("检测站公告")){
if (null!=inspectionNews.getPublishUnit() && inspectionNews.getPublishUnit().equals("检测站公告")){
inspectionNews.setCategory("jczgg");
inspectionNews.setPublishUnit(null);
}
List<InspectionNews> list = baseMapper.selectInspectionNewsList(inspectionNews);
List<InspectionNews> list = baseMapper.selectInspectionNewsList(page,inspectionNews);
list.forEach(it->{
it.setNewsContent(HtmlFilter.dealFunction(it.getNewsContent()));
});

20
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionCategoryServiceImpl.java
View File

@ -1,6 +1,9 @@
package cn.iocoder.yudao.module.inspection.service.impl;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
@ -48,9 +51,7 @@ public class ShopInspectionCategoryServiceImpl extends ServiceImpl<ShopInspectio
@Transactional(rollbackFor = Exception.class)
public void updateByIdVo(ShopInspectionCategory category) {
this.updateById(category);
LambdaUpdateWrapper<InspectionCategoryTemplate> wrapper =new LambdaUpdateWrapper<>();
wrapper.eq(InspectionCategoryTemplate::getCategoryId,category.getId());
templateService.remove(wrapper);
templateService.deleteByCategoryId(category.getId());
List<InspectionCategoryTemplate> templates = category.getTemplates();
for (InspectionCategoryTemplate template : templates) {
template.setCategoryId(category.getId());
@ -78,11 +79,14 @@ public class ShopInspectionCategoryServiceImpl extends ServiceImpl<ShopInspectio
}
@Override
public List<ShopInspectionCategory> listVo(ShopInspectionCategory shopInspectionCategory) {
LambdaQueryWrapper<ShopInspectionCategory> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(shopInspectionCategory.getCategoryName()),ShopInspectionCategory::getCategoryName,shopInspectionCategory.getCategoryName()).orderByAsc(ShopInspectionCategory::getOrderNum);
List<ShopInspectionCategory> list = this.list(queryWrapper);
return list;
public PageResult<ShopInspectionCategory> listVo(ShopInspectionCategory shopInspectionCategory, PageParam pageParam) {
QueryWrapper<ShopInspectionCategory> queryWrapper = new QueryWrapper<>();
if(null!=shopInspectionCategory.getCategoryName()){
queryWrapper.like("category_name",shopInspectionCategory.getCategoryName());
}
queryWrapper.orderByAsc("order_num");
return baseMapper.selectPage(pageParam,queryWrapper);
}
@Override

7
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/ShopInspectionGoodsServiceImpl.java
View File

@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.iocoder.yudao.util.StringUtils;
import cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate;
@ -213,7 +214,7 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl<ShopInspectionGo
@Override
public int deleteShopInspectionGoodsByIds(Long[] ids)
{
return baseMapper.deleteBatchIds(Arrays.asList(ids));
return baseMapper.deleteByList(Arrays.asList(ids));
}
/**
@ -229,8 +230,8 @@ public class ShopInspectionGoodsServiceImpl extends ServiceImpl<ShopInspectionGo
}
//后台管理的列表查询部分
@Override
public List<ShopInspectionGoods> listSystem(ShopInspectionGoods shopInspectionGoods) {
return baseMapper.listSystem(shopInspectionGoods);
public List<ShopInspectionGoods> listSystem(Page<ShopInspectionGoods> page,ShopInspectionGoods shopInspectionGoods) {
return baseMapper.listSystem(page,shopInspectionGoods);
}

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/SiteInfoServiceImpl.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.inspection.service.impl;
import java.util.List;
import cn.iocoder.yudao.util.DateUtils;
import cn.iocoder.yudao.util.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import cn.iocoder.yudao.module.inspection.mapper.SiteInfoMapper;
@ -40,9 +41,9 @@ public class SiteInfoServiceImpl implements ISiteInfoService
* @return inspection
*/
@Override
public List<SiteInfo> selectSiteInfoList(SiteInfo siteInfo)
public List<SiteInfo> selectSiteInfoList(Page<SiteInfo> page,SiteInfo siteInfo)
{
List<SiteInfo> siteInfos = siteInfoMapper.selectSiteInfoList(siteInfo);
List<SiteInfo> siteInfos = siteInfoMapper.selectSiteInfoList(page,siteInfo);
for (SiteInfo info : siteInfos) {
if (null!=info.getSiteLongitude()&&null!=info.getSiteLatitude()){
info.setLongitude(info.getSiteLongitude().toString());

84
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/controller/FzRecordController.java Normal file
View File

@ -0,0 +1,84 @@
package cn.iocoder.yudao.module.payment.controller;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
import cn.iocoder.yudao.module.payment.entity.FzRecord;
import cn.iocoder.yudao.module.payment.service.IFzRecordService;
import cn.iocoder.yudao.util.ExcelUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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
*
* @author zcy
* @date 2023-10-18
*/
@RestController
@RequestMapping("/admin-api/fzRecord/fzRecord")
public class FzRecordController extends BaseController
{
@Autowired
private IFzRecordService fzRecordService;
/**
* 查询分账记录列表
*/
// @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:list')")
@GetMapping("/list")
public TableDataInfo list(FzRecord fzRecord,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
Page<FzRecord> page = new Page<>(pageNum, pageSize);
List<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
return getDataTable(list);
}
/**
* 导出分账记录列表
*/
// @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, FzRecord fzRecord)
{
Page<FzRecord> page = new Page<>();
List<FzRecord> list = fzRecordService.selectFzRecordList(page,fzRecord);
ExcelUtil<FzRecord> util = new ExcelUtil<FzRecord>(FzRecord.class);
util.exportExcel(response, list, "分账记录数据");
}
/**
* 获取分账记录详细信息
*/
// @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:query')")
@GetMapping(value = "/{id}")
public CommonResult getInfo(@PathVariable("id") Long id)
{
return success(fzRecordService.selectFzRecordById(id));
}
/**
* 新增分账记录
*/
// @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:add')")
@PostMapping
public CommonResult add(@RequestBody FzRecord fzRecord)
{
return toAjax(fzRecordService.insertFzRecord(fzRecord));
}
/**
* 修改分账记录
*/
// @PreAuthorize("@ss.hasPermi('fzRecord:fzRecord:edit')")
@PutMapping
public CommonResult edit(@RequestBody FzRecord fzRecord)
{
return toAjax(fzRecordService.updateFzRecord(fzRecord));
}
}

54
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/entity/FzRecord.java Normal file
View File

@ -0,0 +1,54 @@
package cn.iocoder.yudao.module.payment.entity;
import cn.iocoder.yudao.annotation.Excel;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
/**
* 分账记录对象 fz_record
*
* @author zcy
* @date 2023-10-18
*/
@Data
public class FzRecord extends TenantBaseDO
{
private static final long serialVersionUID = 1L;
/** 主键 */
@TableId(type = IdType.AUTO)
private Long id;
/** 商户主键 */
private Long partnerId;
/** 商户名称 */
@Excel(name = "商户名称")
private String partnerName;
/** 订单主键 */
private Long orderId;
/** 单号 */
@Excel(name = "单号")
private String orderNo;
/** 入账金额单位分 */
@Excel(name = "入账金额单位分")
private Long amount;
/** 总金额 */
@Excel(name = "总金额")
private Long totalAmount;
/** 是否成功1成功0失败 */
@Excel(name = "是否成功1成功0失败")
private String isSuccess;
/** 失败原因 */
@Excel(name = "失败原因")
private String reason;
}

36
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/mapper/FzRecordMapper.java Normal file
View File

@ -0,0 +1,36 @@
package cn.iocoder.yudao.module.payment.mapper;
import cn.iocoder.yudao.module.payment.entity.FzRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 分账记录Mapper接口
*
* @author zcy
* @date 2023-10-18
*/
@Mapper
public interface FzRecordMapper extends BaseMapper<FzRecord>
{
/**
* 查询分账记录
*
* @param id 分账记录主键
* @return 分账记录
*/
public FzRecord selectFzRecordById(Long id);
/**
* 查询分账记录列表
*
* @param fzRecord 分账记录
* @return 分账记录集合
*/
public List<FzRecord> selectFzRecordList(Page<FzRecord> page,@Param("vo") FzRecord fzRecord);
}

48
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/IFzRecordService.java Normal file
View File

@ -0,0 +1,48 @@
package cn.iocoder.yudao.module.payment.service;
import cn.iocoder.yudao.module.payment.entity.FzRecord;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* 分账记录Service接口
*
* @author zcy
* @date 2023-10-18
*/
public interface IFzRecordService extends IService<FzRecord>
{
/**
* 查询分账记录
*
* @param id 分账记录主键
* @return 分账记录
*/
public FzRecord selectFzRecordById(Long id);
/**
* 查询分账记录列表
*
* @param fzRecord 分账记录
* @return 分账记录集合
*/
public List<FzRecord> selectFzRecordList(Page<FzRecord> page,FzRecord fzRecord);
/**
* 新增分账记录
*
* @param fzRecord 分账记录
* @return 结果
*/
public int insertFzRecord(FzRecord fzRecord);
/**
* 修改分账记录
*
* @param fzRecord 分账记录
* @return 结果
*/
public int updateFzRecord(FzRecord fzRecord);
}

73
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/FzRecordServiceImpl.java Normal file
View File

@ -0,0 +1,73 @@
package cn.iocoder.yudao.module.payment.service.impl;
import cn.iocoder.yudao.module.payment.entity.FzRecord;
import cn.iocoder.yudao.module.payment.mapper.FzRecordMapper;
import cn.iocoder.yudao.module.payment.service.IFzRecordService;
import cn.iocoder.yudao.util.DateUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 分账记录Service业务层处理
*
* @author zcy
* @date 2023-10-18
*/
@Service
public class FzRecordServiceImpl extends ServiceImpl<FzRecordMapper, FzRecord> implements IFzRecordService
{
/**
* 查询分账记录
*
* @param id 分账记录主键
* @return 分账记录
*/
@Override
public FzRecord selectFzRecordById(Long id)
{
return baseMapper.selectFzRecordById(id);
}
/**
* 查询分账记录列表
*
* @param fzRecord 分账记录
* @return 分账记录
*/
@Override
public List<FzRecord> selectFzRecordList(Page<FzRecord> page,FzRecord fzRecord)
{
return baseMapper.selectFzRecordList(page,fzRecord);
}
/**
* 新增分账记录
*
* @param fzRecord 分账记录
* @return 结果
*/
@Override
public int insertFzRecord(FzRecord fzRecord)
{
return baseMapper.insert(fzRecord);
}
/**
* 修改分账记录
*
* @param fzRecord 分账记录
* @return 结果
*/
@Override
public int updateFzRecord(FzRecord fzRecord)
{
fzRecord.setUpdateTime(DateUtils.getNowDate());
return baseMapper.updateById(fzRecord);
}
}

102
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/PartnerDetailController.java Normal file
View File

@ -0,0 +1,102 @@
package cn.iocoder.yudao.module.shop.controller;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
import cn.iocoder.yudao.module.shop.service.IPartnerDetailService;
import cn.iocoder.yudao.util.ExcelUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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
*
* @author ruoyi
* @date 2023-08-13
*/
@RestController
@RequestMapping("/admin-api/partner/detail")
public class PartnerDetailController extends BaseController
{
@Autowired
private IPartnerDetailService partnerDetailService;
/**
* 查询【请填写功能名称】列表
*/
// @PreAuthorize("@ss.hasPermi('system:detail:list')")
@GetMapping("/list")
public TableDataInfo list(PartnerDetail partnerDetail,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
Page<PartnerDetail> page = new Page<>(pageNum, pageSize);
List<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
return getDataTable(list);
}
/**
* 导出【请填写功能名称】列表
*/
@PreAuthorize("@ss.hasPermi('system:detail:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, PartnerDetail partnerDetail)
{
Page<PartnerDetail> page = new Page<>();
List<PartnerDetail> list = partnerDetailService.selectPartnerDetailList(page,partnerDetail);
ExcelUtil<PartnerDetail> util = new ExcelUtil<PartnerDetail>(PartnerDetail.class);
util.exportExcel(response, list, "【请填写功能名称】数据");
}
/**
* 获取【请填写功能名称】详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:detail:query')")
@GetMapping(value = "/{id}")
public CommonResult getInfo(@PathVariable("id") Long id)
{
return success(partnerDetailService.selectPartnerDetailById(id));
}
/**
* 新增【请填写功能名称】
*/
@PostMapping("/add")
public CommonResult add(@RequestBody PartnerDetail partnerDetail)
{
return toAjax(partnerDetailService.insertPartnerDetail(partnerDetail));
}
/**
* 修改【请填写功能名称】
*/
// @PreAuthorize("@ss.hasPermi('system:detail:edit')")
@PutMapping
public CommonResult edit(@RequestBody PartnerDetail partnerDetail)
{
return toAjax(partnerDetailService.updatePartnerDetail(partnerDetail));
}
/**
* 修改【审核接口】
*/
// @PreAuthorize("@ss.hasPermi('system:detail:edit')")
@PostMapping("/examine")
public CommonResult examine(@RequestBody PartnerDetail partnerDetail) throws Exception {
partnerDetailService.examine(partnerDetail);
return success();
}
/**
* 删除【请填写功能名称】
*/
// @PreAuthorize("@ss.hasPermi('system:detail:remove')")
@DeleteMapping("/{ids}")
public CommonResult remove(@PathVariable Long[] ids)
{
return toAjax(partnerDetailService.deletePartnerDetailByIds(ids));
}
}

93
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/controller/ShopCouponTemplateController.java Normal file
View File

@ -0,0 +1,93 @@
package cn.iocoder.yudao.module.shop.controller;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.core.controller.BaseController;
import cn.iocoder.yudao.module.core.page.TableDataInfo;
import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
import cn.iocoder.yudao.module.shop.service.IShopCouponTemplateService;
import cn.iocoder.yudao.util.ExcelUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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
*
* @author ruoyi
* @date 2023-08-29
*/
@RestController
@RequestMapping("/admin-api/shop/couponTemplate")
public class ShopCouponTemplateController extends BaseController
{
@Autowired
private IShopCouponTemplateService shopCouponTemplateService;
/**
* 查询优惠券模板列表
*/
// @PreAuthorize("@ss.hasPermi('shop:couponTemplate:list')")
@GetMapping("/list")
public TableDataInfo list(ShopCouponTemplate shopCouponTemplate,@RequestParam("pageNum") Integer pageNum,@RequestParam("pageSize") Integer pageSize)
{
Page<ShopCouponTemplate> page = new Page<>(pageNum, pageSize);
List<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
return getDataTable(list);
}
/**
* 导出优惠券模板列表
*/
// @PreAuthorize("@ss.hasPermi('shop:couponTemplate:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, ShopCouponTemplate shopCouponTemplate)
{
Page<ShopCouponTemplate> page = new Page<>();
List<ShopCouponTemplate> list = shopCouponTemplateService.selectShopCouponTemplateList(page,shopCouponTemplate);
ExcelUtil<ShopCouponTemplate> util = new ExcelUtil<ShopCouponTemplate>(ShopCouponTemplate.class);
util.exportExcel(response, list, "优惠券模板数据");
}
/**
* 获取优惠券模板详细信息
*/
// @PreAuthorize("@ss.hasPermi('shop:couponTemplate:query')")
@GetMapping(value = "/{id}")
public CommonResult getInfo(@PathVariable("id") Long id)
{
return success(shopCouponTemplateService.selectShopCouponTemplateById(id));
}
/**
* 新增优惠券模板
*/
// @PreAuthorize("@ss.hasPermi('shop:couponTemplate:add')")
@PostMapping
public CommonResult add(@RequestBody ShopCouponTemplate shopCouponTemplate)
{
return toAjax(shopCouponTemplateService.insertShopCouponTemplate(shopCouponTemplate));
}
/**
* 修改优惠券模板
*/
// @PreAuthorize("@ss.hasPermi('shop:couponTemplate:edit')")
@PutMapping
public CommonResult edit(@RequestBody ShopCouponTemplate shopCouponTemplate)
{
return toAjax(shopCouponTemplateService.updateShopCouponTemplate(shopCouponTemplate));
}
/**
* 删除优惠券模板
*/
// @PreAuthorize("@ss.hasPermi('shop:couponTemplate:remove')")
@DeleteMapping("/{ids}")
public CommonResult remove(@PathVariable Long[] ids)
{
return toAjax(shopCouponTemplateService.deleteShopCouponTemplateByIds(ids));
}
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/PartnerDetailMapper.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.shop.mapper;
import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -31,7 +32,7 @@ public interface PartnerDetailMapper
* @param partnerDetail 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<PartnerDetail> selectPartnerDetailList(PartnerDetail partnerDetail);
public List<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,@Param("vo") PartnerDetail partnerDetail);
/**
* 新增【请填写功能名称】

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopCouponTemplateMapper.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -30,7 +31,7 @@ public interface ShopCouponTemplateMapper extends BaseMapper<ShopCouponTemplate>
* @param shopCouponTemplate 优惠券模板
* @return 优惠券模板集合
*/
public List<ShopCouponTemplate> selectShopCouponTemplateList(ShopCouponTemplate shopCouponTemplate);
public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,@Param("vo") ShopCouponTemplate shopCouponTemplate);
/**
* 新增优惠券模板

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/mapper/ShopMallPartnersMapper.java
View File

@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.shop.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -30,7 +31,7 @@ public interface ShopMallPartnersMapper extends BaseMapper<ShopMallPartners>
* @param shopMallPartners 合作商管理
* @return 合作商管理集合
*/
public List<ShopMallPartners> selectShopMallPartnersList(ShopMallPartners shopMallPartners);
public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, @Param("shop") ShopMallPartners shopMallPartners);
/**
* 新增合作商管理

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IPartnerDetailService.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.shop.service;
import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@ -28,7 +29,7 @@ public interface IPartnerDetailService
* @param partnerDetail 【请填写功能名称】
* @return 【请填写功能名称】集合
*/
public List<PartnerDetail> selectPartnerDetailList(PartnerDetail partnerDetail);
public List<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,PartnerDetail partnerDetail);
/**
* 新增【请填写功能名称】
@ -60,4 +61,6 @@ public interface IPartnerDetailService
* @return 结果
*/
public int deletePartnerDetailById(Long id);
public int examine(PartnerDetail partnerDetail) throws Exception;
}

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopCouponTemplateService.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.shop.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
@ -27,7 +28,7 @@ public interface IShopCouponTemplateService extends IService<ShopCouponTemplate
* @param shopCouponTemplate 优惠券模板
* @return 优惠券模板集合
*/
public List<ShopCouponTemplate> selectShopCouponTemplateList(ShopCouponTemplate shopCouponTemplate);
public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,ShopCouponTemplate shopCouponTemplate);
/**
* 新增优惠券模板

3
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/IShopMallPartnersService.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.shop.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
@ -27,7 +28,7 @@ public interface IShopMallPartnersService extends IService<ShopMallPartners>
* @param shopMallPartners 合作商管理
* @return 合作商管理集合
*/
public List<ShopMallPartners> selectShopMallPartnersList(ShopMallPartners shopMallPartners);
public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, ShopMallPartners shopMallPartners);
/**
* 新增合作商管理

82
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/PartnerDetailServiceImpl.java
View File

@ -1,7 +1,13 @@
package cn.iocoder.yudao.module.shop.service.impl;
import cn.iocoder.yudao.module.partner.entity.PartnerBalance;
import cn.iocoder.yudao.module.partner.entity.PartnerBankInfo;
import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
import cn.iocoder.yudao.module.partner.service.IPartnerBalanceService;
import cn.iocoder.yudao.module.partner.service.IPartnerWorkerService;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.service.permission.PermissionService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import cn.iocoder.yudao.util.InspWechatPayConfig;
import cn.iocoder.yudao.util.DateUtils;
@ -9,6 +15,8 @@ import cn.iocoder.yudao.module.shop.entity.PartnerDetail;
import cn.iocoder.yudao.module.shop.mapper.PartnerDetailMapper;
import cn.iocoder.yudao.module.shop.service.IPartnerDetailService;
import cn.iocoder.yudao.module.shop.service.IShopMallPartnersService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.wechat.pay.java.core.Config;
import com.wechat.pay.java.core.RSAAutoCertificateConfig;
import com.wechat.pay.java.service.profitsharing.ProfitsharingService;
@ -20,8 +28,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.ruoyi.partner.service.IPartnerBankInfoService;
import org.springframework.transaction.annotation.Transactional;
import static cn.iocoder.yudao.util.AddressSplitter.splitAddress;
/**
@ -47,6 +61,8 @@ public class PartnerDetailServiceImpl implements IPartnerDetailService
private IPartnerBankInfoService partnerBankInfoService;
@Resource
private InspWechatPayConfig inspWechatPayConfig;
@Autowired
private PermissionService permissionService;
/**
* 查询【请填写功能名称】
@ -73,9 +89,9 @@ public class PartnerDetailServiceImpl implements IPartnerDetailService
* @return 【请填写功能名称】
*/
@Override
public List<PartnerDetail> selectPartnerDetailList(PartnerDetail partnerDetail)
public List<PartnerDetail> selectPartnerDetailList(Page<PartnerDetail> page,PartnerDetail partnerDetail)
{
return partnerDetailMapper.selectPartnerDetailList(partnerDetail);
return partnerDetailMapper.selectPartnerDetailList(page,partnerDetail);
}
/**
@ -149,4 +165,66 @@ public class PartnerDetailServiceImpl implements IPartnerDetailService
}
//审核接口
@Override
@Transactional(rollbackFor = Exception.class)
public int examine(PartnerDetail partnerDetail) throws Exception {
if (partnerDetail.getStatus().equals("2")){
//开设店铺
ShopMallPartners shopMallPartners =new ShopMallPartners();
shopMallPartners.setUserId(partnerDetail.getUserId());
shopMallPartners.setType(partnerDetail.getType());
shopMallPartners.setAverageScore(4.5);
List<String> strings = splitAddress(partnerDetail.getPosition());
shopMallPartners.setProvince(strings.get(0));
shopMallPartners.setCity(strings.get(1));
shopMallPartners.setArea(strings.get(2));
shopMallPartners.setIsWorking("0");
shopMallPartners.setIsBanned("0");
shopMallPartners.setContactNumber(partnerDetail.getPhone());
shopMallPartners.setOpenComment("0");
shopMallPartners.setPartnerName(partnerDetail.getPartnerName());
partnersService.save(shopMallPartners);
partnerDetail.setPartnerId(shopMallPartners.getPartnerId());
//审核通过
partnerDetailMapper.updatePartnerDetail(partnerDetail);
AdminUserDO user = userService.getUser(partnerDetail.getUserId());
Set<Long> role = new HashSet<>();
role.add(113L);
permissionService.assignUserRole(user.getId(),role);
//创建账户
PartnerBalance partnerBalance =new PartnerBalance();
partnerBalance.setPartnerId(shopMallPartners.getPartnerId());
partnerBalance.setTotalRevenue(0L);
partnerBalance.setAmount(0L);
partnerBalance.setFrozenAmount(0L);
partnerBalance.setWithdrawAmount(0L);
partnerBalanceService.save(partnerBalance);
//将店主加入员工
PartnerWorker partnerWorker =new PartnerWorker();
partnerWorker.setUserId(user.getId());
partnerWorker.setPartnerId(shopMallPartners.getPartnerId());
partnerWorker.setAvatar(user.getAvatar());
partnerWorker.setWorkName(user.getNickname());
partnerWorker.setWorkPhone(user.getMobile());
workerService.save(partnerWorker);
//添加平台为收帐放
LambdaQueryWrapper<PartnerBankInfo> queryWrapper =new LambdaQueryWrapper<>();
queryWrapper.eq(PartnerBankInfo::getPartnerId,shopMallPartners.getPartnerId());
PartnerBankInfo bankInfo = partnerBankInfoService.getOne(queryWrapper);
try {
receiversAdd(inspWechatPayConfig.getAppId(), bankInfo.getMchId(),bankInfo.getApiclientKey(),
bankInfo.getSerialNo(),bankInfo.getApiV3Key());
}catch (Exception e){
throw new Exception("商户信息不正确，请联系管理员");
}
}else if (partnerDetail.getStatus().equals("3")){
//拒绝通过
partnerDetailMapper.updatePartnerDetail(partnerDetail);
}
return 0;
}
}

5
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopCouponTemplateServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.shop.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.iocoder.yudao.util.DateUtils;
import cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate;
@ -39,9 +40,9 @@ public class ShopCouponTemplateServiceImpl extends ServiceImpl<ShopCouponTemplat
* @return 优惠券模板
*/
@Override
public List<ShopCouponTemplate> selectShopCouponTemplateList(ShopCouponTemplate shopCouponTemplate)
public List<ShopCouponTemplate> selectShopCouponTemplateList(Page<ShopCouponTemplate> page,ShopCouponTemplate shopCouponTemplate)
{
return baseMapper.selectShopCouponTemplateList(shopCouponTemplate);
return baseMapper.selectShopCouponTemplateList(page,shopCouponTemplate);
}
/**

6
dl-module-inspection/src/main/java/cn/iocoder/yudao/module/shop/service/impl/ShopMallPartnersServiceImpl.java
View File

@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.permission.UserRoleDO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import cn.iocoder.yudao.module.system.dal.mysql.permission.UserRoleMapper;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.iocoder.yudao.module.partner.entity.PartnerWorker;
import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
@ -54,9 +55,10 @@ public class ShopMallPartnersServiceImpl extends ServiceImpl<ShopMallPartnersMap
* @return 合作商管理
*/
@Override
public List<ShopMallPartners> selectShopMallPartnersList(ShopMallPartners shopMallPartners)
public List<ShopMallPartners> selectShopMallPartnersList(Page<ShopMallPartners> page, ShopMallPartners shopMallPartners)
{
return baseMapper.selectShopMallPartnersList(shopMallPartners);
return baseMapper.selectShopMallPartnersList(page,shopMallPartners);
}
/**

22
dl-module-inspection/src/main/resources/mapper/contract/ContractHistoryMapper.xml
View File

@ -10,13 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="contractId" column="contract_id" />
<result property="signContract" column="sign_contract" />
<result property="createTime" column="create_time" />
<result property="creator" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updater" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectContractHistoryVo">
select id, user_id, contract_id, sign_contract, create_time, create_by, update_time, update_by from contract_history
select id, user_id, contract_id, sign_contract, create_time, creator, update_time, updater from contract_history
</sql>
<select id="selectContractHistoryList" parameterType="cn.iocoder.yudao.module.contract.entity.ContractHistory" resultType="cn.iocoder.yudao.module.contract.entity.ContractHistory">
@ -26,9 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
history.contract_id,
history.sign_contract,
history.create_time,
history.create_by as creator,
history.creator as creator,
history.update_time,
history.update_by as updater,
history.updater as updater,
su.real_name,
su.phonenumber as phoneNum
FROM
@ -53,9 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contractId != null">contract_id,</if>
<if test="signContract != null">sign_contract,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contractId != null">#{contractId},</if>
<if test="signContract != null">#{signContract},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -76,9 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contractId != null">contract_id = #{contractId},</if>
<if test="signContract != null">sign_contract = #{signContract},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

18
dl-module-inspection/src/main/resources/mapper/contract/ContractManagementMapper.xml
View File

@ -11,13 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="positionJson" column="position_json" />
<result property="orderNum" column="order_num" />
<result property="createTime" column="create_time" />
<result property="creator" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updater" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectContractManagementVo">
select id, contract_name, contract_file_path, position_json, order_num,create_time, create_by, update_time, update_by from contract_management
select id, contract_name, contract_file_path, position_json, order_num,create_time, creator, update_time, updater from contract_management
</sql>
<select id="selectContractManagementList" parameterType="cn.iocoder.yudao.module.contract.entity.ContractManagement" resultMap="ContractManagementResult">
@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="positionJson != null">position_json,</if>
<if test="orderNum != null">order_num,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="positionJson != null">#{positionJson},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="positionJson != null">position_json = #{positionJson},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

18
dl-module-inspection/src/main/resources/mapper/inspection/DelInspectionInfoMapper.xml
View File

@ -36,9 +36,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="month" column="month" />
<result property="day" column="day" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
<result property="nextMaintenanceDate" column="next_maintenance_date" />
<result property="nextInspectionDate" column="next_inspection_date" />
<result property="otherPhone" column="other_phone" />
@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectDelInspectionInfoVo">
select id, inspection_order_id, user_id, user_name, buy_name, buy_phone, user_address, unit_name, partner_id, work_id, worker_name, worker_phone, worker_avatar, category_id, car_num, car_model, car_nature, car_status, car_id_no, is_pass, is_retrial, remark, customer_source, status, start_time, end_time, make_cert, year, month, day, create_time, create_by, update_time, update_by, next_maintenance_date, next_inspection_date, other_phone, driver_licenes_img, is_pay_online, is_pick_car from del_inspection_info
select id, inspection_order_id, user_id, user_name, buy_name, buy_phone, user_address, unit_name, partner_id, work_id, worker_name, worker_phone, worker_avatar, category_id, car_num, car_model, car_nature, car_status, car_id_no, is_pass, is_retrial, remark, customer_source, status, start_time, end_time, make_cert, year, month, day, create_time, creator, update_time, updater, next_maintenance_date, next_inspection_date, other_phone, driver_licenes_img, is_pay_online, is_pick_car from del_inspection_info
</sql>
<select id="selectDelInspectionInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.DelInspectionInfo" resultMap="DelInspectionInfoResult">
@ -130,9 +130,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="month != null">month,</if>
<if test="day != null">day,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
<if test="nextMaintenanceDate != null">next_maintenance_date,</if>
<if test="nextInspectionDate != null">next_inspection_date,</if>
<if test="otherPhone != null">other_phone,</if>
@ -172,9 +172,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="month != null">#{month},</if>
<if test="day != null">#{day},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
<if test="nextMaintenanceDate != null">#{nextMaintenanceDate},</if>
<if test="nextInspectionDate != null">#{nextInspectionDate},</if>
<if test="otherPhone != null">#{otherPhone},</if>
@ -217,9 +217,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="month != null">month = #{month},</if>
<if test="day != null">day = #{day},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="nextMaintenanceDate != null">next_maintenance_date = #{nextMaintenanceDate},</if>
<if test="nextInspectionDate != null">next_inspection_date = #{nextInspectionDate},</if>
<if test="otherPhone != null">other_phone = #{otherPhone},</if>

18
dl-module-inspection/src/main/resources/mapper/inspection/DelInspectionOrderMapper.xml
View File

@ -35,10 +35,10 @@
<result property="partnerId" column="partner_id" />
<result property="partnerName" column="partner_name" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="deptId" column="dept_id" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
<result property="validationTime" column="validation_time" />
<result property="validationRealName" column="validation_real_name" />
<result property="validationUserId" column="validation_user_id" />
@ -61,7 +61,7 @@
</resultMap>
<sql id="selectDelOrderInfoVo">
select id, transaction_id, order_no, goods_id, goods_title, goods_type, sku_id, sku_name, user_id, real_name, phonenumber, goods_price, pay_money, order_time, reduce_money, balance, pay_time, pay_type, pay_remark, is_online, receivables_account, order_status, comment_desc, comment_star, comment_time, access_code, order_type, partner_id, partner_name, create_time, create_by, dept_id, update_time, update_by, validation_time, validation_real_name, validation_user_id, is_coupon, coupon_id, coupon_code, coupon_discount, good_num, pick_car_id, user_car_id, other_phone, driver_licenes_img, is_pay_online, is_pick_car, remark, car_no, car_model, car_nature, car_id_no from del_order_info
select id, transaction_id, order_no, goods_id, goods_title, goods_type, sku_id, sku_name, user_id, real_name, phonenumber, goods_price, pay_money, order_time, reduce_money, balance, pay_time, pay_type, pay_remark, is_online, receivables_account, order_status, comment_desc, comment_star, comment_time, access_code, order_type, partner_id, partner_name, create_time, creator, dept_id, update_time, updater, validation_time, validation_real_name, validation_user_id, is_coupon, coupon_id, coupon_code, coupon_discount, good_num, pick_car_id, user_car_id, other_phone, driver_licenes_img, is_pay_online, is_pick_car, remark, car_no, car_model, car_nature, car_id_no from del_order_info
</sql>
<select id="selectDelOrderInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.DelOrderInfo" resultMap="DelOrderInfoResult">
@ -155,10 +155,10 @@
<if test="partnerId != null">partner_id,</if>
<if test="partnerName != null">partner_name,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="deptId != null">dept_id,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
<if test="validationTime != null">validation_time,</if>
<if test="validationRealName != null">validation_real_name,</if>
<if test="validationUserId != null">validation_user_id,</if>
@ -210,10 +210,10 @@
<if test="partnerId != null">#{partnerId},</if>
<if test="partnerName != null">#{partnerName},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="deptId != null">#{deptId},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
<if test="validationTime != null">#{validationTime},</if>
<if test="validationRealName != null">#{validationRealName},</if>
<if test="validationUserId != null">#{validationUserId},</if>
@ -268,10 +268,10 @@
<if test="partnerId != null">partner_id = #{partnerId},</if>
<if test="partnerName != null">partner_name = #{partnerName},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="validationTime != null">validation_time = #{validationTime},</if>
<if test="validationRealName != null">validation_real_name = #{validationRealName},</if>
<if test="validationUserId != null">validation_user_id = #{validationUserId},</if>

18
dl-module-inspection/src/main/resources/mapper/inspection/InspectionAppointmentMapper.xml
View File

@ -12,13 +12,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="appointmentDay" column="appointment_day" />
<result property="appointmentPeriod" column="appointment_period" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectInspectionAppointmentVo">
select id, partner_id, order_id, goods_title, appointment_day, appointment_period, create_time, create_by, update_time, update_by from inspection_appointment
select id, partner_id, order_id, goods_title, appointment_day, appointment_period, create_time, creator, update_time, updater from inspection_appointment
</sql>
<select id="selectInspectionAppointmentList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionAppointment" resultMap="InspectionAppointmentResult">
@ -47,9 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="appointmentDay != null">appointment_day,</if>
<if test="appointmentPeriod != null">appointment_period,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -59,9 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="appointmentDay != null">#{appointmentDay},</if>
<if test="appointmentPeriod != null">#{appointmentPeriod},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -74,9 +74,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="appointmentDay != null">appointment_day = #{appointmentDay},</if>
<if test="appointmentPeriod != null">appointment_period = #{appointmentPeriod},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

21
dl-module-inspection/src/main/resources/mapper/inspection/InspectionCategoryTemplateMapper.xml
View File

@ -10,13 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="skuName" column="sku_name" />
<result property="skuPrice" column="sku_price" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateBy" column="update_by" />
<result property="creator" column="creator" />
<result property="updater" column="updater" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectInspectionCategoryTemplateVo">
select id, category_id, sku_name, sku_price, create_time, create_by, update_by, update_time from inspection_category_template
select id, category_id, sku_name, sku_price, create_time, creator, updater, update_time from inspection_category_template
</sql>
<select id="selectInspectionCategoryTemplateList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionCategoryTemplate" resultMap="InspectionCategoryTemplateResult">
@ -41,8 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="skuName != null">sku_name,</if>
<if test="skuPrice != null">sku_price,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="updateBy != null">update_by,</if>
<if test="creator != null">creator,</if>
<if test="updater != null">updater,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -51,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="skuName != null">#{skuName},</if>
<if test="skuPrice != null">#{skuPrice},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updater != null">#{updater},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
@ -64,8 +64,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="skuName != null">sku_name = #{skuName},</if>
<if test="skuPrice != null">sku_price = #{skuPrice},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
@ -81,4 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteByCategoryId">
delete from inspection_category_template where category_id = #{id}
</delete>
</mapper>

12
dl-module-inspection/src/main/resources/mapper/inspection/InspectionHomeGoodsMapper.xml
View File

@ -28,9 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderNum != null">order_num,</if>
<if test="reason != null">reason,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -38,9 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderNum != null">#{orderNum},</if>
<if test="reason != null">#{reason},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -51,9 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="reason != null">reason = #{reason},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

18
dl-module-inspection/src/main/resources/mapper/inspection/InspectionInfoMapper.xml
View File

@ -18,13 +18,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="month" column="month" />
<result property="day" column="day" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectInspectionInfoVo">
select id, inspection_order_id, work_id, worker_name, worker_phone, is_pass, status, start_time, end_time, year, month, day, create_time, create_by, update_time, update_by from inspection_info
select id, inspection_order_id, work_id, worker_name, worker_phone, is_pass, status, start_time, end_time, year, month, day, create_time, creator, update_time, updater from inspection_info
</sql>
<select id="selectInspectionInfoList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionInfo" resultMap="InspectionInfoResult">
@ -65,9 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="month != null">month,</if>
<if test="day != null">day,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -83,9 +83,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="month != null">#{month},</if>
<if test="day != null">#{day},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -104,9 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="month != null">month = #{month},</if>
<if test="day != null">day = #{day},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

18
dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsAssociationMapper.xml
View File

@ -10,13 +10,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="newsId" column="news_id" />
<result property="type" column="type" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectInspectionNewsAssociationVo">
select id, user_id, news_id, type, create_time, create_by, update_time, update_by from inspection_news_association
select id, user_id, news_id, type, create_time, creator, update_time, updater from inspection_news_association
</sql>
<select id="selectInspectionNewsAssociationList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionNewsAssociation" resultMap="InspectionNewsAssociationResult">
@ -40,18 +40,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="newsId != null">news_id,</if>
<if test="type != null">type,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
<if test="newsId != null">#{newsId},</if>
<if test="type != null">#{type},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -62,9 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="newsId != null">news_id = #{newsId},</if>
<if test="type != null">type = #{type},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

18
dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsCommentMapper.xml
View File

@ -11,13 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="realName" column="real_name" />
<result property="userAvatar" column="user_avatar" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectInspectionNewsCommentVo">
select id, news_id, context, real_name, user_avatar, create_time, create_by, update_time, update_by from inspection_news_comment
select id, news_id, context, real_name, user_avatar, create_time, creator, update_time, updater from inspection_news_comment
</sql>
<select id="selectInspectionNewsCommentList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionNewsComment" resultMap="InspectionNewsCommentResult">
@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realName != null">real_name,</if>
<if test="userAvatar != null">user_avatar,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="newsId != null">#{newsId},</if>
@ -53,9 +53,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realName != null">#{realName},</if>
<if test="userAvatar != null">#{userAvatar},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -67,9 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="realName != null">real_name = #{realName},</if>
<if test="userAvatar != null">user_avatar = #{userAvatar},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

38
dl-module-inspection/src/main/resources/mapper/inspection/InspectionNewsMapper.xml
View File

@ -16,17 +16,17 @@
<select id="selectInspectionNewsList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionNews" resultType="cn.iocoder.yudao.module.inspection.entity.InspectionNews">
<include refid="selectInspectionNewsVo"/>
<where>
<if test="category != null and category != ''"> and category = #{category}</if>
<if test="newsTitle != null and newsTitle != ''"> and news_title = #{newsTitle}</if>
<if test="newsCover != null and newsCover != ''"> and news_cover = #{newsCover}</if>
<if test="publishUnit != null and publishUnit != ''"> and publish_unit = #{publishUnit}</if>
<if test="newsContent != null and newsContent != ''"> and news_content = #{newsContent}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="orderNum != null "> and order_num = #{orderNum}</if>
<if test="readNum != null "> and read_num = #{readNum}</if>
<if test="likeNum != null "> and like_num = #{likeNum}</if>
<if test="collectNum != null "> and collect_num = #{collectNum}</if>
<if test="createBy != null "> and creator = #{creator}</if>
<if test="vo.category != null and vo.category != ''"> and category = #{vo.category}</if>
<if test="vo.newsTitle != null and vo.newsTitle != ''"> and news_title = #{vo.newsTitle}</if>
<if test="vo.newsCover != null and vo.newsCover != ''"> and news_cover = #{vo.newsCover}</if>
<if test="vo.publishUnit != null and vo.publishUnit != ''"> and publish_unit = #{vo.publishUnit}</if>
<if test="vo.newsContent != null and vo.newsContent != ''"> and news_content = #{vo.newsContent}</if>
<if test="vo.type != null and vo.type != ''"> and type = #{vo.type}</if>
<if test="vo.orderNum != null "> and order_num = #{vo.orderNum}</if>
<if test="vo.readNum != null "> and read_num = #{vo.readNum}</if>
<if test="vo.likeNum != null "> and like_num = #{vo.likeNum}</if>
<if test="vo.collectNum != null "> and collect_num = #{vo.collectNum}</if>
<if test="vo.creator != null "> and creator = #{vo.creator}</if>
</where>
order by create_time desc
</select>
@ -52,9 +52,9 @@
<if test="likeNum != null">like_num,</if>
<if test="collectNum != null">collect_num,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -70,9 +70,9 @@
<if test="likeNum != null">#{likeNum},</if>
<if test="collectNum != null">#{collectNum},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -91,9 +91,9 @@
<if test="likeNum != null">like_num = #{likeNum},</if>
<if test="collectNum != null">collect_num = #{collectNum},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>
@ -113,9 +113,9 @@
<if test="likeNum != null">like_num = like_num +1,</if>
<if test="collectNum != null">collect_num = collect_num +1,</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

18
dl-module-inspection/src/main/resources/mapper/inspection/InspectionPickCarMapper.xml
View File

@ -19,13 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="distance" column="distance" />
<result property="needPrice" column="need_price" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectInspectionPickCarVo">
select id, partner_id, goods_title, user_id, order_id, user_phone, longitude, latitude, adress_detail, appointment_day, appointment_time, distance, need_price, create_time, create_by, update_time, update_by from inspection_pick_car
select id, partner_id, goods_title, user_id, order_id, user_phone, longitude, latitude, adress_detail, appointment_day, appointment_time, distance, need_price, create_time, creator, update_time, updater from inspection_pick_car
</sql>
<select id="selectInspectionPickCarList" parameterType="cn.iocoder.yudao.module.inspection.entity.InspectionPickCar" resultMap="InspectionPickCarResult">
@ -67,9 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null">distance,</if>
<if test="needPrice != null">need_price,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="partnerId != null">#{partnerId},</if>
@ -85,9 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null">#{distance},</if>
<if test="needPrice != null">#{needPrice},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -107,9 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="distance != null">distance = #{distance},</if>
<if test="needPrice != null">need_price = #{needPrice},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

32
dl-module-inspection/src/main/resources/mapper/inspection/ShopCouponTemplateMapper.xml
View File

@ -20,26 +20,26 @@
<result property="eventsStartTime" column="events_start_time" />
<result property="eventsEndTime" column="events_end_time" />
<result property="roleKey" column="role_key" />
<result property="creator" column="create_by" />
<result property="creator" column="creator" />
<result property="createTime" column="create_time" />
<result property="updater" column="update_by" />
<result property="updater" column="updater" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectShopCouponTemplateVo">
select id, coupon_type, all_platform, partner_id, title, bind_moudle, bind_goods_ids, bind_partner_id, discount, effective_day, start_time, expiration_time, events_start_time, events_end_time, role_key, create_by, create_time, update_by, update_time from shop_coupon_template
select id, coupon_type, all_platform, partner_id, title, bind_moudle, bind_goods_ids, bind_partner_id, discount, effective_day, start_time, expiration_time, events_start_time, events_end_time, role_key, creator, create_time, updater, update_time from shop_coupon_template
</sql>
<select id="selectShopCouponTemplateList" parameterType="cn.iocoder.yudao.module.shop.entity.ShopCouponTemplate" resultMap="ShopCouponTemplateResult">
<include refid="selectShopCouponTemplateVo"/>
<where>
<if test="title != null and title != ''"> and title = #{title}</if>
<if test="discount != null "> and discount = #{discount}</if>
<if test="effectiveDay != null "> and effective_day = #{effectiveDay}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="expirationTime != null "> and expiration_time = #{expirationTime}</if>
<if test="eventsStartTime != null "> and events_start_time = #{eventsStartTime}</if>
<if test="eventsEndTime != null "> and events_end_time = #{eventsEndTime}</if>
<if test="vo.title != null and title != ''"> and title = #{vo.title}</if>
<if test="vo.discount != null "> and discount = #{vo.discount}</if>
<if test="vo.effectiveDay != null "> and effective_day = #{vo.effectiveDay}</if>
<if test="vo.startTime != null "> and start_time = #{vo.startTime}</if>
<if test="vo.expirationTime != null "> and expiration_time = #{vo.expirationTime}</if>
<if test="vo.eventsStartTime != null "> and events_start_time = #{vo.eventsStartTime}</if>
<if test="vo.eventsEndTime != null "> and events_end_time = #{vo.eventsEndTime}</if>
</where>
</select>
@ -75,9 +75,9 @@
<if test="eventsStartTime != null">events_start_time,</if>
<if test="eventsEndTime != null">events_end_time,</if>
<if test="roleKey != null">role_key,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -96,9 +96,9 @@
<if test="eventsStartTime != null">#{eventsStartTime},</if>
<if test="eventsEndTime != null">#{eventsEndTime},</if>
<if test="roleKey != null">#{roleKey},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
@ -120,9 +120,9 @@
<if test="eventsStartTime != null">events_start_time = #{eventsStartTime},</if>
<if test="eventsEndTime != null">events_end_time = #{eventsEndTime},</if>
<if test="roleKey != null">role_key = #{roleKey},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}

16
dl-module-inspection/src/main/resources/mapper/inspection/ShopInspectionGoodsMapper.xml
View File

@ -3,6 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.inspection.mapper.ShopInspectionGoodsMapper">
<delete id="deleteByList">
delete from shop_inspection_goods where id in
<foreach collection="list" open="(" close=")" item="item" separator=",">
#{item}
</foreach>
</delete>
<select id="selectShopInspectionGoodsListWx" parameterType="cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods" resultType="cn.iocoder.yudao.module.inspection.entity.ShopInspectionGoods">
select * from shop_inspection_goods
@ -28,11 +34,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
INNER JOIN shop_mall_partners smp ON smp.partner_id = sig.partner_id AND smp.is_banned = '0'
INNER JOIN shop_inspection_category sic ON sic.id = sig.goods_category_id
<where>
<if test="id != null "> and sig.id = #{id}</if>
<if test="title != null and title != ''"> and sig.title like concat('%', #{title}, '%')</if>
<if test="goodsCategoryId!= null "> and sig.goods_category_id = #{goodsCategoryId}</if>
<if test="partnerName!= null "> and smp.partner_name like concat('%',#{partnerName},'%')</if>
<if test="partnerId!= null "> and sig.partner_id = #{partnerId}</if>
<if test="vo.id != null "> and sig.id = #{vo.id}</if>
<if test="vo.title != null and vo.title != ''"> and sig.title like concat('%', #{vo.title}, '%')</if>
<if test="vo.goodsCategoryId!= null "> and sig.goods_category_id = #{vo.goodsCategoryId}</if>
<if test="vo.partnerName!= null "> and smp.partner_name like concat('%',#{vo.partnerName},'%')</if>
<if test="vo.partnerId!= null "> and sig.partner_id = #{vo.partnerId}</if>
</where>
ORDER BY FIELD(sig.listing_status,1,2,3,0), create_time desc
</select>

36
dl-module-inspection/src/main/resources/mapper/inspection/SiteInfoMapper.xml
View File

@ -14,28 +14,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="siteContractPhone" column="site_contract_phone" />
<result property="orderNum" column="order_num" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectSiteInfoVo">
select id, site_name, site_longitude, site_latitude, site_address, site_contract_name, site_contract_phone, order_num, create_time, create_by, update_time, update_by from site_info
select id, site_name, site_longitude, site_latitude, site_address, site_contract_name, site_contract_phone, order_num, create_time, creator, update_time, updater from site_info
</sql>
<select id="selectSiteInfoList" resultType="cn.iocoder.yudao.module.inspection.entity.SiteInfo">
select id, site_name, site_longitude, site_latitude, site_address, site_contract_name,
site_contract_phone, order_num, create_time, create_by, update_time, update_by,
ROUND(ST_Distance_Sphere (POINT (#{longitude}, #{latitude}),POINT (site_longitude, site_latitude ))) AS distance
site_contract_phone, order_num, create_time, creator, update_time, updater,
ROUND(ST_Distance_Sphere (POINT (#{vo.longitude}, #{vo.latitude}),POINT (site_longitude, site_latitude ))) AS distance
from site_info
<where>
<if test="siteName != null and siteName != ''"> and site_name like concat('%', #{siteName}, '%')</if>
<if test="siteLongitude != null "> and site_longitude = #{siteLongitude}</if>
<if test="siteLatitude != null "> and site_latitude = #{siteLatitude}</if>
<if test="siteAddress != null and siteAddress != ''"> and site_address = #{siteAddress}</if>
<if test="siteContractName != null and siteContractName != ''"> and site_contract_name like concat('%', #{siteContractName}, '%')</if>
<if test="siteContractPhone != null and siteContractPhone != ''"> and site_contract_phone = #{siteContractPhone}</if>
<if test="orderNum != null "> and order_num = #{orderNum}</if>
<if test="vo.siteName != null and vo.siteName != ''"> and site_name like concat('%', #{vo.siteName}, '%')</if>
<if test="vo.siteLongitude != null "> and site_longitude = #{vo.siteLongitude}</if>
<if test="vo.siteLatitude != null "> and site_latitude = #{vo.siteLatitude}</if>
<if test="vo.siteAddress != null and vo.siteAddress != ''"> and site_address = #{vo.siteAddress}</if>
<if test="vo.siteContractName != null and vo.siteContractName != ''"> and site_contract_name like concat('%', #{vo.siteContractName}, '%')</if>
<if test="vo.siteContractPhone != null and vo.siteContractPhone != ''"> and site_contract_phone = #{vo.siteContractPhone}</if>
<if test="vo.orderNum != null "> and order_num = #{orderNum}</if>
</where>
order by distance asc
</select>
@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="siteContractPhone != null">site_contract_phone,</if>
<if test="orderNum != null">order_num,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -71,9 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="siteContractPhone != null">#{siteContractPhone},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -88,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="siteContractPhone != null">site_contract_phone = #{siteContractPhone},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

23
dl-module-inspection/src/main/resources/mapper/payment/FzRecordMapper.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.payment.mapper.FzRecordMapper">
<select id="selectFzRecordList" resultType="cn.iocoder.yudao.module.payment.entity.FzRecord">
select * from fz_record
<where>
<if test="vo.partnerName != null and vo.partnerName != ''"> and partner_name like concat('%', #{vo.partnerName}, '%')</if>
<if test="vo.orderNo != null and vo.orderNo != ''"> and order_no = #{vo.orderNo}</if>
<if test="vo.isSuccess != null and vo.isSuccess != ''"> and is_success = #{vo.isSuccess}</if>
</where>
</select>
<select id="selectFzRecordById" parameterType="Long" resultType="cn.iocoder.yudao.module.payment.entity.FzRecord">
select * from fz_record
where id = #{id}
</select>
</mapper>

18
dl-module-inspection/src/main/resources/mapper/payment/OrderInfoDetailMapper.xml
View File

@ -13,13 +13,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="recordType" column="record_type" />
<result property="deptId" column="dept_id" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectOrderInfoDetailVo">
select id, order_id, detail_info, record_time, record_money, record_type, dept_id, create_time, create_by, update_time, update_by from order_info_detail
select id, order_id, detail_info, record_time, record_money, record_type, dept_id, create_time, creator, update_time, updater from order_info_detail
</sql>
<select id="selectOrderInfoDetailList" parameterType="cn.iocoder.yudao.module.payment.entity.OrderInfoDetail" resultMap="OrderInfoDetailResult">
@ -50,9 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="recordType != null">record_type,</if>
<if test="deptId != null">dept_id,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -63,9 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="recordType != null">#{recordType},</if>
<if test="deptId != null">#{deptId},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -79,9 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="recordType != null">record_type = #{recordType},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

40
dl-module-inspection/src/main/resources/mapper/shop/PartnerDetailMapper.xml
View File

@ -19,29 +19,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="status" column="status" />
<result property="rejectReason" column="reject_reason" />
<result property="createTime" column="create_time" />
<result property="creator" column="create_by" />
<result property="creator" column="creator" />
<result property="updateTime" column="update_time" />
<result property="updater" column="update_by" />
<result property="updater" column="updater" />
</resultMap>
<sql id="selectPartnerDetailVo">
select id, user_id, type, partner_id, partner_name, business_license, shop_image, position, phone, id_card_front, id_card_back, status, reject_reason,create_time, create_by, update_time, update_by from partner_detail
select id, user_id, type, partner_id, partner_name, business_license, shop_image, position, phone, id_card_front, id_card_back, status, reject_reason,create_time, creator, update_time, updater from partner_detail
</sql>
<select id="selectPartnerDetailList" parameterType="cn.iocoder.yudao.module.shop.entity.PartnerDetail" resultMap="PartnerDetailResult">
<include refid="selectPartnerDetailVo"/>
<where>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="partnerId != null "> and partner_id = #{partnerId}</if>
<if test="partnerName != null and partnerName != ''"> and partner_name like concat('%', #{partnerName}, '%')</if>
<if test="businessLicense != null and businessLicense != ''"> and business_license = #{businessLicense}</if>
<if test="shopImage != null and shopImage != ''"> and shop_image = #{shopImage}</if>
<if test="position != null and position != ''"> and position = #{position}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
<if test="idCardFront != null and idCardFront != ''"> and id_card_front = #{idCardFront}</if>
<if test="idCardBack != null and idCardBack != ''"> and id_card_back = #{idCardBack}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="vo.userId != null "> and user_id = #{vo.userId}</if>
<if test="vo.type != null and vo.type != ''"> and type = #{vo.type}</if>
<if test="vo.partnerId != null "> and partner_id = #{vo.partnerId}</if>
<if test="vo.partnerName != null and vo.partnerName != ''"> and partner_name like concat('%', #{vo.partnerName}, '%')</if>
<if test="vo.businessLicense != null and vo.businessLicense != ''"> and business_license = #{vo.businessLicense}</if>
<if test="vo.shopImage != null and vo.shopImage != ''"> and shop_image = #{vo.shopImage}</if>
<if test="vo.position != null and vo.position != ''"> and position = #{vo.position}</if>
<if test="vo.phone != null and vo.phone != ''"> and phone = #{vo.phone}</if>
<if test="vo.idCardFront != null and vo.idCardFront != ''"> and id_card_front = #{vo.idCardFront}</if>
<if test="vo.idCardBack != null and vo.idCardBack != ''"> and id_card_back = #{vo.idCardBack}</if>
<if test="vo.status != null and vo.status != ''"> and status = #{vo.status}</if>
</where>
</select>
@ -70,9 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="idCardBack != null">id_card_back,</if>
<if test="status != null">status,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -88,9 +88,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="idCardBack != null">#{idCardBack},</if>
<if test="status != null">#{status},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -110,9 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null">status = #{status},</if>
<if test="rejectReason != null">reject_reason = #{rejectReason},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

20
dl-module-inspection/src/main/resources/mapper/shop/ShopCouponMapper.xml
View File

@ -15,9 +15,9 @@
<result property="expirationTime" column="expiration_time" />
<result property="useTime" column="use_time" />
<result property="couponStatus" column="coupon_status" />
<result property="creator" column="create_by" />
<result property="creator" column="creator" />
<result property="createTime" column="create_time" />
<result property="updater" column="update_by" />
<result property="updater" column="updater" />
<result property="updateTime" column="update_time" />
<result property="title" column="title" />
<result property="userId" column="user_id" />
@ -28,7 +28,7 @@
<sql id="selectShopCouponVo">
select coupon_id,title, coupon_type, coupon_code, bind_moudle, bind_goods_ids, discount, start_time,
expiration_time, use_time, coupon_status, shop_coupon.create_by, shop_coupon.create_time, shop_coupon.update_by,
expiration_time, use_time, coupon_status, shop_coupon.creator, shop_coupon.create_time, shop_coupon.updater,
shop_coupon.update_time,shop_coupon.user_id,order_id,shop_coupon.phonenumber,sys_user.real_name from shop_coupon
LEFT JOIN sys_user on shop_coupon.user_id = sys_user.user_id
</sql>
@ -151,9 +151,9 @@
<if test="expirationTime != null">expiration_time,</if>
<if test="useTime != null">use_time,</if>
<if test="couponStatus != null">coupon_status,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
<if test="updateTime != null">update_time,</if>
<if test="title != null">title,</if>
<if test="userId != null">user_id,</if>
@ -171,9 +171,9 @@
<if test="expirationTime != null">#{expirationTime},</if>
<if test="useTime != null">#{useTime},</if>
<if test="couponStatus != null">#{couponStatus},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="title != null">#{title},</if>
<if test="userId != null">#{userId},</if>
@ -194,9 +194,9 @@
<if test="expirationTime != null">expiration_time = #{expirationTime},</if>
<if test="useTime != null">use_time = #{useTime},</if>
<if test="couponStatus != null">coupon_status = #{couponStatus},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="title != null">title = #{title},</if>
<if test="userId != null">user_id = #{userId},</if>
@ -210,7 +210,7 @@
<trim prefix="SET" suffixOverrides=",">
use_time = null,
coupon_status = #{couponStatus},
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
order_id = null
</trim>

49
dl-module-inspection/src/main/resources/mapper/shop/ShopMallPartnersMapper.xml
View File

@ -27,9 +27,9 @@
<result property="isWorking" column="is_working"/>
<result property="orderNum" column="order_num"/>
<result property="createTime" column="create_time"/>
<result property="creator" column="create_by"/>
<result property="creator" column="creator"/>
<result property="updateTime" column="update_time"/>
<result property="updater" column="update_by"/>
<result property="updater" column="updater"/>
</resultMap>
<sql id="selectShopMallPartnersVo">
@ -55,40 +55,17 @@
is_working,
order_num,
create_time,
create_by,
creator,
update_time,
update_by
updater
from shop_mall_partners
</sql>
<select id="selectShopMallPartnersList" parameterType="cn.iocoder.yudao.module.shop.entity.ShopMallPartners" resultType="cn.iocoder.yudao.module.shop.entity.ShopMallPartners">
select smp.*,su.real_name
select smp.*,su.nickname
from shop_mall_partners smp
left join sys_user su on su.user_id = smp.user_id
<where>
<if test="userId != null ">and smp.user_id = #{userId}</if>
<if test="type != null and type != ''">and smp.type = #{type}</if>
<if test="partnerName != null and partnerName != ''">and smp.partner_name like concat('%', #{partnerName},
'%')
</if>
<if test="partnerLogo != null and partnerLogo != ''">and smp.partner_logo = #{partnerLogo}</if>
<if test="shopImages != null and shopImages != ''">and smp.shop_images = #{shopImages}</if>
<if test="contactNumber != null and contactNumber != ''">and smp.contact_number = #{contactNumber}</if>
<if test="address != null and address != ''">and smp.address = #{address}</if>
<if test="province != null and province != ''">and smp.province = #{province}</if>
<if test="city != null and city != ''">and smp.city = #{city}</if>
<if test="area != null and area != ''">and smp.area = #{area}</if>
<if test="partnerCategoryId != null and partnerCategoryId != ''">and smp.partner_category_id =
#{partnerCategoryId}
</if>
<if test="averageScore != null ">and smp.average_score = #{averageScore}</if>
<if test="longitude != null and longitude != ''">and smp.longitude = #{longitude}</if>
<if test="latitude != null and latitude != ''">and smp.latitude = #{latitude}</if>
<if test="workTime != null and workTime != ''">and smp.work_time = #{workTime}</if>
<if test="salesNum != null ">and smp.sales_num = #{salesNum}</if>
<if test="orderNum != null ">and smp.order_num = #{orderNum}</if>
<if test="isBanned != null ">and smp.is_banned = #{isBanned}</if>
</where>
left join system_users su on su.id = smp.user_id
order by order_num
</select>
@ -132,9 +109,9 @@
<if test="isBanned != null ">is_banned,</if>
<if test="isWorking != null ">is_working,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
@ -158,9 +135,9 @@
<if test="isBanned != null ">#{isBanned},</if>
<if test="isWorking != null ">#{isWorking},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -188,9 +165,9 @@
<if test="isBanned != null ">is_banned=#{isBanned},</if>
<if test="isWorking != null ">is_working=#{isWorking},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where partner_id = #{partnerId}
</update>

1
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/appBase/service/impl/SysAnnouncementServiceImpl.java
View File

@ -76,6 +76,7 @@ public class SysAnnouncementServiceImpl extends ServiceImpl<SysAnnouncementMappe
sysAnnouncement.setId(null);
sysAnnouncement.setToUserId(toUserId);
sysAnnouncement.setIsRead("0");
sysAnnouncement.setTenantId(1L);
baseMapper.insert(sysAnnouncement);
//socket通知
try {

12
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.rescue.app.controller.admin;
import cn.hutool.extra.spring.SpringUtil;
import cn.iocoder.yudao.module.rescue.service.IRescueDriverInfoService;
import com.alibaba.fastjson.JSONObject;
import org.slf4j.Logger;
@ -26,6 +27,11 @@ public class RescueDriverSocket {
private ConcurrentHashMap<String, Session> sessionMap = new ConcurrentHashMap<>();
//关键代码，设置一个静态上下文属性appcontext
private static ApplicationContext appcontext;
public RescueDriverSocket(SpringUtil springUtil) {
}
public static void setAppcontext(ApplicationContext appcontext) {
RescueDriverSocket.appcontext = appcontext;
}
@ -44,7 +50,7 @@ public class RescueDriverSocket {
public void onOpen(Session session, @PathParam(value = "driverId") String driverId) {
this.sessionMap.put(driverId,session);
//更新司机在线状态
IRescueDriverInfoService rescueDriverInfoService = appcontext.getBean(IRescueDriverInfoService.class);
IRescueDriverInfoService rescueDriverInfoService = SpringUtil.getBean(IRescueDriverInfoService.class);
rescueDriverInfoService.topLine(Long.parseLong(driverId));
log.info("用户{}已创建连接", driverId);
}
@ -64,7 +70,7 @@ public class RescueDriverSocket {
public void onMessage(String msg,@PathParam(value = "driverId") String driverId){
JSONObject requestMsg = JSONObject.parseObject(msg);
//更新司机位置信息
IRescueDriverInfoService rescueDriverInfoService = appcontext.getBean(IRescueDriverInfoService.class);
IRescueDriverInfoService rescueDriverInfoService = SpringUtil.getBean(IRescueDriverInfoService.class);
rescueDriverInfoService.updatePosition(Long.parseLong(driverId),requestMsg);
log.info("用户{}发来消息:{}",driverId,msg);
}
@ -79,7 +85,7 @@ public class RescueDriverSocket {
public void onClose(Session session,@PathParam(value = "driverId") String driverId){
this.sessionMap.remove(driverId);
//更新司机在线状态
IRescueDriverInfoService rescueDriverInfoService = appcontext.getBean(IRescueDriverInfoService.class);
IRescueDriverInfoService rescueDriverInfoService = SpringUtil.getBean(IRescueDriverInfoService.class);
rescueDriverInfoService.downLine(Long.parseLong(driverId));
log.info("用户{}已关闭连接", driverId);

2
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueDriverInfoServiceImpl.java
View File

@ -410,7 +410,7 @@ public class RescueDriverInfoServiceImpl extends ServiceImpl<RescueDriverInfoMap
queryWrapper2.eq(RescueOrderInfo::getRescueInfoId, rescueId);
RescueOrderInfo orderInfo = rescueOrderInfoService.getOne(queryWrapper2);
//为了避免微信通知不到的情况在此进行主动查询的功能
if (StringUtils.isNotEmpty(orderInfo.getOrderStatus()) && orderInfo.getOrderStatus().equals("1")) {
if (null!=orderInfo && StringUtils.isNotEmpty(orderInfo.getOrderStatus()) && orderInfo.getOrderStatus().equals("1")) {
try {
//待支付的情况下进行主动查询
String resStr = wechatPayRequest.wechatHttpGet("https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/" + orderInfo.getOrderNo() + "?mchid=" + wechatPayConfig.getMchId());

12
dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml
View File

@ -44,9 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="driverAccept != null">driver_accept,</if>
<if test="driverRejectReason != null">driver_reject_reason,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">creator,</if>
<if test="creator != null">creator,</if>
<if test="updateTime != null">update_time,</if>
<if test="updateBy != null">updater,</if>
<if test="updater != null">updater,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -55,9 +55,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="driverAccept != null">#{driverAccept},</if>
<if test="driverRejectReason != null">#{driverRejectReason},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
<if test="creator != null">#{creator},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updater != null">#{updater},</if>
</trim>
</insert>
@ -69,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="driverAccept != null">driver_accept = #{driverAccept},</if>
<if test="driverRejectReason != null">driver_reject_reason = #{driverRejectReason},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">creator = #{createBy},</if>
<if test="creator != null">creator = #{creator},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="updateBy != null">updater = #{updateBy},</if>
<if test="updater != null">updater = #{updater},</if>
</trim>
where id = #{id}
</update>

12
yudao-dependencies/pom.xml
View File

@ -26,7 +26,7 @@
<druid.version>1.2.23</druid.version>
<mybatis.version>3.5.16</mybatis.version>
<mybatis-plus.version>3.5.7</mybatis-plus.version>
<pagehelper.boot.version>1.4.2</pagehelper.boot.version>
<pagehelper.boot.version>2.1.0</pagehelper.boot.version>
<jsqlparser.version>4.9</jsqlparser.version>
<mybatis-plus-generator.version>3.5.7</mybatis-plus-generator.version>
<dynamic-datasource.version>4.3.1</dynamic-datasource.version>
@ -140,11 +140,11 @@
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-spring-boot-starter-websocket</artifactId>
<version>${revision}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>cn.iocoder.boot</groupId>-->
<!-- <artifactId>yudao-spring-boot-starter-websocket</artifactId>-->
<!-- <version>${revision}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.github.xiaoymin</groupId>

2
yudao-framework/pom.xml
View File

@ -15,7 +15,7 @@
<module>yudao-spring-boot-starter-redis</module>
<module>yudao-spring-boot-starter-web</module>
<module>yudao-spring-boot-starter-security</module>
<module>yudao-spring-boot-starter-websocket</module>
<!-- <module>yudao-spring-boot-starter-websocket</module>-->
<module>yudao-spring-boot-starter-monitor</module>
<module>yudao-spring-boot-starter-protection</module>

11
yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
View File

@ -71,6 +71,17 @@
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>2.1.0</version>
<exclusions>
<exclusion>
<artifactId>mybatis-spring</artifactId>
<groupId>org.mybatis</groupId>
</exclusion>
<exclusion>
<artifactId>mybatis</artifactId>
<groupId>org.mybatis</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>

8
yudao-module-infra/yudao-module-infra-biz/pom.xml
View File

@ -42,10 +42,10 @@
<artifactId>yudao-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-spring-boot-starter-websocket</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>cn.iocoder.boot</groupId>-->
<!-- <artifactId>yudao-spring-boot-starter-websocket</artifactId>-->
<!-- </dependency>-->
<!-- DB 相关 -->
<dependency>

68
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/websocket/WebSocketSenderApiImpl.java
View File

@ -1,34 +1,34 @@
package cn.iocoder.yudao.module.infra.api.websocket;
import cn.iocoder.yudao.framework.websocket.core.sender.WebSocketMessageSender;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
/**
* WebSocket 发送器的 API 实现类
*
* @author 芋道源码
*/
@Component
public class WebSocketSenderApiImpl implements WebSocketSenderApi {
@Resource
private WebSocketMessageSender webSocketMessageSender;
@Override
public void send(Integer userType, Long userId, String messageType, String messageContent) {
webSocketMessageSender.send(userType, userId, messageType, messageContent);
}
@Override
public void send(Integer userType, String messageType, String messageContent) {
webSocketMessageSender.send(userType, messageType, messageContent);
}
@Override
public void send(String sessionId, String messageType, String messageContent) {
webSocketMessageSender.send(sessionId, messageType, messageContent);
}
}
//package cn.iocoder.yudao.module.infra.api.websocket;
//
//import cn.iocoder.yudao.framework.websocket.core.sender.WebSocketMessageSender;
//import org.springframework.stereotype.Component;
//
//import javax.annotation.Resource;
//
///**
// * WebSocket 发送器的 API 实现类
// *
// * @author 芋道源码
// */
//@Component
//public class WebSocketSenderApiImpl implements WebSocketSenderApi {
//
// @Resource
// private WebSocketMessageSender webSocketMessageSender;
//
// @Override
// public void send(Integer userType, Long userId, String messageType, String messageContent) {
// webSocketMessageSender.send(userType, userId, messageType, messageContent);
// }
//
// @Override
// public void send(Integer userType, String messageType, String messageContent) {
// webSocketMessageSender.send(userType, messageType, messageContent);
// }
//
// @Override
// public void send(String sessionId, String messageType, String messageContent) {
// webSocketMessageSender.send(sessionId, messageType, messageContent);
// }
//
//}

96
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/websocket/DemoWebSocketMessageListener.java
View File

@ -1,48 +1,48 @@
package cn.iocoder.yudao.module.infra.websocket;
import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.websocket.core.listener.WebSocketMessageListener;
import cn.iocoder.yudao.framework.websocket.core.sender.WebSocketMessageSender;
import cn.iocoder.yudao.framework.websocket.core.util.WebSocketFrameworkUtils;
import cn.iocoder.yudao.module.infra.websocket.message.DemoReceiveMessage;
import cn.iocoder.yudao.module.infra.websocket.message.DemoSendMessage;
import org.springframework.stereotype.Component;
import org.springframework.web.socket.WebSocketSession;
import javax.annotation.Resource;
/**
* WebSocket 示例：单发消息
*
* @author 芋道源码
*/
@Component
public class DemoWebSocketMessageListener implements WebSocketMessageListener<DemoSendMessage> {
@Resource
private WebSocketMessageSender webSocketMessageSender;
@Override
public void onMessage(WebSocketSession session, DemoSendMessage message) {
Long fromUserId = WebSocketFrameworkUtils.getLoginUserId(session);
// 情况一：单发
if (message.getToUserId() != null) {
DemoReceiveMessage toMessage = new DemoReceiveMessage().setFromUserId(fromUserId)
.setText(message.getText()).setSingle(true);
webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), message.getToUserId(), // 给指定用户
"demo-message-receive", toMessage);
return;
}
// 情况二：群发
DemoReceiveMessage toMessage = new DemoReceiveMessage().setFromUserId(fromUserId)
.setText(message.getText()).setSingle(false);
webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), // 给所有用户
"demo-message-receive", toMessage);
}
@Override
public String getType() {
return "demo-message-send";
}
}
//package cn.iocoder.yudao.module.infra.websocket;
//
//import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
//import cn.iocoder.yudao.framework.websocket.core.listener.WebSocketMessageListener;
//import cn.iocoder.yudao.framework.websocket.core.sender.WebSocketMessageSender;
//import cn.iocoder.yudao.framework.websocket.core.util.WebSocketFrameworkUtils;
//import cn.iocoder.yudao.module.infra.websocket.message.DemoReceiveMessage;
//import cn.iocoder.yudao.module.infra.websocket.message.DemoSendMessage;
//import org.springframework.stereotype.Component;
//import org.springframework.web.socket.WebSocketSession;
//
//import javax.annotation.Resource;
//
///**
// * WebSocket 示例：单发消息
// *
// * @author 芋道源码
// */
//@Component
//public class DemoWebSocketMessageListener implements WebSocketMessageListener<DemoSendMessage> {
//
// @Resource
// private WebSocketMessageSender webSocketMessageSender;
//
// @Override
// public void onMessage(WebSocketSession session, DemoSendMessage message) {
// Long fromUserId = WebSocketFrameworkUtils.getLoginUserId(session);
// // 情况一：单发
// if (message.getToUserId() != null) {
// DemoReceiveMessage toMessage = new DemoReceiveMessage().setFromUserId(fromUserId)
// .setText(message.getText()).setSingle(true);
// webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), message.getToUserId(), // 给指定用户
// "demo-message-receive", toMessage);
// return;
// }
// // 情况二：群发
// DemoReceiveMessage toMessage = new DemoReceiveMessage().setFromUserId(fromUserId)
// .setText(message.getText()).setSingle(false);
// webSocketMessageSender.sendObject(UserTypeEnum.ADMIN.getValue(), // 给所有用户
// "demo-message-receive", toMessage);
// }
//
// @Override
// public String getType() {
// return "demo-message-send";
// }
//
//}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
View File

@ -32,8 +32,8 @@ public class NoticeController {
@Resource
private NoticeService noticeService;
@Resource
private WebSocketSenderApi webSocketSenderApi;
// @Resource
// private WebSocketSenderApi webSocketSenderApi;
@PostMapping("/create")
@Operation(summary = "创建通知公告")
@ -85,7 +85,7 @@ public class NoticeController {
NoticeDO notice = noticeService.getNotice(id);
Assert.notNull(notice, "公告不能为空");
// 通过 websocket 推送给在线的用户
webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), "notice-push", notice);
// webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), "notice-push", notice);
return success(true);
}

1
yudao-server/src/main/resources/application.yaml
View File

@ -221,6 +221,7 @@ yudao:
permit-all_urls:
- /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，不需要登录
- /admin-api/system/config/configKey/**
- /websocket/**
websocket:
enable: true # websocket的开关
path: /infra/ws # 路径