From ce06cb3e8167151290d68b76b3684ec49e8f31a4 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期五, 17 十一月 2023 17:04:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/project/Environ.vue | 42 ++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java | 63 +++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 96 +++++++++++++
modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml | 20 ++
web/src/views/modules/project/Environ-AddOrUpdate.vue | 85 ++++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 40 +++++
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java | 23 +++
7 files changed, 369 insertions(+), 0 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
new file mode 100644
index 0000000..4e3d86a
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.project.controller;
+
+
+import com.zt.common.annotation.LogOperation;
+import com.zt.common.constant.Constant;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.servlet.Result;
+import com.zt.common.servlet.PageResult;
+import com.zt.common.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+import com.zt.common.validator.group.AddGroup;
+import com.zt.common.validator.group.DefaultGroup;
+import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.model.Environ;
+import com.zt.life.modules.project.service.EnvironService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * environ
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@RestController
+@RequestMapping("/project/Environ/")
+@Api(tags="environ")
+public class EnvironController {
+ @Autowired
+ private EnvironService environService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "CODE^LK") })
+ public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(environService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<Environ> get(@PathVariable("id") Long id){
+ Environ data = environService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody Environ environ){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environ, AddGroup.class, DefaultGroup.class);
+ environService.insert(environ);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody Environ environ){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
+ environService.update(environ);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java
new file mode 100644
index 0000000..3af63fe
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.project.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.project.model.Environ;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * environ
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Mapper
+public interface EnvironDao extends BaseDao<Environ> {
+
+ List<Environ> getList(Map<String, Object> params);
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
new file mode 100644
index 0000000..1c8f2e8
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
@@ -0,0 +1,63 @@
+package com.zt.life.modules.project.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * environ
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("environ")
+public class Environ extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "缂栧彿")
+ private String code;
+
+ @ApiModelProperty(value = "纭蒋浠惰祫婧�")
+ private String hardSoftwareRes;
+
+ @ApiModelProperty(value = "鍔ㄦ�佹祴璇曠幆澧冨浘")
+ private String testEnvirontDiagram;
+
+ @ApiModelProperty(value = "鐜宸紓鎬у垎鏋�")
+ private String environAnalysis;
+
+ @ApiModelProperty(value = "鐜寤虹珛")
+ private String environEstablish;
+
+ @ApiModelProperty(value = "鐜寤虹珛浜哄憳")
+ private String establishStaff;
+
+ @ApiModelProperty(value = "鐜寤虹珛鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date establishDate;
+
+ @ApiModelProperty(value = "鐜纭")
+ private String environConfirmat;
+
+ @ApiModelProperty(value = "鐜纭浜哄憳")
+ private String confirmatStaff;
+
+ @ApiModelProperty(value = "鐜纭鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date confirmatDate;
+
+ @ApiModelProperty(value = "鏄惁杩涜鐜鐥呮瘨鏌ユ潃")
+ private String isVirusScan;
+
+ @ApiModelProperty(value = "鐥呮瘨搴撶増鏈�")
+ private String virusDatabaseVersion;
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
new file mode 100644
index 0000000..d030877
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -0,0 +1,40 @@
+package com.zt.life.modules.project.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.project.dao.EnvironDao;
+import com.zt.life.modules.project.model.Environ;
+import org.springframework.stereotype.Service;
+import com.zt.common.db.query.QueryFilter;
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * environ
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Service
+public class EnvironService extends BaseService<EnvironDao, Environ> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<Environ> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+}
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
new file mode 100644
index 0000000..42eb2ff
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
@@ -0,0 +1,20 @@
+<?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.zt.life.modules.project.dao.EnvironDao">
+
+ <select id="getList" resultType="com.zt.life.modules.project.model.Environ">
+ select a.*
+ from environ a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/web/src/views/modules/project/Environ-AddOrUpdate.vue b/web/src/views/modules/project/Environ-AddOrUpdate.vue
new file mode 100644
index 0000000..367bcd1
--- /dev/null
+++ b/web/src/views/modules/project/Environ-AddOrUpdate.vue
@@ -0,0 +1,85 @@
+<template>
+ <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
+ <zt-form-item label="缂栧彿" prop="code" rules="required">
+ <el-input v-model="dataForm.code"></el-input>
+ </zt-form-item>
+ <zt-form-item label="纭蒋浠惰祫婧�" prop="hardSoftwareRes" rules="required">
+ <el-input v-model="dataForm.hardSoftwareRes"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鍔ㄦ�佹祴璇曠幆澧冨浘" prop="testEnvirontDiagram" rules="required">
+ <el-input v-model="dataForm.testEnvirontDiagram"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜宸紓鎬у垎鏋�" prop="environAnalysis" rules="required">
+ <el-input v-model="dataForm.environAnalysis"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜寤虹珛" prop="environEstablish" rules="required">
+ <el-input v-model="dataForm.environEstablish"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜寤虹珛浜哄憳" prop="establishStaff" rules="required">
+ <el-input v-model="dataForm.establishStaff"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜寤虹珛鏃ユ湡" prop="establishDate" rules="required">
+ <el-input v-model="dataForm.establishDate"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜纭" prop="environConfirmat" rules="required">
+ <el-input v-model="dataForm.environConfirmat"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜纭浜哄憳" prop="confirmatStaff" rules="required">
+ <el-input v-model="dataForm.confirmatStaff"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐜纭鏃ユ湡" prop="confirmatDate" rules="required">
+ <el-input v-model="dataForm.confirmatDate"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鏄惁杩涜鐜鐥呮瘨鏌ユ潃" prop="isVirusScan" rules="required">
+ <el-input v-model="dataForm.isVirusScan"></el-input>
+ </zt-form-item>
+ <zt-form-item label="鐥呮瘨搴撶増鏈�" prop="virusDatabaseVersion" rules="required">
+ <el-input v-model="dataForm.virusDatabaseVersion"></el-input>
+ </zt-form-item>
+ </el-form>
+ </zt-dialog>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ dataForm: {
+ id: '',
+ code: '',
+ hardSoftwareRes: '',
+ testEnvirontDiagram: '',
+ environAnalysis: '',
+ environEstablish: '',
+ establishStaff: '',
+ establishDate: '',
+ environConfirmat: '',
+ confirmatStaff: '',
+ confirmatDate: '',
+ isVirusScan: '',
+ virusDatabaseVersion: ''
+ }
+ }
+ },
+ methods: {
+ // 鑾峰彇淇℃伅
+ async getInfo() {
+ let res = await this.$http.get(`/project/Environ/${this.dataForm.id}`)
+ this.dataForm = {
+ ...this.dataForm,
+ ...res.data
+ }
+ },
+ // 琛ㄥ崟鎻愪氦
+ async formSubmit() {
+ let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Environ/', this.dataForm)
+ if (res.success) {
+ await this.$tip.success()
+ this.$refs.dialog.close()
+ this.$emit('refreshDataList')
+ }
+ }
+ }
+ }
+</script>
diff --git a/web/src/views/modules/project/Environ.vue b/web/src/views/modules/project/Environ.vue
new file mode 100644
index 0000000..ae2bfb1
--- /dev/null
+++ b/web/src/views/modules/project/Environ.vue
@@ -0,0 +1,42 @@
+<template>
+ <el-card shadow="never" class="aui-card--fill">
+ <div class="mod-project-environ}">
+ <zt-table-wraper query-url="/project/Environ/page" delete-url="/project/Environ" v-slot="{ table }">
+ <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
+ <el-form-item>
+ <el-input v-model="dataForm.code" placeholder="璇疯緭鍏ョ紪鍙�" clearable></el-input>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-button type="query" @click="table.query()"/>
+ <zt-button type="add" perm="project:add" @click="table.editHandle()"/>
+ <zt-button type="delete" perm="project:delete" @click="table.deleteHandle()"/>
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
+ <el-table-column type="selection" width="40"/>
+ <el-table-column prop="code" label="缂栧彿"/>
+ <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
+ </el-table>
+ <!-- 寮圭獥, 鏂板 / 淇敼 -->
+ <add-or-update @refreshDataList="table.query"/>
+ </zt-table-wraper>
+ </div>
+ </el-card>
+</template>
+
+<script>
+ import AddOrUpdate from './Environ-AddOrUpdate'
+ export default {
+ data() {
+ return {
+ dataForm: {
+ code: '',
+ }
+ }
+ },
+ components: {
+ AddOrUpdate
+ }
+ }
+</script>
--
Gitblit v1.9.1