From 8ccc0a978c5ca641e76eb83e799b2469df8c9fb6 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 21 六月 2024 10:54:01 +0800 Subject: [PATCH] # --- zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/controller/ProjectController.java | 101 ++++++ zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/ProjectService.java | 8 zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/mapper/ProjectMapper.java | 12 zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/utils/CodeBuilder.java | 2 zy-ptc-kernel/src/main/java/project.sql | 9 zy-ptc-kernel/src/main/resources/mapper/manager/ProjectMapper.xml | 5 zy-ptc-flow/src/pages/manager/project/index.jsx | 441 +++++++++++++++++++++++++++ zy-ptc-kernel/src/main/resources/application.yml | 2 zy-ptc-flow/src/pages/manager/project/components/edit.jsx | 154 +++++++++ zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/entity/Project.java | 214 +++++++++++++ zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/impl/ProjectServiceImpl.java | 12 11 files changed, 958 insertions(+), 2 deletions(-) diff --git a/zy-ptc-flow/src/pages/manager/project/components/edit.jsx b/zy-ptc-flow/src/pages/manager/project/components/edit.jsx new file mode 100644 index 0000000..5e0cd3a --- /dev/null +++ b/zy-ptc-flow/src/pages/manager/project/components/edit.jsx @@ -0,0 +1,154 @@ +import React, { useState, useRef, useEffect } from 'react'; +import { + ProForm, + ProFormDigit, + ProFormText, + ProFormSelect, + ProFormDateTimePicker +} from '@ant-design/pro-components'; +import { Form, Modal } from 'antd'; +import { FormattedMessage, useIntl } from '@umijs/max'; +import moment from 'moment'; +import Http from '@/utils/http'; + +const Edit = (props) => { + const intl = useIntl(); + const [form] = Form.useForm(); + const { } = props; + + useEffect(() => { + form.resetFields(); + form.setFieldsValue({ + ...props.values + }) + }, [form, props]) + + const handleCancel = () => { + props.onCancel(); + }; + + const handleOk = () => { + form.submit(); + } + + const handleFinish = async (values) => { + props.onSubmit({ ...values }); + } + + return ( + <> + <Modal + title={ + Object.keys(props.values).length > 0 + ? intl.formatMessage({ id: 'page.edit', defaultMessage: '缂栬緫' }) + : intl.formatMessage({ id: 'page.add', defaultMessage: '娣诲姞' }) + } + width={640} + forceRender + destroyOnClose + open={props.open} + onCancel={handleCancel} + onOk={handleOk} + > + <ProForm + form={form} + submitter={false} + onFinish={handleFinish} + layout="horizontal" + grid={true} + > + <ProFormDigit + name="id" + disabled + hidden={true} + /> + <ProForm.Group> + <ProFormText + name="uuid" + label="缂栧彿" + colProps={{ md: 12, xl: 12 }} + /> + <ProFormText + name="name" + label="鍚嶇О" + colProps={{ md: 12, xl: 12 }} + /> + </ProForm.Group> + <ProForm.Group> + <ProFormText + name="wms" + label="wms" + colProps={{ md: 12, xl: 12 }} + /> + <ProFormText + name="wcs" + label="wcs" + colProps={{ md: 12, xl: 12 }} + /> + </ProForm.Group> + <ProForm.Group> + <ProFormSelect + name="status" + label="鐘舵��" + colProps={{ md: 12, xl: 12 }} + rules={[{ required: true }]} + options={[ + { label: '姝e父', value: 1 }, + { label: '鍐荤粨', value: 0 }, + ]} + /> + <ProFormSelect + name="createBy" + label="娣诲姞浜哄憳" + colProps={{ md: 12, xl: 12 }} + fieldProps={{ precision: 0 }} + showSearch + debounceTime={300} + request={async ({ keyWords }) => { + const resp = await Http.doPostForm('api/user/query', { condition: keyWords }); + return resp.data; + }} + /> + </ProForm.Group> + <ProForm.Group> + <ProFormDateTimePicker + name="createTime" + label="娣诲姞鏃堕棿" + colProps={{ md: 12, xl: 12 }} + rules={[{ required: true }]} + transform={(value) => moment(value).toISOString()} + /> + <ProFormSelect + name="updateBy" + label="淇敼浜哄憳" + colProps={{ md: 12, xl: 12 }} + fieldProps={{ precision: 0 }} + showSearch + debounceTime={300} + request={async ({ keyWords }) => { + const resp = await Http.doPostForm('api/user/query', { condition: keyWords }); + return resp.data; + }} + /> + </ProForm.Group> + <ProForm.Group> + <ProFormDateTimePicker + name="updateTime" + label="淇敼鏃堕棿" + colProps={{ md: 12, xl: 12 }} + transform={(value) => moment(value).toISOString()} + /> + <ProFormText + name="memo" + label="澶囨敞" + colProps={{ md: 12, xl: 12 }} + /> + </ProForm.Group> + + </ProForm> + </Modal> + </> + ) +} + +export default Edit; diff --git a/zy-ptc-flow/src/pages/manager/project/index.jsx b/zy-ptc-flow/src/pages/manager/project/index.jsx new file mode 100644 index 0000000..f493d72 --- /dev/null +++ b/zy-ptc-flow/src/pages/manager/project/index.jsx @@ -0,0 +1,441 @@ + +import React, { useState, useRef, useEffect } from 'react'; +import { Button, message, Modal, Tag } from 'antd'; +import { + FooterToolbar, + PageContainer, + ProTable, + LightFilter, +} from '@ant-design/pro-components'; +import { FormattedMessage, useIntl } from '@umijs/max'; +import { PlusOutlined, ExportOutlined } from '@ant-design/icons'; +import Http from '@/utils/http'; +import Edit from './components/edit' +import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch' +import { statusMap } from '@/utils/enum-util' +import { repairBug } from '@/utils/common-util'; + +const TABLE_KEY = 'pro-table-project'; + +const handleSave = async (val, intl) => { + const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '姝e湪娣诲姞' })); + try { + const resp = await Http.doPost('api/project/save', val); + if (resp.code === 200) { + message.success(intl.formatMessage({ id: 'page.add.success', defaultMessage: '娣诲姞鎴愬姛' })); + return true; + } else { + message.error(resp.msg); + return false; + } + } catch (error) { + message.error(intl.formatMessage({ id: 'page.add.fail', defaultMessage: '娣诲姞澶辫触璇烽噸璇曪紒' })); + return false; + } finally { + hide(); + } +}; + +const handleUpdate = async (val, intl) => { + const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '姝e湪鏇存柊' })); + try { + const resp = await Http.doPost('api/project/update', val); + if (resp.code === 200) { + message.success(intl.formatMessage({ id: 'page.update.success', defaultMessage: '鏇存柊鎴愬姛' })); + return true; + } else { + message.error(resp.msg); + return false; + } + } catch (error) { + message.error(intl.formatMessage({ id: 'page.update.fail', defaultMessage: '鏇存柊澶辫触璇烽噸璇曪紒' })); + return false; + } finally { + hide(); + } +}; + +const handleRemove = async (rows, intl) => { + if (!rows) return true; + const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '姝e湪鍒犻櫎' })); + try { + const resp = await Http.doPost('api/project/remove/' + rows.map((row) => row.id).join(',')); + if (resp.code === 200) { + message.success(intl.formatMessage({ id: 'page.delete.success', defaultMessage: '鍒犻櫎鎴愬姛' })); + return true; + } else { + message.error(resp.msg); + return false; + } + } catch (error) { + message.error(intl.formatMessage({ id: 'page.delete.fail', defaultMessage: '鍒犻櫎澶辫触锛岃閲嶈瘯锛�' })); + return false; + } finally { + hide(); + } +}; + +const handleExport = async (intl) => { + const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '姝e湪瀵煎嚭' })); + try { + const resp = await Http.doPostBlob('api/project/export'); + const blob = new Blob([resp], { type: 'application/vnd.ms-excel' }); + window.location.href = window.URL.createObjectURL(blob); + message.success(intl.formatMessage({ id: 'page.export.success', defaultMessage: '瀵煎嚭鎴愬姛' })); + return true; + } catch (error) { + message.error(intl.formatMessage({ id: 'page.export.fail', defaultMessage: '瀵煎嚭澶辫触锛岃閲嶈瘯' })); + return false; + } finally { + hide(); + } +}; + + +const Main = () => { + const intl = useIntl(); + const formTableRef = useRef(); + const actionRef = useRef(); + const [selectedRows, setSelectedRows] = useState([]); + const [modalVisible, setModalVisible] = useState(false); + const [currentRow, setCurrentRow] = useState(); + const [searchParam, setSearchParam] = useState({}); + + useEffect(() => { + + }, []); + + const columns = [ + { + title: intl.formatMessage({ + id: 'page.table.no', + defaultMessage: 'No' + }), + dataIndex: 'index', + valueType: 'indexBorder', + width: 48, + }, + { + title: '缂栧彿', + dataIndex: 'uuid', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <TextFilter + name='uuid' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: '鍚嶇О', + dataIndex: 'name', + valueType: 'text', + hidden: false, + width: 140, + copyable: true, + filterDropdown: (props) => <TextFilter + name='name' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: 'wms', + dataIndex: 'wms', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <TextFilter + name='wms' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: 'wcs', + dataIndex: 'wcs', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <TextFilter + name='wcs' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: '鐘舵��', + dataIndex: 'status$', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <SelectFilter + name='status' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + data={[ + { label: '姝e父', value: 1 }, + { label: '鍐荤粨', value: 0 }, + ]} + />, + }, + { + title: '娣诲姞浜哄憳', + dataIndex: 'createBy$', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <LinkFilter + name='createBy' + major='user' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: '娣诲姞鏃堕棿', + dataIndex: 'createTime$', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <DatetimeRangeFilter + name='createTime' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: '淇敼浜哄憳', + dataIndex: 'updateBy$', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <LinkFilter + name='updateBy' + major='user' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: '淇敼鏃堕棿', + dataIndex: 'updateTime$', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <DatetimeRangeFilter + name='updateTime' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + { + title: '澶囨敞', + dataIndex: 'memo', + valueType: 'text', + hidden: false, + width: 140, + filterDropdown: (props) => <TextFilter + name='memo' + {...props} + actionRef={actionRef} + setSearchParam={setSearchParam} + />, + }, + + { + title: '鎿嶄綔', + dataIndex: 'option', + width: 140, + valueType: 'option', + render: (_, record) => [ + <Button + type="link" + key="edit" + onClick={() => { + setModalVisible(true); + setCurrentRow(record); + }} + > + <FormattedMessage id='page.edit' defaultMessage='缂栬緫' /> + </Button>, + <Button + type="link" + danger + key="batchRemove" + onClick={async () => { + Modal.confirm({ + title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }), + content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }), + onOk: async () => { + const success = await handleRemove([record], intl); + if (success) { + if (actionRef.current) { + actionRef.current.reload(); + } + } + }, + }); + }} + > + <FormattedMessage id='page.delete' defaultMessage='鍒犻櫎' /> + </Button>, + ], + }, + ]; + + return ( + <PageContainer + header={{ + breadcrumb: {}, + }} + > + <div style={{ width: '100%', float: 'right' }}> + <ProTable + key="project" + rowKey="id" + actionRef={actionRef} + formRef={formTableRef} + columns={columns} + cardBordered + scroll={{ x: 1300 }} + dateFormatter="string" + pagination={{ pageSize: 16 }} + search={false} + toolbar={{ + search: { + onSearch: (value) => { + setSearchParam(prevState => ({ + ...prevState, + condition: value + })); + actionRef.current?.reload(); + }, + }, + filter: ( + <LightFilter + onValuesChange={(val) => { + }} + > + </LightFilter> + ), + actions: [ + <Button + type="primary" + key="save" + onClick={async () => { + setModalVisible(true) + }} + > + <PlusOutlined /> + <FormattedMessage id='page.add' defaultMessage='娣诲姞' /> + </Button>, + <Button + key="export" + onClick={async () => { + handleExport(intl); + }} + > + <ExportOutlined /> + <FormattedMessage id='page.export' defaultMessage='瀵煎嚭' /> + </Button>, + ], + }} + request={(params, sorter, filter) => + Http.doPostPromise('/api/project/page', { ...params, ...searchParam }, (res) => { + return { + data: res.data.records, + total: res.data.total, + success: true, + } + }) + } + rowSelection={{ + onChange: (ids, rows) => { + setSelectedRows(rows); + } + }} + columnsState={{ + persistenceKey: TABLE_KEY, + persistenceType: 'localStorage', + defaultValue: { + // memo: { show: repairBug(TABLE_KEY, 'memo', false) }, + option: { fixed: 'right', disable: true }, + }, + onChange(value) { + }, + }} + /> + </div> + + {selectedRows?.length > 0 && ( + <FooterToolbar + extra={ + <div> + <a style={{ fontWeight: 600 }}>{selectedRows.length}</a> + <FormattedMessage id='page.selected' defaultMessage=' 椤瑰凡閫夋嫨' /> + </div> + } + > + <Button + key="remove" + danger + onClick={async () => { + Modal.confirm({ + title: intl.formatMessage({ id: 'page.delete', defaultMessage: '鍒犻櫎' }), + content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '纭畾鍒犻櫎璇ラ」鍚楋紵' }), + onOk: async () => { + const success = await handleRemove(selectedRows, intl); + if (success) { + setSelectedRows([]); + actionRef.current?.reloadAndRest?.(); + } + }, + }); + }} + > + <FormattedMessage id='page.delete.batch' defaultMessage='鎵归噺鍒犻櫎' /> + </Button> + </FooterToolbar> + )} + + <Edit + open={modalVisible} + values={currentRow || {}} + onCancel={ + () => { + setModalVisible(false); + setCurrentRow(undefined); + } + } + onSubmit={async (values) => { + let ok = false; + if (values.id) { + ok = await handleUpdate({ ...values }, intl) + } else { + ok = await handleSave({ ...values }, intl) + } + if (ok) { + setModalVisible(false); + setCurrentRow(undefined); + if (actionRef.current) { + actionRef.current.reload(); + } + } + }} + /> + </PageContainer> + ); +}; + +export default Main; diff --git a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/controller/ProjectController.java b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/controller/ProjectController.java new file mode 100644 index 0000000..cda162a --- /dev/null +++ b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/controller/ProjectController.java @@ -0,0 +1,101 @@ +package com.zy.ptc.kernel.system.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.ptc.kernel.common.annotation.OperationLog; +import com.zy.ptc.kernel.common.domain.BaseParam; +import com.zy.ptc.kernel.common.domain.KeyValVo; +import com.zy.ptc.kernel.common.domain.PageParam; +import com.zy.ptc.kernel.manager.entity.Project; +import com.zy.ptc.kernel.manager.service.ProjectService; +import com.zy.ptc.kernel.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 ProjectController extends BaseController { + + @Autowired + private ProjectService projectService; + + @PreAuthorize("hasAuthority('manager:project:list')") + @PostMapping("/project/page") + public R page(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<Project, BaseParam> pageParam = new PageParam<>(baseParam, Project.class); + return R.ok().add(projectService.page(pageParam, pageParam.buildWrapper(true))); + } + + @PreAuthorize("hasAuthority('manager:project:list')") + @PostMapping("/project/list") + public R list(@RequestBody Map<String, Object> map) { + return R.ok().add(projectService.list()); + } + + @PreAuthorize("hasAuthority('manager:project:list')") + @GetMapping("/project/{id}") + public R get(@PathVariable("id") Long id) { + return R.ok().add(projectService.getById(id)); + } + + @PreAuthorize("hasAuthority('manager:project:save')") + @OperationLog("娣诲姞椤圭洰绠$悊") + @PostMapping("/project/save") + public R save(@RequestBody Project project) { + if (!projectService.save(project)) { + return R.error("娣诲姞澶辫触"); + } + return R.ok("娣诲姞鎴愬姛"); + } + + @PreAuthorize("hasAuthority('manager:project:update')") + @OperationLog("淇敼椤圭洰绠$悊") + @PostMapping("/project/update") + public R update(@RequestBody Project project) { + if (!projectService.updateById(project)) { + return R.error("淇敼澶辫触"); + } + return R.ok("淇敼鎴愬姛"); + } + + @PreAuthorize("hasAuthority('manager:project:remove')") + @OperationLog("鍒犻櫎椤圭洰绠$悊") + @PostMapping("/project/remove/{ids}") + public R remove(@PathVariable Long[] ids) { + if (!projectService.removeByIds(Arrays.asList(ids))) { + return R.error("鍒犻櫎澶辫触"); + } + return R.ok("鍒犻櫎鎴愬姛"); + } + + @PreAuthorize("hasAuthority('manager:project:list')") + @PostMapping("/project/query") + public R query(@RequestParam(required = false) String condition) { + List<KeyValVo> vos = new ArrayList<>(); + LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>(); + if (!Cools.isEmpty(condition)) { + wrapper.like(Project::getName, condition); + } + projectService.page(new Page<>(1, 30), wrapper).getRecords().forEach( + item -> vos.add(new KeyValVo(item.getId(), item.getName())) + ); + return R.ok().add(vos); + } + + @PreAuthorize("hasAuthority('manager:project:list')") + @PostMapping("/project/export") + public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { + ExcelUtil.build(ExcelUtil.create(projectService.list(), Project.class), response); + } + +} diff --git a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/entity/Project.java b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/entity/Project.java new file mode 100644 index 0000000..c6bd0c9 --- /dev/null +++ b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/entity/Project.java @@ -0,0 +1,214 @@ +package com.zy.ptc.kernel.manager.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.text.SimpleDateFormat; +import java.util.Date; + +import com.zy.ptc.kernel.system.entity.Host; +import com.zy.ptc.kernel.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.ptc.kernel.system.service.UserService; +import com.zy.ptc.kernel.system.service.HostService; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("man_project") +public class Project 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 uuid; + + /** + * 鍚嶇О + */ + @ApiModelProperty(value= "鍚嶇О") + private String name; + + /** + * wms + */ + @ApiModelProperty(value= "wms") + private String wms; + + /** + * wcs + */ + @ApiModelProperty(value= "wcs") + private String wcs; + + /** + * 鎵�灞炴満鏋� + */ + @ApiModelProperty(value= "鎵�灞炴満鏋�") + private Integer hostId; + + /** + * 鐘舵�� 1: 姝e父 0: 鍐荤粨 + */ + @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 鍐荤粨 ") + private Integer status; + + /** + * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") + @TableLogic + private Integer deleted; + + /** + * 娣诲姞浜哄憳 + */ + @ApiModelProperty(value= "娣诲姞浜哄憳") + private Integer createBy; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + private Integer updateBy; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + public Project() {} + + public Project(String uuid,String name,String wms,String wcs,Integer hostId,Integer status,Integer deleted,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) { + this.uuid = uuid; + this.name = name; + this.wms = wms; + this.wcs = wcs; + this.hostId = hostId; + this.status = status; + this.deleted = deleted; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.memo = memo; + } + +// Project project = new Project( +// null, // 缂栧彿 +// null, // 鍚嶇О +// null, // wms +// null, // wcs +// 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 "姝e父"; + 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 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 getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + 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 String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + +} diff --git a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/mapper/ProjectMapper.java b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/mapper/ProjectMapper.java new file mode 100644 index 0000000..6627159 --- /dev/null +++ b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/mapper/ProjectMapper.java @@ -0,0 +1,12 @@ +package com.zy.ptc.kernel.manager.mapper; + +import com.zy.ptc.kernel.manager.entity.Project; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface ProjectMapper extends BaseMapper<Project> { + +} diff --git a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/ProjectService.java b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/ProjectService.java new file mode 100644 index 0000000..b317905 --- /dev/null +++ b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/ProjectService.java @@ -0,0 +1,8 @@ +package com.zy.ptc.kernel.manager.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.ptc.kernel.manager.entity.Project; + +public interface ProjectService extends IService<Project> { + +} diff --git a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/impl/ProjectServiceImpl.java b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/impl/ProjectServiceImpl.java new file mode 100644 index 0000000..2513628 --- /dev/null +++ b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/manager/service/impl/ProjectServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.ptc.kernel.manager.service.impl; + +import com.zy.ptc.kernel.manager.mapper.ProjectMapper; +import com.zy.ptc.kernel.manager.entity.Project; +import com.zy.ptc.kernel.manager.service.ProjectService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("projectService") +public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService { + +} diff --git a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/utils/CodeBuilder.java b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/utils/CodeBuilder.java index 0cf9435..7aa5415 100644 --- a/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/utils/CodeBuilder.java +++ b/zy-ptc-kernel/src/main/java/com/zy/ptc/kernel/utils/CodeBuilder.java @@ -15,7 +15,7 @@ generator.frontendPrefixPath = "zy-ptc-flow/"; generator.sqlOsType = SqlOsType.MYSQL; - generator.url="47.76.147.249:3306/zy_ptc_db"; + generator.url="localhost:3306/zy_ptc_db"; generator.username="root"; generator.password="xltys1995"; // generator.url="47.97.1.152:51433;databasename=jkasrs"; diff --git a/zy-ptc-kernel/src/main/java/project.sql b/zy-ptc-kernel/src/main/java/project.sql new file mode 100644 index 0000000..ba6b545 --- /dev/null +++ b/zy-ptc-kernel/src/main/java/project.sql @@ -0,0 +1,9 @@ +-- save project record +-- mysql +insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '椤圭洰绠$悊绠$悊', '0', '/manager/project', /manager/project', '0' , '0', '1' , '1'); + +insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ椤圭洰绠$悊', '', '1', 'manager:project:list', '0', '1', '1'); +insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞椤圭洰绠$悊', '', '1', 'manager:project:save', '1', '1', '1'); +insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼椤圭洰绠$悊', '', '1', 'manager:project:update', '2', '1', '1'); +insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎椤圭洰绠$悊', '', '1', 'manager:project:remove', '3', '1', '1'); + diff --git a/zy-ptc-kernel/src/main/resources/application.yml b/zy-ptc-kernel/src/main/resources/application.yml index 7366d47..2123351 100644 --- a/zy-ptc-kernel/src/main/resources/application.yml +++ b/zy-ptc-kernel/src/main/resources/application.yml @@ -13,7 +13,7 @@ validation-timeout: 3000 connection-test-query: select 1 driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://47.76.147.249:3306/zy_ptc_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://localhost:3306/zy_ptc_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: xltys1995 # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver diff --git a/zy-ptc-kernel/src/main/resources/mapper/manager/ProjectMapper.xml b/zy-ptc-kernel/src/main/resources/mapper/manager/ProjectMapper.xml new file mode 100644 index 0000000..ad07b92 --- /dev/null +++ b/zy-ptc-kernel/src/main/resources/mapper/manager/ProjectMapper.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.ptc.kernel.manager.mapper.ProjectMapper"> + +</mapper> -- Gitblit v1.9.1