Merge remote-tracking branch 'origin/develop' into develop

src/main/java/net/vtstar/zhongtong/avi/equipment/controller/BasicInfoController.java

@@ -30,7 +30,7 @@ public class BasicInfoController {
 
     @ApiOperation(value = "分页查询设备列表", notes = "使用通用搜索组件，searchCode：SCADA_EQUIP_INFO\n" +
             "字段含义：\n{\n" +
-            "  \"workshopCode\": \"车间，字符串类型\",\n" +
+            "  \"workshopName\": \"车间，字符串类型\",\n" +
             "  \"equipType\": \"设备类型，字符串类型\",\n" +
             "  \"equipCode\": \"设备编号，字符串类型\",\n" +
             "  \"alias\": \"设备名称，字符串类型\"\n" +
@@ -43,6 +43,7 @@ public class BasicInfoController {
 
     @ApiOperation(value = "新建设备", notes = "新增参数说明，新增需传入以下参数即可：\n{\n" +
             "  \"workshopCode\": \"车间，字符串类型，长度最大20\",\n" +
+            "  \"workshopName\": \"车间名称，字符串类型，长度最大50\",\n" +
             "  \"equipType\": \"设备分类，字符串类型，长度最大50\",\n" +
             "  \"equipCode\": \"设备编号，字符串类型，长度最大100\"\n" +
             "  \"alias\": \"设备名称，字符串类型，长度最大100, 非必填\"\n" +
@@ -62,10 +63,10 @@ public class BasicInfoController {
     }
 
     @ApiOperation("删除设备（根据id删除单个）")
-    @DeleteMapping("/equipDelete")
-    public Return deleteEquip(@RequestParam Long id) {
-        Assert.notNull(id, "Id is null");
-        basicInfoService.deleteEquipById(id);
+    @DeleteMapping("/equipDelete/{equipId}")
+    public Return deleteEquip(@PathVariable("equipId") Long equipId) {
+        Assert.notNull(equipId, "Id is null");
+        basicInfoService.deleteEquipById(equipId);
         return Return.success();
     }
 
@@ -104,10 +105,10 @@ public class BasicInfoController {
     }
 
     @ApiOperation("删除工位（根据id删除单个）")
-    @DeleteMapping("/stationDelete")
-    public Return deleteStation(@RequestParam Long id) {
-        Assert.notNull(id, "Id is null");
-        basicInfoService.deleteStationById(id);
+    @DeleteMapping("/stationDelete/{stationId}")
+    public Return deleteStation(@PathVariable("stationId") Long stationId) {
+        Assert.notNull(stationId, "Id is null");
+        basicInfoService.deleteStationById(stationId);
         return Return.success();
     }
 }

src/main/java/net/vtstar/zhongtong/avi/equipment/domain/EquipInfo.java

@@ -25,13 +25,20 @@ public class EquipInfo {
     @Id
     private Long id;
 
-    @ApiModelProperty(notes = "车间")
-    @NotNull(message = "车间不能为空")
-    @Length(max = 20, message = "车间名称长度不能大于{max}")
+    @ApiModelProperty(notes = "车间编号")
+    @NotNull(message = "车间编号不能为空")
+    @Length(max = 20, message = "车间编号长度不能大于{max}")
     @Column(name = "workshop_code")
     @Search
     private String workshopCode;
 
+    @ApiModelProperty(notes = "车间名称")
+    @NotNull(message = "车间名称不能为空")
+    @Length(max = 50, message = "车间名称长度不能大于{max}")
+    @Column(name = "workshop_name")
+    @Search
+    private String workshopName;
+
     @ApiModelProperty(notes = "设备分类")
     @NotNull(message = "设备分类不能为空")
     @Length(max = 50, message = "设备分类长度不能大于{max}")

src/main/java/net/vtstar/zhongtong/avi/equipment/service/BasicInfoService.java

@@ -94,6 +94,7 @@ public class BasicInfoService {
             ParamAssert.isTrue(CollectionUtils.isEmpty(equipInfos) || !oldData.getId().equals(equipInfos.get(0).getId()),
                     "存在车间/分类/编号完全相同的设备!");
             oldData.setWorkshopCode(equipInfo.getWorkshopCode());
+            oldData.setWorkshopName(equipInfo.getWorkshopName());
             oldData.setEquipType(equipInfo.getEquipType());
             oldData.setEquipCode(equipInfo.getEquipCode());
             oldData.setAlias(equipInfo.getAlias());