jiangping
2024-12-18 ebb04a3d1b37709029e12736e3aef5918b290607
最新版本541200007
已添加9个文件
已修改1个文件
674 ■■■■■ 文件已修改
admin/src/api/business/tmsFactoryParam.js 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaTmsFactoryParamWindow.vue 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/tmsFactoryParam.vue 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/db/business.tms_factory_param.permissions.sql 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/TmsFactoryParamMapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/tmsFactoryParam.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
import request from '../../utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/page', data, {
    trim: true
  })
}
// å¯¼å‡ºExcel
export function exportExcel (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/exportExcel', data, {
    trim: true,
    download: true
  })
}
// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/create', data)
}
// ä¿®æ”¹
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/tmsFactoryParam/updateById', data)
}
// åˆ é™¤
export function deleteById (id) {
  return request.get(`/visitsAdmin/cloudService/tmsFactoryParam/delete/${id}`)
}
// æ‰¹é‡åˆ é™¤
export function deleteByIdInBatch (ids) {
  return request.get('/visitsAdmin/cloudService/tmsFactoryParam/delete/batch', {
    params: {
      ids
    }
  })
}
admin/src/components/business/OperaTmsFactoryParamWindow.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,58 @@
<template>
  <GlobalWindow
    :title="title"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"
  >
    <el-form :model="form" ref="form" :rules="rules">
       <el-form-item label="名称" prop="name" required>
        <el-input v-model="form.name" placeholder="请输入名称" v-trim/>
      </el-form-item>
    <el-form-item label="TMS编码" prop="code" required>
      <el-input v-model="form.code" placeholder="请输入TMS编码" v-trim/>
    </el-form-item>
      <el-form-item label="总库存量(万支)" prop="num1">
        <el-input v-model="form.num1" placeholder="请输入总库存量(万支)" v-trim/>
      </el-form-item>
      <el-form-item label="总出库能力(万支)" prop="num2">
        <el-input v-model="form.num2" placeholder="请输入总出库能力(万支)" v-trim/>
      </el-form-item>
    <el-form-item label="排序码" prop="sortnum">
      <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim/>
    </el-form-item>
    </el-form>
  </GlobalWindow>
