diff --git a/admin-hanhai-vue/.env b/admin-hanhai-vue/.env index 66bd357..30b0439 100644 --- a/admin-hanhai-vue/.env +++ b/admin-hanhai-vue/.env @@ -1,5 +1,5 @@ NODE_ENV=production -VUE_APP_PLATFORM_NAME=壹通告后台管理系统 +VUE_APP_PLATFORM_NAME=帧视界后台管理系统 # 开启单点登录 VUE_APP_SSO=false # 开启微应用模式 diff --git a/admin-hanhai-vue/public/index.html b/admin-hanhai-vue/public/index.html index f844672..a5958a2 100644 --- a/admin-hanhai-vue/public/index.html +++ b/admin-hanhai-vue/public/index.html @@ -5,7 +5,7 @@ - 壹通告后台管理系统 + 帧视界后台管理系统 \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue deleted file mode 100644 index 2cd14a4..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfForm.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue deleted file mode 100644 index 2adcf5f..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue deleted file mode 100644 index c9b5de8..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue/modules/CheerConfModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts deleted file mode 100644 index 0a3a913..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.api.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/cheerConf/cheerConf/list', - save='/cheerConf/cheerConf/add', - edit='/cheerConf/cheerConf/edit', - deleteOne = '/cheerConf/cheerConf/delete', - deleteBatch = '/cheerConf/cheerConf/deleteBatch', - importExcel = '/cheerConf/cheerConf/importExcel', - exportXls = '/cheerConf/cheerConf/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts deleted file mode 100644 index 7cca604..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConf.data.ts +++ /dev/null @@ -1,43 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '键', - align:"center", - dataIndex: 'keyValue' - }, - { - title: '说明', - align:"center", - dataIndex: 'keyTitle' - }, - { - title: '内容', - align:"center", - dataIndex: 'keyCentent' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '键', - field: 'keyValue', - component: 'Input', - }, - { - label: '说明', - field: 'keyTitle', - component: 'Input', - }, - { - label: '内容', - field: 'keyCentent', - component: 'Input', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue deleted file mode 100644 index ab5f457..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/CheerConfList.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue deleted file mode 100644 index 49c804e..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerConf/vue3/components/CheerConfModal.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java deleted file mode 100644 index 71e5874..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.jeecg.modules.cheerRecharge.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; -import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 充值套餐 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Api(tags="充值套餐") -@RestController -@RequestMapping("/cheerRecharge/cheerRecharge") -@Slf4j -public class CheerRechargeController extends JeecgController { - @Autowired - private ICheerRechargeService cheerRechargeService; - - /** - * 分页列表查询 - * - * @param cheerRecharge - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "充值套餐-分页列表查询") - @ApiOperation(value="充值套餐-分页列表查询", notes="充值套餐-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(CheerRecharge cheerRecharge, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cheerRecharge, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = cheerRechargeService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param cheerRecharge - * @return - */ - @AutoLog(value = "充值套餐-添加") - @ApiOperation(value="充值套餐-添加", notes="充值套餐-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody CheerRecharge cheerRecharge) { - cheerRechargeService.save(cheerRecharge); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param cheerRecharge - * @return - */ - @AutoLog(value = "充值套餐-编辑") - @ApiOperation(value="充值套餐-编辑", notes="充值套餐-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody CheerRecharge cheerRecharge) { - cheerRechargeService.updateById(cheerRecharge); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "充值套餐-通过id删除") - @ApiOperation(value="充值套餐-通过id删除", notes="充值套餐-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - cheerRechargeService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "充值套餐-批量删除") - @ApiOperation(value="充值套餐-批量删除", notes="充值套餐-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.cheerRechargeService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "充值套餐-通过id查询") - @ApiOperation(value="充值套餐-通过id查询", notes="充值套餐-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - CheerRecharge cheerRecharge = cheerRechargeService.getById(id); - if(cheerRecharge==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(cheerRecharge); - } - - /** - * 导出excel - * - * @param request - * @param cheerRecharge - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, CheerRecharge cheerRecharge) { - return super.exportXls(request, cheerRecharge, CheerRecharge.class, "充值套餐"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, CheerRecharge.class); - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java deleted file mode 100644 index 73c49d7..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.jeecg.modules.cheerRecharge.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 充值套餐 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Data -@TableName("cheer_recharge") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="cheer_recharge对象", description="充值套餐") -public class CheerRecharge implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**金融*/ - @Excel(name = "金融", width = 15) - @ApiModelProperty(value = "金融") - private java.math.BigDecimal price; -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java deleted file mode 100644 index d19bbd9..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.cheerRecharge.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 充值套餐 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -public interface CheerRechargeMapper extends BaseMapper { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml deleted file mode 100644 index e025af8..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java deleted file mode 100644 index 5dd8ff8..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.cheerRecharge.service; - -import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 充值套餐 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -public interface ICheerRechargeService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java deleted file mode 100644 index 8861b81..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.cheerRecharge.service.impl; - -import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; -import org.jeecg.modules.cheerRecharge.mapper.CheerRechargeMapper; -import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 充值套餐 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Service -public class CheerRechargeServiceImpl extends ServiceImpl implements ICheerRechargeService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue deleted file mode 100644 index fb52825..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/CheerRechargeList.vue +++ /dev/null @@ -1,171 +0,0 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue deleted file mode 100644 index 1a42f68..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeForm.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue deleted file mode 100644 index 72f22c9..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue deleted file mode 100644 index b41219d..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue/modules/CheerRechargeModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts deleted file mode 100644 index b013494..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.api.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/cheerRecharge/cheerRecharge/list', - save='/cheerRecharge/cheerRecharge/add', - edit='/cheerRecharge/cheerRecharge/edit', - deleteOne = '/cheerRecharge/cheerRecharge/delete', - deleteBatch = '/cheerRecharge/cheerRecharge/deleteBatch', - importExcel = '/cheerRecharge/cheerRecharge/importExcel', - exportXls = '/cheerRecharge/cheerRecharge/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts deleted file mode 100644 index e0f0077..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRecharge.data.ts +++ /dev/null @@ -1,23 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '金融', - align:"center", - dataIndex: 'price' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '金融', - field: 'price', - component: 'InputNumber', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue deleted file mode 100644 index 17a6006..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/CheerRechargeList.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue deleted file mode 100644 index fa0861a..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/vue3/components/CheerRechargeModal.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java deleted file mode 100644 index 4f80895..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/controller/CheerWaterController.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.jeecg.modules.cheerWater.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.cheerWater.entity.CheerWater; -import org.jeecg.modules.cheerWater.service.ICheerWaterService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 加油流水表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Api(tags="加油流水表") -@RestController -@RequestMapping("/cheerWater/cheerWater") -@Slf4j -public class CheerWaterController extends JeecgController { - @Autowired - private ICheerWaterService cheerWaterService; - - /** - * 分页列表查询 - * - * @param cheerWater - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "加油流水表-分页列表查询") - @ApiOperation(value="加油流水表-分页列表查询", notes="加油流水表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(CheerWater cheerWater, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(cheerWater, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = cheerWaterService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param cheerWater - * @return - */ - @AutoLog(value = "加油流水表-添加") - @ApiOperation(value="加油流水表-添加", notes="加油流水表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody CheerWater cheerWater) { - cheerWaterService.save(cheerWater); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param cheerWater - * @return - */ - @AutoLog(value = "加油流水表-编辑") - @ApiOperation(value="加油流水表-编辑", notes="加油流水表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody CheerWater cheerWater) { - cheerWaterService.updateById(cheerWater); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "加油流水表-通过id删除") - @ApiOperation(value="加油流水表-通过id删除", notes="加油流水表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - cheerWaterService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "加油流水表-批量删除") - @ApiOperation(value="加油流水表-批量删除", notes="加油流水表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.cheerWaterService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "加油流水表-通过id查询") - @ApiOperation(value="加油流水表-通过id查询", notes="加油流水表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - CheerWater cheerWater = cheerWaterService.getById(id); - if(cheerWater==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(cheerWater); - } - - /** - * 导出excel - * - * @param request - * @param cheerWater - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, CheerWater cheerWater) { - return super.exportXls(request, cheerWater, CheerWater.class, "加油流水表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, CheerWater.class); - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java deleted file mode 100644 index bd5a801..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/entity/CheerWater.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.jeecg.modules.cheerWater.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 加油流水表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Data -@TableName("cheer_water") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="cheer_water对象", description="加油流水表") -public class CheerWater implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**原价*/ - @Excel(name = "原价", width = 15) - @ApiModelProperty(value = "原价") - private java.math.BigDecimal oldPrice; - /**支付价*/ - @Excel(name = "支付价", width = 15) - @ApiModelProperty(value = "支付价") - private java.math.BigDecimal price; - /**订单名称*/ - @Excel(name = "订单名称", width = 15) - @ApiModelProperty(value = "订单名称") - private java.lang.String name; - /**用户标识*/ - @Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") - @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") - @ApiModelProperty(value = "用户标识") - private java.lang.String userId; - /**支付状态*/ - @Excel(name = "支付状态", width = 15) - @ApiModelProperty(value = "支付状态") - private java.lang.String state; -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java deleted file mode 100644 index 45b88d3..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.cheerWater.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.cheerWater.entity.CheerWater; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 加油流水表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -public interface CheerWaterMapper extends BaseMapper { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml deleted file mode 100644 index 0656457..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java deleted file mode 100644 index 1932122..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/ICheerWaterService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.cheerWater.service; - -import org.jeecg.modules.cheerWater.entity.CheerWater; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 加油流水表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -public interface ICheerWaterService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java deleted file mode 100644 index 50238e9..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.cheerWater.service.impl; - -import org.jeecg.modules.cheerWater.entity.CheerWater; -import org.jeecg.modules.cheerWater.mapper.CheerWaterMapper; -import org.jeecg.modules.cheerWater.service.ICheerWaterService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 加油流水表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Service -public class CheerWaterServiceImpl extends ServiceImpl implements ICheerWaterService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue deleted file mode 100644 index 867cea1..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/CheerWaterList.vue +++ /dev/null @@ -1,203 +0,0 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue deleted file mode 100644 index 23a4dc7..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterForm.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue deleted file mode 100644 index 7c8d9f1..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue deleted file mode 100644 index 91db811..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue/modules/CheerWaterModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts deleted file mode 100644 index c11f370..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.api.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/cheerWater/cheerWater/list', - save='/cheerWater/cheerWater/add', - edit='/cheerWater/cheerWater/edit', - deleteOne = '/cheerWater/cheerWater/delete', - deleteBatch = '/cheerWater/cheerWater/deleteBatch', - importExcel = '/cheerWater/cheerWater/importExcel', - exportXls = '/cheerWater/cheerWater/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts deleted file mode 100644 index 10a7a80..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWater.data.ts +++ /dev/null @@ -1,72 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '创建日期', - align:"center", - sorter: true, - dataIndex: 'createTime' - }, - { - title: '原价', - align:"center", - dataIndex: 'oldPrice' - }, - { - title: '支付价', - align:"center", - dataIndex: 'price' - }, - { - title: '订单名称', - align:"center", - dataIndex: 'name' - }, - { - title: '用户标识', - align:"center", - dataIndex: 'userId_dictText' - }, - { - title: '支付状态', - align:"center", - dataIndex: 'state' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '原价', - field: 'oldPrice', - component: 'InputNumber', - }, - { - label: '支付价', - field: 'price', - component: 'InputNumber', - }, - { - label: '订单名称', - field: 'name', - component: 'Input', - }, - { - label: '用户标识', - field: 'userId', - component: 'JSearchSelect', - componentProps:{ - dict:"han_hai_member,nick_name,id" - }, - }, - { - label: '支付状态', - field: 'state', - component: 'Input', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue deleted file mode 100644 index 7b54d9e..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/CheerWaterList.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue deleted file mode 100644 index faa1ac3..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/vue3/components/CheerWaterModal.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java deleted file mode 100644 index f343cad..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/controller/PayOrderController.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.jeecg.modules.payOrder.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.payOrder.entity.PayOrder; -import org.jeecg.modules.payOrder.service.IPayOrderService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 知识付费订单表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Api(tags="知识付费订单表") -@RestController -@RequestMapping("/payOrder/payOrder") -@Slf4j -public class PayOrderController extends JeecgController { - @Autowired - private IPayOrderService payOrderService; - - /** - * 分页列表查询 - * - * @param payOrder - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "知识付费订单表-分页列表查询") - @ApiOperation(value="知识付费订单表-分页列表查询", notes="知识付费订单表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(PayOrder payOrder, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payOrder, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = payOrderService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param payOrder - * @return - */ - @AutoLog(value = "知识付费订单表-添加") - @ApiOperation(value="知识付费订单表-添加", notes="知识付费订单表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody PayOrder payOrder) { - payOrderService.save(payOrder); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param payOrder - * @return - */ - @AutoLog(value = "知识付费订单表-编辑") - @ApiOperation(value="知识付费订单表-编辑", notes="知识付费订单表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody PayOrder payOrder) { - payOrderService.updateById(payOrder); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "知识付费订单表-通过id删除") - @ApiOperation(value="知识付费订单表-通过id删除", notes="知识付费订单表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - payOrderService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "知识付费订单表-批量删除") - @ApiOperation(value="知识付费订单表-批量删除", notes="知识付费订单表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payOrderService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "知识付费订单表-通过id查询") - @ApiOperation(value="知识付费订单表-通过id查询", notes="知识付费订单表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - PayOrder payOrder = payOrderService.getById(id); - if(payOrder==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(payOrder); - } - - /** - * 导出excel - * - * @param request - * @param payOrder - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, PayOrder payOrder) { - return super.exportXls(request, payOrder, PayOrder.class, "知识付费订单表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, PayOrder.class); - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java deleted file mode 100644 index e456b53..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/entity/PayOrder.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.jeecg.modules.payOrder.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 知识付费订单表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Data -@TableName("pay_order") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="pay_order对象", description="知识付费订单表") -public class PayOrder implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**商品标识*/ - @Excel(name = "商品标识", width = 15) - @ApiModelProperty(value = "商品标识") - private java.lang.String shopId; - /**订单名称*/ - @Excel(name = "订单名称", width = 15) - @ApiModelProperty(value = "订单名称") - private java.lang.String title; - /**价格*/ - @Excel(name = "价格", width = 15) - @ApiModelProperty(value = "价格") - private java.math.BigDecimal price; - /**数量*/ - @Excel(name = "数量", width = 15) - @ApiModelProperty(value = "数量") - private java.lang.Integer num; - /**用户*/ - @Excel(name = "用户", width = 15) - @ApiModelProperty(value = "用户") - private java.lang.String userId; - /**状态*/ - @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") - private java.lang.Integer state; -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java deleted file mode 100644 index ae6d59a..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/PayOrderMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.payOrder.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.payOrder.entity.PayOrder; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 知识付费订单表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -public interface PayOrderMapper extends BaseMapper { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml deleted file mode 100644 index 7b0a219..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java deleted file mode 100644 index f9ebe60..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/IPayOrderService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.payOrder.service; - -import org.jeecg.modules.payOrder.entity.PayOrder; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 知识付费订单表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -public interface IPayOrderService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java deleted file mode 100644 index 5cc5b1b..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.payOrder.service.impl; - -import org.jeecg.modules.payOrder.entity.PayOrder; -import org.jeecg.modules.payOrder.mapper.PayOrderMapper; -import org.jeecg.modules.payOrder.service.IPayOrderService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 知识付费订单表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Service -public class PayOrderServiceImpl extends ServiceImpl implements IPayOrderService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue deleted file mode 100644 index 40db8ae..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/PayOrderList.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue deleted file mode 100644 index 75aafc2..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderForm.vue +++ /dev/null @@ -1,129 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue deleted file mode 100644 index d5d01b2..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue deleted file mode 100644 index 26cb93e..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue/modules/PayOrderModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts deleted file mode 100644 index 5050c78..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.api.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/payOrder/payOrder/list', - save='/payOrder/payOrder/add', - edit='/payOrder/payOrder/edit', - deleteOne = '/payOrder/payOrder/delete', - deleteBatch = '/payOrder/payOrder/deleteBatch', - importExcel = '/payOrder/payOrder/importExcel', - exportXls = '/payOrder/payOrder/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts deleted file mode 100644 index 41897f8..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrder.data.ts +++ /dev/null @@ -1,73 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '商品标识', - align:"center", - dataIndex: 'shopId' - }, - { - title: '订单名称', - align:"center", - dataIndex: 'title' - }, - { - title: '价格', - align:"center", - dataIndex: 'price' - }, - { - title: '数量', - align:"center", - dataIndex: 'num' - }, - { - title: '用户', - align:"center", - dataIndex: 'userId' - }, - { - title: '状态', - align:"center", - dataIndex: 'state' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '商品标识', - field: 'shopId', - component: 'Input', - }, - { - label: '订单名称', - field: 'title', - component: 'Input', - }, - { - label: '价格', - field: 'price', - component: 'InputNumber', - }, - { - label: '数量', - field: 'num', - component: 'InputNumber', - }, - { - label: '用户', - field: 'userId', - component: 'Input', - }, - { - label: '状态', - field: 'state', - component: 'InputNumber', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue deleted file mode 100644 index 1935da9..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/PayOrderList.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue deleted file mode 100644 index 262e465..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payOrder/vue3/components/PayOrderModal.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java deleted file mode 100644 index 9934557..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/controller/PayShopController.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.jeecg.modules.payShop.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.payShop.entity.PayShop; -import org.jeecg.modules.payShop.service.IPayShopService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 付费商品修改表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Api(tags="付费商品修改表") -@RestController -@RequestMapping("/payShop/payShop") -@Slf4j -public class PayShopController extends JeecgController { - @Autowired - private IPayShopService payShopService; - - /** - * 分页列表查询 - * - * @param payShop - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "付费商品修改表-分页列表查询") - @ApiOperation(value="付费商品修改表-分页列表查询", notes="付费商品修改表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(PayShop payShop, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payShop, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = payShopService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param payShop - * @return - */ - @AutoLog(value = "付费商品修改表-添加") - @ApiOperation(value="付费商品修改表-添加", notes="付费商品修改表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody PayShop payShop) { - payShopService.save(payShop); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param payShop - * @return - */ - @AutoLog(value = "付费商品修改表-编辑") - @ApiOperation(value="付费商品修改表-编辑", notes="付费商品修改表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody PayShop payShop) { - payShopService.updateById(payShop); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "付费商品修改表-通过id删除") - @ApiOperation(value="付费商品修改表-通过id删除", notes="付费商品修改表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - payShopService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "付费商品修改表-批量删除") - @ApiOperation(value="付费商品修改表-批量删除", notes="付费商品修改表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.payShopService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "付费商品修改表-通过id查询") - @ApiOperation(value="付费商品修改表-通过id查询", notes="付费商品修改表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - PayShop payShop = payShopService.getById(id); - if(payShop==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(payShop); - } - - /** - * 导出excel - * - * @param request - * @param payShop - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, PayShop payShop) { - return super.exportXls(request, payShop, PayShop.class, "付费商品修改表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, PayShop.class); - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java deleted file mode 100644 index c736afb..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/entity/PayShop.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.jeecg.modules.payShop.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 付费商品修改表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Data -@TableName("pay_shop") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="pay_shop对象", description="付费商品修改表") -public class PayShop implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**图片*/ - @Excel(name = "图片", width = 15) - @ApiModelProperty(value = "图片") - private java.lang.String image; - /**标题*/ - @Excel(name = "标题", width = 15) - @ApiModelProperty(value = "标题") - private java.lang.String title; - /**内容*/ - @Excel(name = "内容", width = 15) - @ApiModelProperty(value = "内容") - private java.lang.String titleText; - /**级别*/ - @Excel(name = "级别", width = 15) - @ApiModelProperty(value = "级别") - private java.lang.String classValue; - /**购买人数*/ - @Excel(name = "购买人数", width = 15) - @ApiModelProperty(value = "购买人数") - private java.lang.String num; - /**价格*/ - @Excel(name = "价格", width = 15) - @ApiModelProperty(value = "价格") - private java.math.BigDecimal price; - /**原价*/ - @Excel(name = "原价", width = 15) - @ApiModelProperty(value = "原价") - private java.math.BigDecimal oldPrice; - /**资源介绍*/ - @Excel(name = "资源介绍", width = 15) - @ApiModelProperty(value = "资源介绍") - private java.lang.String content; - /**资源实际内容*/ - @Excel(name = "资源实际内容", width = 15) - @ApiModelProperty(value = "资源实际内容") - private java.lang.String conValue; -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java deleted file mode 100644 index cff8a82..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/PayShopMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.payShop.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.payShop.entity.PayShop; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 付费商品修改表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -public interface PayShopMapper extends BaseMapper { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml deleted file mode 100644 index c122179..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java deleted file mode 100644 index b898e66..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/IPayShopService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.payShop.service; - -import org.jeecg.modules.payShop.entity.PayShop; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 付费商品修改表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -public interface IPayShopService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java deleted file mode 100644 index c439274..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.payShop.service.impl; - -import org.jeecg.modules.payShop.entity.PayShop; -import org.jeecg.modules.payShop.mapper.PayShopMapper; -import org.jeecg.modules.payShop.service.IPayShopService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 付费商品修改表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Service -public class PayShopServiceImpl extends ServiceImpl implements IPayShopService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue deleted file mode 100644 index 7d5d19f..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/PayShopList.vue +++ /dev/null @@ -1,215 +0,0 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue deleted file mode 100644 index 150fcc5..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopForm.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue deleted file mode 100644 index 56195c9..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue deleted file mode 100644 index 8be2583..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue/modules/PayShopModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts deleted file mode 100644 index fdb5102..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.api.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/payShop/payShop/list', - save='/payShop/payShop/add', - edit='/payShop/payShop/edit', - deleteOne = '/payShop/payShop/delete', - deleteBatch = '/payShop/payShop/deleteBatch', - importExcel = '/payShop/payShop/importExcel', - exportXls = '/payShop/payShop/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts deleted file mode 100644 index 94d33d1..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShop.data.ts +++ /dev/null @@ -1,101 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '图片', - align:"center", - dataIndex: 'image', - customRender:render.renderAvatar, - }, - { - title: '标题', - align:"center", - dataIndex: 'title' - }, - { - title: '内容', - align:"center", - dataIndex: 'titleText' - }, - { - title: '级别', - align:"center", - dataIndex: 'classValue' - }, - { - title: '购买人数', - align:"center", - dataIndex: 'num' - }, - { - title: '价格', - align:"center", - dataIndex: 'price' - }, - { - title: '原价', - align:"center", - dataIndex: 'oldPrice' - }, - { - title: '资源实际内容', - align:"center", - dataIndex: 'conValue' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '图片', - field: 'image', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '标题', - field: 'title', - component: 'Input', - }, - { - label: '内容', - field: 'titleText', - component: 'Input', - }, - { - label: '级别', - field: 'classValue', - component: 'Input', - }, - { - label: '购买人数', - field: 'num', - component: 'Input', - }, - { - label: '价格', - field: 'price', - component: 'InputNumber', - }, - { - label: '原价', - field: 'oldPrice', - component: 'InputNumber', - }, - { - label: '资源介绍', - field: 'content', - component: 'JCodeEditor', //TODO String后缀暂未添加 - }, - { - label: '资源实际内容', - field: 'conValue', - component: 'Input', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue deleted file mode 100644 index 8447ee0..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/PayShopList.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue deleted file mode 100644 index f557b7c..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/vue3/components/PayShopModal.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java deleted file mode 100644 index e23311b..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java +++ /dev/null @@ -1,229 +0,0 @@ -package org.jeecg.modules.shcoolFloor.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor; -import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 楼栋表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Api(tags="楼栋表") -@RestController -@RequestMapping("/shcoolFloor/shcoolFloor") -@Slf4j -public class ShcoolFloorController extends JeecgController{ - @Autowired - private IShcoolFloorService shcoolFloorService; - - /** - * 分页列表查询 - * - * @param shcoolFloor - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "楼栋表-分页列表查询") - @ApiOperation(value="楼栋表-分页列表查询", notes="楼栋表-分页列表查询") - @GetMapping(value = "/rootList") - public Result> queryPageList(ShcoolFloor shcoolFloor, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - String hasQuery = req.getParameter("hasQuery"); - if(hasQuery != null && "true".equals(hasQuery)){ - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap()); - List list = shcoolFloorService.queryTreeListNoPage(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - }else{ - String parentId = shcoolFloor.getPid(); - if (oConvertUtils.isEmpty(parentId)) { - parentId = "0"; - } - shcoolFloor.setPid(null); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap()); - // 使用 eq 防止模糊查询 - queryWrapper.eq("pid", parentId); - Page page = new Page(pageNo, pageSize); - IPage pageList = shcoolFloorService.page(page, queryWrapper); - return Result.OK(pageList); - } - } - - /** - * 获取子数据 - * @param shcoolFloor - * @param req - * @return - */ - //@AutoLog(value = "楼栋表-获取子数据") - @ApiOperation(value="楼栋表-获取子数据", notes="楼栋表-获取子数据") - @GetMapping(value = "/childList") - public Result> queryPageList(ShcoolFloor shcoolFloor,HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(shcoolFloor, req.getParameterMap()); - List list = shcoolFloorService.list(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - } - - /** - * 批量查询子节点 - * @param parentIds 父ID（多个采用半角逗号分割） - * @return 返回 IPage - * @param parentIds - * @return - */ - //@AutoLog(value = "楼栋表-批量获取子数据") - @ApiOperation(value="楼栋表-批量获取子数据", notes="楼栋表-批量获取子数据") - @GetMapping("/getChildListBatch") - public Result getChildListBatch(@RequestParam("parentIds") String parentIds) { - try { - QueryWrapper queryWrapper = new QueryWrapper<>(); - List parentIdList = Arrays.asList(parentIds.split(",")); - queryWrapper.in("pid", parentIdList); - List list = shcoolFloorService.list(queryWrapper); - IPage pageList = new Page<>(1, 10, list.size()); - pageList.setRecords(list); - return Result.OK(pageList); - } catch (Exception e) { - log.error(e.getMessage(), e); - return Result.error("批量查询子节点失败：" + e.getMessage()); - } - } - - /** - * 添加 - * - * @param shcoolFloor - * @return - */ - @AutoLog(value = "楼栋表-添加") - @ApiOperation(value="楼栋表-添加", notes="楼栋表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ShcoolFloor shcoolFloor) { - shcoolFloorService.addShcoolFloor(shcoolFloor); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param shcoolFloor - * @return - */ - @AutoLog(value = "楼栋表-编辑") - @ApiOperation(value="楼栋表-编辑", notes="楼栋表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ShcoolFloor shcoolFloor) { - shcoolFloorService.updateShcoolFloor(shcoolFloor); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "楼栋表-通过id删除") - @ApiOperation(value="楼栋表-通过id删除", notes="楼栋表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - shcoolFloorService.deleteShcoolFloor(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "楼栋表-批量删除") - @ApiOperation(value="楼栋表-批量删除", notes="楼栋表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.shcoolFloorService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "楼栋表-通过id查询") - @ApiOperation(value="楼栋表-通过id查询", notes="楼栋表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ShcoolFloor shcoolFloor = shcoolFloorService.getById(id); - if(shcoolFloor==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(shcoolFloor); - } - - /** - * 导出excel - * - * @param request - * @param shcoolFloor - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ShcoolFloor shcoolFloor) { - return super.exportXls(request, shcoolFloor, ShcoolFloor.class, "楼栋表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ShcoolFloor.class); - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java deleted file mode 100644 index 5f3bd63..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.jeecg.modules.shcoolFloor.entity; - -import java.io.Serializable; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.UnsupportedEncodingException; - -/** - * @Description: 楼栋表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Data -@TableName("shcool_floor") -@ApiModel(value="shcool_floor对象", description="楼栋表") -public class ShcoolFloor implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**名称*/ - @Excel(name = "名称", width = 15) - @ApiModelProperty(value = "名称") - private java.lang.String name; - /**排序*/ - @Excel(name = "排序", width = 15) - @ApiModelProperty(value = "排序") - private java.lang.Integer sort; - /**父级节点*/ - @Excel(name = "父级节点", width = 15) - @ApiModelProperty(value = "父级节点") - private java.lang.String pid; - /**是否有子节点*/ - @Excel(name = "是否有子节点", width = 15, dicCode = "yn") - @Dict(dicCode = "yn") - @ApiModelProperty(value = "是否有子节点") - private java.lang.String hasChild; -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java deleted file mode 100644 index a8e4110..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.jeecg.modules.shcoolFloor.mapper; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 楼栋表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -public interface ShcoolFloorMapper extends BaseMapper { - - /** - * 编辑节点状态 - * @param id - * @param status - */ - void updateTreeNodeStatus(@Param("id") String id,@Param("status") String status); - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml deleted file mode 100644 index 1d46344..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - update shcool_floor set has_child = #{status} where id = #{id} - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java deleted file mode 100644 index 4f1a431..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.jeecg.modules.shcoolFloor.service; - -import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor; -import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.exception.JeecgBootException; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import java.util.List; - -/** - * @Description: 楼栋表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -public interface IShcoolFloorService extends IService { - - /**根节点父ID的值*/ - public static final String ROOT_PID_VALUE = "0"; - - /**树节点有子节点状态值*/ - public static final String HASCHILD = "1"; - - /**树节点无子节点状态值*/ - public static final String NOCHILD = "0"; - - /**新增节点*/ - void addShcoolFloor(ShcoolFloor shcoolFloor); - - /**修改节点*/ - void updateShcoolFloor(ShcoolFloor shcoolFloor) throws JeecgBootException; - - /**删除节点*/ - void deleteShcoolFloor(String id) throws JeecgBootException; - - /**查询所有数据，无分页*/ - List queryTreeListNoPage(QueryWrapper queryWrapper); - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java deleted file mode 100644 index 7a05582..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.jeecg.modules.shcoolFloor.service.impl; - -import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor; -import org.jeecg.modules.shcoolFloor.mapper.ShcoolFloorMapper; -import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 楼栋表 - * @Author: jeecg-boot - * @Date: 2024-09-02 - * @Version: V1.0 - */ -@Service -public class ShcoolFloorServiceImpl extends ServiceImpl implements IShcoolFloorService { - - @Override - public void addShcoolFloor(ShcoolFloor shcoolFloor) { - //新增时设置hasChild为0 - shcoolFloor.setHasChild(IShcoolFloorService.NOCHILD); - if(oConvertUtils.isEmpty(shcoolFloor.getPid())){ - shcoolFloor.setPid(IShcoolFloorService.ROOT_PID_VALUE); - }else{ - //如果当前节点父ID不为空 则设置父节点的hasChildren 为1 - ShcoolFloor parent = baseMapper.selectById(shcoolFloor.getPid()); - if(parent!=null && !"1".equals(parent.getHasChild())){ - parent.setHasChild("1"); - baseMapper.updateById(parent); - } - } - baseMapper.insert(shcoolFloor); - } - - @Override - public void updateShcoolFloor(ShcoolFloor shcoolFloor) { -// ShcoolFloor entity = this.getById(shcoolFloor.getId()); -// if(entity==null) { -// throw new JeecgBootException("未找到对应实体"); -// } -// String old_pid = entity.getPid(); -// String new_pid = shcoolFloor.getPid(); -// if(!old_pid.equals(new_pid)) { -// updateOldParentNode(old_pid); -// if(oConvertUtils.isEmpty(new_pid)){ -// shcoolFloor.setPid(IShcoolFloorService.ROOT_PID_VALUE); -// } -// if(!IShcoolFloorService.ROOT_PID_VALUE.equals(shcoolFloor.getPid())) { -// baseMapper.updateTreeNodeStatus(shcoolFloor.getPid(), IShcoolFloorService.HASCHILD); -// } -// } -// baseMapper.updateById(shcoolFloor); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteShcoolFloor(String id) throws JeecgBootException { -// //查询选中节点下所有子节点一并删除 -// id = this.queryTreeChildIds(id); -// if(id.indexOf(",")>0) { -// StringBuffer sb = new StringBuffer(); -// String[] idArr = id.split(","); -// for (String idVal : idArr) { -// if(idVal != null){ -// ShcoolFloor shcoolFloor = this.getById(idVal); -// String pidVal = shcoolFloor.getPid(); -// //查询此节点上一级是否还有其他子节点 -// List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal).notIn("id",Arrays.asList(idArr))); -// if((dataList == null || dataList.size()==0) && !Arrays.asList(idArr).contains(pidVal) -// && !sb.toString().contains(pidVal)){ -// //如果当前节点原本有子节点 现在木有了，更新状态 -// sb.append(pidVal).append(","); -// } -// } -// } -// //批量删除节点 -// baseMapper.deleteBatchIds(Arrays.asList(idArr)); -// //修改已无子节点的标识 -// String[] pidArr = sb.toString().split(","); -// for(String pid : pidArr){ -// this.updateOldParentNode(pid); -// } -// }else{ -// ShcoolFloor shcoolFloor = this.getById(id); -// if(shcoolFloor==null) { -// throw new JeecgBootException("未找到对应实体"); -// } -// updateOldParentNode(shcoolFloor.getPid()); -// baseMapper.deleteById(id); -// } - } - - @Override - public List queryTreeListNoPage(QueryWrapper queryWrapper) { - List dataList = baseMapper.selectList(queryWrapper); - List mapList = new ArrayList<>(); - for(ShcoolFloor data : dataList){ - String pidVal = data.getPid(); - //递归查询子节点的根节点 - if(pidVal != null && !"0".equals(pidVal)){ - ShcoolFloor rootVal = this.getTreeRoot(pidVal); - if(rootVal != null && !mapList.contains(rootVal)){ - mapList.add(rootVal); - } - }else{ - if(!mapList.contains(data)){ - mapList.add(data); - } - } - } - return mapList; - } - -// /** -// * 根据所传pid查询旧的父级节点的子节点并修改相应状态值 -// * @param pid -// */ -// private void updateOldParentNode(String pid) { -// if(!IShcoolFloorService.ROOT_PID_VALUE.equals(pid)) { -// Integer count = baseMapper.selectCount(new QueryWrapper().eq("pid", pid)); -// if(count==null || count<=1) { -// baseMapper.updateTreeNodeStatus(pid, IShcoolFloorService.NOCHILD); -// } -// } -// } - - /** - * 递归查询节点的根节点 - * @param pidVal - * @return - */ - private ShcoolFloor getTreeRoot(String pidVal){ - ShcoolFloor data = baseMapper.selectById(pidVal); - if(data != null && !"0".equals(data.getPid())){ - return this.getTreeRoot(data.getPid()); - }else{ - return data; - } - } - - /** - * 根据id查询所有子节点id - * @param ids - * @return - */ - private String queryTreeChildIds(String ids) { - //获取id数组 - String[] idArr = ids.split(","); - StringBuffer sb = new StringBuffer(); - for (String pidVal : idArr) { - if(pidVal != null){ - if(!sb.toString().contains(pidVal)){ - if(sb.toString().length() > 0){ - sb.append(","); - } - sb.append(pidVal); - this.getTreeChildIds(pidVal,sb); - } - } - } - return sb.toString(); - } - - /** - * 递归查询所有子节点 - * @param pidVal - * @param sb - * @return - */ - private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){ - List dataList = baseMapper.selectList(new QueryWrapper().eq("pid", pidVal)); - if(dataList != null && dataList.size()>0){ - for(ShcoolFloor tree : dataList) { - if(!sb.toString().contains(tree.getId())){ - sb.append(",").append(tree.getId()); - } - this.getTreeChildIds(tree.getId(),sb); - } - } - return sb; - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue deleted file mode 100644 index 18e67c5..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/ShcoolFloorList.vue +++ /dev/null @@ -1,353 +0,0 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue deleted file mode 100644 index f55bdc4..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue/modules/ShcoolFloorModal.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts deleted file mode 100644 index a0ce0fc..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.api.ts +++ /dev/null @@ -1,82 +0,0 @@ -import {defHttp} from "/@/utils/http/axios"; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/shcoolFloor/shcoolFloor/rootList', - save='/shcoolFloor/shcoolFloor/add', - edit='/shcoolFloor/shcoolFloor/edit', - deleteShcoolFloor = '/sys/shcoolFloor/delete', - deleteBatch = '/shcoolFloor/shcoolFloor/deleteBatch', - importExcel = '/shcoolFloor/shcoolFloor/importExcel', - exportXls = '/shcoolFloor/shcoolFloor/exportXls', - loadTreeData = '/shcoolFloor/shcoolFloor/loadTreeRoot', - getChildList = '/shcoolFloor/shcoolFloor/childList', - getChildListBatch = '/shcoolFloor/shcoolFloor/getChildListBatch', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - * @param params - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); -/** - * 删除 - */ -export const deleteShcoolFloor = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteShcoolFloor, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDeleteShcoolFloor = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdateDict = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} -/** - * 查询全部树形节点数据 - * @param params - */ -export const loadTreeData = (params) => - defHttp.get({url: Api.loadTreeData,params}); -/** - * 查询子节点数据 - * @param params - */ -export const getChildList = (params) => - defHttp.get({url: Api.getChildList, params}); -/** - * 批量查询子节点数据 - * @param params - */ -export const getChildListBatch = (params) => - defHttp.get({url: Api.getChildListBatch, params},{isTransformResponse:false}); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts deleted file mode 100644 index d6c3444..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloor.data.ts +++ /dev/null @@ -1,38 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '名称', - align:"center", - dataIndex: 'name' - }, - { - title: '排序', - align:"center", - dataIndex: 'sort' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '名称', - field: 'name', - component: 'Input', - }, - { - label: '排序', - field: 'sort', - component: 'InputNumber', - }, - { - label: '父级节点', - field: 'pid', - component: 'Input', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue deleted file mode 100644 index d4553de..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/ShcoolFloorList.vue +++ /dev/null @@ -1,272 +0,0 @@ - - - - - diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue deleted file mode 100644 index eb9b90b..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/vue3/components/ShcoolFloorModal.vue +++ /dev/null @@ -1,87 +0,0 @@ - - diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java deleted file mode 100644 index 9c880f4..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.java +++ /dev/null @@ -1,171 +0,0 @@ -package org.jeecg.modules.shcoolSub.controller; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.util.oConvertUtils; -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; -import org.jeecg.modules.shcoolSub.service.IShcoolSubService; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; - -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; - - /** - * @Description: 报修表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Api(tags="报修表") -@RestController -@RequestMapping("/shcoolSub/shcoolSub") -@Slf4j -public class ShcoolSubController extends JeecgController { - @Autowired - private IShcoolSubService shcoolSubService; - - /** - * 分页列表查询 - * - * @param shcoolSub - * @param pageNo - * @param pageSize - * @param req - * @return - */ - //@AutoLog(value = "报修表-分页列表查询") - @ApiOperation(value="报修表-分页列表查询", notes="报修表-分页列表查询") - @GetMapping(value = "/list") - public Result> queryPageList(ShcoolSub shcoolSub, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(shcoolSub, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = shcoolSubService.page(page, queryWrapper); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param shcoolSub - * @return - */ - @AutoLog(value = "报修表-添加") - @ApiOperation(value="报修表-添加", notes="报修表-添加") - @PostMapping(value = "/add") - public Result add(@RequestBody ShcoolSub shcoolSub) { - shcoolSubService.save(shcoolSub); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - * - * @param shcoolSub - * @return - */ - @AutoLog(value = "报修表-编辑") - @ApiOperation(value="报修表-编辑", notes="报修表-编辑") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result edit(@RequestBody ShcoolSub shcoolSub) { - shcoolSubService.updateById(shcoolSub); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "报修表-通过id删除") - @ApiOperation(value="报修表-通过id删除", notes="报修表-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - shcoolSubService.removeById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "报修表-批量删除") - @ApiOperation(value="报修表-批量删除", notes="报修表-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.shcoolSubService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "报修表-通过id查询") - @ApiOperation(value="报修表-通过id查询", notes="报修表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ShcoolSub shcoolSub = shcoolSubService.getById(id); - if(shcoolSub==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(shcoolSub); - } - - /** - * 导出excel - * - * @param request - * @param shcoolSub - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ShcoolSub shcoolSub) { - return super.exportXls(request, shcoolSub, ShcoolSub.class, "报修表"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ShcoolSub.class); - } - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java deleted file mode 100644 index a7ab016..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/entity/ShcoolSub.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.jeecg.modules.shcoolSub.entity; - -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @Description: 报修表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Data -@TableName("shcool_sub") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="shcool_sub对象", description="报修表") -public class ShcoolSub implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private java.lang.String id; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private java.lang.String createBy; - /**创建日期*/ - @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; - /**更新日期*/ - @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; - /**楼栋*/ - @Excel(name = "楼栋", width = 15) - @ApiModelProperty(value = "楼栋") - private java.lang.String building; - /**室号*/ - @Excel(name = "室号", width = 15) - @ApiModelProperty(value = "室号") - private java.lang.String room; - /**项目*/ - @Excel(name = "项目", width = 15) - @ApiModelProperty(value = "项目") - private java.lang.String project; - /**姓名*/ - @Excel(name = "姓名", width = 15) - @ApiModelProperty(value = "姓名") - private java.lang.String name; - /**简介*/ - @Excel(name = "简介", width = 15) - @ApiModelProperty(value = "简介") - private java.lang.String context; - /**电话*/ - @Excel(name = "电话", width = 15) - @ApiModelProperty(value = "电话") - private java.lang.String phone; - /**照片*/ - @Excel(name = "照片", width = 15) - @ApiModelProperty(value = "照片") - private java.lang.String image; - /**用户标识*/ - @Excel(name = "用户标识", width = 15) - @ApiModelProperty(value = "用户标识") - private java.lang.String userId; - /**状态*/ - @Excel(name = "状态", width = 15) - @ApiModelProperty(value = "状态") - private java.lang.String state; - /**结单/驳回*/ - @Excel(name = "结单/驳回", width = 15) - @ApiModelProperty(value = "结单/驳回") - private java.lang.String cleckState; - /**驳回原因*/ - @Excel(name = "驳回原因", width = 15) - @ApiModelProperty(value = "驳回原因") - private java.lang.String returnValue; - /**结单结果*/ - @Excel(name = "结单结果", width = 15) - @ApiModelProperty(value = "结单结果") - private java.lang.String successTitle; - /**结单金额*/ - @Excel(name = "结单金额", width = 15) - @ApiModelProperty(value = "结单金额") - private java.math.BigDecimal successPrice; - /**处理说明*/ - @Excel(name = "处理说明", width = 15) - @ApiModelProperty(value = "处理说明") - private java.lang.String sucessText; - /**照片*/ - @Excel(name = "照片", width = 15) - @ApiModelProperty(value = "照片") - private java.lang.String successImage; -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java deleted file mode 100644 index c6b0a82..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.jeecg.modules.shcoolSub.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 报修表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -public interface ShcoolSubMapper extends BaseMapper { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml deleted file mode 100644 index a05ada2..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java deleted file mode 100644 index 6e124e1..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.jeecg.modules.shcoolSub.service; - -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 报修表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -public interface IShcoolSubService extends IService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java deleted file mode 100644 index ab90074..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.jeecg.modules.shcoolSub.service.impl; - -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; -import org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper; -import org.jeecg.modules.shcoolSub.service.IShcoolSubService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 报修表 - * @Author: jeecg-boot - * @Date: 2024-08-29 - * @Version: V1.0 - */ -@Service -public class ShcoolSubServiceImpl extends ServiceImpl implements IShcoolSubService { - -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue deleted file mode 100644 index 4ac20bb..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue +++ /dev/null @@ -1,256 +0,0 @@ - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue deleted file mode 100644 index 5831aaa..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue deleted file mode 100644 index 5f63f7f..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.Style#Drawer.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue deleted file mode 100644 index eaf4dab..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubModal.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts deleted file mode 100644 index 744c4ad..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.api.ts +++ /dev/null @@ -1,61 +0,0 @@ -import {defHttp} from '/@/utils/http/axios'; -import {Modal} from 'ant-design-vue'; - -enum Api { - list = '/shcoolSub/shcoolSub/list', - save='/shcoolSub/shcoolSub/add', - edit='/shcoolSub/shcoolSub/edit', - deleteOne = '/shcoolSub/shcoolSub/delete', - deleteBatch = '/shcoolSub/shcoolSub/deleteBatch', - importExcel = '/shcoolSub/shcoolSub/importExcel', - exportXls = '/shcoolSub/shcoolSub/exportXls', -} -/** - * 导出api - * @param params - */ -export const getExportUrl = Api.exportXls; -/** - * 导入api - */ -export const getImportUrl = Api.importExcel; -/** - * 列表接口 - * @param params - */ -export const list = (params) => - defHttp.get({url: Api.list, params}); - -/** - * 删除单个 - */ -export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); -} -/** - * 批量删除 - * @param params - */ -export const batchDelete = (params, handleSuccess) => { - Modal.confirm({ - title: '确认删除', - content: '是否删除选中数据', - okText: '确认', - cancelText: '取消', - onOk: () => { - return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); - }); - } - }); -} -/** - * 保存或者更新 - * @param params - */ -export const saveOrUpdate = (params, isUpdate) => { - let url = isUpdate ? Api.edit : Api.save; - return defHttp.post({url: url, params}); -} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts deleted file mode 100644 index 76c738f..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts +++ /dev/null @@ -1,166 +0,0 @@ -import {BasicColumn} from '/@/components/Table'; -import {FormSchema} from '/@/components/Table'; -import { rules} from '/@/utils/helper/validator'; -import { render } from '/@/utils/common/renderUtils'; -//列表数据 -export const columns: BasicColumn[] = [ - { - title: '楼栋', - align:"center", - dataIndex: 'building' - }, - { - title: '室号', - align:"center", - dataIndex: 'room' - }, - { - title: '项目', - align:"center", - dataIndex: 'project' - }, - { - title: '姓名', - align:"center", - dataIndex: 'name' - }, - { - title: '简介', - align:"center", - dataIndex: 'context' - }, - { - title: '电话', - align:"center", - dataIndex: 'phone' - }, - { - title: '照片', - align:"center", - dataIndex: 'image', - customRender:render.renderAvatar, - }, - { - title: '用户标识', - align:"center", - dataIndex: 'userId' - }, - { - title: '状态', - align:"center", - dataIndex: 'state' - }, - { - title: '结单/驳回', - align:"center", - dataIndex: 'cleckState' - }, - { - title: '驳回原因', - align:"center", - dataIndex: 'returnValue' - }, - { - title: '结单结果', - align:"center", - dataIndex: 'successTitle' - }, - { - title: '结单金额', - align:"center", - dataIndex: 'successPrice' - }, - { - title: '处理说明', - align:"center", - dataIndex: 'sucessText' - }, - { - title: '照片', - align:"center", - dataIndex: 'successImage' - }, -]; -//查询数据 -export const searchFormSchema: FormSchema[] = [ -]; -//表单数据 -export const formSchema: FormSchema[] = [ - { - label: '楼栋', - field: 'building', - component: 'Input', - }, - { - label: '室号', - field: 'room', - component: 'Input', - }, - { - label: '项目', - field: 'project', - component: 'Input', - }, - { - label: '姓名', - field: 'name', - component: 'Input', - }, - { - label: '简介', - field: 'context', - component: 'InputTextArea',//TODO 注意string转换问题 - }, - { - label: '电话', - field: 'phone', - component: 'Input', - }, - { - label: '照片', - field: 'image', - component: 'JImageUpload', - componentProps:{ - }, - }, - { - label: '用户标识', - field: 'userId', - component: 'Input', - }, - { - label: '状态', - field: 'state', - component: 'Input', - }, - { - label: '结单/驳回', - field: 'cleckState', - component: 'Input', - }, - { - label: '驳回原因', - field: 'returnValue', - component: 'Input', - }, - { - label: '结单结果', - field: 'successTitle', - component: 'Input', - }, - { - label: '结单金额', - field: 'successPrice', - component: 'InputNumber', - }, - { - label: '处理说明', - field: 'sucessText', - component: 'Input', - }, - { - label: '照片', - field: 'successImage', - component: 'Input', - }, -]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue deleted file mode 100644 index a01f737..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSubList.vue +++ /dev/null @@ -1,162 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue deleted file mode 100644 index be54a26..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/components/ShcoolSubModal.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/controller/CheerConfController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/controller/CheerConfController.class deleted file mode 100644 index 44b93d4..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/controller/CheerConfController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/entity/CheerConf.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/entity/CheerConf.class deleted file mode 100644 index c90c3c7..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/entity/CheerConf.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class deleted file mode 100644 index f46bc76..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/CheerConfMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml deleted file mode 100644 index 6e16809..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/mapper/xml/CheerConfMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/ICheerConfService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/ICheerConfService.class deleted file mode 100644 index 4bd9811..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/ICheerConfService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class deleted file mode 100644 index 7fd77ad..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerConf/service/impl/CheerConfServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class deleted file mode 100644 index e4dc64f..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class deleted file mode 100644 index bd0c924..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/entity/CheerRecharge.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class deleted file mode 100644 index eb26327..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/CheerRechargeMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml deleted file mode 100644 index e025af8..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/mapper/xml/CheerRechargeMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class deleted file mode 100644 index dafbced..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/ICheerRechargeService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class deleted file mode 100644 index 1187722..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerRecharge/service/impl/CheerRechargeServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/controller/CheerWaterController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/controller/CheerWaterController.class deleted file mode 100644 index bceeed5..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/controller/CheerWaterController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/entity/CheerWater.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/entity/CheerWater.class deleted file mode 100644 index 18f51ac..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/entity/CheerWater.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class deleted file mode 100644 index bfa275e..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml deleted file mode 100644 index 0656457..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/mapper/xml/CheerWaterMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/ICheerWaterService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/ICheerWaterService.class deleted file mode 100644 index fae8fac..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/ICheerWaterService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class deleted file mode 100644 index 4869966..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/cheerWater/service/impl/CheerWaterServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/controller/PayOrderController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/controller/PayOrderController.class deleted file mode 100644 index eef42e5..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/controller/PayOrderController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/entity/PayOrder.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/entity/PayOrder.class deleted file mode 100644 index 4dc865d..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/entity/PayOrder.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/PayOrderMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/PayOrderMapper.class deleted file mode 100644 index c6477c1..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/PayOrderMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml deleted file mode 100644 index 7b0a219..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/mapper/xml/PayOrderMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/IPayOrderService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/IPayOrderService.class deleted file mode 100644 index 8e4a906..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/IPayOrderService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class deleted file mode 100644 index af3fec9..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/controller/PayShopController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/controller/PayShopController.class deleted file mode 100644 index b35e5e6..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/controller/PayShopController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/entity/PayShop.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/entity/PayShop.class deleted file mode 100644 index bfcc025..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/entity/PayShop.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/PayShopMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/PayShopMapper.class deleted file mode 100644 index 51f11bb..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/PayShopMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml deleted file mode 100644 index c122179..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/mapper/xml/PayShopMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/IPayShopService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/IPayShopService.class deleted file mode 100644 index 37927ef..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/IPayShopService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class deleted file mode 100644 index c9b8bbd..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class deleted file mode 100644 index 6f213c3..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class deleted file mode 100644 index 33d705c..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class deleted file mode 100644 index e29be24..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml deleted file mode 100644 index 1d46344..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/mapper/xml/ShcoolFloorMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - update shcool_floor set has_child = #{status} where id = #{id} - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class deleted file mode 100644 index d379bf0..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class deleted file mode 100644 index e9b3893..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class deleted file mode 100644 index d238bf8..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class deleted file mode 100644 index bc4ec24..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class deleted file mode 100644 index 5e6f286..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml deleted file mode 100644 index a05ada2..0000000 --- a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/mapper/xml/ShcoolSubMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/IShcoolSubService.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/IShcoolSubService.class deleted file mode 100644 index 926503a..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/IShcoolSubService.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class deleted file mode 100644 index ec5f0ca..0000000 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.class and /dev/null differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar index 8919ebd..b8c56ae 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.2.0.jar differ diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index f6232fb..d1c315e 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,5 +1,6 @@ org/jeecg/common/api/dto/LogDTO.class org/jeecg/common/util/SpringContextUtils.class +org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.class org/jeecg/config/mybatis/TenantContext.class org/jeecg/config/WebMvcConfiguration.class org/jeecg/common/util/MyClassLoader.class @@ -145,7 +146,9 @@ org/jeecg/modules/atComplaintReason/mapper/AtComplaintReasonMapper.class org/jeecg/common/system/query/QueryRuleEnum.class org/jeecg/modules/cheerConf/service/ICheerConfService.class org/jeecg/common/aspect/annotation/OnlineAuth.class +org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.class org/jeecg/common/util/RestDesformUtil.class +org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.class org/jeecg/common/system/vo/DictModelMany.class org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.class org/jeecg/modules/payShop/mapper/PayShopMapper.class @@ -225,6 +228,7 @@ org/jeecg/common/util/dynamic/db/DbTypeUtils.class org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.class org/jeecg/modules/shcoolSub/mapper/ShcoolSubMapper.class org/jeecg/common/api/CommonAPI.class +org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.class org/jeecg/modules/payOrder/service/impl/PayOrderServiceImpl.class org/jeecg/config/AutoPoiConfig.class org/jeecg/modules/payOrder/entity/PayOrder.class @@ -232,6 +236,7 @@ org/jeecg/common/aspect/AutoLogAspect.class org/jeecg/config/sign/interceptor/SignAuthConfiguration.class org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.class org/jeecg/common/util/RestUtil.class +org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.class org/jeecg/common/util/PasswordUtil.class org/jeecg/config/Swagger2Config$1.class org/jeecg/modules/atPromotion/entity/AtPromotion.class diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index a0970e7..7cb059a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/jeecg-boot-base/jeecg-boot-base-core/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -79,6 +79,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/impl/ShcoolFloorServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java @@ -111,6 +112,8 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/entity/ShcoolFloor.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/service/IShcoolFloorService.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/payShop/service/impl/PayShopServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/service/impl/AtMasterPieceServiceImpl.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atMasterPiece/controller/AtMasterPieceController.java @@ -216,6 +219,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHanBanner/mapper/HanHaiBannerMapper.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/mapper/ShcoolFloorMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atComplaintReason/controller/AtComplaintReasonController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java @@ -229,6 +233,7 @@ /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerWater/mapper/CheerWaterMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java +/Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolFloor/controller/ShcoolFloorController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/cheerRecharge/controller/CheerRechargeController.java /Applications/hanhai-object/hanhai-a-notice-api/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java diff --git a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar index c5100ea..19c26ee 100644 Binary files a/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar and b/jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.2.0.jar differ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java deleted file mode 100644 index cf06211..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerInfoController.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.jeecg.modules.api.cheeroncontroller; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiBean.OrderPayBean; -import org.jeecg.modules.apiBean.OrderRechargeBean; -import org.jeecg.modules.apiBean.OrderWaterPageBean; -import org.jeecg.modules.apiUtils.printUtil; -import org.jeecg.modules.apiservice.InfoApiService; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -@Api(tags="加油小程序-个人中心相关接口") -@RestController -@RequestMapping("/cheer/info") -@Slf4j -public class CheerInfoController { - - //获取个人中心接口 - @Resource - private InfoApiService infoApiService; - - - //获取个人信息接口 - @ApiOperation(value="小程序-获取个人信息接口", notes="小程序-获取个人信息接口") - @GetMapping("/getInfo") - public Result getInfo(@RequestHeader("X-Access-Token") String token) - { - return infoApiService.getInfo(token); - } - - - //修改个人信息接口 - @ApiOperation(value="小程序-修改个人信息接口", notes="小程序-修改个人信息接口") - @PostMapping("/updateInfo") - public Result updateInfo(@RequestHeader("X-Access-Token") String token, HanHaiMember bean) - { - return infoApiService.updateInfo(token,bean); - } - - - /********************************************************************************************/ - /**************************************加油小程序相关*****************************************/ - //获取加油流水订单 - @ApiOperation(value="小程序-获取加油流水订单", notes="小程序-获取加油流水订单") - @GetMapping("/getOrderWaterPage") - public Result getOrderWaterPage(@RequestHeader("X-Access-Token") String token, OrderWaterPageBean bean) - { - return infoApiService.getOrderWaterPage(token,bean); - } - - //获取加油流水订单 - @ApiOperation(value="小程序-用户输入支付创建支付订单并且支付", notes="小程序-用户输入支付创建支付订单并且支付") - @GetMapping("/createOrderPay") - public Result createOrderPay(@RequestHeader("X-Access-Token") String token, OrderPayBean bean){ - return infoApiService.createOrderPay(token, bean); - } - - //获取充值套餐列表 - @ApiOperation(value="小程序-获取充值套餐列表", notes="小程序-获取充值套餐列表") - @RequestMapping(value = "/getRechargePage", method = {RequestMethod.GET}) - public Result getRechargePage(OrderRechargeBean bean){ - - return infoApiService.getRechargePage(bean); - } - - //获取配置信息：折扣、客户电话、客户微信 - @ApiOperation(value="小程序-获取配置信息：折扣、客户电话、客户微信等", notes="小程序-获取配置信息：折扣、客户电话、客户微信等") - @RequestMapping(value = "/getConfig", method = {RequestMethod.GET}) - public Result getConfig(String keyValue){ - return infoApiService.getConfig(keyValue); - } - - - //打印账单 - @ApiOperation(value="小程序-打印账单", notes="小程序-打印账单") - @RequestMapping(value = "/printBill", method = {RequestMethod.GET}) - public static Result printBill(){ - //拼接打印信息 - String content = printUtil.spellMessage(); - - //客户要求打印两次 - printUtil.printBill(content); - printUtil.printBill(content); - - return Result.OK("打印成功"); - } - - - //支付回调 - @PostMapping("/notify") - public Object createNotify(@RequestBody String requestBody){ - return infoApiService.createNotify(requestBody); - } - -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java deleted file mode 100644 index 260f991..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/cheeroncontroller/CheerLoginApiController.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.jeecg.modules.api.cheeroncontroller; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiservice.LoginApiService; -import org.jeecg.modules.bean.LoginReq; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -@Api(tags="加油小程序-登录相关接口") -@RestController -@RequestMapping("/cheer/login") -@Slf4j -public class CheerLoginApiController { - - //授权登录 - @Resource - private LoginApiService loginApiService; - - - //小程序授权登录 - @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口") - @GetMapping("/login") - public Result login(LoginReq loginReq){ - return loginApiService.login(loginReq); - } - - - //获取用户协议 - @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") - @GetMapping("/getUserAgreement") - public Result getUserAgreement(){ - return loginApiService.getUserAgreement(); - } - - - //获取隐私政策 - @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") - @GetMapping("/getPrivacyPolicy") - public Result getPrivacyPolicy(){ - return loginApiService.getPrivacyPolicy(); - } - -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java index 19ee009..997d74d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/LoginApiController.java @@ -48,28 +48,5 @@ public class LoginApiController { return loginApiService.getPrivacyPolicy(); } - //获取联系电话 - @ApiOperation(value="小程序-获取联系电话", notes="小程序-获取联系电话") - @GetMapping("/getPhone") - public Result getPhone(){ - return loginApiService.getPhone(); - } - - //获取联系微信 - @ApiOperation(value="小程序-获取联系微信", notes="小程序-获取联系微信") - @GetMapping("/getWechat") - public Result getWechat(){ - return loginApiService.getWechat(); - } - - //或者折扣 - @ApiOperation(value="小程序-获取折扣", notes="小程序-获取折扣") - @GetMapping("/getDiscount") - public Result getDiscount(){ - return loginApiService.getDiscount(); - } - - - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java deleted file mode 100644 index f00695e..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayApiIndexController.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.jeecg.modules.api.payController; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jboss.jandex.Index; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiservice.IndexApiService; -import org.jeecg.modules.apiservice.InfoApiService; -import org.jeecg.modules.bean.WaterPageBean; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -@Api(tags="知识付费小程序-接口部分") -@RestController -@RequestMapping("/pay-api/info") -@Slf4j -public class PayApiIndexController { - - - //获取个人中心接口 - @Resource - private InfoApiService infoApiService; - - //获取首页接口 - - @Resource - private IndexApiService indexApiService; - - //获取个人信息接口 - @ApiOperation(value="小程序-获取个人信息接口", notes="小程序-获取个人信息接口") - @GetMapping("/getInfo") - public Result getInfo(@RequestHeader("X-Access-Token") String token) - { - System.out.println("没有劲来"+token); - - return infoApiService.getInfo(token); - } - - - //修改个人信息接口 - @ApiOperation(value="小程序-修改个人信息接口", notes="小程序-修改个人信息接口") - @PostMapping("/updateInfo") - public Result updateInfo(@RequestHeader("X-Access-Token") String token, HanHaiMember bean) - { - return infoApiService.updateInfo(token,bean); - } - - - //获取商品信息 - @ApiOperation(value="小程序-获取商品信息", notes="小程序-获取商品信息") - @GetMapping("/getPayShopOne") - public Result getPayShopOne(){ - return indexApiService.getPayShopOne(); - } - - //获取订单列表 - @ApiOperation(value="小程序-获取订单列表", notes="小程序-获取订单列表") - @GetMapping("/getPayOrderPage") - public Result getPayOrderPage(@RequestHeader("X-Access-Token") String token, WaterPageBean bean){ - return indexApiService.getPayOrderPage(token,bean); - } - - - //创建支付订单 - @ApiOperation(value="小程序-创建支付订单", notes="小程序-创建支付订单") - @PostMapping("/createPayOrder") - public Result createPayOrder(@RequestHeader("X-Access-Token") String token,String shopId,Integer num){ - return indexApiService.createPayOrder(token,shopId,num); - } - - - //支付回调 - @PostMapping("/notify") - public Object createNotify(@RequestBody String requestBody){ - return indexApiService.createNotify(requestBody); - } - - - -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java deleted file mode 100644 index cc9d632..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/payController/PayLoginController.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.jeecg.modules.api.payController; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiservice.LoginApiService; -import org.jeecg.modules.bean.LoginReq; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -@Api(tags="知识付费小程序-登录相关接口") -@RestController -@RequestMapping("/pay-api/login") -@Slf4j -public class PayLoginController { - - - //授权登录 - @Resource - private LoginApiService loginApiService; - - - //小程序授权登录 - @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口") - @GetMapping("/login") - public Result login(LoginReq loginReq){ - return loginApiService.login(loginReq); - } - - - //获取用户协议 - @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") - @GetMapping("/getUserAgreement") - public Result getUserAgreement(){ - return loginApiService.getUserAgreement(); - } - - - //获取隐私政策 - @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") - @GetMapping("/getPrivacyPolicy") - public Result getPrivacyPolicy(){ - return loginApiService.getPrivacyPolicy(); - } - -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java deleted file mode 100644 index 2a2e337..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolApiController.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.jeecg.modules.api.schoolcontroller; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiservice.IndexApiService; -import org.jeecg.modules.bean.WaterPageBean; -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -@Api(tags="报修小程序-报修相关接口") -@RestController -@RequestMapping("/school-api") -@Slf4j -public class SchoolApiController { - - - //获取首页接口 - - @Resource - private IndexApiService indexApiService; - - - //增加报修单 - @ApiOperation(value="小程序-增加报修单", notes="小程序-增加报修单") - @GetMapping("/addSchoolOrder") - public Result addSchoolOrder(ShcoolSub bean){ - return indexApiService.addSchoolOrder(bean); - } - - //驳回 - @ApiOperation(value="小程序-驳回", notes="小程序-驳回") - @GetMapping("/editSchoolOrderError") - public Result editSchoolOrderError(ShcoolSub bean){ - return indexApiService.editSchoolOrderError(bean); - } - - //结单 - @ApiOperation(value="小程序-结单", notes="小程序-结单") - @GetMapping("/editSchoolOrderSuccess") - public Result editSchoolOrderSuccess(ShcoolSub bean){ - return indexApiService.editSchoolOrderSuccess(bean); - } - - - //列表 - @ApiOperation(value="小程序-报修列表", notes="小程序-报修列表") - @GetMapping("/getSchoolOrderPage") - public Result getSchoolOrderPage(String state, WaterPageBean bean){ - return indexApiService.getSchoolOrderPage(state,bean); - } - - //获取楼栋 - @ApiOperation(value="小程序-获取楼栋", notes="小程序-获取楼栋") - @GetMapping("/getFloorList") - public Result getFloorList(){ - return indexApiService.getFloorList(); - } - - - //获取室号 - @ApiOperation(value="小程序-获取楼栋", notes="小程序-获取楼栋") - @GetMapping("/getActorGoList") - public Result getActorGoList(String id){ - return indexApiService.getRoomList(id); - } - - - - -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java deleted file mode 100644 index 4b79a44..0000000 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/schoolcontroller/SchoolLoginController.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.jeecg.modules.api.schoolcontroller; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.apiservice.LoginApiService; -import org.jeecg.modules.bean.LoginReq; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - - -@Api(tags="小程序-学校报修登录相关接口") -@RestController -@RequestMapping("/school/login") -@Slf4j -public class SchoolLoginController { - - - //授权登录 - @Resource - private LoginApiService loginApiService; - - - //小程序授权登录 - @ApiOperation(value="小程序-登录接口", notes="小程序-登录接口") - @GetMapping("/login") - public Result login(LoginReq loginReq){ - return loginApiService.login(loginReq); - } - - - //获取用户协议 - @ApiOperation(value="小程序-获取用户协议", notes="小程序-获取用户协议") - @GetMapping("/getUserAgreement") - public Result getUserAgreement(){ - return loginApiService.getUserAgreement(); - } - - - //获取隐私政策 - @ApiOperation(value="小程序-获取隐私政策", notes="小程序-获取隐私政策") - @GetMapping("/getPrivacyPolicy") - public Result getPrivacyPolicy(){ - return loginApiService.getPrivacyPolicy(); - } - - - - - - - - -} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java index 1bc8a07..d8a6c82 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/IndexApiService.java @@ -2,10 +2,8 @@ package org.jeecg.modules.apiservice; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.ActorSetPageBean; -import org.jeecg.modules.apiBean.OrderPayBean; import org.jeecg.modules.apiBean.TrendsBean; import org.jeecg.modules.bean.WaterPageBean; -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; public interface IndexApiService { @@ -34,43 +32,5 @@ public interface IndexApiService { //获取投诉原因 Result getComplaintReason(); - //获取商品信息 - Result getPayShopOne(); - - //获取订单列表 - Result getPayOrderPage(String token, WaterPageBean bean); - - - //创建支付订单 - Result createPayOrder(String token, String shopId,Integer num); - - - - - //增加报修单 - Result addSchoolOrder(ShcoolSub bean); - - //驳回 - Result editSchoolOrderError(ShcoolSub bean); - - //结单 - Result editSchoolOrderSuccess(ShcoolSub bean); - - - //列表 - Result getSchoolOrderPage(String state,WaterPageBean bean); - - - //支付回调 - Object createNotify(String requestBody); - - - //获取楼栋 - Result getFloorList(); - - - //获取室号 - Result getRoomList(String floorId); - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java index 47e88d1..b68a433 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/InfoApiService.java @@ -55,22 +55,4 @@ public interface InfoApiService { //用户提现 Result withdraw(String token); - - /********************************************************************************************/ - /**************************************加油小程序相关*****************************************/ - //加油小程序-获取订单流水信息 - Result getOrderWaterPage(String token,OrderWaterPageBean bean); - //加油小程序-用户输入支付创建支付订单并且支付 - Result createOrderPay(String token,OrderPayBean bean); - - - //获取充值套餐列表 - Result getRechargePage(OrderRechargeBean bean); - - //获取配置信息：折扣、客户电话、客户微信 - Result getConfig(String keyValue); - - //支付回调 - Object createNotify(String requestBody); - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java index dff059a..83522af 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/LoginApiService.java @@ -8,23 +8,10 @@ public interface LoginApiService { //小程序-登录接口 Result login(LoginReq loginReq); - //获取用户协议 Result getUserAgreement(); //获取隐私政策 Result getPrivacyPolicy(); - //获取联系电话 - Result getPhone(); - - //获取联系微信 - Result getWechat(); - - //获取折扣 - Result getDiscount(); - - //获取套餐列表 - Result getPackageList(); - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index 265ba15..8cd3bd8 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -22,29 +22,15 @@ import org.jeecg.modules.atPromotion.service.IAtPromotionService; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; import org.jeecg.modules.bean.WaterPageBean; -import org.jeecg.modules.cheerWater.entity.CheerWater; -import org.jeecg.modules.cheerWater.service.ICheerWaterService; -import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; -import org.jeecg.modules.hanHaiWater.entity.HanHaiWater; import org.jeecg.modules.hanHanBanner.entity.HanHaiBanner; import org.jeecg.modules.hanHanBanner.service.IHanHaiBannerService; import org.jeecg.modules.pay.MpWxPayService; -import org.jeecg.modules.payOrder.entity.PayOrder; -import org.jeecg.modules.payOrder.service.IPayOrderService; -import org.jeecg.modules.payShop.entity.PayShop; -import org.jeecg.modules.payShop.service.IPayShopService; -import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor; -import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService; -import org.jeecg.modules.shcoolSub.entity.ShcoolSub; -import org.jeecg.modules.shcoolSub.service.IShcoolSubService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.math.BigDecimal; -import java.util.Date; import java.util.List; @Service @@ -83,12 +69,6 @@ public class IndexApiServiceImpl implements IndexApiService { //支付接口 @Autowired private MpWxPayService mpWxPayService; - //加油小程序 - @Resource - private ICheerWaterService cheerWaterService; - //获取楼栋 - @Resource - private IShcoolFloorService shcoolFloorService; @@ -157,185 +137,4 @@ public class IndexApiServiceImpl implements IndexApiService { } - - - @Resource - private IPayShopService payShopService; - @Resource - private IPayOrderService payOrderService; - - - //获取商品信息 - @Override - public Result getPayShopOne(){ - PayShop payShop = payShopService.list().get(0); - return Result.OK("查询成功",payShop); - } - - //获取订单列表 - @Override - public Result getPayOrderPage(String token, WaterPageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(bean.getPageNo(), bean.getPageSize()); - Page pageList = payOrderService - .lambdaQuery() - .orderByDesc(PayOrder::getCreateTime) - .eq(PayOrder::getState,1) - .eq(PayOrder::getUserId,hanHaiMember.getId()) - .page(page); - return Result.OK("订单列表",pageList); - } - - - //创建支付订单 - @Override - public Result createPayOrder(String token, String shopId,Integer num){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //判断商品标识不能为空 - if(StringUtils.isBlank(shopId)){ - return Result.error("商品标识不能为空"); - } - //判断数量不能为空 - if(num == null){ - return Result.error("数量不能为空"); - } - //判断数量不能为空 - if(num < 1){ - return Result.error("购买数量不能小于1"); - } - - //查询当前商品信息 - PayShop byId = payShopService.getById(shopId); - - //创建支付订单 - PayOrder order = new PayOrder(); - order.setCreateTime(new Date()); - order.setPrice(byId.getPrice().multiply(new BigDecimal(num))); - order.setNum(num); - order.setUserId(hanHaiMember.getId()); - order.setTitle(byId.getTitle()+"购买"); - payOrderService.save(order); - - - //吊起微信支付 - String s = new BigDecimal(0.01).multiply(new BigDecimal(100)).toString(); - int i1 = Double.valueOf(s).intValue(); - Object appOrder = mpWxPayService.createOrderPay( - "购买"+order.getTitle() , - "127.0.0.1", - order.getId(), - i1, - order.getId(), - hanHaiMember.getAppletOpenid(), - order.toString()); - - - - return Result.OK("订单创建成功",appOrder); - } - - - - - - @Resource - private IShcoolSubService shcoolSubService; - - //增加报修单 - @Override - public Result addSchoolOrder(ShcoolSub bean){ - shcoolSubService.save(bean); - return Result.OK("增加成功"); - } - - //驳回 - @Override - public Result editSchoolOrderError(ShcoolSub bean){ - if(StringUtils.isBlank(bean.getId())){ - return Result.error("订单标识不能为空"); - } - shcoolSubService.updateById(bean); - return Result.OK("驳回成功"); - } - - //结单 - @Override - public Result editSchoolOrderSuccess(ShcoolSub bean){ - if(StringUtils.isBlank(bean.getId())){ - return Result.error("订单标识不能为空"); - } - shcoolSubService.updateById(bean); - return Result.OK("结单成功"); - } - - - //列表 - @Override - public Result getSchoolOrderPage(String state,WaterPageBean bean){ - Page page = new Page(bean.getPageNo(), bean.getPageSize()); - Page pageList = shcoolSubService - .lambdaQuery() - .orderByDesc(ShcoolSub::getCreateTime) - .page(page); - - if(StringUtils.isNotBlank(state)){ - pageList = shcoolSubService - .lambdaQuery() - .orderByDesc(ShcoolSub::getCreateTime) - .eq(ShcoolSub::getState,state) - .page(page); - } - return Result.OK("订单列表",pageList); - } - - - - //支付回调 - @Override - public Object createNotify(String requestBody){ - WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); - - String outTradeNo = notify.getOutTradeNo(); - - //开始处理业务逻辑 - PayOrder byId = payOrderService.getById(outTradeNo); - - if(byId!=null){ - if(byId.getState() != 1){ - payOrderService.lambdaUpdate() - .set(PayOrder::getState,1) - .eq(PayOrder::getId,outTradeNo) - .update(); - - } - } - return null; - } - - - - //获取楼栋 - @Override - public Result getFloorList(){ - List list = shcoolFloorService - .lambdaQuery() - .isNull(ShcoolFloor::getPid) - .orderByDesc(ShcoolFloor::getSort) - .list(); - return Result.OK("楼栋列表",list); - } - - - //获取室号 - @Override - public Result getRoomList(String floorId){ - List list = shcoolFloorService - .lambdaQuery() - .eq(ShcoolFloor::getPid, floorId) - .orderByDesc(ShcoolFloor::getSort) - .list(); - return Result.OK("楼栋列表",list); - } - - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index 4fe90c4..a1a5df0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -6,20 +6,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.RedisUtil; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.*; -import org.jeecg.modules.apiUtils.printUtil; import org.jeecg.modules.apiservice.InfoApiService; -import org.jeecg.modules.atPerformer.entity.AtPerformer; -import org.jeecg.modules.atPerformer.service.IAtPerformerService; import org.jeecg.modules.atPromotion.entity.AtPromotion; import org.jeecg.modules.atPromotion.service.IAtPromotionService; import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; -import org.jeecg.modules.cheerConf.entity.CheerConf; -import org.jeecg.modules.cheerConf.service.ICheerConfService; -import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; -import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService; -import org.jeecg.modules.cheerWater.entity.CheerWater; -import org.jeecg.modules.cheerWater.service.ICheerWaterService; import org.jeecg.modules.hanHaiBank.entity.HanHaiBank; import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; @@ -71,16 +62,6 @@ public class InfoApiServiceImpl implements InfoApiService { private IAtTrendsService atTrendsService; - - - - //加油小程序 - @Resource - private ICheerWaterService cheerWaterService; - @Resource - private ICheerConfService cheerConfService; - @Resource - private ICheerRechargeService cheerRechargeService; //支付接口 @Autowired private MpWxPayService mpWxPayService; @@ -346,143 +327,4 @@ public class InfoApiServiceImpl implements InfoApiService { } - - - - /********************************************************************************************/ - /**************************************加油小程序相关*****************************************/ - - //加油小程序-获取订单流水信息 - @Override - public Result getOrderWaterPage(String token, OrderWaterPageBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - Page page = new Page(bean.getPageNo(), bean.getPageSize()); - Page page1 = cheerWaterService.lambdaQuery() - .eq(CheerWater::getUserId, hanHaiMember.getId()) - .eq(CheerWater::getState, "1") - .orderByDesc(CheerWater::getCreateTime) - .page(page); - - return Result.OK("加油流水",page1); - } - - - //加油小程序-用户输入支付创建支付订单并且支付 - @Override - public Result createOrderPay(String token, OrderPayBean bean){ - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //判断输入金额是否为空 - if(bean.getMoney() == null){ - return Result.error("支付金额不能为空"); - } - //查询当前折扣 - CheerConf one = cheerConfService.lambdaQuery() - .eq(CheerConf::getKeyValue, "preferential") - .one(); - //判断折扣是否为空 - if(one == null){ - return Result.error("当前没有折扣"); - } - //得到折扣值转为BigDecimal类型 - BigDecimal discount = new BigDecimal(one.getKeyCentent()); - if(bean.getMoney().compareTo(new BigDecimal(0)) == 0){ - return Result.error("支付金额不能为0"); - } - if(bean.getMoney().compareTo(new BigDecimal(0)) == -1){ - return Result.error("支付金额不能为负数"); - } - BigDecimal oldMoney = bean.getMoney(); - //支付金额乘折扣保留两位小数 - BigDecimal money = bean.getMoney().multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP); - - //创建订单流水 - CheerWater cheerWater = new CheerWater(); - cheerWater.setUserId(hanHaiMember.getId()); - cheerWater.setOldPrice(oldMoney); - cheerWater.setPrice(money); - cheerWater.setState("0"); - cheerWater.setCreateTime(new Date()); - cheerWaterService.save(cheerWater); - - - - //吊起微信支付 - String s = bean.getMoney().multiply(new BigDecimal(100)).toString(); - int i1 = Double.valueOf(s).intValue(); - Object appOrder = mpWxPayService.createOrderGo( - "购买"+cheerWater.getName() , - "127.0.0.1", - cheerWater.getId(), - i1, - cheerWater.getId(), - hanHaiMember.getAppletOpenid(), - cheerWater.toString()); - - - - return Result.OK("支付成功",appOrder); - } - - - - - - - - - - - //获取充值套餐列表 - @Override - public Result getRechargePage(OrderRechargeBean bean) { - Page page = new Page<>(bean.getPageNo(),bean.getPageSize()); - Page page1 = cheerRechargeService - .lambdaQuery() - .orderByDesc(CheerRecharge::getCreateTime) - .page(page); - - return Result.OK("充值套餐",page1); - } - - //获取配置信息：折扣、客户电话、客户微信 - @Override - public Result getConfig(String keyValue) { - - CheerConf one = cheerConfService.lambdaQuery() - .eq(CheerConf::getKeyValue, keyValue) - .one(); - return Result.OK("配置信息", one); - } - - - - //支付回调 - @Override - public Object createNotify(String requestBody){ - WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); - - String outTradeNo = notify.getOutTradeNo(); - - //开始处理业务逻辑 - CheerWater byId = cheerWaterService.getById(outTradeNo); - - if(byId!=null){ - if(!byId.getState().equals("1")){ - cheerWaterService.lambdaUpdate() - .set(CheerWater::getState,"1") - .eq(CheerWater::getId,outTradeNo) - .update(); - - - //拼接打印信息 - String content = printUtil.spellMessage(); - - //客户要求打印两次 - printUtil.printBill(content); - printUtil.printBill(content); - } - } - return null; - } - } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java index 2518231..dfda590 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/LoginApiServiceImpl.java @@ -3,25 +3,16 @@ package org.jeecg.modules.apiservice.impl; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiservice.LoginApiService; import org.jeecg.modules.bean.LoginReq; -import org.jeecg.modules.cheerConf.entity.CheerConf; -import org.jeecg.modules.cheerConf.service.ICheerConfService; -import org.jeecg.modules.cheerRecharge.entity.CheerRecharge; -import org.jeecg.modules.cheerRecharge.service.ICheerRechargeService; import org.jeecg.modules.service.AppletLoginService; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.List; @Service public class LoginApiServiceImpl implements LoginApiService { @Resource private AppletLoginService appletLoginService; - @Resource - private ICheerConfService cheerConfService; - @Resource - private ICheerRechargeService cheerRechargeService; //小程序-登录接口 @Override @@ -47,51 +38,4 @@ public class LoginApiServiceImpl implements LoginApiService { return Result.OK("隐私政策"); } - - //获取联系电话 - @Override - public Result getPhone(){ - CheerConf one = cheerConfService.lambdaQuery() - .eq(CheerConf::getKeyValue, "phone") - .one(); - - return Result.OK("电话",one.getKeyCentent()); - } - - //获取联系微信 - @Override - public Result getWechat(){ - CheerConf one = cheerConfService.lambdaQuery() - .eq(CheerConf::getKeyValue, "wx") - .one(); - - return Result.OK("微信",one.getKeyCentent()); - } - - //获取折扣 - @Override - public Result getDiscount(){ - CheerConf one = cheerConfService.lambdaQuery() - .eq(CheerConf::getKeyValue, "preferential") - .one(); - - return Result.OK("折扣",one.getKeyCentent()); - } - - - //获取套餐列表 - @Override - public Result getPackageList(){ - List list = cheerRechargeService.lambdaQuery() - .orderByDesc(CheerRecharge::getCreateTime) - .list(); - return Result.OK("套餐列表",list); - } - - - - - - - }