Merge remote-tracking branch 'origin/master'

zzw

2023-11-17 ce06cb3e8167151290d68b76b3684ec49e8f31a4

Merge remote-tracking branch 'origin/master'

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java

New file
@@ -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();
    }

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironDao.java

New file
@@ -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);

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java

New file
@@ -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;

}

 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java

New file
@@ -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);
    }

}

 modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml

New file
@@ -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>

 web/src/views/modules/project/Environ-AddOrUpdate.vue

New file
@@ -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>

 web/src/views/modules/project/Environ.vue

New file
@@ -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>