</template>
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
export default {
  name: 'OperaTmsFactoryParamWindow',
  extends: BaseOpera,
  components: { GlobalWindow },
  data () {
    return {
      // è¡¨å•数据
      form: {
        id: null,
        code: '',
        name: '',
        sortnum: '',
        num1: '',
        num2: ''
      },
      // éªŒè¯è§„则
      rules: {
      }
    }
  },
  created () {
    this.config({
      api: '/business/tmsFactoryParam',
      'field.id': 'id'
    })
  }
}
</script>
admin/src/views/business/tmsFactoryParam.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
<template>
  <TableLayout :permissions="['business:tmsfactoryparam:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="编码" prop="code">
        <el-input v-model="searchForm.code" placeholder="编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:tmsfactoryparam:create', 'business:tmsfactoryparam:delete']">
        <li><el-button type="primary" @click="$refs.operaTmsFactoryParamWindow.open('新建TMS工厂配置信息表')" icon="el-icon-plus" v-permissions="['business:tmsfactoryparam:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:tmsfactoryparam:delete']">删除</el-button></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="姓名" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="编码" min-width="100px"></el-table-column>
        <el-table-column prop="num1" label="总库存量(万支)" min-width="100px"></el-table-column>
        <el-table-column prop="num2" label="总出库能力(万支)" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:tmsfactoryparam:update', 'business:tmsfactoryparam:delete'])"
          label="操作"
          min-width="120"
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaTmsFactoryParamWindow.open('编辑TMS工厂配置信息表', row)" icon="el-icon-edit" v-permissions="['business:tmsfactoryparam:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:tmsfactoryparam:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      </pagination>
    </template>
    <!-- æ–°å»º/修改 -->
    <OperaTmsFactoryParamWindow ref="operaTmsFactoryParamWindow" @success="handlePageChange"/>
  </TableLayout>
</template>
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaTmsFactoryParamWindow from '@/components/business/OperaTmsFactoryParamWindow'
export default {
  name: 'TmsFactoryParam',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaTmsFactoryParamWindow },
  data () {
    return {
      // æœç´¢
      searchForm: {
        code: '',
        name: ''
      }
    }
  },
  created () {
    this.config({
      module: 'TMS工厂配置信息表',
      api: '/business/tmsFactoryParam',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
  }
}
</script>
server/db/business.tms_factory_param.permissions.sql
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:create', '新建TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:delete', '删除TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:update', '修改TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:query', '查询TMS工厂配置信息表', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:tmsfactoryparam:exportExcel', '导出TMS工厂配置信息表(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsFactoryParamCloudController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.doumee.cloud.admin;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.service.business.TmsFactoryParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
@Api(tags = "TMS工厂配置信息表")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/tmsFactoryParam")
public class TmsFactoryParamCloudController extends BaseController {
    @Autowired
    private TmsFactoryParamService tmsFactoryParamService;
    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @CloudRequiredPermission("business:tmsfactoryparam:create")
    public ApiResponse create(@RequestBody TmsFactoryParam tmsFactoryParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        tmsFactoryParam.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(tmsFactoryParamService.create(tmsFactoryParam));
    }
    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @CloudRequiredPermission("business:tmsfactoryparam:delete")
    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        tmsFactoryParamService.deleteById(id,this.getLoginUser(token));
        return ApiResponse.success(null);
    }
    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:tmsfactoryparam:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        tmsFactoryParamService.deleteByIdInBatch(idList,this.getLoginUser(token));
        return ApiResponse.success(null);
    }
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:tmsfactoryparam:update")
    public ApiResponse updateById(@RequestBody TmsFactoryParam tmsFactoryParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        tmsFactoryParam.setLoginUserInfo(this.getLoginUser(token));
        tmsFactoryParamService.updateById(tmsFactoryParam);
        return ApiResponse.success(null);
    }
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:tmsfactoryparam:query")
    public ApiResponse<PageData<TmsFactoryParam>> findPage (@RequestBody PageWrap<TmsFactoryParam> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(tmsFactoryParamService.findPage(pageWrap));
    }
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:tmsfactoryparam:exportExcel")
    public void exportExcel (@RequestBody PageWrap<TmsFactoryParam> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ExcelExporter.build(TmsFactoryParam.class).export(tmsFactoryParamService.findPage(pageWrap).getRecords(), "TMS工厂配置信息表", response);
    }
    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:tmsfactoryparam:query")
    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(tmsFactoryParamService.findById(id));
    }
}
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/TmsFactoryParamMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.doumee.dao.business;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.github.yulichang.base.MPJBaseMapper;
/**
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
public interface TmsFactoryParamMapper extends MPJBaseMapper<TmsFactoryParam> {
}
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/TmsFactoryParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,86 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
/**
 * TMS工厂配置信息表
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
@Data
@ApiModel("TMS工厂配置信息表")
@TableName("`tms_factory_param`")
public class TmsFactoryParam extends LoginUserModel {
    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;
    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;
    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    private Date createDate;
    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;
    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    private Date editDate;
    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;
    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;
    @ApiModelProperty(value = "月台编码(关联platforms)")
    @ExcelColumn(name="月台编码(关联platforms)")
    private String code;
    @ApiModelProperty(value = "人员编码(关联member)")
    @ExcelColumn(name="人员编码(关联member)")
    private String name;
    @ApiModelProperty(value = "排序码", example = "1")
    @ExcelColumn(name="排序码")
    private Integer sortnum;
    @ApiModelProperty(value = "总库存量(万支)", example = "1")
    @ExcelColumn(name="总库存量(万支)")
    private BigDecimal num1;
    @ApiModelProperty(value = "总出库能力(万支)", example = "1")
    @ExcelColumn(name="总出库能力(万支)")
    private BigDecimal num2;
    @ApiModelProperty(value = "扩展字段3")
    @ExcelColumn(name="扩展字段3")
    private String param3;
    @ApiModelProperty(value = "扩展字段4")
    @ExcelColumn(name="扩展字段4")
    private String param4;
    @ApiModelProperty(value = "操作人姓名")
    @TableField(exist = false)
    private String editorName;
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/TmsFactoryParamService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
package com.doumee.service.business;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.TmsFactoryParam;
import java.util.List;
/**
 * TMS工厂配置信息表Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
public interface TmsFactoryParamService {
    /**
     * åˆ›å»º
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return Integer
     */
    Integer create(TmsFactoryParam tmsFactoryParam);
    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id,LoginUserInfo user);
    /**
     * åˆ é™¤
     *
     * @param tmsFactoryParam å®žä½“对象
     */
    void delete(TmsFactoryParam tmsFactoryParam);
    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);
    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param tmsFactoryParam å®žä½“对象
     */
    void updateById(TmsFactoryParam tmsFactoryParam);
    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param tmsFactoryParams å®žä½“集
     */
    void updateByIdInBatch(List<TmsFactoryParam> tmsFactoryParams);
    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return TmsFactoryParam
     */
    TmsFactoryParam findById(Integer id);
    /**
     * æ¡ä»¶æŸ¥è¯¢å•条记录
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return TmsFactoryParam
     */
    TmsFactoryParam findOne(TmsFactoryParam tmsFactoryParam);
    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return List<TmsFactoryParam>
     */
    List<TmsFactoryParam> findList(TmsFactoryParam tmsFactoryParam);
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<TmsFactoryParam>
     */
    PageData<TmsFactoryParam> findPage(PageWrap<TmsFactoryParam> pageWrap);
    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param tmsFactoryParam å®žä½“对象
     * @return long
     */
    long count(TmsFactoryParam tmsFactoryParam);
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/TmsFactoryParamServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,191 @@
package com.doumee.service.business.impl;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.TmsFactoryParamMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.PlatformGroup;
import com.doumee.dao.business.model.TmsFactoryParam;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.TmsFactoryParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
/**
 * TMS工厂配置信息表Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2024/12/18 17:44
 */
