From aff9b2919752b67d6227802f59f23ed90ff71c16 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 24 五月 2023 10:40:02 +0800
Subject: [PATCH] 增加配方管理

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbFormulaController.java     |  186 ++++++++++++++++++++++++++
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java |    1 
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbFormulaMapper.xml          |    5 
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbFormulaService.java          |   14 ++
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbFormulaServiceImpl.java  |   19 ++
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java       |   15 ++
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbFormulaMapper.java             |   17 ++
 jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml                                         |    2 
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java                   |  105 +++++++++++++++
 pom.xml                                                                                                                |    2 
 jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java    |   12 
 11 files changed, 371 insertions(+), 7 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
new file mode 100644
index 0000000..5c4c4aa
--- /dev/null
+++ b/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;
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
index e2a2116..2dc83a3 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryEquipmentController.java
+++ b/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) {
+		//------------------------------------------------------------------------------------------------
+		//鏄惁寮�鍚郴缁熺鐞嗘ā鍧楃殑澶氱鎴锋暟鎹殧绂汇�怱AAS澶氱鎴锋ā寮忋��
+		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);
+	}
+
 	/**
 	 *   娣诲姞
 	 *
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbFormulaController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryHerbFormulaController.java
new file mode 100644
index 0000000..b9e46df
--- /dev/null
+++ b/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) {
+		//------------------------------------------------------------------------------------------------
+		//鏄惁寮�鍚郴缁熺鐞嗘ā鍧楃殑澶氱鎴锋暟鎹殧绂汇�怱AAS澶氱鎴锋ā寮忋��
+		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);
+    }
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbFormulaMapper.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryHerbFormulaMapper.java
new file mode 100644
index 0000000..3fd53e0
--- /dev/null
+++ b/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> {
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbFormulaMapper.xml b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryHerbFormulaMapper.xml
new file mode 100644
index 0000000..9e5807a
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbFormulaService.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryHerbFormulaService.java
new file mode 100644
index 0000000..8ccb548
--- /dev/null
+++ b/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> {
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbFormulaServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryHerbFormulaServiceImpl.java
new file mode 100644
index 0000000..46dfa87
--- /dev/null
+++ b/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 {
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index 9fcd610..3e33bb9 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/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);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
index 963ed0b..939bc66 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
@@ -87,7 +87,7 @@
 			LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>();
 			query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
 			query.orderByAsc(SysPermission::getSortNo);
-			
+
 			//鏀寔閫氳繃鑿滃崟鍚嶅瓧锛屾ā绯婃煡璇�
 			if(oConvertUtils.isNotEmpty(sysPermission.getName())){
 				query.like(SysPermission::getName, sysPermission.getName());
@@ -211,7 +211,7 @@
 
 //	/**
 //	 * 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勮彍鍗曟潈闄愬拰鎸夐挳鏉冮檺锛堟牴鎹敤鎴疯处鍙凤級
-//	 * 
+//	 *
 //	 * @return
 //	 */
 //	@RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
@@ -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 銆愯矾鐢辩紦瀛樸�戦椤电殑缂撳瓨璁剧疆鏈夐棶棰橈紝闇�瑕佹牴鎹悗鍙扮殑璺敱閰嶇疆鏉ュ疄鐜版槸鍚︾紦瀛�
 
@@ -277,7 +277,7 @@
 				}
 				//update-end---author:liusq ---date:2022-06-29  for锛氳缃嚜瀹氫箟棣栭〉鍦板潃鍜岀粍浠�-----------
 			}
-			
+
 			JSONObject json = new JSONObject();
 			JSONArray menujsonArray = new JSONArray();
 			this.getPermissionJsonArray(menujsonArray, metaList, null);
@@ -303,7 +303,7 @@
 			json.put("sysSafeMode", jeecgBaseConfig.getSafeMode());
 			result.setResult(json);
 		} catch (Exception e) {
-			result.error500("鏌ヨ澶辫触:" + e.getMessage());  
+			result.error500("鏌ヨ澶辫触:" + e.getMessage());
 			log.error(e.getMessage(), e);
 		}
 		return result;
diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml
index 723a4ba..16d9cf9 100644
--- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/resources/application.yml
+++ b/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
diff --git a/pom.xml b/pom.xml
index 133748a..6a36cbf 100644
--- a/pom.xml
+++ b/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>
         <!-- 娴嬭瘯 -->

--
Gitblit v1.9.3