迁移

qmjszx-admin/src/main/java/beilv/web/controller/system/SysNoticeAppController.java

@@ -20,93 +20,15 @@ import beilv.system.service.ISysNoticeService;
  * 
  * @author ruoyi
  */
-@Controller
+@RestController
 @RequestMapping("/app-api/notice")
 public class SysNoticeAppController extends BaseController
 {
-    private String prefix = "/notice";
+    private String prefix = "app-api/notice";
 
     @Autowired
     private ISysNoticeService noticeService;
 
-    @RequiresPermissions("system:notice:view")
-    @GetMapping()
-    public String notice()
-    {
-        return prefix + "/notice";
-    }
-
-    /**
-     * 查询公告列表
-     */
-    @RequiresPermissions("system:notice:list")
-    @PostMapping("/list")
-    @ResponseBody
-    public TableDataInfo list(SysNotice notice)
-    {
-        startPage();
-        List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 新增公告
-     */
-    @RequiresPermissions("system:notice:add")
-    @GetMapping("/add")
-    public String add()
-    {
-        return prefix + "/add";
-    }
-
-    /**
-     * 新增保存公告
-     */
-    @RequiresPermissions("system:notice:add")
-    @Log(title = "通知公告", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    @ResponseBody
-    public AjaxResult addSave(@Validated SysNotice notice)
-    {
-        notice.setCreateBy(getLoginName());
-        return toAjax(noticeService.insertNotice(notice));
-    }
-
-    /**
-     * 修改公告
-     */
-    @RequiresPermissions("system:notice:edit")
-    @GetMapping("/edit/{noticeId}")
-    public String edit(@PathVariable("noticeId") Long noticeId, ModelMap mmap)
-    {
-        mmap.put("notice", noticeService.selectNoticeById(noticeId));
-        return prefix + "/edit";
-    }
-
-    /**
-     * 修改保存公告
-     */
-    @RequiresPermissions("system:notice:edit")
-    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    @ResponseBody
-    public AjaxResult editSave(@Validated SysNotice notice)
-    {
-        notice.setUpdateBy(getLoginName());
-        return toAjax(noticeService.updateNotice(notice));
-    }
-
-    /**
-     * 查询公告详细
-     */
-    @RequiresPermissions("system:notice:list")
-    @GetMapping("/view/{noticeId}")
-    public String view(@PathVariable("noticeId") Long noticeId, ModelMap mmap)
-    {
-        mmap.put("notice", noticeService.selectNoticeById(noticeId));
-        return prefix + "/view";
-    }
     /**
      * 小程序查询公告详细
      */
@@ -116,19 +38,6 @@ public class SysNoticeAppController extends BaseController
     }
 
     /**
-     * 删除公告
-     */
-    @RequiresPermissions("system:notice:remove")
-    @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @PostMapping("/remove")
-    @ResponseBody
-    public AjaxResult remove(String ids)
-    {
-        return toAjax(noticeService.deleteNoticeByIds(ids));
-    }
-
-
-    /**
      * 小程序获取通知公告列表
      */
     @GetMapping("/appList")

qmjszx-admin/src/main/java/beilv/web/controller/system/SysNoticeController.java

@@ -49,7 +49,6 @@ public class SysNoticeController extends BaseController
         return getDataTable(list);
     }
 
-
     /**
      * 新增公告
      */
@@ -107,13 +106,6 @@ public class SysNoticeController extends BaseController
         mmap.put("notice", noticeService.selectNoticeById(noticeId));
         return prefix + "/view";
     }
-    /**
-     * 小程序查询公告详细
-     */
-    @GetMapping(value = "/{noticeId}")
-    public AjaxResult getInfo(@PathVariable Long noticeId) {
-        return success(noticeService.selectNoticeById(noticeId));
-    }
 
     /**
      * 删除公告
@@ -127,15 +119,4 @@ public class SysNoticeController extends BaseController
         return toAjax(noticeService.deleteNoticeByIds(ids));
     }
 
-
-    /**
-     * 小程序获取通知公告列表
-     */
-    @GetMapping("/appList")
-    public TableDataInfo appList(SysNotice notice)
-    {
-        startPage();
-        List<SysNotice> list = noticeService.selectNoticeListApp(notice);
-        return getDataTable(list);
-    }
 }

qmjszx-admin/src/main/java/beilv/web/controller/system/QmjsShoppingMallController.java

@@ -1,4 +1,4 @@
-package beilv.web.controller.system;
+package beilv.shopping.controller;
 
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import beilv.common.annotation.Log;
 import beilv.common.enums.BusinessType;
-import beilv.system.domain.QmjsShoppingMall;
-import beilv.system.service.IQmjsShoppingMallService;
+import beilv.shopping.domain.QmjsShoppingMall;
+import beilv.shopping.service.IQmjsShoppingMallService;
 import beilv.common.core.controller.BaseController;
 import beilv.common.core.domain.AjaxResult;
 import beilv.common.utils.poi.ExcelUtil;