@Service
public class TmsFactoryParamServiceImpl implements TmsFactoryParamService {
    @Autowired
    private TmsFactoryParamMapper tmsFactoryParamMapper;
    @Override
    public Integer create(TmsFactoryParam model) {
        if(tmsFactoryParamMapper.selectCount(new QueryWrapper<TmsFactoryParam>().lambda()
                .eq(TmsFactoryParam::getIsdeleted, Constants.ZERO)
                .eq(TmsFactoryParam::getCode,model.getCode())
        )>0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,工厂编码不能重复!");
        }
        model.setIsdeleted(Constants.ZERO);
        model.setCreator(model.getLoginUserInfo().getId());
        model.setCreateDate(new Date());
        model.setEditDate(model.getCreateDate());
        model.setEditor(model.getCreator());
        tmsFactoryParamMapper.insert(model);
        return model.getId();
    }
    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        tmsFactoryParamMapper.update(null,new UpdateWrapper<TmsFactoryParam>().lambda().set(TmsFactoryParam::getIsdeleted,Constants.ONE)
                .eq(TmsFactoryParam::getId,id)
                .eq(TmsFactoryParam::getEditDate,new Date())
                .eq(TmsFactoryParam::getEditor,user.getId())
        );
    }
    @Override
    public void delete(TmsFactoryParam tmsFactoryParam) {
        UpdateWrapper<TmsFactoryParam> deleteWrapper = new UpdateWrapper<>(tmsFactoryParam);
        tmsFactoryParamMapper.delete(deleteWrapper);
    }
    @Override
    public void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        for(Integer id : ids){
            deleteById(id,user);
        }
    }
    @Override
    public void updateById(TmsFactoryParam model) {
        if(tmsFactoryParamMapper.selectCount(new QueryWrapper<TmsFactoryParam>().lambda()
                .eq(TmsFactoryParam::getIsdeleted, Constants.ZERO)
                .ne(TmsFactoryParam::getId,model.getId())
                .eq(TmsFactoryParam::getCode,model.getCode())
        )>0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,工厂编码不能重复!");
        }
        model.setEditor(model.getLoginUserInfo().getId());
        model.setEditDate(model.getCreateDate());
        tmsFactoryParamMapper.updateById(model);
    }
    @Override
    public void updateByIdInBatch(List<TmsFactoryParam> tmsFactoryParams) {
        if (CollectionUtils.isEmpty(tmsFactoryParams)) {
            return;
        }
        for (TmsFactoryParam tmsFactoryParam: tmsFactoryParams) {
            this.updateById(tmsFactoryParam);
        }
    }
    @Override
    public TmsFactoryParam findById(Integer id) {
        return tmsFactoryParamMapper.selectById(id);
    }
    @Override
    public TmsFactoryParam findOne(TmsFactoryParam tmsFactoryParam) {
        QueryWrapper<TmsFactoryParam> wrapper = new QueryWrapper<>(tmsFactoryParam);
        return tmsFactoryParamMapper.selectOne(wrapper);
    }
    @Override
    public List<TmsFactoryParam> findList(TmsFactoryParam tmsFactoryParam) {
        tmsFactoryParam.setIsdeleted(Constants.ZERO);
        QueryWrapper<TmsFactoryParam> wrapper = new QueryWrapper<>(tmsFactoryParam);
        return tmsFactoryParamMapper.selectList(wrapper);
    }
    @Override
    public PageData<TmsFactoryParam> findPage(PageWrap<TmsFactoryParam> pageWrap) {
        IPage<TmsFactoryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<TmsFactoryParam> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.selectAll(TmsFactoryParam.class)
                .selectAs(SystemUser::getRealname,TmsFactoryParam::getEditorName)
                .leftJoin(SystemUser.class,SystemUser::getId,TmsFactoryParam::getEditor);
        if (pageWrap.getModel().getId() != null) {
             queryWrapper.eq(TmsFactoryParam::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
             queryWrapper.eq(TmsFactoryParam::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
             queryWrapper.ge(TmsFactoryParam::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
             queryWrapper.le(TmsFactoryParam::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
             queryWrapper.eq(TmsFactoryParam::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
             queryWrapper.ge(TmsFactoryParam::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
             queryWrapper.le(TmsFactoryParam::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
             queryWrapper.eq(TmsFactoryParam::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
             queryWrapper.eq(TmsFactoryParam::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getCode() != null) {
             queryWrapper.eq(TmsFactoryParam::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getName() != null) {
             queryWrapper.eq(TmsFactoryParam::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getSortnum() != null) {
             queryWrapper.eq(TmsFactoryParam::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getNum1() != null) {
             queryWrapper.eq(TmsFactoryParam::getNum1, pageWrap.getModel().getNum1());
        }
        if (pageWrap.getModel().getNum2() != null) {
             queryWrapper.eq(TmsFactoryParam::getNum2, pageWrap.getModel().getNum2());
        }
        if (pageWrap.getModel().getParam3() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam3, pageWrap.getModel().getParam3());
        }
        if (pageWrap.getModel().getParam4() != null) {
             queryWrapper.eq(TmsFactoryParam::getParam4, pageWrap.getModel().getParam4());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(tmsFactoryParamMapper.selectPage(page, queryWrapper));
    }
    @Override
    public long count(TmsFactoryParam tmsFactoryParam) {
        QueryWrapper<TmsFactoryParam> wrapper = new QueryWrapper<>(tmsFactoryParam);
        return tmsFactoryParamMapper.selectCount(wrapper);
    }
}
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -1273,6 +1273,7 @@
        data.setYesterdayElectricity(getDefaultData());//昨日用电
        getMonthElectricityData(data.getMonthElectricity());//通过安防平获取本月用电量数据
        carbonElec = new BigDecimal(StringUtils.defaultString(data.getMonthElectricity().getTotal(), "0"));
        getLastMonthElectricityData(data.getElectricityQuantity());//通过安防平获取上月用电量数据
        getCurrentDateElectircityData(data.getTodayElectricity(),0);//通过安防平获取今日用电量数据
        getCurrentDateElectircityData(data.getYesterdayElectricity(),-1);//通过安防平获取昨日用电量数据