台湾繁體字

web/src/main/java/com/zhehekeji/web/controller/PLCController.java

@@ -40,7 +40,7 @@ public class PLCController {
             try {
                 ksecNettyClient.createClient(configProperties.getKsec());
             }catch (Exception e){
-                Assert.isTrue(false,"连接失败，ip："+configProperties.getKsec().getIp()+",port:"+configProperties.getKsec().getPort());
+                Assert.isTrue(false,"連接失敗，ip："+configProperties.getKsec().getIp()+",port:"+configProperties.getKsec().getPort());
             }
 
         }else {
@@ -51,7 +51,7 @@ public class PLCController {
                 try {
                     nettyClient.createClient(street);
                 }catch (Exception e){
-                    Assert.isTrue(false,"连接失败，ip："+street.getPlcIp()+",port:"+street.getPlcPort());
+                    Assert.isTrue(false,"連接失敗，ip："+street.getPlcIp()+",port:"+street.getPlcPort());
                 }
             }
         }

web/src/main/java/com/zhehekeji/web/service/CameraService.java

@@ -98,7 +98,7 @@ public class CameraService {
 
     public void del(Integer id) {
         Integer count = streetMapper.checkCamera(id);
-        Assert.isTrue(count == null || count == 0, "球机已被绑定");
+        Assert.isTrue(count == null || count == 0, "球機已被綁定");
         cameraMapper.deleteById(id);
     }
 

web/src/main/java/com/zhehekeji/web/service/CategoryService.java

@@ -59,9 +59,13 @@ public class CategoryService {
     }
 
     public void edit(Category category){
-        Assert.notNull(category.getId(),"ID不能为空");
+        Assert.notNull(category.getId(),"ID為空");
         category.setUpdateTime(LocalDateTime.now());
-        categoryMapper.updateById(category);
+        try {
+            categoryMapper.updateById(category);
+        }catch (DuplicateKeyException e){
+            Assert.isTrue(false,"品規已存在");
+        }
     }
 
     public void del(Integer id){
@@ -73,7 +77,7 @@ public class CategoryService {
         try {
             categoryMapper.insert(category);
         }catch (DuplicateKeyException e){
-            Assert.isTrue(false,"品规已存在");
+            Assert.isTrue(false,"品規已存在");
         }
         return category.getId();
     }

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -42,7 +42,7 @@ public class StockService {
         try {
             EasyExcel.read(file.getInputStream(), StockExcel.class, new StockImport(stockMapper)).sheet().doRead();
         }catch (Exception e){
-            Assert.isTrue(false,"导入出错");
+            Assert.isTrue(false,"導入出錯");
         }
     }
 
@@ -305,7 +305,7 @@ public class StockService {
      */
     public Stock checkCorrect(StockCheck stockCheck) {
         Stock stock = stockInfo(stockCheck);
-        Assert.isTrue(stock != null && stock.getId() != null, "该货位暂时没有记录");
+        Assert.isTrue(stock != null && stock.getId() != null, "該貨位暫時沒有記錄");
         Integer oldStatus = stock.getStatus();
         if(StockStatus.SUCCESS.getStatus().equals(oldStatus)){
             return stock;
@@ -339,9 +339,9 @@ public class StockService {
      */
     public Stock checkByMan(CheckByMan checkByMan) {
         Stock stock = stockMapper.getByShelveIdAndRowColumn(checkByMan.getShelveId(), checkByMan.getRow(), checkByMan.getColumn());
-        Assert.notNull(stock, "该货位暂时没有记录");
+        Assert.notNull(stock, "該貨位暫時沒有記錄");
         Boolean same = checkByMan.getCategory().equals(stock.getCategory()) && checkByMan.getCount().equals(stock.getCount());
-        Assert.isTrue(!same, "品规和数量与原有记录相同");
+        Assert.isTrue(!same, "品規、數量與原有紀錄相同");
         Integer oldStatus = stock.getStatus();
         String oldCategory = stock.getCategory();
         Integer count = stock.getCount();