qmjszx-system/src/main/java/beilv/system/domain/QmjsShoppingMall.java

@@ -1,4 +1,4 @@
-package beilv.system.domain;
+package beilv.shopping.domain;
 
 import java.math.BigDecimal;
 import org.apache.commons.lang3.builder.ToStringBuilder;

qmjszx-system/src/main/java/beilv/system/mapper/QmjsShoppingMallMapper.java

@@ -1,7 +1,9 @@
-package beilv.system.mapper;
+package beilv.shopping.mapper;
+
+import beilv.shopping.domain.QmjsShoppingMall;
 
 import java.util.List;
-import beilv.system.domain.QmjsShoppingMall;
+
 
 /**
  * 商城Mapper接口

qmjszx-system/src/main/java/beilv/system/service/IQmjsShoppingMallService.java

@@ -1,7 +1,9 @@
-package beilv.system.service;
+package beilv.shopping.service;
+
+import beilv.shopping.domain.QmjsShoppingMall;
 
 import java.util.List;
-import beilv.system.domain.QmjsShoppingMall;
+
 
 /**
  * 商城Service接口

qmjszx-system/src/main/java/beilv/system/service/impl/QmjsShoppingMallServiceImpl.java

@@ -1,11 +1,13 @@
-package beilv.system.service.impl;
+package beilv.shopping.service.impl;
 
 import java.util.List;
+
+import beilv.shopping.domain.QmjsShoppingMall;
+import beilv.shopping.mapper.QmjsShoppingMallMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import beilv.system.mapper.QmjsShoppingMallMapper;
-import beilv.system.domain.QmjsShoppingMall;
-import beilv.system.service.IQmjsShoppingMallService;
+
+import beilv.shopping.service.IQmjsShoppingMallService;
 import beilv.common.core.text.Convert;
 
 /**

qmjszx-admin/src/main/java/beilv/web/controller/system/SysUserBillController.java

@@ -1,4 +1,4 @@
-package beilv.web.controller.system;
+package beilv.userbill.controller;
 
 import beilv.common.annotation.Log;
 import beilv.common.core.controller.BaseController;
@@ -6,8 +6,8 @@ import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.page.TableDataInfo;
 import beilv.common.enums.BusinessType;
 import beilv.common.utils.poi.ExcelUtil;
-import beilv.system.domain.SysUserBill;
-import beilv.system.service.ISysUserBillService;
+import beilv.userbill.domain.SysUserBill;
+import beilv.userbill.service.ISysUserBillService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

qmjszx-system/src/main/java/beilv/system/domain/SysUserBill.java

@@ -1,4 +1,4 @@
-package beilv.system.domain;
+package beilv.userbill.domain;
 
 import beilv.common.annotation.Excel;
 import beilv.common.core.domain.BaseEntity;

qmjszx-system/src/main/java/beilv/system/mapper/SysUserBillMapper.java

@@ -1,8 +1,10 @@
-package beilv.system.mapper;
+package beilv.userbill.mapper;
+
+import beilv.userbill.domain.SysUserBill;
 
 import java.math.BigDecimal;
 import java.util.List;
-import beilv.system.domain.SysUserBill;
+
 
 /**
  * 用户积分流水Mapper接口

qmjszx-system/src/main/java/beilv/system/service/ISysUserBillService.java

@@ -1,6 +1,8 @@
-package beilv.system.service;
+package beilv.userbill.service;
 
-import beilv.system.domain.SysUserBill;
+
+
+import beilv.userbill.domain.SysUserBill;
 
 import java.math.BigDecimal;
 import java.util.List;

qmjszx-system/src/main/java/beilv/system/service/impl/SysUserBillServiceImpl.java

@@ -1,10 +1,10 @@
-package beilv.system.service.impl;
+package beilv.userbill.service.impl;
 
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
-import beilv.system.domain.SysUserBill;
-import beilv.system.mapper.SysUserBillMapper;
-import beilv.system.service.ISysUserBillService;
+import beilv.userbill.domain.SysUserBill;
+import beilv.userbill.mapper.SysUserBillMapper;
+import beilv.userbill.service.ISysUserBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

qmjszx-system/src/main/resources/mapper/system/QmjsShoppingMallMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="beilv.system.mapper.QmjsShoppingMallMapper">
+<mapper namespace="beilv.shopping.mapper.QmjsShoppingMallMapper">
     
     <resultMap type="QmjsShoppingMall" id="QmjsShoppingMallResult">
         <result property="id"    column="id"    />

qmjszx-system/src/main/resources/mapper/system/SysUserBillMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="beilv.system.mapper.SysUserBillMapper">
+<mapper namespace="beilv.userbill.mapper.SysUserBillMapper">
 
     <resultMap type="SysUserBill" id="SysUserBillResult">
         <result property="id" column="id"/>