diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java new file mode 100644 index 000000000..dd3893bce --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java @@ -0,0 +1,99 @@ +package com.jsowell.web.controller.pile; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.jsowell.pile.service.OrderPileOccupyService; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.jsowell.common.annotation.Log; +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.enums.BusinessType; +import com.jsowell.pile.domain.OrderPileOccupy; +import com.jsowell.common.util.poi.ExcelUtil; +import com.jsowell.common.core.page.TableDataInfo; + +/** + * 占桩订单Controller + * + * @author jsowell + * @date 2023-09-08 + */ +@RestController +@RequestMapping("/pile/occupy") +public class OrderPileOccupyController extends BaseController { + @Autowired + private OrderPileOccupyService orderPileOccupyService; + + /** + * 查询占桩订单列表 + */ + @PreAuthorize("@ss.hasPermi('pile:occupy:list')") + @GetMapping("/list") + public TableDataInfo list(OrderPileOccupy orderPileOccupy) { + startPage(); + List list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy); + return getDataTable(list); + } + + /** + * 导出占桩订单列表 + */ + @PreAuthorize("@ss.hasPermi('pile:occupy:export')") + @Log(title = "占桩订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, OrderPileOccupy orderPileOccupy) { + List list = orderPileOccupyService.selectOrderPileOccupyList(orderPileOccupy); + ExcelUtil util = new ExcelUtil(OrderPileOccupy.class); + util.exportExcel(response, list, "占桩订单数据"); + } + + /** + * 获取占桩订单详细信息 + */ + @PreAuthorize("@ss.hasPermi('pile:occupy:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(orderPileOccupyService.selectByPrimaryKey(id.intValue())); + } + + /** + * 新增占桩订单 + */ + @PreAuthorize("@ss.hasPermi('pile:occupy:add')") + @Log(title = "占桩订单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody OrderPileOccupy orderPileOccupy) { + return toAjax(orderPileOccupyService.insert(orderPileOccupy)); + } + + /** + * 修改占桩订单 + */ + @PreAuthorize("@ss.hasPermi('pile:occupy:edit')") + @Log(title = "占桩订单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody OrderPileOccupy orderPileOccupy) { + return toAjax(orderPileOccupyService.updateByPrimaryKey(orderPileOccupy)); + } + + /** + * 删除占桩订单 + */ + // @PreAuthorize("@ss.hasPermi('pile:occupy:remove')") + // @Log(title = "占桩订单", businessType = BusinessType.DELETE) + // @DeleteMapping("/{ids}") + // public AjaxResult remove(@PathVariable Long[] ids) + // { + // return toAjax(orderPileOccupyService.deleteByPrimaryKey(ids)); + // } +} diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 7224b24b0..cde272340 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -38,8 +38,8 @@ spring: master: url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: jsowell_dev - #url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - #username: jsowell_prd_copy +# url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_prd_copy password: 123456 # 从库数据源 slave: diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java index 31b65527d..5ba7307c3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java @@ -113,4 +113,13 @@ public interface OrderPileOccupyMapper { * @return */ OrderPileOccupy queryUnPayOrderByMemberId(String memberId); + + + /** + * 查询占桩订单列表 + * + * @param orderPileOccupy 占桩订单 + * @return 占桩订单集合 + */ + public List selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java index 8bea21157..5c3ad9bd7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java @@ -37,6 +37,14 @@ public interface OrderPileOccupyService{ OrderPileOccupy queryByOccupyCode(String occupyCode); + /** + * 查询占桩订单列表 + * + * @param orderPileOccupy 占桩订单 + * @return 占桩订单集合 + */ + public List selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy); + List queryOccupyOrderList(QueryOccupyOrderDTO dto); /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index af1b12e4c..ae705d449 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -139,6 +139,11 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { return orderPileOccupyMapper.queryByOccupyCode(occupyCode); } + @Override + public List selectOrderPileOccupyList(OrderPileOccupy orderPileOccupy) { + return orderPileOccupyMapper.selectOrderPileOccupyList(orderPileOccupy); + } + /** * 查询占桩订单列表 * diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index 4b00fdaa2..934bef39b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -905,4 +905,25 @@ order by create_time desc limit 1 + + \ No newline at end of file diff --git a/jsowell-ui/src/api/pile/occupy.js b/jsowell-ui/src/api/pile/occupy.js new file mode 100644 index 000000000..792bc8b76 --- /dev/null +++ b/jsowell-ui/src/api/pile/occupy.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询占桩订单列表 +export function listOccupy(query) { + return request({ + url: '/pile/occupy/list', + method: 'get', + params: query + }) +} + +// 查询占桩订单详细 +export function getOccupy(id) { + return request({ + url: '/pile/occupy/' + id, + method: 'get' + }) +} + +// 新增占桩订单 +export function addOccupy(data) { + return request({ + url: '/pile/occupy', + method: 'post', + data: data + }) +} + +// 修改占桩订单 +export function updateOccupy(data) { + return request({ + url: '/pile/occupy', + method: 'put', + data: data + }) +} + +// 删除占桩订单 +export function delOccupy(id) { + return request({ + url: '/pile/occupy/' + id, + method: 'delete' + }) +} diff --git a/jsowell-ui/src/router/index.js b/jsowell-ui/src/router/index.js index 25ccbde48..92f300f7c 100644 --- a/jsowell-ui/src/router/index.js +++ b/jsowell-ui/src/router/index.js @@ -68,7 +68,7 @@ export const constantRoutes = [ children: [ { path: "index", - component: () => import("@/views/index"), + component: () => import("@/views/pile/occupy"), name: "Index", meta: { title: "首页", icon: "dashboard", affix: true }, }, diff --git a/jsowell-ui/src/views/index.vue b/jsowell-ui/src/views/index.vue deleted file mode 100644 index 769c0c646..000000000 --- a/jsowell-ui/src/views/index.vue +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - diff --git a/jsowell-ui/src/views/pile/occupy/index.vue b/jsowell-ui/src/views/pile/occupy/index.vue new file mode 100644 index 000000000..4d1607b2b --- /dev/null +++ b/jsowell-ui/src/views/pile/occupy/index.vue @@ -0,0 +1,423 @@ + + +