From 95d317016c4f865851fb327816f49a5329e8d098 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 16 八月 2024 10:59:18 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/strategy/circleRule/index.vue | 244 ++++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CircleRule.java | 227 +++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CircleRuleServiceImpl.java | 39 ++
zy-asrs-wms/src/main/resources/sql/menu/circleRule.sql | 9
zy-asrs-wms/src/main/resources/mapper/asrs/CircleRuleMapper.xml | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CircleRuleController.java | 102 ++++++
zy-asrs-admin/src/views/strategy/circleRule/edit.vue | 211 ++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CircleRuleMapper.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/CircleRuleService.java | 12
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/CircleRuleType.java | 17 +
10 files changed, 878 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-admin/src/views/strategy/circleRule/edit.vue b/zy-asrs-admin/src/views/strategy/circleRule/edit.vue
new file mode 100644
index 0000000..9eb9277
--- /dev/null
+++ b/zy-asrs-admin/src/views/strategy/circleRule/edit.vue
@@ -0,0 +1,211 @@
+<script setup>
+import { ref, nextTick } from 'vue';
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
+
+const formTable = ref(null);
+const submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+
+const emit = defineEmits(['tableReload'])
+
+const handleOk = (e) => {
+ nextTick(() => {
+ setTimeout(() => {
+ submitButton.value.$el.click();
+ }, 100);
+ });
+};
+
+const onFinish = values => {
+ // console.log('Success:', values);
+ open.value = false;
+ post(isSave.value ? '/api/circleRule/save' : '/api/circleRule/update', formData.value).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
+ emit('tableReload', 'reload')
+ nextTick(() => {
+ formTable.value.resetFields()
+ })
+ })
+};
+const onFinishFailed = errorInfo => {
+ console.log('Failed:', errorInfo);
+};
+
+const userQueryList = ref(null);
+userQuery();
+function userQuery() {
+ postForm('/api/user/query', {}).then(resp => {
+ let result = resp.data;
+ userQueryList.value = result.data;
+ })
+}
+
+
+defineExpose({
+ open,
+ formData,
+ initFormData,
+ isSave,
+})
+
+</script>
+
+<script>
+export default {
+ name: '寰幆绛栫暐-edit'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open"
+ :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
+ style="width: 600px;">
+ <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
+ style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
+ @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.name', '鍚嶇О') "
+ name="name"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.name"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.flag', '鏍囪瘑') "
+ name="flag"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.flag"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.current_value', '褰撳墠鍊�') "
+ name="currentValue"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.currentValue"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.start_value', '璧峰鍊�') "
+ name="startValue"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.startValue"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.target_value', '缁撴潫鍊�') "
+ name="targetValue"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.targetValue"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.status', '鐘舵��') "
+ name="status"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.status"
+ :options="[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.create_time', '娣诲姞鏃堕棿') "
+ name="createTime"
+ style="width: 250px;"
+ >
+ <a-date-picker
+ v-model:value="formData.createTime"
+ show-time
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.create_by', '娣诲姞浜哄憳') "
+ name="createBy"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.createBy"
+ :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%"
+ show-search
+ :options="userQueryList"
+ optionFilterProp="label"
+ optionLabelProp="label"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.update_time', '淇敼鏃堕棿') "
+ name="updateTime"
+ style="width: 250px;"
+ >
+ <a-date-picker
+ v-model:value="formData.updateTime"
+ show-time
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ />
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.update_by', '淇敼浜哄憳') "
+ name="updateBy"
+ style="width: 250px;"
+ >
+ <a-select
+ v-model:value="formData.updateBy"
+ :placeholder="formatMessage('common.select', '璇烽�夋嫨')"
+ style="width: 100%"
+ show-search
+ :options="userQueryList"
+ optionFilterProp="label"
+ optionLabelProp="label"
+ >
+ </a-select>
+ </a-form-item>
+ <a-form-item
+ :label="formatMessage('db.strategy_circle_rule.memo', '澶囨敞') "
+ name="memo"
+ style="width: 250px;"
+ >
+ <a-input
+ v-model:value="formData.memo"
+ />
+ </a-form-item>
+
+ <a-form-item>
+ <a-button type="primary" html-type="submit" ref="submitButton"
+ style="visibility: hidden;">Submit</a-button>
+ </a-form-item>
+ </a-form>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/strategy/circleRule/index.vue b/zy-asrs-admin/src/views/strategy/circleRule/index.vue
new file mode 100644
index 0000000..19d4d06
--- /dev/null
+++ b/zy-asrs-admin/src/views/strategy/circleRule/index.vue
@@ -0,0 +1,244 @@
+<script setup>
+import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import EditView from './edit.vue'
+import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-circleRule';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+let tableData = ref([]);
+getPage();
+
+const {
+ getColumnSearchProps,
+ handleResizeColumn,
+} = useTableSearch();
+
+const columns = [
+ {
+ title: formatMessage('db.strategy_circle_rule.name', '鍚嶇О'),
+ dataIndex: 'name',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('name'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.flag', '鏍囪瘑'),
+ dataIndex: 'flag',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('flag'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.current_value', '褰撳墠鍊�'),
+ dataIndex: 'currentValue',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('currentValue'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.start_value', '璧峰鍊�'),
+ dataIndex: 'startValue',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('startValue'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.target_value', '缁撴潫鍊�'),
+ dataIndex: 'targetValue',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('targetValue'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.strategy_circle_rule.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
+
+ {
+ title: formatMessage('common.operation', '鎿嶄綔'),
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ width: 140,
+ fixed: 'right',
+ },
+];
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+const hasSelected = computed(() => state.selectedRowKeys.length > 0);
+const start = () => {
+ state.loading = true;
+ // ajax request after empty completing
+ setTimeout(() => {
+ state.loading = false;
+ state.selectedRowKeys = [];
+ }, 1000);
+};
+const onSelectChange = selectedRowKeys => {
+ // console.log('selectedRowKeys changed: ', selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+};
+
+function getPage() {
+ post('/api/circleRule/page', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ tableData.value = data;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleEdit = (item) => {
+ editChild.value.open = true;
+ editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
+ editChild.value.isSave = item == null;
+}
+
+const handleDel = (rows) => {
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
+ try {
+ post('/api/circleRule/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ hide()
+ })
+ } catch (error) {
+ message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
+ }
+ },
+ });
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/circleRule/export', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+};
+
+const onSearch = () => {
+ // console.log('search');
+ getPage()
+}
+
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
+function handleTableReload(value) {
+ getPage()
+}
+
+</script>
+
+<script>
+export default {
+ name: '寰幆绛栫暐'
+}
+</script>
+
+<template>
+ <div>
+ <EditView ref="editChild" @tableReload="handleTableReload" />
+ <div class="table-header">
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ <div class="table-header-right">
+ <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div>
+ </div>
+ <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
+ <template #bodyCell="{ column, text, record }">
+ <template v-if="column.dataIndex === 'oper'">
+ <div style="display: flex;justify-content: space-evenly;">
+ <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
+ <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
+ }}</a-button>
+ </div>
+ </template>
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CircleRuleController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CircleRuleController.java
new file mode 100644
index 0000000..2071c42
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/CircleRuleController.java
@@ -0,0 +1,102 @@
+package com.zy.asrs.wms.asrs.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.common.annotation.OperationLog;
+import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.common.domain.KeyValVo;
+import com.zy.asrs.wms.common.domain.PageParam;
+import com.zy.asrs.wms.asrs.entity.CircleRule;
+import com.zy.asrs.wms.asrs.service.CircleRuleService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class CircleRuleController extends BaseController {
+
+ @Autowired
+ private CircleRuleService circleRuleService;
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:list')")
+ @PostMapping("/circleRule/page")
+ public R page(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<CircleRule, BaseParam> pageParam = new PageParam<>(baseParam, CircleRule.class);
+ return R.ok().add(circleRuleService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:list')")
+ @PostMapping("/circleRule/list")
+ public R list(@RequestBody Map<String, Object> map) {
+ return R.ok().add(circleRuleService.list());
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:list')")
+ @GetMapping("/circleRule/{id}")
+ public R get(@PathVariable("id") Long id) {
+ return R.ok().add(circleRuleService.getById(id));
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:save')")
+ @OperationLog("娣诲姞寰幆绛栫暐")
+ @PostMapping("/circleRule/save")
+ public R save(@RequestBody CircleRule circleRule) {
+ if (!circleRuleService.save(circleRule)) {
+ return R.error("娣诲姞澶辫触");
+ }
+ return R.ok("娣诲姞鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:update')")
+ @OperationLog("淇敼寰幆绛栫暐")
+ @PostMapping("/circleRule/update")
+ public R update(@RequestBody CircleRule circleRule) {
+ if (!circleRuleService.updateById(circleRule)) {
+ return R.error("淇敼澶辫触");
+ }
+ return R.ok("淇敼鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:remove')")
+ @OperationLog("鍒犻櫎寰幆绛栫暐")
+ @PostMapping("/circleRule/remove/{ids}")
+ public R remove(@PathVariable Long[] ids) {
+ if (!circleRuleService.removeByIds(Arrays.asList(ids))) {
+ return R.error("鍒犻櫎澶辫触");
+ }
+ return R.ok("鍒犻櫎鎴愬姛");
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:list')")
+ @PostMapping("/circleRule/query")
+ public R query(@RequestParam(required = false) String condition) {
+ List<KeyValVo> vos = new ArrayList<>();
+ LambdaQueryWrapper<CircleRule> wrapper = new LambdaQueryWrapper<>();
+ if (!Cools.isEmpty(condition)) {
+ wrapper.like(CircleRule::getName, condition);
+ }
+ circleRuleService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
+ item -> vos.add(new KeyValVo(item.getId(), item.getName()))
+ );
+ return R.ok().add(vos);
+ }
+
+ @PreAuthorize("hasAuthority('asrs:circleRule:list')")
+ @PostMapping("/circleRule/export")
+ public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ ExcelUtil.build(ExcelUtil.create(circleRuleService.list(), CircleRule.class), response);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CircleRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CircleRule.java
new file mode 100644
index 0000000..9d21733
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CircleRule.java
@@ -0,0 +1,227 @@
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+import com.zy.asrs.common.utils.Synchro;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("strategy_circle_rule")
+public class CircleRule implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ private String name;
+
+ /**
+ * 鏍囪瘑
+ */
+ @ApiModelProperty(value= "鏍囪瘑")
+ private String flag;
+
+ /**
+ * 褰撳墠鍊�
+ */
+ @ApiModelProperty(value= "褰撳墠鍊�")
+ private Integer currentValue;
+
+ /**
+ * 璧峰鍊�
+ */
+ @ApiModelProperty(value= "璧峰鍊�")
+ private Integer startValue;
+
+ /**
+ * 缁撴潫鍊�
+ */
+ @ApiModelProperty(value= "缁撴潫鍊�")
+ private Integer targetValue;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public CircleRule() {}
+
+ public CircleRule(String name,String flag,Integer currentValue,Integer startValue,Integer targetValue,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.name = name;
+ this.flag = flag;
+ this.currentValue = currentValue;
+ this.startValue = startValue;
+ this.targetValue = targetValue;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// CircleRule circleRule = new CircleRule(
+// null, // 鍚嶇О
+// null, // 鏍囪瘑
+// null, // 褰撳墠鍊�
+// null, // 璧峰鍊�
+// null, // 缁撴潫鍊�
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getHostId$(){
+ HostService service = SpringUtils.getBean(HostService.class);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/CircleRuleType.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/CircleRuleType.java
new file mode 100644
index 0000000..9ca9c45
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/CircleRuleType.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.wms.asrs.entity.enums;
+
+public enum CircleRuleType {
+
+ LEV("lev", "灞傚惊鐜�"),
+ ;
+
+
+ public String flag;
+ public String desc;
+
+ CircleRuleType(String flag, String desc) {
+ this.flag = flag;
+ this.desc = desc;
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CircleRuleMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CircleRuleMapper.java
new file mode 100644
index 0000000..4800660
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/CircleRuleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.mapper;
+
+import com.zy.asrs.wms.asrs.entity.CircleRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface CircleRuleMapper extends BaseMapper<CircleRule> {
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/CircleRuleService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/CircleRuleService.java
new file mode 100644
index 0000000..84776f1
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/CircleRuleService.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.wms.asrs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.asrs.entity.CircleRule;
+
+public interface CircleRuleService extends IService<CircleRule> {
+
+ CircleRule getCircleRuleByFlag(String flag);
+
+ Integer getCurrentValueByFlag(String flag);
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CircleRuleServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CircleRuleServiceImpl.java
new file mode 100644
index 0000000..6e93a17
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/CircleRuleServiceImpl.java
@@ -0,0 +1,39 @@
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.asrs.mapper.CircleRuleMapper;
+import com.zy.asrs.wms.asrs.entity.CircleRule;
+import com.zy.asrs.wms.asrs.service.CircleRuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("circleRuleService")
+public class CircleRuleServiceImpl extends ServiceImpl<CircleRuleMapper, CircleRule> implements CircleRuleService {
+
+ @Override
+ public CircleRule getCircleRuleByFlag(String flag) {
+ return this.getOne(new LambdaQueryWrapper<CircleRule>().eq(CircleRule::getFlag, flag));
+ }
+
+ @Override
+ public Integer getCurrentValueByFlag(String flag) {
+ CircleRule circleRule = this.getOne(new LambdaQueryWrapper<CircleRule>().eq(CircleRule::getFlag, flag));
+ if(circleRule == null){
+ throw new CoolException("寰幆绛栫暐涓嶅瓨鍦�");
+ }
+
+ Integer currentValue = circleRule.getCurrentValue();
+ Integer startValue = circleRule.getStartValue();
+ Integer targetValue = circleRule.getTargetValue();
+ if (currentValue > targetValue) {
+ currentValue = startValue;
+ }else {
+ currentValue += 1;
+ }
+
+ circleRule.setCurrentValue(currentValue);
+ this.updateById(circleRule);
+ return currentValue;
+ }
+}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/CircleRuleMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/CircleRuleMapper.xml
new file mode 100644
index 0000000..5e97f86
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/CircleRuleMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.wms.asrs.mapper.CircleRuleMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/resources/sql/menu/circleRule.sql b/zy-asrs-wms/src/main/resources/sql/menu/circleRule.sql
new file mode 100644
index 0000000..185e92f
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/sql/menu/circleRule.sql
@@ -0,0 +1,9 @@
+-- save circleRule record
+-- mysql
+insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '寰幆绛栫暐绠＄悊', '0', '/asrs/circleRule', '/asrs/circleRule', '0' , '0', '1' , '1');
+
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ寰幆绛栫暐', '', '1', 'asrs:circleRule:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞寰幆绛栫暐', '', '1', 'asrs:circleRule:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼寰幆绛栫暐', '', '1', 'asrs:circleRule:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎寰幆绛栫暐', '', '1', 'asrs:circleRule:remove', '3', '1', '1');
+
--
Gitblit v1.9.1