增加系统设置controller

src/main/java/com/neotel/smfcore/common/csv/CsvReader.java

@@ -140,7 +140,7 @@ public class CsvReader {
 	 */
 	 */
 	public CsvReader(String fileName, char delimiter)
 	public CsvReader(String fileName, char delimiter)
 			throws FileNotFoundException {
 			throws FileNotFoundException {
-		this(fileName, delimiter, Charset.forName("GBK"));
+		this(fileName, delimiter, Charset.forName("UTF-8"));
 	}
 	}
 
 
 	/**
 	/**

src/main/java/com/neotel/smfcore/common/csv/CsvWriter.java

@@ -93,7 +93,7 @@ public class CsvWriter {
 	 *            The path to the file to output the data.
 	 *            The path to the file to output the data.
 	 */
 	 */
 	public CsvWriter(String fileName) {
 	public CsvWriter(String fileName) {
-		this(fileName, Letters.COMMA, Charset.forName("ISO-8859-1"));
+		this(fileName, Letters.COMMA, Charset.forName("UTF-8"));
 	}
 	}
 
 
 	/**
 	/**

src/main/java/com/neotel/smfcore/core/barcode/rest/BacodeController.java → src/main/java/com/neotel/smfcore/core/barcode/rest/BarcodeController.java

@@ -44,7 +44,7 @@ import java.util.Set;
 @RequiredArgsConstructor
 @RequiredArgsConstructor
 @Api(tags = "产品：条码管理")
 @Api(tags = "产品：条码管理")
 @RequestMapping("api/barcode")
 @RequestMapping("api/barcode")
-public class BacodeController {
+public class BarcodeController {
     @Autowired
     @Autowired
     private final IBarcodeManager barcodeManager;
     private final IBarcodeManager barcodeManager;
     @Autowired
     @Autowired

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -55,7 +55,10 @@ public class BarcodeDto implements Serializable {
 
 
     @ApiModelProperty("标签解析出来的数量,用于判断条码是否是重新打印的,重新打印的条码需要重新设置数量")
     @ApiModelProperty("标签解析出来的数量,用于判断条码是否是重新打印的,重新打印的条码需要重新设置数量")
     private int labelAmount = 0;
     private int labelAmount = 0;
+    @ApiModelProperty("宽度")
     private int plateSize=0;
     private int plateSize=0;
+
+    @ApiModelProperty("高度")
     private int height=0;
     private int height=0;
     private String provider;
     private String provider;
 
 

src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java

 package com.neotel.smfcore.core.storage.rest;
 package com.neotel.smfcore.core.storage.rest;
 
 
+import com.google.common.base.Strings;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.csv.CsvReader;
 import com.neotel.smfcore.common.exception.BadRequestException;
 import com.neotel.smfcore.common.exception.BadRequestException;
+import com.neotel.smfcore.common.exception.ValidateException;
+import com.neotel.smfcore.common.utils.FileUtil;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.storage.rest.dto.StorageDto;
 import com.neotel.smfcore.core.storage.rest.dto.StorageDto;
@@ -9,7 +14,11 @@ import com.neotel.smfcore.core.storage.rest.mapstruct.StorageMapper;
 import com.neotel.smfcore.core.storage.rest.query.StorageQueryCriteria;
 import com.neotel.smfcore.core.storage.rest.query.StorageQueryCriteria;
 import com.neotel.smfcore.core.storage.service.dao.IStorageDao;
 import com.neotel.smfcore.core.storage.service.dao.IStorageDao;
 import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
 import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
+import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
+import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import com.neotel.smfcore.security.bean.FileProperties;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;

src/main/java/com/neotel/smfcore/core/system/rest/SettingsController.java

+package com.neotel.smfcore.core.system.rest;
+
+import com.neotel.smfcore.common.exception.BadRequestException;
+import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.system.rest.bean.dto.SettingsDto;
+import com.neotel.smfcore.core.system.rest.bean.mapstruct.SettingsMapper;
+import com.neotel.smfcore.core.system.service.po.Settings;
+import com.neotel.smfcore.security.rest.bean.dto.MenuDto;
+import com.neotel.smfcore.security.service.po.Menu;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Slf4j
+@Api(tags = "系统：设置")
+@RestController
+@RequestMapping("/api/settings")
+@RequiredArgsConstructor
+public class SettingsController {
+    @Autowired
+    private DataCache dataCache;
+
+    @Autowired
+    private SettingsMapper settingsMapper;
+
+    @ApiOperation("获取设置信息")
+    @GetMapping()
+    @PreAuthorize("@el.check('settings:list')")
+    public SettingsDto getSettings() {
+
+      Settings settings= dataCache.getSettings();
+      SettingsDto dto=settingsMapper.toDto(settings);
+      return dto;
+    }
+
+    @ApiOperation("修改设置信息")
+    @PutMapping
+    @PreAuthorize("@el.check('settings:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody SettingsDto settingsDto) {
+
+        if(settingsDto.getMaxHumidity()<=settingsDto.getMinHumidity()){
+            throw new BadRequestException("温度范围数据错误");
+        }
+        if(settingsDto.getMaxHumidityShow()<=settingsDto.getMinHumidityShow()){
+            throw new BadRequestException("温度显示范围数据错误");
+        }
+        if(settingsDto.getMaxTemperature()<=settingsDto.getMinTemperature()){
+            throw new BadRequestException("湿度范围数据错误");
+        }
+        if(settingsDto.getMaxTemperatureShow()<=settingsDto.getMinTemperatureShow()){
+            throw new BadRequestException("湿度显示范围数据错误");
+        }
+
+        if(settingsDto.getInNotifyApi()==null){
+            settingsDto.setInNotifyApi("");
+        }
+        if(settingsDto.getOutNotifyApi()==null){
+            settingsDto.setOutNotifyApi("");
+        }
+        if(settingsDto.getOrderFileDir()==null){
+            settingsDto.setOrderFileDir("");
+        }
+        Settings settings=dataCache.getSettings();
+        settings.setInNotifyApi(settingsDto.getInNotifyApi());
+        settings.setOutNotifyApi(settingsDto.getOutNotifyApi());
+        settings.setOrderFileDir(settingsDto.getOrderFileDir());
+        settings.setMinHumidity(settingsDto.getMinHumidity());
+        settings.setMaxHumidity(settingsDto.getMaxHumidity());
+        settings.setMinTemperature(settingsDto.getMinTemperature());
+        settings.setMaxTemperature(settingsDto.getMaxTemperature());
+        settings.setMaxHumidityShow(settingsDto.getMaxHumidityShow());
+        settings.setMinHumidityShow(settingsDto.getMinHumidityShow());
+        settings.setMaxTemperatureShow(settingsDto.getMaxTemperatureShow());
+        settings.setMinTemperatureShow(settingsDto.getMinTemperatureShow());
+        dataCache.updateSettings(settings);
+        return new ResponseEntity<>(HttpStatus.OK);
+
+    }
+}

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/SettingsDto.java

+package com.neotel.smfcore.core.system.rest.bean.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+@Getter
+@Setter
+public class SettingsDto implements Serializable {
+
+    @ApiModelProperty("最低温度")
+    private float minTemperature = 22.0F;
+
+    @ApiModelProperty("仪表显示最低温度")
+    private float minTemperatureShow = 20.0F;
+
+    @ApiModelProperty("最高温度")
+    private float maxTemperature = 38.0F;
+
+    @ApiModelProperty("仪表显示最高温度")
+    private float maxTemperatureShow = 30.0F;
+
+    @ApiModelProperty("最低湿度值")
+    private float minHumidity = 0.0F;
+
+    @ApiModelProperty("仪表显示最低湿度值")
+    private float minHumidityShow = 0.0F;
+
+    @ApiModelProperty("湿度值")
+    private float maxHumidity = 100.0F;
+
+    @ApiModelProperty("仪表显示最高湿度值")
+    private float maxHumidityShow = 15.0F;
+
+    @ApiModelProperty("呆滞物料提醒时间(天)")
+    private int inactionDay = 0;
+
+    @ApiModelProperty("入库通知api地址")
+    private String inNotifyApi;
+
+    @ApiModelProperty("出库通知api地址")
+    private String outNotifyApi;
+
+    @ApiModelProperty("订单文件的路径")
+    private String orderFileDir;
+}

src/main/java/com/neotel/smfcore/core/system/rest/bean/mapstruct/SettingsMapper.java

+package com.neotel.smfcore.core.system.rest.bean.mapstruct;
+
+import com.neotel.smfcore.common.base.BaseMapper;
+import com.neotel.smfcore.core.system.rest.bean.dto.SettingsDto;
+import com.neotel.smfcore.core.system.service.po.Settings;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+@Mapper(componentModel = "spring" ,unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface SettingsMapper extends BaseMapper<SettingsDto, Settings> {
+}