增加配方管理

baoshiwei

2023-05-24 aff9b2919752b67d6227802f59f23ed90ff71c16

增加配方管理

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package org.jeecg.modules.dry.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * @Description: å¹²ç‡¥é…æ–¹
 * @Author: jeecg-boot
 * @Date:   2023-05-16
 * @Version: V1.0
 */
@Data
@TableName("dry_herb_formula")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="dry_herb_formula对象", description="干燥配方")
public class DryHerbFormula implements Serializable {
    private static final long serialVersionUID = 1L;

    /**id*/
    @TableId(type = IdType.ASSIGN_ID)
    @ApiModelProperty(value = "id")
    private String id;
    /**药材id*/
    @Excel(name = "药材id", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id")
    @Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id")
    @ApiModelProperty(value = "药材id")
    private String herbId;
    /**药材名称*/
    @Excel(name = "药材名称", width = 15)
    @ApiModelProperty(value = "药材名称")
    private String herbName;
    /**设备类型*/
    @Excel(name = "设备类型", width = 15, dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
    @Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
    @ApiModelProperty(value = "设备类型")
    private String eqpType;
    /**目标含水率*/
    @Excel(name = "目标含水率", width = 15)
    @ApiModelProperty(value = "目标含水率")
    private Double target;
    /**投料量*/
    @Excel(name = "投料量", width = 15)
    @ApiModelProperty(value = "投料量")
    private Integer feed;
    /**预计干燥时间*/
    @Excel(name = "预计干燥时间", width = 15)
    @ApiModelProperty(value = "预计干燥时间")
    private Integer et;
    /**热风温度*/
    @Excel(name = "热风温度", width = 15)
    @ApiModelProperty(value = "热风温度")
    private Double windTemp;
    /**环境温度*/
    @Excel(name = "环境温度", width = 15)
    @ApiModelProperty(value = "环境温度")
    private Double envTemp;
    /**环境湿度*/
    @Excel(name = "环境湿度", width = 15)
    @ApiModelProperty(value = "环境湿度")
    private Double envHum;
    /**荡料延时ms*/
    @Excel(name = "荡料延时ms", width = 15)
    @ApiModelProperty(value = "荡料延时ms")
    private Integer delay;
    /**翻料次数*/
    @Excel(name = "翻料次数", width = 15)
    @ApiModelProperty(value = "翻料次数")
    private Integer turn;
    /**租户id*/
    @Excel(name = "租户id", width = 15)
    @ApiModelProperty(value = "租户id")
    private Integer tenantId;
    /**创建人*/
    @ApiModelProperty(value = "创建人")
    private String createBy;
    /**创建时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
    /**更新人*/
    @ApiModelProperty(value = "更新人")
    private String updateBy;
    /**更新时间*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "更新时间")
    private Date updateTime;
}

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java

@@ -81,6 +81,21 @@
        return Result.OK(pageList);
    }

     @ApiOperation(value="查询所有干燥机", notes="查询所有干燥机")
     @GetMapping(value = "/listAll")
    public Result<List<DryEquipment>> queryAllEquipment(DryEquipment dryEquipment, HttpServletRequest req) {
        //------------------------------------------------------------------------------------------------
        //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
        if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
            dryEquipment.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
        }
        //------------------------------------------------------------------------------------------------
        QueryWrapper<DryEquipment> queryWrapper = QueryGenerator.initQueryWrapper(dryEquipment, req.getParameterMap());

        List<DryEquipment> eqps = dryEquipmentService.list(queryWrapper);
        return Result.OK(eqps);
    }

    /**
     *   æ·»åŠ 
     *

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbFormulaController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,186 @@
package org.jeecg.modules.dry.controller;

import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.config.TenantContext;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
import org.jeecg.modules.dry.entity.DryHerbFormula;
import org.jeecg.modules.dry.service.IDryHerbFormulaService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;

import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;

 /**
 * @Description: å¹²ç‡¥é…æ–¹
 * @Author: jeecg-boot
 * @Date:   2023-05-16
 * @Version: V1.0
 */
@Api(tags="干燥配方")
@RestController
@RequestMapping("/dry/dryHerbFormula")
@Slf4j
public class DryHerbFormulaController extends JeecgController<DryHerbFormula, IDryHerbFormulaService> {
    @Autowired
    private IDryHerbFormulaService dryHerbFormulaService;

    /**
     * åˆ†é¡µåˆ—表查询
     *
     * @param dryHerbFormula
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "干燥配方-分页列表查询")
    @ApiOperation(value="干燥配方-分页列表查询", notes="干燥配方-分页列表查询")
    @GetMapping(value = "/list")
    public Result<IPage<DryHerbFormula>> queryPageList(DryHerbFormula dryHerbFormula,
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        //------------------------------------------------------------------------------------------------
        //是否开启系统管理模块的多租户数据隔离【SAAS多租户模式】
        if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
            dryHerbFormula.setTenantId(oConvertUtils.getInt(TenantContext.getTenant(),0));
        }
        //------------------------------------------------------------------------------------------------
        QueryWrapper<DryHerbFormula> queryWrapper = QueryGenerator.initQueryWrapper(dryHerbFormula, req.getParameterMap());
        Page<DryHerbFormula> page = new Page<DryHerbFormula>(pageNo, pageSize);
        IPage<DryHerbFormula> pageList = dryHerbFormulaService.page(page, queryWrapper);
        return Result.OK(pageList);
    }

    /**
     *   æ·»åŠ 
     *
     * @param dryHerbFormula
     * @return
     */
    @AutoLog(value = "干燥配方-添加")
    @ApiOperation(value="干燥配方-添加", notes="干燥配方-添加")
    @RequiresPermissions("dry:dry_herb_formula:add")
    @PostMapping(value = "/add")
    public Result<String> add(@RequestBody DryHerbFormula dryHerbFormula) {
        dryHerbFormulaService.save(dryHerbFormula);
        return Result.OK("添加成功！");
    }

    /**
     *  ç¼–辑
     *
     * @param dryHerbFormula
     * @return
     */
    @AutoLog(value = "干燥配方-编辑")
    @ApiOperation(value="干燥配方-编辑", notes="干燥配方-编辑")
    @RequiresPermissions("dry:dry_herb_formula:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
    public Result<String> edit(@RequestBody DryHerbFormula dryHerbFormula) {
        dryHerbFormulaService.updateById(dryHerbFormula);
        return Result.OK("编辑成功!");
    }

    /**
     *   é€šè¿‡id删除
     *
     * @param id
     * @return
     */
    @AutoLog(value = "干燥配方-通过id删除")
    @ApiOperation(value="干燥配方-通过id删除", notes="干燥配方-通过id删除")
    @RequiresPermissions("dry:dry_herb_formula:delete")
    @DeleteMapping(value = "/delete")
    public Result<String> delete(@RequestParam(name="id",required=true) String id) {
        dryHerbFormulaService.removeById(id);
        return Result.OK("删除成功!");
    }

    /**
     *  æ‰¹é‡åˆ é™¤
     *
     * @param ids
     * @return
     */
    @AutoLog(value = "干燥配方-批量删除")
    @ApiOperation(value="干燥配方-批量删除", notes="干燥配方-批量删除")
    @RequiresPermissions("dry:dry_herb_formula:deleteBatch")
    @DeleteMapping(value = "/deleteBatch")
    public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
        this.dryHerbFormulaService.removeByIds(Arrays.asList(ids.split(",")));
        return Result.OK("批量删除成功!");
    }

    /**
     * é€šè¿‡id查询
     *
     * @param id
     * @return
     */
    //@AutoLog(value = "干燥配方-通过id查询")
    @ApiOperation(value="干燥配方-通过id查询", notes="干燥配方-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<DryHerbFormula> queryById(@RequestParam(name="id",required=true) String id) {
        DryHerbFormula dryHerbFormula = dryHerbFormulaService.getById(id);
        if(dryHerbFormula==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(dryHerbFormula);
    }

    /**
    * å¯¼å‡ºexcel
    *
    * @param request
    * @param dryHerbFormula
    */
    @RequiresPermissions("dry:dry_herb_formula:exportXls")
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, DryHerbFormula dryHerbFormula) {
        return super.exportXls(request, dryHerbFormula, DryHerbFormula.class, "干燥配方");
    }

    /**
      * é€šè¿‡excel导入数据
    *
    * @param request
    * @param response
    * @return
    */
    @RequiresPermissions("dry:dry_herb_formula:importExcel")
    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
        return super.importExcel(request, response, DryHerbFormula.class);
    }

}

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbFormulaMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.jeecg.modules.dry.mapper;

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.dry.entity.DryHerbFormula;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @Description: å¹²ç‡¥é…æ–¹
 * @Author: jeecg-boot
 * @Date:   2023-05-16
 * @Version: V1.0
 */
public interface DryHerbFormulaMapper extends BaseMapper<DryHerbFormula> {

}

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbFormulaMapper.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="org.jeecg.modules.dry.mapper.DryHerbFormulaMapper">

</mapper>

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbFormulaService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package org.jeecg.modules.dry.service;

import org.jeecg.modules.dry.entity.DryHerbFormula;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @Description: å¹²ç‡¥é…æ–¹
 * @Author: jeecg-boot
 * @Date:   2023-05-16
 * @Version: V1.0
 */
public interface IDryHerbFormulaService extends IService<DryHerbFormula> {

}

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbFormulaServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package org.jeecg.modules.dry.service.impl;

import org.jeecg.modules.dry.entity.DryHerbFormula;
import org.jeecg.modules.dry.mapper.DryHerbFormulaMapper;
import org.jeecg.modules.dry.service.IDryHerbFormulaService;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

/**
 * @Description: å¹²ç‡¥é…æ–¹
 * @Author: jeecg-boot
 * @Date:   2023-05-16
 * @Version: V1.0
 */
@Service
public class DryHerbFormulaServiceImpl extends ServiceImpl<DryHerbFormulaMapper, DryHerbFormula> implements IDryHerbFormulaService {

}

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java

@@ -73,6 +73,7 @@
        orderVo.setPlcdisable(realTimeDataVo.getPlcdisable());
        orderVo.setLowalarm(realTimeDataVo.getLowalarm());
        orderVo.setWind(realTimeDataVo.getWind());
        orderVo.setOriginWeight(realTimeDataVo.getWeight2());
        DryOrderTrendVo trendVo = new DryOrderTrendVo(realTimeDataVo);
        // 2.2 ä¿å­˜å·¥å•å«æ°´çŽ‡å˜åŒ– æˆ– é‡é‡å˜åŒ–
        saveOrderTrendVo(trendVo, orderVo);

 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java

@@ -250,8 +250,8 @@
            //添加首页路由
            //update-begin-author:taoyan date:20200211 for: TASK #3368 ã€è·¯ç”±ç¼“存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存
            if(!PermissionDataUtil.hasIndexPage(metaList)){
                SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"首页")).get(0);
                metaList.add(0,indexMenu);
//                SysPermission indexMenu = sysPermissionService.list(new LambdaQueryWrapper<SysPermission>().eq(SysPermission::getName,"首页")).get(0);
//                metaList.add(0,indexMenu);
            }
            //update-end-author:taoyan date:20200211 for: TASK #3368 ã€è·¯ç”±ç¼“存】首页的缓存设置有问题，需要根据后台的路由配置来实现是否缓存


 jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml

@@ -10,6 +10,8 @@
        server-addr: @config.server-addr@
      discovery:
        server-addr: ${spring.cloud.nacos.config.server-addr}
    inetutils:
      preferred-networks: 192.168
  config:
    import:
      - optional:nacos:ichd.yaml

 pom.xml

@@ -429,7 +429,7 @@
                <!--当前环境-->
                <profile.name>dev</profile.name>
                <!--Nacos服务地址-->
                <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
                <config.server-addr>192.168.19.168:8848</config.server-addr>
            </properties>
        </profile>
        <!-- æµ‹è¯• -->